dev/master candidate 2017-11-19#194
Merged
Merged
Conversation
Changed the branch of FMS to the updated version of coupler_type_reform_rwh, which has some additional minor changes to the coupler type compared with the previous version on this branch. All answers are bitwise identical, but there are changes that will be required for a version of SIS2 that will soon be checked onto dev/gfdl.
- mlotst (MLD_003) monthly/annual min/max have been added to diag_table for OM4_025 and OM4_05. - Closes #145
Made a series of 4 separate corrections to calculations at open boundary points to avoid any dependencies on the values of thicknesses outside of the domain: - Corrected the calculation of the baroclinic pressure anomaly-driven accelerations due to deflections of the free surface in open boundary conditions at the end of the barotropic stepping. - Corrected the setup of the BT_cont_type at open boundary condition points. - Corrected the calculation of face-areas at open boundary condition points for finding vertically averaged accelerations. - Corrected the calculation of the averaged normal velocities in the bottom boundary layer at open boundary condition points. Each of these code changes do change answers in test cases with some types of open boundary conditions, and the reference solutions for circle_OBCs have been updated for the combination of these 4 updates. MOM6 commit NOAA-GFDL/MOM6@993ad0f
Relocated the calls to MOM_initalize_fixed and call_OBC_register earlier in initialize_MOM, so that the tracer registration calls can (in a future commit) include setup related to OBC tracer fluxes. All answers are bitwise identical, but the order of entries in every MOM_parameter_doc file changes, and new versions of these files have been added. MOM6 commit Hallberg-NOAA/MOM6@4f654e8
- NOAA-GFDL/MOM6@365356c Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl - NOAA-GFDL/MOM6@dac96f4 Added chksum calls around radiation_open_bdry_conds - NOAA-GFDL/MOM6@b3247d9 Removed trailing white space
- In the last merge, a version of FMS was pointed to that is not visible on GitHub. This happened because the merge was made from an active development branch which appears to be far ahead of, or incompatible with, the main branches. Merge requests are best made from feature branches which contain only the relevant changes and are based from the head of a main branch. - The last merge broke everything so I am fixing this without waiting for the review process.
…OM6-examples into Hallberg-NOAA-reorder_MOM_init
- I've updated ocean_only/tracer_mixing and ocean_only/unit_tests during the merge because they were missed in branch.
- NOAA-GFDL/SIS2@d57d276 Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl - NOAA-GFDL/SIS2@6995ce7 Merge pull request #1 from Hallberg-NOAA/coupler_type_reform_rwh - NOAA-GFDL/SIS2@725d709 (*)Save gas fluxes to restarts with concurrent ice - NOAA-GFDL/SIS2@9020bf1 +Added optional gas_flux args to ice_model_init - NOAA-GFDL/SIS2@e2497e6 +Complete reformulation of SIS2 tracer fluxes - NOAA-GFDL/SIS2@3209acc +Use new coupler_type routines in the SIS2 code
- NOAA-GFDL/icebergs@6595cdd Update license to LGPLv3
- Commit NOAA-GFDL/MOM6@f2c7634 updated documentation files. - NOAA-GFDL/MOM6@e153f79 Merge pull request #585 from NOAA-GFDL/split_MOM_forcing_type - NOAA-GFDL/MOM6@81fa515 Merge pull request #584 from ashao/return_tracer_diabatic - NOAA-GFDL/MOM6@aa45edc Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into split_MOM_forcing_type - NOAA-GFDL/MOM6@eb4134b Relocated calls to set_derived_forcing_fields - NOAA-GFDL/MOM6@f2c7634 +Added mech_forcing type structure - NOAA-GFDL/MOM6@d8f52da Bugfix when using passive tracers with diabatic driver but no fluxes
Changed version of the barotropic splitting used by the CM2G63L test case to move to the modern version used by all other test cases and open the way to obsolete USE_LEGACY_SPLIT and related parameters. This deliberate change of settings changes the answers and MOM_parameter_doc files for CM2G63L.
- 5ea0080 updated MOM_input and generated files but a diff between MOM_input and MOM_parameter_doc.short (which should only reveal the boiler plate at the top of the file) showed that MOM_input was very out of date. I've updated MOM_input to reflect the latest documentation/order so that the diff is minimal. - IO_LAYOUT had been changed but MOM_parameter_doc.layout was not updated - now corrected.
Removed the option to use the very old GOLD algorithm for the barotropic solver. Also removed the modules MOM_dynamics_legacy_split and MOM_legacy_barotropic This change was required to simplify the introduction of new interfaces that clearly separate the dynamics, tracer advection and thermodynamics update phases of the algorithm. Because there are no longer any test cases that have USE_LEGACY_SPLIT=True, all answers are bitwise identical, but the MOM_parameter_doc.all files for all test cases with dynamics change. Also updated the versions of FMS and SIS2, but these are minor changes. MOM6 commit NOAA-GFDL/MOM6@baed1fa
- Commit 3d01bfb missed tracer_mixing/rho and /z .
- Commit 3d01bfb incorrectly updated the versions of SIS2 and FMS. This happened because the feature branch "obsolete_legacy_split" was made on top of a commit that had this different versions.
Dev/master
…son-GFDL/MOM6-examples into MJHarrison-GFDL-user/mjh/FMS_for_sponges
- Since we have explicitly square of requested variables (e.g. tossq) we do not need to also write out the _pow2 version. There seems to be something wrong with the _pow2 diagnostics anyway, which @StephenGriffies has reported to FMS. - Close #158.
- Commit 3a04ca3 updates MOM_parameter_doc.all files with new default value for DIAG_MISVAL. - NOAA-GFDL/MOM6@3a04ca3 Merge pull request #594 from adcroft/cmor_missing_value - NOAA-GFDL/MOM6@2109349 Merge pull request #592 from adcroft/mask_areacello - NOAA-GFDL/MOM6@c175587 Changed default missing value - NOAA-GFDL/MOM6@0dc506a Mask areacello in diagnostics - NOAA-GFDL/MOM6@5249bbb Removed debugging added in PR #586 - NOAA-GFDL/MOM6@9d1b04f Merge pull request #586 from MJHarrison-GFDL/new_ALE_sponges - NOAA-GFDL/MOM6@3a7bf08 remove trailing whitespace - NOAA-GFDL/MOM6@9465031 fix to retain previous answers - NOAA-GFDL/MOM6@38f588b updates for off-grid/time-varying sponges - NOAA-GFDL/MOM6@6bd2d98 Updates in support of ALE sponges from files - NOAA-GFDL/MOM6@27289eb Updates for ALE sponges
- NOAA-GFDL/MOM6@b51eb51 Merge pull request #593 from adcroft/fix_cell_measures - NOAA-GFDL/MOM6@acf846b Restore cell measures for dynamic variables
- Updates available diagnostics - Also update OM4 diag_table - NOAA-GFDL/MOM6@03308f3 Merge pull request #595 from adcroft/add_static_cell_measures - NOAA-GFDL/MOM6@1547ece Adds cell methods to static variables
- Number of layers were wrong in rho-space - Bad values were appearing at depth in z-space - NOAA-GFDL/MOM6@a3acfed Merge pull request #642 from adcroft/fix-rho-coord-diagnostics - NOAA-GFDL/MOM6@abda61d Use correct number of layers in diagnostic rho coordinates - NOAA-GFDL/MOM6@6e11928 Adds a non-iterative form of build_rho_column() - NOAA-GFDL/MOM6@d2a2b8c Re-factored build_rho_column() - NOAA-GFDL/MOM6@5d8111a Set defaults in coord_rho.F90 - NOAA-GFDL/MOM6@2d7fc4c Merge pull request #640 from adcroft/fix-masked-diagnostics - NOAA-GFDL/MOM6@6a46f62 Turn off safety checks in MOM_diag_mediator.F90 - NOAA-GFDL/MOM6@ae47696 No longer set array values to missing_value - NOAA-GFDL/MOM6@6555ecc Removed masks from diag_type - NOAA-GFDL/MOM6@7c5219b Create and use masks in diagnostic axes groups - NOAA-GFDL/MOM6@2f2b6e4 Removed dummy missing_value from diag_masks_set()
- introduced source variable checking
- output file is only written if at least
one refineDiag variable is generated
- removed trailing whitespace
More robust refineDiag scripts
- replaced do_msftyrho_out with do_msftyrho
Fixed typo in refineDiag_ocean_month_rho2.py
Updated cmocean module import
Updated the version of MOM6 to the latest in dev/gfdl, which includes some changes to the entries for frazil-related variables in several available_diags files. All answers are bitwise identical.
Switched to the version of the MOM6 that offers a geometric progression of times to save the ocean model statistics, including the new run-time parameter ENERGYSAVEDAYS_GEOMETRIC, which is now logged in the MOM_parameter_doc.all files for the coupled configurations. All solutions are bitwise identical. MOM6 commit NOAA-GFDL/MOM6@b30cc48
Added new diagnostics of the ocean heat capacity and reference density that can be output via the diag_manager. This changes the available_diags files, but all answers are bitwise identical. MOM6 commit NOAA-GFDL/MOM6@e30c9a0
Made a series of 4 commits to help support the use of MOM6 in idealized non-Boussinesq barotropic tide simulations. All answers in existing test cases are identical, but each of these 4 commits introduces changes to the MOM_parameter_doc files. MOM6 commit Hallberg-NOAA/MOM6@b509561
Made a series of 4 commits to help support the use of MOM6 in idealized non-Boussinesq barotropic tide simulations, plus one follow up to correct trailing white space. All answers in existing test cases are identical, but each of these 4 commits introduces changes to the MOM_parameter_doc files. MOM6 commit Hallberg-NOAA/MOM6@87aeb27
Bringing script fixes for OM4/CM4 into dev/gfdl
…examples into Hallberg-NOAA-tide_support
- Analysis script set to check for daily
and now monthly pp output
CMIP6 analysis updates
- Last merge updated MOM_parameter_doc.all for OBC experiments - NOAA-GFDL/MOM6@0c5347f Merge branch 'ESMG-user/ksh/open_bc' into dev/gfdl - NOAA-GFDL/MOM6@8100c20 Merge branch 'user/ksh/open_bc' of https://github.com/ESMG/MOM6 into ESMG-user/ksh/open_bc - NOAA-GFDL/MOM6@7e928b7 Setting stencil=2 causes trouble in ESMG seamount. - NOAA-GFDL/MOM6@3076ad2 Merge pull request #649 from NOAA-GFDL/OM4-maintenance - NOAA-GFDL/MOM6@03a7d4f Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6@276a372 Merge branch 'ashao-alt_T_S_for_remapping' into dev/gfdl - NOAA-GFDL/MOM6@f8a870d Merge branch 'alt_T_S_for_remapping' of https://github.com/ashao/MOM6 into ashao-alt_T_S_for_remapping - NOAA-GFDL/MOM6@dd72868 Converted outside land masker to use tiles. - NOAA-GFDL/MOM6@2e56f78 *Add stencil=2 to MOM_barotropic for Flather. - NOAA-GFDL/MOM6@8ea301c Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6@30ba8e2 Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6@8785a87 Failed Travis check with OOB because T/S may not be associated - NOAA-GFDL/MOM6@a0e6e30 Override T and S for remapped transport diagnostics - NOAA-GFDL/MOM6@a3acfed Merge pull request #642 from adcroft/fix-rho-coord-diagnostics - NOAA-GFDL/MOM6@abda61d Use correct number of layers in diagnostic rho coordinates - NOAA-GFDL/MOM6@6e11928 Adds a non-iterative form of build_rho_column() - NOAA-GFDL/MOM6@d2a2b8c Re-factored build_rho_column() - NOAA-GFDL/MOM6@5d8111a Set defaults in coord_rho.F90 - NOAA-GFDL/MOM6@2d7fc4c Merge pull request #640 from adcroft/fix-masked-diagnostics - NOAA-GFDL/MOM6@6a46f62 Turn off safety checks in MOM_diag_mediator.F90 - NOAA-GFDL/MOM6@ae47696 No longer set array values to missing_value - NOAA-GFDL/MOM6@6555ecc Removed masks from diag_type - NOAA-GFDL/MOM6@7c5219b Create and use masks in diagnostic axes groups - NOAA-GFDL/MOM6@2f2b6e4 Removed dummy missing_value from diag_masks_set() - NOAA-GFDL/MOM6@0a61469 Clean up weirdness that failed in static build. - NOAA-GFDL/MOM6@329c8bc *Masking of tangengial velocity outside OBCs. - NOAA-GFDL/MOM6@5991c83 Removed masking of areas in ocean_static.nc - NOAA-GFDL/MOM6@917dae6 Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc - NOAA-GFDL/MOM6@f9f50d5 travis_wait has been deemed a fail. - NOAA-GFDL/MOM6@14f9a05 Can depend on outside land masking for Kelvin wave. - NOAA-GFDL/MOM6@842fffe Added a travis_wait to running tests. - NOAA-GFDL/MOM6@beb2e54 *Adding a MASK_OUTSIDE_OBCS option.
Made several changes to MOM6 that change the MOM_parameter_doc.all files and the available_diags files, including obsoleting MASK_MASSLESS_TRACERS and relocating various predia and preale diagnostics into the respective subroutines which changes the order of entries in the available diags files. All answers are bitwise identical, but the MOM_parameter_doc.all and available_diags files have changed. MOM6 commit Hallberg-NOAA/MOM6@653f770
Added a new test case to do a global 1- or 2-layer ocean-only run with tides.
- This release of FMS incorporates everything that was on the branch coupler_types_reform_rwh which was what we were pointing to. It also includes other fixes need for upcoming commits for src/MOM6.
…AA/MOM6-examples into Hallberg-NOAA-restructure_step_MOM
No output/answer changes implied but this brings src/MOM6 up to date with head of dev/gfdl in order to submit consistent PR to dev/master. - NOAA-GFDL/MOM6@bdcac96 Merge pull request #655 from ashao/add_ALE_enable_averaging - NOAA-GFDL/MOM6@41b09ba Add enable averaging before ALE routines - NOAA-GFDL/MOM6@20d206a Merge pull request #651 from adcroft/fix-intent-in-coupler-types - NOAA-GFDL/MOM6@baad349 Fixes the intent of argument updated by data_override
Fixing mismatch in branch histories
- NOAA-GFDL/mkmf@309d50d Better fix for symlinks - NOAA-GFDL/mkmf@8895cac list_paths now finds symlinks as well
Hallberg-NOAA
added a commit
that referenced
this pull request
Sep 15, 2021
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
marshallward
added a commit
that referenced
this pull request
Sep 8, 2022
- NOAA-GFDL/MOM6@a490004b1 Corrected doxygen comments for interface filter - NOAA-GFDL/MOM6@0e4cda9a6 +Add an interface filtering capability - NOAA-GFDL/MOM6@575595a99 Report error logs from codecov upload fail - NOAA-GFDL/MOM6@1c85a00ff +Fix nudged OBCs for tracers (#194) New parameter: - APPLY_INTERFACE_FILTER = False Modified parameter descriptor: - THICKNESSDIFFUSE_FIRST
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
These are the corresponding configuration updates that match MOM6 PR NOAA-GFDL/MOM6#656.