[Dart-dev] DART/branches Revision: 11982

[dart at ucar.edu]

raeder at ucar.edu
2017-10-13 13:59:06 -0600 (Fri, 13 Oct 2017)
375
setup_advanced setup_hybrid: added fv_div24del2flag to user_nl_cam_####
   to ensure that the right value (4) is always used.
   Added optional variables to user_nl_clm_#### to handle cold start cases,
   where a CLM restart files needs to be interpolated to the desired version.
case_st_archive.py: fixed indenting problem which led to creation
   of rpointer.unset files.




Modified: DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/case_st_archive.py
===================================================================
--- DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/case_st_archive.py	2017-10-13 19:57:50 UTC (rev 11981)
+++ DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/case_st_archive.py	2017-10-13 19:59:06 UTC (rev 11982)
@@ -95,24 +95,24 @@
                 if rpointer_content is not 'unset':
                     if not ninst_strings:
                         ninst_strings = ["empty"]
-                for ninst_string in ninst_strings:
-                    if ninst_string == 'empty':
-                        ninst_string = ""
-                    for key, value in [('$CASE', casename),
-                                       ('$DATENAME', datename),
-                                       ('$NINST_STRING', ninst_string)]:
-                        rpointer_file = rpointer_file.replace(key, value)
-                        rpointer_content = rpointer_content.replace(key, value)
+                    for ninst_string in ninst_strings:
+                        if ninst_string == 'empty':
+                            ninst_string = ""
+                        for key, value in [('$CASE', casename),
+                                           ('$DATENAME', datename),
+                                           ('$NINST_STRING', ninst_string)]:
+                            rpointer_file = rpointer_file.replace(key, value)
+                            rpointer_content = rpointer_content.replace(key, value)
+    
+                        # write out the respect files with the correct contents
+                        rpointer_file = os.path.join(archive_restdir, rpointer_file)
+                        logger.info("writing rpointer_file %s" % rpointer_file)
+                        f = open(rpointer_file, 'w')
+                        for output in rpointer_content.split(','):
+                            f.write("%s \n" %output)
+                        f.close()
 
-                    # write out the respect files with the correct contents
-                    rpointer_file = os.path.join(archive_restdir, rpointer_file)
-                    logger.info("writing rpointer_file %s" % rpointer_file)
-                    f = open(rpointer_file, 'w')
-                    for output in rpointer_content.split(','):
-                        f.write("%s \n" %output)
-                    f.close()
 
-
 ###############################################################################
 def _archive_log_files(case):
 ###############################################################################

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-10-13 19:57:50 UTC (rev 11981)
+++ DART/branches/rma_trunk/models/cam-fv/shell_scripts/cesm2_0_beta05/setup_advanced	2017-10-13 19:59:06 UTC (rev 11982)
@@ -832,7 +832,9 @@
 
 # CAM physics (etc.) selection.  (Eaton said?) It's safer to always specify the physics,
 # instead of letting the compset choose it.
-# ./xmlchange CAM_CONFIG_OPTS="-phys cam4 "
+set CAM_CONFIG_OPTS=""
+# set CAM_CONFIG_OPTS="-phys cam4 "
+./xmlchange CAM_CONFIG_OPTS="$CAM_CONFIG_OPTS"
 
 # Reduce the amount of stuff that's st_archived.
 #  > Fewer restart sets saved to         $archive/rest and/or to HPSS,
@@ -1095,6 +1097,15 @@
 # MAKE SURE THE STAGING SECTION OF THIS SCRIPT MATCHES THESE VALUES.
 # ==============================================================================
 
+# Check whether (or decide to) interpolation of the CLM restart file will be done.
+# If so, each CLM namelist needs it's own finidat_interp_dest
+set do_clm_interp = "true"
+set line = `grep use_init_interp user_nl_clm_0001`
+if ($status == 0) then
+   set words = `echo $line | sed -e "s#[=\.]# #g`
+   if ($words[2] == true ) set do_clm_interp = "true"
+endif
+
 @ inst = 1
 while ($inst <= $num_instances)
 
@@ -1128,8 +1139,9 @@
    # Was needed for 2 degree spinup 
    # even though 1 degree worked with default 1 degree topo with a name similar to this.
    # echo "bnd_topo = '/glade/p/cesmdata/cseg/inputdata/atm/cam/topo/fv_1.9x2.5_nc3000_Nsw084_Nrs016_Co120_Fi001_ZR_061116.nc' " >> ${fname}
+   echo $CAM_CONFIG_OPTS | grep 'cam4'
+   if ($status == 0) echo " fv_div24del2_flag = 4 "       >> ${fname}
 
-
    # CESM2.0, CAM6
    # I've removed the section which defined the WACCM timestep and 
    # prescribed aerosols, green house gasses, # ozone, etc., 
@@ -1219,22 +1231,25 @@
    # echo "hist_mfilt  = 1"              >> ${fname}
    # echo "hist_nhtfrq = 0"              >> ${fname}
 
-   echo "check_finidat_year_consistency = .false."   >> ${fname}
    echo "hist_empty_htapes = .true."   >> ${fname}
    echo "hist_fincl1 = 'TSA'"          >> ${fname}
    echo "hist_nhtfrq = -$stop_n"       >> ${fname}
    echo "hist_mfilt  = 1"              >> ${fname}
    echo "hist_avgflag_pertape = 'I'"   >> ${fname}
-   # This was needed to allow the interpolation of the default CLM restart file.
-   # It may not be needed in runs that start from a somewhat spun up ensemble,
-   # but we don't particularly want or need this bit of physics.