From 114c9a3ab836d7527bded1e644803da9c00652e8 Mon Sep 17 00:00:00 2001 From: Xylar Asay-Davis Date: Mon, 8 Apr 2024 13:21:02 -0500 Subject: [PATCH] Don't set ssh from landIceDraft in global ocean init Instead, it will be read in from the topography file directly, meaning it can be updated (e.g. from ssh adjustment). --- .../mpas-ocean/src/mode_init/mpas_ocn_init_global_ocean.F | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/components/mpas-ocean/src/mode_init/mpas_ocn_init_global_ocean.F b/components/mpas-ocean/src/mode_init/mpas_ocn_init_global_ocean.F index 302e32e0e736..2476d01aa8f4 100644 --- a/components/mpas-ocean/src/mode_init/mpas_ocn_init_global_ocean.F +++ b/components/mpas-ocean/src/mode_init/mpas_ocn_init_global_ocean.F @@ -129,7 +129,7 @@ subroutine ocn_init_setup_global_ocean(domain, iErr)!{{{ real (kind=RKIND), dimension(:, :), pointer :: normalVelocity real (kind=RKIND), dimension(:, :, :), pointer :: ecosysTracers, activeTracers, debugTracers, & DMSTracers, MacroMoleculesTracers - integer, pointer :: nVertLevels, nCellsSolve, tracerIndex + integer, pointer :: nVertLevels, nCellsSolve, nCells, tracerIndex integer :: iCell, k, iTracer integer, dimension(3) :: indexField @@ -964,8 +964,7 @@ subroutine ocn_init_setup_global_ocean_interpolate_land_ice_topography(domain, i real (kind=RKIND), dimension(:), pointer :: landIceDraft, & landIcePressure, & landIceFraction, & - landIceFloatingFraction, & - ssh + landIceFloatingFraction integer, pointer :: nCells integer, dimension(:), pointer :: maxLevelCell, landIceMask, landIceFloatingMask @@ -1007,7 +1006,6 @@ subroutine ocn_init_setup_global_ocean_interpolate_land_ice_topography(domain, i call mpas_pool_get_array(landIceInitPool, 'landIcePressureObserved', landIcePressureObserved) call mpas_pool_get_array(landIceInitPool, 'landIceFracObserved', landIceFracObserved) call mpas_pool_get_array(landIceInitPool, 'landIceFloatingFracObserved', landIceFloatingFracObserved) - call mpas_pool_get_array(statePool, 'ssh', ssh, 1) call mpas_pool_get_array(forcingPool, 'landIceMask', landIceMask) call mpas_pool_get_array(forcingPool, 'landIceFloatingMask', landIceFloatingMask) call mpas_pool_get_array(forcingPool, 'landIceDraft', landIceDraft) @@ -1020,7 +1018,6 @@ subroutine ocn_init_setup_global_ocean_interpolate_land_ice_topography(domain, i 'indicates that this field is missing in the initial condition file (e.g. ' // & 'because it is meant for an older E3SM version).', MPAS_LOG_CRIT) endif - ssh(:) = 0.0_RKIND landIceFraction(:) = 0.0_RKIND landIceDraft(:) = 0.0_RKIND landIcePressure(:) = 0.0_RKIND @@ -1038,7 +1035,6 @@ subroutine ocn_init_setup_global_ocean_interpolate_land_ice_topography(domain, i end if landIceDraft(iCell) = landIceDraftObserved(iCell) - ssh(iCell) = landIceDraft(iCell) landIcePressure(iCell) = landIcePressureObserved(iCell) if (landIcePressure(iCell) > 0.0_RKIND) then modifyLandIcePressureMask(iCell) = 1