From 8bbfbc20a3de0107626d1b0807912f88a8cb2034 Mon Sep 17 00:00:00 2001 From: James Foucar Date: Tue, 25 Jun 2019 12:29:53 -0600 Subject: [PATCH] Update CIME to ESMCI cime5.8.3 (PR #3010) Update CIME to ESMCI cime5.8.3 Squash merge of jgfouca/branch-for-to-acme-2019-06-24 Features: * Update to the latest NCAR pio2 development version 2.4.4. pio1 still default. * require ids in namelist definition files to be lower case * Add logic to control activation of glcshelf_c2_ice Bug fixes: * None [BFB] --- driver-mct/main/cime_comp_mod.F90 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/driver-mct/main/cime_comp_mod.F90 b/driver-mct/main/cime_comp_mod.F90 index a140c85b14a3..20cdf67d1a1d 100644 --- a/driver-mct/main/cime_comp_mod.F90 +++ b/driver-mct/main/cime_comp_mod.F90 @@ -1614,8 +1614,11 @@ subroutine cime_init() if (glcocn_present .and. ocn_prognostic) glc_c2_ocn = .true. ! For now, glcshelf->ocn only activated if the ocean has activated ocn->glcshelf if (ocn_c2_glcshelf .and. glcocn_present .and. ocn_prognostic) glcshelf_c2_ocn = .true. + ! For now, glacshelf->ice also controlled by ocean's ocn_c2_glcshelf flag + ! Note that ice also has to be prognostic for glcshelf_c2_ice to be true. + ! It is not expected that glc and ice would ever be run without ocn prognostic. + if (ocn_c2_glcshelf .and. glcice_present .and. ice_prognostic) glcshelf_c2_ice = .true. if (glcice_present .and. iceberg_prognostic) glc_c2_ice = .true. - if (glcocn_present .and. ice_prognostic) glcshelf_c2_ice = .true. endif if (wav_present) then if (ocn_prognostic) wav_c2_ocn = .true. @@ -3922,6 +3925,10 @@ subroutine cime_run_ocnglc_coupling() !Map g2x_gx shelf fields that were updated above, to g2x_ox. !Do this at intrinsic coupling !frequency + call prep_glc_accum_ocn(timer='CPL:glcprep_accum_ocn') !accum x2g_g fields here into x2g_gacc + endif + + if (glcshelf_c2_ice) then call prep_ice_shelf_calc_g2x_ix(timer='CPL:glcpost_glcshelf2ice') !Map g2x_gx shelf fields to g2x_ix. !Do this at intrinsic coupling @@ -3931,9 +3938,6 @@ subroutine cime_run_ocnglc_coupling() !changing on the intrinsic !timestep. But I don't think it's !unsafe to do it here. - - call prep_glc_accum_ocn(timer='CPL:glcprep_accum_ocn') !accum x2g_g fields here into x2g_gacc - endif endif