X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD-M-SAXS-homology%2FCMakeLists.txt;h=1db545949e6b22ac9e0ad81f3a8e1886093594f5;hb=211858eb434640ea42491010492ea3e632de4d64;hp=c2c1129070adf7f5c9ab383d8df9871a60965f3c;hpb=b6e44584752243911a717a94aa770b3c1f52f3b8;p=unres.git

diff --git a/source/unres/src_MD-M-SAXS-homology/CMakeLists.txt b/source/unres/src_MD-M-SAXS-homology/CMakeLists.txt
index c2c1129..1db5459 100644
--- a/source/unres/src_MD-M-SAXS-homology/CMakeLists.txt
+++ b/source/unres/src_MD-M-SAXS-homology/CMakeLists.txt
@@ -216,6 +216,8 @@ elseif(UNRES_MD_FF STREQUAL "E0LL2Y")
   set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0" )
 elseif(UNRES_MD_FF STREQUAL "4P")
   set(CPPFLAGS "UNRES -DISNAN -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DSCCORPDB" )
+elseif(UNRES_MD_FF STREQUAL "NEWCORR")
+  set(CPPFLAGS "PROCOR -DUNRES -DISNAN -DSPLITELE -DLANG0 -DNEWCORR -DCORRCD" )
 endif(UNRES_MD_FF STREQUAL "GAB")
 
 
@@ -617,6 +619,11 @@ FILE(COPY ${CMAKE_SOURCE_DIR}/ctest/matplotlib_hist.py
         FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )
 
+FILE(COPY ${CMAKE_SOURCE_DIR}/ctest/matplotlib_plot.py
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR} 
+        FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+)
+
 FILE(COPY ${CMAKE_SOURCE_DIR}/ctest/checkgrad.awk
         DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
 
@@ -787,7 +794,7 @@ else(NOT UNRES_WITH_MPI)
     add_test(NAME UNRES_M_MIN_prota COMMAND ${mpiexec} ${boot_lam} ${np} 2 ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh prota_MIN_CART 2 )
     add_test(NAME UNRES_M_MIN_INT COMMAND ${mpiexec} ${boot_lam} ${np} 1 ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh 1l2y_MIN_INT 1 )
     add_test(NAME UNRES_M_REGULAR COMMAND ${mpiexec} ${boot_lam} ${np} 1 ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh 1l2y_MIN_REGULAR_INT 1 )
-    add_test(NAME UNRES_M_MD_microcanonical COMMAND ${mpiexec} ${boot_lam} ${np} 2 ${CMAKE_CURRENT_BINARY_DIR}/test_prota_E0LL2Y.sh 1l2y_micro 2 )
+    add_test(NAME UNRES_M_MD_microcanonical COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_mpi_E0LL2Y.sh 1l2y_micro 2 2 )
     add_test(NAME UNRES_M_Langevin COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_mpi_E0LL2Y.sh 1L2Y_L 2 2 )
 # no NH in src_MD-M code
 ##    add_test(NAME UNRES_M_NoseHoover COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_mpi_E0LL2Y.sh 1L2Y_NH 2 2 )