Skip to content

Commit

Permalink
*MOM6: Merge pull request #2 from adcroft/new_remapping_algorithm
Browse files Browse the repository at this point in the history
- Answers for global_ALE/hycom changed by commit NOAA-GFDL/MOM6@4ab620f

- NOAA-GFDL/MOM6@7ccae06 Merge pull request #2 from adcroft/new_remapping_algorithm
- NOAA-GFDL/MOM6@6008aa5 Fixed an uninitialized diagnostic id
- NOAA-GFDL/MOM6@a567dbf Bugfix for uninitialized variable in remap_via_sub_cells()
- NOAA-GFDL/MOM6@4ab620f *Switched remap_via_sub_cells() to use "new" algorithm
  • Loading branch information
adcroft committed Apr 21, 2017
1 parent 961143b commit fd91c16
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions ocean_only/global_ALE/hycom/ocean.stats.gnu
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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, 0.000, 0, En 6.702072720487E-01, CFL 0.00000, SL 6.1731E-11, M 1.37953E+21, S 34.7202, T 3.6208, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
12, 0.500, 0, En 6.704885171950E-01, CFL 0.05994, SL 6.1880E-04, M 1.37953E+21, S 34.7202, T 3.6208, Me 3.99E-13, Se 1.37E-11, Te 1.42E-12
24, 1.000, 0, En 6.705770507040E-01, CFL 0.10056, SL 1.2858E-03, M 1.37953E+21, S 34.7202, T 3.6208, Me 9.26E-19, Se 2.09E-16, Te 6.30E-18
0, 0.000, 0, En 6.702072720487E-01, CFL 0.00000, SL 6.1731E-11, M 1.37953E+21, S 34.7202, T 3.6184, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
12, 0.500, 0, En 6.702623123727E-01, CFL 0.05980, SL 6.1892E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 3.99E-13, Se 1.37E-11, Te 1.39E-12
24, 1.000, 0, En 6.700987804669E-01, CFL 0.10072, SL 1.2862E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me 7.39E-19, Se 1.30E-16, Te 5.40E-19
6 changes: 3 additions & 3 deletions ocean_only/global_ALE/hycom/ocean.stats.intel
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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, 0.000, 0, En 6.702072720487E-01, CFL 0.00000, SL 6.1731E-11, M 1.37953E+21, S 34.7202, T 3.6208, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
12, 0.500, 0, En 6.704885171950E-01, CFL 0.05994, SL 6.1880E-04, M 1.37953E+21, S 34.7202, T 3.6208, Me 3.99E-13, Se 1.37E-11, Te 1.42E-12
24, 1.000, 0, En 6.705770507040E-01, CFL 0.10056, SL 1.2858E-03, M 1.37953E+21, S 34.7202, T 3.6208, Me 1.45E-18, Se 1.81E-16, Te -2.49E-18
0, 0.000, 0, En 6.702072720487E-01, CFL 0.00000, SL 6.1731E-11, M 1.37953E+21, S 34.7202, T 3.6184, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
12, 0.500, 0, En 6.702623123727E-01, CFL 0.05980, SL 6.1892E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 3.99E-13, Se 1.37E-11, Te 1.39E-12
24, 1.000, 0, En 6.700987804669E-01, CFL 0.10072, SL 1.2862E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me 1.12E-18, Se 1.75E-16, Te 1.49E-17
6 changes: 3 additions & 3 deletions ocean_only/global_ALE/hycom/ocean.stats.pgi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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, 0.000, 0, En 6.702072720487E-01, CFL 0.00000, SL 6.2440E-11, M 1.37953E+21, S 34.7202, T 3.6208, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
12, 0.500, 0, En 6.704885198876E-01, CFL 0.05994, SL 6.1880E-04, M 1.37953E+21, S 34.7202, T 3.6208, Me 3.99E-13, Se 1.37E-11, Te 1.42E-12
24, 1.000, 0, En 6.705770552890E-01, CFL 0.10056, SL 1.2858E-03, M 1.37953E+21, S 34.7202, T 3.6208, Me 7.32E-19, Se 7.48E-17, Te -2.62E-19
0, 0.000, 0, En 6.702072720487E-01, CFL 0.00000, SL 6.2440E-11, M 1.37953E+21, S 34.7202, T 3.6184, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
12, 0.500, 0, En 6.702623169559E-01, CFL 0.05980, SL 6.1892E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 3.99E-13, Se 1.37E-11, Te 1.39E-12
24, 1.000, 0, En 6.700987894178E-01, CFL 0.10072, SL 1.2862E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me 6.83E-19, Se 9.33E-17, Te 5.39E-18
2 changes: 1 addition & 1 deletion src/MOM6

0 comments on commit fd91c16

Please sign in to comment.