diff --git a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all index 77227a1ce3..ce6df450c0 100644 --- a/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all @@ -1738,6 +1738,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd 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 311fe907b3..af7e98955d 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 @@ -1738,6 +1738,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd 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 311fe907b3..af7e98955d 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 @@ -1738,6 +1738,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 39231ead53..407714f1c9 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -1738,6 +1738,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd 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 9728419712..8aded9492d 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 @@ -2028,6 +2028,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 3 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd 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 6bdeb9c6c8..eff24df925 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -2053,6 +2053,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd 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 e89fdb4e44..02804e55bb 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -2076,6 +2076,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 36e2e03c99..a6a10b64e7 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -2053,6 +2053,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index e6c86c7954..b8983adfce 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -2076,6 +2076,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index fed5cdc8f1..fdc69f112c 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -1755,6 +1755,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd 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 280b827805..9a04e55aa4 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -1755,6 +1755,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 280b827805..9a04e55aa4 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -1755,6 +1755,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd diff --git a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all index ad404bcfd4..f4ebb64712 100644 --- a/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all +++ b/land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all @@ -1947,6 +1947,10 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0 ! The interval increases by a factor of 2. after each call to write_energy. ! === module ocean_model_init === +SINGLE_STEPPING_CALL = True ! [Boolean] default = True + ! If true, advance the state of MOM with a single step + ! including both dynamics and thermodynamics. If false, + ! the two phases are advanced with separate calls. RESTART_CONTROL = 1 ! default = 1 ! An integer whose bits encode which restart files are ! written. Add 2 (bit 1) for a time-stamped file, and odd diff --git a/src/MOM6 b/src/MOM6 index a7dc667630..783259bd0c 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit a7dc667630ccb0cced6bf91c34ff84b7bf1ae189 +Subproject commit 783259bd0c7d5544a416c321cbe984c7dd377c26 diff --git a/src/SIS2 b/src/SIS2 index b9a0a8896b..17245e81b2 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit b9a0a8896b5f4e23248cbd7634fb224fe7176be6 +Subproject commit 17245e81b26c95eff4cc4d26ec6347f9cea3e96d