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.

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

Multi component user mods #1551

Merged
merged 3 commits into from
May 17, 2017
Merged

Conversation

jedwards4b
Copy link
Contributor

Allows multiple component user_mods. but gives primary component precedent.
Fixes warning issues for ocn grid non-idmap error if ocn is DOCN
Rearrange tests in scripts_regression_tests to avoid conflict between tests.

Test suite: scripts_regression_tests.py hand tests with F2000_DEV and contrived user_mods
Test baseline:
Test namelist changes:
Test status: bit for bit

Fixes

User interface changes?:

Code review:

@@ -428,7 +430,10 @@ def _get_gridmaps_v2(self, component_grids):
if grid1_value != grid2_value and grid1_value != 'null' and grid2_value != 'null':
map_ = gridmaps[node.text]
if map_ == 'idmap':
logger.warning("Warning: missing non-idmap %s for %s, %s and %s %s "
if grid1_name == "ocn_grid" and grid1_value == atm_gridvalue:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This avoids the warning: Warning: missing non-idmap ROF2OCN_LIQ_RMAPNAME for ocn_grid, 0.9x1.25 and rof_grid r05. When the ocn grid matches the atm grid this file isn't used and there is no need for the warning.

note = "This compset includes user_mods %s"%user_mods
append_status(note, "README.case", caseroot=self._caseroot)
logger.info(note)
comp = str(self.get_value("COMP_%s"%component_class))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Each component can now specify it's own user mods.

@rljacob
Copy link
Member

rljacob commented May 17, 2017

Can you give an example of how this works in a create_newcase command?

@jedwards4b
Copy link
Contributor Author

These are specified in the config_component.xml file for each component and not on the command line, there is no change in user interface.

@jgfouca
Copy link
Contributor

jgfouca commented May 17, 2017

Waiting for @billsacks review.

Copy link
Member

@billsacks billsacks left a comment

Choose a reason for hiding this comment

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

This looks good to me - thanks, @jedwards4b !

@mvertens mvertens self-requested a review May 17, 2017 19:04
@mvertens mvertens assigned mvertens and unassigned jgfouca May 17, 2017
@mvertens mvertens merged commit d404d35 into ESMCI:master May 17, 2017
@mvertens mvertens deleted the multi_component_user_mods branch May 17, 2017 19:05
@mvertens mvertens mentioned this pull request May 17, 2017
jedwards4b added a commit that referenced this pull request May 17, 2017
fixed bug in usermods
Hot fix for duplicate user_mods call in PR #1551

Test suite: None
Test baseline: None
Test namelist changes: manual verification that user_mods is not called twice
Test status: bit for bit
Fixes
User interface changes?:
Code review: jedwards
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants