Skip to content

Commit

Permalink
*MOM6: Altered initial conditions for circle_obcs
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@36275ae *Altered initial conditions for circle_obcs
- NOAA-GFDL/MOM6@2577c8a +Revamped MOM_diapyc_energy_req.F90
  • Loading branch information
@adcroft
adcroft committed Sep 13, 2016
1 parent 03d877f commit 15d7971
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
10 changes: 5 additions & 5 deletions ocean_only/circle_obcs/ocean.stats.gnu
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Step, Time, Truncs, Energy/Mass, Maximum CFL, Mean sea level, Total Mass, Frac Mass Err
[hours] [m2 s-2] [Nondim] [m] [kg] [Nondim]
0, 0.000, 0, En 4.980199294816E-06, CFL 0.00000, SL -0.0000E+00, Mass 6.18600E+15, Me 0.00E+00
15, 0.500, 0, En 4.977856955357E-06, CFL 0.00006, SL -1.1830E-05, Mass 6.18600E+15, Me -1.97E-08
30, 1.000, 0, En 4.975345882846E-06, CFL 0.00012, SL -1.2143E-05, Mass 6.18600E+15, Me -5.21E-10
45, 1.500, 0, En 4.972445088329E-06, CFL 0.00018, SL -1.2071E-05, Mass 6.18600E+15, Me 1.20E-10
60, 2.000, 0, En 4.968931012673E-06, CFL 0.00023, SL -1.2040E-05, Mass 6.18600E+15, Me 5.08E-11
0, 0.000, 0, En 5.868315862280E-01, CFL 0.00000, SL -2.6909E+00, Mass 6.15826E+15, Me 0.00E+00
15, 0.500, 0, En 7.092949118195E-03, CFL 0.00334, SL -6.9940E-02, Mass 6.18528E+15, Me 4.37E-03
30, 1.000, 0, En 4.416641781179E-03, CFL 0.00683, SL 1.1404E-02, Mass 6.18612E+15, Me 1.36E-04
45, 1.500, 0, En 4.385092886529E-03, CFL 0.00926, SL 3.2173E-03, Mass 6.18603E+15, Me -1.36E-05
60, 2.000, 0, En 4.361270478621E-03, CFL 0.01050, SL 3.2264E-03, Mass 6.18603E+15, Me 1.50E-08
10 changes: 5 additions & 5 deletions ocean_only/circle_obcs/ocean.stats.intel
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Step, Time, Truncs, Energy/Mass, Maximum CFL, Mean sea level, Total Mass, Frac Mass Err
[hours] [m2 s-2] [Nondim] [m] [kg] [Nondim]
0, 0.000, 0, En 4.980199294816E-06, CFL 0.00000, SL 0.0000E+00, Mass 6.18600E+15, Me 0.00E+00
15, 0.500, 0, En 4.977856955357E-06, CFL 0.00006, SL -1.1830E-05, Mass 6.18600E+15, Me -1.97E-08
30, 1.000, 0, En 4.975345882846E-06, CFL 0.00012, SL -1.2143E-05, Mass 6.18600E+15, Me -5.21E-10
45, 1.500, 0, En 4.972445088329E-06, CFL 0.00018, SL -1.2071E-05, Mass 6.18600E+15, Me 1.20E-10
60, 2.000, 0, En 4.968931012673E-06, CFL 0.00023, SL -1.2040E-05, Mass 6.18600E+15, Me 5.08E-11
0, 0.000, 0, En 5.868315862280E-01, CFL 0.00000, SL -2.6909E+00, Mass 6.15826E+15, Me 0.00E+00
15, 0.500, 0, En 7.092949118195E-03, CFL 0.00334, SL -6.9940E-02, Mass 6.18528E+15, Me 4.37E-03
30, 1.000, 0, En 4.416641781179E-03, CFL 0.00683, SL 1.1404E-02, Mass 6.18612E+15, Me 1.36E-04
45, 1.500, 0, En 4.385092886529E-03, CFL 0.00926, SL 3.2173E-03, Mass 6.18603E+15, Me -1.36E-05
60, 2.000, 0, En 4.361270478621E-03, CFL 0.01050, SL 3.2264E-03, Mass 6.18603E+15, Me 1.50E-08
10 changes: 5 additions & 5 deletions ocean_only/circle_obcs/ocean.stats.pgi
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Step, Time, Truncs, Energy/Mass, Maximum CFL, Mean sea level, Total Mass, Frac Mass Err
[hours] [m2 s-2] [Nondim] [m] [kg] [Nondim]
0, 0.000, 0, En 4.980199294816E-06, CFL 0.00000, SL 0.0000E+00, Mass 6.18600E+15, Me 0.00E+00
15, 0.500, 0, En 4.977856955357E-06, CFL 0.00006, SL -1.1830E-05, Mass 6.18600E+15, Me -1.97E-08
30, 1.000, 0, En 4.975345882846E-06, CFL 0.00012, SL -1.2143E-05, Mass 6.18600E+15, Me -5.21E-10
45, 1.500, 0, En 4.972445088329E-06, CFL 0.00018, SL -1.2071E-05, Mass 6.18600E+15, Me 1.20E-10
60, 2.000, 0, En 4.968931012673E-06, CFL 0.00023, SL -1.2040E-05, Mass 6.18600E+15, Me 5.08E-11
0, 0.000, 0, En 5.868315862280E-01, CFL 0.00000, SL -2.6909E+00, Mass 6.15826E+15, Me 0.00E+00
15, 0.500, 0, En 7.092949118195E-03, CFL 0.00334, SL -6.9940E-02, Mass 6.18528E+15, Me 4.37E-03
30, 1.000, 0, En 4.416641781179E-03, CFL 0.00683, SL 1.1404E-02, Mass 6.18612E+15, Me 1.36E-04
45, 1.500, 0, En 4.385092886529E-03, CFL 0.00926, SL 3.2173E-03, Mass 6.18603E+15, Me -1.36E-05
60, 2.000, 0, En 4.361270478621E-03, CFL 0.01050, SL 3.2264E-03, Mass 6.18603E+15, Me 1.50E-08
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 3 files
+16 −1 src/parameterizations/vertical/MOM_diabatic_driver.F90
+788 −120 src/parameterizations/vertical/MOM_diapyc_energy_req.F90
+10 −2 src/user/circle_obcs_initialization.F90

0 comments on commit 15d7971

Please sign in to comment.