merging devel

[unres.git] / source / unres / src_MD / CMakeLists.txt

diff --git a/source/unres/src_MD/CMakeLists.txt b/source/unres/src_MD/CMakeLists.txt
index b041904..441d99a 100644 (file)
--- a/source/unres/src_MD/CMakeLists.txt
+++ b/source/unres/src_MD/CMakeLists.txt
@@ -78,12 +78,17 @@ set(UNRES_MD_SRC0
        timing.F
        thread.F 
        unres.F
+       ssMD.F
 )
 
 if(Fortran_COMPILER_NAME STREQUAL "ifort")
   set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng.f ) 
 elseif(Fortran_COMPILER_NAME STREQUAL "mpif90")
   set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng.f )
+elseif(Fortran_COMPILER_NAME STREQUAL "f95")
+  set(UNRES_MD_SRC0 ${UNRES_MD_SRC0} prng.f )
+elseif(Fortran_COMPILER_NAME STREQUAL "gfortran")
+  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")
@@ -156,6 +161,14 @@ elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   set(FFLAGS2 "-std=legacy -I. ")
   #set(FFLAGS3 "-c -w -O3 -ipo -ipo_obj -opt_report" )
   set(FFLAGS3 "-std=legacy -I. " )
+<<<<<<< HEAD
+=======
+elseif (Fortran_COMPILER_NAME STREQUAL "g77")
+  set(FFLAGS0 "-I ${CMAKE_CURRENT_SOURCE_DIR} " ) 
+  set(FFLAGS1 "-g -I ${CMAKE_CURRENT_SOURCE_DIR} " ) 
+  set(FFLAGS2 "-I ${CMAKE_CURRENT_SOURCE_DIR} ")
+  set(FFLAGS3 "-I ${CMAKE_CURRENT_SOURCE_DIR} " )
+>>>>>>> f3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
 
@@ -207,6 +220,15 @@ elseif (Fortran_COMPILER_NAME STREQUAL "f95")
 elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   # Add old gfortran flags
   set(CPPFLAGS "${CPPFLAGS} -DG77") 
+<<<<<<< HEAD
+=======
+elseif (Fortran_COMPILER_NAME STREQUAL "g77")
+  # Add old gfortran flags
+  set(CPPFLAGS "${CPPFLAGS} -DG77")
+>>>>>>> f3fb02dcb801d48f6bdc6f48c78bc8a3a2c7fb97
+else(Fortran_COMPILER_NAME STREQUAL "ifort")
+  # Default preprocessor flag
+  set(CPPFLAGS "${CPPFLAGS} -DPGI")
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
 #=========================================
@@ -333,7 +355,7 @@ 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 SCCORPAR=$DD/sccor_pdb_shelly.dat
 export PATTERN=$DD/patterns.cart
 #-----------------------------------------------------------------------------
 $UNRES_BIN