diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all index 35a8a8a42..ef53ae569 100644 --- a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all @@ -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'. diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all index c06f8efa9..a815327f4 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -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'. diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all index 08180fb03..90504b41d 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 7487a4731..c9f2a54da 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all index 77eae0968..f0e30cf04 100644 --- a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all index 0fde87288..eb1c79223 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all index e6534ed43..14eb89baa 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all index 73d17a6cc..240e7436d 100644 --- a/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all index e9dacb9ce..a3ae2d64b 100644 --- a/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index ce07929ff..38473979c 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 4054f37f5..2384c01f7 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index 5a1cd08a9..c8c690f58 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 89d6266e9..01294908b 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index 229accf77..429d0dcbd 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -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'. diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 9e21aee33..55e7f79b8 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -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'. diff --git a/src/MOM6 b/src/MOM6 index 5a1e06987..d2f562ac1 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 5a1e06987f46360df19cc38c9309a3883fc1883f +Subproject commit d2f562ac164b41ac0a36d2cb5158ba00036469a1 diff --git a/src/SIS2 b/src/SIS2 index 445cc3600..35767bb84 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit 445cc36007118475c48c9934260cc33472896a18 +Subproject commit 35767bb8436bba28774f9add64605b967a3289cf