Changeset 1210 for palm/trunk/SCRIPTS

Timestamp:

Aug 14, 2013 10:58:20 AM (11 years ago)

Author:

raasch

Message:

fftw support added; object file list in Makefile replaced by a short one line statement

Location:

palm/trunk/SCRIPTS

Files:

• mbuild (modified) (7 diffs)
• mrun (modified) (3 diffs)

palm/trunk/SCRIPTS/mbuild

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-# adjustments for CSC Helsinki (lccrayf)
+# fftw support added
 #
 # Former revisions:
 # -----------------
 # $Id$
+#
+# 1197 2013-07-04 06:19:45Z raasch
+# adjustments for CSC Helsinki (lccrayf)
 #
 # 1099 2013-02-10 01:47:43Z raasch
@@ -450 +453 @@
     fi
 
+    fftw_inc=""
+    fftw_lib=""
     modules=""
     netcdf_inc=""
@@ -705 +710 @@
 
 
-       # NETCDF-OPTIONEN ERMITTELN
+       # get netCDF options
     line=""
     grep  "$remote_host_string" $config_file | grep "%netcdf_inc"  >  $tmp_mbuild
@@ -738 +743 @@
              # EVENTUELLE DOPPELPUNKTE AUS OPTIONSSTRING ENTFERNEN
           netcdf_lib=`echo $line | cut -d" " -s -f2 | sed 's/::/%DUM%/g' | sed 's/:/ /g' | sed 's/%DUM%/:/g'`
+       fi
+
+    done < $tmp_mbuild
+
+
+
+       # get fftw options
+    line=""
+    grep  "$remote_host_string" $config_file | grep "%fftw_inc"  >  $tmp_mbuild
+    while read line1
+    do
+
+       if [[ $(echo $line1 | cut -d" " -s -f3-) = "$remote_host_string" ]]
+       then
+          line="$line1"
+       fi
+
+       if [[ "$line" != ""  &&  $(echo $line | cut -c1) != "#" ]]
+       then
+             # EVENTUELLE DOPPELPUNKTE AUS OPTIONSSTRING ENTFERNEN
+          fftw_inc=`echo $line | cut -d" " -s -f2 | sed 's/::/%DUM%/g' | sed 's/:/ /g' | sed 's/%DUM%/:/g'`
+       fi
+
+    done < $tmp_mbuild
+
+    line=""
+    grep  "$remote_host_string" $config_file | grep "%fftw_lib"  >  $tmp_mbuild
+    while read line1
+    do
+
+       if [[ $(echo $line1 | cut -d" " -s -f3-) = "$remote_host_string" ]]
+       then
+          line="$line1"
+       fi
+
+       if [[ "$line" != ""  &&  $(echo $line | cut -c1) != "#" ]]
+       then
+             # EVENTUELLE DOPPELPUNKTE AUS OPTIONSSTRING ENTFERNEN
+          fftw_lib=`echo $line | cut -d" " -s -f2 | sed 's/::/%DUM%/g' | sed 's/:/ /g' | sed 's/%DUM%/:/g'`
        fi
 
@@ -785 +829 @@
           found=true
 
-             # NETCDF-INCLUDEVERZEICHNIS HINZUFUEGEN
-          compiler_options="$compiler_options $netcdf_inc"
+             # add include paths for netCDF and fftw
+          compiler_options="$compiler_options $netcdf_inc $fftw_inc"
        fi
 
@@ -857 +901 @@
           found=true
 
-             # NETCDF-LIBRARY HINZUFUEGEN
-          loader_options="$loader_options $netcdf_lib"
+             # add netCDF- and fftw-library
+          loader_options="$loader_options $netcdf_lib $fftw_lib"
        fi
 
@@ -1303 +1347 @@
           echo "  *** execute \"make\" on local host"
 
+          echo "make  $make_options  PROG=$mainprog  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$loader_options"  2>&1 | tee ${remote_host}_last_make_protokoll"
           make  $make_options  PROG=$mainprog  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$loader_options"  2>&1 | tee ${remote_host}_last_make_protokoll
 

palm/trunk/SCRIPTS/mrun

@@ -22 +22 @@
 # Current revisions:
 # ------------------
-#
+# fftw support added
 #
 # Former revisions:
@@ -143 +143 @@
  executable=""
  execution_error=false
+ fftw_inc=""
+ fftw_lib=""
+ fftw_support=false
  fimm=false
  fname=test
@@ -1917 +1920 @@
 
     # COMPILE- UND LINK-OPTIONEN BESTIMMEN
- fopts="$fopts $netcdf_inc $dvr_inc"
- lopts="$lopts $netcdf_lib $dvr_lib"
+ fopts="$fopts $netcdf_inc $fftw_inc $dvr_inc"
+ lopts="$lopts $netcdf_lib $fftw_lib $dvr_lib"
  ROPTS="$ropts"
 # if [[ ( $(echo $host | cut -c1-3) = nec  ||  $(echo $host | cut -c1-3) = ibm  ||  $host = lckyoto  ||  $host = lcsgih  ||  $host = lcsgib  ||  $host = lctit  ||  $host = lcfimm  ||  $host = lcflow  ||  $host = lcxe6 ||  $host = lcxt5m || $host = lck || $host = lckiaps || $host = lckordi || $host = lcsb || $host )  &&  -n $numprocs ]]