NCAR / MOM6

NCAR/CESM fork of the Modular Ocean Model v.6 (MOM6)
Other
2 stars 18 forks source link

Make the US argument to MOM_domains_init optional #272

Closed Hallberg-NOAA closed 3 months ago

Hallberg-NOAA commented 3 months ago

This commit makes the unit_scale_type argument US to MOM_domains_init() and gen_auto_mask_table() optional and moves it to the end of the argument list, so that coupled or ice-ocean models using SIS2 will compile with the proposed updates to the main branch of MOM6 from dev/ncar. Because MOM6 and SIS2 use some common framework code but are managed in separate github repositories, we need to use optional argument to allow a single version of SIS2 to work across changes to MOM6 interfaces. Because the TOPO_CONFIG parameter as used in SIS2 has a default value, there is an alternative call to get_param() for TOPO_CONFIG with a default when MOM_domains_init() is called with a domain_name argument. Also added missing scale arguments to get_param() calls for MINIMUM_DEPTH and MASKING_DEPTH. This commit also adds or corrects units in the comments describing 4 recently added or modified variables. All answers are bitwise identical in any cases that worked before (noting that some cases using SIS2 would not even compile before this fix).

codecov-commenter commented 3 months ago

Codecov Report

Attention: Patch coverage is 30.00000% with 14 lines in your changes are missing coverage. Please review.

Project coverage is 37.40%. Comparing base (13fbeb7) to head (a538cc0).

:exclamation: Current head a538cc0 differs from pull request most recent head de59adf. Consider uploading reports for the commit de59adf to get more accurate results

Files Patch % Lines
src/framework/MOM_domains.F90 25.00% 10 Missing and 2 partials :warning:
src/ice_shelf/MOM_ice_shelf.F90 0.00% 1 Missing :warning:
src/ocean_data_assim/MOM_oda_driver.F90 0.00% 1 Missing :warning:
Additional details and impacted files ```diff @@ Coverage Diff @@ ## dev/ncar-candidate-240319 #272 +/- ## ============================================================= - Coverage 37.40% 37.40% -0.01% ============================================================= Files 270 270 Lines 79908 79914 +6 Branches 14858 14860 +2 ============================================================= + Hits 29893 29894 +1 - Misses 44469 44471 +2 - Partials 5546 5549 +3 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.