Skip to content

MOM6+SIS2: Enable exchange of runoff DOC from Land to Ice used in CMIP7 ESM4.5 (#1034) #592

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

Merged
Hallberg-NOAA merged 1 commit into from
Mar 17, 2026
Merged

MOM6+SIS2: Enable exchange of runoff DOC from Land to Ice used in CMIP7 ESM4.5 (#1034) #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2293,6 +2293,9 @@ USE_RIGID_SEA_ICE = False ! [Boolean] default = False
! resist vertical motion.
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2293,6 +2293,9 @@ USE_RIGID_SEA_ICE = False ! [Boolean] default = False
! resist vertical motion.
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2293,6 +2293,9 @@ USE_RIGID_SEA_ICE = False ! [Boolean] default = False
! resist vertical motion.
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2328,6 +2328,9 @@ USE_RIGID_SEA_ICE = False ! [Boolean] default = False
! resist vertical motion.
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2604,6 +2604,9 @@ USE_RIGID_SEA_ICE = False ! [Boolean] default = False
! resist vertical motion.
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2724,6 +2724,9 @@ SEA_ICE_RIGID_MASS = 100.0 ! [kg m-2] default = 1000.0
! rigidity
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2763,6 +2763,9 @@ SEA_ICE_RIGID_MASS = 100.0 ! [kg m-2] default = 1000.0
! rigidity
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2739,6 +2739,9 @@ SEA_ICE_RIGID_MASS = 100.0 ! [kg m-2] default = 1000.0
! rigidity
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2698,6 +2698,9 @@ SEA_ICE_RIGID_MASS = 100.0 ! [kg m-2] default = 1000.0
! rigidity
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2724,6 +2724,9 @@ SEA_ICE_RIGID_MASS = 100.0 ! [kg m-2] default = 1000.0
! rigidity
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2763,6 +2763,9 @@ SEA_ICE_RIGID_MASS = 100.0 ! [kg m-2] default = 1000.0
! rigidity
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2659,6 +2659,9 @@ USE_RIGID_SEA_ICE = False ! [Boolean] default = False
! resist vertical motion.
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2299,6 +2299,9 @@ USE_RIGID_SEA_ICE = False ! [Boolean] default = False
! resist vertical motion.
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2309,6 +2309,9 @@ USE_RIGID_SEA_ICE = False ! [Boolean] default = False
! resist vertical motion.
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2299,6 +2299,9 @@ USE_RIGID_SEA_ICE = False ! [Boolean] default = False
! resist vertical motion.
ALLOW_ICEBERG_FLUX_DIAGNOSTICS = False ! [Boolean] default = False
! If true, makes available diagnostics of fluxes from icebergs as seen by MOM6.
ALLOW_CARBON_FLUX_EXCHANGE = False ! [Boolean] default = False
! If true, makes available fluxes and diagnostics of carbon in runoff within
! MOM6.
ALLOW_FLUX_ADJUSTMENTS = False ! [Boolean] default = False
! If true, allows flux adjustments to specified via the data_table using the
! component name 'OCN'.
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Open in desktop
Submodule MOM6 updated 9 files
+15 −2 config_src/drivers/FMS_cap/MOM_surface_forcing_gfdl.F90
+11 −1 config_src/drivers/FMS_cap/ocean_model_MOM.F90
+11 −0 config_src/drivers/STALE_mct_cap/mom_ocean_model_mct.F90
+4 −1 config_src/drivers/STALE_mct_cap/ocn_comp_mct.F90
+15 −0 config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
+4 −1 config_src/drivers/solo_driver/MOM_driver.F90
+34 −6 src/core/MOM_forcing_type.F90
+62 −3 src/ice_shelf/MOM_ice_shelf.F90
+4 −3 src/ice_shelf/MOM_ice_shelf_state.F90
2 changes: 1 addition & 1 deletion src/SIS2
Open in desktop
Submodule SIS2 updated 1 files
+3 −1 src/ice_spec.F90
Loading