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

Dfn transport #219

Merged
merged 108 commits into from Feb 21, 2019
Merged

Dfn transport #219

merged 108 commits into from Feb 21, 2019

Conversation

alessiofumagalli
Copy link
Contributor

some updates mainly related to the dfn upscaling paper. there are few fixing of the code, so very useful. please consider a deep check mainly on that parts. the branch might not be 100% finished, but 99%.

…arcy and then a advection+diffusion with tpfa and upwind
Conflicts:
    src/porepy/numerics/interface_laws/elliptic_interface_laws.py
@coveralls
Copy link

coveralls commented Feb 18, 2019

Coverage Status

Coverage increased (+0.8%) to 79.426% when pulling 6ea62d6 on dfn_transport into 8c8130e on develop.

src/porepy/numerics/fv/fv_elliptic.py Show resolved Hide resolved
src/porepy/numerics/fv/mpfa.py Outdated Show resolved Hide resolved
@@ -10,7 +10,7 @@
import scipy.sparse as sps


class EmptyDiscretization(object):
class Cell_dof_face_dof_map(object):
Copy link
Contributor

Choose a reason for hiding this comment

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

Documentation update needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

what do you mean?

@alessiofumagalli
Copy link
Contributor Author

@IvarStefansson , should I raise an error for extract_flux? OK for the documentation of Cell_dof_face_dof_map

Copy link
Contributor

@keileg keileg left a comment

Choose a reason for hiding this comment

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

I am mostly happy; the only substantial change is the naming of the tolerance in mpfa/vem/rt0 (should also be tpfa?).

examples/example4/test_dual_varying_k.py Show resolved Hide resolved
src/porepy/__init__.py Show resolved Hide resolved
src/porepy/grids/coarsening.py Show resolved Hide resolved
src/porepy/numerics/fem/rt0.py Outdated Show resolved Hide resolved
src/porepy/numerics/fv/fv_elliptic.py Show resolved Hide resolved
src/porepy/numerics/vem/mvem.py Outdated Show resolved Hide resolved
src/porepy/utils/half_space.py Show resolved Hide resolved
if g_master.dim == g_slave.dim:
self.discr_slave.enforce_neumann_int_bound(
g_slave, data_edge, matrix, True, slave_ind
)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@keileg , @rbe051 not sure what happened, I didn't touch this part of the code. Which version should I consider?

Copy link
Contributor

Choose a reason for hiding this comment

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

The finite volume schemes does not use the enforce_neumann_int_bound, but my guess is that the first is correct. Otherwise are you will try to enforce Neumann conditions on the cells of the lower dim grid?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

so I should reverse the change to the original one?

Copy link
Contributor

Choose a reason for hiding this comment

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

I think so.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think so.

if g_master.dim == g_slave.dim:
self.discr_slave.enforce_neumann_int_bound(
g_slave, data_edge, matrix, True, slave_ind
)
Copy link
Contributor

Choose a reason for hiding this comment

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

The finite volume schemes does not use the enforce_neumann_int_bound, but my guess is that the first is correct. Otherwise are you will try to enforce Neumann conditions on the cells of the lower dim grid?

@alessiofumagalli alessiofumagalli merged commit 38a9a8d into develop Feb 21, 2019
@alessiofumagalli alessiofumagalli deleted the dfn_transport branch February 21, 2019 08:16
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

5 participants