Skip to content

FMS2: Move FMS domain calls to MOM infra #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hallberg-NOAA merged 2 commits into from
Jul 24, 2023
Merged

FMS2: Move FMS domain calls to MOM infra #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26bcab6
FMS2: Move FMS domain calls to MOM infra
marshallward Jun 30, 2023
a3961da
Remove fms_io_mod entries from ice_ridge.F90
marshallward Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/SIS_framework.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ module SIS_framework

! This file is part of SIS2. See LICENSE.md for the license.

use fms_io_mod, only : set_domain, nullify_domain

use MOM_coms_infra, only : SIS_chksum=>field_chksum
use MOM_coupler_types, only : coupler_1d_bc_type, coupler_2d_bc_type, coupler_3d_bc_type
use MOM_coupler_types, only : coupler_type_spawn, coupler_type_initialized, coupler_type_send_data
Expand All @@ -15,6 +13,7 @@ module SIS_framework
use MOM_domain_infra, only : MOM_domain_type, domain2D, get_domain_extent
use MOM_domain_infra, only : global_field, redistribute_data=>redistribute_array, broadcast_domain
use MOM_domain_infra, only : CENTER, CORNER, EAST=>EAST_FACE, NORTH=>NORTH_FACE, EAST_FACE, NORTH_FACE
use MOM_domain_infra, only : set_domain, nullify_domain
use MOM_error_handler, only : callTree_enter, callTree_leave, callTree_waypoint
use MOM_file_parser, only : get_param, read_param, log_param, log_version, param_file_type
! use MOM_io, only : MULTIPLE, READONLY_FILE, SINGLE_FILE
Expand Down
6 changes: 3 additions & 3 deletions src/ice_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2031,7 +2031,7 @@ subroutine ice_model_init(Ice, Time_Init, Time, Time_step_fast, Time_step_slow,
call clone_MOM_domain(sGD, dG%Domain)

! Set up the restart file and determine whether this is a new simulation.
call set_domain(sGD%mpp_domain)
call set_domain(sGD)
if (.not.associated(Ice%Ice_restart)) &
call SIS_restart_init(Ice%Ice_restart, restart_file, sGD, param_file)
new_sim = determine_is_new_run(dirs%input_filename, dirs%restart_input_dir, sG, Ice%Ice_restart)
Expand Down Expand Up @@ -2189,7 +2189,7 @@ subroutine ice_model_init(Ice, Time_Init, Time, Time_step_fast, Time_step_slow,

! Allocate and register fields for restarts.

if (.not.slow_ice_PE) call set_domain(fGD%mpp_domain)
if (.not.slow_ice_PE) call set_domain(fGD)
if (split_restart_files) then
if (.not.associated(Ice%Ice_fast_restart)) &
call SIS_restart_init(Ice%Ice_fast_restart, fast_rest_file, fGD, param_file)
Expand Down Expand Up @@ -2515,7 +2515,7 @@ subroutine ice_model_init(Ice, Time_Init, Time, Time_step_fast, Time_step_slow,


! if (Ice%fCS%Rad%add_diurnal_sw .or. Ice%fCS%Rad%do_sun_angle_for_alb) then
! call set_domain(fGD%mpp_domain)
! call set_domain(fGD)
call astronomy_init()
! call nullify_domain()
! endif
Expand Down
1 change: 0 additions & 1 deletion src/ice_ridge.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ module ice_ridging_mod
use MOM_unit_scaling, only : unit_scale_type
use SIS_hor_grid, only : SIS_hor_grid_type
use SIS_types, only : ice_state_type, ist_chksum
use fms_io_mod, only : register_restart_field, restart_file_type
use SIS_tracer_registry, only : SIS_tracer_registry_type, SIS_tracer_type, get_SIS_tracer_pointer
use SIS2_ice_thm, only : get_SIS2_thermo_coefs
use ice_grid, only : ice_grid_type
Expand Down