[Dart-dev] DART/branches Revision: 12604

[dart at ucar.edu]

raeder at ucar.edu
2018-05-29 08:32:14 -0600 (Tue, 29 May 2018)
338
Replace use of CESM's NINST with DART's num_instances, 
since NINST does not always have the value of the ensemble size;
when multi-driver is turned on.
Updated vertical coordinate to recam.
Fixed spurious cp redirection.
Added cp of new fill_inflation_restart.
Updated to handle PBS (fixing directives in st_archive).
Updated comments.




Modified: DART/branches/recam/models/cam-fv/shell_scripts/DART_config
===================================================================
--- DART/branches/recam/models/cam-fv/shell_scripts/DART_config	2018-05-25 22:24:43 UTC (rev 12603)
+++ DART/branches/recam/models/cam-fv/shell_scripts/DART_config	2018-05-29 14:32:14 UTC (rev 12604)
@@ -12,11 +12,11 @@
 #
 # This script integrates DART with a pre-existing CESM multi-instance case.
 # It must be run from a valid CASEROOT directory and some environment variables
-# must be set (as in CESM#_#_setup_YYY). If the case was created
+# must be set (as in cesm#_#/setup_XXX). If the case was created
 # using one of the DART scripts, this script should be staged in the
 # CASEROOT directory automatically, and DARTROOT is set at that time.
 #
-# CAM is the only active model component.
+# CAM is the only model component used for assimilation.
 # CESM starts and stops to allow for CAM to assimilate every 6 hours.
 #
 # This script will build the DART executables if they are not found.
@@ -50,19 +50,14 @@
 
 if ( ! -e ./xmlquery ) then
    echo "ERROR: $0 must be run from a CASEROOT directory".
-   exit -1
+   exit 1
 endif
 
-setenv CASE          `./xmlquery CASE           -value`
-setenv CASEROOT      `./xmlquery CASEROOT       -value`
-# old; setenv CCSM_COMPSET  `./xmlquery CCSM_COMPSET   -value`
-setenv COMPSET       `./xmlquery COMPSET   -value`
-setenv EXEROOT       `./xmlquery EXEROOT        -value`
-setenv NINST_ATM     `./xmlquery NINST_ATM      -value`
-setenv RUNDIR        `./xmlquery RUNDIR         -value`
+setenv CASE          `./xmlquery CASE           --value`
+setenv CASEROOT      `./xmlquery CASEROOT       --value`
+setenv COMPSET       `./xmlquery COMPSET   --value`
+setenv EXEROOT       `./xmlquery EXEROOT        --value`
 
-set num_instances = $NINST_ATM
-
 # DARTROOT is set by the DART CESM_configure scripts. Under certain
 # situations, you may need to set this manually. It should reference the
 # base portion of the DART code tree.
@@ -80,7 +75,7 @@
 # some systems don't like the -v option to any of the following
 switch ("`hostname`")
    case be*:
-      # NCAR "bluefire"
+      # NCAR "bluefire", an IBM Linux machine.
       set   MOVE = '/usr/local/bin/mv -fv'
       set   COPY = '/usr/local/bin/cp -fv --preserve=timestamps'
       set   LINK = '/usr/local/bin/ln -fvs'
@@ -89,6 +84,11 @@
    breaksw
    default:
       # NERSC "hopper", NWSC "yellowstone"
+      # NWSC "cheyenne"; which cp am I getting?  ls -l /bin/cp yields
+      #       /bin/cp --> /usr/bin/cp
+      #    'man cp' yields a choice:
+      #       cp(1) which has --preserve, and 
+      #       cp(1p) which is some POSIX cp which doesn't have --preserve
       set   MOVE = '/bin/mv -fv'
       set   COPY = '/bin/cp -fv --preserve=timestamps'
       set   LINK = '/bin/ln -fvs'
@@ -109,7 +109,7 @@
    if ( ! -d $DIR ) then
       echo "ERROR: directory '$DIR' not found"
       echo "       In the setup script check the setting of: $VAR"
-      exit -1
+      exit 10
    endif
 end
 
@@ -126,6 +126,7 @@
       echo "WARNING: executable file 'filter' not found."
       echo "         Looking for: $targetdir/filter "
       echo "         Trying to rebuild all executables for $MODEL now ..."
+      echo "         This will be incorrect, if input.nml:preprocess_nml is not correct."
       (cd $targetdir; ./quickbuild.csh -mpi)
       if ( ! -x $targetdir/filter ) then
          echo "ERROR: executable file 'filter' not found."
@@ -132,7 +133,7 @@
          echo "       Unsuccessfully tried to rebuild: $targetdir/filter "
          echo "       Required DART assimilation executables are not found."
          echo "       Stopping prematurely."
-         exit -1
+         exit 20
       endif
    endif
 end
@@ -149,7 +150,10 @@
 # This might want to have a conditional around it, to only execute if it's a bsub machine.
 sed -e "/BSUB[ ]*-o/c\#BSUB  -o cesm_st_arch.stdout.%J" \
     -e "/BSUB[ ]*-e/c\#BSUB  -e cesm_st_arch.stderr.%J" \
-    -e "/BSUB[ ]*-J/c\#BSUB  -J ${CASE}.st_arch" case.st_archive >! temp.$$  || exit 20
+    -e "/BSUB[ ]*-J/c\#BSUB  -J ${CASE}.st_arch"        \
+    -e  "/PBS[ ]*-N/c\#PBS  -N cesm_st_arch.stdout"     \
+    -e  "/PBS[ ]*-o/c\#PBS  -o cesm_st_arch.stdouterr"  \
+    case.st_archive >! temp.$$  || exit 30
 ${MOVE} temp.$$ case.st_archive
 chmod 755       case.st_archive