Skip to content

Commit

Permalink
*Corrected a bug for C-grid stresses on SIS2 icebergs
Browse files Browse the repository at this point in the history 
  There had been a bug in the interpolation of the C-grid stresses onto the
icebergs' grid that had the potential to cause segmentation faults and was
causing the SIS2_bergs_cgrid test case to fail to reproduce across PE count.
This has now been corrected, and the SIS2_bergs_cgrid test case now reproduces
across PE count.  New reference solutions have been checked in for the
SIS2_bergs_cgrid test case.
  • Loading branch information
@Hallberg-NOAA
Hallberg-NOAA committed Sep 4, 2014
1 parent 0e2fb48 commit cc6be35
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 24 deletions.
8 changes: 4 additions & 4 deletions examples/ocean_SIS2/SIS2_bergs_cgrid/seaice.stats.gnu
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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, 0.000, Area 0.000000000000E+00 0.000000000000E+00, Ext 0.0000E+00 0.0000E+00, 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
3, 0.250, Area 7.831554654570E+12 1.001499946156E+11, Ext 8.0121E+12 1.0197E+11, M 7.15264E+14 7.53642E+12, Enth -2.26214E+20 -2.34651E+18, S 4.9997 4.9951, Me 4.17E-18, Te 9.22E-18, Se 9.36E-17
6, 0.500, Area 9.561571407855E+12 8.301303087919E+10, Ext 9.8757E+12 9.0761E+10, M 8.85945E+14 7.09445E+12, Enth -2.90999E+20 -2.17919E+18, S 4.9982 4.9791, Me 3.54E-18, Te -3.08E-18, Se 2.26E-17
9, 0.750, Area 1.030079638966E+13 7.676499530276E+10, Ext 1.0630E+13 9.7772E+10, M 1.01275E+15 6.56045E+12, Enth -3.38649E+20 -1.98891E+18, S 4.9959 4.9611, Me 1.88E-18, Te -6.12E-19, Se 6.97E-18
12, 1.000, Area 1.073635754821E+13 6.995336776184E+10, Ext 1.1135E+13 9.6486E+10, M 1.14160E+15 6.01420E+12, Enth -3.84998E+20 -1.81814E+18, S 4.9933 4.9434, Me 4.08E-18, Te 2.59E-17, Se 1.88E-17
3, 0.250, Area 7.831554654570E+12 1.001499946156E+11, Ext 8.0121E+12 1.0197E+11, M 7.15264E+14 7.53642E+12, Enth -2.26214E+20 -2.34651E+18, S 4.9997 4.9951, Me 4.17E-18, Te 9.20E-18, Se 9.36E-17
6, 0.500, Area 9.556605533552E+12 8.300642597840E+10, Ext 9.8722E+12 9.0761E+10, M 8.85942E+14 7.09445E+12, Enth -2.90998E+20 -2.17919E+18, S 4.9982 4.9791, Me -1.52E-18, Te -1.02E-17, Se 2.48E-17
9, 0.750, Area 1.029665385381E+13 7.680268687584E+10, Ext 1.0616E+13 9.7772E+10, M 1.01281E+15 6.55973E+12, Enth -3.38665E+20 -1.98872E+18, S 4.9959 4.9611, Me 5.35E-18, Te -1.95E-18, Se 1.70E-18
12, 1.000, Area 1.072527594577E+13 6.992751330696E+10, Ext 1.1127E+13 9.6486E+10, M 1.14167E+15 6.01284E+12, Enth -3.85021E+20 -1.81782E+18, S 4.9933 4.9435, Me 2.98E-18, Te 4.27E-18, Se 1.38E-17
8 changes: 4 additions & 4 deletions examples/ocean_SIS2/SIS2_bergs_cgrid/seaice.stats.intel
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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, 0.000, Area 0.000000000000E+00 0.000000000000E+00, Ext 0.0000E+00 0.0000E+00, 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
3, 0.250, Area 7.831448435109E+12 1.001503841427E+11, Ext 8.0121E+12 1.0197E+11, M 7.15263E+14 7.53642E+12, Enth -2.26213E+20 -2.34651E+18, S 4.9997 4.9951, Me 8.69E-18, Te 5.90E-18, Se 9.40E-17
6, 0.500, Area 9.562617296722E+12 8.301270293302E+10, Ext 9.8839E+12 9.0761E+10, M 8.86059E+14 7.09477E+12, Enth -2.91035E+20 -2.17929E+18, S 4.9982 4.9791, Me -6.38E-19, Te 2.05E-16, Se 1.37E-17
9, 0.750, Area 1.029314977283E+13 7.681822292257E+10, Ext 1.0629E+13 9.7772E+10, M 1.01286E+15 6.56040E+12, Enth -3.38682E+20 -1.98891E+18, S 4.9959 4.9611, Me -3.01E-18, Te -6.41E-18, Se 9.73E-18
12, 1.000, Area 1.073724872675E+13 6.991825010121E+10, Ext 1.1133E+13 9.6486E+10, M 1.14164E+15 6.01507E+12, Enth -3.85012E+20 -1.81848E+18, S 4.9933 4.9434, Me 8.34E-18, Te 1.35E-18, Se 2.59E-17
3, 0.250, Area 7.831448435109E+12 1.001503841427E+11, Ext 8.0121E+12 1.0197E+11, M 7.15263E+14 7.53642E+12, Enth -2.26213E+20 -2.34651E+18, S 4.9997 4.9951, Me 8.69E-18, Te 5.89E-18, Se 9.40E-17
6, 0.500, Area 9.561958970740E+12 8.301165005087E+10, Ext 9.8804E+12 9.0761E+10, M 8.86088E+14 7.09477E+12, Enth -2.91044E+20 -2.17929E+18, S 4.9982 4.9791, Me 7.92E-19, Te -1.68E-16, Se 1.38E-17
9, 0.750, Area 1.029312603773E+13 7.681029707435E+10, Ext 1.0625E+13 9.7772E+10, M 1.01288E+15 6.55919E+12, Enth -3.38691E+20 -1.98855E+18, S 4.9959 4.9611, Me -2.01E-18, Te -3.74E-18, Se 4.21E-18
12, 1.000, Area 1.073157542530E+13 6.990666187401E+10, Ext 1.1134E+13 9.6486E+10, M 1.14148E+15 6.01174E+12, Enth -3.84965E+20 -1.81748E+18, S 4.9933 4.9434, Me 2.68E-18, Te -2.08E-18, Se 1.63E-17
8 changes: 4 additions & 4 deletions examples/ocean_SIS2/SIS2_bergs_cgrid/seaice.stats.pgi
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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, 0.000, Area 0.000000000000E+00 0.000000000000E+00, Ext 0.0000E+00 0.0000E+00, 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
3, 0.250, Area 7.831458008066E+12 1.001503863633E+11, Ext 8.0121E+12 1.0197E+11, M 7.15263E+14 7.53642E+12, Enth -2.26213E+20 -2.34651E+18, S 4.9997 4.9951, Me -1.30E-18, Te -1.71E-18, Se 9.02E-17
6, 0.500, Area 9.556637019435E+12 8.301185585680E+10, Ext 9.8747E+12 9.0761E+10, M 8.85903E+14 7.09445E+12, Enth -2.90986E+20 -2.17919E+18, S 4.9982 4.9791, Me 3.78E-18, Te 6.40E-18, Se 2.23E-17
9, 0.750, Area 1.029107709205E+13 7.677546230998E+10, Ext 1.0611E+13 9.7772E+10, M 1.01261E+15 6.56017E+12, Enth -3.38601E+20 -1.98885E+18, S 4.9959 4.9611, Me 7.08E-18, Te 4.78E-18, Se 1.18E-17
12, 1.000, Area 1.073962549853E+13 6.995135407989E+10, Ext 1.1141E+13 9.6486E+10, M 1.14191E+15 6.01595E+12, Enth -3.85090E+20 -1.81871E+18, S 4.9933 4.9434, Me -4.80E-18, Te 8.26E-18, Se 1.06E-17
3, 0.250, Area 7.831458008066E+12 1.001503863633E+11, Ext 8.0121E+12 1.0197E+11, M 7.15263E+14 7.53642E+12, Enth -2.26213E+20 -2.34651E+18, S 4.9997 4.9951, Me -1.30E-18, Te -1.72E-18, Se 9.02E-17
6, 0.500, Area 9.555302416346E+12 8.300854911815E+10, Ext 9.8713E+12 9.0761E+10, M 8.85886E+14 7.09446E+12, Enth -2.90981E+20 -2.17919E+18, S 4.9982 4.9791, Me 3.41E-18, Te 3.71E-18, Se 1.54E-17
9, 0.750, Area 1.028512283727E+13 7.679702631133E+10, Ext 1.0611E+13 9.7772E+10, M 1.01254E+15 6.55934E+12, Enth -3.38579E+20 -1.98860E+18, S 4.9959 4.9611, Me -8.97E-19, Te 7.97E-19, Se 6.82E-18
12, 1.000, Area 1.072984763070E+13 7.004350021772E+10, Ext 1.1154E+13 9.6486E+10, M 1.14168E+15 6.01120E+12, Enth -3.85019E+20 -1.81728E+18, S 4.9933 4.9435, Me 2.56E-19, Te -6.27E-19, Se -1.58E-18
8 changes: 4 additions & 4 deletions examples/ocean_SIS2/SIS2_bergs_cgrid/timestats.gnu
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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.974470353868E-01, CFL 0.00000, SL 1.8221E-09, M 1.37957E+21, S 34.7200, T 3.6134, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
3, 0.250, 0, En 6.976373475743E-01, CFL 0.16338, SL 1.2090E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 1.64E-16, Se 5.78E-15, Te 2.37E-15
6, 0.500, 0, En 7.013855374487E-01, CFL 0.12584, SL 1.6341E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.50E-16, Se 8.67E-15, Te 1.65E-15
9, 0.750, 0, En 7.048787525338E-01, CFL 0.13543, SL 1.8713E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 3.49E-16, Se 1.19E-14, Te 2.33E-15
12, 1.000, 0, En 7.064514616306E-01, CFL 0.15720, SL 2.1172E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 4.27E-16, Se 1.45E-14, Te 2.76E-15
3, 0.250, 0, En 6.976379180302E-01, CFL 0.16338, SL 1.2090E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 1.64E-16, Se 5.78E-15, Te 2.37E-15
6, 0.500, 0, En 7.013740518449E-01, CFL 0.12584, SL 1.6342E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.50E-16, Se 8.57E-15, Te 1.64E-15
9, 0.750, 0, En 7.050582989324E-01, CFL 0.13543, SL 1.8714E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 3.49E-16, Se 1.20E-14, Te 2.33E-15
12, 1.000, 0, En 7.064481159621E-01, CFL 0.15877, SL 2.1173E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 4.30E-16, Se 1.46E-14, Te 2.79E-15
8 changes: 4 additions & 4 deletions examples/ocean_SIS2/SIS2_bergs_cgrid/timestats.intel
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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.974470353868E-01, CFL 0.00000, SL 1.8221E-09, M 1.37957E+21, S 34.7200, T 3.6134, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
3, 0.250, 0, En 6.976387341150E-01, CFL 0.16338, SL 1.2090E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 1.63E-16, Se 5.81E-15, Te 2.37E-15
6, 0.500, 0, En 7.013735229663E-01, CFL 0.12584, SL 1.6343E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.50E-16, Se 8.65E-15, Te 1.64E-15
9, 0.750, 0, En 7.048770086823E-01, CFL 0.13543, SL 1.8717E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 3.50E-16, Se 1.20E-14, Te 2.36E-15
12, 1.000, 0, En 7.065534438258E-01, CFL 0.15753, SL 2.1172E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 4.30E-16, Se 1.46E-14, Te 2.78E-15
3, 0.250, 0, En 6.976387153543E-01, CFL 0.16338, SL 1.2090E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 1.63E-16, Se 5.80E-15, Te 2.37E-15
6, 0.500, 0, En 7.013755890779E-01, CFL 0.12584, SL 1.6343E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.49E-16, Se 8.53E-15, Te 1.63E-15
9, 0.750, 0, En 7.049016403032E-01, CFL 0.13543, SL 1.8716E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 3.49E-16, Se 1.20E-14, Te 2.35E-15
12, 1.000, 0, En 7.067581996180E-01, CFL 0.15870, SL 2.1171E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 4.28E-16, Se 1.46E-14, Te 2.76E-15
8 changes: 4 additions & 4 deletions examples/ocean_SIS2/SIS2_bergs_cgrid/timestats.pgi
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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.974470353868E-01, CFL 0.00000, SL 1.8221E-09, M 1.37957E+21, S 34.7200, T 3.6134, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
3, 0.250, 0, En 6.976371780575E-01, CFL 0.16338, SL 1.2090E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 1.63E-16, Se 5.74E-15, Te 2.37E-15
6, 0.500, 0, En 7.013646954722E-01, CFL 0.12584, SL 1.6341E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.51E-16, Se 8.69E-15, Te 1.63E-15
9, 0.750, 0, En 7.048414886384E-01, CFL 0.15722, SL 1.8712E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 3.49E-16, Se 1.19E-14, Te 2.31E-15
12, 1.000, 0, En 7.064255458405E-01, CFL 0.15743, SL 2.1178E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 4.32E-16, Se 1.47E-14, Te 2.78E-15
3, 0.250, 0, En 6.976371001296E-01, CFL 0.16338, SL 1.2090E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 1.63E-16, Se 5.74E-15, Te 2.37E-15
6, 0.500, 0, En 7.013667202696E-01, CFL 0.12584, SL 1.6341E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 2.50E-16, Se 8.61E-15, Te 1.63E-15
9, 0.750, 0, En 7.048661298571E-01, CFL 0.13543, SL 1.8710E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 3.52E-16, Se 1.20E-14, Te 2.35E-15
12, 1.000, 0, En 7.068658385304E-01, CFL 0.15898, SL 2.1173E-03, M 1.37957E+21, S 34.7200, T 3.6134, Me 4.33E-16, Se 1.48E-14, Te 2.79E-15

0 comments on commit cc6be35

Please sign in to comment.