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

Conversation

Projects
None yet
3 participants
@danlipsa
Contributor

danlipsa commented Jan 13, 2016

No description provided.

@danlipsa

This comment has been minimized.

Contributor

danlipsa commented Jan 13, 2016

@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

This comment has been minimized.

@danlipsa

This comment has been minimized.

Contributor

danlipsa commented Jan 13, 2016

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

This comment has been minimized.

Contributor

danlipsa commented Jan 13, 2016

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

@danlipsa

This comment has been minimized.

Contributor

danlipsa commented Jan 13, 2016

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

@danlipsa danlipsa force-pushed the irregular-cut-wrap branch from 357f781 to 1215166 Jan 13, 2016

@danlipsa

This comment has been minimized.

Contributor

danlipsa commented Jan 13, 2016

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

BUG #1754: irregular cuts are not wrapped.
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 danlipsa force-pushed the irregular-cut-wrap branch from 1215166 to d58bd1b Jan 13, 2016

@danlipsa

This comment has been minimized.

Contributor

danlipsa commented Jan 14, 2016

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

@danlipsa

This comment has been minimized.

Contributor

danlipsa commented Jan 14, 2016

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

@danlipsa

This comment has been minimized.

Contributor

danlipsa commented Jan 15, 2016

@danlipsa

This comment has been minimized.

Contributor

danlipsa commented Jan 15, 2016

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

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Jan 18, 2016

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

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Jan 19, 2016

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

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Jan 19, 2016

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

@aashish24

This comment has been minimized.

Contributor

aashish24 commented Jan 20, 2016

@doutriaux1 could you please review this branch ?

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

This comment has been minimized.

@doutriaux1

doutriaux1 Jan 21, 2016

Member

@danlipsa what is Pedigree?

This comment has been minimized.

@danlipsa

danlipsa Jan 21, 2016

Contributor

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 danlipsa force-pushed the irregular-cut-wrap branch from c8fdceb to d58bd1b Jan 21, 2016

@danlipsa

This comment has been minimized.

Contributor

danlipsa commented Jan 21, 2016

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

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Jan 22, 2016

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

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Jan 22, 2016

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

This comment has been minimized.

Contributor

danlipsa commented Jan 22, 2016

@doutriaux1 Sounds good. Thanks Charles.

@doutriaux1

This comment has been minimized.

Member

doutriaux1 commented Jan 22, 2016

doutriaux1 added a commit that referenced this pull request Jan 22, 2016

@doutriaux1 doutriaux1 merged commit d42bf96 into master Jan 22, 2016

5 of 8 checks passed

cont-int/LLNL/Darwin-Mac (FULL) 'In Queue: 0' (Thu Jan 21 21:47:10 2016)
Details
cont-int/LLNL/Darwin-Mac (NOGUI) 'In Queue: 0' (Thu Jan 21 21:47:09 2016)
Details
cont-int/LLNL/Darwin-Mac LEAN 'In Queue: 0' (Thu Jan 21 21:47:09 2016)
Details
cont-int/LLNL/Linux-RH6 (MESA) 'ctest -j12 -D Exper' (Thu Jan 21 22:12:35 2016)
Details
cont-int/LLNL/Linux-Ub. 15.10 (FULL/MESA) 'ctest -j15 -D Exper' (Thu Jan 21 22:37:53 2016)
Details
continuous-integration/kitware-buildbot/uvcdat-garant-linux-release/ Build done.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@doutriaux1 doutriaux1 deleted the irregular-cut-wrap branch Jan 22, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment