From 75a5051f3e85737a6b0df904e900a7e2eceabf6e Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Tue, 4 May 2021 11:51:33 -0600 Subject: [PATCH 1/2] Remove unneeded glc_nx and glc_ny drv namelist variables These don't appear to be needed in the drv, and trying to support them will be tricky with multiple ice sheets. --- cime_config/config_component.xml | 5 +++-- cime_config/namelist_definition_drv.xml | 22 ---------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index f69aa441e..716db3ab8 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -1192,6 +1192,9 @@ glacier (glc) grid - DO NOT EDIT (for experts only) + integer 0 @@ -1199,7 +1202,6 @@ env_build.xml number of glc cells in i direction - DO NOT EDIT (for experts only) - integer 0 @@ -1208,7 +1210,6 @@ number of glc cells in j direction - DO NOT EDIT (for experts only) - char UNSET diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml index 94a821d79..399de8551 100644 --- a/cime_config/namelist_definition_drv.xml +++ b/cime_config/namelist_definition_drv.xml @@ -869,28 +869,6 @@ $ICE_NY - - integer - control - MED_attributes - - number of glc cells in i direction - - - $GLC_NX - - - - integer - control - MED_attributes - - number of glc cells in j direction - - - $GLC_NY - - integer control From cb3425bfffc68a454285b3fcc28a29f8c99961a9 Mon Sep 17 00:00:00 2001 From: Bill Sacks Date: Thu, 27 May 2021 16:34:39 -0600 Subject: [PATCH 2/2] Remove unused mapping file variables There were some remnants of the lnd2glc and glc2lnd mapping file variables that weren't actually referenced in the code. This commit removes them. Note that we *do* still need these maps, but with changes Mariana Vertenstein put in place a few months ago, it is assumed that these maps are always generated at runtime. (If we later want to go back to supporting these maps being provided as pre-generated files, this commit should be reverted and some other code should be added back in to actually use the relevant variables.) --- cime_config/config_component.xml | 32 --------------- cime_config/namelist_definition_drv.xml | 52 ------------------------- mediator/esmFldsExchange_cesm_mod.F90 | 16 -------- 3 files changed, 100 deletions(-) diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml index 716db3ab8..6b549a9ae 100644 --- a/cime_config/config_component.xml +++ b/cime_config/config_component.xml @@ -1433,22 +1433,6 @@ lnd2atm state mapping file - - char - idmap - run_domain - env_run.xml - lnd2glc flux mapping file - - - - char - idmap - run_domain - env_run.xml - lnd2glc state mapping file - - char idmap @@ -1489,22 +1473,6 @@ rof2ocn runoff mapping file - - char - idmap - run_domain - env_run.xml - glc2lnd flux mapping file - - - - char - idmap - run_domain - env_run.xml - glc2lnd state mapping file - - char idmap diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml index 399de8551..243e84404 100644 --- a/cime_config/namelist_definition_drv.xml +++ b/cime_config/namelist_definition_drv.xml @@ -2005,58 +2005,6 @@ - - char - mapping - abs - MED_attributes - - land to glc mapping file for fluxes - - - $LND2GLC_FMAPNAME - - - - - char - mapping - abs - MED_attributes - - land to glc mapping file for states - - - $LND2GLC_SMAPNAME - - - - - char - mapping - abs - MED_attributes - - glc to land mapping file for fluxes - - - $GLC2LND_FMAPNAME - - - - - char - mapping - abs - MED_attributes - - glc to land mapping file for states - - - $GLC2LND_SMAPNAME - - - char mapping diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90 index 8253fe951..740497122 100644 --- a/mediator/esmFldsExchange_cesm_mod.F90 +++ b/mediator/esmFldsExchange_cesm_mod.F90 @@ -30,14 +30,12 @@ module esmFldsExchange_cesm_mod character(len=CX) :: atm2ice_fmap='unset', atm2ice_smap='unset', atm2ice_vmap='unset' character(len=CX) :: atm2ocn_fmap='unset', atm2ocn_smap='unset', atm2ocn_vmap='unset' character(len=CX) :: atm2lnd_fmap='unset', atm2lnd_smap='unset' - character(len=CX) :: glc2lnd_smap='unset', glc2lnd_fmap='unset' character(len=CX) :: glc2ice_rmap='unset' character(len=CX) :: glc2ocn_liq_rmap='unset' character(len=CX) :: glc2ocn_ice_rmap='unset' character(len=CX) :: ice2atm_fmap='unset', ice2atm_smap='unset' character(len=CX) :: ocn2atm_fmap='unset', ocn2atm_smap='unset' character(len=CX) :: lnd2atm_fmap='unset', lnd2atm_smap='unset' - character(len=CX) :: lnd2glc_fmap='unset', lnd2glc_smap='unset' character(len=CX) :: lnd2rof_fmap='unset' character(len=CX) :: rof2lnd_fmap='unset' character(len=CX) :: rof2ocn_fmap='unset', rof2ocn_ice_rmap='unset', rof2ocn_liq_rmap='unset' @@ -140,12 +138,6 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc) call NUOPC_CompAttributeGet(gcomp, name='rof2lnd_fmapname', value=rof2lnd_fmap, rc=rc) if (chkerr(rc,__LINE__,u_FILE_u)) return if (mastertask) write(logunit, '(a)') trim(subname)//'rof2lnd_fmapname = '// trim(rof2lnd_fmap) - call NUOPC_CompAttributeGet(gcomp, name='glc2lnd_fmapname', value=glc2lnd_fmap, rc=rc) - if (chkerr(rc,__LINE__,u_FILE_u)) return - if (mastertask) write(logunit, '(a)') trim(subname)//'glc2lnd_smapname = '// trim(glc2lnd_fmap) - call NUOPC_CompAttributeGet(gcomp, name='glc2lnd_smapname', value=glc2lnd_smap, rc=rc) - if (chkerr(rc,__LINE__,u_FILE_u)) return - if (mastertask) write(logunit, '(a)') trim(subname)//'glc2lnd_smapname = '// trim(glc2lnd_smap) ! mapping to ice call NUOPC_CompAttributeGet(gcomp, name='atm2ice_fmapname', value=atm2ice_fmap, rc=rc) @@ -206,14 +198,6 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc) if (chkerr(rc,__LINE__,u_FILE_u)) return if (mastertask) write(logunit, '(a)') trim(subname)//'lnd2rof_fmapname = '// trim(lnd2rof_fmap) - ! mapping to glc - call NUOPC_CompAttributeGet(gcomp, name='lnd2glc_fmapname', value=lnd2glc_fmap, rc=rc) - if (chkerr(rc,__LINE__,u_FILE_u)) return - if (mastertask) write(logunit, '(a)') trim(subname)//'lnd2glc_fmapname = '// trim(lnd2glc_fmap) - call NUOPC_CompAttributeGet(gcomp, name='lnd2glc_smapname', value=lnd2glc_smap, rc=rc) - if (chkerr(rc,__LINE__,u_FILE_u)) return - if (mastertask) write(logunit, '(a)') trim(subname)//'lnd2glc_smapname = '// trim(lnd2glc_smap) - ! mapping to wav call NUOPC_CompAttributeGet(gcomp, name='atm2wav_smapname', value=atm2wav_smap, rc=rc) if (chkerr(rc,__LINE__,u_FILE_u)) return