X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc%2FCMakeLists.txt;h=8cc305ae2304f1c99d4077fa9ad864c7599f8643;hb=df0278fa298d8846367e9cc4b48bb1cfdee4e7b4;hp=5635fc7659400353376cb3c03a42b7117954d57f;hpb=2020d99e08890994f96c86097bbe1b855b5d6494;p=unres.git

diff --git a/source/wham/src/CMakeLists.txt b/source/wham/src/CMakeLists.txt
index 5635fc7..8cc305a 100644
--- a/source/wham/src/CMakeLists.txt
+++ b/source/wham/src/CMakeLists.txt
@@ -96,9 +96,9 @@ set(UNRES_WHAM_PP_SRC
 if (Fortran_COMPILER_NAME STREQUAL "ifort")
   set(FFLAGS0 "-mcmodel=medium -shared-intel  -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres" ) 
 elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
-  set(FFLAGS0 "-std=legacy -g -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres" ) 
+  set(FFLAGS0 "-std=legacy -mcmodel=medium -g -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres" ) 
 else ()
-  set(FFLAGS0 "-g -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres" )   
+  set(FFLAGS0 "-g -mcmodel=medium -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres" )   
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
 
@@ -244,6 +244,23 @@ install(TARGETS UNRES_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/wham)
 # TESTS 
 #=========================================
 
+#  MESSAGE (STATUS "${MPI_Fortran_LIBRARIES}")
+  if ("${MPI_Fortran_LIBRARIES}"  MATCHES "lam")
+     MESSAGE (STATUS "LAM MPI library detected")
+     set (boot_lam "-boot")
+  else()
+     set (boot_lam "")
+  endif()
+
+  if (UNRES_SRUN)
+   set (np "-n")
+   set (mpiexec "srun")
+  else()
+   set (np "-np")
+   set (mpiexec "mpiexec")
+  endif()
+
+
 FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/scripts/wham_mpi_E0LL2Y.sh
 "#!/bin/sh
 export POT=GB
@@ -270,7 +287,7 @@ export SIDEP=$DD/contact.3.parm
 export SCRATCHDIR=.
 #-----------------------------------------------------------------------------
 echo CTEST_FULL_OUTPUT
-mpiexec -np $2 $WHAM_BIN 
+${mpiexec} ${boot_lam} ${np} $2 $WHAM_BIN 
 ./wham_check.sh $1 
 ")