Skip to content

Commit

Permalink
Merge pull request #1 from NOAA-GFDL/dev/master
Browse files Browse the repository at this point in the history 
Updated fork with commits from NOAA-GFDL/MOM6-examples
  • Loading branch information
@jkrasting
jkrasting authored Mar 21, 2017
2 parents 3a7ded8 + c5949e4 commit 503b8a3
Show file tree
Hide file tree
Showing 139 changed files with 7,030 additions and 617 deletions.
4 changes: 4 additions & 0 deletions coupled_AM2_LM3_SIS/CM2G63L/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,10 @@ MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False
! If true, extend OBC segments. This option is used to recover
! legacy solutions dependent on an incomplete implementaion of OBCs.
! This option will be obsoleted in the future.
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all
! fluxes are zeroed out. MASKING_DEPTH is ignored if negative.
Expand Down
6 changes: 5 additions & 1 deletion coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
TOPO_FILE = "topog.nc" ! default = "topog.nc"
Expand Down Expand Up @@ -1084,6 +1083,10 @@ KHTH_SLOPE_MAX = 0.01 ! [nondim] default = 0.01
KD_SMOOTH = 1.0E-06 ! [not defined] default = 1.0E-06
! A diapycnal diffusivity that is used to interpolate
! more sensible values of T & S into thin layers.
KHTH_USE_FGNV_STREAMFUNCTION = False ! [Boolean] default = False
! If true, use the streamfunction formulation of
! Ferrari et al., 2010, which effectively emphasizes
! graver vertical modes by smoothing in the vertical.

! === module MOM_mixed_layer_restrat ===
MIXEDLAYER_RESTRAT = True ! [Boolean] default = False
Expand Down Expand Up @@ -1613,6 +1616,7 @@ TRACER_ADVECTION_SCHEME = "PLM" ! default = "PLM"
! The horizontal transport scheme for tracers:
! PLM - Piecewise Linear Method
! PPM:H3 - Piecewise Parabolic Method (Huyhn 3rd order)
! PPM - Piecewise Parabolic Method (Colella-Woodward)

! === module MOM_tracer_hor_diff ===
KHTR = 10.0 ! [m2 s-1] default = 0.0
Expand Down
1 change: 0 additions & 1 deletion coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@ TOPO_CONFIG = "file" !
! DOME2D - use a shelf and slope configuration for the
! DOME2D gravity current/overflow test case.
! seamount - Gaussian bump for spontaneous motion test case.
! supercritical - flat but with 8.95 degree land mask.
! Phillips - ACC-like idealized topography used in the Phillips config.
! USER - call a user modified routine.
MAXIMUM_DEPTH = 6000.0 ! [m]
Expand Down
18 changes: 12 additions & 6 deletions coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ APPLY_SLP_TO_OCEAN = False ! [Boolean] default = False
MIN_H_FOR_TEMP_CALC = 0.0 ! [m] default = 0.0
! The minimum ice thickness at which to do temperature
! calculations.
MIN_OCEAN_PARTSIZE = 0.0 ! [nondim] default = 0.0
! The minimum value for the fractional open-ocean area.
! This can be 0, but for some purposes it may be useful
! to set this to a miniscule value (like 1e-40) that will
! be lost to roundoff during any sums so that the open
! ocean fluxes can be used in with new categories.
DO_ICEBERGS = False ! [Boolean] default = False
! If true, call the iceberg module.
ADD_DIURNAL_SW = False ! [Boolean] default = False
Expand Down Expand Up @@ -128,6 +122,12 @@ NK_SNOW = 1 ! [nondim] default = 1
H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0
! A constant that translates thicknesses from the model's
! internal units of thickness to kg m-2.
MIN_OCEAN_PARTSIZE = 0.0 ! [nondim] default = 0.0
! The minimum value for the fractional open-ocean area.
! This can be 0, but for some purposes it may be useful
! to set this to a miniscule value (like 1e-40) that will
! be lost to roundoff during any sums so that the open
! ocean fluxes can be used in with new categories.

! === module MOM_domains ===
REENTRANT_X = True ! [Boolean] default = True
Expand Down Expand Up @@ -407,6 +407,12 @@ STATISTICS_FILE = "seaice.stats" ! default = "seaice.stats"

! === module SIS_fast_thermo ===
! This module applies rapidly varying heat fluxes to the ice and does an implicit surface temperature calculation.
REORDER_0C_HEATFLUX = False ! [Boolean] default = False
! If true, rearrange the calculation of the heat fluxes
! projected back to 0C to work on each contribution
! separately, so that they can be indentically replicated
! if there is a single fast timestep per coupled timestep
! and REDO_FAST_ICE_UPDATE=True.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
4 changes: 4 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,10 @@ MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False
! If true, extend OBC segments. This option is used to recover
! legacy solutions dependent on an incomplete implementaion of OBCs.
! This option will be obsoleted in the future.
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all
! fluxes are zeroed out. MASKING_DEPTH is ignored if negative.
Expand Down
18 changes: 12 additions & 6 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ APPLY_SLP_TO_OCEAN = False ! [Boolean] default = False
MIN_H_FOR_TEMP_CALC = 0.0 ! [m] default = 0.0
! The minimum ice thickness at which to do temperature
! calculations.
MIN_OCEAN_PARTSIZE = 0.0 ! [nondim] default = 0.0
! The minimum value for the fractional open-ocean area.
! This can be 0, but for some purposes it may be useful
! to set this to a miniscule value (like 1e-40) that will
! be lost to roundoff during any sums so that the open
! ocean fluxes can be used in with new categories.
DO_ICEBERGS = False ! [Boolean] default = False
! If true, call the iceberg module.
ADD_DIURNAL_SW = False ! [Boolean] default = False
Expand Down Expand Up @@ -128,6 +122,12 @@ NK_SNOW = 1 ! [nondim] default = 1
H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0
! A constant that translates thicknesses from the model's
! internal units of thickness to kg m-2.
MIN_OCEAN_PARTSIZE = 0.0 ! [nondim] default = 0.0
! The minimum value for the fractional open-ocean area.
! This can be 0, but for some purposes it may be useful
! to set this to a miniscule value (like 1e-40) that will
! be lost to roundoff during any sums so that the open
! ocean fluxes can be used in with new categories.

! === module MOM_domains ===
REENTRANT_X = True ! [Boolean] default = True
Expand Down Expand Up @@ -455,6 +455,12 @@ STATISTICS_FILE = "seaice.stats" ! default = "seaice.stats"

! === module SIS_fast_thermo ===
! This module applies rapidly varying heat fluxes to the ice and does an implicit surface temperature calculation.
REORDER_0C_HEATFLUX = False ! [Boolean] default = False
! If true, rearrange the calculation of the heat fluxes
! projected back to 0C to work on each contribution
! separately, so that they can be indentically replicated
! if there is a single fast timestep per coupled timestep
! and REDO_FAST_ICE_UPDATE=True.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/seaice.stats.gnu
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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]
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, 0, Area 1.406249956043E+13 4.023442309365E+12, Ext 1.5381E+13 4.8092E+12, CFL 0.000, M 8.62971E+15 1.94430E+15, Enth -2.92921E+21 -5.94229E+20, S 0.0000 0.0000, Me 0.00E+00, Te -0.00E+00, Se 0.00E+00
3, 693135.250, 0, Area 1.403480703021E+13 3.954931562466E+12, Ext 1.5110E+13 4.7287E+12, CFL 0.091, M 9.14253E+15 1.86395E+15, Enth -3.08728E+21 -5.71895E+20, S 0.2113 0.0257, Me -1.09E-18, Te -9.28E-17, Se 7.96E-17
6, 693135.500, 0, Area 1.378933710665E+13 3.904462457989E+12, Ext 1.4893E+13 4.7767E+12, CFL 0.100, M 9.07057E+15 1.80236E+15, Enth -3.06509E+21 -5.51729E+20, S 0.2178 0.0264, Me 2.24E-18, Te -8.81E-17, Se -4.82E-18
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/seaice.stats.intel
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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]
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, 0, Area 1.406249956043E+13 4.023442309365E+12, Ext 1.5381E+13 4.8092E+12, CFL 0.000, M 8.62971E+15 1.94430E+15, Enth -2.92921E+21 -5.94229E+20, S 0.0000 0.0000, Me 0.00E+00, Te 0.00E+00, Se 0.00E+00
3, 693135.250, 0, Area 1.403480766436E+13 3.954931662468E+12, Ext 1.5110E+13 4.7287E+12, CFL 0.091, M 9.14253E+15 1.86395E+15, Enth -3.08728E+21 -5.71895E+20, S 0.2113 0.0257, Me 1.42E-18, Te -8.68E-17, Se 9.55E-17
6, 693135.500, 0, Area 1.378924171798E+13 3.905963573757E+12, Ext 1.4893E+13 4.7767E+12, CFL 0.100, M 9.07058E+15 1.80237E+15, Enth -3.06509E+21 -5.51732E+20, S 0.2178 0.0264, Me 5.99E-19, Te -8.67E-17, Se 1.19E-18
Expand Down
4 changes: 2 additions & 2 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/seaice.stats.pgi
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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]
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, 0, Area 1.406249956043E+13 4.023442309365E+12, Ext 1.5381E+13 4.8092E+12, CFL 0.000, M 8.62971E+15 1.94430E+15, Enth -2.92921E+21 -5.94229E+20, S 0.0000 0.0000, Me 0.00E+00, Te -0.00E+00, Se 0.00E+00
3, 693135.250, 0, Area 1.403480706536E+13 3.954931754342E+12, Ext 1.5110E+13 4.7287E+12, CFL 0.091, M 9.14253E+15 1.86395E+15, Enth -3.08728E+21 -5.71895E+20, S 0.2113 0.0257, Me 4.86E-18, Te -8.95E-17, Se 9.57E-17
6, 693135.500, 0, Area 1.378949704472E+13 3.904497430392E+12, Ext 1.4893E+13 4.7767E+12, CFL 0.100, M 9.07057E+15 1.80235E+15, Enth -3.06509E+21 -5.51726E+20, S 0.2178 0.0264, Me -2.15E-19, Te -8.08E-17, Se -2.82E-18
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,10 @@ MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any.
OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0
! The number of open boundary segments.
EXTEND_OBC_SEGMENTS = False ! [Boolean] default = False
! If true, extend OBC segments. This option is used to recover
! legacy solutions dependent on an incomplete implementaion of OBCs.
! This option will be obsoleted in the future.
MASKING_DEPTH = -9999.0 ! [m] default = -9999.0
! The depth below which to mask points as land points, for which all
! fluxes are zeroed out. MASKING_DEPTH is ignored if negative.
Expand Down
18 changes: 12 additions & 6 deletions ice_ocean_SIS2/Baltic/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ APPLY_SLP_TO_OCEAN = False ! [Boolean] default = False
MIN_H_FOR_TEMP_CALC = 0.0 ! [m] default = 0.0
! The minimum ice thickness at which to do temperature
! calculations.
MIN_OCEAN_PARTSIZE = 0.0 ! [nondim] default = 0.0
! The minimum value for the fractional open-ocean area.
! This can be 0, but for some purposes it may be useful
! to set this to a miniscule value (like 1e-40) that will
! be lost to roundoff during any sums so that the open
! ocean fluxes can be used in with new categories.
DO_ICEBERGS = False ! [Boolean] default = False
! If true, call the iceberg module.
ADD_DIURNAL_SW = True ! [Boolean] default = False
Expand Down Expand Up @@ -128,6 +122,12 @@ NK_SNOW = 1 ! [nondim] default = 1
H_TO_KG_M2 = 1.0 ! [kg m-2 H-1] default = 1.0
! A constant that translates thicknesses from the model's
! internal units of thickness to kg m-2.
MIN_OCEAN_PARTSIZE = 0.0 ! [nondim] default = 0.0
! The minimum value for the fractional open-ocean area.
! This can be 0, but for some purposes it may be useful
! to set this to a miniscule value (like 1e-40) that will
! be lost to roundoff during any sums so that the open
! ocean fluxes can be used in with new categories.

! === module MOM_domains ===
REENTRANT_X = False ! [Boolean] default = True
Expand Down Expand Up @@ -473,6 +473,12 @@ STATISTICS_FILE = "seaice.stats" ! default = "seaice.stats"

! === module SIS_fast_thermo ===
! This module applies rapidly varying heat fluxes to the ice and does an implicit surface temperature calculation.
REORDER_0C_HEATFLUX = False ! [Boolean] default = False
! If true, rearrange the calculation of the heat fluxes
! projected back to 0C to work on each contribution
! separately, so that they can be indentically replicated
! if there is a single fast timestep per coupled timestep
! and REDO_FAST_ICE_UPDATE=True.

! === module SIS2_ice_thm (updates) ===
! This sub-module does updates of the sea-ice due to thermodynamic changes.
Expand Down
4 changes: 2 additions & 2 deletions ice_ocean_SIS2/Baltic/seaice.stats.gnu
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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]
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, 0, Area 0.000000000000E+00 0.000000000000E+00, Ext 0.0000E+00 0.0000E+00, CFL 0.000, 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, 0, Area 6.642189823205E+09 0.000000000000E+00, Ext 6.6433E+09 0.0000E+00, CFL 0.018, M 5.21629E+11 0.00000E+00, Enth -1.60660E+17 0.00000E+00, S 4.9952 0.0000, Me 2.31E-17, Te 4.22E-16, Se 2.72E-16
6, 0.500, 0, Area 6.583199339721E+09 0.000000000000E+00, Ext 6.6433E+09 0.0000E+00, CFL 0.024, M 5.06566E+11 0.00000E+00, Enth -1.57694E+17 0.00000E+00, S 4.9762 0.0000, Me -7.66E-17, Te -3.23E-16, Se -4.04E-16
Expand Down
Loading

0 comments on commit 503b8a3

Please sign in to comment.