Skip to content

Commit

Permalink
Use EAST_FACE instead of EAST to denote positions
Browse files Browse the repository at this point in the history
  Replaced the variable EAST with EAST_FACE and NORTH with NORTH_FACE to
indicate the positions where some variables are discretized, both coming via
SIS_framework, for greater clarity and to conform with the variable names used
elsewhere in the MOM6_code.
  • Loading branch information
Hallberg-NOAA committed Apr 3, 2021
1 parent 27d462a commit b10799c
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/SIS_types.F90
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module SIS_types
use SIS_diag_mediator, only : register_SIS_diag_field, register_static_field
use SIS_debugging, only : chksum, Bchksum, Bchksum_pair, hchksum, uvchksum
use SIS_debugging, only : check_redundant_B, check_redundant_C
use SIS_framework, only : domain2D, CORNER, EAST, NORTH, redistribute_data
use SIS_framework, only : domain2D, CORNER, EAST_FACE, NORTH_FACE, redistribute_data
use SIS_framework, only : register_restart_field, SIS_restart_CS, restore_SIS_state
use SIS_framework, only : query_initialized=>query_inited, only_read_from_restarts
use SIS_framework, only : safe_alloc, safe_alloc_ptr
Expand Down Expand Up @@ -517,14 +517,14 @@ subroutine ice_state_register_restarts(IST, G, IG, Ice_restart)
if (IST%Cgrid_dyn) then
if (G%symmetric) then
call register_restart_field(Ice_restart, 'sym_u_ice_C', IST%u_ice_C, &
position=EAST, mandatory=.false.)
position=EAST_FACE, mandatory=.false.)
call register_restart_field(Ice_restart, 'sym_v_ice_C', IST%v_ice_C, &
position=NORTH, mandatory=.false.)
position=NORTH_FACE, mandatory=.false.)
else
call register_restart_field(Ice_restart, 'u_ice_C', IST%u_ice_C, &
position=EAST, mandatory=.false.)
position=EAST_FACE, mandatory=.false.)
call register_restart_field(Ice_restart, 'v_ice_C', IST%v_ice_C, &
position=NORTH, mandatory=.false.)
position=NORTH_FACE, mandatory=.false.)
endif
else
if (G%symmetric) then
Expand Down Expand Up @@ -604,9 +604,9 @@ subroutine ice_state_read_alt_restarts(IST, G, IG, Ice_restart, restart_dir)
if (IST%Cgrid_dyn .and. (.not.u_set)) then
call safe_alloc(u_tmp, G%isd, G%ied, G%jsd, G%jed)
call safe_alloc(v_tmp, G%isd, G%ied, G%jsd, G%jed)
call only_read_from_restarts(Ice_restart, 'u_ice_C', u_tmp, position=EAST, &
call only_read_from_restarts(Ice_restart, 'u_ice_C', u_tmp, position=EAST_FACE, &
directory=restart_dir, domain=domain_tmp, success=read_u)
call only_read_from_restarts(Ice_restart, 'v_ice_C', v_tmp, position=NORTH, &
call only_read_from_restarts(Ice_restart, 'v_ice_C', v_tmp, position=NORTH_FACE, &
directory=restart_dir, domain=domain_tmp, success=read_v)
if (read_u .and. read_v) then
! The non-symmetric variant of this vector has been successfully read.
Expand Down Expand Up @@ -655,9 +655,9 @@ subroutine ice_state_read_alt_restarts(IST, G, IG, Ice_restart, restart_dir)
if (IST%Cgrid_dyn .and. (.not.u_set)) then
call safe_alloc(u_tmp, G%isd-1, G%ied, G%jsd, G%jed)
call safe_alloc(v_tmp, G%isd, G%ied, G%jsd-1, G%jed)
call only_read_from_restarts(Ice_restart, 'sym_u_ice_C', u_tmp, position=EAST, &
call only_read_from_restarts(Ice_restart, 'sym_u_ice_C', u_tmp, position=EAST_FACE, &
directory=restart_dir, domain=domain_tmp, success=read_u)
call only_read_from_restarts(Ice_restart, 'sym_v_ice_C', v_tmp, position=NORTH, &
call only_read_from_restarts(Ice_restart, 'sym_v_ice_C', v_tmp, position=NORTH_FACE, &
directory=restart_dir, domain=domain_tmp, success=read_v)
if (read_u .and. read_v) then
! The symmetric variant of this vector has been successfully read.
Expand Down

0 comments on commit b10799c

Please sign in to comment.