refactor: add coupler_generate sfc xgrid (#119)

NOAA-GFDL · Jun 4, 2024 · eda97dd · eda97dd
1 parent afb305e
commit eda97dd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/full/coupler_main.F90 b/full/coupler_main.F90
@@ -495,16 +495,15 @@ program coupler_main
     endif
 
     if (Atm%pe) then
-      if (.NOT.(do_ice .and. Ice%pe) .OR. (ice_npes .NE. atmos_npes)) &
-         call fms_mpp_set_current_pelist(Atm%pelist)
+
+      if (.NOT.(do_ice.and.Ice%pe) .OR. (ice_npes.NE.atmos_npes)) call fms_mpp_set_current_pelist(Atm%pelist)
+
+      if(do_chksum) call atmos_ice_land_chksum('set_ice_surface+', nc, Atm, Land, Ice, &
+                                               Land_ice_atmos_boundary, Atmos_ice_boundary, Atmos_land_boundary)
 
       call fms_mpp_clock_begin(coupler_clocks%atm)
-      if (do_chksum) call atmos_ice_land_chksum('set_ice_surface+', nc, Atm, Land, Ice, &
-                 Land_ice_atmos_boundary, Atmos_ice_boundary, Atmos_land_boundary)
-      call fms_mpp_clock_begin(coupler_clocks%generate_sfc_xgrid)
-      call generate_sfc_xgrid( Land, Ice )
-      call fms_mpp_clock_end(coupler_clocks%generate_sfc_xgrid)
 
+      call coupler_generate_sfc_xgrid(Land, Ice, coupler_clocks)
       call send_ice_mask_sic(Time)
 
       !-----------------------------------------------------------------------

diff --git a/full/full_coupler_mod.F90 b/full/full_coupler_mod.F90
@@ -103,7 +103,7 @@ module full_coupler_mod
   public :: ice_model_fast_cleanup, unpack_land_ice_boundary
   public :: update_ice_model_slow
   public :: update_ocean_model, update_slow_ice_and_ocean
-  public :: sfc_boundary_layer, generate_sfc_xgrid, send_ice_mask_sic
+  public :: sfc_boundary_layer, send_ice_mask_sic
   public :: flux_down_from_atmos, flux_up_to_atmos
   public :: flux_land_to_ice
   public :: flux_ice_to_ocean_finish
@@ -131,12 +131,10 @@ module full_coupler_mod
   public :: coupler_unpack_ocean_ice_boundary, coupler_exchange_slow_to_fast_ice, &
             coupler_exchange_fast_to_slow_ice, coupler_set_ice_surface_fields
 
-!-----------------------------------------------------------------------
+  public :: coupler_generate_sfc_xgrid
 
   public :: coupler_clock_type
 
-!-----------------------------------------------------------------------
-
 #include <file_version.fh>
 
   !> namelist interface
@@ -1617,7 +1615,7 @@ subroutine coupler_set_clock_ids(coupler_clocks, Atm, Land, Ice, Ocean, ensemble
     coupler_clocks%intermediate_restart    = fms_mpp_clock_id( 'intermediate restart' )
     coupler_clocks%final_flux_check_stocks = fms_mpp_clock_id( 'final flux_check_stocks' )
 
-end subroutine coupler_set_clock_ids
+  end subroutine coupler_set_clock_ids
 
 !> \brief This subroutine calls coupler_chksum as well as atmos_ice_land_chksum and ocean_chksum
   subroutine coupler_atmos_ice_land_ocean_chksum(id, timestep, Atm, Land, Ice, Land_ice_atmos_boundary,&
@@ -1854,4 +1852,18 @@ subroutine coupler_set_ice_surface_fields(Ice, coupler_clocks)
 
   end subroutine coupler_set_ice_surface_fields
 
+!> \brief This subroutine calls generate_sfc_xgrid.  Clocks are set and before the call
+  subroutine coupler_generate_sfc_xgrid(Land, Ice, coupler_clocks)
+
+    implicit none
+    type(land_data_type), intent(inout) :: Land   !< Land
+    type(ice_data_type),  intent(inout) :: Ice    !< Ice
+    type(coupler_clock_type), intent(inout) :: coupler_clocks !< coupler_clocks
+
+    call fms_mpp_clock_begin(coupler_clocks%generate_sfc_xgrid)
+    call generate_sfc_xgrid( Land, Ice )
+    call fms_mpp_clock_end(coupler_clocks%generate_sfc_xgrid)
+
+  end subroutine coupler_generate_sfc_xgrid
+
 end module full_coupler_mod