mmka.chem.univ.gda.pl Git - unres.git/commit

author	Adam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
	Wed, 17 Dec 2014 09:40:58 +0000 (10:40 +0100)
committer	Adam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
	Wed, 17 Dec 2014 09:40:58 +0000 (10:40 +0100)
commit	9b46e3da575cb549a4070ee7d0c75efc729951e6
tree	223d1a55c32df37ef4ba698e35a6e2f8e3c888e9	tree \| snapshot
parent	4d788798cc98884901de55bd9b81f32ea40e986b	commit \| diff
parent	f5379d3246c4bd95e946c4d35d4a1c13e329c4cb	commit \| diff

Merge branch 'master' of mmka:unres into multichain

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/MREMD.F
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-M/unres.F
source/unres/src_MD/cinfo.f
source/wham/src-M/Makefile
source/wham/src/DIMENSIONS.FREE

19 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
bin/unres/MINIM/unres_ifort_MIN_single_GAB.exe	blob1 \|	blob2 \|	history
source/unres/src_MD-M/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/COMMON.DERIV	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/MD_A-MTS.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/MREMD.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/energy_p_new_barrier.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/geomout.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/initialize_p.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/readrtns_CSA.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/sc_move.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/unres.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/COMMON.SCCOR	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/energy_p_new_barrier.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MIN/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/wham/src-M/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/wham/src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/wham/src/energy_p_new.F	diff1 \|	diff2 \|	blob \| history

UNRESPACK 3.x

RSS Atom

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
bin/unres/MINIM/unres_ifort_MIN_single_GAB.exe	blob1 \|	blob2 \|	history
source/unres/src_MD-M/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/COMMON.DERIV	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/MD_A-MTS.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/MREMD.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/energy_p_new_barrier.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/geomout.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/initialize_p.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/readrtns_CSA.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/sc_move.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/unres.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/COMMON.SCCOR	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/energy_p_new_barrier.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MIN/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/wham/src-M/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/wham/src/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/wham/src/energy_p_new.F	diff1 \|	diff2 \|	blob \| history