Skip to content

MOM6: +Restructured step_MOM(2) #213

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
adcroft merged 1 commit into from
Feb 27, 2018
Merged

MOM6: +Restructured step_MOM(2) #213

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
4 changes: 4 additions & 0 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 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 @@ -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
Expand Down
4 changes: 4 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 @@ -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
Expand Down
4 changes: 4 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 @@ -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
Expand Down
4 changes: 4 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 @@ -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
Expand Down
4 changes: 4 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 @@ -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
Expand Down
4 changes: 4 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 @@ -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
Expand Down
4 changes: 4 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 @@ -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
Expand Down
4 changes: 4 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 @@ -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
Expand Down
4 changes: 4 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 @@ -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
Expand Down
4 changes: 4 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 @@ -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
Expand Down
4 changes: 4 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 @@ -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
Expand Down
4 changes: 4 additions & 0 deletions land_ice_ocean_LM3_SIS2/OM_360x320_C180/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Open in desktop
Submodule MOM6 updated 8 files
+140 −35 config_src/coupled_driver/ocean_model_MOM.F90
+10 −11 config_src/mct_driver/ocn_comp_mct.F90
+40 −41 config_src/solo_driver/MOM_driver.F90
+351 −353 src/core/MOM.F90
+35 −2 src/core/MOM_checksum_packages.F90
+8 −6 src/parameterizations/lateral/MOM_hor_visc.F90
+7 −2 src/parameterizations/vertical/MOM_sponge.F90
+1 −0 src/user/seamount_initialization.F90
2 changes: 1 addition & 1 deletion src/SIS2
Open in desktop
Submodule SIS2 updated 1 files
+1 −1 src/ice_type.F90