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

Feat/tree functions #177

Merged
merged 15 commits into from
Jul 8, 2019
Merged

Feat/tree functions #177

merged 15 commits into from
Jul 8, 2019

Conversation

micmitch
Copy link
Contributor

The addition of several functions from @jcapriot to make it easier to work with octree meshes. Several of the functions are used to integrate line source terms for FDEM. Other improvements include updating documentation and improving plotGrid to visualize octree meshes and models.

@codecov
Copy link

codecov bot commented Jun 26, 2019

Codecov Report

Merging #177 into master will decrease coverage by 0.65%.
The diff coverage is 41.53%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #177      +/-   ##
==========================================
- Coverage   81.02%   80.36%   -0.66%     
==========================================
  Files          23       23              
  Lines        4848     5328     +480     
==========================================
+ Hits         3928     4282     +354     
- Misses        920     1046     +126
Impacted Files Coverage Δ
discretize/TensorMesh.py 75.92% <0%> (ø) ⬆️
discretize/View.py 75.34% <100%> (+3.02%) ⬆️
discretize/TreeMesh.py 40.9% <42.01%> (-6.51%) ⬇️
discretize/utils/codeutils.py 95.45% <0%> (-4.55%) ⬇️
discretize/utils/matutils.py 92.9% <0%> (-2.03%) ⬇️
discretize/mixins/vtkModule.py 79.92% <0%> (-0.44%) ⬇️
discretize/utils/meshutils.py 89.33% <0%> (-0.37%) ⬇️
discretize/mixins/__init__.py 61.9% <0%> (+1.9%) ⬆️
discretize/base/base_mesh.py 81.93% <0%> (+2.49%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 75f5068...0e7a38b. Read the comment docs.

@codecov
Copy link

codecov bot commented Jun 26, 2019

Codecov Report

Merging #177 into master will decrease coverage by 1.15%.
The diff coverage is 41.53%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #177      +/-   ##
==========================================
- Coverage    83.1%   81.94%   -1.16%     
==========================================
  Files          23       23              
  Lines        4894     4974      +80     
==========================================
+ Hits         4067     4076       +9     
- Misses        827      898      +71
Impacted Files Coverage Δ
discretize/TensorMesh.py 80.55% <0%> (ø) ⬆️
discretize/View.py 73.09% <100%> (+0.03%) ⬆️
discretize/TreeMesh.py 57.27% <42.01%> (-11.66%) ⬇️
discretize/utils/codeutils.py 82.85% <0%> (-2.86%) ⬇️
discretize/utils/matutils.py 92.9% <0%> (-2.03%) ⬇️
discretize/utils/meshutils.py 93.01% <0%> (-0.37%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9ffbca3...8608d36. Read the comment docs.

Copy link
Member

@lheagy lheagy left a comment

Choose a reason for hiding this comment

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

Many thanks for all of the docstrings! This is looking good. I have just merged the latest master and will see what happens with the testing. It looks like the previous fail was due to python 2.7. If it is still the case, I am totally fine dropping the python 2.7 testing and noting that we no longer explicitly support 2.7 rather than going hunting for the issue.

@jcapriot, @micmitch were there any other updates you wanted to make before we merge this in?

@property
def permuteCC(self):
"""Permutation matrix re-ordering of cells sorted by x, then y, then z"""
Copy link
Member

Choose a reason for hiding this comment

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

Thanks for the doc-strings :)

@jcapriot
Copy link
Member

jcapriot commented Jul 3, 2019

I don't have any more local things left on this so I'm good to pull this in

@lheagy
Copy link
Member

lheagy commented Jul 8, 2019

It seems that only python 2.7 is giving issues here. I am inclined to just remove testing and indicate that we no longer explicitly support python 2.7. Are there any concerns with this?

@lheagy lheagy merged commit 67588be into master Jul 8, 2019
@lheagy lheagy deleted the feat/tree_functions branch July 8, 2019 21:10
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.

3 participants