[Dart-dev] DART/branches Revision: 12473

[dart at ucar.edu]

nancy at ucar.edu
2018-03-30 10:27:33 -0600 (Fri, 30 Mar 2018)
127
fixes to the script from moha.  these need to be
reviewed and if approved, committed to the rma_trunk
version of this script.




Modified: DART/branches/recam/models/cam-fv/shell_scripts/cesm2_0_beta05/setup_hybrid
===================================================================
--- DART/branches/recam/models/cam-fv/shell_scripts/cesm2_0_beta05/setup_hybrid	2018-03-29 15:54:17 UTC (rev 12472)
+++ DART/branches/recam/models/cam-fv/shell_scripts/cesm2_0_beta05/setup_hybrid	2018-03-30 16:27:33 UTC (rev 12473)
@@ -871,20 +871,19 @@
 
 # Need to know if we are using WACCM (aka WCCM or WXIE) for several reasons.
 # Mostly file managment issues.
+# 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.
 # CESM2; maybe not needed anymore?
 #        DART_config needs it to set input.nml values.
 # WARNING:   Check your $COMPSET to see whether the grep pattern below will detect your WACCM ! !
+setenv waccm false
 set comps = `echo $COMPSET | sed -e "s#_# #"`
 set atm = `echo $comps[2] | sed -e "s#%# #"`
 if ($#atm > 1) then
    echo $atm[2] | grep 'W[CX]' 
    if ($status == 0) setenv waccm true
-else
-   setenv 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
@@ -1082,7 +1081,7 @@
    echo " nhtfrq        = -$stop_n "                      >> ${fname}
    echo " mfilt         = 1 "                             >> ${fname}
    echo $CAM_CONFIG_OPTS | grep 'cam4'
-   if ($status == 0) echo " fv_div24del2_flag = 4 "       >> ${fname}
+   if ($status == 0) echo " fv_div24del2flag = 4 "        >> ${fname}
 
 
    # CESM2.0, CAM6
@@ -1174,7 +1173,8 @@
    # echo "hist_mfilt  = 1"              >> ${fname}
    # echo "hist_nhtfrq = 0"              >> ${fname}
 
-   echo "check_finidat_year_consistency = .false."   >> ${fname}
+   # may be needed for full CLM, but not running CAM
+   #echo "check_finidat_year_consistency = .false."   >> ${fname}
    echo "hist_empty_htapes = .true."   >> ${fname}
    echo "hist_fincl1 = 'TSA'"          >> ${fname}
    echo "hist_nhtfrq = -$stop_n"       >> ${fname}