Skip to content

Commit 9b73944

Browse files
committed
Use broadcast_domain in share_ice_domains
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.
1 parent 4de49b9 commit 9b73944

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/ice_model.F90

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ module ice_model_mod
4545
use coupler_types_mod, only : coupler_1d_bc_type, coupler_2d_bc_type, coupler_3d_bc_type
4646
use coupler_types_mod, only : coupler_type_spawn, coupler_type_initialized
4747
use coupler_types_mod, only : coupler_type_rescale_data, coupler_type_copy_data
48-
use fms_io_mod, only : set_domain, nullify_domain, restore_state, query_initialized
49-
use fms_io_mod, only : register_restart_field, restart_file_type
50-
use mpp_domains_mod, only : mpp_broadcast_domain
5148

5249
use astronomy_mod, only : astronomy_init, astronomy_end
5350
use astronomy_mod, only : universal_time, orbital_time, diurnal_solar, daily_mean_solar
@@ -80,6 +77,8 @@ module ice_model_mod
8077
use SIS_fast_thermo, only : do_update_ice_model_fast, avg_top_quantities, total_top_quantities
8178
use SIS_fast_thermo, only : redo_update_ice_model_fast, find_excess_fluxes
8279
use SIS_fast_thermo, only : infill_array, SIS_fast_thermo_init, SIS_fast_thermo_end
80+
use SIS_framework, only : set_domain, nullify_domain, broadcast_domain
81+
use SIS_framework, only : restart_file_type, restore_state, query_initialized, register_restart_field
8382
use SIS_fixed_initialization, only : SIS_initialize_fixed
8483
use SIS_get_input, only : Get_SIS_input, directories
8584
use SIS_hor_grid, only : SIS_hor_grid_type, set_hor_grid, SIS_hor_grid_end, set_first_direction
@@ -2665,10 +2664,10 @@ subroutine share_ice_domains(Ice)
26652664
else
26662665
allocate(Ice%fast_domain)
26672666
endif
2668-
call mpp_broadcast_domain(Ice%Domain)
2669-
call mpp_broadcast_domain(Ice%slow_domain_NH)
2670-
call mpp_broadcast_domain(Ice%slow_domain)
2671-
call mpp_broadcast_domain(Ice%fast_domain)
2667+
call broadcast_domain(Ice%Domain)
2668+
call broadcast_domain(Ice%slow_domain_NH)
2669+
call broadcast_domain(Ice%slow_domain)
2670+
call broadcast_domain(Ice%fast_domain)
26722671

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

0 commit comments

Comments
 (0)