Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused namelist variables #199

Merged
merged 2 commits into from
Jun 8, 2021
Merged

Remove unused namelist variables #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75a5051
Remove unneeded glc_nx and glc_ny drv namelist variables
billsacks May 4, 2021
cb3425b
Remove unused mapping file variables
billsacks May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 3 additions & 34 deletions cime_config/config_component.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,14 +1192,16 @@
<desc>glacier (glc) grid - DO NOT EDIT (for experts only)</desc>
</entry>

<!-- GLC_NX and GLC_NY are only needed by xglc. These variables do not
accommodate multiple ice sheet grids, but that's okay for now,
since xglc currently only runs on a single ice sheet grid.-->
<entry id="GLC_NX">
<type>integer</type>
<default_value>0</default_value>
<group>build_grid</group>
<file>env_build.xml</file>
<desc>number of glc cells in i direction - DO NOT EDIT (for experts only)</desc>
</entry>

<entry id="GLC_NY">
<type>integer</type>
<default_value>0</default_value>
Expand All @@ -1208,7 +1210,6 @@
<desc>number of glc cells in j direction - DO NOT EDIT (for experts only)</desc>
</entry>


<entry id="WAV_GRID">
<type>char</type>
<default_value>UNSET</default_value>
Expand Down Expand Up @@ -1432,22 +1433,6 @@
<desc>lnd2atm state mapping file</desc>
</entry>

<entry id="LND2GLC_FMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>lnd2glc flux mapping file</desc>
</entry>

<entry id="LND2GLC_SMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>lnd2glc state mapping file</desc>
</entry>

<entry id="LND2ROF_FMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
Expand Down Expand Up @@ -1488,22 +1473,6 @@
<desc>rof2ocn runoff mapping file</desc>
</entry>

<entry id="GLC2LND_FMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2lnd flux mapping file</desc>
</entry>

<entry id="GLC2LND_SMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>glc2lnd state mapping file</desc>
</entry>

<entry id="GLC2ICE_RMAPNAME">
<type>char</type>
<default_value>idmap</default_value>
Expand Down
74 changes: 0 additions & 74 deletions cime_config/namelist_definition_drv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,28 +869,6 @@
<value>$ICE_NY</value>
</values>
</entry>
<entry id="glc_nx" modify_via_xml="GLC_NX">
<type>integer</type>
<category>control</category>
<group>MED_attributes</group>
<desc>
number of glc cells in i direction
</desc>
<values>
<value>$GLC_NX</value>
</values>
</entry>
<entry id="glc_ny" modify_via_xml="GLC_NY">
<type>integer</type>
<category>control</category>
<group>MED_attributes</group>
<desc>
number of glc cells in j direction
</desc>
<values>
<value>$GLC_NY</value>
</values>
</entry>
<entry id="lnd_nx" modify_via_xml="LND_NX">
<type>integer</type>
<category>control</category>
Expand Down Expand Up @@ -2027,58 +2005,6 @@
</values>
</entry>

<entry id="lnd2glc_fmapname" modify_via_xml="LND2GLC_FMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>
land to glc mapping file for fluxes
</desc>
<values>
<value>$LND2GLC_FMAPNAME</value>
</values>
</entry>

<entry id="lnd2glc_smapname" modify_via_xml="LND2GLC_SMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>
land to glc mapping file for states
</desc>
<values>
<value>$LND2GLC_SMAPNAME</value>
</values>
</entry>

<entry id="glc2lnd_fmapname" modify_via_xml="GLC2LND_FMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>
glc to land mapping file for fluxes
</desc>
<values>
<value>$GLC2LND_FMAPNAME</value>
</values>
</entry>

<entry id="glc2lnd_smapname" modify_via_xml="GLC2LND_SMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>
glc to land mapping file for states
</desc>
<values>
<value>$GLC2LND_SMAPNAME</value>
</values>
</entry>

<entry id="atm2wav_smapname" modify_via_xml="ATM2WAV_SMAPNAME">
<type>char</type>
<category>mapping</category>
Expand Down
16 changes: 0 additions & 16 deletions mediator/esmFldsExchange_cesm_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down