Skip to content
This repository has been archived by the owner on Sep 27, 2021. It is now read-only.

cmake: add multicomp. test imc test #581

Merged
merged 2 commits into from
Aug 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ For more detailed information about the changes see the history of the
* move CI to GitHub Actions (#563, #567, #569)
* add max scaling parameter to pressure correction (#565)
* fix test dependencies for parallel ctest (#573)
* fix multicomponent imc (#579)
* fix multicomponent imc (#579, #581)

## Version 1.6.1 (released 21.06.20)
* add support for cma-3 (#158)
Expand Down
22 changes: 22 additions & 0 deletions src/tools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,28 @@ if(ENABLE_TESTING)
set_tests_properties(integration_Compare_csg_imc_solve_reg_output_4 PROPERTIES DEPENDS integration_Run_csg_imc_solve_reg)
set_tests_properties(integration_Compare_csg_imc_solve_reg_output_4 PROPERTIES LABELS "csg;tools;votca;integration")

set(RUNPATH ${CMAKE_CURRENT_BINARY_DIR}/Run_csg_stat_imc_multi)
set(REFPATH ${CMAKE_CURRENT_SOURCE_DIR}/references/LJ1-LJ2/smaller_system)
file(MAKE_DIRECTORY ${RUNPATH})
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${REFPATH}/LJ1-LJ1.dist.tgt ${RUNPATH}/LJ1-LJ1.dist.tgt)
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${REFPATH}/LJ1-LJ2.dist.tgt ${RUNPATH}/LJ1-LJ2.dist.tgt)
execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${REFPATH}/LJ2-LJ2.dist.tgt ${RUNPATH}/LJ2-LJ2.dist.tgt)
add_test(NAME integration_Run_csg_stat_imc_multi
COMMAND csg_stat --top ${REFPATH}/topol.xml --trj ${REFPATH}/traj.gro --do-imc
--options ${REFPATH}/settings_imc.xml
WORKING_DIRECTORY ${RUNPATH})
set_tests_properties(integration_Run_csg_stat_imc_multi PROPERTIES LABELS "csg;tools;votca;integration")
set_tests_properties(integration_Run_csg_stat_imc_multi PROPERTIES DEPENDS integration_Run_gmx_mdrun_multi)
add_test(NAME integration_Compare_csg_stat-imc_multi_output COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 all.imc -f2 ${REFPATH}/all.imc WORKING_DIRECTORY ${RUNPATH})
set_tests_properties(integration_Compare_csg_stat-imc_multi_output PROPERTIES DEPENDS integration_Run_csg_stat-imc)
set_tests_properties(integration_Compare_csg_stat-imc_multi_output PROPERTIES LABELS "csg;tools;votca;integration")
add_test(NAME integration_Compare_csg_stat-imc_multi_output_2 COMMAND $<TARGET_FILE:VOTCA::votca_compare> --etol ${REGRESSIONTEST_TOLERANCE} -f1 all.gmc -f2 ${REFPATH}/all.gmc WORKING_DIRECTORY ${RUNPATH})
set_tests_properties(integration_Compare_csg_stat-imc_multi_output_2 PROPERTIES DEPENDS integration_Run_csg_stat-imc)
set_tests_properties(integration_Compare_csg_stat-imc_multi_output_2 PROPERTIES LABELS "csg;tools;votca;integration")
add_test(NAME integration_Compare_csg_stat-imc_multi_output_3 COMMAND ${CMAKE_COMMAND} -E compare_files all.idx ${REFPATH}/all.idx WORKING_DIRECTORY ${RUNPATH})
set_tests_properties(integration_Compare_csg_stat-imc_multi_output_3 PROPERTIES DEPENDS integration_Run_csg_stat-imc)
set_tests_properties(integration_Compare_csg_stat-imc_multi_output_3 PROPERTIES LABELS "csg;tools;votca;integration")

set(RUNPATH ${CMAKE_CURRENT_BINARY_DIR}/Run_csg_resample)
set(REFPATH ${CMAKE_CURRENT_SOURCE_DIR}/references/csg_resample)
file(MAKE_DIRECTORY ${RUNPATH})
Expand Down
58 changes: 58 additions & 0 deletions src/tools/references/LJ1-LJ2/smaller_system/LJ1-LJ1.dist.tgt
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Created on Sun 16 Aug 2020 03:08:18 PM MDT by junghans@pn1806404-fedora
# called from resample_target.sh, version 1.6.1 gitid: bbbd535 (dirty)
# settings file: '/home/junghans/votca/build/csg-tutorials/LJ1-LJ2/imc/settings.xml'
# working directory: /home/junghans/votca/build/csg-tutorials/LJ1-LJ2/imc/step_001
0.32 0.0461789 i
0.33 0.35068 i
0.34 1.10194 i
0.35 2.00697 i
0.36 2.61527 i
0.37 2.7855 i
0.38 2.63332 i
0.39 2.32983 i
0.4 1.99326 i
0.41 1.68538 i
0.42 1.42664 i
0.43 1.21668 i
0.44 1.05379 i
0.45 0.92566 i
0.46 0.825243 i
0.47 0.750721 i
0.48 0.695109 i
0.49 0.65482 i
0.5 0.628716 i
0.51 0.612063 i
0.52 0.60708 i
0.53 0.612287 i
0.54 0.625476 i
0.55 0.649703 i
0.56 0.683099 i
0.57 0.725751 i
0.58 0.77785 i
0.59 0.835395 i
0.6 0.897581 i
0.61 0.96196 i
0.62 1.02413 i
0.63 1.08015 i
0.64 1.12913 i
0.65 1.16821 i
0.66 1.19436 i
0.67 1.21005 i
0.68 1.21655 i
0.69 1.21507 i
0.7 1.20353 i
0.71 1.18602 i
0.72 1.15976 i
0.73 1.12847 i
0.74 1.09225 i
0.75 1.05303 i
0.76 1.01446 i
0.77 0.978071 i
0.78 0.945128 i
0.79 0.916319 i
0.8 0.893767 i
0.81 0.876978 i
0.82 0.865074 i
0.83 0.860647 i
0.84 0.861604 i
0.85 0.867301 i
61 changes: 61 additions & 0 deletions src/tools/references/LJ1-LJ2/smaller_system/LJ1-LJ2.dist.tgt
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Created on Sun 16 Aug 2020 03:08:18 PM MDT by junghans@pn1806404-fedora
# called from resample_target.sh, version 1.6.1 gitid: bbbd535 (dirty)
# settings file: '/home/junghans/votca/build/csg-tutorials/LJ1-LJ2/imc/settings.xml'
# working directory: /home/junghans/votca/build/csg-tutorials/LJ1-LJ2/imc/step_001
0.29 0.00407706 i
0.3 0.0980601 i
0.31 0.586629 i
0.32 1.5219 i
0.33 2.40606 i
0.34 2.83031 i
0.35 2.80895 i
0.36 2.53853 i
0.37 2.18661 i
0.38 1.8464 i
0.39 1.55435 i
0.4 1.31687 i
0.41 1.13097 i
0.42 0.986734 i
0.43 0.874927 i
0.44 0.791855 i
0.45 0.728925 i
0.46 0.680994 i
0.47 0.648911 i
0.48 0.628711 i
0.49 0.619172 i
0.5 0.619586 i
0.51 0.628307 i
0.52 0.64696 i
0.53 0.675497 i
0.54 0.711636 i
0.55 0.75716 i
0.56 0.809867 i
0.57 0.867546 i
0.58 0.928006 i
0.59 0.986756 i
0.6 1.04163 i
0.61 1.09197 i
0.62 1.13427 i
0.63 1.16634 i
0.64 1.18957 i
0.65 1.20389 i
0.66 1.2077 i
0.67 1.20385 i
0.68 1.19274 i
0.69 1.17371 i
0.7 1.14571 i
0.71 1.11348 i
0.72 1.07613 i
0.73 1.03824 i
0.74 1.0008 i
0.75 0.965699 i
0.76 0.935099 i
0.77 0.910166 i
0.78 0.890604 i
0.79 0.876204 i
0.8 0.868734 i
0.81 0.866601 i
0.82 0.869003 i
0.83 0.877674 i
0.84 0.890004 i
0.85 0.905635 i
63 changes: 63 additions & 0 deletions src/tools/references/LJ1-LJ2/smaller_system/LJ2-LJ2.dist.tgt
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# Created on Sun 16 Aug 2020 03:08:18 PM MDT by junghans@pn1806404-fedora
# called from resample_target.sh, version 1.6.1 gitid: bbbd535 (dirty)
# settings file: '/home/junghans/votca/build/csg-tutorials/LJ1-LJ2/imc/settings.xml'
# working directory: /home/junghans/votca/build/csg-tutorials/LJ1-LJ2/imc/step_001
0.27 0.00564834 i
0.28 0.134565 i
0.29 0.741135 i
0.3 1.7536 i
0.31 2.56094 i
0.32 2.83661 i
0.33 2.70727 i
0.34 2.38417 i
0.35 2.02604 i
0.36 1.70247 i
0.37 1.43488 i
0.38 1.22381 i
0.39 1.05892 i
0.4 0.932305 i
0.41 0.836471 i
0.42 0.764144 i
0.43 0.709969 i
0.44 0.673153 i
0.45 0.648446 i
0.46 0.632466 i
0.47 0.628724 i
0.48 0.633526 i
0.49 0.647372 i
0.5 0.670475 i
0.51 0.701558 i
0.52 0.741491 i
0.53 0.788987 i
0.54 0.840737 i
0.55 0.896867 i
0.56 0.952862 i
0.57 1.00688 i
0.58 1.05708 i
0.59 1.09982 i
0.6 1.13533 i
0.61 1.16416 i
0.62 1.1839 i
0.63 1.19464 i
0.64 1.19853 i
0.65 1.19478 i
0.66 1.18055 i
0.67 1.15885 i
0.68 1.13025 i
0.69 1.09648 i
0.7 1.05865 i
0.71 1.02192 i
0.72 0.985704 i
0.73 0.953645 i
0.74 0.926263 i
0.75 0.903422 i
0.76 0.886753 i
0.77 0.876282 i
0.78 0.87138 i
0.79 0.871089 i
0.8 0.876902 i
0.81 0.886559 i
0.82 0.899136 i
0.83 0.916078 i
0.84 0.934397 i
0.85 0.953522 i
Loading