Adam Sieradzan [Wed, 17 Dec 2014 09:48:55 +0000 (10:48 +0100)]
Merge branch 'master' of mmka:unres
Conflicts:
.gitignore
bin/cluster/unres_clustMD-mult_MPICH-GAB.exe
bin/unres/MD/unres_gfortran_single_GAB.exe
bin/unres/MD/unres_ifort_single_GAB.exe
bin/unres/MINIM/unres_ifort_MIN_single_E0LL2Y.exe
bin/unres/MINIM/unres_ifort_MIN_single_GAB.exe
bin/unres_clustMD_MPI-oldparm
bin/wham/wham_multparm-ham_rep-oldparm
source/cluster/wham/src/COMMON.SCCOR
source/cluster/wham/src/Makefile
source/unres/src_MD-M/Makefile
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/stochfric.F
source/unres/src_MD/cinfo.f
source/wham/src-M/Makefile
source/wham/src/DIMENSIONS.FREE
Adam Sieradzan [Wed, 17 Dec 2014 09:42:35 +0000 (10:42 +0100)]
zmiany w gitignore
Adam Liwo [Thu, 11 Dec 2014 14:37:42 +0000 (15:37 +0100)]
Minor change in documentation (installman)
Adam Liwo [Thu, 11 Dec 2014 14:36:04 +0000 (15:36 +0100)]
Updated changelog, added minimization-only version binaries
Adam Liwo [Thu, 11 Dec 2014 14:14:41 +0000 (15:14 +0100)]
Created binaries and fixed bugs when compiling single-processor version of the multichain code.
Dawid Jagieła [Sun, 7 Dec 2014 15:30:55 +0000 (16:30 +0100)]
removed CSA_DiL sources from CMake
Cezary Czaplewski [Fri, 5 Dec 2014 13:32:31 +0000 (14:32 +0100)]
correction to 4P energy and csa examples
Cezary Czaplewski [Fri, 5 Dec 2014 13:16:25 +0000 (14:16 +0100)]
corrected example CSA run with 4P
Cezary Czaplewski [Fri, 5 Dec 2014 12:44:53 +0000 (13:44 +0100)]
new options for mpich2 with gfortran Makefile
Cezary Czaplewski [Fri, 5 Dec 2014 10:39:17 +0000 (11:39 +0100)]
src_CSA_DiL removed from prerelease, current version in devel
Adam Liwo [Thu, 4 Dec 2014 13:54:48 +0000 (14:54 +0100)]
Added the change docs by Adam
Adam Liwo [Thu, 4 Dec 2014 13:52:45 +0000 (14:52 +0100)]
Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1
Adam Liwo [Thu, 4 Dec 2014 13:51:12 +0000 (14:51 +0100)]
Yet more changes in the documentation ( by Adam)
Adam Liwo [Thu, 4 Dec 2014 13:40:17 +0000 (14:40 +0100)]
Revised documentation by Adam
Dawid Jagiela [Fri, 28 Nov 2014 12:37:21 +0000 (13:37 +0100)]
changed FF preprocesor flags in src_CSA_DiL/CMakeLists.txt
Dawid Jagiela [Fri, 28 Nov 2014 11:49:03 +0000 (12:49 +0100)]
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Adam Liwo [Fri, 28 Nov 2014 11:42:27 +0000 (12:42 +0100)]
Updated INSTALL
Adam Liwo [Fri, 28 Nov 2014 11:38:33 +0000 (12:38 +0100)]
Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1
Dawid Jagiela [Fri, 28 Nov 2014 11:38:22 +0000 (12:38 +0100)]
fixed FF preprocesor flags for src_CSA/CMakeLists.txt
Adam Liwo [Fri, 28 Nov 2014 11:37:12 +0000 (12:37 +0100)]
Updated INSTALL
By Adam
Dawid Jagiela [Fri, 28 Nov 2014 11:24:28 +0000 (12:24 +0100)]
changed csa.f to csa.F in src_CSA/CMakeLists.txt sources
Adam Liwo [Fri, 28 Nov 2014 10:45:13 +0000 (11:45 +0100)]
Trying to bring files - continued
By Adam
Adam Liwo [Fri, 28 Nov 2014 10:37:50 +0000 (11:37 +0100)]
Trying to bring the csa.F file to the repository.
By Adam.
Adam Liwo [Thu, 27 Nov 2014 14:53:46 +0000 (15:53 +0100)]
Additional fix of xdrfpdb binaries (creation of bin/xdrf and putting
binaries there acc. to documentation.
By Adam
Adam Liwo [Thu, 27 Nov 2014 14:35:35 +0000 (15:35 +0100)]
Fixed Makefiles, handle all force fields thru appropriate options
By Adam
Dawid Jagiela [Wed, 5 Nov 2014 21:44:43 +0000 (22:44 +0100)]
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Dawid Jagiela [Wed, 5 Nov 2014 21:44:05 +0000 (22:44 +0100)]
ctest ala10 binary location fix
Dawid Jagieła [Wed, 5 Nov 2014 08:56:10 +0000 (09:56 +0100)]
Added CMake build instructions
Dawid Jagiela [Fri, 31 Oct 2014 22:48:33 +0000 (23:48 +0100)]
fix for multiple MPI include paths passed by MPI wrapper
Dawid Jagiela [Mon, 27 Oct 2014 22:19:36 +0000 (23:19 +0100)]
1) binaries are compiled into /bin subdirectory of build directory
2) added "make install" support costumizable with CMAKE_INSTALL_PREFIX
Dawid Jagiela [Sun, 26 Oct 2014 21:58:46 +0000 (22:58 +0100)]
1) Threading cleanup in src_CSA & src_CSA_DiL
2) Makefile verbose turned off for "Release" builds
3) fixed missing printmat.f in cluster/wham/src/CMakeLists.txt
Dawid Jagiela [Sun, 26 Oct 2014 16:03:50 +0000 (17:03 +0100)]
switched to CMake FindMPI module in all source files that use MPI
Dawid Jagiela [Sun, 26 Oct 2014 14:33:10 +0000 (15:33 +0100)]
added missing preprocessor flags for prng_32.F
Dawid Jagiela [Sat, 25 Oct 2014 21:45:17 +0000 (23:45 +0200)]
prng.f unification
Dawid Jagiela [Thu, 16 Oct 2014 23:51:51 +0000 (01:51 +0200)]
64-bit fix for unres/CSA and unres/CSA_DiL code
Dawid Jagieła [Tue, 14 Oct 2014 22:30:49 +0000 (00:30 +0200)]
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Dawid Jagieła [Tue, 14 Oct 2014 22:29:43 +0000 (00:29 +0200)]
fixed CMake variable typo
Cezary Czaplewski [Wed, 8 Oct 2014 10:32:04 +0000 (12:32 +0200)]
correct default option for compilers in cluster CmakeList.txt
Cezary Czaplewski [Wed, 8 Oct 2014 10:09:44 +0000 (12:09 +0200)]
correct default option for compilers in wham CmakeList.txt
Dawid Jagiela [Fri, 25 Apr 2014 07:54:20 +0000 (03:54 -0400)]
1) added warnings suppression if find_package(MPI) failes to find MPI
2) removed non-standardold MPI paths - should be passed by cmake variables directly
Pawel Krupa [Wed, 20 Nov 2013 15:57:39 +0000 (10:57 -0500)]
Poprawione przyklady w polu ff_gab (zmieniony potencjal SIDEPAR na:
sc_GB_opt.1gab_3S_qclass5no310-shan2-sc-16-10-8k).
Pawel Krupa [Wed, 20 Nov 2013 15:53:22 +0000 (10:53 -0500)]
Poprawione przyklady do pola ff_gab (zmieniony potencjal SIDEPAR na: sc_GB_opt.1gab_3S_qclass5no310-shan2-sc-16-10-8k).
Adam Sieradzan [Mon, 18 Nov 2013 19:02:48 +0000 (20:02 +0100)]
dzialajacy gradient
Adam Sieradzan [Thu, 14 Nov 2013 22:25:51 +0000 (23:25 +0100)]
Dzialajacy gradient dla reszt 13 i 7
Adam Sieradzan [Thu, 14 Nov 2013 13:32:27 +0000 (14:32 +0100)]
zabezpieczenie przedczarkowe
Adam Sieradzan [Tue, 5 Nov 2013 22:32:58 +0000 (23:32 +0100)]
Bugfix for smaller size of memory
Adam Sieradzan [Tue, 5 Nov 2013 20:10:47 +0000 (21:10 +0100)]
Debug part 11
Adam Sieradzan [Tue, 5 Nov 2013 20:02:11 +0000 (21:02 +0100)]
Debug part 10
Adam Sieradzan [Tue, 5 Nov 2013 19:42:53 +0000 (20:42 +0100)]
Debug part 9
Adam Sieradzan [Tue, 5 Nov 2013 19:30:19 +0000 (20:30 +0100)]
Debug part 8
Adam Sieradzan [Tue, 5 Nov 2013 19:07:23 +0000 (20:07 +0100)]
Debug cd 7
Adam Sieradzan [Tue, 5 Nov 2013 18:35:49 +0000 (19:35 +0100)]
Debug part 7
Adam Sieradzan [Tue, 5 Nov 2013 18:02:35 +0000 (19:02 +0100)]
Debug part 6
Adam Sieradzan [Tue, 5 Nov 2013 17:49:55 +0000 (18:49 +0100)]
Debug part 5
Adam Sieradzan [Tue, 5 Nov 2013 17:30:04 +0000 (18:30 +0100)]
Debug part 4
Adam Sieradzan [Tue, 5 Nov 2013 17:24:58 +0000 (18:24 +0100)]
Debug part 3
Adam Sieradzan [Tue, 5 Nov 2013 17:04:35 +0000 (18:04 +0100)]
Debug part 2
Adam Sieradzan [Tue, 5 Nov 2013 16:30:27 +0000 (17:30 +0100)]
Debug part 1
Adam Sieradzan [Tue, 5 Nov 2013 13:51:57 +0000 (14:51 +0100)]
Merge branch 'adasko' into devel
Conflicts:
source/unres/src_MD/Makefile
Adam Sieradzan [Tue, 5 Nov 2013 13:39:58 +0000 (14:39 +0100)]
Merge branch 'devel' of mmka:unres into devel
Adam Sieradzan [Tue, 5 Nov 2013 13:39:29 +0000 (14:39 +0100)]
ignorowanie build2
Adam Sieradzan [Tue, 5 Nov 2013 13:37:15 +0000 (14:37 +0100)]
pierwsza proba merga devela do adasko
Merge branch 'devel' into adasko
Conflicts:
.gitignore
PARAM/pot_theta_G631_DIL.parm
PARAM/pot_theta_G631_DIL_ext.parm
bin/unres/MD-M/unres_Tc_procor_oldparm_em64-D-symetr.exe
bin/unres_clustMD_MPI-oldparm
bin/wham/wham_multparm-ham_rep-oldparm
source/cluster/wham/src-M/CMakeLists.txt
source/cluster/wham/src-M/COMMON.SCCOR
source/cluster/wham/src-M/cartprint.o
source/cluster/wham/src-M/chainbuild.o
source/cluster/wham/src-M/contact.o
source/cluster/wham/src-M/convert.o
source/cluster/wham/src-M/energy_p_new.o
source/cluster/wham/src-M/geomout.o
source/cluster/wham/src-M/hc.o
source/cluster/wham/src-M/initialize_p.o
source/cluster/wham/src-M/int_from_cart1.o
source/cluster/wham/src-M/main_clust.o
source/cluster/wham/src-M/parmread.o
source/cluster/wham/src-M/permut.o
source/cluster/wham/src-M/proc_proc.o
source/cluster/wham/src-M/read_coords.o
source/cluster/wham/src-M/read_ref_str.o
source/cluster/wham/src-M/readpdb.o
source/cluster/wham/src-M/readrtns.o
source/cluster/wham/src-M/rescode.o
source/cluster/wham/src-M/setup_var.o
source/cluster/wham/src-M/wrtclust.o
source/cluster/wham/src-M/xdrf/libxdrf.a
source/cluster/wham/src/energy_p_new.F
source/unres/src_MD-M/COMMON.SCCOR
source/unres/src_MD-M/COMMON.TORSION
source/unres/src_MD-M/Makefile
source/unres/src_MD-M/cinfo.f
source/unres/src_MD-M/stochfric.F
source/unres/src_MD/COMMON.LOCAL
source/unres/src_MD/COMMON.SCCOR
source/unres/src_MD/Makefile
source/unres/src_MD/cinfo.f
source/unres/src_MD/parmread.F
source/wham/src-M/CMakeLists.txt
source/wham/src-M/cinfo.f
source/wham/src-M/include_unres/COMMON.SCCOR
source/wham/src/Makefile
source/wham/src/cinfo.f
source/wham/src/enecalc1.F
source/wham/src/energy_p_new.F
source/wham/src/include_unres/COMMON.SCCOR
source/wham/src/int_from_cart.f
source/wham/src/parmread.F
Adam Sieradzan [Tue, 5 Nov 2013 13:15:27 +0000 (14:15 +0100)]
Dostosowanie w src whama i clustra
Adam Sieradzan [Tue, 5 Nov 2013 07:15:34 +0000 (08:15 +0100)]
Merge branch 'adasko' of mmka:unres into adasko
Cezary Czaplewski [Wed, 30 Oct 2013 20:51:11 +0000 (21:51 +0100)]
Makefile for pgi 2013
Cezary Czaplewski [Wed, 30 Oct 2013 18:33:20 +0000 (19:33 +0100)]
Merge branch 'devel' of mmka:unres into devel
Cezary Czaplewski [Wed, 30 Oct 2013 18:31:24 +0000 (19:31 +0100)]
testing Makefile for pgi compiler
Adam Sieradzan [Wed, 16 Oct 2013 13:51:06 +0000 (15:51 +0200)]
drobnostki w ext theta (cofniete)
Adam Sieradzan [Mon, 7 Oct 2013 17:45:58 +0000 (19:45 +0200)]
small correctian in wham
Dawid Jagiela [Sun, 22 Sep 2013 13:26:40 +0000 (15:26 +0200)]
show_UNRES.py - large loops speedup by using xrange
Dawid Jagiela [Mon, 2 Sep 2013 15:06:12 +0000 (17:06 +0200)]
Merge branch 'devel' of mmka:unres into devel
Dawid Jagiela [Mon, 2 Sep 2013 15:05:23 +0000 (17:05 +0200)]
resolved conflicts in: source/unres/src_MD/CMakeLists.txt
Cezary Czaplewski [Mon, 2 Sep 2013 15:04:07 +0000 (17:04 +0200)]
repair of broken merge
Cezary Czaplewski [Mon, 2 Sep 2013 13:20:28 +0000 (15:20 +0200)]
Merge branch 'devel' of mmka:unres into devel
Conflicts:
source/unres/src_MD/CMakeLists.txt
Cezary Czaplewski [Mon, 2 Sep 2013 13:18:05 +0000 (15:18 +0200)]
merging devel
Cezary Czaplewski [Mon, 2 Sep 2013 13:02:33 +0000 (15:02 +0200)]
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Cezary Czaplewski [Mon, 2 Sep 2013 13:01:15 +0000 (15:01 +0200)]
dynamic disulfides in multichain
Adam Kazimierz Sieradzan [Mon, 2 Sep 2013 12:21:17 +0000 (08:21 -0400)]
Zmiany w pliku sccor_am1_pawel.dat
Adam Kazimierz Sieradzan [Sat, 31 Aug 2013 19:08:38 +0000 (15:08 -0400)]
1)Clean-up 2)making similar src_MD and its multichain version 3)
correction of potentials and bugfix in ../PARAM/pot_theta_G631_DIL.parm
4) introduction of theta_pdb and rotam_pdb in multichain
Dawid Jagiela [Sat, 31 Aug 2013 18:35:42 +0000 (20:35 +0200)]
Merge branch 'devel' of mmka:unres into devel
Adam Kazimierz Sieradzan [Sat, 31 Aug 2013 12:58:46 +0000 (08:58 -0400)]
Merge branch 'adasko' of mmka.chem.univ.gda.pl:unres into adasko
Adam Kazimierz Sieradzan [Sat, 31 Aug 2013 12:41:51 +0000 (08:41 -0400)]
Merge mmka.chem.univ.gda.pl:unres into adasko
Adam Kazimierz Sieradzan [Sat, 31 Aug 2013 12:22:46 +0000 (08:22 -0400)]
Clean-up in parmread for src-MD and src-MD-M
pre-preparation for removal of src-MD and leaving out only the
multichain version
Adam Kazimierz Sieradzan [Sat, 31 Aug 2013 09:32:31 +0000 (05:32 -0400)]
wylaczenie diagnostyki
Adam Kazimierz Sieradzan [Sat, 31 Aug 2013 09:28:36 +0000 (05:28 -0400)]
Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1
Adam Kazimierz Sieradzan [Sat, 31 Aug 2013 09:27:48 +0000 (05:27 -0400)]
zmiany w prereleasie drobne
Dawid Jagiela [Fri, 23 Aug 2013 12:11:37 +0000 (14:11 +0200)]
Merge branch 'devel' of mmka:unres into devel
Dawid Jagiela [Fri, 23 Aug 2013 09:58:30 +0000 (11:58 +0200)]
Fix to use native system xdr headers
Signed-off-by: Dawid Jagiela <lightnir@chem.univ.gda.pl>
Adam Sieradzan [Mon, 12 Aug 2013 20:32:43 +0000 (22:32 +0200)]
new tosrional double torsional and valence
Adam Sieradzan [Mon, 12 Aug 2013 20:32:43 +0000 (22:32 +0200)]
new tosrional double torsional and valence
Adam Sieradzan [Mon, 12 Aug 2013 20:28:23 +0000 (22:28 +0200)]
changes for DIMENSION for smaller size MEMory
Adam Sieradzan [Thu, 8 Aug 2013 00:16:23 +0000 (02:16 +0200)]
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Cezary Czaplewski [Wed, 7 Aug 2013 21:54:08 +0000 (23:54 +0200)]
decrease of Max_Parm to 32 necessary for 4GB machine
Adam Sieradzan [Wed, 7 Aug 2013 16:05:10 +0000 (18:05 +0200)]
merge...
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Conflicts:
source/wham/src/energy_p_new.F
Adam Sieradzan [Wed, 7 Aug 2013 16:03:22 +0000 (18:03 +0200)]
usuniecie diagnostyki
Cezary Czaplewski [Mon, 5 Aug 2013 07:09:27 +0000 (09:09 +0200)]
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Cezary Czaplewski [Mon, 5 Aug 2013 07:07:47 +0000 (09:07 +0200)]
only new xdrf2pdb binary
Dawid Jagiela [Thu, 25 Jul 2013 08:53:59 +0000 (10:53 +0200)]
test name changed for unres MD DFA version
Dawid Jagiela [Thu, 25 Jul 2013 08:53:59 +0000 (10:53 +0200)]
test name changed for unres MD DFA version
Dawid Jagiela [Thu, 25 Jul 2013 08:35:26 +0000 (10:35 +0200)]
Merge branch 'prerelease-3.2.1' into devel
projects / unres.git / log