Changeset 1083 for palm

Timestamp:

Jan 4, 2013 10:22:09 AM (12 years ago)

Author:

maronga

Message:

bugfixes in parameter file check

Location:

palm/trunk/SCRIPTS

Files:

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

palm/trunk/SCRIPTS/mbuild

@@ -20 +20 @@
 # Current revisions:
 # -----------------
+# bugfix in parameter file check (in case that no preprocessor flag, i.e. -cpp was
+# set in %cpp_options, the last directive in the variable was processed.
 #
 # Former revisions:
@@ -1531 +1533 @@
              tar -xf  ${mainprog}_sources_check.tar
              rm -rf ${mainprog}_sources_check.tar
-             make  -f Makefile_check $make_options  F90=$compiler_name_ser  COPT="$copts_check"  F90FLAGS="$compiler_options" LDFLAGS="$loader_options"
+             make  -f Makefile_check $make_options  F90=$compiler_name_ser  COPT="$copts_check"  F90FLAGS="$compiler_options"
              tar -cf  check_namelist_files.tar Makefile_check check_namelist_files.x *.f90 *.o *.mod
              mv check_namelist_files.tar $check_depository_path

palm/trunk/SCRIPTS/mrun

@@ -22 +22 @@
 # Current revisions:
 # -----------------
-#
+# bugfix in parameter file check (read %cpp_options was missing)
 #
 # Former revisions:
@@ -2212 +2212 @@
 
 #ONLY PERFORM CHECK IF -z OPTION IS NOT SET, NO RESTART RUN IS CARRIED OUT AND IF THE EXECUTION HOST IS THE LOCAL HOST
+# ATTENTION: THIS ROUTINE DOES NOT WORK IF THE COMPILER ON THE LOCAL HOST DIFFERS FROM THE COMPILER ON THE REMOTE HOST
  if [[ $check_namelist_files == false ]]
  then
@@ -2350 +2351 @@
        fi
 
-       copts_check="-cpp -D__parallel -D__check"
+       # GET CHECK OPTIONS
+       line=""
+       found=false
+
+       grep  "$localhost" ${base_directory}/${config_file} | grep "%cpp_options"  >  $tmp_check
+
+       while read line1
+       do
+
+          if [[ $(echo $line1 | cut -d" " -s -f3-) = "$localhost" ]]
+          then
+             line="$line1"
+          fi
+
+          if [[ "$line" != ""  &&  $(echo $line | cut -c1) != "#" ]]
+          then
+          # EVENTUELLE DOPPELPUNKTE AUS OPTIONSSTRING UND ALLE -D ENTFERNEN
+          line="$line "
+             copts_check=`echo $line | cut -d" " -s -f2 | sed 's/::/%DUM%/g' | sed 's/:/ /g' | sed 's/%DUM%/:/g' | sed 's/-D[^ ]* //g' | sed 's/ -D.*//g'`
+             found=true
+          fi
+
+       done < $tmp_check
+       copts_check="$copts_check -D__check -D__parallel"
+
        make -f Makefile_check F90=$compiler_name_ser  COPT="$copts_check"