Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

noresm2.5_alpha09: Update CTSM, BLOM config in compsets. #632

Merged
merged 6 commits into from
Feb 6, 2025
+64 −7
Merged

noresm2.5_alpha09: Update CTSM, BLOM config in compsets. #632

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cf9e04
update .gitmodules
mvdebolskiy Jan 29, 2025
638c733
make hybrid coord default in blom. Add a test for non-hybryd coords
mvdebolskiy Feb 1, 2025
e5577c5
revert ccs_config, add clm submodule
mvdebolskiy Feb 1, 2025
08b927a
change test length for nonhyb to avoid time limit
mvdebolskiy Feb 4, 2025
3b560d9
rename blom nohyb compset to blom compsets scheme
mvdebolskiy Feb 5, 2025
c922239
add changelog
mvdebolskiy Feb 6, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ fxDONOTUSEurl = https://github.com/NorESMhub/CISM-wrapper
[submodule "clm"]
path = components/clm
url = https://github.com/NorESMhub/CTSM
fxtag = ctsm5.3.11-noresm_v1
fxtag = ctsm5.3.11-noresm_v2
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NorESMhub/CTSM

Expand Down
16 changes: 11 additions & 5 deletions cime_config/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,24 @@

<compset>
<alias>N1850</alias>
<lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%SP_CICE_BLOM%ECO_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
<lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%SP_CICE_BLOM%HYB%ECO_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
</compset>
<compset>
<alias>N1850clmbgc</alias>
<lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%BGC-CROP_CICE_BLOM%ECO_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
<lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%BGC-CROP_CICE_BLOM%HYB%ECO_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
</compset>
<compset>
<alias>N1850fates-sp</alias>
<lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%FATES-SP_CICE_BLOM%ECO_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
<lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%FATES-SP_CICE_BLOM%HYB%ECO_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
</compset>
<compset>
<alias>N1850fates-nocomp</alias>
<lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%FATES-NOCOMP_CICE_BLOM%ECO_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
<lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%FATES-NOCOMP_CICE_BLOM%HYB%ECO_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
</compset>

<compset>
<alias>N1850mam4</alias>
<lname>1850_CAM70%LT%GHGMAM4_CLM60%SP_CICE_BLOM%ECO_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
<lname>1850_CAM70%LT%GHGMAM4_CLM60%SP_CICE_BLOM%HYB%ECO_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
</compset>

<!-- BG compsets: evolving ice sheet -->
Expand All @@ -77,6 +77,12 @@
<lname>1850_DATM%CRUv7_CLM50%BGC-CROP_CICE_POP2_MOSART_CISM2%GRIS-EVOLVE_SWAV</lname>
</compset>

<!-- fully coupled without hybrid coordinate in BLOM for testing-->
<compset>
<alias>N1850nohyb</alias>
<lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%SP_CICE_BLOM%ECO_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
</compset>

<entries>
<entry id="RUN_STARTDATE">
<values>
Expand Down
8 changes: 8 additions & 0 deletions cime_config/testlist_allactive.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,12 @@
<option name="wallclock"> 01:00:00 </option>
</options>
</test>
<test name="ERS_D_Ld4" grid="ne30pg3_tn14" compset="N1850nohyb" testmods="allactive/defaultio">
<machines>
<machine name="betzy" compiler="intel" category="prealpha_noresm"/>
</machines>
<options>
<option name="wallclock"> 01:00:00 </option>
</options>
</test>
</testlist>
2 changes: 1 addition & 1 deletion components/clm
Open in desktop
Submodule clm updated 7 files
+1 −0 bld/namelist_files/namelist_defaults_drydep.xml
+0 −4 cime_config/testdefs/testmods_dirs/clm/FatesColdMeganSatPhen/user_nl_clm
+36 −21 src/biogeochem/VOCEmissionMod.F90
+7 −6 src/biogeophys/BalanceCheckMod.F90
+1 −2 src/biogeophys/CanopyFluxesMod.F90
+0 −2 src/biogeophys/CanopyStateType.F90
+18 −2 src/utils/clmfates_interfaceMod.F90