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.

Sign up for GitHub

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

Jump to bottom

Dfn transport #219

Merged
merged 108 commits into from
Feb 21, 2019
Merged

Dfn transport #219

Show file tree
Hide file tree
Changes from 100 commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
08ef486
error fix in the importer dfn_3d_from_fab, probably due to an old imp…
alessiofumagalli Nov 20, 2018
9b9b91c
fix the ndof for the upwind coupler, this is not really an error but …
alessiofumagalli Nov 20, 2018
c49f2bb
introduce a first example for a dfn_transport, it compute flux with d…
alessiofumagalli Nov 20, 2018
3c2e4a6
update example1 by make the bc easier to define in the dfn_transport
alessiofumagalli Nov 20, 2018
6275891
add discretization for the mass matrix, used in the time dependent part
alessiofumagalli Nov 20, 2018
f9654bc
add second example of a dfn with flow and time dependent advection+di…
alessiofumagalli Nov 20, 2018
ebb7b40
Merge branch 'develop' into dfn_transport
alessiofumagalli Nov 26, 2018
8f5270d
add a tolerance in the rotation of the grid, to overwrite default val…
alessiofumagalli Nov 26, 2018
f46fd20
in the comp_geom.map_grid propagate the input tolerance into the proj…
alessiofumagalli Nov 26, 2018
83f721b
add a new example in the dfn_transport
alessiofumagalli Nov 26, 2018
c5c7c61
dfn transport: example 3. Add extra parameters in the data useful for…
alessiofumagalli Nov 27, 2018
9ae762a
add post_process script to summarise data
alessiofumagalli Nov 27, 2018
6fc483f
add example 4 for the dfn transport test case
alessiofumagalli Nov 27, 2018
de5f6d3
in dfn_transport rename a folder which will be not included in a poss…
alessiofumagalli Nov 28, 2018
2376650
in dfn_transport rename a second folder which will be not included in…
alessiofumagalli Nov 28, 2018
c522a51
in dfn_transport rename a folder where the example is now the possibl…
alessiofumagalli Nov 28, 2018
e268f7b
in dfn_transport rename a folder where the example is now the possibl…
alessiofumagalli Nov 28, 2018
17848b7
add a function to compute the flux jump on each trace, useful for the…
alessiofumagalli Nov 28, 2018
59d79a8
Merge branch 'develop' into dfn_transport
alessiofumagalli Dec 3, 2018
07b9485
in the dfn_transport examples: adapt the discretization setup to the …
alessiofumagalli Dec 3, 2018
848dd75
in dfn_transport, add first example and update example 2
alessiofumagalli Dec 3, 2018
4ae35f5
in the dfn_transport remove useless data file, now it's handled in a …
alessiofumagalli Dec 3, 2018
7d7b23d
dfn transport - update the main file
alessiofumagalli Dec 4, 2018
6737cdc
dfn transport, add the geometries
alessiofumagalli Dec 4, 2018
3618858
dfn transport, the first example loops on all the considered geometries
alessiofumagalli Dec 4, 2018
6ae1a54
consider the 1d with (almost) empty volume, this is just a temporal fix
alessiofumagalli Dec 4, 2018
2096a6d
dfn transport, define two scenarios (boundary conditions related) for…
alessiofumagalli Dec 4, 2018
c603634
dfn transport: in the mass discretization fix the behavior for the lo…
alessiofumagalli Dec 5, 2018
37030f7
Merge branch 'develop' into dfn_transport
alessiofumagalli Dec 6, 2018
da87281
dfn transport, allow the exporting of the P0 velocity
alessiofumagalli Dec 6, 2018
5718da0
dfn transport, update test case of complex geometry
alessiofumagalli Dec 6, 2018
931c9b6
allow to cut the dfn while importing by giving a box
alessiofumagalli Dec 6, 2018
83c11fd
dfn transport, add extra variables for post process
alessiofumagalli Dec 6, 2018
25192c3
remove debug point
alessiofumagalli Dec 6, 2018
38d7f27
dfn transport, add post process script for example 1
alessiofumagalli Dec 6, 2018
7da44aa
dfn transport, add outflow computation
alessiofumagalli Dec 6, 2018
7ce7916
dfn transport, update post process and plot-over-time example 1
alessiofumagalli Dec 6, 2018
fd54196
Merge branch 'develop' into dfn_transport
alessiofumagalli Dec 11, 2018
2632436
dfn transport, remove useless dfn geometry
alessiofumagalli Dec 11, 2018
ac64e83
dfn transport, rename file according to the order of the examples
alessiofumagalli Dec 11, 2018
98e4d13
dfn transport, rename file according to the order of the examples
alessiofumagalli Dec 11, 2018
2d5ef0e
dfn transport, remove useless dfn geometries
alessiofumagalli Dec 11, 2018
15fc240
dfn transport, update the geometry of example 3 by cutting the domain
alessiofumagalli Dec 11, 2018
d5ac077
dfn transport, consider an already cut dfn instead of using a box arg…
alessiofumagalli Dec 11, 2018
e30969a
dfn transport, add the possibility to impose a different boundary con…
alessiofumagalli Dec 11, 2018
b2e36e0
Merge branch 'dfn_transport' of github.com:pmgbergen/porepy into dfn_…
alessiofumagalli Dec 11, 2018
1c02cef
dfn trasnport, add more time steps and increase the pressure gradient
alessiofumagalli Dec 12, 2018
452842b
dfn transport, add the possibility to define physical parameters for …
alessiofumagalli Dec 12, 2018
c364e61
dfn transport, add the possibility to impose the initial condition
alessiofumagalli Dec 12, 2018
6516a7f
in rt0 consider a custom tolerance (with a default value) in the mapp…
alessiofumagalli Jan 9, 2019
80adf0e
in mpfa consider a custom tolerance (with a default value) in the map…
alessiofumagalli Jan 9, 2019
b45cf3b
in the extract_flux and extract_pressure for the dual_elliptic remove…
alessiofumagalli Jan 9, 2019
fe93978
in mvem consider a custom tolerance (with a default value) in the map…
alessiofumagalli Jan 9, 2019
abca4aa
update the computation of extract flux for fv scheme by using the new…
alessiofumagalli Jan 9, 2019
9808302
in the example of dfn_transport, update the list of discretization an…
alessiofumagalli Jan 9, 2019
7d8b856
dfn_transport, adapt the main files of the example with the new inter…
alessiofumagalli Jan 9, 2019
ffc0d5f
dfn_transport, in the tests consider the outflow without the flux
alessiofumagalli Jan 11, 2019
895bf94
dfn_transport, update the post process files
alessiofumagalli Jan 11, 2019
0f3527c
dfn_transport, update outflow computation
alessiofumagalli Jan 14, 2019
01f581f
dfn_transport, update post process computation
alessiofumagalli Jan 14, 2019
6062a94
dfn_transport, avoid mpfa in the solvers
alessiofumagalli Jan 14, 2019
709000d
dfn_transport, for the mvem consider the coarsening with the same num…
alessiofumagalli Jan 14, 2019
26e533f
dfn_trasnport, update definition of mesh size for example 1
alessiofumagalli Jan 16, 2019
bc9a1fb
dfn_transport, extract the flux and the pressure
alessiofumagalli Jan 17, 2019
9e040b3
dfn_transport, fix computation of flux
alessiofumagalli Jan 21, 2019
0ed583b
dfn_tranport, example 1 fix the grid size for the examples
alessiofumagalli Jan 21, 2019
d32ab86
dfn_transport, add the export of the grids for the MVEM case
alessiofumagalli Jan 21, 2019
03c3aa3
dfn_transport, update the post process script
alessiofumagalli Jan 21, 2019
cf5dfbc
dfn_transport, update the plot over time script
alessiofumagalli Jan 21, 2019
2db4ed7
dfn_transport, update the plot over time script
alessiofumagalli Jan 21, 2019
a854a4e
Merge branch 'dfn_transport' of github.com:pmgbergen/porepy into dfn_…
alessiofumagalli Jan 21, 2019
d91ba68
during the coarsening keep track of the new mapping also for the face…
alessiofumagalli Jan 23, 2019
4376125
dfn_transport, since we couple MVEM with primal VEM (from Torino) no …
alessiofumagalli Jan 23, 2019
b047a1c
bug fix, when computing the cell center of a star shaped cell shift t…
alessiofumagalli Jan 23, 2019
b798ea0
dfn_transport, small fix in discretization
alessiofumagalli Jan 23, 2019
3abd994
add to the exporting also the face boundary tag
alessiofumagalli Jan 24, 2019
9553e77
dfn_transport, after a bug fixed reactivate the mvem simulation
alessiofumagalli Jan 29, 2019
8c07597
dfn_transport, set up mvem coarse grid for case 2
alessiofumagalli Feb 5, 2019
dbfaf7a
dfn_trasnport, update post process example 1
alessiofumagalli Feb 5, 2019
2fe7cba
dfn_transport, consider Aavatsmark way of computing transmissibilitie…
alessiofumagalli Feb 6, 2019
70764c4
Merge branch 'develop' into dfn_transport
alessiofumagalli Feb 18, 2019
b0e51fb
remove useless functions, use now the new interface
alessiofumagalli Feb 18, 2019
978ffbb
dfn_transport, remove unused mpfa scheme
alessiofumagalli Feb 18, 2019
512a2ef
dfn_transport, change name from PressureTrace to EmptyDiscretization …
alessiofumagalli Feb 18, 2019
eb6da2d
dfn_transport, consider the time step explicitly after the creation o…
alessiofumagalli Feb 18, 2019
5e5542a
dfn_transport, remove useless intersection files
alessiofumagalli Feb 18, 2019
70f9874
dfn_transport, in the example use the new interface to create the grids
alessiofumagalli Feb 18, 2019
a124446
dfn_transport, remove unused examples
alessiofumagalli Feb 18, 2019
d0fe304
fix default value for the extract pressure and flux
alessiofumagalli Feb 18, 2019
3ab676c
in the mpfa set the default value for the tolerance to 1e-5, the one …
alessiofumagalli Feb 18, 2019
25cc1c6
change name from EmptyDiscretization to Cell_dof_face_dof_map
alessiofumagalli Feb 18, 2019
1d24215
remove unused files
alessiofumagalli Feb 18, 2019
fe206cf
remove useless import and logger
alessiofumagalli Feb 18, 2019
c371985
re-introduce the inverter for mpfa that was deleted, not sure why
alessiofumagalli Feb 18, 2019
db5e4a3
dfn tranport, add post process file
alessiofumagalli Feb 18, 2019
e49c49f
dfn transport, introduce a reaction and source term in the discretiza…
alessiofumagalli Feb 18, 2019
ebefb9a
dfn transport, update example3 to consider the reaction and source term
alessiofumagalli Feb 18, 2019
7fb8b46
change the name of Integral to ScalarSource, the new implementation h…
alessiofumagalli Feb 18, 2019
fdfbad9
dfn transport, update post process plot over time
alessiofumagalli Feb 18, 2019
c1b0702
fix pytest, from Integral to ScalarSource
alessiofumagalli Feb 19, 2019
548dea5
modifications according to codacy
alessiofumagalli Feb 19, 2019
8a123db
fix other suggestions from codacy
alessiofumagalli Feb 19, 2019
cdfa72e
change name from Cell_dof_face_dof_map to CellDofFaceDofMap
alessiofumagalli Feb 20, 2019
f03cb80
add comments to the function star_shape_cell_centers
alessiofumagalli Feb 20, 2019
bb4120c
change from tol to deviation_from_plane_tol + additional comments
alessiofumagalli Feb 20, 2019
54c5065
remove useless -------- line
alessiofumagalli Feb 20, 2019
e2bbc34
run black on the modified files of the branch dfn_transport
alessiofumagalli Feb 20, 2019
6ea62d6
revert a part of the code to a previous status in elliptic interface …
alessiofumagalli Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/example4/test_dual_varying_k.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ def main(N):

up = sps.linalg.spsolve(A_flow + A_source, b_flow + b_source)
keileg marked this conversation as resolved.
Show resolved Hide resolved

u = solver_flow.extract_flux(g, up)
p = solver_flow.extract_pressure(g, up)
u = solver_flow.extract_flux(g, up, data)
p = solver_flow.extract_pressure(g, up, data)
# P0u = solver_flow.project_flux(g, u, data, keyword="flow")

diam = np.amax(g.cell_diameters())
Expand Down
4 changes: 2 additions & 2 deletions examples/example4/test_dual_varying_k_surface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ def main(N):

up = sps.linalg.spsolve(A_flow + A_source, b_flow + b_source)

u = solver_flow.extract_flux(g, up)
p = solver_flow.extract_pressure(g, up)
u = solver_flow.extract_flux(g, up, data)
p = solver_flow.extract_pressure(g, up, data)
# P0u = solver_flow.project_flux(g, u, data)

diam = np.amax(g.cell_diameters())
Expand Down
4 changes: 2 additions & 2 deletions examples/example4/test_dual_varying_k_surface_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ def main(N):

up = sps.linalg.spsolve(A_flow + A_source, b_flow + b_source)

u = solver_flow.extract_flux(g, up)
p = solver_flow.extract_pressure(g, up)
u = solver_flow.extract_flux(g, up, data)
p = solver_flow.extract_pressure(g, up, data)
P0u = solver_flow.project_flux(g, u, data)

diam = np.amax(g.cell_diameters())
Expand Down
2 changes: 1 addition & 1 deletion examples/example4/test_mpfa_varying_k.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def main(N):
# Choose and define the solvers
solver = pp.Mpfa("flow")
A, b_flux = solver.assemble_matrix_rhs(g, data)
_, b_source = pp.Integral("flow").assemble_matrix_rhs(g, data)
_, b_source = pp.ScalarSource("flow").assemble_matrix_rhs(g, data)
p = sps.linalg.spsolve(A, b_flux + b_source)

diam = np.amax(g.cell_diameters())
Expand Down
2 changes: 1 addition & 1 deletion examples/example4/test_mpfa_varying_k_surface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def main(N):
# Choose and define the solvers
solver = pp.Mpfa("flow")
A, b_flux = solver.assemble_matrix_rhs(g, data)
_, b_source = pp.Integral("flow").assemble_matrix_rhs(g, data)
_, b_source = pp.ScalarSource("flow").assemble_matrix_rhs(g, data)
p = sps.linalg.spsolve(A, b_flux + b_source)

diam = np.amax(g.cell_diameters())
Expand Down
2 changes: 1 addition & 1 deletion examples/example4/test_mpfa_varying_k_surface_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def main(N):
# Choose and define the solvers
solver = pp.Mpfa("flow")
A, b_flux = solver.assemble_matrix_rhs(g, data)
_, b_source = pp.Integral("flow").assemble_matrix_rhs(g, data)
_, b_source = pp.ScalarSource("flow").assemble_matrix_rhs(g, data)
p = sps.linalg.spsolve(A, b_flux + b_source)

diam = np.amax(g.cell_diameters())
Expand Down
2 changes: 1 addition & 1 deletion examples/example5/test_upwind_examples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def funp_ex(pt):

up = sps.linalg.spsolve(D_flow + D_source, b_flow + b_source)

p, u = solver.extract_pressure(g, up), solver.extract_flux(g, up)
p, u = solver.extract_pressure(g, up, data), solver.extract_flux(g, up, data)
P0u = solver.project_flux(g, u, data)

save = pp.Exporter(g, "darcy", folder)
Expand Down