X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Funres%2Fsrc_MD%2FCMakeLists.txt;h=568af70789181dc1ba1f1501e1705ef221991e52;hb=adbdde721155499f92e80e5e6cee0b5d9723a65a;hp=e82c6f390db6ab9056016d3175faee66d27027ca;hpb=69e7eb6f86190ed55e6a46fb2ea82840f3da19be;p=unres.git

diff --git a/source/unres/src_MD/CMakeLists.txt b/source/unres/src_MD/CMakeLists.txt
index e82c6f3..568af70 100644
--- a/source/unres/src_MD/CMakeLists.txt
+++ b/source/unres/src_MD/CMakeLists.txt
@@ -59,7 +59,6 @@ set(UNRES_MD_SRC0
 	parmread.F 
 	pinorm.f 
 	printmat.f 
-	prng_32.F 
 	q_measure.F 
 	randgens.f 
 	rattle.F 
@@ -81,6 +80,13 @@ set(UNRES_MD_SRC0
 	unres.F
 )
 
+if(Fortran_COMPILER_NAME STREQUAL "ifort")
+  set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng.f ) 
+else()
+  set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng_32.F )
+endif (Fortran_COMPILER_NAME STREQUAL "ifort")
+
+
 set(UNRES_MD_SRC3 
 	energy_p_new_barrier.F 
 	energy_p_new-sep_barrier.F 
@@ -111,7 +117,6 @@ set(UNRES_MD_PP_SRC
 	MP.F 
 	MREMD.F 
 	parmread.F 
-	prng_32.F 
 	q_measure1.F 
 	q_measure3.F 
 	q_measure.F
@@ -130,6 +135,10 @@ set(UNRES_MD_PP_SRC
 ) 
 
 
+if(NOT Fortran_COMPILER_NAME STREQUAL "ifort")
+  set(UNRES_MD_PP_SRC ${UNRES_MD_PP_SRC} prng_32.F) 
+endif(NOT Fortran_COMPILER_NAME STREQUAL "ifort")
+
 #================================================
 # Set comipiler flags for different sourcefiles  
 #================================================
@@ -205,7 +214,9 @@ if (UNRES_WITH_MPI)
   set(CPPFLAGS "${CPPFLAGS} -DMP -DMPI") 
 endif(UNRES_WITH_MPI)
 
+#=========================================
 # Apply preprocesor flags to *.F files
+#=========================================
 set_property(SOURCE ${UNRES_MD_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS} )  
 
 
@@ -214,10 +225,10 @@ set_property(SOURCE ${UNRES_MD_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS}
 #========================================
 if(UNRES_WITH_MPI) 
   # binary with mpi
-  set(UNRES_BIN "unres_${Fortran_COMPILER_NAME}_MPICH_${UNRES_FF}.exe")
+  set(UNRES_BIN "unres_${Fortran_COMPILER_NAME}_MPICH_${UNRES_MD_FF}.exe")
 else(UNRES_WITH_MPI)
   # binary without mpi
-  set(UNRES_BIN "unres_${Fortran_COMPILER_NAME}_single_${UNRES_FF}.exe")
+  set(UNRES_BIN "unres_${Fortran_COMPILER_NAME}_single_${UNRES_MD_FF}.exe")
 endif(UNRES_WITH_MPI)  
 
 #=========================================
@@ -287,7 +298,7 @@ target_link_libraries( UNRES_BIN-MD xdrf )
 #  test_single_ala.sh
 #=========================================
 
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh
+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/scripts/test_single_ala.sh
 "#!/bin/sh
 export POT=GB
 export PREFIX=ala10
@@ -310,6 +321,16 @@ export PATTERN=$DD/patterns.cart
 $UNRES_BIN
 ")
 
+#
+# File permissions workaround
+#
+FILE(	COPY ${CMAKE_CURRENT_BINARY_DIR}/scripts/test_single_ala.sh 
+	DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+	FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
+)
+
+
+
 #=========================================
 #  ala10.inp
 #=========================================
@@ -318,7 +339,7 @@ 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
+reset_moment=1000 reset_vel=1000
 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    &
@@ -342,9 +363,13 @@ XAAAAAAAAAAX
 # Add tests
 
 if(NOT UNRES_WITH_MPI)
-
+                  
   add_test(NAME UNRES_MD_Ala10 COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh )
 
+else(NOT UNRES_WITH_MPI)
+
+
+  add_test(NAME UNRES_MD_MPI_Ala10 COMMAND mpirun -np 1 ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh )
 
 endif(NOT UNRES_WITH_MPI)