-
Notifications
You must be signed in to change notification settings - Fork 19
Have XiosRead_test read output of XiosWrite_test
#999
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
Conversation
XIOSRead_test read output of XiosWrite_test
XIOSRead_test read output of XiosWrite_testXiosRead_test read output of XiosWrite_test
|
It turns out that the reason the tests fail is that XIOS appends the names of dimensions associated with domains with the domain name, e.g., |
3582343 to
c16977a
Compare
… splitting for now
c16977a to
690b99a
Compare
|
[Rebased on top of |
3ebf95c to
7613cc1
Compare
timspainNERSC
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the canonical and alternate names in ModelArrayDetails.cpp should be swapped. Everything else looks ready to be merged.
| { ModelArray::Dimension::X, { "xdim", "x_dim", 0, 0, 0 } }, | ||
| { ModelArray::Dimension::Y, { "ydim", "y_dim", 0, 0, 0 } }, | ||
| { ModelArray::Dimension::XVERTEX, { "xvertex", "x_vertex", 1, 1, 0 } }, // defined as x + 1 | ||
| { ModelArray::Dimension::YVERTEX, { "yvertex", "y_vertex", 1, 1, 0 } }, // defined as y + 1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd suggest using x_dim as the primary name, as that is the name that will be used in files written using the legacy code path. It would be good if the XIOS code path could read these files by default.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
18f5410 to
97aa780
Compare
183435f to
279efaa
Compare
279efaa to
e157a0c
Compare
|
Okay after quite a bit of debugging I figured out the errors in the integration tests. |
timspainNERSC
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm going to approve this, but everywhere you have changed x& y to xdim & ydim should really be changed to x_dim & y_dim, since these are the primary names for these dimensions. That they were not changed is my oversight when I originally changed the names, so thanks for fixing that :).
core/src/include/gridNames.hpp
Outdated
| static const std::string xName = "xdim"; | ||
| static const std::string yName = "ydim"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think these should be x_dim and y_dim, the primary names. I must not have changed this when making the original move from x,y to xdim, ydim.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 1a41099.
core/test/ParaGridIO_input_test.py
Outdated
| xDim = ncFile.createDimension("xdim", nx) | ||
| yDim = ncFile.createDimension("ydim", ny) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Again, these should be the primary names and should have been changed when I moved from x, y to xdim, ydim.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 1a41099.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both the changes here again should be the primary x_dim, y_dim names.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 1a41099.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both the changes here again should be the primary x_dim, y_dim names.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 1a41099.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both the changes here again should be the primary x_dim, y_dim names.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 1a41099.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both the changes here again should be the primary x_dim, y_dim names.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 1a41099.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both the changes here again should be the primary x_dim, y_dim names.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 1a41099.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both the changes here again should be the primary x_dim, y_dim names.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 1a41099.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both the changes here again should be the primary x_dim, y_dim names.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 1a41099.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both the changes here again should be the primary x_dim, y_dim names.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done in 1a41099.
Ah okay no problem, I'll switch them before merging. |
Have
XiosRead_testread output ofXiosWrite_testFixes #990
Merges into #996Task List
Test Description
From the issue:
To facilitate this change,
XiosWrite_testwas set to be a dependency ofXiosRead_testincore/test/CMakeLists.txt. As a result, if any subset of the test suite is run that includes both of them is run then the write test will come first.Change Description
The main code change required to support the revised testing was to set the values for the x- and y- dimensions of each domain. These aren't actually used in the model so I just set them to coincide with the local index values. I also needed to correct the names for the axis dimensions. With these changes, the
XiosWrite_testproduces output that's accepted by theXiosRead_test.As part of the PR, I dropped the split frequency functionality from the test with the intention of re-enabling it in a follow-up PR that addresses #898.
Documentation Impact
None
Pre-Request Checklist