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

author	Adam Liwo <adam@matrix.chem.cornell.edu>
	Mon, 18 Jun 2012 14:08:46 +0000 (10:08 -0400)
committer	Adam Liwo <adam@matrix.chem.cornell.edu>
	Mon, 18 Jun 2012 14:08:46 +0000 (10:08 -0400)
commit	fa1db3888c80d6b1ceb7c21f466415e299c45233
tree	04f76dd425fd209ba23c93081d2117ece147179a	tree \| snapshot
parent	0fcfcdb0d41d3ff88aadc59c6dbc2448c9c8fd4f	commit \| diff
parent	f28b6049844f723c108dc6eb421bd852887950ba	commit \| diff

Merge branch 'devel' of mmka.chem.univ.gda.pl:unres into devel
merge adam->devel (2nd attempt)
Conflicts:
.gitignore
bin/unres/MD/unres_ifort_MPICH_GAB.exe
examples/unres/MD/ff_gab/1L2Y_minim.inp
source/cluster/wham/src/DIMENSIONS.COMPAR
source/cluster/wham/src/include_unres/COMMON.INTERACT
source/cluster/wham/src/include_unres/COMMON.SBRIDGE
source/cluster/wham/src/include_unres/COMMON.TORSION
source/unres/src_MD/cinfo.f
source/unres/src_MIN/Makefile
source/xdrfpdb/src-M/xdrf
source/xdrfpdb/src/xdrf
source/xdrfpdb/src/xdrf2ang.f
source/xdrfpdb/src/xdrf2pdb-m.F

18 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
examples/unres/MD/ff_gab/1L2Y_minim.inp	diff1 \|	diff2 \|	blob \| history
source/cluster/wham/src/DIMENSIONS.COMPAR	diff1 \|	diff2 \|	blob \| history
source/cluster/wham/src/energy_p_new.F	diff1 \|	diff2 \|	blob \| history
source/cluster/wham/src/include_unres/COMMON.INTERACT	diff1 \|	diff2 \|	blob \| history
source/cluster/wham/src/include_unres/COMMON.SBRIDGE	diff1 \|	diff2 \|	blob \| history
source/cluster/wham/src/include_unres/COMMON.TORSION	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/unres.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/Makefile_MPICH_ifort	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/cinfo.f	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/energy_p_new_barrier.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/readrtns.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MIN/energy_p_new_barrier.F	diff1 \|	diff2 \|	blob \| history
source/wham/src/energy_p_new.F	diff1 \|	diff2 \|	blob \| history
source/xdrfpdb/src-M/xdrf2pdb-m.F	diff1 \|	diff2 \|	blob \| history
source/xdrfpdb/src/Makefile	diff1 \|	diff2 \|	blob \| history
source/xdrfpdb/src/xdrf2ang.f	diff1 \|	diff2 \|	blob \| history
source/xdrfpdb/src/xdrf2pdb-m.F	diff1 \|	diff2 \|	blob \| history

UNRESPACK 3.x

RSS Atom

.gitignore	diff1 \|	diff2 \|	blob \| history
examples/unres/MD/ff_gab/1L2Y_minim.inp	diff1 \|	diff2 \|	blob \| history
source/cluster/wham/src/DIMENSIONS.COMPAR	diff1 \|	diff2 \|	blob \| history
source/cluster/wham/src/energy_p_new.F	diff1 \|	diff2 \|	blob \| history
source/cluster/wham/src/include_unres/COMMON.INTERACT	diff1 \|	diff2 \|	blob \| history
source/cluster/wham/src/include_unres/COMMON.SBRIDGE	diff1 \|	diff2 \|	blob \| history
source/cluster/wham/src/include_unres/COMMON.TORSION	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/unres.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/Makefile_MPICH_ifort	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/cinfo.f	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/energy_p_new_barrier.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/readrtns.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MIN/energy_p_new_barrier.F	diff1 \|	diff2 \|	blob \| history
source/wham/src/energy_p_new.F	diff1 \|	diff2 \|	blob \| history
source/xdrfpdb/src-M/xdrf2pdb-m.F	diff1 \|	diff2 \|	blob \| history
source/xdrfpdb/src/Makefile	diff1 \|	diff2 \|	blob \| history
source/xdrfpdb/src/xdrf2ang.f	diff1 \|	diff2 \|	blob \| history
source/xdrfpdb/src/xdrf2pdb-m.F	diff1 \|	diff2 \|	blob \| history