diff --git a/.gitmodules b/.gitmodules index a232ef7875..36cbeeefc3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,7 +52,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/RTM [submodule "mosart"] path = components/mosart url = https://github.com/ESCOMP/MOSART -fxtag = mosart1.1.12 +fxtag = mosart1.1.13 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/MOSART @@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute [submodule "ccs_config"] path = ccs_config url = https://github.com/ESMCI/ccs_config_cesm.git -fxtag = ccs_config_cesm1.0.66 +fxtag = ccs_config_cesm1.0.75 fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git @@ -91,8 +91,11 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git [submodule "cdeps"] path = components/cdeps -url = https://github.com/ESCOMP/CDEPS.git -fxtag = cdeps1.0.91 +#url = https://github.com/ESCOMP/CDEPS.git +url = https://github.com/billsacks/CDEPS.git +#fxtag = cdeps1.0.92 +#branch = fixes_for_ifx +fxtag = c2c83bd2157406c9a4df2c1c816032b619dba45d fxrequired = ToplevelRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git diff --git a/ccs_config b/ccs_config index 76370cc085..e5833b40b4 160000 --- a/ccs_config +++ b/ccs_config @@ -1 +1 @@ -Subproject commit 76370cc08587fd653458cdfb2e0b220b3168ded6 +Subproject commit e5833b40b47f54f9203474c6c3e01b656e92c25f diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 1e82513737..5165ea7c74 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -178,6 +178,14 @@ + + + FAIL + #3660 + Restart issues with default "inactive" fields added to history by hist_all_fields. + + +