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 index 2e5084673..b0ac03ce4 100644 --- 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 @@ -954,6 +954,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 10.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False 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 index 646b52fde..5a7e3776d 100644 --- a/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all @@ -954,6 +954,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 10.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False 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 index 458de2b97..1689d0178 100644 --- a/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all +++ b/coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all @@ -954,6 +954,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 10.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index de391fda1..e30e2c83c 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -954,6 +954,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 10.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False 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 index 5eb52ff24..488535c08 100644 --- 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 @@ -1150,6 +1150,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 600.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all index af395c792..1484a077b 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -1268,6 +1268,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all index 704a2c663..53144424e 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -1272,6 +1272,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all index 02ff02b3a..39f7095a5 100644 --- a/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all @@ -1255,6 +1255,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all index 37e99461e..31541781c 100644 --- a/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM5nb_025/MOM_parameter_doc.all @@ -1247,6 +1247,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index 19e81baa6..311bbfe4e 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -1268,6 +1268,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index 69951ef0d..6102dab26 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -1272,6 +1272,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index c212a04ee..0e20e9314 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -1259,6 +1259,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index a1e42939d..3ab14e120 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -925,6 +925,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 10.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all index f0fa0da9b..9814e20bc 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -925,6 +925,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 10.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index b30efd482..3121c3dfe 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -925,6 +925,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 10.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False 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 index 8ff51b107..08378debd 100644 --- 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 @@ -764,6 +764,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False 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 index 3d8485dc0..8cffba1af 100644 --- 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 @@ -911,6 +911,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False 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 index 01d82d328..66fc52aea 100644 --- 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 @@ -911,6 +911,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False 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 index 690d13f92..fb126ccc6 100644 --- 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 @@ -764,6 +764,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all index 2e96ce8a1..d2969078f 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/EPBL/MOM_parameter_doc.all @@ -911,6 +911,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all index 51a5c7f38..df7e9147d 100644 --- a/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/mech_only/KPP/MOM_parameter_doc.all @@ -911,6 +911,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all index 7177a70ce..48860c3c7 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/BML/MOM_parameter_doc.all @@ -764,6 +764,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all index baeed0106..9351dd257 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/EPBL/MOM_parameter_doc.all @@ -911,6 +911,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all index 6b8c3caa0..87a579152 100644 --- a/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/skin_warming_wind/KPP/MOM_parameter_doc.all @@ -911,6 +911,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all index 2ae1e6389..a4126dcda 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/BML/MOM_parameter_doc.all @@ -764,6 +764,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all index 819a15e4d..5b6aeb17b 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/EPBL/MOM_parameter_doc.all @@ -911,6 +911,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all index bb3215e5d..40403cf81 100644 --- a/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all +++ b/ocean_only/CVmix_SCM_tests/wind_only/KPP/MOM_parameter_doc.all @@ -911,6 +911,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index 6f9173372..37bc20839 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -819,6 +819,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index c46e1cbe4..a3eed9275 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -724,6 +724,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 8000.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 41ea44ed9..5e6e83fcf 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -911,6 +911,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 343984ae7..fa346209c 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -783,6 +783,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index d976d2b02..0eff32843 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -975,6 +975,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index c5be4e206..ca8c1549c 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -927,6 +927,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 4bf43e092..04fa9e6b9 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -862,6 +862,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 1.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index a17899d70..47e6b184f 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -823,6 +823,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index e0af7507b..0c5fde9b9 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -649,6 +649,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index 4037ef375..62c1c465a 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -772,6 +772,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index a300f86f8..872319726 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -782,6 +782,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index 5b57c402f..41c555344 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -976,6 +976,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index eca4157fe..f3ccc4fa8 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -928,6 +928,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index c35e83290..563aacc01 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -928,6 +928,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index e22892665..92021ab19 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -1197,6 +1197,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 600.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 7e88fea12..626673614 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -1042,6 +1042,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 600.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index f4fe4b2b6..eb57fd265 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -1137,6 +1137,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 600.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 8010faa11..c381b4961 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -775,6 +775,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all index 880754782..aa181bb76 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -913,6 +913,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 1.0E-04 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 3f58548f0..b9588c615 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -877,6 +877,9 @@ CHANNEL_DRAG_MAX_BBL_THICK = 5.0 ! [m] default = 5.0 ! proportional to HBBL if USE_JACKSON_PARAM or DRAG_AS_BODY_FORCE is true. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 10.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 51ac8a218..477145caa 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -767,6 +767,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index f117dae13..295c25259 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -913,6 +913,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 3d07c9a84..dd81f1088 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -800,6 +800,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 92d067d3c..906beefa0 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -992,6 +992,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index f5ead1ea5..3b4e249f1 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -941,6 +941,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index a07170231..5cae83ef4 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -941,6 +941,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index e7d79f2d4..bdb555b7f 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -776,6 +776,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index 304805e26..3b7824cab 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -878,6 +878,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index b38c3d975..f37429ff0 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -878,6 +878,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index be5311137..a6617d47d 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -781,6 +781,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index c62eb495b..7c570fd67 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -975,6 +975,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index e67ab564d..0d573ebe7 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -927,6 +927,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 500.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index 81874aec8..57006f69b 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -761,6 +761,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 2e565131a..e07836c97 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -976,6 +976,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index 0736a60da..07fc25631 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -928,6 +928,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 033e88190..cc2d2689a 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -620,6 +620,9 @@ CORRECT_BBL_BOUNDS = False ! [Boolean] default = False ! the bottom layer feels the intended drag. ! === module MOM_thickness_diffuse === +USE_THICKNESS_DIFFUSE_ANN = False ! [Boolean] default = False + ! If true, use the ANN to compute the mesoscale streamfunction for thickness + ! diffusivity. KHTH = 0.0 ! [m2 s-1] default = 0.0 ! The background horizontal thickness diffusivity. READ_KHTH = False ! [Boolean] default = False diff --git a/src/MOM6 b/src/MOM6 index 75b69c26f..bec619312 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit 75b69c26f387f18e5e45fc9a954980358e87c827 +Subproject commit bec619312051e01335fbd13fb4ce0b5446124ad1 diff --git a/src/SIS2 b/src/SIS2 index f96e21736..0372a89ae 160000 --- a/src/SIS2 +++ b/src/SIS2 @@ -1 +1 @@ -Subproject commit f96e21736008769c758b85ab56709f69c170a8ba +Subproject commit 0372a89aef8ce5d4c085c91acd47670659167063