diff --git a/.gitmodules b/.gitmodules index eebf87c5d8..9c5ab48276 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ [submodule "fates"] path = src/fates url = https://github.com/NorESMhub/fates -fxtag = sci.1.88.6_api.42.0.0_nor_sci1_api1 +fxtag = sci.1.88.6_api.42.0.0_nor_sci2_api1 fxrequired = AlwaysRequired # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed fxDONOTUSEurl = https://github.com/NorESMhub/fates diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml index 49ecbf57c1..c555b511d2 100644 --- a/bld/namelist_files/namelist_defaults_ctsm.xml +++ b/bld/namelist_files/namelist_defaults_ctsm.xml @@ -636,7 +636,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case). -lnd/clm2/paramdata/fates_params_sci.1.88.6_api.42.0.0_14pft_nor_sci1_api1_c251204.nc +lnd/clm2/paramdata/fates_params_sci.1.88.6_api.42.0.0_14pft_nor_sci2_api1_c260130.nc diff --git a/src/fates b/src/fates index 05612f93e7..82e7c0bbf2 160000 --- a/src/fates +++ b/src/fates @@ -1 +1 @@ -Subproject commit 05612f93e701dea0501da87651aca81349b95cf4 +Subproject commit 82e7c0bbf23b64c239924b705fd630ce7237580c