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
Adam Sieradzan [Wed, 16 Oct 2013 13:51:06 +0000 (15:51 +0200)]
drobnostki w ext theta (cofniete)
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
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 Sieradzan [Mon, 12 Aug 2013 20:32:43 +0000 (22:32 +0200)]
new tosrional double torsional and valence
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
Dawid Jagiela [Thu, 25 Jul 2013 08:14:18 +0000 (10:14 +0200)]
fixed WHAM for gfortran: src/energy_p_new.F
Adam Sieradzan [Tue, 16 Jul 2013 19:01:25 +0000 (21:01 +0200)]
NIE PEWNE ZMIANY ZWERYFIKUJ!!
Adam Kazimierz Sieradzan [Fri, 28 Jun 2013 18:12:54 +0000 (14:12 -0400)]
Just few comments added to WHAM to clarify
Adam Kazimierz Sieradzan [Fri, 28 Jun 2013 01:00:10 +0000 (21:00 -0400)]
Bugfix for SS wham and introduction SS to cluster analysis
Adam Kazimierz Sieradzan [Tue, 25 Jun 2013 23:37:52 +0000 (19:37 -0400)]
Dodanie dynamic disulfide to WHAM
Cezary Czaplewski [Tue, 7 May 2013 13:39:45 +0000 (15:39 +0200)]
some corrections in xdrf2pdb-m for dyn_ss
Cezary Czaplewski [Tue, 30 Apr 2013 07:10:32 +0000 (09:10 +0200)]
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Cezary Czaplewski [Tue, 30 Apr 2013 07:08:54 +0000 (09:08 +0200)]
testing ssbond in cx
Dawid Jagiela [Thu, 18 Apr 2013 14:44:24 +0000 (16:44 +0200)]
restructured examples
Dawid Jagiela [Mon, 15 Apr 2013 11:38:26 +0000 (13:38 +0200)]
changed SCCORPAR to shelly potentials in GAB & 12LY ff - UNRESInpGen.py
Dawid Jagiela [Fri, 12 Apr 2013 10:47:11 +0000 (12:47 +0200)]
added default preprocessor flags for unknown compilers
Dawid Jagiela [Thu, 11 Apr 2013 11:17:48 +0000 (13:17 +0200)]
added REMD/MREMD input generation in UNRESInpGen.py
Cezary Czaplewski [Mon, 8 Apr 2013 13:01:54 +0000 (09:01 -0400)]
correct writing of dyn_ss for cx and x
Dawid Jagiela [Thu, 7 Mar 2013 12:10:51 +0000 (13:10 +0100)]
added OVERLAP and NOSEARCHSC options in UNRESInpGen.py
Dawid Jagiela [Wed, 6 Mar 2013 15:26:08 +0000 (16:26 +0100)]
Added minimazation support to UNRESInpGen.py
Dawid Jagiela [Tue, 5 Mar 2013 11:32:20 +0000 (12:32 +0100)]
added glicyne support in show_UNRES.py
Dawid Jagiela [Thu, 28 Feb 2013 12:36:00 +0000 (13:36 +0100)]
Merge branch 'devel' of mmka:unres into devel
Dawid Jagiela [Thu, 28 Feb 2013 12:31:57 +0000 (13:31 +0100)]
fixed ray-tracing bug and size of ellipoids in show_UNRES.py
Cezary Czaplewski [Tue, 19 Feb 2013 02:26:17 +0000 (03:26 +0100)]
cleaning of gfortran warnings in src_MD_DFA
Cezary Czaplewski [Tue, 19 Feb 2013 02:17:08 +0000 (03:17 +0100)]
cleaning of gfortran warnings
Cezary Czaplewski [Tue, 19 Feb 2013 02:06:11 +0000 (03:06 +0100)]
copy DFA cleaning of types from CSA to MD
Cezary Czaplewski [Tue, 19 Feb 2013 01:41:54 +0000 (02:41 +0100)]
repairs error in merge
Cezary Czaplewski [Tue, 19 Feb 2013 00:50:42 +0000 (01:50 +0100)]
Merge branch 'prerelease-3.2.1' into devel
Conflicts:
bin/unres/CSA/unres_csa_ifort_mpich-1.2.7p1.exe
bin/unres/MD/unres_gfortran_single_GAB.exe
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
bin/unres/MD/unres_ifort_single_GAB.exe
bin/unres/MINIM/unres_ifort_MIN_single_E0LL2Y.exe
source/unres/src_CSA/Makefile
source/unres/src_CSA_DiL/refsys.f
source/unres/src_MD-M/Makefile
source/unres/src_MD/parmread.F
source/unres/src_MD_DFA/COMMON.REFSYS
Cezary Czaplewski [Tue, 19 Feb 2013 00:06:47 +0000 (01:06 +0100)]
dyn_ss and other finegrain printout cleaning
Cezary Czaplewski [Mon, 18 Feb 2013 12:52:01 +0000 (13:52 +0100)]
dynamic dissulfides with finegrain parallelization cont.
Cezary Czaplewski [Mon, 18 Feb 2013 07:47:34 +0000 (08:47 +0100)]
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Cezary Czaplewski [Mon, 18 Feb 2013 07:46:11 +0000 (08:46 +0100)]
dynamic dissulfides with finegrain parallelization
Adam Liwo [Mon, 18 Feb 2013 07:10:29 +0000 (02:10 -0500)]
Added refsys.f to src_CSA_DiL
Adam Liwo [Mon, 18 Feb 2013 04:54:00 +0000 (23:54 -0500)]
Added refsys,f
Adam Liwo [Mon, 18 Feb 2013 04:49:11 +0000 (23:49 -0500)]
refsys deleted from readpdb.F in srd_CSA_DiL
Adam Liwo [Mon, 18 Feb 2013 04:47:02 +0000 (23:47 -0500)]
refsys separated from readpdb in src_CDA_DiL
Adam Liwo [Mon, 18 Feb 2013 04:41:27 +0000 (23:41 -0500)]
Added refsysy to Cmakelists
Adam Liwo [Thu, 8 Nov 2012 13:58:32 +0000 (08:58 -0500)]
8/11/12 by Adam: fixed disulfide bridge problems
Conflicts:
bin/unres/CSA/unres_csa_ifort_mpich-1.2.7p1.exe
bin/unres/MD-M/unres_Tc_procor_oldparm_em64-D-symetr.exe
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
bin/unres/MD/unres_ifort_single_GAB.exe
source/unres/src_MD/parmread.F
Cezary Czaplewski [Mon, 18 Feb 2013 00:23:23 +0000 (01:23 +0100)]
compilation only
Adam Liwo [Sun, 17 Feb 2013 04:41:34 +0000 (23:41 -0500)]
Fixed addition of dummy residues for input UNRES pdb files
Fixed arcos.f
Adam Liwo [Sun, 17 Feb 2013 04:25:47 +0000 (23:25 -0500)]
added files deleted by merge with devel
Adam Liwo [Sun, 17 Feb 2013 04:24:40 +0000 (23:24 -0500)]
added files deleted by merge with devel
Adam Liwo [Sun, 17 Feb 2013 03:34:55 +0000 (22:34 -0500)]
Fixed the addition of dummy chain ends to structures read from UNRES PDB files
Fixed the bug in arcos.f (returned alpha=0 for cos(alpha)<=-1)
Conflicts:
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
source/unres/src_MD-M/Makefile
Adam Liwo [Sun, 17 Feb 2013 03:45:06 +0000 (22:45 -0500)]
Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
Adam Liwo [Sun, 17 Feb 2013 03:34:55 +0000 (22:34 -0500)]
Fixed the addition of dummy chain ends to structures read from UNRES PDB files
Fixed the bug in arcos.f (returned alpha=0 for cos(alpha)<=-1)
Cezary Czaplewski [Sun, 17 Feb 2013 02:06:59 +0000 (03:06 +0100)]
dyn_ss writing pdb and ihpb cleaning
Cezary Czaplewski [Sat, 16 Feb 2013 13:44:13 +0000 (14:44 +0100)]
more type cleaning in DFA
Cezary Czaplewski [Sat, 16 Feb 2013 13:38:19 +0000 (14:38 +0100)]
type declaration in COMMON.DFA
Cezary Czaplewski [Sat, 16 Feb 2013 13:20:06 +0000 (14:20 +0100)]
no type declaration in common
Cezary Czaplewski [Sat, 16 Feb 2013 13:09:23 +0000 (14:09 +0100)]
no type declaration in common
Cezary Czaplewski [Sat, 16 Feb 2013 12:05:44 +0000 (13:05 +0100)]
common sccor rename to avoid conflict with torsion
Cezary Czaplewski [Sat, 16 Feb 2013 12:01:38 +0000 (13:01 +0100)]
classical Makefile cleaning
Cezary Czaplewski [Sat, 16 Feb 2013 11:20:46 +0000 (12:20 +0100)]
rename common sccorin src_CSA
Cezary Czaplewski [Sat, 16 Feb 2013 11:05:56 +0000 (12:05 +0100)]
src_MD-M compiles with old Makefile and common sccor rename
Cezary Czaplewski [Sat, 16 Feb 2013 06:34:33 +0000 (07:34 +0100)]
common name correction
Cezary Czaplewski [Sat, 16 Feb 2013 06:10:05 +0000 (07:10 +0100)]
prng and not prng_32 for gfortran
Cezary Czaplewski [Sat, 16 Feb 2013 05:31:17 +0000 (06:31 +0100)]
prng and not prng_32 for f95
Cezary Czaplewski [Sat, 16 Feb 2013 03:56:34 +0000 (04:56 +0100)]
new SCCORPAR for ctest
Cezary Czaplewski [Sat, 16 Feb 2013 03:16:00 +0000 (04:16 +0100)]
common reorder to avoid padding in gfortran
Cezary Czaplewski [Sat, 16 Feb 2013 01:31:51 +0000 (02:31 +0100)]
small changes to compile in gfortran
Cezary Czaplewski [Fri, 15 Feb 2013 09:16:51 +0000 (10:16 +0100)]
dynamic disulfides are working again in md
Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
examples/unres/new/MD/DYN_SS/dyn_ss/small.inp
examples/unres/new/MD/DYN_SS/dyn_ss/unres_eval.csh
examples/unres/new/MD/DYN_SS/dyn_ss_from_pdb/small.inp
examples/unres/new/MD/DYN_SS/dyn_ss_from_pdb/small.out_GB000
examples/unres/new/MD/DYN_SS/dyn_ss_from_pdb/small_000.rst
examples/unres/new/MD/DYN_SS/dyn_ss_from_pdb/small_GB000.stat
examples/unres/new/MD/DYN_SS/dyn_ss_from_pdb/small_MD000.pdb
examples/unres/new/MD/DYN_SS/no_ss/small.inp
examples/unres/new/MD/DYN_SS/no_ss/small.out_GB000
examples/unres/new/MD/DYN_SS/no_ss/small_GB000.stat
source/unres/src_MD/cinfo.f
source/unres/src_MD/energy_p_new_barrier.F
Cezary Czaplewski [Fri, 15 Feb 2013 00:50:59 +0000 (01:50 +0100)]
adding ename to statout with PRINT_COMPON
Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
examples/unres/new/MD/DYN_SS/no_ss/small.out_GB000
examples/unres/new/MD/DYN_SS/ss/small.inp
examples/unres/new/MD/DYN_SS/ss/small.out_GB000
examples/unres/new/MD/DYN_SS/ss/small_GB000.stat
source/unres/src_MD/cinfo.f
Cezary Czaplewski [Mon, 24 Sep 2012 12:02:06 +0000 (14:02 +0200)]
MULTCONF is working now
Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
Cezary Czaplewski [Mon, 24 Sep 2012 08:56:04 +0000 (10:56 +0200)]
error message when reading SCCOR corrected
Conflicts:
bin/unres/MD/unres_ifort_MPICH_E0LL2Y-test.exe
Cezary Czaplewski [Fri, 21 Sep 2012 08:41:32 +0000 (10:41 +0200)]
ss_dyn compiles with make and with cmake
Cezary Czaplewski [Thu, 20 Sep 2012 08:33:37 +0000 (10:33 +0200)]
dynamic SS from old Maurizio's code
Conflicts:
bin/unres/MD/unres_ifort_MPICH_GAB.exe
Cezary Czaplewski [Thu, 14 Feb 2013 23:48:05 +0000 (00:48 +0100)]
compilation only
Dawid Jagiela [Sun, 10 Feb 2013 23:44:52 +0000 (00:44 +0100)]
added UNRES visualization plugin for PyMOL
Bartlomiej Zaborowski [Thu, 7 Feb 2013 12:37:21 +0000 (13:37 +0100)]
kosmetyczne zmiany do MD_DFA
Bartlomiej Zaborowski [Wed, 6 Feb 2013 14:59:31 +0000 (15:59 +0100)]
Merge branch 'devel' of mmka:unres into devel
Bartlomiej Zaborowski [Wed, 6 Feb 2013 14:57:48 +0000 (15:57 +0100)]
Files to working MD_DFA
Bartlomiej Zaborowski [Wed, 6 Feb 2013 14:56:43 +0000 (15:56 +0100)]
Working MD_DFA
Dawid Jagiela [Wed, 6 Feb 2013 13:56:22 +0000 (14:56 +0100)]
added pymol/UNRESInpGen.py - generates inputs for MD
Dawid Jagiela [Thu, 10 Jan 2013 10:25:21 +0000 (11:25 +0100)]
fixed missing closing bracket
Dawid Jagiela [Thu, 10 Jan 2013 10:21:22 +0000 (11:21 +0100)]
WHAM -DISNAN fix
Dawid Jagiela [Thu, 10 Jan 2013 09:56:24 +0000 (10:56 +0100)]
added UNRES_MD_FF setting for WHAM in (wham & cluster/wham)
Adam Sieradzan [Sun, 6 Jan 2013 18:52:46 +0000 (19:52 +0100)]
Wprowadzenie do Clustrowania D-aminokwasow w polu Yi
Dawid Jagiela [Wed, 19 Dec 2012 14:13:37 +0000 (15:13 +0100)]
Merge branch 'prerelease-3.2.1' of mmka:unres into prerelease-3.2.1
Dawid Jagiela [Wed, 19 Dec 2012 13:01:49 +0000 (14:01 +0100)]
poprawki w COMMONAch
Adam Sieradzan [Tue, 18 Dec 2012 11:51:32 +0000 (12:51 +0100)]
Usuniecie diagnostyki
Adam Kazimierz Sieradzan [Wed, 12 Dec 2012 12:21:27 +0000 (07:21 -0500)]
debud OFF
Adam Kazimierz Sieradzan [Wed, 12 Dec 2012 11:44:50 +0000 (06:44 -0500)]
Merge branch 'adasko' of mmka.chem.univ.gda.pl:unres into adasko
Andrei Niadzvedtski [Wed, 12 Dec 2012 11:43:15 +0000 (12:43 +0100)]
debug ON w MD
Adam Kazimierz Sieradzan [Wed, 12 Dec 2012 10:21:45 +0000 (05:21 -0500)]
Merge branch 'adasko' of mmka.chem.univ.gda.pl:unres into adasko
Adam Sieradzan [Mon, 10 Dec 2012 12:38:34 +0000 (13:38 +0100)]
zmiana w komonie
Adam Sieradzan [Mon, 10 Dec 2012 08:54:21 +0000 (09:54 +0100)]
zmiana w COMMONIE
Adam Kazimierz Sieradzan [Thu, 6 Dec 2012 12:43:22 +0000 (07:43 -0500)]
Merge branch 'adasko' of mmka.chem.univ.gda.pl:unres into adasko
Adam Sieradzan [Thu, 6 Dec 2012 12:19:21 +0000 (13:19 +0100)]
bugfix w whamie w parmreadzie
Adam Kazimierz Sieradzan [Thu, 6 Dec 2012 09:31:09 +0000 (04:31 -0500)]
zmiany w xdrfie
Adam Sieradzan [Thu, 6 Dec 2012 09:17:42 +0000 (10:17 +0100)]
bugfix przekroczenia granic
Adam Sieradzan [Wed, 5 Dec 2012 13:01:05 +0000 (14:01 +0100)]
zmaina w xdrf
Adam Sieradzan [Tue, 4 Dec 2012 08:09:28 +0000 (09:09 +0100)]
bugfix w contact parm
Pawel Krupa [Tue, 4 Dec 2012 08:06:08 +0000 (03:06 -0500)]
New examples based on current version of UNRES.
projects / unres.git / log