Skip to content
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

Reorder update and Ocn-to-OIB calls #206

Draft
wants to merge 2 commits into
base: dev/gfdl
Choose a base branch
from
Draft

Reorder update and Ocn-to-OIB calls #206

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d266c70
Reorder update and Ocn-to-OIB calls
Feb 27, 2024
a2b5dd9
Merge branch 'NOAA-GFDL:dev/gfdl' into reorder_interspersed_coupling
theresa-cordero May 22, 2024
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
29 changes: 15 additions & 14 deletions src/combined_ice_ocean_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,12 @@ module combined_ice_ocean_driver

use ice_model_mod, only : ice_data_type, ice_model_end
use ice_model_mod, only : update_ice_slow_thermo, update_ice_dynamics_trans
use ice_model_mod, only : unpack_ocn_ice_bdry
use ice_model_mod, only : unpack_ocn_ice_bdry, ocn_ice_bnd_type_chksum
use ocean_model_mod, only : update_ocean_model, ocean_model_end
use ocean_model_mod, only : ocean_public_type, ocean_state_type, ice_ocean_boundary_type
use ocean_model_mod, only: ocean_public_type_chksum, ice_ocn_bnd_type_chksum
use ocean_model_mod, only : ocean_public_type_chksum, ice_ocn_bnd_type_chksum
use ice_boundary_types, only : ocean_ice_boundary_type
use SIS_types, only : translate_OSS_to_sOSS

implicit none ; private

Expand Down Expand Up @@ -205,13 +206,10 @@ subroutine update_slow_ice_and_ocean(CS, Ice, Ocn, Ocean_sfc, IOB, &
"ocean and slow ice layouts and domain sizes are identical.")

if (CS%intersperse_ice_ocn) then
if (.not.CS%use_intersperse_bug) &
call direct_flux_ocn_to_OIB(time_start_update, Ocean_sfc, OIB, Ice, do_thermo=.true.)

! First step the ice, then ocean thermodynamics.
call update_ice_slow_thermo(Ice)

call direct_flux_ice_to_IOB(time_start_update, Ice, IOB, do_thermo=.true.)
call direct_flux_ice_to_IOB(time_start_update, Ice, IOB, do_thermo=.true.)

call update_ocean_model(IOB, Ocn, Ocean_sfc, time_start_update, coupling_time_step, &
update_dyn=.false., update_thermo=.true., &
Expand All @@ -229,6 +227,9 @@ subroutine update_slow_ice_and_ocean(CS, Ice, Ocn, Ocean_sfc, IOB, &
dyn_time_step = coupling_time_step - (time_start_step - time_start_update)
endif

if (.not.CS%use_intersperse_bug) &
call direct_flux_ocn_to_OIB(time_start_step, Ocean_sfc, OIB, Ice, do_thermo=.true.)

call update_ice_dynamics_trans(Ice, time_step=dyn_time_step, &
start_cycle=(ns==1), end_cycle=(ns==nstep), cycle_length=dt_coupling)

Expand All @@ -237,8 +238,6 @@ subroutine update_slow_ice_and_ocean(CS, Ice, Ocn, Ocean_sfc, IOB, &
call update_ocean_model(IOB, Ocn, Ocean_sfc, time_start_step, dyn_time_step, &
update_dyn=.true., update_thermo=.false., &
start_cycle=.false., end_cycle=(ns==nstep), cycle_length=dt_coupling)
if (.not.CS%use_intersperse_bug) &
call direct_flux_ocn_to_OIB(time_start_step, Ocean_sfc, OIB, Ice, do_thermo=.false.)

time_start_step = time_start_step + dyn_time_step
enddo
Expand Down Expand Up @@ -379,19 +378,19 @@ subroutine direct_flux_ocn_to_OIB(Time, Ocean, OIB, Ice, do_thermo)
do_therm = .true. ; if (present(do_thermo)) do_therm = do_thermo
do_area_weighted_flux = .false. !! Need to add option to account for area weighted fluxes

if (ASSOCIATED(OIB%u)) OIB%u = Ocean%u_surf
if (ASSOCIATED(OIB%v)) OIB%v = Ocean%v_surf
if (ASSOCIATED(OIB%sea_level)) OIB%sea_level = Ocean%sea_lev
if (ASSOCIATED(OIB%u)) OIB%u(:,:) = Ocean%u_surf(:,:)
if (ASSOCIATED(OIB%v)) OIB%v(:,:) = Ocean%v_surf(:,:)
if (ASSOCIATED(OIB%sea_level)) OIB%sea_level(:,:) = Ocean%sea_lev(:,:)

if (do_therm) then
if (ASSOCIATED(OIB%t)) OIB%t = Ocean%t_surf
if (ASSOCIATED(OIB%s)) OIB%s = Ocean%s_surf
if (ASSOCIATED(OIB%t)) OIB%t(:,:) = Ocean%t_surf(:,:)
if (ASSOCIATED(OIB%s)) OIB%s(:,:) = Ocean%s_surf(:,:)
if (ASSOCIATED(OIB%frazil)) then
! if(do_area_weighted_flux) then
! OIB%frazil = Ocean%frazil * Ocean%area
! call divide_by_area(OIB%frazil, Ice%area)
! else
OIB%frazil = Ocean%frazil
OIB%frazil(:,:) = Ocean%frazil(:,:)
! endif
endif
endif
Expand All @@ -416,6 +415,8 @@ subroutine direct_flux_ocn_to_OIB(Time, Ocean, OIB, Ice, do_thermo)
call unpack_ocn_ice_bdry(OIB, Ice%sCS%OSS, Ice%sCS%IST%ITV, Ice%sCS%G, Ice%sCS%US, &
Ice%sCS%specified_ice, Ice%ocean_fields)

call translate_OSS_to_sOSS(Ice%sCS%OSS, Ice%sCS%IST, Ice%sCS%sOSS, Ice%sCS%G, Ice%sCS%US)

end subroutine direct_flux_ocn_to_OIB


Expand Down