From 4f988d8aa105c3924a9c9a0211e50baa981bceb1 Mon Sep 17 00:00:00 2001 From: Robert Hallberg Date: Wed, 15 Sep 2021 17:19:26 -0400 Subject: [PATCH] MOM6: Merge in dev/ncar/2021-08-30 & other commits This commit updates the MOM_parameter_doc files to reflect recently added runtime parameters, especially from dev-ncar-main-candidate-2021-08-30. This commit also includes some updates to the MOM_parameter_doc.all files for some less commonly exercised test cases that had been overlooked in another recent update. Submodule updates in this PR include: - NOAA-GFDL/MOM6@233f982c2 Merge pull request #1497 from marshallward/main_to_dev_gfdl - NOAA-GFDL/MOM6@72aabe5a4 Merge branch 'dev/gfdl' into main_to_dev_gfdl - NOAA-GFDL/MOM6@c09e19957 Merge pull request #1491 from gustavo-marques/dev-ncar-main-candidate-2021-08-30 - NOAA-GFDL/MOM6@cabe0d1c9 Merge pull request #1492 from marshallward/malloc_perturb_update - NOAA-GFDL/MOM6@47493085d Merge branch 'dev/gfdl' into malloc_perturb_update - NOAA-GFDL/MOM6@87aad2621 Merge pull request #1495 from marshallward/ale_sponge_halo_fix - NOAA-GFDL/MOM6@e05ceb238 Merge branch 'dev/gfdl' into ale_sponge_halo_fix - NOAA-GFDL/MOM6@16230850a Merge pull request #1490 from Hallberg-NOAA/offset_bathyT_by_Z_ref - NOAA-GFDL/MOM6@f44b9c46b Merge branch 'dev/gfdl' into offset_bathyT_by_Z_ref - NOAA-GFDL/MOM6@a31641682 Merge pull request #1488 from marshallward/rotate_read_data - NOAA-GFDL/MOM6@e5a522b6e Infra: MOM_read_data rename to read_field - NOAA-GFDL/MOM6@6a7216b79 Merge branch 'dev/gfdl' into rotate_read_data - NOAA-GFDL/MOM6@b47b44635 ALE sponge: Only update fields on uv over masks - NOAA-GFDL/MOM6@b560b2ccb Merge branch 'pr/1494' into dev/gfdl - NOAA-GFDL/MOM6@54b4a2302 Merge pull request #1493 from Hallberg-NOAA/find_interfaces_fix - NOAA-GFDL/MOM6@41c96ccdd Merge branch 'dev/gfdl' into find_interfaces_fix - NOAA-GFDL/MOM6@dc6f129cb Merge pull request #7 from alperaltuntas/pr1491_fixes - NOAA-GFDL/MOM6@127a22163 Merge branch 'dev/gfdl' into rotate_read_data - NOAA-GFDL/MOM6@67707e47e Merge branch 'dev/gfdl' into ale_sponge_halo_fix - NOAA-GFDL/MOM6@456d4a900 ALE sponge mask_z halo fixes - NOAA-GFDL/MOM6@6d13b1890 Still more syntax issues - NOAA-GFDL/MOM6@9c2b4e4b5 Fixing a citation - NOAA-GFDL/MOM6@db3fd1cdf Fixed forgotten \f$ - NOAA-GFDL/MOM6@9ee07718a More on background mixing. - NOAA-GFDL/MOM6@5f8c446d9 update all calls of KPP_compute_BLD and KPP_calculate to support the passage of lamult enhancement factor - NOAA-GFDL/MOM6@11c550f55 add references to KPP enhancements methods - NOAA-GFDL/MOM6@d1c0835cb Merge pull request #1487 from raphaeldussin/fix_diags_intwaves - NOAA-GFDL/MOM6@4f707ce54 Some background diffusivity text - NOAA-GFDL/MOM6@b039e62c3 More documentation - Jackson start. - NOAA-GFDL/MOM6@ca1c42682 (*)Avoid uninitialized data use in find_interfaces - NOAA-GFDL/MOM6@5bea5868c Merge branch 'dev/gfdl' into fix_diags_intwaves - NOAA-GFDL/MOM6@a7d8e3a65 Merge pull request #1479 from OlgaSergienko/ice_dynamics - NOAA-GFDL/MOM6@d234258c4 Merge branch 'dev/gfdl' into ice_dynamics - NOAA-GFDL/MOM6@f98b76d13 Merge pull request #1453 from MJHarrison-GFDL/SPEAR_ECDA - NOAA-GFDL/MOM6@f46c4bcad Changed identation in MOM6_ice_shelf_initialize.F90 to follow MOM6 convention - NOAA-GFDL/MOM6@88da4c9a5 clearer documentation for correct_leap_year_inconsistency flag - NOAA-GFDL/MOM6@d37f1cfd5 Add documentation for correct_leap_year_inconsistency argument - NOAA-GFDL/MOM6@ccaddf108 Merge branch 'dev/gfdl' into SPEAR_ECDA - NOAA-GFDL/MOM6@14aebaaa1 Merge branch 'dev/gfdl' into fix_diags_intwaves - NOAA-GFDL/MOM6@91383e332 Testing: Set MALLOC_PERTURB_ to 1 - NOAA-GFDL/MOM6@e2c565c09 changed identation MOM_ice_shelf_initialize.F90 to follow MOM6 convention - NOAA-GFDL/MOM6@442ae8ff5 changed the block idetentation for consistency with MOM6 code style - NOAA-GFDL/MOM6@060c41290 (*)Offset G%bathyT by -G%Z_ref - NOAA-GFDL/MOM6@a253d3797 init local arrays, fix to axes and logging - NOAA-GFDL/MOM6@91ab1e586 Merge branch 'main' into dev-ncar-main-candidate-2021-08-30 - NOAA-GFDL/MOM6@ddec6f9ca Testing: Rotation support for MOM_read_data - NOAA-GFDL/MOM6@bdba2d222 Merge pull request #195 from klindsay28/dimension_rescaling_fixes - NOAA-GFDL/MOM6@380615dde Merge pull request #194 from NCAR/merge_ww3_coupling_vr12ma - NOAA-GFDL/MOM6@60ad2ed2e Merge branch 'dev/gfdl' into SPEAR_ECDA - NOAA-GFDL/MOM6@88b36422f Restore Vt2 diagnostic calculation when requested and retain the functionality of prescribed constant enhancement. - NOAA-GFDL/MOM6@a5caf2e8b removed tab from MOM_ice_shelf_initialize.F90 - NOAA-GFDL/MOM6@3ce2efe29 changes to ice_velocity_mask_update, initialization of ice velocity and ice thickness for new and restart simulations - NOAA-GFDL/MOM6@197cd1870 MOM_CFC_cap cleanup - NOAA-GFDL/MOM6@f6524adee Add run-time parameters CFC11_IC_VAL and CFC12_IC_VAL. - NOAA-GFDL/MOM6@fa96ae332 correct prepending inputdir to CFC_BC_file - NOAA-GFDL/MOM6@bc198197c let register_tracer handle flux_units for MOM_CFC_cap tracers - NOAA-GFDL/MOM6@e87adb88a dimension rescaling fixes for MOM_CFC_cap tracers - NOAA-GFDL/MOM6@9011801b6 Various dimension rescaling fixes - NOAA-GFDL/MOM6@d734536c0 Refactor the way Langmuir entrainment and enhancement factor are computed and applied: (1) When available, pass the enhancement factor received from WW3. Otherwise, let CVmix compute the enhancement factor. (2) Instead of explicitly multiplying diffusivities and viscosities with the enhancement factor, let CVMix handle enhancement internally. - NOAA-GFDL/MOM6@734e53782 change VR12-MA wave_method string to EFACTOR - NOAA-GFDL/MOM6@5ba918aae Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into SPEAR_ECDA - NOAA-GFDL/MOM6@66a758415 Fix pointer initialization and other cleanup - NOAA-GFDL/MOM6@80e1e2e88 fix omp error in KPP module: add lamult to shared clauses - NOAA-GFDL/MOM6@9fe68ac66 fix doxygen error: add comments for wave method strings - NOAA-GFDL/MOM6@2d385a061 Introduce changes needed for CVMix KPP module for the VR12-MA wave coupling option - NOAA-GFDL/MOM6@141277181 Minor fixes for the WW3 coupling option VR12-MA - NOAA-GFDL/MOM6@7ebf3b07e bringing in vr12ma ww3 coupling changes to the latest dev/ncar and resolving conflicts - NOAA-GFDL/MOM6@3e1b0cdf5 Merge pull request #191 from gustavo-marques/recover_answer_change_in_CFC_PR - NOAA-GFDL/MOM6@69f653a53 Merge pull request #193 from NCAR/merge_main_210802 - NOAA-GFDL/MOM6@3117b9830 merge dev/ncar with main 210723 - NOAA-GFDL/MOM6@090fa83fe Add optional argument to FMS2 interface to init_extern_field - NOAA-GFDL/MOM6@8ef959637 Merge https://github.com/OlgaSergienko/MOM6 into ice_dynamics - NOAA-GFDL/MOM6@016beb6c2 Merge branch 'NOAA-GFDL:dev/gfdl' into dev/gfdl - NOAA-GFDL/MOM6@9c0a73505 add dimensional rescaling for thickness initialization - NOAA-GFDL/MOM6@eacf3e25d comments - NOAA-GFDL/MOM6@2169f6dae Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into SPEAR_ECDA - NOAA-GFDL/MOM6@762291114 Changes the order of calculation - NOAA-GFDL/MOM6@997636e3c move lamult from forces to fluxes - NOAA-GFDL/MOM6@7d85ab291 set lamult to 1 below ice - NOAA-GFDL/MOM6@5f756ab7e Enable the export of ice fraction when wave coupling is on. The export of ice fraction was previously added for the newly added CFC module. - NOAA-GFDL/MOM6@bc65e4f46 merge latest dev/ncar into ww3_coupling_vr12ma - NOAA-GFDL/MOM6@230a8b83e Merge pull request #190 from NCAR/fix_cfc_import - NOAA-GFDL/MOM6@b767a1343 import ifrac and u10_sqr only when CFC module is active - NOAA-GFDL/MOM6@b7e0fda76 Merge pull request #189 from gustavo-marques/ncar_cfcs_implementation - NOAA-GFDL/MOM6@5c0e8db43 Merge remote-tracking branch 'origin' into SPEAR_ECDA - NOAA-GFDL/MOM6@347e1470f Merge branch 'NOAA-GFDL:dev/gfdl' into dev/gfdl - NOAA-GFDL/MOM6@0267d0829 Merge branch 'ice_dynamics' of https://github.com/OlgaSergienko/MOM6 into ice_dynamics - NOAA-GFDL/MOM6@457c4991d increased a number of iterations in solver for non-linear viscosity - NOAA-GFDL/MOM6@13f5e12c5 Merge https://github.com/OlgaSergienko/MOM6 into ice_dynamics - NOAA-GFDL/MOM6@f45659d47 introduce the lamult import from ww3 in nuopc cap and add a diag - NOAA-GFDL/MOM6@3aade32dd CFCs implementation via NUOPC cap - NOAA-GFDL/MOM6@276954f3c Fixed a misplaced parentheses - NOAA-GFDL/MOM6@0d5915608 introduce a new wave coupling method: VR12-MA (not fully implemented yet) - NOAA-GFDL/MOM6@d1de7c852 Merge pull request #188 from gustavo-marques/fix_mem_leak_bkgnd - NOAA-GFDL/MOM6@14e233438 Deallocate Kd_bkgnd and Kv_bkgnd - NOAA-GFDL/MOM6@3812cf64c Merge pull request #187 from gustavo-marques/fix_retrieving_nthreads_nuopc - NOAA-GFDL/MOM6@d3f4f0f12 Merge pull request #186 from gustavo-marques/main-candidate-ncar-2021-04-21 - NOAA-GFDL/MOM6@eca5fd53e Merge remote-tracking branch 'origin' into SPEAR_ECDA - NOAA-GFDL/MOM6@7eb92f643 Merge pull request #2 from NOAA-GFDL/dev/gfdl - NOAA-GFDL/MOM6@165176b6e debug checksums pre/post oda - NOAA-GFDL/MOM6@dac7180c3 Use local indexing for MOM6 DA grid - NOAA-GFDL/MOM6@a21ee337e squash this commit.Fix some issues with basin mask - NOAA-GFDL/MOM6@2e60468b1 squash this commit. Revert US argument in call to init_oda. - NOAA-GFDL/MOM6@6e00221bd doxygen. squash this commit - NOAA-GFDL/MOM6@20306e910 squash this commit - NOAA-GFDL/MOM6@568188292 squash this commit - NOAA-GFDL/MOM6@4d411ba22 optionally apply data assimilation increments or a time-varying tendency adjustment to tracers --- .../AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all | 2 ++ .../Concurrent_ice_1deg/MOM_parameter_doc.all | 2 ++ .../MOM_parameter_doc.all | 2 ++ ice_ocean_SIS2/Baltic/MOM_parameter_doc.all | 2 ++ .../MOM_parameter_doc.all | 2 ++ .../Baltic_OM4_025/MOM_parameter_doc.all | 2 ++ .../Baltic_OM4_05/MOM_parameter_doc.all | 2 ++ ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all | 2 ++ ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all | 2 ++ ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all | 2 ++ ice_ocean_SIS2/SIS2/MOM_parameter_doc.all | 2 ++ .../SIS2_bergs_cgrid/MOM_parameter_doc.all | 2 ++ .../SIS2_cgrid/MOM_parameter_doc.all | 2 ++ .../cooling_only/BML/MOM_parameter_doc.all | 2 ++ .../cooling_only/EPBL/MOM_parameter_doc.all | 2 ++ .../cooling_only/KPP/MOM_parameter_doc.all | 2 ++ .../mech_only/BML/MOM_parameter_doc.all | 2 ++ .../mech_only/EPBL/MOM_parameter_doc.all | 2 ++ .../mech_only/KPP/MOM_parameter_doc.all | 2 ++ .../BML/MOM_parameter_doc.all | 2 ++ .../EPBL/MOM_parameter_doc.all | 2 ++ .../KPP/MOM_parameter_doc.all | 2 ++ .../wind_only/BML/MOM_parameter_doc.all | 2 ++ .../wind_only/EPBL/MOM_parameter_doc.all | 2 ++ .../wind_only/KPP/MOM_parameter_doc.all | 2 ++ ocean_only/DOME/MOM_parameter_doc.all | 2 ++ ocean_only/ISOMIP/layer/MOM_parameter_doc.all | 8 +++++++- ocean_only/ISOMIP/rho/MOM_parameter_doc.all | 8 +++++++- ocean_only/MESO_025_23L/MOM_parameter_doc.all | 16 +++++++++++----- .../MESO_025_23L/MOM_parameter_doc.short | 4 ++-- ocean_only/MESO_025_63L/MOM_parameter_doc.all | 16 +++++++++++----- .../MESO_025_63L/MOM_parameter_doc.short | 4 ++-- .../Phillips_2layer/MOM_parameter_doc.all | 2 ++ .../MOM_parameter_doc.all | 2 ++ .../adjustment2d/layer/MOM_parameter_doc.all | 2 ++ .../adjustment2d/rho/MOM_parameter_doc.all | 2 ++ .../adjustment2d/z/MOM_parameter_doc.all | 2 ++ ocean_only/benchmark/MOM_parameter_doc.all | 2 ++ .../buoy_forced_basin/MOM_parameter_doc.all | 8 +++++++- ocean_only/circle_obcs/MOM_parameter_doc.all | 2 ++ ocean_only/double_gyre/MOM_parameter_doc.all | 2 ++ .../external_gwave/MOM_parameter_doc.all | 2 ++ .../layer/MOM_parameter_doc.all | 2 ++ .../flow_downslope/rho/MOM_parameter_doc.all | 2 ++ .../sigma/MOM_parameter_doc.all | 2 ++ .../flow_downslope/z/MOM_parameter_doc.all | 2 ++ ocean_only/global/MOM_parameter_doc.all | 19 ++++++++++++++----- ocean_only/global/MOM_parameter_doc.short | 4 ++-- .../global_ALE/hycom/MOM_parameter_doc.all | 2 ++ .../global_ALE/layer/MOM_parameter_doc.all | 2 ++ ocean_only/global_ALE/z/MOM_parameter_doc.all | 2 ++ .../idealized_hurricane/MOM_parameter_doc.all | 8 +++++++- .../lock_exchange/MOM_parameter_doc.all | 2 ++ .../MOM_parameter_doc.all | 2 ++ .../nonBous_global/MOM_parameter_doc.all | 2 ++ .../resting/layer/MOM_parameter_doc.all | 2 ++ ocean_only/resting/z/MOM_parameter_doc.all | 2 ++ .../seamount/layer/MOM_parameter_doc.all | 2 ++ ocean_only/seamount/rho/MOM_parameter_doc.all | 2 ++ .../seamount/sigma/MOM_parameter_doc.all | 2 ++ ocean_only/seamount/z/MOM_parameter_doc.all | 2 ++ .../single_column/BML/MOM_parameter_doc.all | 2 ++ .../single_column/EPBL/MOM_parameter_doc.all | 2 ++ .../single_column/KPP/MOM_parameter_doc.all | 2 ++ .../sloshing/layer/MOM_parameter_doc.all | 2 ++ ocean_only/sloshing/rho/MOM_parameter_doc.all | 2 ++ ocean_only/sloshing/z/MOM_parameter_doc.all | 2 ++ ocean_only/tides_025/MOM_parameter_doc.all | 16 +++++++++++----- ocean_only/tides_025/MOM_parameter_doc.short | 6 +++--- .../MOM_parameter_doc.all | 2 ++ .../tracer_mixing/rho/MOM_parameter_doc.all | 2 ++ .../tracer_mixing/z/MOM_parameter_doc.all | 2 ++ ocean_only/unit_tests/MOM_parameter_doc.all | 2 ++ src/MOM6 | 2 +- 74 files changed, 207 insertions(+), 34 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 index 29a8f7a757..b30b307820 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 @@ -325,6 +325,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = True ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 0d807601dc..175f8411e2 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 @@ -325,6 +325,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = True ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 2af02e17e2..aae0333c2f 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 @@ -325,6 +325,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = True ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all index 41ada238fb..f20d1759b5 100644 --- a/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic/MOM_parameter_doc.all @@ -325,6 +325,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = True ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 cb73ac0bcc..643e973c82 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 @@ -343,6 +343,8 @@ USE_ADVECTION_TEST_TRACER = True ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 567d837456..79428103d8 100644 --- a/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all @@ -351,6 +351,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 0e6e06ce37..cf615153bc 100644 --- a/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all @@ -351,6 +351,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all index e8ac73079c..951e601781 100644 --- a/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all @@ -351,6 +351,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all index e3e36c4c0b..a0af0ae200 100644 --- a/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all @@ -351,6 +351,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all index fe71587b05..e6c919fa74 100644 --- a/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all @@ -342,6 +342,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all index 2a2882a3c2..d4ba9ff7bd 100644 --- a/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2/MOM_parameter_doc.all @@ -325,6 +325,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = True ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 5ff3d65d71..0db902be21 100644 --- a/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all @@ -325,6 +325,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = True ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all index 4c6ed2d1f8..670052a777 100644 --- a/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all +++ b/ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all @@ -325,6 +325,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = True ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 4e36f38799..be8c23c77f 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 @@ -335,6 +335,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 14516c85af..a25a79efaf 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 @@ -338,6 +338,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 da0cdd20f6..8106e1f8dd 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 @@ -338,6 +338,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 1b2b9d1bfe..0241f6fb84 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 @@ -335,6 +335,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 671582058c..18feae34cb 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 @@ -338,6 +338,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 3d2fc84e90..6f8f86aed7 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 @@ -338,6 +338,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 15ec15df00..81ff08cc94 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 @@ -335,6 +335,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 4186e5b599..55f52d354e 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 @@ -338,6 +338,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 7ea574acd0..ae2ef708f6 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 @@ -338,6 +338,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 3b7bfc82da..3d709df5c5 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 @@ -335,6 +335,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 335c49c1cb..d7649190b5 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 @@ -338,6 +338,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 b78281f663..cb1e98944e 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 @@ -338,6 +338,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/DOME/MOM_parameter_doc.all b/ocean_only/DOME/MOM_parameter_doc.all index ade53590e7..2a9ab75355 100644 --- a/ocean_only/DOME/MOM_parameter_doc.all +++ b/ocean_only/DOME/MOM_parameter_doc.all @@ -342,6 +342,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/ISOMIP/layer/MOM_parameter_doc.all b/ocean_only/ISOMIP/layer/MOM_parameter_doc.all index ee514e38da..c4475b773f 100644 --- a/ocean_only/ISOMIP/layer/MOM_parameter_doc.all +++ b/ocean_only/ISOMIP/layer/MOM_parameter_doc.all @@ -232,7 +232,7 @@ OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 ! The number of open boundary segments. 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. + ! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH CHANNEL_CONFIG = "none" ! default = "none" ! A parameter that determines which set of channels are ! restricted to specific widths. Options are: @@ -336,6 +336,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. @@ -345,6 +347,8 @@ USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. USE_DYED_OBC_TRACER = False ! [Boolean] default = False ! If true, use the dyed_obc_tracer tracer package. +USE_NW2_TRACERS = False ! [Boolean] default = False + ! If true, use the NeverWorld2 tracers. ! === module MOM_grid === ! Parameters providing information about the lateral grid. @@ -578,6 +582,8 @@ SURFACE_PRESSURE_SCALE = 8820.0 ! [file dependent] default = 1.0 ! SURFACE_PRESSURE_FILE into a surface pressure. TRIMMING_USES_REMAPPING = False ! [Boolean] default = False ! When trimming the column, also remap T and S. +ODA_INCUPD = False ! [Boolean] default = False + ! If true, oda incremental updates will be applied everywhere in the domain. SPONGE = False ! [Boolean] default = False ! If true, sponges may be applied anywhere in the domain. The exact location and ! properties of those sponges are specified via SPONGE_CONFIG. diff --git a/ocean_only/ISOMIP/rho/MOM_parameter_doc.all b/ocean_only/ISOMIP/rho/MOM_parameter_doc.all index 90cf542905..f00660adab 100644 --- a/ocean_only/ISOMIP/rho/MOM_parameter_doc.all +++ b/ocean_only/ISOMIP/rho/MOM_parameter_doc.all @@ -232,7 +232,7 @@ OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 ! The number of open boundary segments. 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. + ! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH CHANNEL_CONFIG = "none" ! default = "none" ! A parameter that determines which set of channels are ! restricted to specific widths. Options are: @@ -336,6 +336,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. @@ -345,6 +347,8 @@ USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. USE_DYED_OBC_TRACER = False ! [Boolean] default = False ! If true, use the dyed_obc_tracer tracer package. +USE_NW2_TRACERS = False ! [Boolean] default = False + ! If true, use the NeverWorld2 tracers. ! === module MOM_grid === ! Parameters providing information about the lateral grid. @@ -698,6 +702,8 @@ REGRID_ACCELERATE_INIT = False ! [Boolean] default = False ! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding ! algorithm to push the initial grid to be consistent with the initial ! condition. Useful only for state-based and iterative coordinates. +ODA_INCUPD = False ! [Boolean] default = False + ! If true, oda incremental updates will be applied everywhere in the domain. SPONGE = False ! [Boolean] default = False ! If true, sponges may be applied anywhere in the domain. The exact location and ! properties of those sponges are specified via SPONGE_CONFIG. diff --git a/ocean_only/MESO_025_23L/MOM_parameter_doc.all b/ocean_only/MESO_025_23L/MOM_parameter_doc.all index 8d8eb0d456..8041a04b2a 100644 --- a/ocean_only/MESO_025_23L/MOM_parameter_doc.all +++ b/ocean_only/MESO_025_23L/MOM_parameter_doc.all @@ -229,22 +229,22 @@ TOPO_EDITS_FILE = "" ! default = "" ! The file from which to read a list of i,j,z topography overrides. ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False ! If true, allow topography overrides to change land mask. -MAXIMUM_DEPTH = 5500.0 ! [m] - ! The maximum depth of the ocean. MINIMUM_DEPTH = 15.0 ! [m] default = 0.0 ! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is ! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is ! specified, then all depths shallower than MINIMUM_DEPTH but deeper than ! MASKING_DEPTH are rounded to MINIMUM_DEPTH. +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 needs to be smaller than MINIMUM_DEPTH +MAXIMUM_DEPTH = 5500.0 ! [m] + ! The maximum depth of the ocean. ! === module MOM_open_boundary === ! 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. -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. CHANNEL_CONFIG = "none" ! default = "none" ! A parameter that determines which set of channels are ! restricted to specific widths. Options are: @@ -345,6 +345,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. @@ -354,6 +356,8 @@ USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. USE_DYED_OBC_TRACER = False ! [Boolean] default = False ! If true, use the dyed_obc_tracer tracer package. +USE_NW2_TRACERS = False ! [Boolean] default = False + ! If true, use the NeverWorld2 tracers. ! === module MOM_grid === ! Parameters providing information about the lateral grid. @@ -472,6 +476,8 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False ! If true, cuts way the top of the column for initial conditions at the depth ! where the hydrostatic pressure matches the imposed surface pressure which is ! read from file. +ODA_INCUPD = False ! [Boolean] default = False + ! If true, oda incremental updates will be applied everywhere in the domain. SPONGE = True ! [Boolean] default = False ! If true, sponges may be applied anywhere in the domain. The exact location and ! properties of those sponges are specified via SPONGE_CONFIG. diff --git a/ocean_only/MESO_025_23L/MOM_parameter_doc.short b/ocean_only/MESO_025_23L/MOM_parameter_doc.short index 65c0073b21..5ba8480923 100644 --- a/ocean_only/MESO_025_23L/MOM_parameter_doc.short +++ b/ocean_only/MESO_025_23L/MOM_parameter_doc.short @@ -93,13 +93,13 @@ TOPO_FILE = "MESO_topog_025mNG.nc" ! default = "topog.nc" ! The file from which the bathymetry is read. TOPO_VARNAME = "depth_t" ! default = "depth" ! The name of the bathymetry variable in TOPO_FILE. -MAXIMUM_DEPTH = 5500.0 ! [m] - ! The maximum depth of the ocean. MINIMUM_DEPTH = 15.0 ! [m] default = 0.0 ! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is ! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is ! specified, then all depths shallower than MINIMUM_DEPTH but deeper than ! MASKING_DEPTH are rounded to MINIMUM_DEPTH. +MAXIMUM_DEPTH = 5500.0 ! [m] + ! The maximum depth of the ocean. ! === module MOM_verticalGrid === ! Parameters providing information about the vertical grid. diff --git a/ocean_only/MESO_025_63L/MOM_parameter_doc.all b/ocean_only/MESO_025_63L/MOM_parameter_doc.all index 9bee9f5e2d..1daabcb326 100644 --- a/ocean_only/MESO_025_63L/MOM_parameter_doc.all +++ b/ocean_only/MESO_025_63L/MOM_parameter_doc.all @@ -229,22 +229,22 @@ TOPO_EDITS_FILE = "" ! default = "" ! The file from which to read a list of i,j,z topography overrides. ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False ! If true, allow topography overrides to change land mask. -MAXIMUM_DEPTH = 5500.0 ! [m] - ! The maximum depth of the ocean. MINIMUM_DEPTH = 15.0 ! [m] default = 0.0 ! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is ! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is ! specified, then all depths shallower than MINIMUM_DEPTH but deeper than ! MASKING_DEPTH are rounded to MINIMUM_DEPTH. +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 needs to be smaller than MINIMUM_DEPTH +MAXIMUM_DEPTH = 5500.0 ! [m] + ! The maximum depth of the ocean. ! === module MOM_open_boundary === ! 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. -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. CHANNEL_CONFIG = "none" ! default = "none" ! A parameter that determines which set of channels are ! restricted to specific widths. Options are: @@ -345,6 +345,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. @@ -354,6 +356,8 @@ USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. USE_DYED_OBC_TRACER = False ! [Boolean] default = False ! If true, use the dyed_obc_tracer tracer package. +USE_NW2_TRACERS = False ! [Boolean] default = False + ! If true, use the NeverWorld2 tracers. ! === module MOM_grid === ! Parameters providing information about the lateral grid. @@ -474,6 +478,8 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False ! If true, cuts way the top of the column for initial conditions at the depth ! where the hydrostatic pressure matches the imposed surface pressure which is ! read from file. +ODA_INCUPD = False ! [Boolean] default = False + ! If true, oda incremental updates will be applied everywhere in the domain. SPONGE = True ! [Boolean] default = False ! If true, sponges may be applied anywhere in the domain. The exact location and ! properties of those sponges are specified via SPONGE_CONFIG. diff --git a/ocean_only/MESO_025_63L/MOM_parameter_doc.short b/ocean_only/MESO_025_63L/MOM_parameter_doc.short index f4fa4a02d4..0917ef98df 100644 --- a/ocean_only/MESO_025_63L/MOM_parameter_doc.short +++ b/ocean_only/MESO_025_63L/MOM_parameter_doc.short @@ -93,13 +93,13 @@ TOPO_FILE = "MESO_025_63L_topog.nc" ! default = "topog.nc" ! The file from which the bathymetry is read. TOPO_VARNAME = "depth_t" ! default = "depth" ! The name of the bathymetry variable in TOPO_FILE. -MAXIMUM_DEPTH = 5500.0 ! [m] - ! The maximum depth of the ocean. MINIMUM_DEPTH = 15.0 ! [m] default = 0.0 ! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is ! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is ! specified, then all depths shallower than MINIMUM_DEPTH but deeper than ! MASKING_DEPTH are rounded to MINIMUM_DEPTH. +MAXIMUM_DEPTH = 5500.0 ! [m] + ! The maximum depth of the ocean. ! === module MOM_verticalGrid === ! Parameters providing information about the vertical grid. diff --git a/ocean_only/Phillips_2layer/MOM_parameter_doc.all b/ocean_only/Phillips_2layer/MOM_parameter_doc.all index 5392be0c05..d1eb552694 100644 --- a/ocean_only/Phillips_2layer/MOM_parameter_doc.all +++ b/ocean_only/Phillips_2layer/MOM_parameter_doc.all @@ -292,6 +292,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all index 8ff417c12b..7115533963 100644 --- a/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/SCM_idealized_hurricane/MOM_parameter_doc.all @@ -338,6 +338,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all index 62a4fd6f04..a7486f0d18 100644 --- a/ocean_only/adjustment2d/layer/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/layer/MOM_parameter_doc.all @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all index c5fe9b058d..3db2899713 100644 --- a/ocean_only/adjustment2d/rho/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/rho/MOM_parameter_doc.all @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/adjustment2d/z/MOM_parameter_doc.all b/ocean_only/adjustment2d/z/MOM_parameter_doc.all index 2a9090eac4..43ae47d9a6 100644 --- a/ocean_only/adjustment2d/z/MOM_parameter_doc.all +++ b/ocean_only/adjustment2d/z/MOM_parameter_doc.all @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/benchmark/MOM_parameter_doc.all b/ocean_only/benchmark/MOM_parameter_doc.all index 8d4e9d25cb..a8f045e138 100644 --- a/ocean_only/benchmark/MOM_parameter_doc.all +++ b/ocean_only/benchmark/MOM_parameter_doc.all @@ -336,6 +336,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/buoy_forced_basin/MOM_parameter_doc.all b/ocean_only/buoy_forced_basin/MOM_parameter_doc.all index cf34abf6f0..1cdf05adf4 100644 --- a/ocean_only/buoy_forced_basin/MOM_parameter_doc.all +++ b/ocean_only/buoy_forced_basin/MOM_parameter_doc.all @@ -216,7 +216,7 @@ OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 ! The number of open boundary segments. 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. + ! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH CHANNEL_CONFIG = "none" ! default = "none" ! A parameter that determines which set of channels are ! restricted to specific widths. Options are: @@ -296,6 +296,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. @@ -305,6 +307,8 @@ USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. USE_DYED_OBC_TRACER = False ! [Boolean] default = False ! If true, use the dyed_obc_tracer tracer package. +USE_NW2_TRACERS = False ! [Boolean] default = False + ! If true, use the NeverWorld2 tracers. ! === module MOM_grid === ! Parameters providing information about the lateral grid. @@ -390,6 +394,8 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False ! If true, cuts way the top of the column for initial conditions at the depth ! where the hydrostatic pressure matches the imposed surface pressure which is ! read from file. +ODA_INCUPD = False ! [Boolean] default = False + ! If true, oda incremental updates will be applied everywhere in the domain. SPONGE = True ! [Boolean] default = False ! If true, sponges may be applied anywhere in the domain. The exact location and ! properties of those sponges are specified via SPONGE_CONFIG. diff --git a/ocean_only/circle_obcs/MOM_parameter_doc.all b/ocean_only/circle_obcs/MOM_parameter_doc.all index c3ba162850..8150f723b8 100644 --- a/ocean_only/circle_obcs/MOM_parameter_doc.all +++ b/ocean_only/circle_obcs/MOM_parameter_doc.all @@ -361,6 +361,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/double_gyre/MOM_parameter_doc.all b/ocean_only/double_gyre/MOM_parameter_doc.all index 40fdff1713..7988368a07 100644 --- a/ocean_only/double_gyre/MOM_parameter_doc.all +++ b/ocean_only/double_gyre/MOM_parameter_doc.all @@ -285,6 +285,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/external_gwave/MOM_parameter_doc.all b/ocean_only/external_gwave/MOM_parameter_doc.all index a2be77d182..21c57cbb4d 100644 --- a/ocean_only/external_gwave/MOM_parameter_doc.all +++ b/ocean_only/external_gwave/MOM_parameter_doc.all @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all index 069a0e4297..4b233c8e49 100644 --- a/ocean_only/flow_downslope/layer/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/layer/MOM_parameter_doc.all @@ -352,6 +352,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all index b5c2dd0f68..338ba86620 100644 --- a/ocean_only/flow_downslope/rho/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/rho/MOM_parameter_doc.all @@ -352,6 +352,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all index 0e0dee97db..a0ad2e0c24 100644 --- a/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/sigma/MOM_parameter_doc.all @@ -352,6 +352,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/flow_downslope/z/MOM_parameter_doc.all b/ocean_only/flow_downslope/z/MOM_parameter_doc.all index 83fc242739..2f02a838a3 100644 --- a/ocean_only/flow_downslope/z/MOM_parameter_doc.all +++ b/ocean_only/flow_downslope/z/MOM_parameter_doc.all @@ -352,6 +352,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/global/MOM_parameter_doc.all b/ocean_only/global/MOM_parameter_doc.all index 7527b88008..11fa2551b0 100644 --- a/ocean_only/global/MOM_parameter_doc.all +++ b/ocean_only/global/MOM_parameter_doc.all @@ -211,22 +211,22 @@ TOPO_EDITS_FILE = "" ! default = "" ! The file from which to read a list of i,j,z topography overrides. ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False ! If true, allow topography overrides to change land mask. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 ! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is ! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is ! specified, then all depths shallower than MINIMUM_DEPTH but deeper than ! MASKING_DEPTH are rounded to MINIMUM_DEPTH. +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 needs to be smaller than MINIMUM_DEPTH +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. ! === module MOM_open_boundary === ! 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. -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. CHANNEL_CONFIG = "global_1deg" ! default = "none" ! A parameter that determines which set of channels are ! restricted to specific widths. Options are: @@ -327,6 +327,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. @@ -336,6 +338,8 @@ USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. USE_DYED_OBC_TRACER = False ! [Boolean] default = False ! If true, use the dyed_obc_tracer tracer package. +USE_NW2_TRACERS = False ! [Boolean] default = False + ! If true, use the NeverWorld2 tracers. ! === module ideal_age_example === DO_IDEAL_AGE = True ! [Boolean] default = True @@ -476,6 +480,8 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False ! If true, cuts way the top of the column for initial conditions at the depth ! where the hydrostatic pressure matches the imposed surface pressure which is ! read from file. +ODA_INCUPD = False ! [Boolean] default = False + ! If true, oda incremental updates will be applied everywhere in the domain. SPONGE = False ! [Boolean] default = False ! If true, sponges may be applied anywhere in the domain. The exact location and ! properties of those sponges are specified via SPONGE_CONFIG. @@ -607,6 +613,9 @@ MEKE_VISCOSITY_COEFF_AU = 0.0 ! [nondim] default = 0.0 MEKE_FIXED_MIXING_LENGTH = 0.0 ! [m] default = 0.0 ! If positive, is a fixed length contribution to the expression for mixing ! length used in MEKE-derived diffusivity. +MEKE_FIXED_TOTAL_DEPTH = True ! [Boolean] default = True + ! If true, use the nominal bathymetric depth as the estimate of the time-varying + ! ocean depth. Otherwise base the depth on the total ocean massper unit area. MEKE_ALPHA_DEFORM = 0.0 ! [nondim] default = 0.0 ! If positive, is a coefficient weighting the deformation scale in the ! expression for mixing length used in MEKE-derived diffusivity. diff --git a/ocean_only/global/MOM_parameter_doc.short b/ocean_only/global/MOM_parameter_doc.short index 51d3c966d7..4fc8f9251e 100644 --- a/ocean_only/global/MOM_parameter_doc.short +++ b/ocean_only/global/MOM_parameter_doc.short @@ -91,13 +91,13 @@ TOPO_CONFIG = "file" ! ! Phillips - ACC-like idealized topography used in the Phillips config. ! dense - Denmark Strait-like dense water formation and overflow. ! USER - call a user modified routine. -MAXIMUM_DEPTH = 6000.0 ! [m] - ! The maximum depth of the ocean. MINIMUM_DEPTH = 0.5 ! [m] default = 0.0 ! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is ! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is ! specified, then all depths shallower than MINIMUM_DEPTH but deeper than ! MASKING_DEPTH are rounded to MINIMUM_DEPTH. +MAXIMUM_DEPTH = 6000.0 ! [m] + ! The maximum depth of the ocean. CHANNEL_CONFIG = "global_1deg" ! default = "none" ! A parameter that determines which set of channels are ! restricted to specific widths. Options are: diff --git a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all index 267d8e906e..0046b1404e 100644 --- a/ocean_only/global_ALE/hycom/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/hycom/MOM_parameter_doc.all @@ -345,6 +345,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/global_ALE/layer/MOM_parameter_doc.all b/ocean_only/global_ALE/layer/MOM_parameter_doc.all index 6b085eca98..a04aa1bd62 100644 --- a/ocean_only/global_ALE/layer/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/layer/MOM_parameter_doc.all @@ -342,6 +342,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/global_ALE/z/MOM_parameter_doc.all b/ocean_only/global_ALE/z/MOM_parameter_doc.all index 06e616302b..4726f993dc 100644 --- a/ocean_only/global_ALE/z/MOM_parameter_doc.all +++ b/ocean_only/global_ALE/z/MOM_parameter_doc.all @@ -345,6 +345,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/idealized_hurricane/MOM_parameter_doc.all b/ocean_only/idealized_hurricane/MOM_parameter_doc.all index 80c68a518b..56c53a06ea 100644 --- a/ocean_only/idealized_hurricane/MOM_parameter_doc.all +++ b/ocean_only/idealized_hurricane/MOM_parameter_doc.all @@ -228,7 +228,7 @@ OBC_NUMBER_OF_SEGMENTS = 0 ! default = 0 ! The number of open boundary segments. 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. + ! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH CHANNEL_CONFIG = "none" ! default = "none" ! A parameter that determines which set of channels are ! restricted to specific widths. Options are: @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. @@ -350,6 +352,8 @@ USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. USE_DYED_OBC_TRACER = False ! [Boolean] default = False ! If true, use the dyed_obc_tracer tracer package. +USE_NW2_TRACERS = False ! [Boolean] default = False + ! If true, use the NeverWorld2 tracers. ! === module MOM_grid === ! Parameters providing information about the lateral grid. @@ -552,6 +556,8 @@ REGRID_ACCELERATE_INIT = False ! [Boolean] default = False ! If true, runs REGRID_ACCELERATE_ITERATIONS iterations of the regridding ! algorithm to push the initial grid to be consistent with the initial ! condition. Useful only for state-based and iterative coordinates. +ODA_INCUPD = False ! [Boolean] default = False + ! If true, oda incremental updates will be applied everywhere in the domain. SPONGE = False ! [Boolean] default = False ! If true, sponges may be applied anywhere in the domain. The exact location and ! properties of those sponges are specified via SPONGE_CONFIG. diff --git a/ocean_only/lock_exchange/MOM_parameter_doc.all b/ocean_only/lock_exchange/MOM_parameter_doc.all index 0fca2c1a1b..e794bd3e87 100644 --- a/ocean_only/lock_exchange/MOM_parameter_doc.all +++ b/ocean_only/lock_exchange/MOM_parameter_doc.all @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. 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 1d13f5ee97..f3878bb29e 100644 --- a/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all +++ b/ocean_only/mixed_layer_restrat_2d/MOM_parameter_doc.all @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/nonBous_global/MOM_parameter_doc.all b/ocean_only/nonBous_global/MOM_parameter_doc.all index 4d98a16ba3..568a4b4df8 100644 --- a/ocean_only/nonBous_global/MOM_parameter_doc.all +++ b/ocean_only/nonBous_global/MOM_parameter_doc.all @@ -328,6 +328,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/resting/layer/MOM_parameter_doc.all b/ocean_only/resting/layer/MOM_parameter_doc.all index 4694c0912e..399ca67211 100644 --- a/ocean_only/resting/layer/MOM_parameter_doc.all +++ b/ocean_only/resting/layer/MOM_parameter_doc.all @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/resting/z/MOM_parameter_doc.all b/ocean_only/resting/z/MOM_parameter_doc.all index c17a7fd65f..1680c8d288 100644 --- a/ocean_only/resting/z/MOM_parameter_doc.all +++ b/ocean_only/resting/z/MOM_parameter_doc.all @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/seamount/layer/MOM_parameter_doc.all b/ocean_only/seamount/layer/MOM_parameter_doc.all index 96aaa22a22..ef0fc15c3a 100644 --- a/ocean_only/seamount/layer/MOM_parameter_doc.all +++ b/ocean_only/seamount/layer/MOM_parameter_doc.all @@ -352,6 +352,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/seamount/rho/MOM_parameter_doc.all b/ocean_only/seamount/rho/MOM_parameter_doc.all index 0dd0fd75d1..80fef80e43 100644 --- a/ocean_only/seamount/rho/MOM_parameter_doc.all +++ b/ocean_only/seamount/rho/MOM_parameter_doc.all @@ -352,6 +352,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/seamount/sigma/MOM_parameter_doc.all b/ocean_only/seamount/sigma/MOM_parameter_doc.all index eb545902da..7b30a47bf3 100644 --- a/ocean_only/seamount/sigma/MOM_parameter_doc.all +++ b/ocean_only/seamount/sigma/MOM_parameter_doc.all @@ -352,6 +352,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/seamount/z/MOM_parameter_doc.all b/ocean_only/seamount/z/MOM_parameter_doc.all index 8ae91cc740..740c3f7e53 100644 --- a/ocean_only/seamount/z/MOM_parameter_doc.all +++ b/ocean_only/seamount/z/MOM_parameter_doc.all @@ -352,6 +352,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/single_column/BML/MOM_parameter_doc.all b/ocean_only/single_column/BML/MOM_parameter_doc.all index 761d28571d..adcafcac50 100644 --- a/ocean_only/single_column/BML/MOM_parameter_doc.all +++ b/ocean_only/single_column/BML/MOM_parameter_doc.all @@ -327,6 +327,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/single_column/EPBL/MOM_parameter_doc.all b/ocean_only/single_column/EPBL/MOM_parameter_doc.all index cda64ccb36..b7c18aaac7 100644 --- a/ocean_only/single_column/EPBL/MOM_parameter_doc.all +++ b/ocean_only/single_column/EPBL/MOM_parameter_doc.all @@ -330,6 +330,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/single_column/KPP/MOM_parameter_doc.all b/ocean_only/single_column/KPP/MOM_parameter_doc.all index 0dc6553cf1..1ab3a14067 100644 --- a/ocean_only/single_column/KPP/MOM_parameter_doc.all +++ b/ocean_only/single_column/KPP/MOM_parameter_doc.all @@ -330,6 +330,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/sloshing/layer/MOM_parameter_doc.all b/ocean_only/sloshing/layer/MOM_parameter_doc.all index 469cedde3c..7346e232c5 100644 --- a/ocean_only/sloshing/layer/MOM_parameter_doc.all +++ b/ocean_only/sloshing/layer/MOM_parameter_doc.all @@ -344,6 +344,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/sloshing/rho/MOM_parameter_doc.all b/ocean_only/sloshing/rho/MOM_parameter_doc.all index 6a969131c3..80ee23c710 100644 --- a/ocean_only/sloshing/rho/MOM_parameter_doc.all +++ b/ocean_only/sloshing/rho/MOM_parameter_doc.all @@ -344,6 +344,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/sloshing/z/MOM_parameter_doc.all b/ocean_only/sloshing/z/MOM_parameter_doc.all index d2ae31fd89..5143434345 100644 --- a/ocean_only/sloshing/z/MOM_parameter_doc.all +++ b/ocean_only/sloshing/z/MOM_parameter_doc.all @@ -344,6 +344,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/tides_025/MOM_parameter_doc.all b/ocean_only/tides_025/MOM_parameter_doc.all index be6c768113..282e423e73 100644 --- a/ocean_only/tides_025/MOM_parameter_doc.all +++ b/ocean_only/tides_025/MOM_parameter_doc.all @@ -207,22 +207,22 @@ TOPO_EDITS_FILE = "All_edits.nc" ! default = "" ! The file from which to read a list of i,j,z topography overrides. ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False ! If true, allow topography overrides to change land mask. -MAXIMUM_DEPTH = 6500.0 ! [m] - ! The maximum depth of the ocean. MINIMUM_DEPTH = 9.5 ! [m] default = 0.0 ! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is ! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is ! specified, then all depths shallower than MINIMUM_DEPTH but deeper than ! MASKING_DEPTH are rounded to MINIMUM_DEPTH. +MASKING_DEPTH = 0.0 ! [m] default = -9999.0 + ! The depth below which to mask points as land points, for which all fluxes are + ! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH +MAXIMUM_DEPTH = 6500.0 ! [m] + ! The maximum depth of the ocean. ! === module MOM_open_boundary === ! 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. -MASKING_DEPTH = 0.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. CHANNEL_CONFIG = "list" ! default = "none" ! A parameter that determines which set of channels are ! restricted to specific widths. Options are: @@ -311,6 +311,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. @@ -320,6 +322,8 @@ USE_BOUNDARY_IMPULSE_TRACER = False ! [Boolean] default = False ! If true, use the boundary impulse tracer. USE_DYED_OBC_TRACER = False ! [Boolean] default = False ! If true, use the dyed_obc_tracer tracer package. +USE_NW2_TRACERS = False ! [Boolean] default = False + ! If true, use the NeverWorld2 tracers. ! === module MOM_grid === ! Parameters providing information about the lateral grid. @@ -409,6 +413,8 @@ TRIM_IC_FOR_P_SURF = False ! [Boolean] default = False ! If true, cuts way the top of the column for initial conditions at the depth ! where the hydrostatic pressure matches the imposed surface pressure which is ! read from file. +ODA_INCUPD = False ! [Boolean] default = False + ! If true, oda incremental updates will be applied everywhere in the domain. SPONGE = False ! [Boolean] default = False ! If true, sponges may be applied anywhere in the domain. The exact location and ! properties of those sponges are specified via SPONGE_CONFIG. diff --git a/ocean_only/tides_025/MOM_parameter_doc.short b/ocean_only/tides_025/MOM_parameter_doc.short index 9d2cf67ccd..c4ed1d555f 100644 --- a/ocean_only/tides_025/MOM_parameter_doc.short +++ b/ocean_only/tides_025/MOM_parameter_doc.short @@ -86,8 +86,6 @@ TOPO_FILE = "ocean_topog.nc" ! default = "topog.nc" ! The file from which the bathymetry is read. TOPO_EDITS_FILE = "All_edits.nc" ! default = "" ! The file from which to read a list of i,j,z topography overrides. -MAXIMUM_DEPTH = 6500.0 ! [m] - ! The maximum depth of the ocean. MINIMUM_DEPTH = 9.5 ! [m] default = 0.0 ! If MASKING_DEPTH is unspecified, then anything shallower than MINIMUM_DEPTH is ! assumed to be land and all fluxes are masked out. If MASKING_DEPTH is @@ -95,7 +93,9 @@ MINIMUM_DEPTH = 9.5 ! [m] default = 0.0 ! MASKING_DEPTH are rounded to MINIMUM_DEPTH. MASKING_DEPTH = 0.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. + ! zeroed out. MASKING_DEPTH needs to be smaller than MINIMUM_DEPTH +MAXIMUM_DEPTH = 6500.0 ! [m] + ! The maximum depth of the ocean. CHANNEL_CONFIG = "list" ! default = "none" ! A parameter that determines which set of channels are ! restricted to specific widths. Options are: diff --git a/ocean_only/torus_advection_test/MOM_parameter_doc.all b/ocean_only/torus_advection_test/MOM_parameter_doc.all index bef646815d..631941ce43 100644 --- a/ocean_only/torus_advection_test/MOM_parameter_doc.all +++ b/ocean_only/torus_advection_test/MOM_parameter_doc.all @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = True ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all index 5dad7a7c66..f5526fa7fc 100644 --- a/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/rho/MOM_parameter_doc.all @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all index 5ef3989c27..4ee0eef5ad 100644 --- a/ocean_only/tracer_mixing/z/MOM_parameter_doc.all +++ b/ocean_only/tracer_mixing/z/MOM_parameter_doc.all @@ -341,6 +341,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/ocean_only/unit_tests/MOM_parameter_doc.all b/ocean_only/unit_tests/MOM_parameter_doc.all index 46e0f712e3..307b00a44f 100644 --- a/ocean_only/unit_tests/MOM_parameter_doc.all +++ b/ocean_only/unit_tests/MOM_parameter_doc.all @@ -285,6 +285,8 @@ USE_ADVECTION_TEST_TRACER = False ! [Boolean] default = False ! If true, use the advection_test_tracer tracer package. USE_OCMIP2_CFC = False ! [Boolean] default = False ! If true, use the MOM_OCMIP2_CFC tracer package. +USE_CFC_CAP = False ! [Boolean] default = False + ! If true, use the MOM_CFC_cap tracer package. USE_generic_tracer = False ! [Boolean] default = False ! If true and _USE_GENERIC_TRACER is defined as a preprocessor macro, use the ! MOM_generic_tracer packages. diff --git a/src/MOM6 b/src/MOM6 index ebd03935e4..233f982c23 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit ebd03935e405f573867daeb0e7c5e70ec3d38990 +Subproject commit 233f982c23e91e0b211b57c43e69a62bf7f0e4fa