Update streams and namelist options for ismip7_run - #993
Merged
matthewhoffman merged 15 commits intoSep 26, 2026
Merged
Conversation
trhille
changed the title
ismip7_run
Contributor
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
Two critical configuration issues remain unresolved, involving calving-mask and strain-rate scaling inputs.
Get a fresh assessment by requesting another Copilot review.
Review effort: Lite
Findings: 2
Open (4)
What changed in this PR
Updates ISMIP7 AIS and GrIS production streams, namelist settings, optional calving inputs, and AIS OCX forcing metadata.
Changes:
- Adds melt, damage-threshold, and strain-rate scaling streams.
- Updates AIS/GrIS setup, configuration, and production namelists.
- Changes AIS OCX ocean forcing to version
v2.
| File | Summary |
|---|---|
compass/landice/tests/ismip7_run/ismip7_gris/streams.landice.template |
Adds GrIS melt parameter streams. |
compass/landice/tests/ismip7_run/ismip7_gris/streams.calving_strain_rate_scaling |
Defines the strain-rate scaling input stream. |
compass/landice/tests/ismip7_run/ismip7_gris/set_up_experiment.py |
Handles scaling input setup. |
compass/landice/tests/ismip7_run/ismip7_gris/namelist.landice |
Updates GrIS production options. Critical: the data source may be selected without an available scaling stream. |
compass/landice/tests/ismip7_run/ismip7_gris/ismip7_gris.cfg |
Adds scaling-file configuration. Nit (1 vote): document the new option. |
compass/landice/tests/ismip7_run/ismip7_gris/ismip7_gris_test.cfg |
Adds test scaling-file configuration. |
compass/landice/tests/ismip7_run/ismip7_ais/streams.landice.template |
Adds AIS melt streams. |
compass/landice/tests/ismip7_run/ismip7_ais/streams.damage_calving_threshold |
Defines the damage-threshold input stream. |
compass/landice/tests/ismip7_run/ismip7_ais/set_up_experiment.py |
Handles damage-threshold input setup. |
compass/landice/tests/ismip7_run/ismip7_ais/namelist.landice |
Updates AIS production options. Critical (3 votes): config_apply_calving_mask can request a missing mask input. |
compass/landice/tests/ismip7_run/ismip7_ais/ismip7_ais.cfg |
Adds threshold-field configuration. Nit (2 votes): document the new options and required inputs. |
compass/landice/tests/ismip7_run/ismip7_ais/ismip7_ais_test.cfg |
Adds test threshold-field configuration. |
compass/landice/ismip7/ice_sheet_params.py |
Changes AIS OCX ocean data to version v2. Nit (2 votes): update the User’s Guide documentation. |
💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
…arams For AIS: - Add damageCalvingThreshold input stream with conditional configuration - Add ISMIP7 melt parameter stream (ismip7shelfMelt_K, ismip7shelfMelt_basin) - Rename existing melt stream from ismip7_params to ismip6_melt_params for clarity For GrIS: - Add calvingStrainRateScaling input stream with conditional configuration - Add ISMIP6 melt parameter stream (ismip6shelfMelt_deltaT, _basin, _gamma0) All new streams are conditionally added via config flags and follow existing patterns for symlink creation and stream template replacement. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Add configuration options with defaults for: - AIS: use_damage_calving and damage_calving_threshold_path - GrIS: use_calving_strain_rate_scaling and calving_strain_rate_scaling_path All options default to false/NotAvailable to maintain backward compatibility. Updated both production and test config files. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Remove use_damage_calving and use_calving_strain_rate_scaling config options. Streams are now added automatically when valid file paths are provided (not 'NotAvailable' and file exists). Actual activation of these features is controlled through MALI namelist options, simplifying the compass configuration. Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
AIS changes: - Use FCT advection with 3rd order and coefficient 1.0 - Set calving to crevasse_depth with mask and damage settings - Enable Runge-Kutta time integration (order 3) - Change sub-shelf melt from ISMIP6 to ISMIP7 GrIS changes: - 3rd-order FCT with RK2 time stepping - Add config_calving_strainrate_scaling_source = 'data' - Change sub-shelf melt from 'none' to ISMIP6 Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
trhille
force-pushed
the
landice/update_ismip7_streams
branch
from
September 25, 2026 18:38
a68c31b to
ab9f0d8
Compare
trhille
force-pushed
the
landice/update_ismip7_streams
branch
from
September 25, 2026 18:45
4f0d13b to
2d807f2
Compare
- Fix E501 line length violations by splitting long lines - Remove unused variable use_damage_calving (F841) Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
Smaller file size while retaining fields needed for paraview/mosaic viz
* Remove cellProcID field from both ice sheet output streams. It has no time-dependence so it's not a big field, but it seemed like an easy target for pruning * Add geoidChange field to AIS output stream. This is only needed if GIA is active, which is not currently the case, but but I'm adding it anyway so we don't forget to do so later.
Switch back to scalar calving parameters for AIS config_damage_calving_threshold_source and GIS config_calving_strainrate_scaling_source. Also disable restore-calving for AIS now that calving is active.
Rather than support cfg variants for these options, let's hardcode the choice of calving law and its options in the namelist and streams.
The settings hardcoded in nl and streams are what are used
Update albany_input.yaml files to use nonlinear budd friction, MOLHO solver, and grounding-line parameterization.
matthewhoffman
self-requested a review
September 26, 2026 21:01
matthewhoffman
approved these changes
Sep 26, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Update streams and namelist options in
ismip7_runto reflect production configuration.Checklist
Testingin this PR) any testing that was used to verify the changes