Merge branch 'gdicker1/update/post_beta02' into develop (PR #73)

Bring in other EarthWorks-specifc changes including:
- Updating timers in CAM
- Updating input data for MPAS in CAM
- Updating CTSM input data for some MPAS resolutions
- Adding timers to MPAS-O and MPAS-SeaIce

.gitmodules

@@ -59,15 +59,15 @@
  path = components/cam
  url = https://www.github.com/EarthWorksOrg/CAM
  fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM
- fxtag = cam-ew2.3.004
+ fxtag = cam-ew2.3.006
  fxrequired = ToplevelRequired
 
 [submodule "clm"]
  path = components/clm
  url = https://github.com/EarthWorksOrg/CTSM
  fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
  fxrequired = ToplevelRequired
- fxtag = ctsm-ew2.3.003
+ fxtag = ctsm-ew2.3.004
 
 [submodule "cice"]
  path = components/cice
@@ -164,14 +164,14 @@
  url = https://github.com/EarthWorksOrg/mpas-ocean.git
  fxDONOTUSEurl = https://github.com/EarthWorksOrg/mpas-ocean.git
  fxrequired = ToplevelRequired
- fxtag = mpaso-ew2.3.000
+ fxtag = mpaso-ew2.3.002
 
 [submodule "mpas-seaice"]
  path = components/mpas-seaice
  url = https://github.com/EarthWorksOrg/mpas-seaice.git
  fxDONOTUSEurl = https://github.com/EarthWorksOrg/mpas-seaice.git
  fxrequired = ToplevelRequired
- fxtag = mpassi-ew2.3.000
+ fxtag = mpassi-ew2.3.001
 
 [submodule "mpas-framework"]
  path = components/mpas-framework

cime_config/testlist_earthworks.xml

@@ -28,15 +28,15 @@
  <option name="wallclock"> 00:20:00 </option>
  </options>
  </test>
- <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="F2000climoEW" testmods="ew/no_gw_front">
+ <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="F2000climoEW" >
  <machines>
  <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
  </machines>
  <options>
  <option name="wallclock"> 00:20:00 </option>
  </options>
  </test>
- <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="FullyCoupledEW" testmods="ew/no_gw_front">
+ <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="FullyCoupledEW" >
  <machines>
  <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
  </machines>
@@ -45,7 +45,7 @@
  <option name="comment">EarthWorks model with active mpasa, mpaso, mpassi</option>
  </options>
  </test>
- <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="CHAOS2000dev" testmods="ew/no_gw_front">
+ <test name="SMS_P128_Vnuopc" grid="mpasa120_oQU120" compset="CHAOS2000dev" >
  <machines>
  <machine name="derecho" compiler="nvhpc" category="ew-pr"/>
  <machine name="derecho" compiler="intel" category="ew-pr"/>

cime_config/testmods_dirs/ew/data_check/shell_commands

@@ -0,0 +1,12 @@
+./case.setup
+./preview_namelists
+# Have to run the previous two steps for next command to succeed
+./check_input_data
+# Since cime will continue even if the above commands fail
+# output success or fail to a special file
+if [[ "0" == "$?" ]]; then
+ echo "EW INPUT DATA CHECK: SUCCESS" | tee ew_data_check.txt
+else
+ echo "EW INPUT DATA CHECK: FAIL" | tee ew_data_check.txt
+ echo "It may be necessary to run ./check_input_data --download" | tee ew_data_check.txt
+fi