X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_CSA%2FCMakeLists.txt;h=c0a3592e798609724945dfe7b72d0df86941e3a2;hb=d3d989108f2d77732ef9ae4b6d0594ca94b3b25f;hp=53337fed2f713b1c90b1678cb0e9c0c4bbf9c223;hpb=733ae2e7ef932eb9e3cc78a063e4fe005b050abd;p=unres.git

diff --git a/source/unres/src_CSA/CMakeLists.txt b/source/unres/src_CSA/CMakeLists.txt
index 53337fe..c0a3592 100644
--- a/source/unres/src_CSA/CMakeLists.txt
+++ b/source/unres/src_CSA/CMakeLists.txt
@@ -394,14 +394,27 @@ endif(UNRES_CSA_FF STREQUAL "E0LL2Y")
      set (boot_lam "")
   endif()
 
+
+  if (UNRES_SRUN)
+   set (np "-n")
+   set (mpiexec "srun")
+  elseif(UNRES_MPIRUN)
+   set (np "-np")
+   set (mpiexec "mpirun")
+  else()
+   set (np "-np")
+   set (mpiexec "mpiexec")
+  endif()
+
+
 if(UNRES_CSA_FF STREQUAL "4P")
-    add_test(NAME UNRES_CSA_global COMMAND mpiexec ${boot_lam} -np 4 ${CMAKE_CURRENT_BINARY_DIR}/test_csa_4P.sh 1l2y_csa_4P )
-    add_test(NAME UNRES_CSA_local COMMAND mpiexec ${boot_lam} -np 4 ${CMAKE_CURRENT_BINARY_DIR}/test_csa_4P.sh 1l2y_csa_local_4P )
+    add_test(NAME UNRES_CSA_global COMMAND ${mpiexec} ${boot_lam} ${np} 4 ${CMAKE_CURRENT_BINARY_DIR}/test_csa_4P.sh 1l2y_csa_4P )
+    add_test(NAME UNRES_CSA_local COMMAND ${mpiexec} ${boot_lam} ${np} 4 ${CMAKE_CURRENT_BINARY_DIR}/test_csa_4P.sh 1l2y_csa_local_4P )
 endif(UNRES_CSA_FF STREQUAL "4P")
 
 if(UNRES_CSA_FF STREQUAL "E0LL2Y")
-    add_test(NAME UNRES_CSA_global_E0LL2Y COMMAND mpiexec ${boot_lam} -np 4 ${CMAKE_CURRENT_BINARY_DIR}/test_csa_E0LL2Y.sh 1l2y_csa )
-    add_test(NAME UNRES_CSA_local_E0LL2Y COMMAND mpiexec ${boot_lam} -np 4 ${CMAKE_CURRENT_BINARY_DIR}/test_csa_E0LL2Y.sh 1l2y_csa_local )
+    add_test(NAME UNRES_CSA_global_E0LL2Y COMMAND ${mpiexec} ${boot_lam} ${np} 4 ${CMAKE_CURRENT_BINARY_DIR}/test_csa_E0LL2Y.sh 1l2y_csa )
+    add_test(NAME UNRES_CSA_local_E0LL2Y COMMAND ${mpiexec} ${boot_lam} ${np} 4 ${CMAKE_CURRENT_BINARY_DIR}/test_csa_E0LL2Y.sh 1l2y_csa_local )
 endif(UNRES_CSA_FF STREQUAL "E0LL2Y")