Skip to content

Commit

Permalink
*New tidal amplitude file for MOM6z
Browse files Browse the repository at this point in the history 
- Old tide file had amplitude and interpolation issues
  (MOM6z_SIS_025/siena/INPUT/tidal_amplitude.nc)
- New tide file is MOM6z_SIS_025/siena/INPUT/tidal_amplitude.v20140321.nc
- added diagnostics to diag_table: TKE_tidal and TKE_itidal
- New tidal amplitude file changes answers
  • Loading branch information
@adcroft
adcroft committed Mar 24, 2014
1 parent 5e36094 commit 5c17844
Show file tree
Hide file tree
Showing 9 changed files with 18 additions and 16 deletions.
1 change: 0 additions & 1 deletion examples/ocean_SIS/MOM6z_SIS_025/INPUT/tidal_amplitude.nc
View file

This file was deleted.

1 change: 1 addition & 0 deletions examples/ocean_SIS/MOM6z_SIS_025/INPUT/tidal_amplitude.v20140321.nc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.datasets/MOM6z_SIS_025/siena/INPUT/tidal_amplitude.v20140321.nc
2 changes: 1 addition & 1 deletion examples/ocean_SIS/MOM6z_SIS_025/MOM_input
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ TKE_ITIDE_MAX = 0.1 ! [W m-2] default = 1000.0
READ_TIDEAMP = True ! [Boolean] default = False
! If true, read a file (given by TIDEAMP_FILE) containing
! the tidal amplitude with INT_TIDE_DISSIPATION.
TIDEAMP_FILE = "tidal_amplitude.nc" ! default = "tideamp.nc"
TIDEAMP_FILE = "tidal_amplitude.v20140321.nc" ! default = "tideamp.nc"
! The path to the file containing the spatially varying
! tidal amplitudes with INT_TIDE_DISSIPATION.
H2_FILE = "ocean_topog.nc" !
Expand Down
2 changes: 1 addition & 1 deletion examples/ocean_SIS/MOM6z_SIS_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1233,7 +1233,7 @@ TKE_ITIDE_MAX = 0.1 ! [W m-2] default = 1000.0
READ_TIDEAMP = True ! [Boolean] default = False
! If true, read a file (given by TIDEAMP_FILE) containing
! the tidal amplitude with INT_TIDE_DISSIPATION.
TIDEAMP_FILE = "tidal_amplitude.nc" ! default = "tideamp.nc"
TIDEAMP_FILE = "tidal_amplitude.v20140321.nc" ! default = "tideamp.nc"
! The path to the file containing the spatially varying
! tidal amplitudes with INT_TIDE_DISSIPATION.
H2_FILE = "ocean_topog.nc" !
Expand Down
2 changes: 1 addition & 1 deletion examples/ocean_SIS/MOM6z_SIS_025/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,7 +478,7 @@ TKE_ITIDE_MAX = 0.1 ! [W m-2] default = 1000.0
READ_TIDEAMP = True ! [Boolean] default = False
! If true, read a file (given by TIDEAMP_FILE) containing
! the tidal amplitude with INT_TIDE_DISSIPATION.
TIDEAMP_FILE = "tidal_amplitude.nc" ! default = "tideamp.nc"
TIDEAMP_FILE = "tidal_amplitude.v20140321.nc" ! default = "tideamp.nc"
! The path to the file containing the spatially varying
! tidal amplitudes with INT_TIDE_DISSIPATION.
H2_FILE = "ocean_topog.nc" !
Expand Down
2 changes: 2 additions & 0 deletions examples/ocean_SIS/MOM6z_SIS_025/diag_table
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ MOM_SIS_025_z
"ocean_model", "vh", "vh", "ocean_annual", "all", .true., "none",2
"ocean_model", "T_ady", "T_ady", "ocean_annual", "all", .true., "none",2
"ocean_model", "S_ady", "S_ady", "ocean_annual", "all", .true., "none",2
"ocean_model", "TKE_tidal", "TKE_tidal", "ocean_annual", "all", .true., "none",2
"ocean_model", "TKE_itidal", "TKE_itidal", "ocean_annual", "all", .true., "none",2

# Sections
"ocean_model", "temp", "temp", "_Drake_passage", "all", .true., "-70. -70. -71. -54.5 -1 -1",2
Expand Down
8 changes: 4 additions & 4 deletions examples/ocean_SIS/MOM6z_SIS_025/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, 693135.000, 0, En 6.782368272983E-05, CFL 0.00000, SL 2.1648E-02, M 1.38184E+21, S 34.7199, T 3.6046, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
6, 693135.250, 0, En 7.887664915025E-04, CFL 0.19820, SL 2.3084E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 2.09E-19, Se 4.36E-16, Te 4.42E-17
12, 693135.500, 0, En 8.437406973579E-04, CFL 0.14266, SL 2.3370E-02, M 1.38184E+21, S 34.7199, T 3.6046, Me -4.46E-20, Se 9.48E-18, Te -8.95E-19
18, 693135.750, 0, En 9.000160463061E-04, CFL 0.15288, SL 2.3645E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 2.75E-20, Se -7.81E-18, Te -1.26E-18
24, 693136.000, 0, En 1.068881032471E-03, CFL 0.23644, SL 2.3898E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me -1.14E-19, Se -9.35E-18, Te 2.47E-18
6, 693135.250, 0, En 7.887403433540E-04, CFL 0.19821, SL 2.3084E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 1.41E-19, Se 4.36E-16, Te 4.28E-17
12, 693135.500, 0, En 8.436775760558E-04, CFL 0.14216, SL 2.3370E-02, M 1.38184E+21, S 34.7199, T 3.6046, Me -1.71E-20, Se -6.87E-18, Te -1.19E-19
18, 693135.750, 0, En 8.998822599530E-04, CFL 0.15275, SL 2.3645E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 9.33E-21, Se 3.11E-17, Te 5.88E-19
24, 693136.000, 0, En 1.068754541594E-03, CFL 0.23581, SL 2.3898E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me -1.46E-19, Se -1.97E-17, Te -2.05E-18
8 changes: 4 additions & 4 deletions examples/ocean_SIS/MOM6z_SIS_025/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, 693135.000, 0, En 6.782368272983E-05, CFL 0.00000, SL 2.1648E-02, M 1.38184E+21, S 34.7199, T 3.6046, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
6, 693135.250, 0, En 7.887664968221E-04, CFL 0.19820, SL 2.3084E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 1.91E-19, Se 4.26E-16, Te 4.36E-17
12, 693135.500, 0, En 8.437406878844E-04, CFL 0.14266, SL 2.3370E-02, M 1.38184E+21, S 34.7199, T 3.6046, Me 4.85E-20, Se 2.07E-17, Te -5.24E-19
18, 693135.750, 0, En 9.000170885654E-04, CFL 0.15301, SL 2.3645E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 9.99E-21, Se 3.81E-19, Te -5.23E-19
24, 693136.000, 0, En 1.068877808018E-03, CFL 0.23623, SL 2.3898E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 2.66E-20, Se 3.94E-18, Te 3.08E-18
6, 693135.250, 0, En 7.887403334087E-04, CFL 0.19821, SL 2.3084E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 6.16E-20, Se 4.36E-16, Te 4.46E-17
12, 693135.500, 0, En 8.436776777073E-04, CFL 0.14215, SL 2.3370E-02, M 1.38184E+21, S 34.7199, T 3.6046, Me -4.34E-20, Se -7.55E-18, Te -3.02E-18
18, 693135.750, 0, En 8.998825479483E-04, CFL 0.15276, SL 2.3645E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 1.23E-19, Se 2.33E-17, Te 1.05E-18
24, 693136.000, 0, En 1.068755521174E-03, CFL 0.23583, SL 2.3898E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 7.04E-21, Se 9.98E-19, Te 1.76E-18
8 changes: 4 additions & 4 deletions examples/ocean_SIS/MOM6z_SIS_025/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, 693135.000, 0, En 6.782368272983E-05, CFL 0.00000, SL 2.1648E-02, M 1.38184E+21, S 34.7199, T 3.6046, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00
6, 693135.250, 0, En 7.887664919756E-04, CFL 0.19820, SL 2.3084E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 3.19E-19, Se 4.32E-16, Te 4.30E-17
12, 693135.500, 0, En 8.437407612934E-04, CFL 0.14266, SL 2.3370E-02, M 1.38184E+21, S 34.7199, T 3.6046, Me 5.65E-20, Se 1.03E-17, Te 1.40E-18
18, 693135.750, 0, En 9.000153877913E-04, CFL 0.15302, SL 2.3645E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 9.71E-21, Se 4.94E-18, Te -1.30E-18
24, 693136.000, 0, En 1.068881884841E-03, CFL 0.23673, SL 2.3898E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 1.06E-20, Se 2.55E-18, Te 2.13E-18
6, 693135.250, 0, En 7.887403384934E-04, CFL 0.19821, SL 2.3084E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 1.71E-19, Se 4.26E-16, Te 4.53E-17
12, 693135.500, 0, En 8.436775627105E-04, CFL 0.14216, SL 2.3370E-02, M 1.38184E+21, S 34.7199, T 3.6046, Me -1.12E-19, Se -1.17E-17, Te -5.71E-18
18, 693135.750, 0, En 8.998824252340E-04, CFL 0.15279, SL 2.3645E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me 1.68E-20, Se 8.42E-18, Te 3.75E-18
24, 693136.000, 0, En 1.068758882351E-03, CFL 0.23611, SL 2.3898E-02, M 1.38184E+21, S 34.7199, T 3.6047, Me -2.05E-20, Se 1.24E-17, Te -1.14E-18

0 comments on commit 5c17844

Please sign in to comment.