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

Irregular cut wrap #1778

Merged
merged 1 commit into from
Jan 22, 2016
Merged

Irregular cut wrap #1778

merged 1 commit into from
Jan 22, 2016

Conversation

danlipsa
Copy link
Contributor

No description provided.

@danlipsa
Copy link
Contributor Author

@doutriaux1 @aashish24 I am having issues with test_vcs_patterns_hatches.py because this test duplicates one row of data (line 23) which results in duplicate cells when wrapping. Is there a way to test that a variable was instructed to create duplicate data? In that case I should not do wrapping. Thanks!

@doutriaux1
Copy link
Contributor

@danlipsa
Copy link
Contributor Author

All these:
baselines/vcs/test_vcs_meshfill_hatch_SH_-180_180.png
baselines/vcs/test_vcs_meshfill_hatch_SH_-180_180_non-contig.png
baselines/vcs/test_vcs_meshfill_hatch_SH_0_360.png
baselines/vcs/test_vcs_meshfill_pattern_SH_-180_180.png
baselines/vcs/test_vcs_meshfill_pattern_SH_-180_180_non-contig.png
baselines/vcs/test_vcs_meshfill_pattern_SH_0_360.png
baselines/vcs/test_vcs_meshfill_solid_SH_-180_180.png
baselines/vcs/test_vcs_meshfill_solid_SH_-180_180_non-contig.png
baselines/vcs/test_vcs_meshfill_solid_SH_0_360.png

@danlipsa
Copy link
Contributor Author

@doutriaux1 Yes, that is the test file, the tests are the one I posted.

@danlipsa
Copy link
Contributor Author

Baselines that go with this
CDAT/uvcdat-testdata#103

@danlipsa
Copy link
Contributor Author

@doutriaux1 @aashish24 I think I found a solution. I wrap only for TransientCurveGrid

sampleCurveGrid4.nc data is cut along an irregular line (not along a longitude line).
This causes lon data to vary betwen -40 and  361. We wrap this data
to the -40,320 interval. In general we wrap data to the interval minX,minX+360
where minX is the minimum longitude value.
@danlipsa
Copy link
Contributor Author

@doutriaux1 @aashish24 please review. Note the 36 updated baselines.

@danlipsa
Copy link
Contributor Author

@doutriaux1 the macs seem hanged. Could you restart them? Thanks!

@danlipsa
Copy link
Contributor Author

@doutriaux1 @aashish24 Ping

@danlipsa
Copy link
Contributor Author

@doutriaux1 @aashish24 All test passed, please review. I would like to merge this in.

@aashish24
Copy link
Contributor

Looks good to me but it would be great if @doutriaux1 can review this.

@doutriaux1
Copy link
Contributor

@danlipsa @aashish24 @williams13 do we want this in 2.4 or in 2.4.1 ?

@aashish24
Copy link
Contributor

@doutriaux1 we definitely want in 2.4.1. We can start 2.4.0 with a older sha if needed.

@aashish24
Copy link
Contributor

@doutriaux1 could you please review this branch ?

else:
attributes2 = grid2.GetPointData()
attributes = grid.GetPointData()
attributes2.SetPedigreeIds(attributes.GetPedigreeIds())
Copy link
Contributor

Choose a reason for hiding this comment

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

@danlipsa what is Pedigree?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is a terminology VTK uses. It is just an index to keep track of where pieces of cells end up after I wrap the dataset around. Certain cells will be cut in two pieces which will end up in different parts of the dataset. When the scalars are updated I use those indexes to set the proper scalar for each cell.

@danlipsa
Copy link
Contributor Author

Sorry, I pushed by mistake my current work on top of this. All tests should pass now.

@doutriaux1
Copy link
Contributor

@danlipsa looks like master is too far away from your branch (in baseline) do you mind merging master in?

@doutriaux1
Copy link
Contributor

Never mind, it's a bot issue. But got locked out of both bots... Yeah... Will fix tomorrow. Bots seem OK. Will build on my Mac just to be safe (hopefully tonight) and will merge

@danlipsa
Copy link
Contributor Author

@doutriaux1 Sounds good. Thanks Charles.

@doutriaux1
Copy link
Contributor

ok passes on my mac as well. Merging!
https://open.cdash.org/testDetails.php?test=412544295&build=4202288

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.

None yet

3 participants