diff --git a/.gitmodules b/.gitmodules index 1571044487..ae4b10631f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ [submodule "fates"] path = src/fates url = https://github.com/samsrabin/fates -fxtag = 60191cf4e5db9bea30170c35eb2f7ea1a6b90439 # isforest-20241016: Combine isforest functions into one. +fxtag = 5abc673561b61bcb416b0f0087c6750041765aac # edge-area-202410: My diagnostic outputs now use group_dyna_*. fxrequired = AlwaysRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/NCAR/fates-release diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 24346a1f39..5982767e37 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -499,7 +499,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). -/glade/u/home/samrabin/ctsm_fates-isforest/src/fates/parameter_files/fates_params_default.cdd58546a.nc +/glade/u/home/samrabin/ctsm_fates-isforest/src/fates/parameter_files/fates_params_default.5abc67356.nc diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm index 7ce530ca5d..c529e86927 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdAllVars/user_nl_clm @@ -63,4 +63,4 @@ hist_fincl1 = 'FATES_TLONGTERM', 'FATES_IS_FOREST_PCT10', 'FATES_IS_FOREST_PCT10_0GRASS', 'FATES_IS_FOREST_PCT25', 'FATES_IS_FOREST_PCT25_0GRASS', 'FATES_IS_FOREST_PCT50', 'FATES_IS_FOREST_PCT50_0GRASS', 'FATES_IS_FOREST_PCT75', 'FATES_IS_FOREST_PCT75_0GRASS', 'FATES_IS_FOREST_PCT90', -'FATES_IS_FOREST_PCT90_0GRASS' +'FATES_IS_FOREST_PCT90_0GRASS', 'FATES_FOREST_AREA_EB' diff --git a/src/fates b/src/fates index 60191cf4e5..5abc673561 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit 60191cf4e5db9bea30170c35eb2f7ea1a6b90439 +Subproject commit 5abc673561b61bcb416b0f0087c6750041765aac