Changeset 841 for palm/trunk/SCRIPTS

Timestamp:

Feb 28, 2012 12:29:49 PM (13 years ago)

Author:

maronga

Message:

further adjustments and bugfixes for the namelist file check

File:

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

palm/trunk/SCRIPTS/mrun

@@ -250 +250 @@
      # 22/02/12 - Siggi  - -s info updated
      # 22/02/12 - Siggi  - case "-s WP" removed
+     # 28/02/12 - BjornM - further adjustments for namelist file check
 
 
@@ -2362 +2363 @@
 
 #### PERFORM PARAMETER FILE CHECK (COUPLED RUNS ARE NOT SUPPORTED YET)
+
+#DEFINE VARIABLES FOR FREQUENTLY USED DIRECTORIES
+ check_depository="${working_directory}/trunk/UTIL"
+ check_sources="${working_directory}/tmp_check_namelist_files"
  skip_check=false
+
+#CHECK IF NAMELIST_FILE_CHECK HAS BEEN COMPILED SUCCESSFULLY
+ if [[ ! -f $check_depository/check_namelist_files.tar || ! -f $PALM_BIN/check_namelist_files.x ]]
+ then
+    skip_check=true 
+
+ fi
+
+#ONLY PERFORM CHECK IF -z OPTION IS NOT SET, NO RESTART RUN IS CARRIED OUT AND IF THE EXECUTION HOST IS THE LOCAL HOST
  if [[ $check_namelist_files == false || $fromhost != $localhost || $run_coupled_model == true || $restart_run == true ]]
  then
@@ -2421 +2435 @@
        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
@@ -2442 +2457 @@
 
     rm -rf ${working_directory}/tmp_check
-
-#   DEFINE VARIABLES FOR FREQUENTLY USED DIRECTORIES
-    check_depository="${working_directory}/trunk/UTIL"
-    check_sources="${working_directory}/tmp_check_namelist_files"
 
 #   CHECK IF THE A P3DF FILE MUST BE CHECKED