[Dart-dev] DART/branches Revision: 13179

[dart at ucar.edu]

thoar at ucar.edu
2019-06-06 10:34:05 -0600 (Thu, 06 Jun 2019)
219
These are updated to Manhattan, but untested.

The inflation section is awful ... still. Should let the setup script
run fill_inflation_restart if need be and then remove a ton of logic
from the assimilate.csh script.




Modified: DART/branches/cesm_clm/models/clm/shell_scripts/cesm1_x/assimilate.csh
===================================================================
--- DART/branches/cesm_clm/models/clm/shell_scripts/cesm1_x/assimilate.csh	2019-05-28 20:34:18 UTC (rev 13178)
+++ DART/branches/cesm_clm/models/clm/shell_scripts/cesm1_x/assimilate.csh	2019-06-06 16:34:05 UTC (rev 13179)
@@ -22,11 +22,10 @@
       # NCAR "bluefire"
       set   MOVE = '/usr/local/bin/mv -fv'
       set   COPY = '/usr/local/bin/cp -fv --preserve=timestamps'
-      set   LINK = '/usr/local/bin/ln -fvs'
+      set   LINK = '/usr/local/bin/ln -vs'
       set REMOVE = '/usr/local/bin/rm -fr'
 
       set BASEOBSDIR = /glade/proj3/image/Observations/FluxTower
-      set  LAUNCHCMD = mpirun.lsf
    breaksw
 
    case ys*:
@@ -33,13 +32,12 @@
       # NCAR "yellowstone"
       set   MOVE = 'mv -fv'
       set   COPY = 'cp -fv --preserve=timestamps'
-      set   LINK = 'ln -fvs'
+      set   LINK = 'ln -vs'
       set REMOVE = 'rm -fr'
       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/land
-      set  LAUNCHCMD = mpirun.lsf
    breaksw
 
    case lone*:
@@ -46,11 +44,10 @@
       # UT lonestar
       set   MOVE = '/bin/mv -fv'
       set   COPY = '/bin/cp -fv --preserve=timestamps'
-      set   LINK = '/bin/ln -fvs'
+      set   LINK = '/bin/ln -vs'
       set REMOVE = '/bin/rm -fr'
 
       set BASEOBSDIR = ${WORK}/DART/observations/snow/work/obs_seqs
-      set  LAUNCHCMD = mpirun.lsf
    breaksw
 
    case la*:
@@ -57,12 +54,11 @@
       # LBNL "lawrencium"
       set   MOVE = 'mv -fv'
       set   COPY = 'cp -fv --preserve=timestamps'
-      set   LINK = 'ln -fvs'
+      set   LINK = 'ln -vs'
       set REMOVE = 'rm -fr'
       set TASKS_PER_NODE = $MAX_TASKS_PER_NODE
 
       set BASEOBSDIR = /your/observation/directory/here
-      set  LAUNCHCMD = "mpiexec -n $NTASKS"
    breaksw
 
    default:
@@ -73,7 +69,6 @@
       set REMOVE = 'rm -fr'
 
       set BASEOBSDIR = /scratch/scratchdirs/nscollin/ACARS
-      set  LAUNCHCMD = "aprun -n $NTASKS"
    breaksw
 endsw
 
@@ -80,7 +75,7 @@
 set ensemble_size = ${NINST_LND}
 
 #-------------------------------------------------------------------------
-# Determine time of model state ... from file name of first member
+# Block 1: Determine time of model state ... from file name of first member
 # of the form "./${CASE}.clm2_${ensemble_member}.r.2000-01-06-00000.nc"
 #
 # Piping stuff through 'bc' strips off any preceeding zeros.
@@ -99,22 +94,8 @@
 echo "valid time of model is $LND_YEAR $LND_MONTH $LND_DAY $LND_SECONDS (seconds)"
 echo "valid time of model is $LND_YEAR $LND_MONTH $LND_DAY $LND_HOUR (hours)"
 
-#-------------------------------------------------------------------------
-# Create temporary working directory for the assimilation and go there
-#-------------------------------------------------------------------------
-
-set temp_dir = assimilate_clm
-echo "temp_dir is $temp_dir"
-
-if ( -d $temp_dir ) then
-   ${REMOVE} $temp_dir/*
-else
-   mkdir -p $temp_dir
-endif
-cd $temp_dir
-
 #-----------------------------------------------------------------------------
-# Get observation sequence file ... or die right away.
+# Block 2: Get observation sequence file ... or die right away.
 # The observation file names have a time that matches the stopping time of CLM.
 #
 # The CLM observations are stowed in two sets of directories.
@@ -135,18 +116,19 @@