IMPORTANT NOTE: Only the nvt fixes perform time integration, meaning they update the velocities and positions of particles due to forces diff -Naur lammps-5Dec08/doc/Section_howto.txt lammps-6Dec08/doc/Section_howto.txt --- lammps-5Dec08/doc/Section_howto.txt 2008-07-23 16:55:13.000000000 -0600 +++ lammps-6Dec08/doc/Section_howto.txt 2008-12-04 09:50:31.000000000 -0700 @@ -1209,7 +1209,9 @@ temperature component of the particle's velocities. See the doc pages for the individual fixes and for the "fix_modify"_fix_modify.html command for instructions on how to assign a temperature compute to a -thermostatting fix. +thermostatting fix. For example, you can apply a thermostat to only +the x and z components of velocity by using it in conjunction with +"compute temp/partial"_compute_temp_partial.html. IMPORTANT NOTE: Only the nvt fixes perform time integration, meaning they update the velocities and positions of particles due to forces diff -Naur lammps-5Dec08/doc/special_bonds.html lammps-6Dec08/doc/special_bonds.html --- lammps-5Dec08/doc/special_bonds.html 2008-07-29 13:56:08.000000000 -0600 +++ lammps-6Dec08/doc/special_bonds.html 2008-12-04 12:44:25.000000000 -0700 @@ -13,17 +13,27 @@
Syntax:
-special_bonds style -special_bonds c1 c2 c3 -special_bonds c1 c2 c3 c4 c5 c6 +special_bonds style args-
charmm args = none + amber args = none + dihedral args = c1 c2 c3 c4 c5 c6 + c1,c2,c3 = weights (0.0 to 1.0) on pairwise Lennard-Jones interactions (and Coulomb if c4,c5,c6 are not specified) + c4,c5,c6 = weights (0.0 to 1.0) on pairwise Coulomb interactions (optional) + explicit args = c1 c2 c3 c4 c5 c6 + c1,c2,c3 = weights (0.0 to 1.0) on pairwise Lennard-Jones interactions (and Coulomb if c4,c5,c6 are not specified) + c4,c5,c6 = weights (0.0 to 1.0) on pairwise Coulomb interactions (optional) ++
Examples:
special_bonds charmm special_bonds amber +special_bonds dihedral 0.0 0.0 0.5 +special_bonds explicit 0 1 1 special_bonds 0 1 1 special_bonds 0.0 0.0 1.0 0.0 0.0 0.5@@ -31,49 +41,68 @@
Set the weighting coefficients for the pairwise force and energy contributions from atom pairs that are also bonded to each other -directly or indirectly. The 1st coefficient is the weighting factor -on 1-2 atom pairs, which are those directly bonded to each other. The -2nd coefficient is the weighting factor on 1-3 atom pairs which are -those separated by 2 bonds (e.g. the 2 H atoms in a water molecule). -The 3rd coefficient is the weighting factor on 1-4 atom pairs which -are separated by 3 bonds (e.g. the 1st and 4th atoms in a dihedral +directly or indirectly. For Lennard-Jones and Coulombic pairwise +interactions, the 1st coefficient is the weighting factor on 1-2 atom +pairs, which are those directly bonded to each other. The 2nd +coefficient is the weighting factor on 1-3 atom pairs which are those +separated by 2 bonds (e.g. the 2 H atoms in a water molecule). The +3rd coefficient is the weighting factor on 1-4 atom pairs which are +separated by 3 bonds (e.g. the 1st and 4th atoms in a dihedral interaction).
Note that for purposes of computing weighted pairwise interactions, -1-3 and 1-4 interactions are not defined from the list of angles or +1-3 and 1-4 interactions are NOT defined from the list of angles or dihedrals used by the simulation. Rather, they are inferred topologically by the set of bonds defined when atoms are read in from a file (read_data or read_restart). Thus the set of 1-2,1-3,1-4 -interactions is the same whether angle potentials are computed or not, -and remains the same even if bonds are constrained, or turned off, or -removed during a simulation. The only exception is if the -delete_bonds command is used with the special -option that recomputes the 1-2,1-3,1-4 topologies; see the command for -more details. +interactions is the same whether angle and dihedral potentials are +computed or not, and remains the same even if bonds are constrained, +or turned off, or removed during a simulation.
-The charmm style sets all 3 coefficients to 0.0, which is the -default for the CHARMM force field. In pair styles -lj/charmm/coul/charmm and lj/charmm/coul/long the 1-4 coefficients -are defined explicitly, and these pair-wise contributions are computed -in the charmm dihedral style - see the pair_coeff -and dihedral_style commands for more -information. +
The two exceptions to this rule are (a) if the special_bonds +dihedral style is used (see below), or (b) if the +delete_bonds command is used with the special +option that recomputes the 1-2,1-3,1-4 topologies after bonds are +deleted; see the delete_bonds command for more +details. +
+The charmm style sets all 3 coefficients to 0.0 for both LJ and +Coulombic interactions, which is the default for the CHARMM force +field. In pair styles lj/charmm/coul/charmm and +lj/charmm/coul/long the 1-4 coefficients are defined explicitly, and +these pair-wise contributions are computed in the charmm dihedral +style - see the pair_coeff and +dihedral_style commands for more information.
The amber style sets the 3 coefficients to 0.0 0.0 0.5 for LJ -interactions and to 0.0 0.0 0.833 for Coulombic interactions, which is -the default for a particular version of the AMBER force field, where -the last value is 5/6. -
-For a lj units system with FENE bonds a -setting of special bonds 0 1 1 should be used. -
-A special_bonds command with 3 coefficients sets the 1-2, 1-3, and 1-4 -coefficients for both LJ and Coulombic terms to those values. -
-A special_bonds command with 6 coefficients sets the 1-2, 1-3, and 1-4 -LJ coefficients to the first 3 values and the Coulombic coefficients -to the last 3 values. +interactions and to 0.0 0.0 0.8333 for Coulombic interactions, which +is the default for a particular version of the AMBER force field, +where the last value is really 5/6. +
+The dihedral style requires you to set 3 or 6 coefficients (see the +explicit style), but it turns off the 1-4 weighting factor for +individual atom pairs if they are not listed as the first and last +atoms in any dihedral defined in the simulation. For example, imagine +you have set the 1-4 weighting factor to 0.5 and you have a linear +molecule with 5 atoms and bonds as follows: 1-2-3-4-5. If your data +file defines 1-2-3-4 as a dihedral, but does not define 2-3-4-5 as a +dihedral, then the pairwise interaction between atoms 1 and 4 will be +weighted by 0.5, but the interaction between atoms 2 and 5 will be +unaffected (full weighting of 1.0). Note that if any of the other +special_bond styles are used, then the 2,5 interaction would also be +weighted by 0.5. The dihedral style is provided because some force +fields follow this rule. +
+The explicit style requires you to set 3 or 6 coefficients directly. +If 3 are specified, they are used for both LJ and Coulombic +interactions. If 6 are specified then the first 3 are LJ coefficients +and the second 3 are Coulombic coefficients. Note that the explicit +keyword itself is optional; the special_bonds command can just take 3 +or 6 numeric arguments by themselves. +
+IMPORTANT NOTE: For a lj units system with FENE +bonds a setting of special bonds 0 1 1 should be used.
Restrictions: none
diff -Naur lammps-5Dec08/doc/special_bonds.txt lammps-6Dec08/doc/special_bonds.txt --- lammps-5Dec08/doc/special_bonds.txt 2008-07-29 13:56:08.000000000 -0600 +++ lammps-6Dec08/doc/special_bonds.txt 2008-12-04 12:44:25.000000000 -0700 @@ -10,17 +10,25 @@ [Syntax:] -special_bonds style -special_bonds c1 c2 c3 -special_bonds c1 c2 c3 c4 c5 c6 :pre +special_bonds style args :pre -style = {charmm} or {amber} -c1,c2,c3,c4,c5,c6 = numeric coefficients from 0.0 to 1.0 :ul +style = {charmm} or {amber} or {dihedral} or {explicit} ({explicit} can be omitted) :ulb,l + {charmm} args = none + {amber} args = none + {dihedral} args = c1 c2 c3 c4 c5 c6 + c1,c2,c3 = weights (0.0 to 1.0) on pairwise Lennard-Jones interactions (and Coulomb if c4,c5,c6 are not specified) + c4,c5,c6 = weights (0.0 to 1.0) on pairwise Coulomb interactions (optional) + {explicit} args = c1 c2 c3 c4 c5 c6 + c1,c2,c3 = weights (0.0 to 1.0) on pairwise Lennard-Jones interactions (and Coulomb if c4,c5,c6 are not specified) + c4,c5,c6 = weights (0.0 to 1.0) on pairwise Coulomb interactions (optional) :pre +:ule Examples: special_bonds charmm special_bonds amber +special_bonds dihedral 0.0 0.0 0.5 +special_bonds explicit 0 1 1 special_bonds 0 1 1 special_bonds 0.0 0.0 1.0 0.0 0.0 0.5 :pre @@ -28,49 +36,68 @@ Set the weighting coefficients for the pairwise force and energy contributions from atom pairs that are also bonded to each other -directly or indirectly. The 1st coefficient is the weighting factor -on 1-2 atom pairs, which are those directly bonded to each other. The -2nd coefficient is the weighting factor on 1-3 atom pairs which are -those separated by 2 bonds (e.g. the 2 H atoms in a water molecule). -The 3rd coefficient is the weighting factor on 1-4 atom pairs which -are separated by 3 bonds (e.g. the 1st and 4th atoms in a dihedral +directly or indirectly. For Lennard-Jones and Coulombic pairwise +interactions, the 1st coefficient is the weighting factor on 1-2 atom +pairs, which are those directly bonded to each other. The 2nd +coefficient is the weighting factor on 1-3 atom pairs which are those +separated by 2 bonds (e.g. the 2 H atoms in a water molecule). The +3rd coefficient is the weighting factor on 1-4 atom pairs which are +separated by 3 bonds (e.g. the 1st and 4th atoms in a dihedral interaction). Note that for purposes of computing weighted pairwise interactions, -1-3 and 1-4 interactions are not defined from the list of angles or +1-3 and 1-4 interactions are NOT defined from the list of angles or dihedrals used by the simulation. Rather, they are inferred topologically by the set of bonds defined when atoms are read in from a file ("read_data"_read_data.html or "read_restart"_read_restart.html). Thus the set of 1-2,1-3,1-4 -interactions is the same whether angle potentials are computed or not, -and remains the same even if bonds are constrained, or turned off, or -removed during a simulation. The only exception is if the -"delete_bonds"_delete_bonds.html command is used with the {special} -option that recomputes the 1-2,1-3,1-4 topologies; see the command for -more details. +interactions is the same whether angle and dihedral potentials are +computed or not, and remains the same even if bonds are constrained, +or turned off, or removed during a simulation. -The {charmm} style sets all 3 coefficients to 0.0, which is the -default for the CHARMM force field. In pair styles -{lj/charmm/coul/charmm} and {lj/charmm/coul/long} the 1-4 coefficients -are defined explicitly, and these pair-wise contributions are computed -in the charmm dihedral style - see the "pair_coeff"_pair_coeff.html -and "dihedral_style"_dihedral_style.html commands for more -information. +The two exceptions to this rule are (a) if the special_bonds +{dihedral} style is used (see below), or (b) if the +"delete_bonds"_delete_bonds.html command is used with the {special} +option that recomputes the 1-2,1-3,1-4 topologies after bonds are +deleted; see the "delete_bonds"_delete_bonds.html command for more +details. + +The {charmm} style sets all 3 coefficients to 0.0 for both LJ and +Coulombic interactions, which is the default for the CHARMM force +field. In pair styles {lj/charmm/coul/charmm} and +{lj/charmm/coul/long} the 1-4 coefficients are defined explicitly, and +these pair-wise contributions are computed in the charmm dihedral +style - see the "pair_coeff"_pair_coeff.html and +"dihedral_style"_dihedral_style.html commands for more information. The {amber} style sets the 3 coefficients to 0.0 0.0 0.5 for LJ -interactions and to 0.0 0.0 0.833 for Coulombic interactions, which is -the default for a particular version of the AMBER force field, where -the last value is 5/6. - -For a "lj units"_units.html system with "FENE bonds"_bond_fene.html a -setting of special bonds 0 1 1 should be used. - -A special_bonds command with 3 coefficients sets the 1-2, 1-3, and 1-4 -coefficients for both LJ and Coulombic terms to those values. - -A special_bonds command with 6 coefficients sets the 1-2, 1-3, and 1-4 -LJ coefficients to the first 3 values and the Coulombic coefficients -to the last 3 values. +interactions and to 0.0 0.0 0.8333 for Coulombic interactions, which +is the default for a particular version of the AMBER force field, +where the last value is really 5/6. + +The {dihedral} style requires you to set 3 or 6 coefficients (see the +{explicit} style), but it turns off the 1-4 weighting factor for +individual atom pairs if they are not listed as the first and last +atoms in any dihedral defined in the simulation. For example, imagine +you have set the 1-4 weighting factor to 0.5 and you have a linear +molecule with 5 atoms and bonds as follows: 1-2-3-4-5. If your data +file defines 1-2-3-4 as a dihedral, but does not define 2-3-4-5 as a +dihedral, then the pairwise interaction between atoms 1 and 4 will be +weighted by 0.5, but the interaction between atoms 2 and 5 will be +unaffected (full weighting of 1.0). Note that if any of the other +special_bond styles are used, then the 2,5 interaction would also be +weighted by 0.5. The {dihedral} style is provided because some force +fields follow this rule. + +The {explicit} style requires you to set 3 or 6 coefficients directly. +If 3 are specified, they are used for both LJ and Coulombic +interactions. If 6 are specified then the first 3 are LJ coefficients +and the second 3 are Coulombic coefficients. Note that the {explicit} +keyword itself is optional; the special_bonds command can just take 3 +or 6 numeric arguments by themselves. + +IMPORTANT NOTE: For a "lj units"_units.html system with "FENE +bonds"_bond_fene.html a setting of special bonds 0 1 1 should be used. [Restrictions:] none diff -Naur lammps-5Dec08/src/force.cpp lammps-6Dec08/src/force.cpp --- lammps-5Dec08/src/force.cpp 2007-10-04 11:57:04.000000000 -0600 +++ lammps-6Dec08/src/force.cpp 2008-12-04 12:47:29.000000000 -0700 @@ -55,6 +55,7 @@ special_lj[1] = special_lj[2] = special_lj[3] = 0.0; special_coul[1] = special_coul[2] = special_coul[3] = 0.0; + special_dihedral = 0; dielectric = 1.0; @@ -352,31 +353,53 @@ { if (narg == 0) error->all("Illegal special_bonds command"); - if (narg == 1 && strcmp(arg[0],"charmm") == 0) { + if (strcmp(arg[0],"charmm") == 0) { + if (narg != 1) error->all("Illegal special_bonds command"); special_lj[1] = 0.0; special_lj[2] = 0.0; special_lj[3] = 0.0; special_coul[1] = 0.0; special_coul[2] = 0.0; special_coul[3] = 0.0; - } else if (narg == 1 && strcmp(arg[0],"amber") == 0) { + special_dihedral = 0; + return; + } + + if (strcmp(arg[0],"amber") == 0) { + if (narg != 1) error->all("Illegal special_bonds command"); special_lj[1] = 0.0; special_lj[2] = 0.0; special_lj[3] = 0.5; special_coul[1] = 0.0; special_coul[2] = 0.0; special_coul[3] = 5.0/6.0; - } else if (narg == 3) { - special_lj[1] = special_coul[1] = atof(arg[0]); - special_lj[2] = special_coul[2] = atof(arg[1]); - special_lj[3] = special_coul[3] = atof(arg[2]); - } else if (narg == 6) { - special_lj[1] = atof(arg[0]); - special_lj[2] = atof(arg[1]); - special_lj[3] = atof(arg[2]); - special_coul[1] = atof(arg[3]); - special_coul[2] = atof(arg[4]); - special_coul[3] = atof(arg[5]); + special_dihedral = 0; + return; + } + + int iarg; + if (strcmp(arg[0],"dihedral") == 0) { + special_dihedral = 1; + iarg = 1; + } else if (strcmp(arg[0],"explicit") == 0) { + special_dihedral = 0; + iarg = 1; + } else { + special_dihedral = 0; + iarg = 0; + } + + if (narg-iarg == 3) { + special_lj[1] = special_coul[1] = atof(arg[iarg+0]); + special_lj[2] = special_coul[2] = atof(arg[iarg+1]); + special_lj[3] = special_coul[3] = atof(arg[iarg+2]); + } else if (narg-iarg == 6) { + special_lj[1] = atof(arg[iarg+0]); + special_lj[2] = atof(arg[iarg+1]); + special_lj[3] = atof(arg[iarg+2]); + special_coul[1] = atof(arg[iarg+3]); + special_coul[2] = atof(arg[iarg+4]); + special_coul[3] = atof(arg[iarg+5]); } else error->all("Illegal special_bonds command"); } diff -Naur lammps-5Dec08/src/force.h lammps-6Dec08/src/force.h --- lammps-5Dec08/src/force.h 2008-04-10 14:53:37.000000000 -0600 +++ lammps-6Dec08/src/force.h 2008-12-04 12:47:29.000000000 -0700 @@ -52,6 +52,8 @@ // index [0] is not used in these arrays double special_lj[4]; // 1-2, 1-3, 1-4 prefactors for LJ double special_coul[4]; // 1-2, 1-3, 1-4 prefactors for Coulombics + int special_dihedral; // 0 if defined dihedrals are ignored + // 1 if only weight 1,4 atoms if in a dihedral Force(class LAMMPS *); ~Force(); diff -Naur lammps-5Dec08/src/input.cpp lammps-6Dec08/src/input.cpp --- lammps-5Dec08/src/input.cpp 2008-05-16 15:58:06.000000000 -0600 +++ lammps-6Dec08/src/input.cpp 2008-12-04 12:47:29.000000000 -0700 @@ -1080,20 +1080,22 @@ void Input::special_bonds() { - // store 1-3,1-4 values before change + // store 1-3,1-4 and dihedral flag values before change double lj2 = force->special_lj[2]; double lj3 = force->special_lj[3]; double coul2 = force->special_coul[2]; double coul3 = force->special_coul[3]; + int dihedral = force->special_dihedral; force->set_special(narg,arg); - // if simulation box defined and 1-3,1-4 values changed, redo special list + // if simulation box defined and saved values changed, redo special list if (domain->box_exist && atom->molecular) { if (lj2 != force->special_lj[2] || lj3 != force->special_lj[3] || - coul2 != force->special_coul[2] || coul3 != force->special_coul[3]) { + coul2 != force->special_coul[2] || coul3 != force->special_coul[3] || + dihedral != force->special_dihedral) { Special special(lmp); special.build(); } diff -Naur lammps-5Dec08/src/special.cpp lammps-6Dec08/src/special.cpp --- lammps-5Dec08/src/special.cpp 2008-11-07 08:47:56.000000000 -0700 +++ lammps-6Dec08/src/special.cpp 2008-12-04 12:47:29.000000000 -0700 @@ -546,6 +546,7 @@ delete [] bufcopy; combine(); + if (force->special_dihedral) dihedral_trim(); } /* ---------------------------------------------------------------------- @@ -690,3 +691,165 @@ atom->nghost = 0; atom->map_set(); } + +/* ---------------------------------------------------------------------- + trim list of 1-4 neighbors by checking defined dihedrals + delete a 1-4 neigh if those atoms are not end points of a defined dihedral +------------------------------------------------------------------------- */ + +void Special::dihedral_trim() +{ + int i,j,m,n,iglobal,jglobal,ilocal,jlocal; + MPI_Request request; + MPI_Status status; + + int *tag = atom->tag; + int *num_dihedral = atom->num_dihedral; + int **dihedral_atom1 = atom->dihedral_atom1; + int **dihedral_atom4 = atom->dihedral_atom4; + int **nspecial = atom->nspecial; + int **special = atom->special; + int nlocal = atom->nlocal; + + // stats on old 1-4 neighbor counts + + double onefourcount = 0.0; + for (i = 0; i < nlocal; i++) + onefourcount += nspecial[i][2] - nspecial[i][1]; + + double allcount; + MPI_Allreduce(&onefourcount,&allcount,1,MPI_DOUBLE,MPI_SUM,world); + + if (me == 0) { + if (screen) + fprintf(screen, + " %g = # of 1-4 neighbors before dihedral trim\n",allcount); + if (logfile) + fprintf(logfile, + " %g = # of 1-4 neighbors before dihedral trim\n",allcount); + } + + // if dihedrals are defined, flag each 1-4 neigh if it appears in a dihedral + + if (num_dihedral && atom->ndihedrals) { + + // dflag = flag for 1-4 neighs of all owned atoms + + int maxcount = 0; + for (i = 0; i < nlocal; i++) + maxcount = MAX(maxcount,nspecial[i][2]-nspecial[i][1]); + int **dflag = + memory->create_2d_int_array(nlocal,maxcount,"special::dflag"); + + for (i = 0; i < nlocal; i++) { + n = nspecial[i][2] - nspecial[i][1]; + for (j = 0; j < n; j++) dflag[i][j] = 0; + } + + // nbufmax = largest buffer needed to hold info from any proc + // info for each atom = list of 1,4 atoms in each dihedral stored by atom + + int nbuf = 0; + for (i = 0; i < nlocal; i++) nbuf += 2*num_dihedral[i]; + + int nbufmax; + MPI_Allreduce(&nbuf,&nbufmax,1,MPI_INT,MPI_MAX,world); + + int *buf = new int[nbufmax]; + int *bufcopy = new int[nbufmax]; + + // fill buffer with list of 1,4 atoms in each dihedral + + int size = 0; + for (i = 0; i < nlocal; i++) + for (j = 0; j < num_dihedral[i]; j++) { + buf[size++] = dihedral_atom1[i][j]; + buf[size++] = dihedral_atom4[i][j]; + } + + // cycle buffer around ring of procs back to self + // when receive buffer, scan list of 1,4 atoms looking for atoms I own + // when find one, scan its 1-4 neigh list and mark I,J as in a dihedral + + int next = me + 1; + int prev = me -1; + if (next == nprocs) next = 0; + if (prev < 0) prev = nprocs - 1; + + int messtag = 7; + for (int loop = 0; loop < nprocs; loop++) { + i = 0; + while (i < size) { + iglobal = buf[i]; + jglobal = buf[i+1]; + ilocal = atom->map(iglobal); + jlocal = atom->map(jglobal); + if (ilocal >= 0 && ilocal < nlocal) + for (m = nspecial[ilocal][1]; m < nspecial[ilocal][2]; m++) + if (jglobal == special[ilocal][m]) { + dflag[ilocal][m-nspecial[ilocal][1]] = 1; + break; + } + if (jlocal >= 0 && jlocal < nlocal) + for (m = nspecial[jlocal][1]; m < nspecial[jlocal][2]; m++) + if (iglobal == special[jlocal][m]) { + dflag[jlocal][m-nspecial[jlocal][1]] = 1; + break; + } + i += 2; + } + if (me != next) { + MPI_Irecv(bufcopy,nbufmax,MPI_INT,prev,messtag,world,&request); + MPI_Send(buf,size,MPI_INT,next,messtag,world); + MPI_Wait(&request,&status); + MPI_Get_count(&status,MPI_INT,&size); + for (j = 0; j < size; j++) buf[j] = bufcopy[j]; + } + } + + // delete 1-4 neighbors if they are not flagged in dflag + + int offset; + for (i = 0; i < nlocal; i++) { + offset = m = nspecial[i][1]; + for (j = nspecial[i][1]; j < nspecial[i][2]; j++) + if (dflag[i][j-offset]) special[i][m++] = special[i][j]; + nspecial[i][2] = m; + } + + // clean up + + memory->destroy_2d_int_array(dflag); + delete [] buf; + delete [] bufcopy; + + // if no dihedrals are defined, delete all 1-4 neighs + + } else for (i = 0; i < nlocal; i++) nspecial[i][2] = nspecial[i][1]; + + // reset atom->maxspecial + + int maxspecial = 0; + for (i = 0; i < nlocal; i++) + maxspecial = MAX(maxspecial,nspecial[i][2]); + + MPI_Allreduce(&maxspecial,&atom->maxspecial,1,MPI_INT,MPI_MAX,world); + atom->maxspecial = MAX(atom->maxspecial,1); + + // stats on new 1-4 neighbor counts + + onefourcount = 0.0; + for (i = 0; i < nlocal; i++) + onefourcount += nspecial[i][2] - nspecial[i][1]; + + MPI_Allreduce(&onefourcount,&allcount,1,MPI_DOUBLE,MPI_SUM,world); + + if (me == 0) { + if (screen) + fprintf(screen, + " %g = # of 1-4 neighbors after dihedral trim\n",allcount); + if (logfile) + fprintf(logfile, + " %g = # of 1-4 neighbors after dihedral trim\n",allcount); + } +} diff -Naur lammps-5Dec08/src/special.h lammps-6Dec08/src/special.h --- lammps-5Dec08/src/special.h 2007-01-29 17:22:05.000000000 -0700 +++ lammps-6Dec08/src/special.h 2008-12-04 12:47:29.000000000 -0700 @@ -27,8 +27,10 @@ private: int me,nprocs; int **onetwo,**onethree,**onefour; + int dihedral_flag; void combine(); + void dihedral_trim(); }; }