Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bld/namelist_files/namelist_defaults_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<!-- ================================================================== -->

<!-- <fates_paramfile>lnd/clm2/paramdata/fates_params_api.36.1.0_14pft_c241003.nc</fates_paramfile> -->
<fates_paramfile>lnd/clm2/paramdata/fates_params_sci.1.88.6_api.42.0.0_14pft_nor_sci1_api1_c251204.nc</fates_paramfile>
<fates_paramfile>lnd/clm2/paramdata/fates_params_sci.1.88.6_api.42.0.0_14pft_nor_sci2_api1_c260130.nc</fates_paramfile>
<!-- ================================================================== -->
<!-- Default surface roughness parameterization -->
<!-- ================================================================== -->
Expand Down
2 changes: 1 addition & 1 deletion src/fates