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

Unstructured plots #1225

Merged
merged 11 commits into from Apr 24, 2015
Merged

Unstructured plots #1225

merged 11 commits into from Apr 24, 2015

Conversation

@doutriaux1
Copy link
Contributor

@doutriaux1 doutriaux1 commented Apr 20, 2015

@dlonie @chaosphere2112 please review
dashboard: https://open.cdash.org/buildSummary.php?buildid=3780331

doutriaux1 added 4 commits Apr 17, 2015
make sure unstrucutred are not plotted against non valid methods
removed print in cdms2
added test case to make sure failing gms do fail
@doutriaux1
Copy link
Contributor Author

@doutriaux1 doutriaux1 commented Apr 20, 2015

@doutriaux1
Copy link
Contributor Author

@doutriaux1 doutriaux1 commented Apr 20, 2015

@ThomasMaxwell can you please try it too? I'm a bit worried it breaks your unstructured grids! Your tests pass but I would feel better if you would try your unstructured grids plotting on this.

@ThomasMaxwell
Copy link
Contributor

@ThomasMaxwell ThomasMaxwell commented Apr 20, 2015

I don’t see any effect of this branch upon the vcs3D unstructured grid plots.

— Tom

From: Charles Doutriaux <notifications@github.commailto:notifications@github.com>
Reply-To: UV-CDAT/uvcdat <reply@reply.github.commailto:reply@reply.github.com>
Date: Monday, April 20, 2015 at 2:47 PM
To: UV-CDAT/uvcdat <uvcdat@noreply.github.commailto:uvcdat@noreply.github.com>
Cc: "Maxwell, Thomas P. (GSFC-606.2)[SCIENCE APPLICATIONS INTL CORP]" <thomas.maxwell@nasa.govmailto:thomas.maxwell@nasa.gov>
Subject: Re: [uvcdat] Unstructured plots (#1225)

@ThomasMaxwellhttps://github.com/ThomasMaxwell can you please try it too? I'm a bit worried it breaks your unstructured grids! Your tests pass but I would feel better if you would try your unstructured grids plotting on this.


Reply to this email directly or view it on GitHubhttps://github.com//pull/1225#issuecomment-94537605.


# Ok let's check for meshfill needed
if g0 is not None and (arglist[0] is not None and isinstance(arglist[0],cdms2.avariable.AbstractVariable) and not isinstance(arglist[0].getGrid(),cdms2.grid.AbstractRectGrid)) and arglist[3] not in ["meshfill",]:
raise RuntimeError("You are attempting to plot unstructured grid with a method that is not meshfill")
Copy link
Contributor Author

@doutriaux1 doutriaux1 Apr 20, 2015

@ThomasMaxwell thanks for checking. Specifically that is the area I was worried about. Glad it didn't break your stuff.

@aashish24 aashish24 added this to the 2.2 milestone Apr 23, 2015
@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Apr 23, 2015

@dlonie can you approve this branch (just verify my changes). The tests are passing for me.

@doutriaux1 I cannot verify if the baseline looks correct. Can you double check on that please?

x.drawlogooff()
x.setbgoutputdimensions(1200,1091,units="pixels")

import vcs
Copy link
Contributor

@allisonvacanti allisonvacanti Apr 23, 2015

These imports (and the checkimage/open below) don't need to be repeated. Accidental copy/paste?

allisonvacanti
Copy link
Contributor

allisonvacanti commented on d6b81af Apr 23, 2015

237 characters O.o

aashish24
Copy link
Contributor

aashish24 commented on d6b81af Apr 23, 2015

Okay, I will wrap it as well 😄

aashish24
Copy link
Contributor

aashish24 commented on d6b81af Apr 23, 2015

ahh..too many style issues. I will push a new PR for that.

@allisonvacanti
Copy link
Contributor

@allisonvacanti allisonvacanti commented Apr 23, 2015

I don't see any functional issues, but the repeated lines of code in the test are confusing.

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Apr 23, 2015

good catch. I took care of it. Please have a look again

allisonvacanti
Copy link
Contributor

allisonvacanti commented on 3d1a738 Apr 23, 2015

From here to x.plot(...) (lines 16-27 in the new diff) looks repeated as well.

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Apr 23, 2015

Grr...Okay..pushed a fix again.

@aashish24 aashish24 force-pushed the unstructured_plots branch from 7c52dac to 2d79cba Apr 23, 2015
@aashish24 aashish24 force-pushed the unstructured_plots branch from 2d79cba to d7bf1c3 Apr 23, 2015
@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Apr 23, 2015

@dlonie I guess it should be all good now.

@allisonvacanti
Copy link
Contributor

@allisonvacanti allisonvacanti commented Apr 23, 2015

+1. You beat me to the missing newline ;)

@allisonvacanti
Copy link
Contributor

@allisonvacanti allisonvacanti commented Apr 23, 2015

Can't merge for conflicts, though.

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Apr 23, 2015

@dlonie wait before you review it.

@aashish24 aashish24 force-pushed the unstructured_plots branch from f51e761 to 45db658 Apr 23, 2015
@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Apr 23, 2015

Okay now it should be good to review.

@@ -266,6 +266,15 @@ cdat_add_test(vcs_test_taylor_2_quads

# These test actually plot things need sample data
if (CDAT_DOWNLOAD_SAMPLE_DATA)
cdat_add_test(test_vcs_plot_unstructured_via_non_meshfill_or_default_fails
Copy link
Contributor

@allisonvacanti allisonvacanti Apr 23, 2015

This file seems to be missing from the branch.

Copy link
Contributor

@allisonvacanti allisonvacanti Apr 23, 2015

The test script, that is.

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Apr 23, 2015

Ah, okay, I don't know why I didn't see that in my ctest. Let me have a look at it.

@aashish24
Copy link
Contributor

@aashish24 aashish24 commented Apr 23, 2015

@dlonie Should be fixed now.

@allisonvacanti
Copy link
Contributor

@allisonvacanti allisonvacanti commented Apr 24, 2015

Tests pass, change looks good \o/

allisonvacanti pushed a commit that referenced this issue Apr 24, 2015
@allisonvacanti allisonvacanti merged commit 117d997 into master Apr 24, 2015
0 of 2 checks passed
@doutriaux1 doutriaux1 deleted the unstructured_plots branch May 14, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants