X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=blobdiff_plain;f=source%2Fwham%2Fsrc%2FCMakeLists.txt;fp=source%2Fwham%2Fsrc%2FCMakeLists.txt;h=51ed5be72c3d7726930723bec0de55ad8a2cc119;hp=6bfb1c237b110cf3f7ab10f619c7bd76ce264669;hb=9453fc761eb545fcb727824c94d012dbf3931951;hpb=6f521277aa2a382d409f5189957283b0998b0d07

diff --git a/source/wham/src/CMakeLists.txt b/source/wham/src/CMakeLists.txt
index 6bfb1c2..51ed5be 100644
--- a/source/wham/src/CMakeLists.txt
+++ b/source/wham/src/CMakeLists.txt
@@ -94,11 +94,13 @@ set(UNRES_WHAM_PP_SRC
 # Set comipiler flags for different sourcefiles  
 #================================================
 if (Fortran_COMPILER_NAME STREQUAL "ifort")
-  set(FFLAGS0 "-mcmodel=medium -g -CB -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres" ) 
+  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" ) 
+elseif (Fortran_COMPILER_NAME STREQUAL "pgf90")
+  set(FFLAGS0 "-mcmodel=medium -Mlarge_arrays -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")
 
 
@@ -156,6 +158,11 @@ elseif (Fortran_COMPILER_NAME STREQUAL "f95")
 elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   # Add old gfortran flags
   set(CPPFLAGS "${CPPFLAGS} -DG77") 
+elseif (Fortran_COMPILER_NAME STREQUAL "pgf90")
+  set(CPPFLAGS "${CPPFLAGS} -DPGI")
+  FILE(COPY ${CMAKE_SOURCE_DIR}/source/lib/isnan_pgi.f DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
+  list(APPEND UNRES_WHAM_SRC0 ${CMAKE_CURRENT_BINARY_DIR}/isnan_pgi.f)
+  set(CMAKE_EXE_LINKER_FLAGS "-Bdynamic")
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
 #=========================================
@@ -244,83 +251,79 @@ install(TARGETS UNRES_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/wham)
 # TESTS 
 #=========================================
 
-#-- Copy all the data files from the test directory into the source directory
-#SET(UNRES_TEST_FILES
-#	ala10.inp
-#    )
-
-#FOREACH (UNRES_TEST_FILE ${UNRES_TEST_FILES})
-#      SET (unres_test_dest "${CMAKE_CURRENT_BINARY_DIR}/${UNRES_TEST_FILE}")
-#      MESSAGE (STATUS " Copying ${UNRES_TEST_FILE} from ${CMAKE_SOURCE_DIR}/examples/unres/MD/ff_gab/${UNRES_TEST_FILE} to ${unres_test_dest}")
-#      ADD_CUSTOM_COMMAND (
-#          TARGET     ${UNRES_BIN}
-#          POST_BUILD
-#          COMMAND    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/examples/unres/MD/ff_gab/${UNRES_TEST_FILE} ${unres_test_dest}
-#      )
-#ENDFOREACH (UNRES_TEST_FILE ${UNRES_TEST_FILES})
-
-#=========================================
-# Generate data test files
-#=========================================
-#  test_single_ala.sh
-#=========================================
-
-#FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh
-#"#!/bin/sh
-#export POT=GB
-#export PREFIX=ala10
+#  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")
+  elseif(UNRES_MPIRUN)
+   set (np "-np")
+   set (mpiexec "mpirun")
+  else()
+   set (np "-np")
+   set (mpiexec "mpiexec")
+  endif()
+
+
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/scripts/wham_mpi_E0LL2Y.sh
+"#!/bin/sh
+export POT=GB
+export PREFIX=$1
 #-----------------------------------------------------------------------------
-#UNRES_BIN=./${UNRES_BIN}
+WHAM_BIN=${CMAKE_BINARY_DIR}/bin/${UNRES_WHAM_BIN}
 #-----------------------------------------------------------------------------
-#DD=${CMAKE_SOURCE_DIR}/PARAM
-#export BONDPAR=$DD/bond.parm
-#export THETPAR=$DD/thetaml.5parm
-#export ROTPAR=$DD/scgauss.parm
-#export TORPAR=$DD/torsion_631Gdp.parm
-#export TORDPAR=$DD/torsion_double_631Gdp.parm
-#export ELEPAR=$DD/electr_631Gdp.parm
-#export SIDEPAR=$DD/sc_GB_opt.1gab_3S_qclass5no310-shan2-sc-16-10-8k
-#export FOURIER=$DD/fourier_opt.parm.1igd_hc_iter3_3
-#export SCPPAR=$DD/scp.parm
-#export SCCORPAR=$DD/rotcorr_AM1.parm
-#export PATTERN=$DD/patterns.cart
+DD=${CMAKE_SOURCE_DIR}/PARAM
+export BONDPAR=$DD/bond_AM1.parm
+export THETPAR=$DD/theta_abinitio.parm
+export ROTPAR=$DD/rotamers_AM1_aura.10022007.parm
+export TORPAR=$DD/torsion_631Gdp.parm
+export TORDPAR=$DD/torsion_double_631Gdp.parm
+export ELEPAR=$DD/electr_631Gdp.parm
+export SIDEPAR=$DD/scinter_$POT.parm
+export FOURIER=$DD/fourier_opt.parm.1igd_hc_iter3_3
+export SCPPAR=$DD/scp.parm
+export SCCORPAR=$DD/sccor_am1_pawel.dat
+export THETPARPDB=$DD/thetaml.5parm
+export ROTPARPDB=$DD/scgauss.parm
+export PATTERN=$DD/patterns.cart
+export CONTFUNC=GB
+export SIDEP=$DD/contact.3.parm
+export SCRATCHDIR=.
 #-----------------------------------------------------------------------------
-#$UNRES_BIN
-#")
+echo CTEST_FULL_OUTPUT
+${mpiexec} ${boot_lam} ${np} $2 $WHAM_BIN 
+./wham_check.sh $1 
+")
+
+#
+# File permissions workaround
+#
+FILE(	COPY ${CMAKE_CURRENT_BINARY_DIR}/scripts/wham_mpi_E0LL2Y.sh 
+	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/wham_check.sh
+        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/1L2Y_wham.inp
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
+
+FILE(COPY ${CMAKE_SOURCE_DIR}/ctest/1L2Y_remd_MD000.cx
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
+
+FILE(COPY ${CMAKE_SOURCE_DIR}/ctest/1L2Y.pdb
+        DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
 
-#=========================================
-#  ala10.inp
-#=========================================
 
-#file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/ala10.inp
-#"ala10 unblocked
-#SEED=-1111333 MD ONE_LETTER rescale_mode=2 PDBOUT
-#nstep=15000 ntwe=100 ntwx=1000 dt=0.1 lang=0 tbf t_bath=300 damax=1.0          &
-#reset_moment=1000 reset_vel=1000 MDPDB
-#WLONG=1.35279 WSCP=1.59304 WELEC=0.71534 WBOND=1.00000 WANG=1.13873            &
-#WSCLOC=0.16258 WTOR=1.98599 WTORD=1.57069 WCORRH=0.42887 WCORR5=0.00000        &
-#WCORR6=0.00000 WEL_LOC=0.16036 WTURN3=1.68722 WTURN4=0.66230 WTURN6=0.00000    &
-#WVDWPP=0.11371 WHPB=1.00000                                                    &
-#CUTOFF=7.00000 WCORR4=0.00000
-#12
-#XAAAAAAAAAAX 
-# 0
-# 0
-#   90.0000   90.0000   90.0000  90.000   90.000   90.000   90.000   90.000 
-#   90.0000   90.0000
-#  180.0000  180.0000  180.0000 180.000  180.000  180.000  180.000  180.000
-#  180.0000
-#  110.0000  110.0000  110.0000 100.000  110.000  100.000  110.000  110.000 
-#  110.0000  110.0000
-# -120.0000 -120.0000 -120.000 -120.000 -120.000 -120.000 -120.000 -120.000
-# -120.0000 -120.0000
-#")
-
-
-# Add tests
-
-#if(NOT UNRES_WITH_MPI)
-
-#  add_test(NAME UNRES_MD_Ala10 COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh )
-
-#endif(NOT UNRES_WITH_MPI)
+if(UNRES_MD_FF STREQUAL "E0LL2Y")
+    add_test(NAME WHAM_remd COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/wham_mpi_E0LL2Y.sh 1L2Y_wham 2 )
+endif(UNRES_MD_FF STREQUAL "E0LL2Y")