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

author	Cezary Czaplewski <czarek@chem.univ.gda.pl>
	Mon, 25 Sep 2017 08:34:06 +0000 (10:34 +0200)
committer	Cezary Czaplewski <czarek@chem.univ.gda.pl>
	Mon, 25 Sep 2017 08:34:06 +0000 (10:34 +0200)
commit	9453fc761eb545fcb727824c94d012dbf3931951
tree	719f4b868f1cd3afb127d41f79b6a82c9df837e1	tree \| snapshot
parent	6f521277aa2a382d409f5189957283b0998b0d07	commit \| diff
parent	589a8f3e38b7ce802f8577e862e54849030a5556	commit \| diff

Merge branch 'prerelease-3.2.1'

Conflicts:
bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
bin/wham/wham-mult_ifort_MPICH-GAB.exe
source/cluster/unres/src/arcos.f
source/cluster/wham/src-M/arcos.f
source/cluster/wham/src/arcos.f
source/wham/src-M/arcos.f
source/wham/src/arcos.f
source/xdrfpdb/src-M/arcos.f
source/xdrfpdb/src/arcos.f

33 files changed:

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
bin/cluster/cluster_unres_ifort.exe	\|	\|	blob
bin/cluster/cluster_wham-mult_ifort_MPI_4P.exe	\|	\|	blob
bin/cluster/cluster_wham-mult_ifort_MPI_E0LL2Y.exe	\|	\|	blob
bin/cluster/cluster_wham-mult_ifort_MPI_GAB.exe	\|	\|	blob
bin/cluster/cluster_wham_ifort_MPI_4P.exe	\|	\|	blob
bin/cluster/cluster_wham_ifort_MPI_E0LL2Y.exe	\|	\|	blob
bin/cluster/cluster_wham_ifort_MPI_GAB.exe	\|	\|	blob
bin/unres/CSA/unresCSA_ifort_MPI_4P.exe	\|	\|	blob
bin/unres/CSA/unresCSA_ifort_MPI_E0LL2Y.exe	\|	\|	blob
bin/unres/CSA/unresCSA_ifort_MPI_GAB.exe	\|	\|	blob
bin/unres/MD/unresMD-mult_ifort_MPI_4P.exe	\|	\|	blob
bin/unres/MD/unresMD-mult_ifort_MPI_E0LL2Y.exe	\|	\|	blob
bin/unres/MD/unresMD-mult_ifort_MPI_GAB.exe	\|	\|	blob
bin/unres/MD/unresMD_ifort_MPI_4P.exe	\|	\|	blob
bin/unres/MD/unresMD_ifort_MPI_E0LL2Y.exe	\|	\|	blob
bin/unres/MD/unresMD_ifort_MPI_GAB.exe	\|	\|	blob
bin/unres/MD/unres_E0LL2Y.csh	diff1 \|	diff2 \|	blob \| history
bin/unres/MINIM/unres_ifort_MIN_single_4P.exe	\|	diff2 \|	blob \| history
bin/unres/MINIM/unres_ifort_MIN_single_E0LL2Y.exe	\|	diff2 \|	blob \| history
bin/unres/MINIM/unres_ifort_MIN_single_GAB.exe	\|	diff2 \|	blob \| history
bin/wham/wham-mult_ifort_MPI_4P.exe	\|	\|	blob
bin/wham/wham-mult_ifort_MPI_E0LL2Y.exe	\|	\|	blob
bin/wham/wham-mult_ifort_MPI_GAB.exe	\|	\|	blob
bin/wham/wham_ifort_MPI_4P.exe	\|	\|	blob
bin/wham/wham_ifort_MPI_E0LL2Y.exe	\|	\|	blob
bin/wham/wham_ifort_MPI_GAB.exe	\|	\|	blob
bin/xdrfpdb/xdrf2ang	diff1 \|	\|	blob \| history
bin/xdrfpdb/xdrf2pdb	diff1 \|	diff2 \|	blob \| history
bin/xdrfpdb/xdrf2pdb-m	diff1 \|	diff2 \|	blob \| history
bin/xdrfpdb/xdrf2pdb-m-mult	diff1 \|	diff2 \|	blob \| history
bin/xdrfpdb/xdrf2pdb-mult	diff1 \|	diff2 \|	blob \| history
bin/xdrfpdb/xdrf2x	diff1 \|	\|	blob \| history

UNRESPACK 3.x

RSS Atom