alexxy/gromacs.git
12 years agoCorrected fourierspacing description
Szilard Pall [Thu, 26 Apr 2012 11:54:37 +0000 (13:54 +0200)]
Corrected fourierspacing description

Change-Id: I5cb577f0750cea3481f766330096d5b2bca7eb6f

12 years agoMerge "fixed initial COM motion removal with multiple groups" into release-4-5-patches
Szilárd Páll [Thu, 26 Apr 2012 11:48:42 +0000 (13:48 +0200)]
Merge "fixed initial COM motion removal with multiple groups" into release-4-5-patches

12 years agoMerge "Various improvements to shell code" into release-4-5-patches
David van der Spoel [Thu, 26 Apr 2012 07:05:10 +0000 (09:05 +0200)]
Merge "Various improvements to shell code" into release-4-5-patches

12 years agofixed initial COM motion removal with multiple groups
Berk Hess [Thu, 19 Apr 2012 13:49:22 +0000 (15:49 +0200)]
fixed initial COM motion removal with multiple groups

Seperate COM motion removal code before step 0 has been replaced by
a call to the normal vcm code. This require some cglo flag changes.
Fixes #925

Change-Id: Ia6b8637b133c343c7e503307f00b557f7ad7409c

12 years agoMerge "allow -append to overrule unsupported file locking" into release-4-5-patches
Berk Hess [Tue, 24 Apr 2012 11:35:33 +0000 (13:35 +0200)]
Merge "allow -append to overrule unsupported file locking" into release-4-5-patches

12 years agoVarious improvements to shell code
Mark Abraham [Wed, 18 Apr 2012 16:07:16 +0000 (02:07 +1000)]
Various improvements to shell code

Tested for binary equality only when appropriate. Increased verbosity
of error message. Clarified code that interpolates a scale factor for
a steepest-descent step size.

Change-Id: Ia386390e3a1b7690bf446342e55a3559da1e67eb

12 years agofixed segfault in graph code with coordinate subsets
Berk Hess [Wed, 18 Apr 2012 11:23:42 +0000 (13:23 +0200)]
fixed segfault in graph code with coordinate subsets

The graph code checked for atom indices above the subset size,
but not for settle. The check for settle has been added.
Fixes #809

Change-Id: I67ddbd3dab5a34f57a29f54f4b07918a6d74c38c

12 years agoallow -append to overrule unsupported file locking
Berk Hess [Wed, 18 Apr 2012 08:28:54 +0000 (10:28 +0200)]
allow -append to overrule unsupported file locking

This is a change to the previous change to let mdrun append anyhow
when file locking is not supported. Now a fatal error is generated,
unless -append is specified explicitly.
This commit refs #924

Change-Id: I98fa201fb5bd62c0de58c3c2d7e17e8b3f727c2f

12 years agoadded missing #ifdef around #include "thread_mpi.h"
Szilard Pall [Tue, 17 Apr 2012 22:56:56 +0000 (00:56 +0200)]
added missing #ifdef around #include "thread_mpi.h"

Due to the the missing #ifdef mdrun was not compiling with compilers
that don't like thread_mpi.h (e.g. Cray compiler).

Change-Id: Ibf980b46aaf56b81fffec5ada7cb3d93492a2220

12 years agochanged mdrun file locking not supported error to a note
Berk Hess [Tue, 17 Apr 2012 15:08:27 +0000 (17:08 +0200)]
changed mdrun file locking not supported error to a note

On some (file) systems file locking is not supported.
This should not prevent users from using the append option of mdrun,
Fixes #924

Change-Id: I99c0d38eb702b316df0027df3d33befc562a0a7a

12 years agoMerge "Permit threads build on Cygwin" into release-4-5-patches
Sander Pronk [Mon, 16 Apr 2012 11:31:27 +0000 (13:31 +0200)]
Merge "Permit threads build on Cygwin" into release-4-5-patches

12 years agoMerge "Clarified warning message" into release-4-5-patches
Teemu Murtola [Sat, 14 Apr 2012 16:29:20 +0000 (18:29 +0200)]
Merge "Clarified warning message" into release-4-5-patches

12 years agoMerge "Clarified warning string" into release-4-5-patches
Teemu Murtola [Sat, 14 Apr 2012 16:28:32 +0000 (18:28 +0200)]
Merge "Clarified warning string" into release-4-5-patches

12 years agoDescribed default output behaviour
Mark Abraham [Sat, 14 Apr 2012 15:58:01 +0000 (01:58 +1000)]
Described default output behaviour

Change-Id: I62d48961277255192d2f1709fbb992e0673337c8

12 years agoClarified warning message
Mark Abraham [Sat, 14 Apr 2012 15:53:46 +0000 (01:53 +1000)]
Clarified warning message

Change-Id: I6fb5ba3cc42604e2445b4cb48093227478e6a613

12 years agoClarified warning string
Mark Abraham [Sat, 14 Apr 2012 15:47:07 +0000 (01:47 +1000)]
Clarified warning string

Change-Id: I65d422d342b946a548e9a29234d1803a13b1a9f0

12 years agoRead PDB information in read_tps_conf().
Teemu Murtola [Thu, 12 Apr 2012 18:45:51 +0000 (21:45 +0300)]
Read PDB information in read_tps_conf().

Fixes #916.

Change-Id: Iaa2bed444b632b4596c6a4e9a4c527a6bc0236b8

12 years agoFix that directory is not mistaken for binary
Roland Schulz [Sat, 31 Mar 2012 22:16:51 +0000 (18:16 -0400)]
Fix that directory is not mistaken for binary

The smart searching for the library path searched for an existing
inode with the name of the binary. If a directory with that name
existed, it was mistaken for the binary.

E.g.:
$ mkdir pdb2gmx
$ pdb2gmx
Fatal error:
No force fields found

This patch replaces gmx_fexist with gmx_is_file which checks that
the inode with the name of the binary is not a directory.

Change-Id: I78cdf8136db9ed69b75dcb1d4d0582ab388ef1d8

12 years agoMade g_helix sensitive to CHARMM atom naming
Mark Abraham [Tue, 10 Apr 2012 01:37:03 +0000 (11:37 +1000)]
Made g_helix sensitive to CHARMM atom naming

Peptide N-H atoms named HN in CHARMM were not recognized as backbone
atoms.

Fixes #896

Change-Id: I205b8dc5c895f20e6cde61ee2a1640fc6414b030

12 years agoPermit threads build on Cygwin
Mark Abraham [Tue, 10 Apr 2012 00:55:41 +0000 (10:55 +1000)]
Permit threads build on Cygwin

Fixes #833
Change-Id: I1429629417132c164e9b017721c0035583d7d6bf

12 years agoMerge "Documentation and error message enhancements" into release-4-5-patches
Christoph Junghans [Mon, 9 Apr 2012 22:06:27 +0000 (00:06 +0200)]
Merge "Documentation and error message enhancements" into release-4-5-patches

12 years agoDocumentation and error message enhancements
Mark Abraham [Mon, 9 Apr 2012 19:15:37 +0000 (05:15 +1000)]
Documentation and error message enhancements

Change-Id: I4282e37c6b070607351cdafba56441b43fb04cd1

12 years agoLots of manual updates
Mark Abraham [Fri, 6 Apr 2012 04:57:19 +0000 (14:57 +1000)]
Lots of manual updates

Accompanies changes in the manual project

Change-Id: I4c64d660f2a0dc2c265efb2f983d4ffbaf432fd4

12 years agoMerge "Consolidated documentation of .mdp restraint options" into release-4-5-patches
Christoph Junghans [Mon, 9 Apr 2012 17:05:27 +0000 (19:05 +0200)]
Merge "Consolidated documentation of .mdp restraint options" into release-4-5-patches

12 years agoConsolidated documentation of .mdp restraint options
Mark Abraham [Thu, 5 Apr 2012 06:24:09 +0000 (16:24 +1000)]
Consolidated documentation of .mdp restraint options

Change-Id: I04164a0e9a36338c5e412cdf73da78ef58299920

12 years agoFix domain decomposition setup for >46k cores
Roland Schulz [Fri, 6 Apr 2012 01:09:15 +0000 (21:09 -0400)]
Fix domain decomposition setup for >46k cores

Fixing int overflow in line 701:
  ldiv*ldiv*ldiv > nnodes_div*nnodes_div

Change-Id: Ic97960caededeee255e874b81d9bbd2fc71d2ae6

12 years agoMerge "Fixes problems with g_msd and g_energy" into release-4-5-patches
Roland Schulz [Tue, 3 Apr 2012 16:45:46 +0000 (18:45 +0200)]
Merge "Fixes problems with g_msd and g_energy" into release-4-5-patches

12 years agoFixes problems with g_msd and g_energy
Michael Shirts [Fri, 30 Mar 2012 18:05:59 +0000 (14:05 -0400)]
Fixes problems with g_msd and g_energy

* Fixes a problem where g_msd will stall on reading a file
  with xy periodic boxes.

* Fixes a problem with gmx_energy ignoring the -skip option.
  Was correct in 4.0.7, but was wrong by 4.5.5. Redmine issue #910

Change-Id: I4247a4bd1cf1ab15ea6157646c97452216a887aa

12 years agoMerge "Improved pdb2gmx error message" into release-4-5-patches
David van der Spoel [Mon, 2 Apr 2012 18:02:36 +0000 (20:02 +0200)]
Merge "Improved pdb2gmx error message" into release-4-5-patches

12 years agoImproved pdb2gmx error message
Mark Abraham [Mon, 2 Apr 2012 07:04:45 +0000 (17:04 +1000)]
Improved pdb2gmx error message

Increased the extent to which pdb2gmx makes use of the encapsulation
available with the t_atoms struct. Now the function that writes the
error message has an easier time being more descriptive of what
is wrong when the atoms in the input coordinate file do not match
those of the .rtp entry.

Change-Id: Ie39dea18efa358f90decad6491ddc04e3756ac39

12 years agoKeep CMake quiet about a Cygwin issue
Mark Abraham [Mon, 2 Apr 2012 06:56:54 +0000 (16:56 +1000)]
Keep CMake quiet about a Cygwin issue

The CMake warning that is suppressed by this does not affect GROMACS
builds.

Change-Id: I6a19f55868b6363cb2be328286b4716659cc270b

12 years agoadded correction for PME virial with non-linear virtual sites
Berk Hess [Tue, 27 Mar 2012 11:35:13 +0000 (13:35 +0200)]
added correction for PME virial with non-linear virtual sites

With non-linear virtual site constructs the virial nees to be corrected
when it is not calculated from the particle coordinates and masses.
Currently this is only a problem for the PME mesh contribution.
This would lead to an incorrect virial and pressure. The error was small
for unordered systems, but could be significant for e.g. an all-atom
bilayer with hydrogens replaced by virtual sites. Fixes #908

Change-Id: I27a06019aa09734a14f3630ef296aaaacb9c5f0b

12 years agofixed g_bar xvg reading issue
Berk Hess [Fri, 23 Mar 2012 13:58:36 +0000 (14:58 +0100)]
fixed g_bar xvg reading issue

Due to a comparison between temperatures in single and double precision
g_bar could give a fatal error when processing xvg files.

Change-Id: Ie63187261b3f20f8e241bf606cc9f23fdd93ec2b

12 years agoMerge "Warnings against equilibrating with P-R P-coupling" into release-4-5-patches
Christoph Junghans [Sun, 18 Mar 2012 20:06:35 +0000 (21:06 +0100)]
Merge "Warnings against equilibrating with P-R P-coupling" into release-4-5-patches

12 years agoMerge "Fix typo in Clang CFlags" into release-4-5-patches
David van der Spoel [Sun, 18 Mar 2012 11:30:31 +0000 (12:30 +0100)]
Merge "Fix typo in Clang CFlags" into release-4-5-patches

12 years agoWarnings against equilibrating with P-R P-coupling
Mark Abraham [Wed, 14 Mar 2012 12:38:12 +0000 (23:38 +1100)]
Warnings against equilibrating with P-R P-coupling

Hopefully this will inhibit some people from doing Parrinello-Rahman
pressure coupling during their equilibration stage. If there's a
legitimate reason for P-R to have volume changes greater than 1%
we can reconsider the verbosity and/or frequency of the warning.

Change-Id: Icaeafa2fad37dfaa4b63ba69be3a3f804d957e7c

12 years agofixed increasing memory usage with SHAKE and DD
Berk Hess [Sat, 17 Mar 2012 20:46:06 +0000 (21:46 +0100)]
fixed increasing memory usage with SHAKE and DD

With domain decompostion SHAKE would be reinitialized every DD step.
This is now only done at initialization. Fixes #899

Change-Id: I4bcb162fa97271f602c5733ba04c7314456fcfa4

12 years agoMerge "Clarified wording of documentation" into release-4-5-patches
Christoph Junghans [Thu, 15 Mar 2012 21:10:25 +0000 (22:10 +0100)]
Merge "Clarified wording of documentation" into release-4-5-patches

12 years agoClarified wording of documentation
Mark Abraham [Thu, 15 Mar 2012 01:27:06 +0000 (12:27 +1100)]
Clarified wording of documentation

Change-Id: I16df3e9db672f86396a22479563dc394035af5ce

12 years agoChanged cryptic error messages about disk quota
Mark Abraham [Wed, 14 Mar 2012 06:08:20 +0000 (17:08 +1100)]
Changed cryptic error messages about disk quota

People who have never had a disk quota don't understand what "out
of quota" could possibly mean. They understand running out of
disk space much more often.

Change-Id: I988cd038e74cf4e914075a748f9f66038ab37882

12 years agoMerge "More editorial fixes to tool documentation" into release-4-5-patches
Christoph Junghans [Mon, 12 Mar 2012 17:03:22 +0000 (18:03 +0100)]
Merge "More editorial fixes to tool documentation" into release-4-5-patches

12 years agoMerge "Made description string for g_select -select clearer" into release-4-5-patches
Teemu Murtola [Mon, 12 Mar 2012 09:36:48 +0000 (10:36 +0100)]
Merge "Made description string for g_select -select clearer" into release-4-5-patches

12 years agoFix typo in Clang CFlags
Roland Schulz [Sat, 10 Mar 2012 00:30:16 +0000 (19:30 -0500)]
Fix typo in Clang CFlags

Change-Id: I4b03e585fd3f6f5d256478feef5038b2d7d13cba

12 years agoMerge "Improved cryptic error message" into release-4-5-patches
David van der Spoel [Fri, 9 Mar 2012 16:25:22 +0000 (17:25 +0100)]
Merge "Improved cryptic error message" into release-4-5-patches

12 years agoMerge "Improved warning note with DD and periodic molecules" into release-4-5-patches
Carsten Kutzner [Fri, 9 Mar 2012 09:10:17 +0000 (10:10 +0100)]
Merge "Improved warning note with DD and periodic molecules" into release-4-5-patches

12 years agoMore editorial fixes to tool documentation
Mark Abraham [Fri, 9 Mar 2012 06:03:47 +0000 (17:03 +1100)]
More editorial fixes to tool documentation

Needed to add better treatment of <averages> and
|magnitudes| for LaTeX versions.

Change-Id: I5e8e3a8d685715af38117a762327d41a8bedf391

12 years agoEditorial changes to tools documentation
Mark Abraham [Fri, 9 Mar 2012 02:22:22 +0000 (13:22 +1100)]
Editorial changes to tools documentation

Made LaTeX type-setting of maths in documentation of tools more
sophisticated, without changing the presentation of maths in
plain text mode.

Various spelling and typographical fixes also.

Change-Id: Ia0c13e1f2ba825911c6e0673af6b940aba9efa21

12 years agoImproved warning note with DD and periodic molecules
Mark Abraham [Thu, 8 Mar 2012 22:10:51 +0000 (09:10 +1100)]
Improved warning note with DD and periodic molecules

Change-Id: I3f7f201edcce1b70a360d0462e5103dfc144b2d7

12 years agoMade description string for g_select -select clearer
Mark Abraham [Thu, 8 Mar 2012 22:07:53 +0000 (09:07 +1100)]
Made description string for g_select -select clearer

New UNIX users wouldn't guess they had to enclose the selection
string in quotes to get around their shell.

Change-Id: I8dd7fdd237e4290ad830a168b4880739aa5dc425

12 years agoImproved cryptic error message
Mark Abraham [Thu, 8 Mar 2012 22:04:35 +0000 (09:04 +1100)]
Improved cryptic error message

Change-Id: Idd3f7a9ce36e155c61009b16da9a1f2b1a98e93e

12 years agoMerge "Minimal support for Clang" into release-4-5-patches
David van der Spoel [Thu, 8 Mar 2012 07:28:30 +0000 (08:28 +0100)]
Merge "Minimal support for Clang" into release-4-5-patches

12 years agofixed g_anaeig incorrect multiple extremes, fixes #870
Berk Hess [Mon, 5 Mar 2012 11:18:58 +0000 (12:18 +0100)]
fixed g_anaeig incorrect multiple extremes, fixes #870

Change-Id: Id06f267c1da300f2a940778833ec35b85fecd3f1

12 years agoadded check for mass-weighting with g_anaeig -entropy, fixes #785
Berk Hess [Mon, 5 Mar 2012 10:57:22 +0000 (11:57 +0100)]
added check for mass-weighting with g_anaeig -entropy, fixes #785

Change-Id: I7a1623ba7a7c7987078901876fb4717d8c0a7261

12 years agoremoved initial temperature with OpenMM, fixes #757
Berk Hess [Mon, 5 Mar 2012 10:43:48 +0000 (11:43 +0100)]
removed initial temperature with OpenMM, fixes #757

Change-Id: Ifc661ce3ece3dfcd2e4bad862392b96d64e70c18

12 years agoMinimal support for Clang
Roland Schulz [Sat, 3 Mar 2012 20:16:03 +0000 (15:16 -0500)]
Minimal support for Clang

Change-Id: I4c6fb22ef8b5d596527eb8fe0991c3c573be606c

12 years agofixed array index out of bounds in EM force trr storage
Berk Hess [Mon, 27 Feb 2012 14:05:25 +0000 (15:05 +0100)]
fixed array index out of bounds in EM force trr storage

The partially implemented force copy was a leftover from a different way
of copying, which should never have been committed.

Change-Id: I026aa79158afcc327185f2f0cf6167d040eccede

12 years agoMerge "Minor formatting fixes to .mdp option documentation" into release-4-5-patches
David van der Spoel [Sat, 25 Feb 2012 13:36:54 +0000 (14:36 +0100)]
Merge "Minor formatting fixes to .mdp option documentation" into release-4-5-patches

12 years agoMinor formatting fixes to .mdp option documentation
Mark Abraham [Fri, 24 Feb 2012 00:29:21 +0000 (11:29 +1100)]
Minor formatting fixes to .mdp option documentation

Change-Id: I71762463880e4cb650f680a2ed83125e450f003a

12 years agoFix pdb2gmx -cmap in corner cases
Mark Abraham [Tue, 21 Feb 2012 06:03:39 +0000 (17:03 +1100)]
Fix pdb2gmx -cmap in corner cases

CMAP torsions are only generated when the atoms are from the same chain
(pdb2gmx -merge allows multiple chains to be present in the
moleculetype), and their residues are in residuetypes.dat as
"Protein".

Fixes #800, #885

Change-Id: Idc4f9a867beedc0be6a4c153606c0731eec86f5f

12 years agoFixed ABI warning for thread_mpi on gcc 4.6 for x86.
Sander Pronk [Wed, 22 Feb 2012 08:01:19 +0000 (09:01 +0100)]
Fixed ABI warning for thread_mpi on gcc 4.6 for x86.

Atomic operation data structures are now padded to the size of a cache
line instead of aligned to the start of a cache line. This works just
as well, but eliminates a warning in gcc 4.6.

Change-Id: I8d00778dcfea41cdb518b083a9c0732e8d978c66

12 years agoMerge "Use Git server (mirror) to avoid fetching problems" into release-4-5-patches
Teemu Murtola [Tue, 21 Feb 2012 18:52:10 +0000 (19:52 +0100)]
Merge "Use Git server (mirror) to avoid fetching problems" into release-4-5-patches

12 years agoUse Git server (mirror) to avoid fetching problems
Roland Schulz [Tue, 21 Feb 2012 04:37:26 +0000 (23:37 -0500)]
Use Git server (mirror) to avoid fetching problems

Change-Id: I144082bd01cf6a5f0583feac0e7877e8e1b163ff

12 years agoFixed an allocation issue with dH histograms.
Sander Pronk [Mon, 13 Feb 2012 17:28:56 +0000 (18:28 +0100)]
Fixed an allocation issue with dH histograms.

Change-Id: Ifc6ed94d77664e3b3afb7fe8dbd1016444d86bc3

12 years agoMerge changes If0c2f9d9,Ic2a8ad82 into release-4-5-patches
Szilárd Páll [Sat, 11 Feb 2012 16:45:25 +0000 (17:45 +0100)]
Merge changes If0c2f9d9,Ic2a8ad82 into release-4-5-patches

* changes:
  Fixed g_sham using more than three dimensions
  Integer multiplication that checks for overflow

12 years agoFixed g_sham using more than three dimensions
Mark Abraham [Thu, 9 Feb 2012 02:48:35 +0000 (13:48 +1100)]
Fixed g_sham using more than three dimensions

When the value given with g_sham -n was greater than 3, arrays used to
overflow and pick_minima() did not work. pick_minima() has been updated
to treat an arbitrary number of dimensions, but retains the particular
code for the two- and three-dimensional cases in the hope that these
are faster. The logic of the complex conditionals has hopefully been
made easier to follow without compromising performance with modern
compilers. Index variables are now of gmx_large_int_t type, as
high-dimensional cases can have large numbers of grid points very fast.

Change-Id: If0c2f9d9ceaf2b5c4c8b1a28a942fae8349fb600

12 years agoInteger multiplication that checks for overflow
Mark Abraham [Fri, 10 Feb 2012 04:10:34 +0000 (15:10 +1100)]
Integer multiplication that checks for overflow

Integer multiplication overflows silently in C, and sometimes we need to
know when it would. For example, when computing the size of
multi-dimensional arrays, we can need to manage the case when the number
of dimensions and their size is too large to represent in the available
type.

Change-Id: Ic2a8ad820838cf314bb985511e483fc397ba35e2

12 years agoMerge "Fixed bug with COM motion removal on part of the system" into release-4-5...
Christoph Junghans [Fri, 10 Feb 2012 01:14:01 +0000 (02:14 +0100)]
Merge "Fixed bug with COM motion removal on part of the system" into release-4-5-patches

12 years agoFixed bug with COM motion removal on part of the system
Berk Hess [Mon, 6 Feb 2012 18:57:50 +0000 (19:57 +0100)]
Fixed bug with COM motion removal on part of the system

Center of mass motion removal on one group (not multiple) which is only part
of system would result in a tpr file with COM removal on the whole system.
Fixes #881

Change-Id: I181427bcad237045060000908f2c28d6e97c1ea4

12 years agoFix ICC on Windows Build
Roland Schulz [Sat, 4 Feb 2012 20:18:24 +0000 (15:18 -0500)]
Fix ICC on Windows Build

Fix NASM with NMake Generator

The workaround in parser.y may not be necessary any longer when this is
merged into master.

Change-Id: I810eec3fa4a13fd912da3832279e8ab47a62bdec

12 years agoMerge "Append all ICC Performance flags only to Release Flags" into release-4-5-patches
Szilárd Páll [Thu, 2 Feb 2012 23:04:07 +0000 (00:04 +0100)]
Merge "Append all ICC Performance flags only to Release Flags" into release-4-5-patches

12 years agoMerge "Revert "Fix ICC on Windows Build"" into release-4-5-patches
Teemu Murtola [Thu, 2 Feb 2012 16:10:18 +0000 (17:10 +0100)]
Merge "Revert "Fix ICC on Windows Build"" into release-4-5-patches

12 years agoMerge "Fixed error message to identify the correct file" into release-4-5-patches
David van der Spoel [Wed, 1 Feb 2012 08:10:58 +0000 (09:10 +0100)]
Merge "Fixed error message to identify the correct file" into release-4-5-patches

12 years agoMerge "Fixed trjconv -sub" into release-4-5-patches
David van der Spoel [Wed, 1 Feb 2012 07:58:54 +0000 (08:58 +0100)]
Merge "Fixed trjconv -sub" into release-4-5-patches

12 years agoMerge "Improved error message" into release-4-5-patches
David van der Spoel [Wed, 1 Feb 2012 07:57:14 +0000 (08:57 +0100)]
Merge "Improved error message" into release-4-5-patches

12 years agoFixed trjconv -sub
Mark Abraham [Wed, 1 Feb 2012 05:57:08 +0000 (16:57 +1100)]
Fixed trjconv -sub

If the index group contains 1..100, then clust->maxframe == 99,
and thus when frame == clust->maxframe it should be included
in the cluster.

Change-Id: I6e093d9f76d0952b31ea9ee1516bade9e9b4419b

12 years agoFixed error message to identify the correct file
Mark Abraham [Wed, 1 Feb 2012 04:45:41 +0000 (15:45 +1100)]
Fixed error message to identify the correct file

When a frame exists, that file has *not* run out of frames.

Change-Id: Ief52d5a17ef73ab318f6d8e00d1f5acb71b69f52

12 years agoMerge "Fix signed/unsigned warnings" into release-4-5-patches
Christoph Junghans [Wed, 1 Feb 2012 04:52:29 +0000 (05:52 +0100)]
Merge "Fix signed/unsigned warnings" into release-4-5-patches

12 years agoImproved error message
Mark Abraham [Tue, 31 Jan 2012 13:43:18 +0000 (00:43 +1100)]
Improved error message

Users would be confused by "Atom N3 is used in an interaction of
type atom in the topology database..." so when "atom" is the
bondtype we don't mention the fact.

Also changed variable name from bDontQuit to bAllowMissing for
consistency with variable names used in pdb2gmx when calling
this code.

Change-Id: Ie8cb3ba64f39d3746b470fa6ae44f5a6f4b6a16c

12 years agoRevert "Fix ICC on Windows Build"
Roland Schulz [Tue, 31 Jan 2012 23:47:52 +0000 (00:47 +0100)]
Revert "Fix ICC on Windows Build"

This reverts commit e8e495fe4317c2e489acb4e82e004afdac618e92

12 years agoAppend all ICC Performance flags only to Release Flags
Roland Schulz [Tue, 31 Jan 2012 11:01:29 +0000 (06:01 -0500)]
Append all ICC Performance flags only to Release Flags

Some of the ICC performance flags were appended to GMXC_CFLAGS
and thus also used e.g. for Debug.

Change-Id: Iadfaa29fb347f24208e6f2406e0d1ad41f037804

12 years agoMerge "Fix ICC on Windows Build" into release-4-5-patches
David van der Spoel [Tue, 31 Jan 2012 18:38:42 +0000 (19:38 +0100)]
Merge "Fix ICC on Windows Build" into release-4-5-patches

12 years agoMerge "Corrected use of ?: in conditional" into release-4-5-patches
Mark Abraham [Tue, 31 Jan 2012 13:51:19 +0000 (14:51 +0100)]
Merge "Corrected use of ?: in conditional" into release-4-5-patches

12 years agoFix signed/unsigned warnings
Roland Schulz [Mon, 30 Jan 2012 07:34:03 +0000 (02:34 -0500)]
Fix signed/unsigned warnings

Change-Id: I3318f06f303a08068849d820381e99267543b4f5

12 years agoMade error message even more explicit
Mark Abraham [Tue, 31 Jan 2012 07:10:55 +0000 (18:10 +1100)]
Made error message even more explicit

Change-Id: Ib1f2e01ca24c5fb305fe220e34797d6991c3f080

12 years agoFix ICC on Windows Build
Roland Schulz [Mon, 30 Jan 2012 07:11:48 +0000 (02:11 -0500)]
Fix ICC on Windows Build

The workaround in parser.y may not be necessary any longer when this is
merged into master.

Change-Id: I48199b55ede5d786a69c41ab008ef3055101d3b0

12 years agoCorrected use of ?: in conditional
Mark Abraham [Tue, 31 Jan 2012 05:20:16 +0000 (16:20 +1100)]
Corrected use of ?: in conditional

Patch contributed by Matthew Zwier to fix the incorrect use of
precedence of ?: and != operators.

Fixes #872

Change-Id: Ie4bbc3cbdaf33fc0386d12c2e142a9c076c2e946

12 years agoMerge "New approach for GerritBuild script" into release-4-5-patches
Roland Schulz [Wed, 25 Jan 2012 18:36:49 +0000 (19:36 +0100)]
Merge "New approach for GerritBuild script" into release-4-5-patches

12 years agoMerge "Fixed timing measurements." into release-4-5-patches
David van der Spoel [Fri, 20 Jan 2012 08:15:33 +0000 (09:15 +0100)]
Merge "Fixed timing measurements." into release-4-5-patches

12 years agoNew approach for GerritBuild script
Roland Schulz [Wed, 18 Jan 2012 09:21:18 +0000 (04:21 -0500)]
New approach for GerritBuild script

- Allows to make changes to build in seperate RelEng repository
- Replaces Matrix view by a linear list of configurations

Change-Id: I7f5c76805836c4cd06527b949ab7ac68f27a31b5

12 years agoFixed timing measurements.
Szilard Pall [Mon, 16 Jan 2012 20:46:59 +0000 (21:46 +0100)]
Fixed timing measurements.

With the VV integrator, kinetic energy calculations are done before the
main MD loop. These should be excluded from the timing measurements.

Change-Id: Ib06b1154965735adc0ff2e20802f78d96ed6fca4

12 years agoThread affinity and x86 assembly fixes for thread_mpi
Sander Pronk [Mon, 16 Jan 2012 16:50:42 +0000 (17:50 +0100)]
Thread affinity and x86 assembly fixes for thread_mpi

set_affinity_np now fails silently (shouldn't do much on recent linux
systems, anyway)
x86 asm changes for llvm compatibility.

Change-Id: Id1e71d3e693bc39f5a5e84b0e949fb41c7b7d0e3

12 years agoMerge "Added CMake Toolchain file for BlueGene/P" into release-4-5-patches
Christoph Junghans [Sun, 15 Jan 2012 01:47:41 +0000 (02:47 +0100)]
Merge "Added CMake Toolchain file for BlueGene/P" into release-4-5-patches

12 years agoFixed use of isfinite and _isfinite
Mark Abraham [Wed, 4 Jan 2012 03:47:05 +0000 (14:47 +1100)]
Fixed use of isfinite and _isfinite

Implemented proper CMake tests for the above functionality.
Catered for MSVC idiosyncratic _finite() function. Removed
erroneous use of HAS_ISFINITE and HAS__ISFINITE.
Encapsulated the use of preprocessor directives into the new
gmx_isfinite() function so the programmer doesn't need to
know about the foregoing mess.

The previous versions resulted in unreachable code.

Change-Id: I7471388ed8f402c3f8b664e7846465de4b85f578

12 years agoMerge "Documented the function of g_cluster -cl -noav" into release-4-5-patches
Christoph Junghans [Wed, 4 Jan 2012 15:52:39 +0000 (16:52 +0100)]
Merge "Documented the function of g_cluster -cl -noav" into release-4-5-patches

12 years agoIntroduced fatal error in grompp for incorrect use of settle and charge groups.
David van der Spoel [Wed, 4 Jan 2012 09:58:22 +0000 (10:58 +0100)]
Introduced fatal error in grompp for incorrect use of settle and charge groups.

Change-Id: I02dfe3f3454a6fc329d9b5ecb2fd4b544c8d2cd1

12 years agoAdded CMake Toolchain file for BlueGene/P
Mark Abraham [Fri, 16 Dec 2011 04:02:52 +0000 (15:02 +1100)]
Added CMake Toolchain file for BlueGene/P

Change-Id: Iff9b5fe3cccc4d18fc252856a1b50ee64630b54a

12 years agoDocumented the function of g_cluster -cl -noav
Mark Abraham [Thu, 29 Dec 2011 22:39:34 +0000 (09:39 +1100)]
Documented the function of g_cluster -cl -noav

A definition was needed for the center of a cluster.

Change-Id: Id1c6d2f229feb27b7981c2d616e78e510d215a9a

12 years agoMerge "Added -dhdl to tpr file list, fixes #855" into release-4-5-patches
Roland Schulz [Tue, 27 Dec 2011 09:29:19 +0000 (10:29 +0100)]
Merge "Added -dhdl to tpr file list, fixes #855" into release-4-5-patches

12 years agoAdded -dhdl to tpr file list, fixes #855
Carsten Kutzner [Mon, 19 Dec 2011 14:42:29 +0000 (15:42 +0100)]
Added -dhdl to tpr file list, fixes #855

Change-Id: I2621c7bb44daa01e25831e2d44c22cdcf47f58e7

12 years agoMerge "Using MinSizeRel configuration and Release target on Windows" into release...
Roland Schulz [Tue, 20 Dec 2011 07:52:33 +0000 (08:52 +0100)]
Merge "Using MinSizeRel configuration and Release target on Windows" into release-4-5-patches