mmka.chem.univ.gda.pl Git - unres.git/commit - source/unres/src_MD/geomout.F

projects / unres.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 272adb4 7359d54)

author	Adam Liwo <adam@piasek4.chem.univ.gda.pl>
	Sun, 10 May 2015 02:31:17 +0000 (04:31 +0200)
committer	Adam Liwo <adam@piasek4.chem.univ.gda.pl>
	Sun, 10 May 2015 02:31:17 +0000 (04:31 +0200)
commit	050ed1574772b7d2bdee4225feda68c312beca75
tree	1871e108c30536527920b1b5e63fad91d9b48db5	tree \| snapshot
parent	272adb4603e8f27ca6f69069921e2d72f4ad3cb3	commit \| diff
parent	7359d54981227ebc66af5d3d191e098b7357d92e	commit \| diff

Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1

Conflicts:
source/unres/src_MD/intcartderiv.F

14 files changed:

bin/unres/MD/unres-mult-symetr_ifort_MPICH_E0LL2Y.exe	diff1 \|	diff2 \|	blob \| history
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe	diff1 \|	diff2 \|	blob \| history
bin/unres/MINIM/unres_ifort_MIN_single_E0LL2Y.exe	diff1 \|	diff2 \|	blob \| history
source/unres/src_CSA/geomout_min.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/DIMENSIONS	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/cinfo.f	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD-M/geomout.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MD/checkder_p.F	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/geomout.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MIN/DIMENSIONS	diff1 \|	diff2 \|	blob \| history
source/unres/src_MIN/geomout_min.F	diff1 \|	diff2 \|	blob \| history
source/unres/src_MIN/unres_min.F	diff1 \|	diff2 \|	blob \| history

UNRESPACK 3.x