Changeset 818 for palm/trunk/SCRIPTS/mrun

Timestamp:

Feb 8, 2012 4:11:23 PM (13 years ago)

Author:

maronga

Message:

bugfix: namelist file check now possible for topography and re-enabled. mrungui update (-z option)

File:

• palm/trunk/SCRIPTS/mrun (modified) (8 diffs)

palm/trunk/SCRIPTS/mrun

@@ -239 +239 @@
      # 03/02/12 - BjornM - namelist file check temporary disabled
      #                     until severel bugs are fixed
+     # 08/02/12 - BjornM - bugfixes: skipping namelist file check in case of 
+     #                     restart runs. check is now possible with topography 
+     #                     and the -v (silent) option is considered
  
     # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
@@ -2404 +2407 @@
 
 #### PERFORM PARAMETER FILE CHECK (COUPLED RUNS ARE NOT SUPPORTED YET)
- skip_check=true
- if [[ $check_namelist_files == false || $fromhost != $localhost || $run_coupled_model == true ]]
+ skip_check=false
+ if [[ $check_namelist_files == false || $fromhost != $localhost || $run_coupled_model == true || $restart_run == true ]]
  then
     skip_check=true
@@ -2463 +2466 @@
        printf "\n  +++ no PARIN list entry found for d3f in the configuration file."
     fi
+#   GET TOPOGRAPHY PARAMETER FILE SUFFIX (USUALLY "_P3DF"). THIS FILE MIGHT IS
+#   NOT NECESSARILY REQUIRED
+    line=""
+    found=false
+    grep  "d3f" $config_file | grep "TOPOGRAPHY_DATA"  >  $tmp_check
+    while read line1
+    do
+       line="$line1"
+       if [[ "$line" != ""  &&  $(echo $line | cut -c1) != "#" ]]
+       then
+          topo_suffix=`echo $line | tr -s " " | cut -d" " -s -f5`
+          found=true
+       fi
+    done < $tmp_check
+
+    if [[ $found = false ]]
+    then
+       printf "\n  +++ no TOPOGRAPHY list entry found in the configuration file."
+    fi
 
     rm -rf ${working_directory}/tmp_check
@@ -2498 +2520 @@
           printf "\n\n"
 
-          while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
-          do
-             printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
-             read  answer
-          done
-          if [[ $answer = a  ||  $answer = A ]]
-          then
-             printf "\n  +++ Aborting...."
-             locat=normal; exit
+          if [[ $silent == false ]]
+          then
+             while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
+             do
+                printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
+                read  answer
+             done
+             if [[ $answer = a  ||  $answer = A ]]
+             then
+                printf "\n  +++ Aborting...."
+                locat=normal; exit
+             fi
           fi
        else
@@ -2541 +2566 @@
           answer=dummy
           printf "\n\n"
-          while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
-          do
-             printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
-             read  answer
-          done
-          if [[ $answer = a  ||  $answer = A ]]
-          then
-             printf "\n  +++ Aborting..."
-             rm -rf  $check_sources
-             locat=normal; exit
+          if [[ $silent == false ]]
+          then
+             while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
+             do
+                printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
+                read  answer
+             done
+             if [[ $answer = a  ||  $answer = A ]]
+             then
+                printf "\n  +++ Aborting..."
+                rm -rf  $check_sources
+                locat=normal; exit
+             else
+                skip_check=true
+             fi
           else
              skip_check=true
@@ -2563 +2593 @@
     then
        cp $working_directory/JOBS/$fname/INPUT/${fname}${p3df_suffix} ./PARINF   
+    fi
+
+
+    if [[ -f $working_directory/JOBS/$fname/INPUT/${fname}${topo_suffix} && $skip_check == false ]]
+    then
+       printf "\n  *** adding topography data"
+       cp $working_directory/JOBS/$fname/INPUT/${fname}${topo_suffix} ./TOPOGRAPHY_DATA
+
+#      IN CASE OF TOPOGRAPHY AND HIGH GRID POINT NUMBERS, THE STACK SIZE 
+#      MUST BE INCREASED. THIS IS DUE TO THE ARRAY nzb_local AND topo_height, 
+#      WHICH REQUIRE SUFFICIENT MEMORY
+       ulimit -s unlimited          
     fi
 
@@ -2577 +2619 @@
 
 #   SAFETY CHECK: ONLY PROCEED IF THE PARAMETER CHECK PROGRAM WAS PROPERLY COMPILED
-    if [[ ! -f check_namelist_files.x ]] then
+    if [[ ! -f check_namelist_files.x && $skip_check == false ]] then
        printf "\n  +++ WARNING: check_namelist_files.x not found."
        answer=dummy
        printf "\n\n"
-       while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
-       do
-          printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
-          read  answer
-       done
-       if [[ $answer = a  ||  $answer = A ]]
-       then
-          printf "\n  +++ Aborting..."
-          rm -rf  $check_sources
-          locat=normal; exit
-       else
-          printf "\n  *** Skipping parameter file check."
-       fi       
+
+       if [[ $silent == false ]]
+       then
+          while [[ "$answer" != c  &&  "$answer" != C  && "$answer" != a  &&  "$answer" != A ]]
+          do
+             printf " >>> continue anyway (c(ontinue)/a(bort)) ?  "
+             read  answer
+          done
+          if [[ $answer = a  ||  $answer = A ]]
+          then
+             printf "\n  +++ Aborting..."
+             rm -rf  $check_sources
+             locat=normal; exit
+          else
+             printf "\n  *** Skipping parameter file check."
+         
+          fi
+      fi
+       
     elif [[ $skip_check == false ]]
     then
@@ -2694 +2742 @@
  fi
 
+    # DELETE TEMPORARY DIRECTORY AND FINISH NAMELIST FILE CHECK   
+ rm -rf  $check_sources
  cd $working_directory