Compare commits

..

4 Commits

Author SHA1 Message Date
ae56b9ad89 patch 31Mar17 for stable release 2017-03-30 10:07:27 -06:00
4466d9fb4a Merge pull request #440 from ohenrich/user-cgdna
Updated lammps.book, USER-CGDNA install script
2017-03-30 09:34:35 -06:00
ac1aa9edea Updated README 2017-03-29 11:18:04 +01:00
c733204a70 Updated lammps.book and install script 2017-03-29 08:28:03 +01:00
9 changed files with 42 additions and 18 deletions

View File

@ -1,7 +1,7 @@
<!-- HTML_ONLY -->
<HEAD>
<TITLE>LAMMPS Users Manual</TITLE>
<META NAME="docnumber" CONTENT="28 Mar 2017 version">
<META NAME="docnumber" CONTENT="31 Mar 2017 version">
<META NAME="author" CONTENT="http://lammps.sandia.gov - Sandia National Laboratories">
<META NAME="copyright" CONTENT="Copyright (2003) Sandia Corporation. This software and manual is distributed under the GNU General Public License.">
</HEAD>
@ -21,7 +21,7 @@
<H1></H1>
LAMMPS Documentation :c,h3
28 Mar 2017 version :c,h4
31 Mar 2017 version :c,h4
Version info: :h4

View File

@ -1686,7 +1686,7 @@ nph) and Berendsen:
The "fix npt"_fix_nh.html commands include a Nose-Hoover thermostat
and barostat. "Fix nph"_fix_nh.html is just a Nose/Hoover barostat;
it does no thermostatting. Both "fix nph"_fix_nh.html and "fix
press/bernendsen"_fix_press_berendsen.html can be used in conjunction
press/berendsen"_fix_press_berendsen.html can be used in conjunction
with any of the thermostatting fixes.
As with the thermostats, "fix npt"_fix_nh.html and "fix

View File

@ -90,8 +90,8 @@ the difference between the {charmm} and {charmmfsh} styles is in the
computation of the 1-4 non-bond interactions, though only if the
distance between the two atoms is within the switching region of the
pairwise potential defined by the corresponding CHARMM pair style,
i.e. between the inner and outer cutoffs specified for the pair style.
The {charmmfsh} style should only be used when using the "pair_style
i.e. within the outer cutoff specified for the pair style. The
{charmmfsh} style should only be used when using the "pair_style
lj/charmmfsw/coul/charmmfsh"_pair_charmm.html to make the Coulombic
pairwise calculations consistent. Use the {charmm} style with
long-range Coulombics or the older "pair_style

View File

@ -464,6 +464,7 @@ pair_nb3b_harmonic.html
pair_nm.html
pair_none.html
pair_oxdna.html
pair_oxdna2.html
pair_peri.html
pair_polymorphic.html
pair_quip.html

View File

@ -49,8 +49,8 @@ args = list of arguments for a particular style :ul
pair_style lj/charmm/coul/charmm 8.0 10.0
pair_style lj/charmm/coul/charmm 8.0 10.0 7.0 9.0
pair_style lj/charmmfsw/coul/charmmfsh 8.0 10.0
pair_style lj/charmmfsw/coul/charmmfsh 8.0 10.0 7.0 9.0
pair_style lj/charmmfsw/coul/charmmfsh 10.0 12.0
pair_style lj/charmmfsw/coul/charmmfsh 10.0 12.0 9.0
pair_coeff * * 100.0 2.0
pair_coeff 1 1 100.0 2.0 150.0 3.5 :pre

View File

@ -29,19 +29,29 @@ action () {
# list of files with dependcies
action bond_oxdna_fene.cpp bond_fene.h
action bond_oxdna2_fene.cpp bond_fene.h
action bond_oxdna_fene.h bond_fene.h
action bond_oxdna2_fene.h bond_fene.h
action fix_nve_dotc_langevin.cpp atom_vec_ellipsoid.h
action fix_nve_dotc_langevin.h atom_vec_ellipsoid.h
action fix_nve_dot.cpp atom_vec_ellipsoid.h
action fix_nve_dot.h atom_vec_ellipsoid.h
action mf_oxdna.h atom_vec_ellipsoid.h
action pair_oxdna_coaxstk.cpp atom_vec_ellipsoid.h
action pair_oxdna2_coaxstk.cpp atom_vec_ellipsoid.h
action pair_oxdna_coaxstk.h atom_vec_ellipsoid.h
action pair_oxdna2_coaxstk.h atom_vec_ellipsoid.h
action pair_oxdna_excv.cpp atom_vec_ellipsoid.h
action pair_oxdna2_excv.cpp atom_vec_ellipsoid.h
action pair_oxdna_excv.h atom_vec_ellipsoid.h
action pair_oxdna2_excv.h atom_vec_ellipsoid.h
action pair_oxdna_hbond.cpp atom_vec_ellipsoid.h
action pair_oxdna_hbond.h atom_vec_ellipsoid.h
action pair_oxdna_stk.cpp atom_vec_ellipsoid.h
action pair_oxdna2_stk.cpp atom_vec_ellipsoid.h
action pair_oxdna_stk.h atom_vec_ellipsoid.h
action pair_oxdna2_stk.h atom_vec_ellipsoid.h
action pair_oxdna_xstk.cpp atom_vec_ellipsoid.h
action pair_oxdna_xstk.h atom_vec_ellipsoid.h
action pair_oxdna2_dh.cpp atom_vec_ellipsoid.h
action pair_oxdna2_dh.h atom_vec_ellipsoid.h

View File

@ -2,9 +2,9 @@ This package contains a LAMMPS implementation of coarse-grained
models of DNA, which can be used to model sequence-specific
DNA strands.
See the doc pages and [1,2] for the individual bond and pair styles.
See the doc pages and [1,2,3] for the individual bond and pair styles.
The packages contains also a new Langevin-type rigid-body integrator,
which has also its own doc page and is explained in [3].
which has also its own doc page and is explained in [4].
[1] T. Ouldridge, A. Louis, J. Doye, "Structural, mechanical,
and thermodynamic properties of a coarse-grained DNA model",
@ -13,16 +13,20 @@ J. Chem. Phys. 134, 085101 (2011).
[2] T.E. Ouldridge, Coarse-grained modelling of DNA and DNA
self-assembly, DPhil. University of Oxford (2011).
[3] R. Davidchack, T. Ouldridge, M. Tretyakov, "New Langevin and
[3] B.E. Snodin, F. Randisi, M. Mosayebi, et al., Introducing
Improved Structural Properties and Salt Dependence into a Coarse-Grained
Model of DNA, J. Chem. Phys. 142, 234901 (2015).
[4] R. Davidchack, T. Ouldridge, M. Tretyakov, "New Langevin and
gradient thermostats for rigid body dynamics", J. Chem. Phys. 142,
144114 (2015).
Example input and data files can be found in
/examples/USER/cgdna/examples/duplex1/ and /duplex2/. A simple python
setup tool which creates single straight or helical DNA strands as
well as DNA duplexes and arrays of duplexes can be found in
/examples/USER/cgdna/util/. A technical report with more information
on the model, the structure of the input and data file, the setup tool
/examples/USER/cgdna/examples/oxDNA/ and /oxDNA2/. Python setup
tools which create single straight or helical DNA strands as
well as DNA duplexes or arrays of duplexes can be found in
/examples/USER/cgdna/util/. A technical report with more information
on the models, the structure of the input and data file, the setup tool
and the performance of the LAMMPS-implementation of oxDNA can be found
in /doc/src/PDF/USER-CGDNA-overview.pdf.
@ -35,6 +39,7 @@ of the LAMMPS manual).
The creator of this package is:
Dr Oliver Henrich
University of Strathclyde, UK
University of Edinburgh, UK
ohenrich@ph.ed.ac.uk
o.henrich@epcc.ed.ac.uk
@ -45,6 +50,8 @@ o.henrich@epcc.ed.ac.uk
bond_oxdna_fene.cpp: backbone connectivity, a modified FENE potential
bond_oxdna2_fene.cpp: corresponding bond style in oxDNA2 (see [3])
** Pair styles provided by this package:
pair_oxdna_excv.cpp: excluded volume interaction between the nucleotides
@ -59,6 +66,13 @@ pair_oxdna_xstk.cpp: cross-stacking interaction between nucleotides
pair_oxdna_coaxstk.cpp: coaxial stacking interaction between nucleotides
pair_oxdna2_excv.cpp, pair_oxdna2_stk.cpp, pair_oxdna2_coaxstk.cpp:
corresponding pair styles in oxDNA2 (see [3])
pair_oxdna2_dh.cpp: Debye-Hueckel electrostatic interaction between backbone
sites
** Fixes provided by this package:
fix_nve_dotc_langevin.cpp: fix for Langevin-type rigid body integrator "C"

View File

@ -254,10 +254,9 @@ double FixHalt::tlimit()
bigint final = update->firststep +
static_cast<bigint> (tratio*value/cpu * elapsed);
nextstep = (final/nevery)*nevery + nevery;
if (nextstep == update->ntimestep) nextstep += nevery;
tratio = 1.0;
}
//printf("EVAL %ld %g %d\n",update->ntimestep,cpu,nevery);
return cpu;
}

View File

@ -1 +1 @@
#define LAMMPS_VERSION "28 Mar 2017"
#define LAMMPS_VERSION "31 Mar 2017"