Repository navigation
Support CISM's SMB budget diagnostics and fractional ice_covered option #158
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
1d12802
Add the namelist variable ice_covered_thck_scale
whlipscomb 6623b14
Add SMB budget fields to the default CISM history variables
whlipscomb 0d9ab52
Add a testmod for fractional ice_covered
whlipscomb d4719af
Add a testmod with the Greenland settings of the CESM3 coupled runs
whlipscomb 447e639
Update externals to alpha11e and update tests to include fractional ice
Katetc c7184a5
Update ChangeLog for cismwrap_3_00_003
Katetc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule ccs_config
updated
19 files
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
cime_config/testdefs/testmods_dirs/cism/fractional_ice_covered/README
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| This testmod sets ice_covered_thck_scale = 4.0, so that CISM sends the coupler a | ||
| fractional ice_covered field, min(1, thck/4 m), instead of a binary (0 or 1) field. | ||
| This tests the coupling of fractional ice cover (lnd -> glc downscaling in CMEPS, | ||
| and the land-model glacier fractions), including exact restart. | ||
| It requires a CMEPS version that supports fractional ice_covered values. |
3 changes: 3 additions & 0 deletions
3
cime_config/testdefs/testmods_dirs/cism/fractional_ice_covered/user_nl_cism
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| ! Send a fractional ice_covered field to the coupler: ice_covered = min(1, thck/4 m) | ||
| ! Requires a CMEPS version that supports fractional ice_covered values. | ||
| ice_covered_thck_scale = 4.0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| This testmod uses the Greenland ice sheet settings of the CESM3 alpha11d coupled runs | ||
| (e.g., b.e30_alpha11d.B1850_MTso.ne30_t233_wgx3.419): power-law basal sliding | ||
| (which_ho_babc = 9) with a spatially varying friction coefficient (which_ho_powerlaw_c = 2) | ||
| obtained by inversion in a standalone spin-up. The coefficient and the initial ice sheet | ||
| state are read from a CISM restart file of a coupled run (in inputdata, cesm2_init). | ||
|
|
||
| Intended for Greenland ice sheet tests at 4 km (gris4), e.g. | ||
| ERS_Ly3.f09_g17_gris4.T1850Gg.derecho_intel.cism-gris_powerlaw |
16 changes: 16 additions & 0 deletions
16
cime_config/testdefs/testmods_dirs/cism/gris_powerlaw/user_nl_cism
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| ! Greenland settings of the CESM3 alpha11d coupled runs (b.e30_alpha11d.B1850_MTso.ne30_t233_wgx3.419-422): | ||
| ! power-law sliding with the basal friction coefficient powerlaw_c from an inversion, | ||
| ! read from the CISM restart file of run b.e30_alpha11b.B1850C_MTso.ne30_t233_wgx3.416 (year 21). | ||
| cisminputfile = '$DIN_LOC_ROOT/cesm2_init/b.e30_alpha11b.B1850C_MTso.ne30_t233_wgx3.416/0021-01-01/b.e30_alpha11b.B1850C_MTso.ne30_t233_wgx3.416.cism.gris.r.0021-01-01-00000.nc' | ||
| which_ho_babc = 9 | ||
| which_ho_powerlaw_c = 2 | ||
| which_ho_bwat = 0 | ||
| which_ho_effecpress = 0 | ||
| glissade_maxiter = 100 | ||
| block_inception = .false. | ||
| remove_ice_caps = .false. | ||
| thck_gradient_ramp = 100. | ||
| pmp_offset = 10. | ||
| beta_powerlaw_umax = 5000. | ||
| pseudo_plastic_q = 0.25 | ||
| p_ocean_penetration = 0.5 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule cdeps
updated
30 files
Submodule share
updated
from 9aa0b4 to f256fa
Submodule source_cism
updated
9 files
| +1 −1 | CMakeLists.txt | |
| +14 −5 | libglad/glad_output_fluxes.F90 | |
| +5 −1 | libglad/glad_output_states.F90 | |
| +13 −1 | libglad/glad_timestep.F90 | |
| +15 −0 | libglad/glad_type.F90 | |
| +32 −0 | libglide/glide_diagnostics.F90 | |
| +37 −0 | libglide/glide_types.F90 | |
| +45 −0 | libglide/glide_vars.def | |
| +15 −0 | libglissade/glissade_mass_balance.F90 |
Submodule CUPiD
updated
42 files
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we include the CMEPS and other externals updates in CISM-Wrapper with these changes (which I'm find with doing) then we could add the fractional_ice_covered test at the same time. I think that's a good idea. Do you want me to make this change or do you want to do it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Katetc, I'll defer to Claude. Claude writes:
By Stage 2, Claude is referring to the next step, where we divide ESCOMP/CISM#94 into six smaller PRs and implement those PRs on top of ESCOMP/CISM#97.