Skip to content

Gfdl cryo merge#3

Merged
alex-huth merged 2 commits into
gfdl-cryosphere:dev/cryofrom
OlgaSergienko:gfdl_cryo_merge
Jan 13, 2025
Merged

Gfdl cryo merge#3
alex-huth merged 2 commits into
gfdl-cryosphere:dev/cryofrom
OlgaSergienko:gfdl_cryo_merge

Conversation

@OlgaSergienko
Copy link
Copy Markdown

This PR removes an extra registration of sfc_mass_flux. Now it is registered with or without running the ice-sheet dynamics.

@alex-huth alex-huth merged commit 5ffc687 into gfdl-cryosphere:dev/cryo Jan 13, 2025
OlgaSergienko added a commit that referenced this pull request Feb 18, 2025
* Removed second registration of sfc_mass_flux with register_diag_field.

* Registered sfc_mass_flux to runs with static and dynamic ice sheets.
OlgaSergienko added a commit that referenced this pull request Mar 6, 2025
* Commit for coupling of land to ocean adot

* Remove unused ice sheet enabled flag

* add adot to Shelf restart

* Register sfc mass flux outside of initialize fluxes

* Gfdl cryo merge (#3)

* Removed second registration of sfc_mass_flux with register_diag_field.

* Registered sfc_mass_flux to runs with static and dynamic ice sheets.

* This commit removed the second registration of 'sfc_mass_flux' in 'register_diag_field()'

* Testing shelf_sfc_mass_flux restart.

* The earlier removed 'register_diag_field()' for 'mass_flux' has been added back and 'register_restart_field()' of 'fluxes_in%shelf_sfc_mass_flux' is moved before 'restore_state()'

* Corrected the line length error.

* Added back 'CS%id_mass_flux = register_diag_field()'

---------

Co-authored-by: NJSchlegel <nschlegel@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants