[Dart-dev] DART/branches Revision: 11163

[dart at ucar.edu]

raeder at ucar.edu
2017-02-28 07:22:17 -0700 (Tue, 28 Feb 2017)
154
Fixed incorrect 'head' and 'tail' of 'latest_file' when linking
inflation restart files.
Also fixed a logical '==' comparison in a STAGE_input statement.



Modified: DART/branches/rma_trunk/models/cam-fv/scripts_cesm1_5/assimilate.csh
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/scripts_cesm1_5/assimilate.csh	2017-02-27 23:31:14 UTC (rev 11162)
+++ DART/branches/rma_trunk/models/cam-fv/scripts_cesm1_5/assimilate.csh	2017-02-28 14:22:17 UTC (rev 11163)
@@ -397,7 +397,7 @@
    if ($MYSTRING[$stage] == 'output')    set STAGE_output = TRUE
    @ stage++
 end
-if ($PRIOR_TF == FALSE && $STAGE_input = TRUE && $STAGE_preassim = TRUE) then
+if ($PRIOR_TF == FALSE && $STAGE_input == TRUE && $STAGE_preassim == TRUE) then
    echo " "
    echo "WARNING ! ! prior inflation is OFF, "
    echo "            but output at stages 'input' and 'preassim' is requested."
@@ -449,8 +449,8 @@
       (ls -rt1 $CASE.cam.${stage}* | tail -n 2 >! latestfile) > & /dev/null
       set nfiles = `cat latestfile | wc -l`
       if ( $nfiles > 0 ) then
-         set latest_sd   = `head -n1 latestfile`
-         set latest_mean = `tail -n1 latestfile`
+         set latest_mean = `head -n1 latestfile`
+         set latest_sd   = `tail -n1 latestfile`
          # These file names are in use as of (r10786 2016-12-14).
          # filter/filter_mod.f90:
          #    call set_file_metadata(file_info, PRIOR_INF_MEAN, stage, 'priorinf_mean', 'prior inflation mean')
@@ -499,8 +499,8 @@
 
       # If one exists, use it as input for this assimilation
       if ( $nfiles > 0 ) then
-         set latest_sd   = `head -n1 latestfile`
-         set latest_mean = `tail -n1 latestfile`
+         set latest_mean = `head -n1 latestfile`
+         set latest_sd   = `tail -n1 latestfile`
          ${LINK} $latest_mean input_postinf_mean.nc
          ${LINK} $latest_sd   input_postinf_sd.nc
       else

Modified: DART/branches/rma_trunk/models/cam-fv/scripts_cesm2_0/assimilate.csh
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/scripts_cesm2_0/assimilate.csh	2017-02-27 23:31:14 UTC (rev 11162)
+++ DART/branches/rma_trunk/models/cam-fv/scripts_cesm2_0/assimilate.csh	2017-02-28 14:22:17 UTC (rev 11163)
@@ -6,13 +6,10 @@
 #
 # DART $Id$
 
-# This script is designed to interface cesm1_5_beta06 and $dart/rma_fixed_filenames v10819.
+# This script is designed to interface cesm2_0_beta05 and $dart/rma_trunk v11###.
 
 # See 'RMA' for places where there are questions about RMA,
 # especially file naming.
-# This is written for the full implementation of new state space and inflation
-# file names, not what will be in the rma_trunk tag.  The full impl. is being
-# developed in branches/rma_fixed_filenames.
 
 
 
@@ -28,6 +25,9 @@
 
 set nonomatch       # suppress "rm" warnings if wildcard does not match anything
 
+setenv CASEROOT $1
+setenv cycle    $2
+
 # The FORCE options are not optional.
 # The VERBOSE options are useful for debugging though
 # some systems don't like the -v option to any of the following
@@ -41,7 +41,7 @@
       set TASKS_PER_NODE = `echo $LSB_SUB_RES_REQ | sed -ne '/ptile/s#.*\[ptile=\([0-9][0-9]*\)]#\1#p'`
       setenv MP_DEBUG_NOTIMEOUT yes
 
-      set BASEOBSDIR = /glade/p/image/Observations/NCEP+ACARS+GPS
+      set BASEOBSDIR = BOGUSBASEOBSDIR
       set  LAUNCHCMD = mpirun.lsf
    breaksw
 
@@ -52,7 +52,7 @@
       set   LINK = '/usr/local/bin/ln -fvs'
       set REMOVE = '/usr/local/bin/rm -fr'
 
-      set BASEOBSDIR = /glade/p/image/Observations/NCEP+ACARS+GPS
+      set BASEOBSDIR = BOGUSBASEOBSDIR
       set LAUNCHCMD  = mpirun.lsf
    breaksw
 
@@ -63,7 +63,7 @@
       set   LINK = 'ln -fvs'
       set REMOVE = 'rm -fr'
 
-      set BASEOBSDIR = /glade/p/image/Observations/NCEP+ACARS+GPS
+      set BASEOBSDIR = BOGUSBASEOBSDIR
       set LAUNCHCMD  = "aprun -n $NTASKS"
 
    breaksw
@@ -70,10 +70,8 @@
 endsw
 
 # In CESM1_4 xmlquery must be executed in $CASEROOT.
-setenv CASEROOT BOGUSCASEROOT
-setenv CASE     $CASEROOT:t
-
 cd ${CASEROOT}
+setenv CASE           $CASEROOT:t