[Dart-dev] DART/branches Revision: 11762

[dart at ucar.edu]

raeder at ucar.edu
2017-06-26 13:48:46 -0600 (Mon, 26 Jun 2017)
422
Committing contents of shell_scripts/cesm2_0_beta05
for use by Bacmeister and by Barre'.  The tests for
Bacmeister used gw_{drag,rdg}.F90 pulled from cam5_4_120
(~cesm2_0_alpha06i).  
The main updates:
> handle the output from the st_archive job better,
> handle the DART's (intermediate) version of config_archive.xml more cleanly,
> search for WACCM within the long compset name more robustly in the CESM2 environment.




Modified: DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/setup_advanced
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/setup_advanced	2017-06-22 23:12:02 UTC (rev 11761)
+++ DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/setup_advanced	2017-06-26 19:48:46 UTC (rev 11762)
@@ -242,7 +242,7 @@
 setenv refcase     CAM6_spinup_sst.25
 setenv refyear     2013
 setenv refmon      06
-setenv refday      15
+setenv refday      01
 setenv reftod      00000
 
 # useful combinations of time that we use below
@@ -281,7 +281,7 @@
 # setenv start_day     15
 setenv start_year    2013
 setenv start_month   06
-setenv start_day     15
+setenv start_day     01
 setenv start_tod     00000
 
 setenv short_term_archiver off
@@ -321,9 +321,9 @@
 #      less than 10 minutes on yellowstone using 1800 pes (120 nodes)
 # ==============================================================================
 
-setenv PROJECT      P86850054
-setenv queue        premium
-setenv timewall     2:00
+setenv PROJECT      your_computer_time_account
+setenv queue        regular
+setenv timewall     1:00
 
 # ==============================================================================
 # standard commands:
@@ -432,8 +432,8 @@
    exit 12
 endif
 
-# setup_advanced will need more flexible arguments, as in CESM1_5_setup_advanced(?)
 # This may need --project, if env var PROJECT is no longer used.
+
 ${CIMEROOT}/scripts/create_newcase --case ${caseroot} --mach ${mach} \
            --res ${resolution} ${compset_args} ${user_grid}
 #    --res ${resolution} --compset ${compset} --ninst $num_instances
@@ -495,6 +495,7 @@
 # which is in this directory too.
 cd $CIMEROOT
 set st_arch = `find [^\.]* -name case_st_archive.py -print`
+set ca_arch = `find [^\.]* -name config_archive.xml -print | grep cesm`
 cd -
 if (! -f $CIMEROOT/${st_arch}.orig) then
    $MOVE $CIMEROOT/${st_arch} $CIMEROOT/${st_arch}.orig
@@ -506,10 +507,9 @@
 # rpointer$NINST_STRING.atm, compared to the rpointers in run:
 # rpointer.atm$NINST_STRING.
 # Fix this (for cesm2_0_beta05 and ...?) by replacing the config_archive.xml file.
-if (! -f $CIMEROOT/cime_config/cesm/config_archive.xml.orig) then
-   mv $CIMEROOT/cime_config/cesm/config_archive.xml \
-      $CIMEROOT/cime_config/cesm/config_archive.xml.orig
-   cp ./config_archive.xml $CIMEROOT/cime_config/cesm/config_archive.xml
+if (! -f $CIMEROOT/${ca_arch}.orig) then
+   ${MOVE} $CIMEROOT/${ca_arch} $CIMEROOT/${ca_arch}.orig
+   ${COPY} ./config_archive.xml $CIMEROOT/${ca_arch}
 endif
 # St_archive will also need updating for new stage names: 
 #     input, forecast, preassim, postassim, analysis, output.
@@ -641,7 +641,7 @@
 #       BUT, do arrange it so that each member(instance) spans complete nodes:
 #       modulo(total pe count / number of instances, 15) == 0.
 
-@ nodes_per_instance = 1
+@ nodes_per_instance = 3
 
 # cesm2; is num_instances still needed here, with ninst being a create_newcase argument?
 #        Try it as it is.  Fix as necessary.
@@ -910,16 +910,21 @@
    @ iarg = $iarg + 2
 end
 
-# Need to know if we are using WACCM (aka WCCM) for several reasons.
+# Need to know if we are using WACCM (aka WCCM or WXIE) for several reasons.
+# CESM2; maybe not needed anymore?
 # Mostly file managment issues.
 # WARNING:   Check your $COMPSET to see whether the grep pattern below will detect your WACCM ! !
-set waccm = `echo $COMPSET | grep CCM`
+set comps = `echo $COMPSET | sed -e "s#_# #"`
+set atm = `echo $comps[2] | sed -e "s#%# #"`
+echo $atm[2] | grep WC 
 if ($status == 0) then
    set waccm = true
 else
    set waccm = false
    # WACCM benefits from a modified cd_core.F90, but none of the
    # other configurations do.
+   # Manhattan; I think cd_core.F90 (doubled div2 diffusion) is no longer needed or useful.
+   # The new default fv_div24del2flag = 4 is a better option.
 endif
 
 # Each CAM dynamical core has its own SourceMods
@@ -1024,6 +1029,9 @@