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

author	Adam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
	Sat, 30 Jul 2022 10:58:20 +0000 (12:58 +0200)
committer	Adam Sieradzan <adasko@piasek4.chem.univ.gda.pl>
	Sat, 30 Jul 2022 10:58:20 +0000 (12:58 +0200)
commit	ae2f9918e1e5f88a78cc32b1d3a7ff90dede1207
tree	9d019a4e86bd34075e833dd10e230b717e0413a9	tree \| snapshot
parent	0f5304c0d44e3ec4d6538de7d274c4b1a1930049	commit \| diff
parent	b74333aa5a167dd84f48d8a9a4c7ac62058e9132	commit \| diff

Merge branch 'UCGM' of mmka.chem.univ.gda.pl:unres4 into UCGM

Conflicts:
source/cluster/io_clust.F90
source/unres/data/energy_data.F90
source/unres/data/names.F90
source/unres/energy.F90
source/wham/enecalc.F90
source/wham/wham_calc.F90
source/wham/wham_data.F90

30 files changed:

PARAM/DUMMY	\|	\|	blob
PARAM/WATWAT_Voth.parm	\|	\|	blob
PARAM/ions_fin_08_02_2022.parm	\|	\|	blob
PARAM/ions_fin_21_02_22.parm	\|	\|	blob
PARAM/ions_fin_23_02_22.parm	\|	\|	blob
PARAM/scinter_GB_ext_lip_nano.parm	\|	\|	blob
PARAM/scparm.momo	\|	\|	blob
PARAM/tube_carbonano3.parm	\|	\|	blob
source/cluster/io_clust.F90	diff1 \|	diff2 \|	blob \| history
source/unres/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/unres/MD.F90	diff1 \|	diff2 \|	blob \| history
source/unres/MREMD.F90	diff1 \|	diff2 \|	blob \| history
source/unres/Makefile	diff1 \|	diff2 \|	blob \| history
source/unres/compare.F90	diff1 \|	diff2 \|	blob \| history
source/unres/control.F90	diff1 \|	diff2 \|	blob \| history
source/unres/data/MD_data.F90	diff1 \|	diff2 \|	blob \| history
source/unres/data/energy_data.F90	diff1 \|	diff2 \|	blob \| history
source/unres/data/io_units.F90	diff1 \|	diff2 \|	blob \| history
source/unres/data/names.F90	diff1 \|	diff2 \|	blob \| history
source/unres/energy.F90	diff1 \|	diff2 \|	blob \| history
source/unres/geometry.F90	diff1 \|	diff2 \|	blob \| history
source/unres/io.F90	diff1 \|	diff2 \|	blob \| history
source/unres/io_base.F90	diff1 \|	diff2 \|	blob \| history
source/unres/io_config.F90	diff1 \|	diff2 \|	blob \| history
source/unres/unres.F90	diff1 \|	diff2 \|	blob \| history
source/wham/enecalc.F90	diff1 \|	diff2 \|	blob \| history
source/wham/io_database.F90	diff1 \|	diff2 \|	blob \| history
source/wham/io_wham.F90	diff1 \|	diff2 \|	blob \| history
source/wham/wham_calc.F90	diff1 \|	diff2 \|	blob \| history
source/wham/wham_data.F90	diff1 \|	diff2 \|	blob \| history

UNRESPACK 4.x

RSS Atom

PARAM/DUMMY	\|	\|	blob
PARAM/WATWAT_Voth.parm	\|	\|	blob
PARAM/ions_fin_08_02_2022.parm	\|	\|	blob
PARAM/ions_fin_21_02_22.parm	\|	\|	blob
PARAM/ions_fin_23_02_22.parm	\|	\|	blob
PARAM/scinter_GB_ext_lip_nano.parm	\|	\|	blob
PARAM/scparm.momo	\|	\|	blob
PARAM/tube_carbonano3.parm	\|	\|	blob
source/cluster/io_clust.F90	diff1 \|	diff2 \|	blob \| history
source/unres/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/unres/MD.F90	diff1 \|	diff2 \|	blob \| history
source/unres/MREMD.F90	diff1 \|	diff2 \|	blob \| history
source/unres/Makefile	diff1 \|	diff2 \|	blob \| history
source/unres/compare.F90	diff1 \|	diff2 \|	blob \| history
source/unres/control.F90	diff1 \|	diff2 \|	blob \| history
source/unres/data/MD_data.F90	diff1 \|	diff2 \|	blob \| history
source/unres/data/energy_data.F90	diff1 \|	diff2 \|	blob \| history
source/unres/data/io_units.F90	diff1 \|	diff2 \|	blob \| history
source/unres/data/names.F90	diff1 \|	diff2 \|	blob \| history
source/unres/energy.F90	diff1 \|	diff2 \|	blob \| history
source/unres/geometry.F90	diff1 \|	diff2 \|	blob \| history
source/unres/io.F90	diff1 \|	diff2 \|	blob \| history
source/unres/io_base.F90	diff1 \|	diff2 \|	blob \| history
source/unres/io_config.F90	diff1 \|	diff2 \|	blob \| history
source/unres/unres.F90	diff1 \|	diff2 \|	blob \| history
source/wham/enecalc.F90	diff1 \|	diff2 \|	blob \| history
source/wham/io_database.F90	diff1 \|	diff2 \|	blob \| history
source/wham/io_wham.F90	diff1 \|	diff2 \|	blob \| history
source/wham/wham_calc.F90	diff1 \|	diff2 \|	blob \| history
source/wham/wham_data.F90	diff1 \|	diff2 \|	blob \| history