changed: ewoms/disc -> opm/models/discretization

2025-02-25 18:55:30 -06:00 · 2019-09-11 13:46:13 +02:00
parent f48ae0f7f1
commit 474ae4ded8
68 changed files with 10727 additions and 40 deletions
--- a/examples/co2injection_flash_ecfv.cpp
+++ b/examples/co2injection_flash_ecfv.cpp
@@ -34,7 +34,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/flash/flashmodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionflash.hh"
 #include "problems/co2injectionproblem.hh"

--- a/examples/co2injection_flash_ni_ecfv.cpp
+++ b/examples/co2injection_flash_ni_ecfv.cpp
@@ -31,7 +31,7 @@
 #include <opm/material/common/quad.hpp>
 #include <opm/models/utils/start.hh>
 #include <ewoms/models/flash/flashmodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionflash.hh"
 #include "problems/co2injectionproblem.hh"

--- a/examples/co2injection_flash_ni_vcfv.cpp
+++ b/examples/co2injection_flash_ni_vcfv.cpp
@@ -31,7 +31,7 @@
 #include <opm/material/common/quad.hpp>
 #include <opm/models/utils/start.hh>
 #include <ewoms/models/flash/flashmodel.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/co2injectionflash.hh"
 #include "problems/co2injectionproblem.hh"

--- a/examples/co2injection_flash_vcfv.cpp
+++ b/examples/co2injection_flash_vcfv.cpp
@@ -34,7 +34,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/flash/flashmodel.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/co2injectionflash.hh"
 #include "problems/co2injectionproblem.hh"

--- a/examples/co2injection_immiscible_ecfv.cpp
+++ b/examples/co2injection_immiscible_ecfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/immiscible/immisciblemodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>

 #include "problems/co2injectionproblem.hh"

--- a/examples/co2injection_immiscible_ni_ecfv.cpp
+++ b/examples/co2injection_immiscible_ni_ecfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/immiscible/immisciblemodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/co2injection_immiscible_ni_vcfv.cpp
+++ b/examples/co2injection_immiscible_ni_vcfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/immiscible/immisciblemodel.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/co2injection_immiscible_vcfv.cpp
+++ b/examples/co2injection_immiscible_vcfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/immiscible/immisciblemodel.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>

 #include "problems/co2injectionproblem.hh"

--- a/examples/co2injection_ncp_ecfv.cpp
+++ b/examples/co2injection_ncp_ecfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/ncp/ncpmodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/co2injection_ncp_ni_ecfv.cpp
+++ b/examples/co2injection_ncp_ni_ecfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/ncp/ncpmodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/co2injection_ncp_ni_vcfv.cpp
+++ b/examples/co2injection_ncp_ni_vcfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/ncp/ncpmodel.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/co2injection_ncp_vcfv.cpp
+++ b/examples/co2injection_ncp_vcfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/ncp/ncpmodel.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>

 #include "problems/co2injectionproblem.hh"

--- a/examples/co2injection_pvs_ecfv.cpp
+++ b/examples/co2injection_pvs_ecfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/pvs/pvsmodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/co2injection_pvs_ni_ecfv.cpp
+++ b/examples/co2injection_pvs_ni_ecfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/pvs/pvsmodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/co2injection_pvs_ni_vcfv.cpp
+++ b/examples/co2injection_pvs_ni_vcfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/pvs/pvsmodel.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/co2injectionproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/co2injection_pvs_vcfv.cpp
+++ b/examples/co2injection_pvs_vcfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/pvs/pvsmodel.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>

 #include "problems/co2injectionproblem.hh"

--- a/examples/finger_immiscible_ecfv.cpp
+++ b/examples/finger_immiscible_ecfv.cpp
@@ -29,7 +29,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/immiscible/immisciblemodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/fingerproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/finger_immiscible_vcfv.cpp
+++ b/examples/finger_immiscible_vcfv.cpp
@@ -29,7 +29,7 @@

 #include <ewoms/common/start.hh>
 #include <ewoms/models/immiscible/immisciblemodel.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/fingerproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/lens_immiscible_ecfv_ad.hh
+++ b/examples/lens_immiscible_ecfv_ad.hh
@@ -30,7 +30,7 @@
 #define EWOMS_LENS_IMMISCIBLE_ECFV_AD_HH

 #include <ewoms/models/immiscible/immisciblemodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/lensproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/lens_richards_ecfv.cpp
+++ b/examples/lens_richards_ecfv.cpp
@@ -28,7 +28,7 @@
 #include "config.h"

 #include <opm/models/utils/start.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>

 #include "problems/richardslensproblem.hh"

--- a/examples/lens_richards_vcfv.cpp
+++ b/examples/lens_richards_vcfv.cpp
@@ -28,7 +28,7 @@
 #include "config.h"

 #include <opm/models/utils/start.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>

 #include "problems/richardslensproblem.hh"

--- a/examples/problems/fingerproblem.hh
+++ b/examples/problems/fingerproblem.hh
@@ -42,7 +42,7 @@
 #include <opm/material/components/Air.hpp>

 #include <ewoms/models/immiscible/immiscibleproperties.hh>
-#include <ewoms/disc/common/restrictprolong.hh>
+#include <opm/models/discretization/common/restrictprolong.hh>

 #if HAVE_DUNE_ALUGRID
 #include <dune/alugrid/grid.hh>
--- a/examples/problems/lensproblem.hh
+++ b/examples/problems/lensproblem.hh
@@ -30,8 +30,8 @@

 #include <ewoms/io/structuredgridvanguard.hh>
 #include <ewoms/models/immiscible/immiscibleproperties.hh>
-#include <ewoms/disc/common/fvbaseadlocallinearizer.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/common/fvbaseadlocallinearizer.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>

 #include <opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp>
 #include <opm/material/fluidmatrixinteractions/LinearMaterial.hpp>
--- a/examples/reservoir_blackoil_ecfv.cpp
+++ b/examples/reservoir_blackoil_ecfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <opm/models/blackoil/blackoilmodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/reservoirproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/reservoir_blackoil_vcfv.cpp
+++ b/examples/reservoir_blackoil_vcfv.cpp
@@ -29,7 +29,7 @@

 #include <opm/models/utils/start.hh>
 #include <opm/models/blackoil/blackoilmodel.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/reservoirproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/reservoir_ncp_ecfv.cpp
+++ b/examples/reservoir_ncp_ecfv.cpp
@@ -29,7 +29,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/ncp/ncpmodel.hh>
-#include <ewoms/disc/ecfv/ecfvdiscretization.hh>
+#include <opm/models/discretization/ecfv/ecfvdiscretization.hh>
 #include "problems/reservoirproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/reservoir_ncp_vcfv.cpp
+++ b/examples/reservoir_ncp_vcfv.cpp
@@ -30,7 +30,7 @@

 #include <opm/models/utils/start.hh>
 #include <ewoms/models/ncp/ncpmodel.hh>
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
 #include "problems/reservoirproblem.hh"

 BEGIN_PROPERTIES
--- a/examples/tutorial1problem.hh
+++ b/examples/tutorial1problem.hh
@@ -32,7 +32,7 @@
 #include <ewoms/models/immiscible/immisciblemodel.hh>

 // The spatial discretization (VCFV == Vertex-Centered Finite Volumes)
-#include <ewoms/disc/vcfv/vcfvdiscretization.hh>  /*@\label{tutorial1:include-discretization}@*/
+#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>  /*@\label{tutorial1:include-discretization}@*/

 // The chemical species that are used
 #include <opm/material/components/SimpleH2O.hpp>