-
Notifications
You must be signed in to change notification settings - Fork 148
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
*Reverted "low mixing" changes in OM4
- 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
Showing
9 changed files
with
16 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |