diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 5cd5f91baa..1f5a64ac56 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -31,14 +31,7 @@ jobs: - name: Run (single processor) unit tests run: make run.unit - - name: Report unit test coverage to CI (PR) - if: github.event_name == 'pull_request' - run: make report.cov.unit REQUIRE_COVERAGE_UPLOAD=true - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - - name: Report unit test coverage to CI (Push) - if: github.event_name != 'pull_request' + - name: Report unit test coverage to CI run: make report.cov.unit env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} @@ -49,14 +42,7 @@ jobs: - name: Run coverage tests run: make -j -k run.cov - - name: Report coverage to CI (PR) - if: github.event_name == 'pull_request' - run: make report.cov REQUIRE_COVERAGE_UPLOAD=true - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} - - - name: Report coverage to CI (Push) - if: github.event_name != 'pull_request' + - name: Report coverage to CI run: make report.cov env: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} diff --git a/src/core/MOM.F90 b/src/core/MOM.F90 index b7f8bd3f66..965d7476ab 100644 --- a/src/core/MOM.F90 +++ b/src/core/MOM.F90 @@ -23,7 +23,7 @@ module MOM use MOM_diag_mediator, only : diag_grid_storage, diag_grid_storage_init use MOM_diag_mediator, only : diag_save_grids, diag_restore_grids use MOM_diag_mediator, only : diag_copy_storage_to_diag, diag_copy_diag_to_storage -use MOM_domains, only : MOM_domains_init +use MOM_domains, only : MOM_domains_init, MOM_domain_type use MOM_domains, only : sum_across_PEs, pass_var, pass_vector use MOM_domains, only : clone_MOM_domain, deallocate_MOM_domain use MOM_domains, only : To_North, To_East, To_South, To_West @@ -2011,9 +2011,11 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, & type(ocean_grid_type), pointer :: G_in => NULL() ! Pointer to the input grid type(hor_index_type), pointer :: HI => NULL() ! A hor_index_type for array extents type(hor_index_type), target :: HI_in ! HI on the input grid + type(hor_index_type) :: HI_in_unmasked ! HI on the unmasked input grid type(verticalGrid_type), pointer :: GV => NULL() type(dyn_horgrid_type), pointer :: dG => NULL(), test_dG => NULL() type(dyn_horgrid_type), pointer :: dG_in => NULL() + type(dyn_horgrid_type), pointer :: dG_unmasked_in => NULL() type(diag_ctrl), pointer :: diag => NULL() type(unit_scale_type), pointer :: US => NULL() type(MOM_restart_CS), pointer :: restart_CSp => NULL() @@ -2113,6 +2115,8 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, & type(vardesc) :: vd_T, vd_S ! Structures describing temperature and salinity variables. type(time_type) :: Start_time type(ocean_internal_state) :: MOM_internal_state + type(MOM_domain_type), pointer :: MOM_dom_unmasked => null() ! Unmasked MOM domain instance + ! (To be used for writing out ocean geometry) CS%Time => Time @@ -2541,10 +2545,10 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, & call MOM_domains_init(G_in%domain, US, param_file, symmetric=symmetric, & static_memory=.true., NIHALO=NIHALO_, NJHALO=NJHALO_, & NIGLOBAL=NIGLOBAL_, NJGLOBAL=NJGLOBAL_, NIPROC=NIPROC_, & - NJPROC=NJPROC_) + NJPROC=NJPROC_, MOM_dom_unmasked=MOM_dom_unmasked) #else call MOM_domains_init(G_in%domain, US, param_file, symmetric=symmetric, & - domain_name="MOM_in") + domain_name="MOM_in", MOM_dom_unmasked=MOM_dom_unmasked) #endif ! Copy input grid (G_in) domain to active grid G @@ -2842,8 +2846,20 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, & ! Write out all of the grid data used by this run. new_sim = determine_is_new_run(dirs%input_filename, dirs%restart_input_dir, G_in, restart_CSp) write_geom_files = ((write_geom==2) .or. ((write_geom==1) .and. new_sim)) - if (write_geom_files) call write_ocean_geometry_file(dG_in, param_file, dirs%output_directory, US=US) - + if (write_geom_files) then + if (associated(MOM_dom_unmasked)) then + call hor_index_init(MOM_dom_unmasked, HI_in_unmasked, param_file, & + local_indexing=.not.global_indexing) + call create_dyn_horgrid(dG_unmasked_in, HI_in_unmasked, bathymetry_at_vel=bathy_at_vel) + call clone_MOM_domain(MOM_dom_unmasked, dG_unmasked_in%Domain) + call MOM_initialize_fixed(dG_unmasked_in, US, OBC_in, param_file, .false., dirs%output_directory) + call write_ocean_geometry_file(dG_unmasked_in, param_file, dirs%output_directory, US=US) + call deallocate_MOM_domain(MOM_dom_unmasked) + call destroy_dyn_horgrid(dG_unmasked_in) + else + call write_ocean_geometry_file(dG_in, param_file, dirs%output_directory, US=US) + endif + endif call destroy_dyn_horgrid(dG_in) ! Initialize dynamically evolving fields, perhaps from restart files. diff --git a/src/framework/MOM_domains.F90 b/src/framework/MOM_domains.F90 index f2c3225025..22226d3b85 100644 --- a/src/framework/MOM_domains.F90 +++ b/src/framework/MOM_domains.F90 @@ -65,7 +65,7 @@ module MOM_domains !! properties of the domain type. subroutine MOM_domains_init(MOM_dom, US, param_file, symmetric, static_memory, & NIHALO, NJHALO, NIGLOBAL, NJGLOBAL, NIPROC, NJPROC, & - min_halo, domain_name, include_name, param_suffix) + min_halo, domain_name, include_name, param_suffix, MOM_dom_unmasked) type(MOM_domain_type), pointer :: MOM_dom !< A pointer to the MOM_domain_type !! being defined here. type(unit_scale_type), pointer :: US !< A dimensional unit scaling type @@ -99,10 +99,13 @@ subroutine MOM_domains_init(MOM_dom, US, param_file, symmetric, static_memory, & !! "MOM_memory.h" if missing. character(len=*), optional, intent(in) :: param_suffix !< A suffix to apply to !! layout-specific parameters. + type(MOM_domain_type), pointer, optional :: MOM_dom_unmasked !< Unmasked MOM domain instance. + !! Set to null if masking is not enabled. ! Local variables integer, dimension(2) :: layout ! The number of logical processors in the i- and j- directions integer, dimension(2) :: auto_layout ! The layout determined by the auto masking routine + integer, dimension(2) :: layout_unmasked ! A temporary layout for unmasked domain integer, dimension(2) :: io_layout ! The layout of logical processors for input and output !$ integer :: ocean_nthreads ! Number of openMP threads !$ logical :: ocean_omp_hyper_thread ! If true use openMP hyper-threads @@ -429,6 +432,16 @@ subroutine MOM_domains_init(MOM_dom, US, param_file, symmetric, static_memory, & "to be the same as the layout.", default=1, layoutParam=.true.) endif + ! Create an unmasked domain if requested. This is used for writing out unmasked ocean geometry. + if (present(MOM_dom_unmasked) .and. mask_table_exists) then + call MOM_define_layout(n_global, PEs_used, layout_unmasked) + call create_MOM_domain(MOM_dom_unmasked, n_global, n_halo, reentrant, tripolar_N, layout_unmasked, & + domain_name=domain_name, symmetric=symmetric, thin_halos=thin_halos, & + nonblocking=nonblocking) + else + MOM_dom_unmasked => null() + endif + call create_MOM_domain(MOM_dom, n_global, n_halo, reentrant, tripolar_N, layout, & io_layout=io_layout, domain_name=domain_name, mask_table=mask_table, & symmetric=symmetric, thin_halos=thin_halos, nonblocking=nonblocking)