Merged
Conversation
added 4 commits
November 25, 2019 10:52
…up() for dradius, to handle cases with one time step only
…traction of 2d rectagular grid is not operational yet
…D() to handle 'rect' meshes (nearest interpolation)
…rest' interp only
added 8 commits
November 25, 2019 18:15
Member
Author
|
Ready for merging when reviewed @lasofivec :-) |
Codecov Report
@@ Coverage Diff @@
## devel #280 +/- ##
==========================================
- Coverage 41.46% 41.11% -0.36%
==========================================
Files 79 79
Lines 23229 23432 +203
==========================================
Hits 9633 9633
- Misses 13596 13799 +203
Continue to review full report at Codecov.
|
lasofivec
approved these changes
Nov 26, 2019
| msg += " - faces.shape: %s\n"%str(dd[dk][k0]['faces'].shape) | ||
| msg += " - unique faces.shape: %s"%str(facesu.shape) | ||
| raise Exception(msg) | ||
| assert v0['type'] in ['rect', 'tri', 'quadtri'], v0['type'] |
Collaborator
There was a problem hiding this comment.
I thought you wanted to get rid of "assert" statements?
Member
Author
There was a problem hiding this comment.
You're right, I replace it with if / raise
| except Exception as err: | ||
| msg = "Could not get data from %s"%ids | ||
| warnings.warn(msg) | ||
| if anyerror: |
Collaborator
There was a problem hiding this comment.
shouldn't anyerror should be set to True if an Exception was found aswell ?
…-coded separator, fixed
lasofivec
approved these changes
Nov 26, 2019
Merged
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Main changes:
Warnings when loading data from MultiIDSLoader fails for some data (in particular when using method to_Plasma2D()) is now just as informative but more concise and easier to read.
method MultiIDSLoader.to_Plasma2D() now more robust versus one-time-step-only data
Introduced the basics for handling of rectangular meshes (R, Z) for interpolation via Plasma2D (nearest interpolation only)
User has to define R and Z grid as '2dmeshR' and '2dmeshZ'
Minor bug fixes in imas2tofu introduced by latest changes, detected when testing by hand, fixed
Issues:
Fixes, in devel, issue #218