Skip to content

Commit

Permalink
*Missed timestats/seaice.stats in commit f0b4d0a
Browse files Browse the repository at this point in the history 
- Commit f0b4d0a due to SIS2 update
  should have changed MOM6z_SIS2_025 timestats and seaice.stats.
- Also missed some changes to SIS.available_diags
  • Loading branch information
@adcroft
adcroft committed Jun 22, 2014
1 parent a76978c commit 95f6ccc
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 14 deletions.
2 changes: 1 addition & 1 deletion examples/ocean_SIS2/MOM6z_SIS2_025/seaice.stats.gnu
View file
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, 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
6, 693135.250, Area 9.199526017118E+12 9.839897365042E+10, Ext 9.2982E+12 1.0243E+11, M 6.78746E+14 5.89409E+12, Enth -2.21583E+20 -1.82811E+18, S 4.9992 4.9850, Me -1.55E-14, Te -1.52E-14, Se -1.56E-14
6, 693135.250, Area 9.199525888296E+12 9.839897674667E+10, Ext 9.2982E+12 1.0243E+11, M 6.78746E+14 5.89409E+12, Enth -2.21583E+20 -1.82811E+18, S 4.9992 4.9850, Me -1.56E-14, Te -1.54E-14, Se -1.56E-14
2 changes: 1 addition & 1 deletion examples/ocean_SIS2/MOM6z_SIS2_025/seaice.stats.intel
View file
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, 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
6, 693135.250, Area 9.199526224388E+12 9.839898547991E+10, Ext 9.2982E+12 1.0243E+11, M 6.78746E+14 5.89409E+12, Enth -2.21583E+20 -1.82811E+18, S 4.9992 4.9850, Me -1.55E-14, Te -1.52E-14, Se -1.56E-14
6, 693135.250, Area 9.199526317677E+12 9.839898859675E+10, Ext 9.2982E+12 1.0243E+11, M 6.78746E+14 5.89409E+12, Enth -2.21583E+20 -1.82811E+18, S 4.9992 4.9850, Me -1.55E-14, Te -1.53E-14, Se -1.56E-14
2 changes: 1 addition & 1 deletion examples/ocean_SIS2/MOM6z_SIS2_025/seaice.stats.pgi
View file
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, 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
6, 693135.250, Area 9.199531518598E+12 9.839898421769E+10, Ext 9.2981E+12 1.0243E+11, M 6.78745E+14 5.89409E+12, Enth -2.21582E+20 -1.82811E+18, S 4.9992 4.9850, Me -1.55E-14, Te -1.50E-14, Se -1.55E-14
6, 693135.250, Area 9.199531572283E+12 9.839898419973E+10, Ext 9.2981E+12 1.0243E+11, M 6.78745E+14 5.89409E+12, Enth -2.21582E+20 -1.82811E+18, S 4.9992 4.9850, Me -1.55E-14, Te -1.51E-14, Se -1.56E-14
2 changes: 1 addition & 1 deletion examples/ocean_SIS2/MOM6z_SIS2_025/timestats.gnu
View file
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 6.782368272938E-05, CFL 0.00000, SL 2.1648E-02, M 1.38184E+21, S 34.7199, T 3.6042, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
6, 693135.250, 0, En 7.849353530374E-04, CFL 0.13477, SL 2.2951E-02, M 1.38184E+21, S 34.7199, T 3.6043, Me 1.57E-19, Se 3.61E-16, Te 4.13E-17
6, 693135.250, 0, En 7.849353378078E-04, CFL 0.13477, SL 2.2951E-02, M 1.38184E+21, S 34.7199, T 3.6043, Me 1.93E-19, Se 3.55E-16, Te 4.20E-17
2 changes: 1 addition & 1 deletion examples/ocean_SIS2/MOM6z_SIS2_025/timestats.intel
View file
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 6.782368272938E-05, CFL 0.00000, SL 2.1648E-02, M 1.38184E+21, S 34.7199, T 3.6042, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
6, 693135.250, 0, En 7.849352329193E-04, CFL 0.13476, SL 2.2951E-02, M 1.38184E+21, S 34.7199, T 3.6043, Me 1.98E-19, Se 3.57E-16, Te 3.94E-17
6, 693135.250, 0, En 7.849352514634E-04, CFL 0.13476, SL 2.2951E-02, M 1.38184E+21, S 34.7199, T 3.6043, Me 1.01E-19, Se 3.51E-16, Te 4.05E-17
2 changes: 1 addition & 1 deletion examples/ocean_SIS2/MOM6z_SIS2_025/timestats.pgi
View file
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 6.782368272938E-05, CFL 0.00000, SL 2.1648E-02, M 1.38184E+21, S 34.7199, T 3.6042, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
6, 693135.250, 0, En 7.849349151564E-04, CFL 0.13476, SL 2.2951E-02, M 1.38184E+21, S 34.7199, T 3.6043, Me 1.63E-19, Se 3.51E-16, Te 4.16E-17
6, 693135.250, 0, En 7.849349867393E-04, CFL 0.13476, SL 2.2951E-02, M 1.38184E+21, S 34.7199, T 3.6043, Me 2.40E-19, Se 3.62E-16, Te 4.22E-17
7 changes: 5 additions & 2 deletions examples/ocean_SIS2/SIS2/SIS.available_diags
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
"ice_model", "coszen" [Unused]
! long_name: cosine of zenith
! units: -1:1
"ice_model", "sw_abs_sfc" [Unused]
! long_name: SW frac. abs. at the ice surface
! units: 0:1
"ice_model", "sw_abs_snow" [Unused]
! long_name: SW frac. abs. in snow
! units: 0:1
Expand All @@ -115,8 +118,8 @@
"ice_model", "sw_pen" [Unused]
! long_name: SW frac. pen. surf.
! units: 0:1
"ice_model", "sw_trn" [Unused]
! long_name: SW frac. trans. to ice bot.
"ice_model", "sw_abs_ocn" [Unused]
! long_name: SW frac. sent to the ocean
! units: 0:1
"ice_model", "alb_vis_dir" [Unused]
! long_name: ice surface albedo vis_dir
Expand Down
7 changes: 5 additions & 2 deletions examples/ocean_SIS2/SIS2_bergs_cgrid/SIS.available_diags
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
"ice_model", "coszen" [Unused]
! long_name: cosine of zenith
! units: -1:1
"ice_model", "sw_abs_sfc" [Unused]
! long_name: SW frac. abs. at the ice surface
! units: 0:1
"ice_model", "sw_abs_snow" [Unused]
! long_name: SW frac. abs. in snow
! units: 0:1
Expand All @@ -115,8 +118,8 @@
"ice_model", "sw_pen" [Unused]
! long_name: SW frac. pen. surf.
! units: 0:1
"ice_model", "sw_trn" [Unused]
! long_name: SW frac. trans. to ice bot.
"ice_model", "sw_abs_ocn" [Unused]
! long_name: SW frac. sent to the ocean
! units: 0:1
"ice_model", "alb_vis_dir" [Unused]
! long_name: ice surface albedo vis_dir
Expand Down
7 changes: 5 additions & 2 deletions examples/ocean_SIS2/SIS2_cgrid/SIS.available_diags
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
"ice_model", "coszen" [Unused]
! long_name: cosine of zenith
! units: -1:1
"ice_model", "sw_abs_sfc" [Unused]
! long_name: SW frac. abs. at the ice surface
! units: 0:1
"ice_model", "sw_abs_snow" [Unused]
! long_name: SW frac. abs. in snow
! units: 0:1
Expand All @@ -115,8 +118,8 @@
"ice_model", "sw_pen" [Unused]
! long_name: SW frac. pen. surf.
! units: 0:1
"ice_model", "sw_trn" [Unused]
! long_name: SW frac. trans. to ice bot.
"ice_model", "sw_abs_ocn" [Unused]
! long_name: SW frac. sent to the ocean
! units: 0:1
"ice_model", "alb_vis_dir" [Unused]
! long_name: ice surface albedo vis_dir
Expand Down
7 changes: 5 additions & 2 deletions examples/ocean_SIS2/SIS2_icebergs/SIS.available_diags
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,9 @@
"ice_model", "coszen" [Unused]
! long_name: cosine of zenith
! units: -1:1
"ice_model", "sw_abs_sfc" [Unused]
! long_name: SW frac. abs. at the ice surface
! units: 0:1
"ice_model", "sw_abs_snow" [Unused]
! long_name: SW frac. abs. in snow
! units: 0:1
Expand All @@ -115,8 +118,8 @@
"ice_model", "sw_pen" [Unused]
! long_name: SW frac. pen. surf.
! units: 0:1
"ice_model", "sw_trn" [Unused]
! long_name: SW frac. trans. to ice bot.
"ice_model", "sw_abs_ocn" [Unused]
! long_name: SW frac. sent to the ocean
! units: 0:1
"ice_model", "alb_vis_dir" [Unused]
! long_name: ice surface albedo vis_dir
Expand Down

0 comments on commit 95f6ccc

Please sign in to comment.