alexxy/gromacs.git
11 years agoPlain text quotes.
David van der Spoel [Sat, 15 Dec 2012 10:11:43 +0000 (11:11 +0100)]
Plain text quotes.

And removed 5 gurgles and 2 bromacses - replaced the bromacses
by new and exciting ones.
Change-Id: Ibdad70d6ceb0caa52be351762704a677e9dddba8

11 years agofix invalid read in construct_vsites
Han Wang [Wed, 23 Jan 2013 21:02:22 +0000 (14:02 -0700)]
fix invalid read in construct_vsites

* aj is not available in the F_VSITEN case hence cannot be read in
  the common part of the function

Change-Id: Ic98dfb91eb095aea933abc3dbfb4f5cc10bf4166

11 years agoAdd fftpack to EXTRA_DIST
Roland Schulz [Sat, 19 Jan 2013 06:08:57 +0000 (01:08 -0500)]
Add fftpack to EXTRA_DIST

The new fftpack files added by 51c2f6c are only compiled if
fftpack is used. Thus "make dist" does not included those
by default.

Change-Id: Id51bba3c622a7087f35e74f7c499b066f095fd0d

11 years agoRelease 4.5.6
Roland Schulz [Sat, 19 Jan 2013 03:35:35 +0000 (22:35 -0500)]
Release 4.5.6

- Updated the version to 4.5.6 in CMakeLists.txt, configure.ac
  and gromacs.7
- Regenerated man-pages and completions

Change-Id: I7692220dfe20248b4cdbdd1ed242d1d97f56fda5

11 years agoFix reading of g96 title
Roland Schulz [Fri, 18 Jan 2013 06:25:50 +0000 (01:25 -0500)]
Fix reading of g96 title

Change-Id: I5b077ef2f581d704848b658c588636c7510d3c38

11 years agoMerge "Fix trjconv -sub with .trr files" into release-4-5-patches
Mark Abraham [Thu, 17 Jan 2013 21:10:40 +0000 (22:10 +0100)]
Merge "Fix trjconv -sub with .trr files" into release-4-5-patches

11 years agoMerge "Added check for valid wall_atomtype in .mdp" into release-4-5-patches
Roland Schulz [Thu, 17 Jan 2013 18:01:52 +0000 (19:01 +0100)]
Merge "Added check for valid wall_atomtype in .mdp" into release-4-5-patches

11 years agoFix trjconv -sub with .trr files
Mark Abraham [Tue, 15 Jan 2013 16:13:30 +0000 (17:13 +0100)]
Fix trjconv -sub with .trr files

ftp is set from the -o file's extension, which cannot be efTRN,
since that's a place-holder file type for command-line parsing.
The error text clearly indicates that .trr (== efTRR) should
work, but of course we have no tests for anything.

Added comment that other trajectory types could work here,
but can't be tested at this time.

Fixes #1118

Change-Id: I118b9b1c25fa7c0640c27e584400dfc64853e67f

11 years agoAdded check for valid wall_atomtype in .mdp
Mark Abraham [Tue, 15 Jan 2013 17:09:31 +0000 (18:09 +0100)]
Added check for valid wall_atomtype in .mdp

Otherwise, mdrun would dump core when the garbage got dereferenced.

Note that this does not need to be merged into release-4-6, because
c7a82654 already fixes it.

Fixes #700

Change-Id: I39f440595f7b112d4f01b5e32218ec45a2a97370

11 years agoMerge "Added fatal error for constraints + L-BFGS minimizer" into release-4-5-patches
Christoph Junghans [Tue, 15 Jan 2013 17:36:06 +0000 (18:36 +0100)]
Merge "Added fatal error for constraints + L-BFGS minimizer" into release-4-5-patches

11 years agoVelocity-verlet integrators and v-rescale are broken
Mark Abraham [Mon, 14 Jan 2013 22:48:20 +0000 (23:48 +0100)]
Velocity-verlet integrators and v-rescale are broken

Added fatal error and suggestion to upgrade GROMACS version.

Fixes #1000

Change-Id: I22653fafdfd0fb2f1fa772fbd95bc55fcf072d8c

11 years agoAdded fatal error for constraints + L-BFGS minimizer
Mark Abraham [Mon, 14 Jan 2013 23:36:53 +0000 (00:36 +0100)]
Added fatal error for constraints + L-BFGS minimizer

Refs #1053

Change-Id: I0fd609918927883fc9ec20d0599a48e396d81d94

11 years agoMerge "Fixing trjconv -sub" into release-4-5-patches
David van der Spoel [Mon, 14 Jan 2013 19:16:59 +0000 (20:16 +0100)]
Merge "Fixing trjconv -sub" into release-4-5-patches

11 years agoMerge "Noting that and why gmxdump -s -sys is broken" into release-4-5-patches
David van der Spoel [Mon, 14 Jan 2013 19:04:48 +0000 (20:04 +0100)]
Merge "Noting that and why gmxdump -s -sys is broken" into release-4-5-patches

11 years agoUpdated code checks with distance restraints
Mark Abraham [Sun, 13 Jan 2013 18:57:36 +0000 (05:57 +1100)]
Updated code checks with distance restraints

Ensemble-averaged distance restraints require -multi, and it is
also reasonable to do REMD with distance restraints, which also
requires -multi. So checks for the ensemble-averaging case need
to be more sensitive to their context.

In fact, ensemble-averaging is probably functional only with PD and
one processor per system, since that was probably all that was
available when it was built.

Fixes #613, refs #1117

Change-Id: Ia6f1bb4eb82eab3c7c249638cd3a5a5d1f707132

11 years agoFixing trjconv -sub
Mark Abraham [Wed, 3 Oct 2012 13:19:32 +0000 (23:19 +1000)]
Fixing trjconv -sub

The process of making code thread safe broke this.

Change-Id: Ie6617c00e52b09ea0eade2dcb0ae998e8ebf3cc4

11 years agoNoting that and why gmxdump -s -sys is broken
Mark Abraham [Sun, 13 Jan 2013 21:23:37 +0000 (22:23 +0100)]
Noting that and why gmxdump -s -sys is broken

Not worth fixing. You could pass a boolean from gmxdump
into the set_posres_params to avoid executing the
problematic line, but that would hit a lot of
other code paths that also call gmx_mtop_to_t_topology.

Refs #635

Change-Id: I308e59287dc578b95ea67c313867df3e75047fa4

11 years agoMerge "Print out atom numbers in g_rmsf" into release-4-5-patches
Roland Schulz [Mon, 7 Jan 2013 22:12:02 +0000 (23:12 +0100)]
Merge "Print out atom numbers in g_rmsf" into release-4-5-patches

11 years agoRemove superfluous memory allocation.
Teemu Murtola [Sun, 30 Dec 2012 06:34:14 +0000 (08:34 +0200)]
Remove superfluous memory allocation.

The next line allocates the memory again.

Fixes #918.

Change-Id: I6f727cf059ccdc5d407b8398b9b29db625c120b8

11 years agoMinor spelling&header fixes for various man pages
Nicholas Breen [Mon, 3 Dec 2012 20:30:34 +0000 (13:30 -0700)]
Minor spelling&header fixes for various man pages

see: http://patch-tracker.debian.org/patch/series/view/gromacs/4.5.5-2/31_manpages.patch

Change-Id: I813ed653b9b50125652fef5522a51304773414dc

11 years agoMerge "Use stat for gmx_is_file. Fix get_libdir with symlinks." into release-4-5...
Erik Lindahl [Mon, 26 Nov 2012 19:55:01 +0000 (20:55 +0100)]
Merge "Use stat for gmx_is_file. Fix get_libdir with symlinks." into release-4-5-patches

11 years agoFixes #1035 NaN in g_cluster output.
David van der Spoel [Mon, 26 Nov 2012 11:17:13 +0000 (12:17 +0100)]
Fixes #1035 NaN in g_cluster output.

Now always initializes the masses of the atoms to prevent
division by zero downstream.

Change-Id: I1b38ccc7982d4340ed068535f7b7dd8e75e1a4c4

11 years agoUse stat for gmx_is_file. Fix get_libdir with symlinks.
Roland Schulz [Sat, 24 Nov 2012 05:07:35 +0000 (00:07 -0500)]
Use stat for gmx_is_file. Fix get_libdir with symlinks.

In commit 4e057440520c1 I used lstat instead of stat confusing the
two. The commit tried to fix the misidentification of directories.
There is no need to distinquish between symlinks and files (and
thus break it if a binary is a symlink).

Change-Id: Ie964e826729a35f11516fb3d002ebc01cbb7a564

11 years agoMerge "Fixes bug in g_hbond that makes it produce fatal error." into release-4-5...
Christoph Junghans [Tue, 20 Nov 2012 16:27:31 +0000 (17:27 +0100)]
Merge "Fixes bug in g_hbond that makes it produce fatal error." into release-4-5-patches

11 years agoFixes bug in g_hbond that makes it produce fatal error.
David van der Spoel [Tue, 20 Nov 2012 10:58:18 +0000 (11:58 +0100)]
Fixes bug in g_hbond that makes it produce fatal error.

Rather than crashing with a range check error when there
are no hydrogen bonds the code now prints to stderr and
continues normally.

Change-Id: Idc9fddf8bfac9989bc1aa3a9c552b08580f99949

11 years agoFix CXX/C mismatch of flag/macro for gmxCFlags
Roland Schulz [Mon, 19 Nov 2012 21:44:15 +0000 (16:44 -0500)]
Fix CXX/C mismatch of flag/macro for gmxCFlags

Change-Id: Ieb87927e24688a29af284b46be3359bbc57d8891

11 years agoMade g_tune_pme work correctly when ir->init_step > 0
Carsten Kutzner [Tue, 6 Nov 2012 13:03:25 +0000 (14:03 +0100)]
Made g_tune_pme work correctly when ir->init_step > 0

For .tpr files with ir->init_step > 0, the benchmarks do not have the
correct number of steps. This fix sets init_step to zero for the benchmark .tpr
files but keeps the original init_step value for the launch .tpr file.
Benchmarking should now work correctly for .tpr files any init_step value,
regardless whether the .cpt file was provided to g_tune_pme or not.

Change-Id: I9d44647d4c71e1514709ee4d6477bd416f455f42

11 years agoSet HAVE_FSEEKO consistently in one place
Roland Schulz [Sat, 27 Oct 2012 08:08:46 +0000 (04:08 -0400)]
Set HAVE_FSEEKO consistently in one place

HAVE_FSEEKO was set in two places and the definition wasn't
consistent. Now only the one in gmxTestLargeFiles is used.
HAVE_FSEEKO is only used if it fully works and 64bit fseek is
available.

Change-Id: I5c8f837e414f1ddeab0de8148d5a9c91047116f8

11 years agoMerge "Fix large file support" into release-4-5-patches
Christoph Junghans [Sat, 27 Oct 2012 02:31:38 +0000 (04:31 +0200)]
Merge "Fix large file support" into release-4-5-patches

11 years agoMerge "Fixed Pulp Fiction quote" into release-4-5-patches
David van der Spoel [Fri, 26 Oct 2012 16:48:28 +0000 (18:48 +0200)]
Merge "Fixed Pulp Fiction quote" into release-4-5-patches

11 years agoFixed Bug #593 about memory hole in trjcat.
David van der Spoel [Sun, 21 Oct 2012 10:06:32 +0000 (12:06 +0200)]
Fixed Bug #593 about memory hole in trjcat.

Fixed by explicitly freeing memory for each frame. Tested to make
sure it does not crash.

Change-Id: Ic0e91b828a1e5a23f38690b4753092a31e6c4db4

11 years agoFix large file support
Roland Schulz [Fri, 19 Oct 2012 21:35:35 +0000 (17:35 -0400)]
Fix large file support

Variables containing flags need to be cached. Before config.h
was written correct on first run but rerunning cmake caused
flags to be ommited. Also fixed test program.

Change-Id: Id948c54766547a85ac84751762de3afba21ea576

11 years agoFixed Pulp Fiction quote
Roland Schulz [Wed, 17 Oct 2012 19:56:11 +0000 (15:56 -0400)]
Fixed Pulp Fiction quote

Fixes 1011

Change-Id: I40bfdca8906505a8a619c6ba2db924a50b830af5

11 years agoRemoved obsolete hint in error message.
Carsten Kutzner [Tue, 16 Oct 2012 11:11:37 +0000 (13:11 +0200)]
Removed obsolete hint in error message.

GMX_RESET_COUNTER was removed from the code a long time ago.

Change-Id: I2fb54995f1a6e211995ef0474bcdb36f5018550d

11 years agoPrint out atom numbers in g_rmsf
Manuel Luitz [Tue, 2 Oct 2012 14:44:11 +0000 (16:44 +0200)]
Print out atom numbers in g_rmsf

Reasonable output of g_rmsf would be the atom numbers
and not the group indices.

Fixes #893

Change-Id: I16a8e25f1934ef40952f24ffd5ab835acabfff72

11 years agoSet return value to FALSE (0) in estimate_dt in libxdrf.c
David van der Spoel [Wed, 3 Oct 2012 15:14:33 +0000 (17:14 +0200)]
Set return value to FALSE (0) in estimate_dt in libxdrf.c

To be on the safe side the function to estimate the time
step betwen frames was fixed such that the return value
bOK is always set even if the file was missing or empty.
In addition the function is made static since it is not
used outside the file.

Change-Id: I8706a23b7a198f9d0718f1bfcb4a7770b2e6e53c

11 years agoFix problems found by cppcheck 1.56
Roland Schulz [Sun, 30 Sep 2012 19:57:59 +0000 (15:57 -0400)]
Fix problems found by cppcheck 1.56

Doesn't fix all problems. New suppressions in Jenkins for 4.6
(so that I can upgrade without having to fix all):

  --suppress=uninitvar:src/gmxlib/md5.c --suppress=nullPointer:src/mdlib/mdebin_bar.c --suppress=nullPointer:src/gmxlib/oenv.c --suppress=nullPointer:src/gmxlib/selection/selhelp.c \
  --suppress=memleak:src/tools/levenmar.c --suppress=selfAssignment:src/gmxlib/nonbonded/nb_kernel_bluegene/* \
  --suppress=invalidPointerCast:src/gmxlib/checkpoint.c --suppress=invalidPointerCast:src/gmxlib/nonbonded/nb_kernel_sse2_single/* --suppress=invalidPointerCast:src/mdlib/fftpack.c \
  --suppress=obsoleteFunctionsusleep:*.c --suppress=obsoleteFunctionsctime_r:*.c --suppress=invalidPrintfArgType_sint:*.c invalidPrintfArgType_uint:*.c

The remaining nullPointer are false positives as far as I know.
Problems found in 4.6 (haven't run cppcheck on 4.5) but
applied to 4.5 because it is also affected.

Change-Id: I5c0b4bce52a0c9ff6ef4ba51721cdf5baff42814

11 years agoMerge "Fixed an off-by-one error in atom counting in gmx_dist." into release-4-5...
Christoph Junghans [Thu, 27 Sep 2012 20:13:40 +0000 (22:13 +0200)]
Merge "Fixed an off-by-one error in atom counting in gmx_dist." into release-4-5-patches

11 years agoMerge "Fix insolidangle selections near poles." into release-4-5-patches
Teemu Murtola [Thu, 27 Sep 2012 17:56:52 +0000 (19:56 +0200)]
Merge "Fix insolidangle selections near poles." into release-4-5-patches

11 years agoFixed an off-by-one error in atom counting in gmx_dist.
Sander Pronk [Wed, 26 Sep 2012 18:12:48 +0000 (20:12 +0200)]
Fixed an off-by-one error in atom counting in gmx_dist.

Replaced atom number in gmx_rmpbc with total number, so it can
accomodate distances between parts of molecules.

Change-Id: I6279c6ae6d61fd761c4d8d37a01c7d856742e6b8

11 years agoMerge "Fix REMD use of gmx_large_int_t for #steps variable" into release-4-5-patches
Christoph Junghans [Tue, 25 Sep 2012 01:45:03 +0000 (03:45 +0200)]
Merge "Fix REMD use of gmx_large_int_t for #steps variable" into release-4-5-patches

11 years agoAdd pdbname selection keyword.
Teemu Murtola [Mon, 24 Sep 2012 04:48:01 +0000 (07:48 +0300)]
Add pdbname selection keyword.

As a supporting change, remove trailing space from t_pdbinfo.atomnm, as
the trailing whitespace does not seem to be used anywhere.
This makes it possible to use it easily in the selection code.

Fixes #1007; fix backported from Iac36bda8.

Also includes changes from 8bddac3 to make the backport easier.

Change-Id: Iac36bda8a84d0a6c131445e7f47ad91d7209fb10

11 years agoFix REMD use of gmx_large_int_t for #steps variable
Mark Abraham [Mon, 24 Sep 2012 02:06:37 +0000 (12:06 +1000)]
Fix REMD use of gmx_large_int_t for #steps variable

Change-Id: I0a72a8b838de4d018c2715f9d620a86134969206

11 years agoFixes for numeric and position selection variables.
Teemu Murtola [Tue, 18 Sep 2012 05:11:47 +0000 (08:11 +0300)]
Fixes for numeric and position selection variables.

Fixed handling of numeric and position selection variables in cases
where they were referenced multiple times.

Backported from Ifbb585ca.

Fixes #1006.

Change-Id: Ieaa479b4b870e044dc269339be57f6b33533c46e

11 years agoFix insolidangle selections near poles.
Teemu Murtola [Fri, 14 Sep 2012 17:28:29 +0000 (20:28 +0300)]
Fix insolidangle selections near poles.

- Correctly treat cases where a point is so close the one of the poles
  that it completely covers one or more bins in the zenith angle
  direction.
- Adjust update_surface_bin() to be more robust to rounding errors and
  easier to understand by simplifying the code used for wrapping angles
  to [-pi, pi] interval.  Problems were triggered here by the first
  change.
- Update comments.

Fixes #1004.

Change-Id: I2707f775793fabb64ea197bdae5fbfe68d6a8933

11 years agoMerge "Fix some memory leaks." into release-4-5-patches
Kasson [Sat, 15 Sep 2012 15:04:38 +0000 (17:04 +0200)]
Merge "Fix some memory leaks." into release-4-5-patches

11 years agoMerge "Adapted NMR related data to new pdb format." into release-4-5-patches
David van der Spoel [Sat, 15 Sep 2012 12:52:22 +0000 (14:52 +0200)]
Merge "Adapted NMR related data to new pdb format." into release-4-5-patches

11 years agoMerge "fixed recent bug with grompp check for P-R P-coupling" into release-4-5-patches
Christoph Junghans [Fri, 14 Sep 2012 15:47:05 +0000 (17:47 +0200)]
Merge "fixed recent bug with grompp check for P-R P-coupling" into release-4-5-patches

11 years agofixed recent bug with grompp check for P-R P-coupling
Berk Hess [Thu, 13 Sep 2012 16:34:12 +0000 (18:34 +0200)]
fixed recent bug with grompp check for P-R P-coupling

Fix for recent commit 57dac834

Change-Id: I5bc631d6db848c8702a65c42ae27f096804abbf7

11 years agoBackport of md-vv rerun check from c7a82654f2eb8992
Roland Schulz [Thu, 13 Sep 2012 16:41:47 +0000 (12:41 -0400)]
Backport of md-vv rerun check from c7a82654f2eb8992

Rerun in parallel with md-vv is broken. The check was added
in c7a82654f2eb8992 but also affects 4.5.

Fixes #1003

Change-Id: Ie0e200a8328b2baecd2eba9eea1453c65a668633

11 years agoFix some memory leaks.
Teemu Murtola [Thu, 13 Sep 2012 04:20:42 +0000 (07:20 +0300)]
Fix some memory leaks.

Fixes part of #1004.

Change-Id: I22280999c5c3c40e8efae45461bd53bae8e2ff40

11 years agoCorrected REMD citation
Mark Abraham [Mon, 10 Sep 2012 09:52:22 +0000 (19:52 +1000)]
Corrected REMD citation

The Fukushima paper relates exclusively to MC and spin glasses.

Change-Id: I58c4eafbe41b0cbd1f3e4afac6f34458ed27eea2

11 years agoAdapted NMR related data to new pdb format.
David van der Spoel [Fri, 7 Sep 2012 19:13:22 +0000 (21:13 +0200)]
Adapted NMR related data to new pdb format.

Since gromacs had adopted the pdb output format to
some standard, the script to convert xplor files
with NMR restratints, such as can be downloaded from
the pdb do not work anymore. The script and accompanying
table have been updated to work with the new pdb format
and simultaneously the extra argument for a residue offset
has been removed. Now the script can be run like
xplor2gmx.pl conf.pdb < restraints.md > disre.itp

Change-Id: I7c3c8bd49b002e2bf0760f4226c913aa36d64611

11 years agoMerge "Fixed .g96 trajectory reading." into release-4-5-patches
Roland Schulz [Thu, 6 Sep 2012 17:04:48 +0000 (19:04 +0200)]
Merge "Fixed .g96 trajectory reading." into release-4-5-patches

11 years agoMade tutorial slightly less confusing.
David van der Spoel [Tue, 4 Sep 2012 13:27:57 +0000 (15:27 +0200)]
Made tutorial slightly less confusing.

Change-Id: Ief3132a54770e8b3c3b69b24b5582ba321ccc5fd

11 years agoFixed .g96 trajectory reading.
Sander Pronk [Mon, 3 Sep 2012 11:58:25 +0000 (13:58 +0200)]
Fixed .g96 trajectory reading.

The line variable in .g96 configuration reading can now be made
persistent - and is done so for reading .g96 trajectories.

This commit fixes #781

Change-Id: If2005a00bb925b41802c4b0dc92e66eb5635f22c

11 years agoMerge "Document correct comm_mode option" into release-4-5-patches
Kasson [Mon, 3 Sep 2012 10:53:57 +0000 (12:53 +0200)]
Merge "Document correct comm_mode option" into release-4-5-patches

11 years agoMerge "Improved pdb2gmx output" into release-4-5-patches
Kasson [Mon, 3 Sep 2012 10:51:40 +0000 (12:51 +0200)]
Merge "Improved pdb2gmx output" into release-4-5-patches

11 years agoFix stack error in grompp
Roland Schulz [Sun, 2 Sep 2012 16:26:22 +0000 (12:26 -0400)]
Fix stack error in grompp

vsiteatoms array was one to short

Fixes #997

Change-Id: I0897694dfc431a20bd1ebf769b24d09038d588b2

11 years agoImproved pdb2gmx output
Mark Abraham [Fri, 31 Aug 2012 03:43:29 +0000 (13:43 +1000)]
Improved pdb2gmx output

Now there is explicit feedback that pdb2gmx is starting generating
hydrogens and termini, which can help the user deduce that problems
lie with those databases, and not necessarily the residue topology
database.

Change-Id: Ie4100b8586d6389a6965ea8cb09eb24cc4e7d3d9

11 years agobug fix for pme.c MPI_COMM_NULL fix dcf8b67e
Berk Hess [Wed, 29 Aug 2012 16:00:08 +0000 (18:00 +0200)]
bug fix for pme.c MPI_COMM_NULL fix dcf8b67e

Change-Id: Idb233db1337bcb881041caec96572e5df6183e6e

11 years agoDocument correct comm_mode option
Mark Abraham [Tue, 28 Aug 2012 01:16:19 +0000 (11:16 +1000)]
Document correct comm_mode option

Change-Id: I18d9896c51d486dfcc52e4d15b052d65de91426d

11 years agoAdded PGLU entry in aminoacids.n.tdb for OPLS-AA.
Bogdan Iorga [Wed, 22 Aug 2012 16:30:26 +0000 (18:30 +0200)]
Added PGLU entry in aminoacids.n.tdb for OPLS-AA.

Previously, pdb2gmx would fail during terminus selection for this residue.

Change submitted initially on the master branch, then abandoned.
(https://gerrit.gromacs.org/#/c/1290/)

Fixes #804.

Change-Id: Ic810242dc65019858c0332d352ef1ba96d4662d6

11 years agoMerge "Fix coordinate is zero check in gmxcheck" into release-4-5-patches
Christoph Junghans [Mon, 20 Aug 2012 17:50:53 +0000 (19:50 +0200)]
Merge "Fix coordinate is zero check in gmxcheck" into release-4-5-patches

11 years agoFix coordinate is zero check in gmxcheck
Roland Schulz [Thu, 16 Aug 2012 23:50:15 +0000 (19:50 -0400)]
Fix coordinate is zero check in gmxcheck

Change-Id: I7504d235edc659b586d61243f3cbf72add2f92b2

11 years agoOptional computation of fluct. props in g_energy. Fixes #954
David van der Spoel [Thu, 16 Aug 2012 07:45:41 +0000 (09:45 +0200)]
Optional computation of fluct. props in g_energy. Fixes #954

Added a command line option -fluct_props to turn on the computation
of heat capacity etc. in g_energy. This prevents a warning message
from appearing on the screen each time the program is run.

Change-Id: I0cac44494ec5a366762d4d0a915146298d2ce1e0

11 years agoAdded TIP4P back into CHARMM27
Mark Abraham [Tue, 31 Jul 2012 01:05:19 +0000 (11:05 +1000)]
Added TIP4P back into CHARMM27

I think Par erroneously removed this in 73b6d636a

Change-Id: Ie9f64636b1b28030ec86248649acad343b7c9a76

11 years agofixed trjconv not writing velocities with cpt input
Berk Hess [Thu, 9 Aug 2012 12:25:24 +0000 (14:25 +0200)]
fixed trjconv not writing velocities with cpt input

Fixes #930

Change-Id: I554dd729484a4238620f2773b5c3b3672cab72ee

11 years agoMerge "fixed incorrect TPI results with dynamic box" into release-4-5-patches
Christoph Junghans [Tue, 7 Aug 2012 16:10:56 +0000 (18:10 +0200)]
Merge "fixed incorrect TPI results with dynamic box" into release-4-5-patches

11 years agoFixed essential dynamics / flooding group PBC serial
Carsten Kutzner [Tue, 7 Aug 2012 09:15:59 +0000 (11:15 +0200)]
Fixed essential dynamics / flooding group PBC serial

In former versions, the PBC representation of essential dynamics /
flooding group atoms could be incorrect in serial runs if the ED group
contained more than a single molecule. In multi-molecule cases, the required
steps to choose the correct PBC image in communicate_group_positions()
therefore need to be performed also in serial runs. Since the PBC representation
can only change in neigborsearching steps, we only need to check the
shifts then. In parallel, NS is signalled by the bUpdateShifts
variable, which is set in dd_make_local_ed_indices(). The latter
function is however not called in serial runs; but still we can pass
the bNS boolean to do_flood() to signal the NS status. For essential
dynamics, unfortunately, since do_edsam() is called from constrain(), there
is no information about the NS status at that point. Until someone
comes up with a better idea, we therefore do the PBC check in every step
in serial essential dynamics - the performance impact will be negligible
anyway.

Change-Id: I86336a5e34131bdeac7e28f35b1ccb633450e54e

11 years agofixed incorrect TPI results with dynamic box
Berk Hess [Mon, 6 Aug 2012 18:52:59 +0000 (20:52 +0200)]
fixed incorrect TPI results with dynamic box

TPI with a box in the -rerun file different from the tpr gave systematic
errors. In Gromacs 4.0 there was a minor error, but not systematic.
Now TPI with any box setup is fully correct. Fixes #799

Change-Id: I69279874c2d1192e63efa224a0f035d43e919e88

11 years agoMerge "Added comment in get_structure about which structures are included" into relea...
Christoph Junghans [Mon, 6 Aug 2012 17:18:50 +0000 (19:18 +0200)]
Merge "Added comment in get_structure about which structures are included" into release-4-5-patches

11 years agoFixed calculation of projection for STAR and/or SORI
Carsten Kutzner [Mon, 6 Aug 2012 13:45:08 +0000 (15:45 +0200)]
Fixed calculation of projection for STAR and/or SORI

Both for STAR and for SORI, if provided to make_edi, the
fit structure and the average structure can be the same
(in these cases the old code works fine), or one can do
the fit on another (possibly larger) part of the molecule.
In the latter case, STAR (or SORI) contains first the fit and
then the average structure (concatenated). Here, the fit has to
be performed using the fit structure while the projection(s) have
to be calculated using the average structure. This is now
taken care of by the 'avindex' index variable.

Change-Id: Id97235030f3394df2931e30249083ad439dbe791

11 years agoAdded comment in get_structure about which structures are included
Carsten Kutzner [Mon, 6 Aug 2012 12:26:53 +0000 (14:26 +0200)]
Added comment in get_structure about which structures are included

This patch just adds a comment and refactors natoms -> nav to better
clarify when we deal with the AVERAGE and when with the REFERENCE (fit)
structure. 'natoms' is not a good choice if we are talking about
the number of atoms in the average structure only.

Change-Id: I7025fb6ea59af0a7bcd7953a25abd09be0dd2979

11 years agoMerge "Fixed segv in essential dynamics module" into release-4-5-patches
Roland Schulz [Sat, 4 Aug 2012 18:12:18 +0000 (20:12 +0200)]
Merge "Fixed segv in essential dynamics module" into release-4-5-patches

11 years agoFixed segv in essential dynamics module
Carsten Kutzner [Thu, 2 Aug 2012 09:52:41 +0000 (11:52 +0200)]
Fixed segv in essential dynamics module

Change-Id: Ia5657a535e7e31d55bf2b310a20dfee2a5e3b7f4

11 years agoFix overlapping memcpy
Roland Schulz [Fri, 3 Aug 2012 02:02:09 +0000 (22:02 -0400)]
Fix overlapping memcpy

The memcpy were not neccessary.

Fixes #984

Change-Id: Iea1d34756444cba2493940ab3f2252e7c108323f

11 years agofixed DD charge group displacement error check
Berk Hess [Wed, 18 Jul 2012 12:36:01 +0000 (14:36 +0200)]
fixed DD charge group displacement error check

One of the two checks for large charge group displacement during
domain decomposition mixed the dimension index and the dimension.
The check was correct for decomposition in x, xy or xyz. Other setups
could lead to false positives and false negatives (unlikely).
Fixes #959

Change-Id: I9e38c43f931e6ca8149faae40f49f675a7ae9664

11 years agoAdding missing entries in programs.txt
Roland Schulz [Tue, 10 Jul 2012 16:32:05 +0000 (12:32 -0400)]
Adding missing entries in programs.txt

Change-Id: I3b7879fc93d9b3a7c5eed5f14825331a12589b25

11 years agoMerge "Fixed bug in sfactor.c that makes g_rdf -sq give wrong results." into release...
Christoph Junghans [Mon, 9 Jul 2012 23:44:01 +0000 (01:44 +0200)]
Merge "Fixed bug in sfactor.c that makes g_rdf -sq give wrong results." into release-4-5-patches

11 years agoFixed bug in sfactor.c that makes g_rdf -sq give wrong results.
Jochen Hub [Mon, 9 Jul 2012 19:46:02 +0000 (21:46 +0200)]
Fixed bug in sfactor.c that makes g_rdf -sq give wrong results.

The number of neutrons is not any more in sfactor.dat, but the
respective sscanf line in sfactor.c has still a placeholder for it.
Consequently, the Cromer-Mann parameter were read incorrectly.

I left the element n (for number of neurons) in gmx_structurefactors_t
for now, but the variable is at present not used.

Fixes Bug #919

Change-Id: I20a78b0b1cf4bf2271ba0ce8c785d900502d7656

11 years agoFix memory error with complex boolean selections.
Teemu Murtola [Fri, 22 Jun 2012 06:25:59 +0000 (09:25 +0300)]
Fix memory error with complex boolean selections.

Backported from dd3a102.

Conflicts:
src/gmxlib/selection/compiler.c

Fixes #968.

Change-Id: If92b5b1eb8cf6b3acb510ba43f64fc82b63ab82a

11 years agoBugfix for the segfault that occurs with g_hbond -hbm -contact.
Erik Marklund [Fri, 6 Jul 2012 07:32:32 +0000 (09:32 +0200)]
Bugfix for the segfault that occurs with g_hbond -hbm -contact.

Fixes #967

Change-Id: I23968ca45683b5867f919bf32e588058bd391c67

11 years agoFixed L-BFGS trajectory output.
Elton Carvalho [Thu, 28 Jun 2012 15:13:03 +0000 (17:13 +0200)]
Fixed L-BFGS trajectory output.

This bug made mdrun ignore nstxout and nstfout when running l_bfgs.
When calling write_traj, MDOF_X|MDOF_F was given as mdof_flags to write
the trajetory, thus ignoring do_x and do_f evaluated on the previous
lines.

Fixes #905.

Change-Id: Id3ff7b090efd23fd28d8c27ea99992d1647f1ed6

11 years agofixed segv/hang with EM and foreign lambda values
Berk Hess [Mon, 25 Jun 2012 09:39:03 +0000 (11:39 +0200)]
fixed segv/hang with EM and foreign lambda values

Energy minimization with nstcalcenergy=-1, foreign lambda values
and no separate dhdl.xvg output file called malloc with negative count.
Fixes #962

Change-Id: I3d6b636ddba80fc2ae400590c48642c217325293

11 years agoFixes #961 - Shake reports wrong error
David van der Spoel [Thu, 21 Jun 2012 16:14:33 +0000 (18:14 +0200)]
Fixes #961 - Shake reports wrong error

The constraint index reported by shake was off by 1.

Change-Id: I6f4d0c013b30f5963fb312b41fb87e90e6314619

11 years agoCorrect normalization for HB-contact c-correlation.
Erik Marklund [Wed, 20 Jun 2012 11:23:12 +0000 (13:23 +0200)]
Correct normalization for HB-contact c-correlation.

Fixes #960

Change-Id: I391dd84fd38e784ac6c311dd913284de47d6a93d

11 years agoMerge "Fixes #882 - looping bug in trxio.c" into release-4-5-patches
Mark Abraham [Tue, 19 Jun 2012 23:12:18 +0000 (01:12 +0200)]
Merge "Fixes #882 -  looping bug in trxio.c" into release-4-5-patches

11 years agoMerge "Quiet linker on BlueGene" into release-4-5-patches
Christoph Junghans [Tue, 19 Jun 2012 22:46:12 +0000 (00:46 +0200)]
Merge "Quiet linker on BlueGene" into release-4-5-patches

11 years agoMerge "Fix g_lie counting last frame twice" into release-4-5-patches
Christoph Junghans [Mon, 18 Jun 2012 21:32:22 +0000 (23:32 +0200)]
Merge "Fix g_lie counting last frame twice" into release-4-5-patches

11 years agoFixes #882 - looping bug in trxio.c
David van der Spoel [Fri, 15 Jun 2012 11:47:07 +0000 (13:47 +0200)]
Fixes #882 -  looping bug in trxio.c

This led to infinite output files in the case of a corrupt
input file.

Change-Id: I25d61752d901012e9ce5e6adae1679c2ef99467a

11 years agoQuiet linker on BlueGene
Mark Abraham [Tue, 5 Jun 2012 04:08:29 +0000 (14:08 +1000)]
Quiet linker on BlueGene

Change-Id: Ib105a93ca233c763d3b6caf3c3c636a673078986

11 years agoMakes g_hbond -contact work
Erik Marklund [Fri, 8 Jun 2012 23:36:53 +0000 (01:36 +0200)]
Makes g_hbond -contact work

Fixes #955

Change-Id: I5d421d5f2e25d3801497efccb291425f90480a8c

11 years agoFix g_lie counting last frame twice
Mark Abraham [Fri, 15 Jun 2012 07:46:26 +0000 (17:46 +1000)]
Fix g_lie counting last frame twice

Change-Id: Ia1c37e79843cd0e10d5e8444d004c7aca9cce87a

11 years agoMerge "Work around failure of endianness testing on BlueGene" into release-4-5-patches
Christoph Junghans [Fri, 15 Jun 2012 00:16:37 +0000 (02:16 +0200)]
Merge "Work around failure of endianness testing on BlueGene" into release-4-5-patches

11 years agoMerge "Made mdrun more verbose about PME split" into release-4-5-patches
Roland Schulz [Thu, 14 Jun 2012 14:14:49 +0000 (16:14 +0200)]
Merge "Made mdrun more verbose about PME split" into release-4-5-patches

11 years agoSmall fix for g_tune_pme
Carsten Kutzner [Thu, 24 May 2012 13:18:11 +0000 (15:18 +0200)]
Small fix for g_tune_pme

Change-Id: I12fd2e48dc409f87b270f1ddaaaf2d1a83683fd1

11 years agoMerge "Added more suggested strategies to error message" into release-4-5-patches
Christoph Junghans [Fri, 8 Jun 2012 15:45:24 +0000 (17:45 +0200)]
Merge "Added more suggested strategies to error message" into release-4-5-patches

11 years agoWork around failure of endianness testing on BlueGene
Mark Abraham [Wed, 6 Jun 2012 11:52:41 +0000 (21:52 +1000)]
Work around failure of endianness testing on BlueGene

Refs #944

Change-Id: I4bbfe9865800bbe4e407a88cdecec6678d56f3b4

11 years agoFix endian test functionality
Mark Abraham [Wed, 6 Jun 2012 10:15:58 +0000 (20:15 +1000)]
Fix endian test functionality

Code for big-endian systems was silently failing with CMake. This
patch brings CMake and autotools into agreement.

Partial fix of #944
Change-Id: I1f14938fd23e926e05397977963fbf968f0406e0