From 30bc60bb37f21aaabf99d27453a1d8ead742f700 Mon Sep 17 00:00:00 2001 From: Gustavo Marques Date: Fri, 1 Jul 2016 08:59:52 -0400 Subject: [PATCH] Chaged allocation of water/heat fluxes This change assures that water/heat fluxes are just allocated when SHELF_THERMO = True. These fluxes are necessary if one wants to use either ENERGETICS_SFC_PBL (ALE mode) or BULKMIXEDLAYER (layer mode). --- src/ice_shelf/MOM_ice_shelf.F90 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ice_shelf/MOM_ice_shelf.F90 b/src/ice_shelf/MOM_ice_shelf.F90 index 1d146e5797..1136b32941 100644 --- a/src/ice_shelf/MOM_ice_shelf.F90 +++ b/src/ice_shelf/MOM_ice_shelf.F90 @@ -1392,12 +1392,11 @@ subroutine initialize_ice_shelf(param_file, ocn_grid, Time, CS, diag, fluxes, Ti ! Allocate the arrays for passing ice-shelf data through the forcing type. if (.not. solo_ice_sheet) then if (is_root_pe()) print *,"initialize_ice_shelf: allocating fluxes" - !GM, the following is necessary to make ENERGETICS_SFC_PBL work + ! GM: the following assures that water/heat fluxes are just allocated + ! when SHELF_THERMO = True. These fluxes are necessary if one wants to + ! use either ENERGETICS_SFC_PBL (ALE mode) or BULKMIXEDLAYER (layer mode). call allocate_forcing_type(G, fluxes, ustar=.true., shelf=.true., & - press=.true., water=.true., heat=.true.) - ! This is to make it work with layer mode without BULKMIXEDLAYER - allocate( fluxes%buoy(isd:ied,jsd:jed) ) - fluxes%buoy(:,:) = 0.0 + press=.true., water=CS%isthermo, heat=CS%isthermo) else if (is_root_pe()) print *,"allocating fluxes in solo mode" call allocate_forcing_type(G, fluxes, ustar=.true., shelf=.true., press=.true.)