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

A fix for #346 so that LND2ROF_FMAPNAME will be used #361

Merged
merged 1 commit into from
Apr 17, 2023
Merged

A fix for #346 so that LND2ROF_FMAPNAME will be used #361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions cime_config/namelist_definition_drv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2055,25 +2055,25 @@
<value samegrid_atm_lnd='true'>idmap</value>
</values>
</entry>
<entry id="lnd2rof_map">
<entry id="lnd2rof_map" modify_via_xml="LND2ROF_FMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>lnd to rof mapping, 'unset' or 'idmap' are normal possible values</desc>
<desc>lnd to rof mapping, 'unset' or 'idmap' are normal possible values (mapping file given for mizuRoute grids)</desc>
<values>
<value>unset</value>
<value>$LND2ROF_FMAPNAME</value>
<value samegrid_lnd_rof='true'>idmap</value>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As this is written, samegrid_lnd_rof will override the LND2ROF_FMPANAME value. This is probably correct, but means there is hidden behavior where the LND2ROF_FMAPNAME value that the user sets is ignored.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The one time this samegrid_lnd_rof comes up is for the nldas2_rnldas2_mnldas2 grid and I made sure with the new code it gives idmap as it should for that case.

</values>
</entry>
<entry id="rof2lnd_map">
<entry id="rof2lnd_map" modify_via_xml="ROF2LND_FMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>MED_attributes</group>
<desc>rof to lnd mapping, 'unset' or 'idmap' are normal possible values</desc>
<desc>rof to lnd mapping, 'unset' or 'idmap' are normal possible values (mapping file given for mizuRoute grids)</desc>
<values>
<value>unset</value>
<value>$ROF2LND_FMAPNAME</value>
<value samegrid_lnd_rof='true'>idmap</value>
</values>
</entry>
Expand Down