projects / unres.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 325eda1 3a74889)
Merge branch 'devel' into AFM
authorAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Thu, 6 Aug 2015 08:39:41 +0000 (10:39 +0200)
committerAdam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
Thu, 6 Aug 2015 08:39:41 +0000 (10:39 +0200)
commitd101c97dea752458d76055fdbae49c26fff03c1f
tree6b41e08a58746819c21abc7728e581a541fde9datree | snapshot
parent325eda160c9ad2982501e091ca40606a29043712commit | diff
parent3a74889c3f6514588d40ec326a78f33b3663f5becommit | diff
Merge branch 'devel' into AFM

Conflicts:
.gitignore
PARAM/pot_theta_G631_DIL.parm
bin/unres/MD/unres-mult-symetr_ifort_MPICH_E0LL2Y.exe
bin/unres/MD/unres_Tc_procor_oldparm_em64-D-symetr.exe
bin/unres/MD/unres_ifort_MPICH_GAB.exe
bin/xdrf2ang
bin/xdrf2pdb
bin/xdrf2pdb-m
source/cluster/wham/src-M/energy_p_new.F
source/maxlik/src_CSA/CMakeLists.txt
source/unres/src_CSA_DiL/CMakeLists.txt
source/unres/src_CSA_DiL/Makefile
source/unres/src_CSA_DiL/csa.F
source/unres/src_MD-M/COMMON.CONTROL
source/unres/src_MD-M/DIMENSIONS
source/unres/src_MD-M/Makefile
source/unres/src_MD-M/cinfo.f
source/unres/src_MD-M/energy_p_new_barrier.F
source/unres/src_MD-M/parmread.F
source/unres/src_MD-M/refsys.f
source/unres/src_MD/COMMON.TORSION
source/wham/src-M/DIMENSIONS
source/wham/src-M/energy_p_new.F
source/wham/src-M/readrtns.F
source/xdrfpdb/src/Makefile
29 files changed:
.gitignore diff1 | diff2 | blob | history
bin/unres/MD/unres-mult-symetr_ifort_MPICH_E0LL2Y.exe blob1 | blob2 | history
bin/unres/MD/unres_ifort_MPICH_GAB.exe blob1 | blob2 | history
source/cluster/wham/src-M/energy_p_new.F diff1 | diff2 | blob | history
source/cluster/wham/src-M/parmread.F diff1 | diff2 | blob | history
source/cluster/wham/src-M/readrtns.F diff1 | diff2 | blob | history
source/unres/src_CSA/CMakeLists.txt diff1 | diff2 | blob | history
source/unres/src_MD-M/COMMON.CONTROL diff1 | diff2 | blob | history
source/unres/src_MD-M/DIMENSIONS diff1 | diff2 | blob | history
source/unres/src_MD-M/Makefile diff1 | diff2 | blob | history
source/unres/src_MD-M/checkder_p.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/intcartderiv.F diff1 | diff2 | blob | history
source/unres/src_MD-M/parmread.F diff1 | diff2 | blob | history
source/unres/src_MD-M/readpdb.F diff1 | diff2 | blob | history
source/unres/src_MD-M/readrtns_CSA.F diff1 | diff2 | blob | history
source/unres/src_MD-M/refsys.f diff1 | diff2 | blob | history
source/unres/src_MD-M/ssMD.F diff1 | diff2 | blob | history
source/unres/src_MD-M/unres.F diff1 | diff2 | blob | history
source/unres/src_MD/initialize_p.F diff1 | diff2 | blob | history
source/unres/src_MD/parmread.F diff1 | diff2 | blob | history
source/unres/src_MD/ssMD.F diff1 | diff2 | blob | history
source/wham/src-M/enecalc1.F diff1 | diff2 | blob | history
source/wham/src-M/energy_p_new.F diff1 | diff2 | blob | history
source/wham/src-M/initialize_p.F diff1 | diff2 | blob | history
source/wham/src-M/parmread.F diff1 | diff2 | blob | history
source/wham/src-M/readrtns.F diff1 | diff2 | blob | history
UNRESPACK 3.x