Skip to content

Commit

Permalink
Use broadcast_domain in share_ice_domains
Browse files Browse the repository at this point in the history
  Use the new SIS-specific framework level interface broadcast_domain in
share_ice_domains as a substitute for mpp_broadcast_domain, which it wraps. Also
use SIS_framework for the restart interfaces.  These changes should enable any
future infrastructure interface changes without leading to widespread changes
within the SIS2 code or a break in the contuity of solutions.  These are
currently just wrappers of the same subroutines, and all answers are bitwise
identical.
  • Loading branch information
Hallberg-NOAA committed Aug 10, 2020
1 parent 4de49b9 commit 9b73944
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions src/ice_model.F90
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ module ice_model_mod
use coupler_types_mod, only : coupler_1d_bc_type, coupler_2d_bc_type, coupler_3d_bc_type
use coupler_types_mod, only : coupler_type_spawn, coupler_type_initialized
use coupler_types_mod, only : coupler_type_rescale_data, coupler_type_copy_data
use fms_io_mod, only : set_domain, nullify_domain, restore_state, query_initialized
use fms_io_mod, only : register_restart_field, restart_file_type
use mpp_domains_mod, only : mpp_broadcast_domain

use astronomy_mod, only : astronomy_init, astronomy_end
use astronomy_mod, only : universal_time, orbital_time, diurnal_solar, daily_mean_solar
Expand Down Expand Up @@ -80,6 +77,8 @@ module ice_model_mod
use SIS_fast_thermo, only : do_update_ice_model_fast, avg_top_quantities, total_top_quantities
use SIS_fast_thermo, only : redo_update_ice_model_fast, find_excess_fluxes
use SIS_fast_thermo, only : infill_array, SIS_fast_thermo_init, SIS_fast_thermo_end
use SIS_framework, only : set_domain, nullify_domain, broadcast_domain
use SIS_framework, only : restart_file_type, restore_state, query_initialized, register_restart_field
use SIS_fixed_initialization, only : SIS_initialize_fixed
use SIS_get_input, only : Get_SIS_input, directories
use SIS_hor_grid, only : SIS_hor_grid_type, set_hor_grid, SIS_hor_grid_end, set_first_direction
Expand Down Expand Up @@ -2665,10 +2664,10 @@ subroutine share_ice_domains(Ice)
else
allocate(Ice%fast_domain)
endif
call mpp_broadcast_domain(Ice%Domain)
call mpp_broadcast_domain(Ice%slow_domain_NH)
call mpp_broadcast_domain(Ice%slow_domain)
call mpp_broadcast_domain(Ice%fast_domain)
call broadcast_domain(Ice%Domain)
call broadcast_domain(Ice%slow_domain_NH)
call broadcast_domain(Ice%slow_domain)
call broadcast_domain(Ice%fast_domain)

if (Ice%shared_slow_fast_PEs) then
ice_clock_exchange = cpu_clock_id('Ice Fast/Slow Exchange', grain=CLOCK_SUBCOMPONENT )
Expand Down

0 comments on commit 9b73944

Please sign in to comment.