[Dart-dev] [5847] DART/branches/development/models/noah: more robust model advance logic.

[nancy at ucar.edu]

Revision: 5847
Author:   thoar
Date:     2012-08-16 20:19:38 -0600 (Thu, 16 Aug 2012)
Log Message:
-----------
more robust model advance logic.
Keeping the advance directory around till we're done debugging.

Modified Paths:
--------------
    DART/branches/development/models/noah/model_mod.nml
    DART/branches/development/models/noah/shell_scripts/advance_model.csh

-------------- next part --------------
Modified: DART/branches/development/models/noah/model_mod.nml
===================================================================
--- DART/branches/development/models/noah/model_mod.nml	2012-08-16 20:12:24 UTC (rev 5846)
+++ DART/branches/development/models/noah/model_mod.nml	2012-08-17 02:19:38 UTC (rev 5847)
@@ -1,6 +1,5 @@
 &model_nml
      noah_netcdf_filename         = 'restart.nc',
-     noah_namelist_filename       = 'namelist.hrldas',
      assimilation_period_days     =    0,
      assimilation_period_seconds  = 3600,
      model_perturbation_amplitude = 0.0,

Modified: DART/branches/development/models/noah/shell_scripts/advance_model.csh
===================================================================
--- DART/branches/development/models/noah/shell_scripts/advance_model.csh	2012-08-16 20:12:24 UTC (rev 5846)
+++ DART/branches/development/models/noah/shell_scripts/advance_model.csh	2012-08-17 02:19:38 UTC (rev 5847)
@@ -77,6 +77,8 @@
 set  MYSTRING  = `echo $MYSTRING | sed -e 's#"# #g'`
 set  LDASINDIR = `echo $MYSTRING[2]`
 
+echo "LDAS input files coming from $LDASINDIR"
+
 # Loop through each state
 set state_copy = 1
 set ensemble_member_line = 1
@@ -99,7 +101,7 @@
    #          * convert the DART state vector to model format 
    #-------------------------------------------------------------------
 
-   echo "converting ensemble member $fext from dart_restart to NOAH restart.nc"
+   echo "advance_model.csh block 2 converting ensemble member $fext"
 
    ln -sf ../restart.$fext.nc  restart.nc   || exit 2
    ln -sf ../$input_file       dart_restart || exit 2
@@ -135,8 +137,16 @@
    #          Your model will likely be different.
    #-------------------------------------------------------------------
 
-   ../Noah_hrldas_beta         || exit 3
+   ../Noah_hrldas_beta
 
+   if (! -e RESTART* ) then
+      echo "ERROR: NOAH died"
+      echo "ERROR: NOAH died"
+      exit 23
+   endif
+
+   \rm -f restart.nc
+
    #-------------------------------------------------------------------
    # Block 4: Move the updated state vector back to CENTRALDIR
    #          (temp_ud was created by integrate_model and is in the 
@@ -166,7 +176,7 @@
 # If you are debugging, you may want to keep this directory. 
 
 cd ..
-\rm -rf $temp_dir
+# \rm -rf $temp_dir
 
 # MANDATORY - Remove the control_file to signal completion. If it still
 # exists in CENTRALDIR after all the ensemble members have been advanced,