Merge bfdfc83 into 2941a07

pmgbergen · Aug 9, 2018 · 1aed152 · 1aed152
2 parents 2941a07 + bfdfc83
commit 1aed152
Show file tree

Hide file tree

Showing 21 changed files with 4 additions and 3 deletions.
diff --git a/examples/papers/Readme.md b/examples/papers/Readme.md
@@ -8,6 +8,7 @@ We try to keep the examples updated as the code changes, but may not always succ
 * [arXiv_1709_03519](./arXiv_1709_03519/) arXiv paper with title "*Dual virtual element method in presence of an inclusion*" by Alessio Fumagalli. See [link](https://arxiv.org/abs/1709.03519).
 * [arXiv_1711_01818](./arXiv_1711_01818/) arXiv paper with title "*Dual Virtual Element Methods for Discrete Fracture Matrix Models*" by Alessio Fumagalli, Eirik Keilegavlen. See [link](https://arxiv.org/abs/1711.01818).
 * [arXiv_1712_00460](./arXiv_1712_00460) arXiv paper with title "*PorePy: An Open-Source Simulation Tool for Flow and Transport in Deformable Fractured Rocks*" by Eirik Keilegavlen, Alessio Fumagalli, Runar Berge, Ivar Stefansson, Inga Berre. See [link](https://arxiv.org/abs/1712.00460).
-* [arXiv_1712_07392](./arXiv_1712_07392) arXiv paper with title "* Implementation of mixed-dimensional models for flow in fractured porous media*" by Eirik Keilegavlen, Alessio Fumagalli, Runar Berge, Ivar Stefansson. See [link](https://arxiv.org/abs/1712.07392).
-* [arXiv_1712_08479](./arXiv_1712_08479) Paper "* Hybrid-Dimensional Finite Volume Discretizations for Fractured Porous Media*" by Ivar Stefansson, Inga Berre, Eirik Keilegavlen.
-* [arXiv-1803_01732](./arXiv_1803_01732) arxiv paper "*Conforming, non-conforming and non-matching discretization couplings in discrete fracture network simulations*" by Alessio Fumagalli, Eirik Keilegavlen, and Stefano Scialo'. See [link](https://arxiv.org/abs/1803.01732).
+* [arXiv_1712_07392](./arXiv_1712_07392) arXiv paper with title "*Implementation of mixed-dimensional models for flow in fractured porous media*" by Eirik Keilegavlen, Alessio Fumagalli, Runar Berge, Ivar Stefansson. See [link](https://arxiv.org/abs/1712.07392).
+* [arXiv_1712_08479](./arXiv_1712_08479) Paper "*Hybrid-Dimensional Finite Volume Discretizations for Fractured Porous Media*" by Ivar Stefansson, Inga Berre, Eirik Keilegavlen.
+* [arXiv_1803_01732](./arXiv_1803_01732) arxiv paper "*Conforming, non-conforming and non-matching discretization couplings in discrete fracture network simulations*" by Alessio Fumagalli, Eirik Keilegavlen, and Stefano Scialo'. See [link](https://arxiv.org/abs/1803.01732).
+* [arXiv_1802_05961](./arXiv_1802_05961) arxiv paper "*Unified approach to discretization of flow in fractured porous media*" by Jan M. Nordbotten, Wietse M. Boon, Alessio Fumagalli, and  Eirik Keilegavlen. See [link](https://arxiv.org/abs/1802.05961).
diff --git a/...apers/legacy_mortar/create_porepy_grid.py → ...rs/arXiv_1802_05961/create_porepy_grid.py b/...apers/legacy_mortar/create_porepy_grid.py → ...rs/arXiv_1802_05961/create_porepy_grid.py
diff --git a/examples/papers/legacy_mortar/example_1.csv → ...les/papers/arXiv_1802_05961/example_1.csv b/examples/papers/legacy_mortar/example_1.csv → ...les/papers/arXiv_1802_05961/example_1.csv
diff --git a/examples/papers/legacy_mortar/example_1.py → ...ples/papers/arXiv_1802_05961/example_1.py b/examples/papers/legacy_mortar/example_1.py → ...ples/papers/arXiv_1802_05961/example_1.py
diff --git a/...rs/legacy_mortar/example_1_convergence.py → ...arXiv_1802_05961/example_1_convergence.py b/...rs/legacy_mortar/example_1_convergence.py → ...arXiv_1802_05961/example_1_convergence.py
diff --git a/...es/papers/legacy_mortar/example_1_data.py → ...papers/arXiv_1802_05961/example_1_data.py b/...es/papers/legacy_mortar/example_1_data.py → ...papers/arXiv_1802_05961/example_1_data.py
diff --git a/.../papers/legacy_mortar/example_1_split.csv → ...pers/arXiv_1802_05961/example_1_split.csv b/.../papers/legacy_mortar/example_1_split.csv → ...pers/arXiv_1802_05961/example_1_split.csv
diff --git a/...es/papers/legacy_mortar/example_1_tpfa.py → ...papers/arXiv_1802_05961/example_1_tpfa.py b/...es/papers/legacy_mortar/example_1_tpfa.py → ...papers/arXiv_1802_05961/example_1_tpfa.py
diff --git a/examples/papers/legacy_mortar/example_2.py → ...ples/papers/arXiv_1802_05961/example_2.py b/examples/papers/legacy_mortar/example_2.py → ...ples/papers/arXiv_1802_05961/example_2.py
diff --git a/...es/papers/legacy_mortar/example_2_data.py → ...papers/arXiv_1802_05961/example_2_data.py b/...es/papers/legacy_mortar/example_2_data.py → ...papers/arXiv_1802_05961/example_2_data.py
diff --git a/examples/papers/legacy_mortar/example_XX.py → ...les/papers/arXiv_1802_05961/example_XX.py b/examples/papers/legacy_mortar/example_XX.py → ...les/papers/arXiv_1802_05961/example_XX.py
diff --git a/examples/papers/legacy_mortar/geiger_3d.csv → ...les/papers/arXiv_1802_05961/geiger_3d.csv b/examples/papers/legacy_mortar/geiger_3d.csv → ...les/papers/arXiv_1802_05961/geiger_3d.csv
diff --git a/examples/papers/legacy_mortar/geiger_3d.py → ...ples/papers/arXiv_1802_05961/geiger_3d.py b/examples/papers/legacy_mortar/geiger_3d.py → ...ples/papers/arXiv_1802_05961/geiger_3d.py
diff --git a/...es/papers/legacy_mortar/geiger_3d_data.py → ...papers/arXiv_1802_05961/geiger_3d_data.py b/...es/papers/legacy_mortar/geiger_3d_data.py → ...papers/arXiv_1802_05961/geiger_3d_data.py
diff --git a/...gacy_mortar/geiger_3d_h_0.05_prepared.geo → ..._1802_05961/geiger_3d_h_0.05_prepared.geo b/...gacy_mortar/geiger_3d_h_0.05_prepared.geo → ..._1802_05961/geiger_3d_h_0.05_prepared.geo
diff --git a/...gacy_mortar/geiger_3d_h_0.15_prepared.geo → ..._1802_05961/geiger_3d_h_0.15_prepared.geo b/...gacy_mortar/geiger_3d_h_0.15_prepared.geo → ..._1802_05961/geiger_3d_h_0.15_prepared.geo
diff --git a/...egacy_mortar/geiger_3d_h_0.1_prepared.geo → ...v_1802_05961/geiger_3d_h_0.1_prepared.geo b/...egacy_mortar/geiger_3d_h_0.1_prepared.geo → ...v_1802_05961/geiger_3d_h_0.1_prepared.geo
diff --git a/...egacy_mortar/geiger_3d_h_0.2_prepared.geo → ...v_1802_05961/geiger_3d_h_0.2_prepared.geo b/...egacy_mortar/geiger_3d_h_0.2_prepared.geo → ...v_1802_05961/geiger_3d_h_0.2_prepared.geo
diff --git a/...es/papers/legacy_mortar/geiger_3d_network → ...papers/arXiv_1802_05961/geiger_3d_network b/...es/papers/legacy_mortar/geiger_3d_network → ...papers/arXiv_1802_05961/geiger_3d_network
diff --git a/...ples/papers/legacy_mortar/grid_to_gmsh.py → ...s/papers/arXiv_1802_05961/grid_to_gmsh.py b/...ples/papers/legacy_mortar/grid_to_gmsh.py → ...s/papers/arXiv_1802_05961/grid_to_gmsh.py
diff --git a/examples/papers/legacy_mortar/solvers.py → examples/papers/arXiv_1802_05961/solvers.py b/examples/papers/legacy_mortar/solvers.py → examples/papers/arXiv_1802_05961/solvers.py