alexxy/gromacs.git
13 years agoMerge branch 'master' of git@git.gromacs.org:gromacs
Szilard Pall [Thu, 24 Jun 2010 19:23:32 +0000 (21:23 +0200)]
Merge branch 'master' of git@git.gromacs.org:gromacs

13 years agocmake support for user-defined binary prefixes, custom mdrun-gpu target, and make...
Szilard Pall [Thu, 24 Jun 2010 19:23:22 +0000 (21:23 +0200)]
cmake support for user-defined binary prefixes, custom mdrun-gpu target, and make install-mdrun

13 years agoInitial CTest support
Rossen Apostolov [Thu, 24 Jun 2010 14:56:41 +0000 (16:56 +0200)]
Initial CTest support

Introduced two simple tests for 1) make, and 2) mdrun -h

13 years agoFixed an erroneous store operation for gb/coulomb potentials
Per Larsson [Thu, 24 Jun 2010 14:39:38 +0000 (16:39 +0200)]
Fixed an erroneous store operation for gb/coulomb potentials

 Please enter the commit message for your changes. Lines starting

13 years agoremoved obsolete fftgrid code and disabled PPPM with a message than we plan to implem...
Berk Hess [Thu, 24 Jun 2010 14:24:41 +0000 (16:24 +0200)]
removed obsolete fftgrid code and disabled PPPM with a message than we plan to implement it again

13 years agospeed up tuning for large numbers of processes
Carsten Kutzner [Thu, 24 Jun 2010 13:51:25 +0000 (15:51 +0200)]
speed up tuning for large numbers of processes

13 years agoXDR file I/O is now thread safe.
Sander Pronk [Thu, 24 Jun 2010 10:34:45 +0000 (12:34 +0200)]
XDR file I/O is now thread safe.

Interface has changed slightly, but Kept some legacy functions for third
party tools.

13 years agochanged pdb2gmx water model atom count detection
Berk Hess [Thu, 24 Jun 2010 09:50:08 +0000 (11:50 +0200)]
changed pdb2gmx water model atom count detection

13 years agotry to avoid weird PME/PP combinations in g_tune_pme
Carsten Kutzner [Thu, 24 Jun 2010 09:43:39 +0000 (11:43 +0200)]
try to avoid weird PME/PP combinations in g_tune_pme

13 years agoimplemented nsteps=-1 for mdrun continuation and tpbconv
Berk Hess [Thu, 24 Jun 2010 08:58:19 +0000 (10:58 +0200)]
implemented nsteps=-1 for mdrun continuation and tpbconv

13 years agofixed smalloc.h and smalloc.c definition inconsistencies
Berk Hess [Thu, 24 Jun 2010 08:07:24 +0000 (10:07 +0200)]
fixed smalloc.h and smalloc.c definition inconsistencies

13 years agoMerge branch 'master' of git@git.gromacs.org:gromacs
Berk Hess [Thu, 24 Jun 2010 07:29:16 +0000 (09:29 +0200)]
Merge branch 'master' of git@git.gromacs.org:gromacs

13 years agoAdded snew_aligned and sfree_aligned for managing n-byte-
Mark Abraham [Sat, 12 Jun 2010 11:28:54 +0000 (21:28 +1000)]
Added snew_aligned and sfree_aligned for managing n-byte-
aligned memory for things like force tables and FFT buffers.
These use posix_memalign or memalign if found, and otherwise
fall back to bit-wise and-ing pointers returned by malloc
to achieve the alignment. This patch is autotools- and
cmake-aware.

13 years agomake CMake with GCC default to C99 off (gcc 4.3 and later have syntax changes)
Peter Kasson [Wed, 23 Jun 2010 20:43:10 +0000 (13:43 -0700)]
make CMake with GCC default to C99 off (gcc 4.3 and later have syntax changes)

13 years agoIncreased SHARED_VERSION_INFO to 6:0:0 (closing bug 403)
Rossen Apostolov [Wed, 23 Jun 2010 14:46:32 +0000 (16:46 +0200)]
Increased SHARED_VERSION_INFO to 6:0:0 (closing bug 403)

13 years agoAdded gcc41 check
Erik Lindahl [Wed, 23 Jun 2010 12:59:30 +0000 (14:59 +0200)]
Added gcc41 check

13 years agoMerge branch 'master' into qmmm
Gerrit Groenhof [Wed, 23 Jun 2010 12:16:29 +0000 (14:16 +0200)]
Merge branch 'master' into qmmm

13 years agoremoved statusio.h
Berk Hess [Wed, 23 Jun 2010 11:29:26 +0000 (13:29 +0200)]
removed statusio.h

13 years agofixed gmx_eneconv compiler warnings
Berk Hess [Wed, 23 Jun 2010 09:58:19 +0000 (11:58 +0200)]
fixed gmx_eneconv compiler warnings

13 years agofixed eneconv -dt option temporarily not writing averages
Berk Hess [Wed, 23 Jun 2010 09:32:09 +0000 (11:32 +0200)]
fixed eneconv -dt option temporarily not writing averages

13 years agoFixed compiler warnings
Maarten Wolf [Wed, 23 Jun 2010 08:13:40 +0000 (10:13 +0200)]
Fixed compiler warnings

13 years agoFixed the same typo in kernel400/410_ia32_sse2
Per Larsson [Wed, 23 Jun 2010 07:02:20 +0000 (09:02 +0200)]
Fixed the same typo in kernel400/410_ia32_sse2

13 years agoDeleted double entries in atomtypes.
Pär Bjelkmar [Tue, 22 Jun 2010 22:06:37 +0000 (00:06 +0200)]
Deleted double entries in atomtypes.

13 years agog_tune_pme now also updates rlistlong etc.
Carsten Kutzner [Tue, 22 Jun 2010 17:00:13 +0000 (19:00 +0200)]
g_tune_pme now also updates rlistlong etc.

13 years agocorrected edr format issue introduced today
Berk Hess [Tue, 22 Jun 2010 13:10:59 +0000 (15:10 +0200)]
corrected edr format issue introduced today

13 years agoadded g_membed to programs.txt
Berk [Tue, 22 Jun 2010 12:04:06 +0000 (14:04 +0200)]
added g_membed to programs.txt

13 years agoFixed gmxcpp directory search for include files.
Teemu Murtola [Tue, 22 Jun 2010 11:52:37 +0000 (13:52 +0200)]
Fixed gmxcpp directory search for include files.

All #include'd files are now searched first in the directory where the
including file is located, then in the directories specified with -I,
and finally in the GMXLIB search path. This should now work correctly
even if the file name contains a partial path, or if there are nested
includes.

13 years agoMore C90 fixes in membed.
Sander Pronk [Tue, 22 Jun 2010 11:44:25 +0000 (13:44 +0200)]
More C90 fixes in membed.

13 years agoC90 fixes.
Sander Pronk [Tue, 22 Jun 2010 11:30:14 +0000 (13:30 +0200)]
C90 fixes.

13 years agovmdio error message fix.
Sander Pronk [Tue, 22 Jun 2010 11:11:05 +0000 (13:11 +0200)]
vmdio error message fix.

13 years agoMost (if not all) file operations are now thread safe.
Sander Pronk [Tue, 22 Jun 2010 10:52:41 +0000 (12:52 +0200)]
Most (if not all) file operations are now thread safe.

The basic data structures and call interfaces in gmxfio and trxio have
been changed to allow for thread-safety (the original ones relied on global
variables to keep part of their state in).
Reading and writing from and to files with gmxfio has changed:
there is a file input/output data structure, and function names
are now more descriptive.
Reading trajectories has changed: there is a status data strucuture to keep
track of frame numbers and the file pointer.

13 years agoEM now always writes last trr frame again
Berk [Tue, 22 Jun 2010 10:46:32 +0000 (12:46 +0200)]
EM now always writes last trr frame again

13 years agoAdded a ";" in nb_kernel430_ia32_sse2.c
Per Larsson [Tue, 22 Jun 2010 08:20:56 +0000 (10:20 +0200)]
Added a ";" in nb_kernel430_ia32_sse2.c

13 years agoadd gmx_qsort routine, since glibc qsort is not threadsafe due to a bug
Berk Hess [Mon, 21 Jun 2010 15:19:53 +0000 (17:19 +0200)]
add gmx_qsort routine, since glibc qsort is not threadsafe due to a bug

13 years agog_tune_pme: add option to choose how nprocs is passed, add downscaling factor
Carsten Kutzner [Mon, 21 Jun 2010 15:09:11 +0000 (17:09 +0200)]
g_tune_pme: add option to choose how nprocs is passed, add downscaling factor

13 years agofixed typo in fatal_error call
Berk Hess [Mon, 21 Jun 2010 10:10:35 +0000 (12:10 +0200)]
fixed typo in fatal_error call

13 years agoMerge branch 'master' of git@git.gromacs.org:gromacs
Szilard Pall [Sun, 20 Jun 2010 22:36:54 +0000 (00:36 +0200)]
Merge branch 'master' of git@git.gromacs.org:gromacs

13 years agoFixed GCC version checking in cmake
Szilard Pall [Sun, 20 Jun 2010 22:36:43 +0000 (00:36 +0200)]
Fixed GCC version checking in cmake

13 years agofixed typo in previous commit
Peter Kasson [Sun, 20 Jun 2010 16:59:30 +0000 (09:59 -0700)]
fixed typo in previous commit

13 years agoModified stat.c trr file check for FAHCORE.
Peter Kasson [Sun, 20 Jun 2010 16:36:15 +0000 (09:36 -0700)]
Modified stat.c trr file check for FAHCORE.

13 years agonow mdrun does not write the trr file when it would be empty
Berk Hess [Fri, 18 Jun 2010 15:24:23 +0000 (17:24 +0200)]
now mdrun does not write the trr file when it would be empty

13 years agoadded env var GMX_MAXBACKUP
Berk Hess [Fri, 18 Jun 2010 15:04:48 +0000 (17:04 +0200)]
added env var GMX_MAXBACKUP

13 years agoFixed a typo
Per Larsson [Fri, 18 Jun 2010 12:31:08 +0000 (14:31 +0200)]
Fixed a typo

13 years agoFixed Makefile.am leading to warnings.
David van der Spoel [Fri, 18 Jun 2010 10:00:15 +0000 (12:00 +0200)]
Fixed Makefile.am leading to warnings.

13 years agoRemoved fitting to rev. gem. recomb. model. It will return when the algortihms are...
Erik Marklund [Fri, 18 Jun 2010 09:44:39 +0000 (11:44 +0200)]
Removed fitting to rev. gem. recomb. model. It will return when the algortihms are more robust. -Erik Marklund

13 years agoCommented out the ballistic stuff and the fitting to to rev. gem. recomb. model....
Erik Marklund [Fri, 18 Jun 2010 09:12:22 +0000 (11:12 +0200)]
Commented out the ballistic stuff and the fitting to to rev. gem. recomb. model. The gemiate ACF is still calculated. The commented-out features will return when I'm more confident in the stability of the algorithms. -Erik Marklund

13 years agofixed pdb2gmx tip4p adn tip5p atom naming (although not in a clean way)
Berk [Fri, 18 Jun 2010 08:27:45 +0000 (10:27 +0200)]
fixed pdb2gmx tip4p adn tip5p atom naming (although not in a clean way)

13 years agopdb2gmx force field choices now start numbering at 1
Berk [Fri, 18 Jun 2010 07:55:40 +0000 (09:55 +0200)]
pdb2gmx force field choices now start numbering at 1

13 years agoFix g_membed compilation error
Maarten Wolf [Fri, 18 Jun 2010 07:31:29 +0000 (09:31 +0200)]
Fix g_membed compilation error

13 years agoMerge branch 'master' into qmmm
Gerrit Groenhof [Fri, 18 Jun 2010 06:42:52 +0000 (08:42 +0200)]
Merge branch 'master' into qmmm

13 years agoChanged erroneous #define DOUBLE to #define GMX_DOUBLE
Per Larsson [Fri, 18 Jun 2010 05:47:51 +0000 (07:47 +0200)]
Changed erroneous #define DOUBLE to #define GMX_DOUBLE
that triggered all-vs-all loops in double precision

13 years agoMerge branch 'master' of git@git.gromacs.org:gromacs
Maarten Wolf [Thu, 17 Jun 2010 14:29:39 +0000 (16:29 +0200)]
Merge branch 'master' of git@git.gromacs.org:gromacs

13 years agofix for the previous mdrun -rerun commit
Berk Hess [Thu, 17 Jun 2010 13:21:24 +0000 (15:21 +0200)]
fix for the previous mdrun -rerun commit

13 years agomdrun -rerun now reads the rerun traj only on the master nodes and now also works...
Berk Hess [Thu, 17 Jun 2010 12:56:00 +0000 (14:56 +0200)]
mdrun -rerun now reads the rerun traj only on the master nodes and now also works with PD

13 years agominor update for previous replex bugfix
Berk Hess [Thu, 17 Jun 2010 12:22:33 +0000 (14:22 +0200)]
minor update for previous replex bugfix

13 years agoMerge branch 'master' of git.gromacs.org:gromacs
Carsten Kutzner [Thu, 17 Jun 2010 12:14:56 +0000 (14:14 +0200)]
Merge branch 'master' of git.gromacs.org:gromacs

13 years agofixed tuning for loadleveler and updated it to modified mdrun options
Carsten Kutzner [Thu, 17 Jun 2010 12:14:10 +0000 (14:14 +0200)]
fixed tuning for loadleveler and updated it to modified mdrun options

13 years agofixed mdrun -rerun giving NaN with dispcorr
Berk Hess [Thu, 17 Jun 2010 12:09:05 +0000 (14:09 +0200)]
fixed mdrun -rerun giving NaN with dispcorr

13 years agoadded water model selection and list file to pdb2gmx
Berk Hess [Thu, 17 Jun 2010 10:11:03 +0000 (12:11 +0200)]
added water model selection and list file to pdb2gmx

13 years agomade a separate tips3p.itp file for CHARMM
Berk Hess [Thu, 17 Jun 2010 09:45:55 +0000 (11:45 +0200)]
made a separate tips3p.itp file for CHARMM

13 years agoMerge branch 'master' of git@git.gromacs.org:gromacs
Berk Hess [Thu, 17 Jun 2010 07:35:55 +0000 (09:35 +0200)]
Merge branch 'master' of git@git.gromacs.org:gromacs

13 years agoMerge branch 'master' of git@git.gromacs.org:gromacs
Per Larsson [Thu, 17 Jun 2010 06:20:08 +0000 (08:20 +0200)]
Merge branch 'master' of git@git.gromacs.org:gromacs

13 years agoFixed inner GB scale factor in double precision nb_kernel430-files
Per Larsson [Thu, 17 Jun 2010 06:18:18 +0000 (08:18 +0200)]
Fixed inner GB scale factor in double precision nb_kernel430-files
and updating of shift forces in some single precision files

13 years agoMerge branch 'master' of git@git.gromacs.org:gromacs
Szilard Pall [Thu, 17 Jun 2010 01:10:41 +0000 (03:10 +0200)]
Merge branch 'master' of git@git.gromacs.org:gromacs

13 years agofixed minor bug in openmm_wrapper.cpp
Szilard Pall [Thu, 17 Jun 2010 01:10:30 +0000 (03:10 +0200)]
fixed minor bug in openmm_wrapper.cpp

13 years agoImplemented (buggy) gcc 4.1.x check in cmake.
Szilard Pall [Thu, 17 Jun 2010 01:08:07 +0000 (03:08 +0200)]
Implemented (buggy) gcc 4.1.x check in cmake.

13 years agoChanged HAVE_COPYFILE check to HAVE_COPYFILE_H in futil.c
kasson [Thu, 17 Jun 2010 00:41:57 +0000 (17:41 -0700)]
Changed HAVE_COPYFILE check to HAVE_COPYFILE_H in futil.c

13 years agoMerge branch 'master' of git://git.gromacs.org/gromacs
kasson [Thu, 17 Jun 2010 00:38:25 +0000 (17:38 -0700)]
Merge branch 'master' of git://git.gromacs.org/gromacs

13 years agoFixing #if statement.
kasson [Wed, 16 Jun 2010 21:15:00 +0000 (14:15 -0700)]
Fixing #if statement.

13 years agoAdded defined() to #if macros
kasson [Wed, 16 Jun 2010 21:09:27 +0000 (14:09 -0700)]
Added defined() to #if macros

13 years agoMerge branch 'mymaster'
kasson [Wed, 16 Jun 2010 18:39:11 +0000 (11:39 -0700)]
Merge branch 'mymaster'

13 years agoSmall cleanup of the openmm section in mdrun.c
Rossen Apostolov [Wed, 16 Jun 2010 18:23:06 +0000 (20:23 +0200)]
Small cleanup of the openmm section in mdrun.c

13 years agoChanged some SSE typecasts to macros; fixing ICC/Windows compile errors.
Peter Kasson [Wed, 16 Jun 2010 16:13:10 +0000 (09:13 -0700)]
Changed some SSE typecasts to macros; fixing ICC/Windows compile errors.

13 years agoadded spce to charmm27
Berk Hess [Wed, 16 Jun 2010 15:01:36 +0000 (17:01 +0200)]
added spce to charmm27

13 years agofixed MPI crash when nat_home=0 in DD
Berk Hess [Wed, 16 Jun 2010 14:35:10 +0000 (16:35 +0200)]
fixed MPI crash when nat_home=0 in DD

13 years agorestored the old order of the mdrun option and removed the -addpart option (replaced...
Berk Hess [Wed, 16 Jun 2010 12:17:17 +0000 (14:17 +0200)]
restored the old order of the mdrun option and removed the -addpart option (replaced by -noappend)

13 years agofixed g_tune_pme for the use with IBM's poe
Carsten Kutzner [Wed, 16 Jun 2010 12:00:08 +0000 (14:00 +0200)]
fixed g_tune_pme for the use with IBM's poe

13 years agoMerge branch 'master' of git.gromacs.org:gromacs
Rossen Apostolov [Wed, 16 Jun 2010 11:12:33 +0000 (13:12 +0200)]
Merge branch 'master' of git.gromacs.org:gromacs

13 years agoFixed the command line options for GPU binaries.
Rossen Apostolov [Wed, 16 Jun 2010 11:07:48 +0000 (13:07 +0200)]
Fixed the command line options for GPU binaries.

Now the GPU binaries will display all CPU options, even if they are not
applicable. The GPU specific "-device" option won't appear in the CPU builds though.

13 years agoreplaced more gmx_fatal by collective calls in DD
Berk Hess [Wed, 16 Jun 2010 10:50:59 +0000 (12:50 +0200)]
replaced more gmx_fatal by collective calls in DD

13 years agofixed atom naming in encad c-termini
Berk Hess [Wed, 16 Jun 2010 09:49:13 +0000 (11:49 +0200)]
fixed atom naming in encad c-termini

13 years agowith nsteps=-1 mdrun now prints ns/day estimate
Berk Hess [Wed, 16 Jun 2010 08:28:43 +0000 (10:28 +0200)]
with nsteps=-1 mdrun now prints ns/day estimate

13 years agoadded nsteps=-1 option to mdp_opt.html
Berk Hess [Wed, 16 Jun 2010 08:15:32 +0000 (10:15 +0200)]
added nsteps=-1 option to mdp_opt.html

13 years agoall energy minimizers now do 0 steps with nsteps=0 and unlimited number of steps...
Berk Hess [Wed, 16 Jun 2010 08:14:04 +0000 (10:14 +0200)]
all energy minimizers now do 0 steps with nsteps=0 and unlimited number of steps with nsteps=-1

13 years agoAdded a check in grompp for nstgbradii<1.
Per Larsson [Wed, 16 Jun 2010 05:36:20 +0000 (07:36 +0200)]
Added a check in grompp for nstgbradii<1.
This fixes bug 436.

13 years agofixed incorrect pdb2gmx CYS2 to CYS renaming which generated an error
Berk Hess [Tue, 15 Jun 2010 09:33:03 +0000 (11:33 +0200)]
fixed incorrect pdb2gmx CYS2 to CYS renaming which generated an error

13 years agoallvsall loops now trigger particle decomposition
Berk Hess [Tue, 15 Jun 2010 09:07:58 +0000 (11:07 +0200)]
allvsall loops now trigger particle decomposition

13 years agofatal_error in the DD initialization now calls MPI_Finalize iso MPI_Abort when possible
Berk Hess [Tue, 15 Jun 2010 08:49:26 +0000 (10:49 +0200)]
fatal_error in the DD initialization now calls MPI_Finalize iso MPI_Abort when possible

13 years agoFixed return values for MPI_Comm_compare in thread_mpi.
Sander Pronk [Tue, 15 Jun 2010 07:58:42 +0000 (09:58 +0200)]
Fixed return values for MPI_Comm_compare in thread_mpi.

13 years agoFixed make_edi.c
David van der Spoel [Mon, 14 Jun 2010 21:07:00 +0000 (23:07 +0200)]
Fixed make_edi.c

13 years agoMerge branch 'master' of git.gromacs.org:gromacs
David van der Spoel [Mon, 14 Jun 2010 20:50:55 +0000 (22:50 +0200)]
Merge branch 'master' of git.gromacs.org:gromacs

13 years agoAdded more fixes in comment texts, generously provided by Nicholas Breen.
David van der Spoel [Mon, 14 Jun 2010 20:50:17 +0000 (22:50 +0200)]
Added more fixes in comment texts, generously provided by Nicholas Breen.

13 years agoAdded MPI_Comm_compare() to thread_mpi.
Sander Pronk [Mon, 14 Jun 2010 18:28:49 +0000 (20:28 +0200)]
Added MPI_Comm_compare() to thread_mpi.

13 years agoadded -cwd option to pdb2gmx
Berk Hess [Mon, 14 Jun 2010 13:42:29 +0000 (15:42 +0200)]
added -cwd option to pdb2gmx

13 years agoFixed a compiler warning.
Teemu Murtola [Sun, 13 Jun 2010 17:45:53 +0000 (19:45 +0200)]
Fixed a compiler warning.

At least GCC 4.0 complained about possible use of an uninitialized
variable, although there was no combination of conditionals that could
cause this, so the variable is now initialized to zero.

13 years agoRaised the NHCHAINLENGTH default to 10
Michael Shirts [Sat, 12 Jun 2010 19:58:05 +0000 (15:58 -0400)]
Raised the NHCHAINLENGTH default to 10

13 years agoMore C90 pedantry.
Sander Pronk [Sat, 12 Jun 2010 09:15:40 +0000 (11:15 +0200)]
More C90 pedantry.

13 years agoFixed a lot of spelling errors in comments and documentation, collected by
David van der Spoel [Sat, 12 Jun 2010 07:05:01 +0000 (09:05 +0200)]
Fixed a lot of spelling errors in comments and documentation, collected by
Nicholas Breen. This fixes bug 435.

13 years agoModifications in fsync routines for checkpoints.
Peter Kasson [Fri, 11 Jun 2010 20:53:05 +0000 (22:53 +0200)]
Modifications in fsync routines for checkpoints.

13 years agoFixed another batch of // comments.
Sander Pronk [Fri, 11 Jun 2010 19:00:52 +0000 (21:00 +0200)]
Fixed another batch of // comments.