Skip to content

Commit

Permalink
MOM6: *Added halo update for T & S with DIABATIC_FIRST
Browse files Browse the repository at this point in the history 
  Added a halo update for temperature and salinity when DIABATIC_FIRST is true.
This corrects the non-reproducing issue #54.  Also,
added debugging chksum calls before set_viscous_BBL.  This changes answers in
the global_ALE test cases, and new reference solutions have been checked in.
MOM6 commit NOAA-GFDL/MOM6@35b8ab6
  • Loading branch information
@Hallberg-NOAA
Hallberg-NOAA committed Oct 22, 2015
1 parent ca9d767 commit 31168bd
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions ocean_only/global_ALE/hycom/timestats.gnu
View file
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 7.139549170881E-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 7.143879153403E-01, CFL 0.06663, SL 6.1765E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 4.00E-13, Se 1.38E-11, Te 1.39E-12
24, 1.000, 0, En 7.141189306834E-01, CFL 0.10736, SL 1.2765E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me 3.53E-19, Se -6.03E-17, Te -1.80E-18
12, 0.500, 0, En 7.143879153262E-01, CFL 0.06663, SL 6.1765E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 4.00E-13, Se 1.38E-11, Te 1.39E-12
24, 1.000, 0, En 7.141189307218E-01, CFL 0.10736, SL 1.2765E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me 2.00E-19, Se -7.24E-17, Te 5.65E-18
4 changes: 2 additions & 2 deletions ocean_only/global_ALE/hycom/timestats.intel
View file
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 7.139549170881E-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 7.143879151212E-01, CFL 0.06663, SL 6.1765E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 4.00E-13, Se 1.38E-11, Te 1.39E-12
24, 1.000, 0, En 7.141189303988E-01, CFL 0.10736, SL 1.2765E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me -3.42E-19, Se -1.42E-16, Te -8.27E-18
12, 0.500, 0, En 7.143879150959E-01, CFL 0.06663, SL 6.1765E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 4.00E-13, Se 1.38E-11, Te 1.39E-12
24, 1.000, 0, En 7.141189306807E-01, CFL 0.10736, SL 1.2765E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me -2.08E-19, Se -6.20E-17, Te 4.45E-18
4 changes: 2 additions & 2 deletions ocean_only/global_ALE/hycom/timestats.pgi
View file
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 7.139549170881E-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 7.143878768824E-01, CFL 0.06663, SL 6.1765E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 4.00E-13, Se 1.38E-11, Te 1.39E-12
24, 1.000, 0, En 7.141192208465E-01, CFL 0.10722, SL 1.2765E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me 1.31E-19, Se -3.71E-17, Te -3.56E-18
12, 0.500, 0, En 7.143878768487E-01, CFL 0.06663, SL 6.1765E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 4.00E-13, Se 1.38E-11, Te 1.39E-12
24, 1.000, 0, En 7.141192187689E-01, CFL 0.10722, SL 1.2765E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me -4.47E-20, Se -1.18E-16, Te 5.93E-19
4 changes: 2 additions & 2 deletions ocean_only/global_ALE/layer/timestats.gnu
View file
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.941873233115E-01, CFL 0.00000, SL 5.9606E-11, M 1.37953E+21, S 34.7196, T 3.6150, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
12, 0.500, 0, En 6.908717009319E-01, CFL 0.08107, SL -1.0255E-02, M 1.37953E+21, S 34.7197, T 3.6148, Me 2.25E-15, Se 7.32E-14, Te 2.91E-14
24, 1.000, 0, En 6.906183321678E-01, CFL 0.10630, SL -1.2054E-02, M 1.37952E+21, S 34.7197, T 3.6147, Me 2.26E-15, Se 7.30E-14, Te 3.20E-14
12, 0.500, 0, En 6.908719176281E-01, CFL 0.08117, SL -1.0255E-02, M 1.37953E+21, S 34.7197, T 3.6148, Me 2.25E-15, Se 7.32E-14, Te 2.91E-14
24, 1.000, 0, En 6.906187183285E-01, CFL 0.10630, SL -1.2054E-02, M 1.37952E+21, S 34.7197, T 3.6147, Me 2.26E-15, Se 7.30E-14, Te 3.20E-14
4 changes: 2 additions & 2 deletions ocean_only/global_ALE/layer/timestats.intel
View file
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.941873233115E-01, CFL 0.00000, SL 5.9606E-11, M 1.37953E+21, S 34.7196, T 3.6150, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
12, 0.500, 0, En 6.908718946848E-01, CFL 0.08107, SL -1.0255E-02, M 1.37953E+21, S 34.7197, T 3.6148, Me 2.25E-15, Se 7.32E-14, Te 2.91E-14
24, 1.000, 0, En 6.906194750174E-01, CFL 0.10630, SL -1.2054E-02, M 1.37952E+21, S 34.7197, T 3.6147, Me 2.27E-15, Se 7.31E-14, Te 3.20E-14
12, 0.500, 0, En 6.908718530701E-01, CFL 0.08117, SL -1.0255E-02, M 1.37953E+21, S 34.7197, T 3.6148, Me 2.25E-15, Se 7.32E-14, Te 2.91E-14
24, 1.000, 0, En 6.906197834338E-01, CFL 0.10630, SL -1.2054E-02, M 1.37952E+21, S 34.7197, T 3.6147, Me 2.26E-15, Se 7.30E-14, Te 3.20E-14
4 changes: 2 additions & 2 deletions ocean_only/global_ALE/layer/timestats.pgi
View file
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.941873233115E-01, CFL 0.00000, SL 5.8898E-11, M 1.37953E+21, S 34.7196, T 3.6150, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
12, 0.500, 0, En 6.908714482280E-01, CFL 0.08107, SL -1.0255E-02, M 1.37953E+21, S 34.7197, T 3.6148, Me 2.25E-15, Se 7.32E-14, Te 2.91E-14
24, 1.000, 0, En 6.906205440346E-01, CFL 0.10630, SL -1.2054E-02, M 1.37952E+21, S 34.7197, T 3.6147, Me 2.27E-15, Se 7.31E-14, Te 3.20E-14
12, 0.500, 0, En 6.908714693890E-01, CFL 0.08107, SL -1.0255E-02, M 1.37953E+21, S 34.7197, T 3.6148, Me 2.25E-15, Se 7.32E-14, Te 2.91E-14
24, 1.000, 0, En 6.906210268351E-01, CFL 0.10630, SL -1.2054E-02, M 1.37952E+21, S 34.7197, T 3.6147, Me 2.26E-15, Se 7.31E-14, Te 3.20E-14
4 changes: 2 additions & 2 deletions ocean_only/global_ALE/z/timestats.gnu
View file
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 1.345952724988E-05, 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 8.213014056475E-04, CFL 0.06130, SL 7.8059E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 2.85E-19, Se 6.01E-17, Te 3.89E-18
24, 1.000, 0, En 1.038491206399E-03, CFL 0.10198, SL 1.5776E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me 1.04E-22, Se 1.09E-16, Te 1.39E-17
12, 0.500, 0, En 8.213014056511E-04, CFL 0.06130, SL 7.8059E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 1.49E-19, Se 4.20E-17, Te -2.62E-18
24, 1.000, 0, En 1.038491205569E-03, CFL 0.10198, SL 1.5776E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me -3.31E-19, Se 9.59E-17, Te 1.33E-17
4 changes: 2 additions & 2 deletions ocean_only/global_ALE/z/timestats.intel
View file
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 1.345952724988E-05, 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 8.213014056645E-04, CFL 0.06130, SL 7.8059E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me -1.32E-19, Se 3.48E-17, Te 7.38E-18
24, 1.000, 0, En 1.038491206394E-03, CFL 0.10198, SL 1.5776E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me 2.98E-19, Se 6.31E-17, Te 1.20E-18
12, 0.500, 0, En 8.213014056627E-04, CFL 0.06130, SL 7.8059E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 9.89E-21, Se 1.32E-16, Te 1.60E-17
24, 1.000, 0, En 1.038491205558E-03, CFL 0.10198, SL 1.5776E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me 4.43E-19, Se -1.77E-17, Te -6.54E-18
4 changes: 2 additions & 2 deletions ocean_only/global_ALE/z/timestats.pgi
View file
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 1.345952724988E-05, 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 8.213013998043E-04, CFL 0.06130, SL 7.8059E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me -3.20E-20, Se 1.07E-16, Te 4.47E-18
24, 1.000, 0, En 1.038491192905E-03, CFL 0.10198, SL 1.5776E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me 4.71E-19, Se 2.14E-17, Te 3.06E-18
12, 0.500, 0, En 8.213013998038E-04, CFL 0.06130, SL 7.8059E-04, M 1.37953E+21, S 34.7202, T 3.6185, Me 2.78E-20, Se 1.16E-16, Te 6.49E-18
24, 1.000, 0, En 1.038491193507E-03, CFL 0.10198, SL 1.5776E-03, M 1.37953E+21, S 34.7202, T 3.6185, Me 1.57E-19, Se -2.57E-17, Te 2.47E-18
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 1 files
+17 −2 src/core/MOM.F90

0 comments on commit 31168bd

Please sign in to comment.