Skip to content

+Updated version of SIS2 and MOM_parameter_doc files #348

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
Dec 29, 2021
Merged

+Updated version of SIS2 and MOM_parameter_doc files #348

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 ice_ocean_SIS2/SIS2/SIS.available_diags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,9 @@
"ice_model", "simass" [Unused]
! long_name: ice mass
! units: kg/m^2
"ice_model", "simass_n" [Unused]
! long_name: ice mass
! units: kg/m^2
"ice_model", "sisnmass" [Unused]
! long_name: snow mass
! units: kg/m^2
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/SIS.available_diags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,9 @@
"ice_model", "simass" [Unused]
! long_name: ice mass
! units: kg/m^2
"ice_model", "simass_n" [Unused]
! long_name: ice mass
! units: kg/m^2
"ice_model", "sisnmass" [Unused]
! long_name: snow mass
! units: kg/m^2
Expand Down
3 changes: 3 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/SIS.available_diags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,9 @@
"ice_model", "simass" [Unused]
! long_name: ice mass
! units: kg/m^2
"ice_model", "simass_n" [Unused]
! long_name: ice mass
! units: kg/m^2
"ice_model", "sisnmass" [Unused]
! long_name: snow mass
! units: kg/m^2
Expand Down
15 changes: 10 additions & 5 deletions ocean_only/ISOMIP/layer/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -840,11 +840,6 @@ ETA_TOLERANCE = 1.0E-12 ! [m] default = 1.25E-14
! total tolerance for SSH is 4 times this value. The default is
! 0.5*NK*ANGSTROM, and this should not be set less than about
! 10^-15*MAXIMUM_DEPTH.
ETA_TOLERANCE_AUX = 1.0E-12 ! [m] default = 1.0E-12
! The tolerance for free-surface height discrepancies between the barotropic
! solution and the sum of the layer thicknesses when calculating the auxiliary
! corrected velocities. By default, this is the same as ETA_TOLERANCE, but can
! be made larger for efficiency.
VELOCITY_TOLERANCE = 3.0E+08 ! [m s-1] default = 3.0E+08
! The tolerance for barotropic velocity discrepancies between the barotropic
! solution and the sum of the layer thicknesses.
Expand Down Expand Up @@ -1527,6 +1522,16 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0
! energies of the run and other globally summed diagnostics. The interval
! increases by a factor of 2. after each call to write_energy.

! === module ocean_stochastics_init ===
DO_SPPT = False ! [Boolean] default = False
! If true, then stochastically perturb the thermodynamic tendemcies of T,S, amd
! h. Amplitude and correlations are controlled by the nam_stoch namelist in the
! UFS model only.
PERT_EPBL = False ! [Boolean] default = False
! If true, then stochastically perturb the kinetic energy production and
! dissipation terms. Amplitude and correlations are controlled by the nam_stoch
! namelist in the UFS model only.

! === module MOM_surface_forcing ===
VARIABLE_WINDS = False ! [Boolean] default = True
! If true, the winds vary in time after the initialization.
Expand Down
2 changes: 2 additions & 0 deletions ocean_only/ISOMIP/layer/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,8 @@ ENERGYSAVEDAYS = 0.125 ! [days] default = 1.0
! The interval in units of TIMEUNIT between saves of the energies of the run and
! other globally summed diagnostics.

! === module ocean_stochastics_init ===

! === module MOM_surface_forcing ===
VARIABLE_WINDS = False ! [Boolean] default = True
! If true, the winds vary in time after the initialization.
Expand Down
15 changes: 10 additions & 5 deletions ocean_only/ISOMIP/rho/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,11 +956,6 @@ ETA_TOLERANCE = 1.0E-12 ! [m] default = 1.25E-14
! total tolerance for SSH is 4 times this value. The default is
! 0.5*NK*ANGSTROM, and this should not be set less than about
! 10^-15*MAXIMUM_DEPTH.
ETA_TOLERANCE_AUX = 1.0E-12 ! [m] default = 1.0E-12
! The tolerance for free-surface height discrepancies between the barotropic
! solution and the sum of the layer thicknesses when calculating the auxiliary
! corrected velocities. By default, this is the same as ETA_TOLERANCE, but can
! be made larger for efficiency.
VELOCITY_TOLERANCE = 3.0E+08 ! [m s-1] default = 3.0E+08
! The tolerance for barotropic velocity discrepancies between the barotropic
! solution and the sum of the layer thicknesses.
Expand Down Expand Up @@ -1787,6 +1782,16 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0
! energies of the run and other globally summed diagnostics. The interval
! increases by a factor of 2. after each call to write_energy.

! === module ocean_stochastics_init ===
DO_SPPT = False ! [Boolean] default = False
! If true, then stochastically perturb the thermodynamic tendemcies of T,S, amd
! h. Amplitude and correlations are controlled by the nam_stoch namelist in the
! UFS model only.
PERT_EPBL = False ! [Boolean] default = False
! If true, then stochastically perturb the kinetic energy production and
! dissipation terms. Amplitude and correlations are controlled by the nam_stoch
! namelist in the UFS model only.

! === module MOM_surface_forcing ===
VARIABLE_WINDS = False ! [Boolean] default = True
! If true, the winds vary in time after the initialization.
Expand Down
2 changes: 2 additions & 0 deletions ocean_only/ISOMIP/rho/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,8 @@ ENERGYSAVEDAYS = 0.125 ! [days] default = 1.0
! The interval in units of TIMEUNIT between saves of the energies of the run and
! other globally summed diagnostics.

! === module ocean_stochastics_init ===

! === module MOM_surface_forcing ===
VARIABLE_WINDS = False ! [Boolean] default = True
! If true, the winds vary in time after the initialization.
Expand Down
18 changes: 10 additions & 8 deletions ocean_only/MESO_025_23L/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -765,11 +765,6 @@ ETA_TOLERANCE = 1.0E-06 ! [m] default = 1.15E-09
! total tolerance for SSH is 4 times this value. The default is
! 0.5*NK*ANGSTROM, and this should not be set less than about
! 10^-15*MAXIMUM_DEPTH.
ETA_TOLERANCE_AUX = 0.001 ! [m] default = 1.0E-06
! The tolerance for free-surface height discrepancies between the barotropic
! solution and the sum of the layer thicknesses when calculating the auxiliary
! corrected velocities. By default, this is the same as ETA_TOLERANCE, but can
! be made larger for efficiency.
VELOCITY_TOLERANCE = 3.0E+08 ! [m s-1] default = 3.0E+08
! The tolerance for barotropic velocity discrepancies between the barotropic
! solution and the sum of the layer thicknesses.
Expand Down Expand Up @@ -1451,9 +1446,6 @@ USE_CALVING_HEAT_CONTENT = False ! [Boolean] default = False
BULKML_CONV_MOMENTUM_BUG = False ! [Boolean] default = False
! If true, use code with a bug that causes a loss of momentum conservation
! during mixedlayer convection.
ALLOW_CLOCKS_IN_OMP_LOOPS = True ! [Boolean] default = True
! If true, clocks can be called from inside loops that can be threaded. To run
! with multiple threads, set to False.

! === module MOM_regularize_layers ===
REGULARIZE_SURFACE_LAYERS = False ! [Boolean] default = False
Expand Down Expand Up @@ -1574,6 +1566,16 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0
! energies of the run and other globally summed diagnostics. The interval
! increases by a factor of 2. after each call to write_energy.

! === module ocean_stochastics_init ===
DO_SPPT = False ! [Boolean] default = False
! If true, then stochastically perturb the thermodynamic tendemcies of T,S, amd
! h. Amplitude and correlations are controlled by the nam_stoch namelist in the
! UFS model only.
PERT_EPBL = False ! [Boolean] default = False
! If true, then stochastically perturb the kinetic energy production and
! dissipation terms. Amplitude and correlations are controlled by the nam_stoch
! namelist in the UFS model only.

! === module MOM_surface_forcing ===
VARIABLE_WINDS = False ! [Boolean] default = True
! If true, the winds vary in time after the initialization.
Expand Down
7 changes: 2 additions & 5 deletions ocean_only/MESO_025_23L/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,6 @@ ETA_TOLERANCE = 1.0E-06 ! [m] default = 1.15E-09
! total tolerance for SSH is 4 times this value. The default is
! 0.5*NK*ANGSTROM, and this should not be set less than about
! 10^-15*MAXIMUM_DEPTH.
ETA_TOLERANCE_AUX = 0.001 ! [m] default = 1.0E-06
! The tolerance for free-surface height discrepancies between the barotropic
! solution and the sum of the layer thicknesses when calculating the auxiliary
! corrected velocities. By default, this is the same as ETA_TOLERANCE, but can
! be made larger for efficiency.

! === module MOM_CoriolisAdv ===
BOUND_CORIOLIS = True ! [Boolean] default = False
Expand Down Expand Up @@ -404,6 +399,8 @@ ENERGYSAVEDAYS = 0.25 ! [days] default = 1.0
! The interval in units of TIMEUNIT between saves of the energies of the run and
! other globally summed diagnostics.

! === module ocean_stochastics_init ===

! === module MOM_surface_forcing ===
VARIABLE_WINDS = False ! [Boolean] default = True
! If true, the winds vary in time after the initialization.
Expand Down
18 changes: 10 additions & 8 deletions ocean_only/MESO_025_63L/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,11 +779,6 @@ ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! total tolerance for SSH is 4 times this value. The default is
! 0.5*NK*ANGSTROM, and this should not be set less than about
! 10^-15*MAXIMUM_DEPTH.
ETA_TOLERANCE_AUX = 0.001 ! [m] default = 1.0E-06
! The tolerance for free-surface height discrepancies between the barotropic
! solution and the sum of the layer thicknesses when calculating the auxiliary
! corrected velocities. By default, this is the same as ETA_TOLERANCE, but can
! be made larger for efficiency.
VELOCITY_TOLERANCE = 3.0E+08 ! [m s-1] default = 3.0E+08
! The tolerance for barotropic velocity discrepancies between the barotropic
! solution and the sum of the layer thicknesses.
Expand Down Expand Up @@ -1481,9 +1476,6 @@ USE_CALVING_HEAT_CONTENT = False ! [Boolean] default = False
BULKML_CONV_MOMENTUM_BUG = False ! [Boolean] default = False
! If true, use code with a bug that causes a loss of momentum conservation
! during mixedlayer convection.
ALLOW_CLOCKS_IN_OMP_LOOPS = True ! [Boolean] default = True
! If true, clocks can be called from inside loops that can be threaded. To run
! with multiple threads, set to False.
LIMIT_BUFFER_DET_DH_SFC = 0.5 ! [nondim] default = 0.5
! The fractional limit in the change between grid points of the surface region
! (mixed & buffer layer) thickness.
Expand Down Expand Up @@ -1610,6 +1602,16 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [hours] default = 0.0
! energies of the run and other globally summed diagnostics. The interval
! increases by a factor of 2. after each call to write_energy.

! === module ocean_stochastics_init ===
DO_SPPT = False ! [Boolean] default = False
! If true, then stochastically perturb the thermodynamic tendemcies of T,S, amd
! h. Amplitude and correlations are controlled by the nam_stoch namelist in the
! UFS model only.
PERT_EPBL = False ! [Boolean] default = False
! If true, then stochastically perturb the kinetic energy production and
! dissipation terms. Amplitude and correlations are controlled by the nam_stoch
! namelist in the UFS model only.

! === module MOM_surface_forcing ===
VARIABLE_WINDS = False ! [Boolean] default = True
! If true, the winds vary in time after the initialization.
Expand Down
7 changes: 2 additions & 5 deletions ocean_only/MESO_025_63L/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,6 @@ ETA_TOLERANCE = 1.0E-06 ! [m] default = 3.15E-09
! total tolerance for SSH is 4 times this value. The default is
! 0.5*NK*ANGSTROM, and this should not be set less than about
! 10^-15*MAXIMUM_DEPTH.
ETA_TOLERANCE_AUX = 0.001 ! [m] default = 1.0E-06
! The tolerance for free-surface height discrepancies between the barotropic
! solution and the sum of the layer thicknesses when calculating the auxiliary
! corrected velocities. By default, this is the same as ETA_TOLERANCE, but can
! be made larger for efficiency.

! === module MOM_CoriolisAdv ===
BOUND_CORIOLIS = True ! [Boolean] default = False
Expand Down Expand Up @@ -433,6 +428,8 @@ ENERGYSAVEDAYS = 1.0 ! [hours] default = 24.0
! The interval in units of TIMEUNIT between saves of the energies of the run and
! other globally summed diagnostics.

! === module ocean_stochastics_init ===

! === module MOM_surface_forcing ===
VARIABLE_WINDS = False ! [Boolean] default = True
! If true, the winds vary in time after the initialization.
Expand Down
15 changes: 10 additions & 5 deletions ocean_only/buoy_forced_basin/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,11 +647,6 @@ ETA_TOLERANCE = 5.0E-10 ! [m] default = 5.0E-10
! total tolerance for SSH is 4 times this value. The default is
! 0.5*NK*ANGSTROM, and this should not be set less than about
! 10^-15*MAXIMUM_DEPTH.
ETA_TOLERANCE_AUX = 5.0E-10 ! [m] default = 5.0E-10
! The tolerance for free-surface height discrepancies between the barotropic
! solution and the sum of the layer thicknesses when calculating the auxiliary
! corrected velocities. By default, this is the same as ETA_TOLERANCE, but can
! be made larger for efficiency.
VELOCITY_TOLERANCE = 3.0E+08 ! [m s-1] default = 3.0E+08
! The tolerance for barotropic velocity discrepancies between the barotropic
! solution and the sum of the layer thicknesses.
Expand Down Expand Up @@ -1272,6 +1267,16 @@ ENERGYSAVEDAYS_GEOMETRIC = 0.0 ! [days] default = 0.0
! energies of the run and other globally summed diagnostics. The interval
! increases by a factor of 2. after each call to write_energy.

! === module ocean_stochastics_init ===
DO_SPPT = False ! [Boolean] default = False
! If true, then stochastically perturb the thermodynamic tendemcies of T,S, amd
! h. Amplitude and correlations are controlled by the nam_stoch namelist in the
! UFS model only.
PERT_EPBL = False ! [Boolean] default = False
! If true, then stochastically perturb the kinetic energy production and
! dissipation terms. Amplitude and correlations are controlled by the nam_stoch
! namelist in the UFS model only.

! === module MOM_surface_forcing ===
VARIABLE_WINDS = False ! [Boolean] default = True
! If true, the winds vary in time after the initialization.
Expand Down
2 changes: 2 additions & 0 deletions ocean_only/buoy_forced_basin/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ MAXTRUNC = 400 ! [truncations save_interval-1] default = 0
! is truncated more than MAXTRUNC times between energy saves. Set MAXTRUNC to 0
! to stop if there is any truncation of velocities.

! === module ocean_stochastics_init ===

! === module MOM_surface_forcing ===
VARIABLE_WINDS = False ! [Boolean] default = True
! If true, the winds vary in time after the initialization.
Expand Down
Loading