diff --git a/ice_ocean_SIS2/SIS2/SIS.available_diags b/ice_ocean_SIS2/SIS2/SIS.available_diags index 43a860fb10..4b36051aa5 100644 --- a/ice_ocean_SIS2/SIS2/SIS.available_diags +++ b/ice_ocean_SIS2/SIS2/SIS.available_diags @@ -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 diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS.available_diags b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS.available_diags index 47428ba78e..bcb308639a 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS.available_diags +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/SIS.available_diags @@ -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 diff --git a/ice_ocean_SIS2/SIS2_cgrid/SIS.available_diags b/ice_ocean_SIS2/SIS2_cgrid/SIS.available_diags index 7511145f4d..78d84edafc 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/SIS.available_diags +++ b/ice_ocean_SIS2/SIS2_cgrid/SIS.available_diags @@ -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 diff --git a/ocean_only/ISOMIP/layer/MOM_parameter_doc.all b/ocean_only/ISOMIP/layer/MOM_parameter_doc.all index 977bd27629..64a43f3e0b 100644 --- a/ocean_only/ISOMIP/layer/MOM_parameter_doc.all +++ b/ocean_only/ISOMIP/layer/MOM_parameter_doc.all @@ -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. @@ -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. diff --git a/ocean_only/ISOMIP/layer/MOM_parameter_doc.short b/ocean_only/ISOMIP/layer/MOM_parameter_doc.short index 3287bee72b..1f9e7cb243 100644 --- a/ocean_only/ISOMIP/layer/MOM_parameter_doc.short +++ b/ocean_only/ISOMIP/layer/MOM_parameter_doc.short @@ -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. diff --git a/ocean_only/ISOMIP/rho/MOM_parameter_doc.all b/ocean_only/ISOMIP/rho/MOM_parameter_doc.all index 12a862ee61..ff7d4ba57a 100644 --- a/ocean_only/ISOMIP/rho/MOM_parameter_doc.all +++ b/ocean_only/ISOMIP/rho/MOM_parameter_doc.all @@ -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. @@ -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. diff --git a/ocean_only/ISOMIP/rho/MOM_parameter_doc.short b/ocean_only/ISOMIP/rho/MOM_parameter_doc.short index a8ed6aeac0..7358729b22 100644 --- a/ocean_only/ISOMIP/rho/MOM_parameter_doc.short +++ b/ocean_only/ISOMIP/rho/MOM_parameter_doc.short @@ -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. diff --git a/ocean_only/MESO_025_23L/MOM_parameter_doc.all b/ocean_only/MESO_025_23L/MOM_parameter_doc.all index 00e001c5c5..97ebf99e3d 100644 --- a/ocean_only/MESO_025_23L/MOM_parameter_doc.all +++ b/ocean_only/MESO_025_23L/MOM_parameter_doc.all @@ -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. @@ -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 @@ -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. diff --git a/ocean_only/MESO_025_23L/MOM_parameter_doc.short b/ocean_only/MESO_025_23L/MOM_parameter_doc.short index 5ba8480923..e0aba1f878 100644 --- a/ocean_only/MESO_025_23L/MOM_parameter_doc.short +++ b/ocean_only/MESO_025_23L/MOM_parameter_doc.short @@ -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 @@ -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. diff --git a/ocean_only/MESO_025_63L/MOM_parameter_doc.all b/ocean_only/MESO_025_63L/MOM_parameter_doc.all index a3f95d3be1..a38922e3e5 100644 --- a/ocean_only/MESO_025_63L/MOM_parameter_doc.all +++ b/ocean_only/MESO_025_63L/MOM_parameter_doc.all @@ -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. @@ -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. @@ -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. diff --git a/ocean_only/MESO_025_63L/MOM_parameter_doc.short b/ocean_only/MESO_025_63L/MOM_parameter_doc.short index 0917ef98df..f4df00627d 100644 --- a/ocean_only/MESO_025_63L/MOM_parameter_doc.short +++ b/ocean_only/MESO_025_63L/MOM_parameter_doc.short @@ -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 @@ -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. diff --git a/ocean_only/buoy_forced_basin/MOM_parameter_doc.all b/ocean_only/buoy_forced_basin/MOM_parameter_doc.all index b93ce8082e..e3ad17e6dc 100644 --- a/ocean_only/buoy_forced_basin/MOM_parameter_doc.all +++ b/ocean_only/buoy_forced_basin/MOM_parameter_doc.all @@ -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. @@ -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. diff --git a/ocean_only/buoy_forced_basin/MOM_parameter_doc.short b/ocean_only/buoy_forced_basin/MOM_parameter_doc.short index df963e5d1c..b66c207906 100644 --- a/ocean_only/buoy_forced_basin/MOM_parameter_doc.short +++ b/ocean_only/buoy_forced_basin/MOM_parameter_doc.short @@ -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. diff --git a/ocean_only/global/MOM_parameter_doc.all b/ocean_only/global/MOM_parameter_doc.all index 14fc745523..be7be98df9 100644 --- a/ocean_only/global/MOM_parameter_doc.all +++ b/ocean_only/global/MOM_parameter_doc.all @@ -912,11 +912,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 = 1.0E-06 ! [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 = 1.0E-04 ! [m s-1] default = 3.0E+08 ! The tolerance for barotropic velocity discrepancies between the barotropic ! solution and the sum of the layer thicknesses. @@ -1783,9 +1778,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. @@ -1912,6 +1904,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 = True ! [Boolean] default = True ! If true, the winds vary in time after the initialization. diff --git a/ocean_only/global/MOM_parameter_doc.short b/ocean_only/global/MOM_parameter_doc.short index 4fc8f9251e..cb51edfe4b 100644 --- a/ocean_only/global/MOM_parameter_doc.short +++ b/ocean_only/global/MOM_parameter_doc.short @@ -526,6 +526,8 @@ ENERGYSAVEDAYS = 0.5 ! [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 === BUOY_CONFIG = "file" ! default = "zero" ! The character string that indicates how buoyancy forcing is specified. Valid diff --git a/ocean_only/idealized_hurricane/MOM_parameter_doc.all b/ocean_only/idealized_hurricane/MOM_parameter_doc.all index 910b46efb6..ea85108846 100644 --- a/ocean_only/idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/idealized_hurricane/MOM_parameter_doc.all @@ -810,11 +810,6 @@ ETA_TOLERANCE = 4.0E-09 ! [m] default = 4.0E-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 = 4.0E-09 ! [m] default = 4.0E-09 - ! 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. @@ -1640,6 +1635,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 = True ! [Boolean] default = True ! If true, the winds vary in time after the initialization. diff --git a/ocean_only/idealized_hurricane/MOM_parameter_doc.short b/ocean_only/idealized_hurricane/MOM_parameter_doc.short index 28634e6e7c..4823d5ffc5 100644 --- a/ocean_only/idealized_hurricane/MOM_parameter_doc.short +++ b/ocean_only/idealized_hurricane/MOM_parameter_doc.short @@ -285,6 +285,8 @@ ENERGYSAVEDAYS = 0.05 ! [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 === BUOY_CONFIG = "const" ! default = "zero" ! The character string that indicates how buoyancy forcing is specified. Valid diff --git a/ocean_only/tides_025/MOM_parameter_doc.all b/ocean_only/tides_025/MOM_parameter_doc.all index 88d0d45757..33cb00c28e 100644 --- a/ocean_only/tides_025/MOM_parameter_doc.all +++ b/ocean_only/tides_025/MOM_parameter_doc.all @@ -702,11 +702,6 @@ ETA_TOLERANCE = 1.0E-12 ! [m] default = 1.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 = 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. @@ -1201,6 +1196,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. diff --git a/ocean_only/tides_025/MOM_parameter_doc.short b/ocean_only/tides_025/MOM_parameter_doc.short index 43ca729252..10a90c19f8 100644 --- a/ocean_only/tides_025/MOM_parameter_doc.short +++ b/ocean_only/tides_025/MOM_parameter_doc.short @@ -324,6 +324,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. diff --git a/src/SIS2 b/src/SIS2 index 04ab05d5df..4e2454bd6a 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit 04ab05d5df16131019ff5f96b623e1b948b81b1e +Subproject commit 4e2454bd6a0793624c60dbb26e71fa79041350b7