diff --git a/.gitmodules b/.gitmodules index 8a6e8f7..c0abe1e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -59,7 +59,7 @@ 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"] @@ -67,7 +67,7 @@ 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 diff --git a/cime_config/testlist_earthworks.xml b/cime_config/testlist_earthworks.xml index e45d818..8b39a39 100644 --- a/cime_config/testlist_earthworks.xml +++ b/cime_config/testlist_earthworks.xml @@ -28,7 +28,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/cime_config/testmods_dirs/ew/data_check/shell_commands b/cime_config/testmods_dirs/ew/data_check/shell_commands new file mode 100755 index 0000000..2751abb --- /dev/null +++ b/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 diff --git a/cime_config/testmods_dirs/ew/no_gw_front/user_nl_cam b/cime_config/testmods_dirs/ew/no_gw_front/user_nl_cam deleted file mode 100644 index 649521a..0000000 --- a/cime_config/testmods_dirs/ew/no_gw_front/user_nl_cam +++ /dev/null @@ -1 +0,0 @@ -use_gw_front=.false. diff --git a/components/cam b/components/cam index ddee772..6344fe3 160000 --- a/components/cam +++ b/components/cam @@ -1 +1 @@ -Subproject commit ddee772d1a9e831958060b5916d41a563bbcf10d +Subproject commit 6344fe3cdb9a2c936bc7fe3146b0b45964ccccaa diff --git a/components/clm b/components/clm index 72e4235..34c1461 160000 --- a/components/clm +++ b/components/clm @@ -1 +1 @@ -Subproject commit 72e4235075e1b5c98d5cfe68173ac35f2edf93f6 +Subproject commit 34c1461cd6127e4eba2ca0712bfeab0a5143271b diff --git a/components/mpas-ocean b/components/mpas-ocean index 642b868..8a10da3 160000 --- a/components/mpas-ocean +++ b/components/mpas-ocean @@ -1 +1 @@ -Subproject commit 642b8685198ed94977ea4766a83de175e3169135 +Subproject commit 8a10da3c25f6275d9bb7cf74a9292111c4a4e5a5 diff --git a/components/mpas-seaice b/components/mpas-seaice index 3d844b3..f99c44d 160000 --- a/components/mpas-seaice +++ b/components/mpas-seaice @@ -1 +1 @@ -Subproject commit 3d844b31ca12691e87734e97bb9e5aa5bc8df1d1 +Subproject commit f99c44dddc4673d61cb3d152b0af38b11e480cd1