MOM6: +FIX_USTAR_GUSTLESS_BUG is now USTAR_GUSTLESS_BUG

- NOAA-GFDL/MOM6@5c146680f +FIX_USTAR_GUSTLESS_BUG is now USTAR_GUSTLESS_BUG - NOAA-GFDL/MOM6@a28443ba1 Fix for an OBC issue with mask_tables - NOAA-GFDL/MOM6@1a8625db9 Disable FPEs in MacOS testing
NOAA-GFDL · Dec 20, 2023 · ef58727 · ef58727
1 parent fc53ea1
commit ef58727
Show file tree

Hide file tree

Showing 67 changed files with 133 additions and 133 deletions.
diff --git a/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
@@ -2078,8 +2078,8 @@ SURFACE_FORCING_ANSWER_DATE = 20181231 ! default = 20181231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = False ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
@@ -2078,8 +2078,8 @@ SURFACE_FORCING_ANSWER_DATE = 99991231 ! default = 99991231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = False ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
@@ -2078,8 +2078,8 @@ SURFACE_FORCING_ANSWER_DATE = 99991231 ! default = 99991231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = False ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
@@ -2109,8 +2109,8 @@ SURFACE_FORCING_ANSWER_DATE = 99991231 ! default = 99991231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = False ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
@@ -2289,8 +2289,8 @@ SURFACE_FORCING_ANSWER_DATE = 99991231 ! default = 99991231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = False ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
@@ -2396,8 +2396,8 @@ SURFACE_FORCING_ANSWER_DATE = 20181231 ! default = 20181231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = True ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = True ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short
@@ -743,8 +743,8 @@ MAX_DELTA_SRESTORE = 5.0 ! [PSU or g kg-1] default = 999.0
  ! The maximum salinity difference used in restoring terms.
 CD_TIDES = 0.0018 ! [nondim] default = 1.0E-04
  ! The drag coefficient that applies to the tides.
-FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = True ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = True ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
@@ -2430,8 +2430,8 @@ SURFACE_FORCING_ANSWER_DATE = 20181231 ! default = 20181231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = True ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = True ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short
@@ -782,8 +782,8 @@ MAX_DELTA_SRESTORE = 5.0 ! [PSU or g kg-1] default = 999.0
  ! The maximum salinity difference used in restoring terms.
 CD_TIDES = 0.0018 ! [nondim] default = 1.0E-04
  ! The drag coefficient that applies to the tides.
-FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = True ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = True ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
@@ -2396,8 +2396,8 @@ SURFACE_FORCING_ANSWER_DATE = 20181231 ! default = 20181231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = True ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = True ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short
@@ -752,8 +752,8 @@ MAX_DELTA_SRESTORE = 5.0 ! [PSU or g kg-1] default = 999.0
  ! The maximum salinity difference used in restoring terms.
 CD_TIDES = 0.0018 ! [nondim] default = 1.0E-04
  ! The drag coefficient that applies to the tides.
-FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = True ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = True ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
@@ -2430,8 +2430,8 @@ SURFACE_FORCING_ANSWER_DATE = 20181231 ! default = 20181231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = True ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = True ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.short
@@ -793,8 +793,8 @@ MAX_DELTA_SRESTORE = 5.0 ! [PSU or g kg-1] default = 999.0
  ! The maximum salinity difference used in restoring terms.
 CD_TIDES = 0.0018 ! [nondim] default = 1.0E-04
  ! The drag coefficient that applies to the tides.
-FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = True ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = True ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
@@ -2337,8 +2337,8 @@ SURFACE_FORCING_ANSWER_DATE = 20181231 ! default = 20181231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = True ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = False ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.short
@@ -760,8 +760,8 @@ CD_TIDES = 0.0018 ! [nondim] default = 1.0E-04
  ! The drag coefficient that applies to the tides.
 GUST_CONST = 0.02 ! [Pa] default = 0.0
  ! The background gustiness in the winds.
-FIX_USTAR_GUSTLESS_BUG = False ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = True ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 
 ! === module MOM_restart ===
diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
@@ -2081,8 +2081,8 @@ SURFACE_FORCING_ANSWER_DATE = 99991231 ! default = 99991231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = False ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
@@ -2085,8 +2085,8 @@ SURFACE_FORCING_ANSWER_DATE = 99991231 ! default = 99991231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = False ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
@@ -2081,8 +2081,8 @@ SURFACE_FORCING_ANSWER_DATE = 99991231 ! default = 99991231
  ! The vintage of the order of arithmetic and expressions in the gustiness
  ! calculations. Values below 20190101 recover the answers from the end of 2018,
  ! while higher values use a simpler expression to calculate gustiness.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 USE_RIGID_SEA_ICE = False ! [Boolean] default = False
  ! If true, sea-ice is rigid enough to exert a nonhydrostatic pressure that

diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all
@@ -1442,8 +1442,8 @@ LATENT_HEAT_VAPORIZATION = 2.5E+06 ! [J/kg] default = 2.5E+06
  ! The latent heat of fusion.
 GUST_CONST = 0.0 ! [Pa] default = 0.0
  ! The background gustiness in the winds.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 READ_GUST_2D = False ! [Boolean] default = False
  ! If true, use a 2-dimensional gustiness supplied from an input file

diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all
@@ -1543,8 +1543,8 @@ LATENT_HEAT_VAPORIZATION = 2.5E+06 ! [J/kg] default = 2.5E+06
  ! The latent heat of fusion.
 GUST_CONST = 0.0 ! [Pa] default = 0.0
  ! The background gustiness in the winds.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 READ_GUST_2D = False ! [Boolean] default = False
  ! If true, use a 2-dimensional gustiness supplied from an input file

diff --git a/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all
@@ -1542,8 +1542,8 @@ LATENT_HEAT_VAPORIZATION = 2.5E+06 ! [J/kg] default = 2.5E+06
  ! The latent heat of fusion.
 GUST_CONST = 0.0 ! [Pa] default = 0.0
  ! The background gustiness in the winds.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 READ_GUST_2D = False ! [Boolean] default = False
  ! If true, use a 2-dimensional gustiness supplied from an input file

diff --git a/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/BML/MOM_parameter_doc.all
@@ -1439,8 +1439,8 @@ LATENT_HEAT_VAPORIZATION = 2.5E+06 ! [J/kg] default = 2.5E+06
  ! The latent heat of fusion.
 GUST_CONST = 0.05 ! [Pa] default = 0.0
  ! The background gustiness in the winds.
-FIX_USTAR_GUSTLESS_BUG = True ! [Boolean] default = True
- ! If true correct a bug in the time-averaging of the gustless wind friction
+USTAR_GUSTLESS_BUG = False  ! [Boolean] default = False
+ ! If true include a bug in the time-averaging of the gustless wind friction
  ! velocity
 READ_GUST_2D = False ! [Boolean] default = False
  ! If true, use a 2-dimensional gustiness supplied from an input file