Skip to content

Commit

Permalink
*Reverted "low mixing" changes in OM4
Browse files Browse the repository at this point in the history 
- I previously committed the low-mixing parameters we were testing
  on dev/master (I'd meant to put them on a branch).
  This commit reverts e2d52e2 and e2d52e2.
- Changes answers for OM4 only.
  • Loading branch information
@adcroft
adcroft committed Sep 22, 2015
1 parent 3e870ad commit 606f31e
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 22 deletions.
5 changes: 1 addition & 4 deletions ice_ocean_SIS2/OM4_025/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ N2_FLOOR_IOMEGA2 = 0.0 ! [nondim] default = 1.0
! The floor applied to N2(k) scaled by Omega^2:
! If =0., N2(k) is simply positive definite.
! If =1., N2(k) > Omega^2 everywhere.
KD = 2.0E-06 ! [m2 s-1]
KD = 2.0E-05 ! [m2 s-1]
! The background diapycnal diffusivity of density in the
! interior. Zero or the molecular value, ~1e-7 m2 s-1,
! may be used.
Expand Down Expand Up @@ -524,9 +524,6 @@ CONVECTION%
! === module MOM_entrain_diffusive ===

! === module MOM_energetic_PBL ===
MSTAR = 0.3 ! [units=nondim] default = 1.2
! The ratio of the friction velocity cubed to the TKE
! input to the mixed layer.

! === module MOM_regularize_layers ===

Expand Down
14 changes: 7 additions & 7 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,7 @@ MIX_BOUNDARY_TRACERS = True ! [Boolean] default = True
! If true, mix the passive tracers in massless layers at
! the bottom into the interior as though a diffusivity of
! KD_MIN_TR were operating.
KD_MIN_TR = 2.0E-07 ! [m2 s-1] default = 2.0E-07
KD_MIN_TR = 2.0E-06 ! [m2 s-1] default = 2.0E-06
! A minimal diffusivity that should always be applied to
! tracers, especially in massless layers near the bottom.
! The default is 0.1*KD.
Expand Down Expand Up @@ -1225,11 +1225,11 @@ KD_TANH_LAT_FN = False ! [Boolean] default = False
! like CM2.1/CM2M. There is no physical justification
! for this form, and it can not be used with
! HENYEY_IGW_BACKGROUND.
KD = 2.0E-06 ! [m2 s-1]
KD = 2.0E-05 ! [m2 s-1]
! The background diapycnal diffusivity of density in the
! interior. Zero or the molecular value, ~1e-7 m2 s-1,
! may be used.
KD_MIN = 2.0E-06 ! [m2 s-1] default = 2.0E-08
KD_MIN = 2.0E-06 ! [m2 s-1] default = 2.0E-07
! The minimum diapycnal diffusivity.
KD_MAX = 0.1 ! [m2 s-1] default = -1.0
! The maximum permitted increment for the diapycnal
Expand All @@ -1238,7 +1238,7 @@ KD_MAX = 0.1 ! [m2 s-1] default = -1.0
KD_ADD = 0.0 ! [m2 s-1] default = 0.0
! A uniform diapycnal diffusivity that is added
! everywhere without any filtering or scaling.
KDML = 2.0E-06 ! [m2 s-1] default = 2.0E-06
KDML = 2.0E-05 ! [m2 s-1] default = 2.0E-05
! If BULKMIXEDLAYER is false, KDML is the elevated
! diapycnal diffusivity in the topmost HMIX of fluid.
! KDML is only used if BULKMIXEDLAYER is false.
Expand Down Expand Up @@ -1319,7 +1319,7 @@ SHEARMIX_RATE = 0.089 ! [nondim] default = 0.089
MAX_RINO_IT = 25 ! [nondim] default = 50
! The maximum number of iterations that may be used to
! estimate the Richardson number driven mixing.
KD_KAPPA_SHEAR_0 = 2.0E-06 ! [m2 s-1] default = 2.0E-06
KD_KAPPA_SHEAR_0 = 2.0E-05 ! [m2 s-1] default = 2.0E-05
! The background diffusivity that is used to smooth the
! density and shear profiles before solving for the
! diffusivities. Defaults to value of KD.
Expand Down Expand Up @@ -1399,7 +1399,7 @@ CORRECT_DENSITY = True ! [Boolean] default = True
MAX_ENT_IT = 5 ! default = 5
! The maximum number of iterations that may be used to
! calculate the interior diapycnal entrainment.
TOLERANCE_ENT = 4.898979485566356E-06 ! [m] default = 4.898979485566356E-06
TOLERANCE_ENT = 1.549193338482967E-05 ! [m] default = 1.549193338482967E-05
! The tolerance with which to solve for entrainment values.

! === module MOM_diabatic_aux ===
Expand All @@ -1419,7 +1419,7 @@ DO_RIVERMIX = False ! [Boolean] default = False
! if the ocean is that deep.

! === module MOM_energetic_PBL ===
MSTAR = 0.3 ! [units=nondim] default = 1.2
MSTAR = 1.2 ! [units=nondim] default = 1.2
! The ratio of the friction velocity cubed to the TKE
! input to the mixed layer.
NSTAR = 0.2 ! [nondim] default = 0.2
Expand Down
7 changes: 2 additions & 5 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,11 +447,11 @@ N2_FLOOR_IOMEGA2 = 0.0 ! [nondim] default = 1.0
! The floor applied to N2(k) scaled by Omega^2:
! If =0., N2(k) is simply positive definite.
! If =1., N2(k) > Omega^2 everywhere.
KD = 2.0E-06 ! [m2 s-1]
KD = 2.0E-05 ! [m2 s-1]
! The background diapycnal diffusivity of density in the
! interior. Zero or the molecular value, ~1e-7 m2 s-1,
! may be used.
KD_MIN = 2.0E-06 ! [m2 s-1] default = 2.0E-08
KD_MIN = 2.0E-06 ! [m2 s-1] default = 2.0E-07
! The minimum diapycnal diffusivity.
KD_MAX = 0.1 ! [m2 s-1] default = -1.0
! The maximum permitted increment for the diapycnal
Expand Down Expand Up @@ -511,9 +511,6 @@ PRESSURE_DEPENDENT_FRAZIL = True ! [Boolean] default = False
! faster but is inappropriate with ice-shelf cavities.

! === module MOM_energetic_PBL ===
MSTAR = 0.3 ! [units=nondim] default = 1.2
! The ratio of the friction velocity cubed to the TKE
! input to the mixed layer.

! === module MOM_regularize_layers ===

Expand Down
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM4_025/seaice.stats.gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Step, Day, Area(N/S), Extent(N/S), Mass(N/S), Heat(N/S), Salinty(N/S), Frac Mass Err, Temp Err, Salin Err
[days] [m2] [m2] [kg] [J] [g/kg] [Nondim] [Nondim] [Nondim]
0, 693135.000, 0, Area 0.000000000000E+00 0.000000000000E+00, Ext 0.0000E+00 0.0000E+00, CFL 0.000, M 0.00000E+00 0.00000E+00, Enth 0.00000E+00 0.00000E+00, S 0.0000 0.0000, Me 0.00E+00, Te 0.00E+00, Se 0.00E+00
6, 693135.250, 0, Area 9.172116220113E+12 9.522162314814E+10, Ext 9.3138E+12 1.0542E+11, CFL 0.082, M 6.86892E+14 6.19651E+12, Enth -2.24240E+20 -1.92506E+18, S 3.0676 3.3756, Me 1.84E-17, Te -1.21E-17, Se 1.07E-16
6, 693135.250, 0, Area 8.986715227495E+12 9.334273309740E+10, Ext 9.1215E+12 1.0291E+11, CFL 0.074, M 6.81870E+14 6.18693E+12, Enth -2.22607E+20 -1.92201E+18, S 3.0706 3.3759, Me 1.60E-17, Te 7.14E-19, Se 1.03E-16
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM4_025/seaice.stats.intel
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Step, Day, Area(N/S), Extent(N/S), Mass(N/S), Heat(N/S), Salinty(N/S), Frac Mass Err, Temp Err, Salin Err
[days] [m2] [m2] [kg] [J] [g/kg] [Nondim] [Nondim] [Nondim]
0, 693135.000, 0, Area 0.000000000000E+00 0.000000000000E+00, Ext 0.0000E+00 0.0000E+00, CFL 0.000, M 0.00000E+00 0.00000E+00, Enth 0.00000E+00 0.00000E+00, S 0.0000 0.0000, Me 0.00E+00, Te 0.00E+00, Se 0.00E+00
6, 693135.250, 0, Area 9.172116220112E+12 9.522162314815E+10, Ext 9.3138E+12 1.0542E+11, CFL 0.082, M 6.86892E+14 6.19651E+12, Enth -2.24240E+20 -1.92506E+18, S 3.0676 3.3756, Me 1.86E-17, Te -2.49E-18, Se 1.06E-16
6, 693135.250, 0, Area 8.986715227495E+12 9.334273309740E+10, Ext 9.1215E+12 1.0291E+11, CFL 0.074, M 6.81870E+14 6.18693E+12, Enth -2.22607E+20 -1.92201E+18, S 3.0706 3.3759, Me 1.70E-17, Te -1.02E-17, Se 1.05E-16
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM4_025/seaice.stats.pgi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Step, Day, Area(N/S), Extent(N/S), Mass(N/S), Heat(N/S), Salinty(N/S), Frac Mass Err, Temp Err, Salin Err
[days] [m2] [m2] [kg] [J] [g/kg] [Nondim] [Nondim] [Nondim]
0, 693135.000, 0, Area 0.000000000000E+00 0.000000000000E+00, Ext 0.0000E+00 0.0000E+00, CFL 0.000, M 0.00000E+00 0.00000E+00, Enth 0.00000E+00 0.00000E+00, S 0.0000 0.0000, Me 0.00E+00, Te 0.00E+00, Se 0.00E+00
6, 693135.250, 0, Area 9.172117006755E+12 9.522162313318E+10, Ext 9.3138E+12 1.0542E+11, CFL 0.082, M 6.86892E+14 6.19651E+12, Enth -2.24240E+20 -1.92506E+18, S 3.0676 3.3756, Me 1.51E-17, Te -3.84E-18, Se 1.04E-16
6, 693135.250, 0, Area 8.986715222278E+12 9.334273309573E+10, Ext 9.1215E+12 1.0291E+11, CFL 0.074, M 6.81870E+14 6.18693E+12, Enth -2.22607E+20 -1.92201E+18, S 3.0706 3.3759, Me 1.67E-17, Te -3.46E-18, Se 1.07E-16
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM4_025/timestats.gnu
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Step, Day, Truncs, Energy/Mass, Maximum CFL, Mean Sea Level, Total Mass, Mean Salin, Mean Temp, Frac Mass Err, Salin Err, Temp Err
[days] [m2 s-2] [Nondim] [m] [kg] [PSU] [degC] [Nondim] [PSU] [degC]
0, 693135.000, 0, En 7.618563369331E-06, CFL 0.00000, SL -2.2712E-09, M 1.38184E+21, S 34.7202, T 3.6042, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
6, 693135.250, 0, En 7.308514509226E-04, CFL 0.15058, SL 1.1383E-03, M 1.38184E+21, S 34.7202, T 3.6044, Me -1.76E-19, Se 1.33E-16, Te 3.03E-18
6, 693135.250, 0, En 7.250249963634E-04, CFL 0.14984, SL 1.1311E-03, M 1.38184E+21, S 34.7202, T 3.6044, Me -5.18E-20, Se 1.34E-16, Te 4.60E-18
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM4_025/timestats.intel
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Step, Day, Truncs, Energy/Mass, Maximum CFL, Mean Sea Level, Total Mass, Mean Salin, Mean Temp, Frac Mass Err, Salin Err, Temp Err
[days] [m2 s-2] [Nondim] [m] [kg] [PSU] [degC] [Nondim] [PSU] [degC]
0, 693135.000, 0, En 7.618563369331E-06, CFL 0.00000, SL -2.2712E-09, M 1.38184E+21, S 34.7202, T 3.6042, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
6, 693135.250, 0, En 7.308514509162E-04, CFL 0.15058, SL 1.1383E-03, M 1.38184E+21, S 34.7202, T 3.6044, Me -1.55E-19, Se 1.34E-16, Te 2.98E-18
6, 693135.250, 0, En 7.250249962491E-04, CFL 0.14984, SL 1.1311E-03, M 1.38184E+21, S 34.7202, T 3.6044, Me -7.86E-20, Se 1.42E-16, Te 3.48E-18
2 changes: 1 addition & 1 deletion ice_ocean_SIS2/OM4_025/timestats.pgi
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Step, Day, Truncs, Energy/Mass, Maximum CFL, Mean Sea Level, Total Mass, Mean Salin, Mean Temp, Frac Mass Err, Salin Err, Temp Err
[days] [m2 s-2] [Nondim] [m] [kg] [PSU] [degC] [Nondim] [PSU] [degC]
0, 693135.000, 0, En 7.618563369331E-06, CFL 0.00000, SL -2.2712E-09, M 1.38184E+21, S 34.7202, T 3.6042, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
6, 693135.250, 0, En 7.308514392747E-04, CFL 0.15058, SL 1.1383E-03, M 1.38184E+21, S 34.7202, T 3.6044, Me 4.30E-20, Se 1.41E-16, Te 5.38E-18
6, 693135.250, 0, En 7.250250069062E-04, CFL 0.14984, SL 1.1311E-03, M 1.38184E+21, S 34.7202, T 3.6044, Me -5.59E-20, Se 1.45E-16, Te 4.40E-18

0 comments on commit 606f31e

Please sign in to comment.