Commit 4ca648bb authored by sjplimp's avatar sjplimp
Browse files

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@1614 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent d260cccc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ velocity upper set 3.0 0.0 0.0
fix	     3 boundary setforce 0.0 0.0 0.0
fix	     4 all enforce2d

# Poisseuille flow
# Poiseuille flow

#velocity     boundary set 0.0 0.0 0.0
#fix	     3 lower setforce 0.0 0.0 0.0
+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ fix_modify 2 temp mobile
#fix	     3 boundary setforce 0.0 0.0 0.0
#fix	     4 all enforce2d

# Poisseuille flow
# Poiseuille flow

velocity     boundary set 0.0 0.0 0.0
fix	     3 lower setforce 0.0 0.0 0.0
+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ fix 1 all nve
fix		2 flow temp/rescale 200 1.0 1.0 0.02 1.0
fix_modify	2 temp mobile

# Poiselle flow
# Poisseuille flow

velocity	boundary set 0.0 0.0 0.0
fix		3 lower setforce 0.0 0.0 0.0
+4 −4
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ Lattice::Lattice(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
    error->all("Lattice orient vectors are not orthogonal");
  if (!right_handed())
    error->all("Lattice orient vectors are not right-handed");
  if (colinear())
    error->all("Lattice primitive vectors are colinear");
  if (collinear())
    error->all("Lattice primitive vectors are collinear");

  if (dimension == 2) {
    if (origin[2] != 0.0)
@@ -321,10 +321,10 @@ int Lattice::right_handed()
}

/* ----------------------------------------------------------------------
   check colinearity of each pair of primitive vectors
   check collinearity of each pair of primitive vectors
------------------------------------------------------------------------- */

int Lattice::colinear()
int Lattice::collinear()
{
  double vec[3];
  cross(a1,a2,vec);
+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ private:

  int orthogonal();
  int right_handed();
  int colinear();
  int collinear();
  void setup_transform();
  void add_basis(double, double, double);
  double dot(double *, double *);
Loading