X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Funres%2Fsrc_MD%2FCMakeLists.txt;h=77d4834f98ecf0fc82e50ada0fbf442958490962;hb=c61be37fdbdeaeb53d62218e259d528b8f21e7ee;hp=5e7341f1c400987b95be4f3b3d21c283ee602bcb;hpb=77e6ab247a00c03cff89430c9a2806af9403f787;p=unres.git

diff --git a/source/unres/src_MD/CMakeLists.txt b/source/unres/src_MD/CMakeLists.txt
index 5e7341f..77d4834 100644
--- a/source/unres/src_MD/CMakeLists.txt
+++ b/source/unres/src_MD/CMakeLists.txt
@@ -388,17 +388,21 @@ FILE(COPY ${CMAKE_SOURCE_DIR}/ctest/prota.pdb
 FILE(COPY ${CMAKE_SOURCE_DIR}/ctest/prota_ENE.inp
         DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
 
+FILE(COPY ${CMAKE_SOURCE_DIR}/ctest/prota_MIN_CART.inp
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
+
+FILE(COPY ${CMAKE_SOURCE_DIR}/ctest/1l2y_micro.inp
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
+
+FILE(COPY ${CMAKE_SOURCE_DIR}/ctest/1L2Y.pdb
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
+
+
 FILE(COPY ${CMAKE_SOURCE_DIR}/ctest/prota_unres_energy_check.sh
         DESTINATION ${CMAKE_CURRENT_BINARY_DIR} 
         FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )
 
-if(NOT UNRES_WITH_MPI)
- set(prota_unres_energy_output "prota_ENE.out_GB")
-else(NOT UNRES_WITH_MPI)
- set(prota_unres_energy_output "prota_ENE.out_GB000")
-endif(NOT UNRES_WITH_MPI)
-
 #=========================================
 #  test_prota_E0LL2Y.sh
 #=========================================
@@ -406,7 +410,8 @@ endif(NOT UNRES_WITH_MPI)
 FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/scripts/test_prota_E0LL2Y.sh
 "#!/bin/sh
 export POT=GB
-export PREFIX=prota_ENE
+export FGPROCS=$2
+export PREFIX=$1
 #-----------------------------------------------------------------------------
 UNRES_BIN=${CMAKE_BINARY_DIR}/bin/${UNRES_BIN}
 #-----------------------------------------------------------------------------
@@ -425,8 +430,9 @@ export THETPARPDB=$DD/thetaml.5parm
 export ROTPARPDB=$DD/scgauss.parm
 export PATTERN=$DD/patterns.cart
 #-----------------------------------------------------------------------------
+echo CTEST_FULL_OUTPUT
 $UNRES_BIN
-./prota_unres_energy_check.sh ${prota_unres_energy_output}
+./prota_unres_energy_check.sh $1 ${UNRES_BIN}
 ")
 
 #
@@ -449,7 +455,9 @@ if(NOT UNRES_WITH_MPI)
   endif(UNRES_MD_FF STREQUAL "GAB")
  
   if(UNRES_MD_FF STREQUAL "E0LL2Y")
-    add_test(NAME UNRES_MD_prota COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh )
+    add_test(NAME UNRES_ENE_prota COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh prota_ENE 1 )
+    add_test(NAME UNRES_MIN_prota COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh prota_MIN_CART 1 )
+    add_test(NAME UNRES_MD_microcanonical COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh 1l2y_micro 1 )
   endif(UNRES_MD_FF STREQUAL "E0LL2Y")
 
 else(NOT UNRES_WITH_MPI)
@@ -459,7 +467,9 @@ else(NOT UNRES_WITH_MPI)
   endif(UNRES_MD_FF STREQUAL "GAB")
 
   if(UNRES_MD_FF STREQUAL "E0LL2Y")
-    add_test(NAME UNRES_MD_prota COMMAND mpiexec -boot ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh )
+    add_test(NAME UNRES_ENE_prota COMMAND mpiexec -boot -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh prota_ENE 2 )
+    add_test(NAME UNRES_MIN_prota COMMAND mpiexec -boot -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh prota_MIN_CART 2 )
+    add_test(NAME UNRES_MD_microcanonical COMMAND mpiexec -boot -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh 1l2y_micro 2 )
   endif(UNRES_MD_FF STREQUAL "E0LL2Y")
 
 endif(NOT UNRES_WITH_MPI)