Skip to content

Commit 1452b57

Browse files
atgeirratgeirr
authored
Merge pull request #550 from akva2/ewoms_to_models
Move ewoms/* into an opm/models/* structure
2 parents 9843df8 + 18d62f2 commit 1452b57

File tree

225 files changed

+530
-530
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+530
-530
lines changed

‎CMakeLists_files.cmake

Lines changed: 152 additions & 152 deletions
Large diffs are not rendered by default.

‎ewoms/models/blackoil/blackoilboundaryratevector.hh renamed to ‎opm/models/blackoil/blackoilboundaryratevector.hh

File renamed without changes.

‎ewoms/models/blackoil/blackoildarcyfluxmodule.hh renamed to ‎opm/models/blackoil/blackoildarcyfluxmodule.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
#ifndef EWOMS_BLACK_OIL_DARCY_FLUX_MODULE_HH
3131
#define EWOMS_BLACK_OIL_DARCY_FLUX_MODULE_HH
3232

33-
#include <ewoms/models/blackoil/blackoilproperties.hh>
33+
#include <opm/models/blackoil/blackoilproperties.hh>
3434

35-
#include <ewoms/models/common/darcyfluxmodule.hh>
36-
#include <ewoms/common/propertysystem.hh>
35+
#include <opm/models/common/darcyfluxmodule.hh>
36+
#include <opm/models/utils/propertysystem.hh>
3737

3838
namespace Opm {
3939

‎ewoms/models/blackoil/blackoilenergymodules.hh renamed to ‎opm/models/blackoil/blackoilenergymodules.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#define EWOMS_BLACK_OIL_ENERGY_MODULE_HH
3030

3131
#include "blackoilproperties.hh"
32-
#include <ewoms/io/vtkblackoilenergymodule.hh>
33-
#include <ewoms/models/common/quantitycallbacks.hh>
32+
#include <opm/models/io/vtkblackoilenergymodule.hh>
33+
#include <opm/models/common/quantitycallbacks.hh>
3434

3535
#include <opm/material/common/Tabulated1DFunction.hpp>
3636

‎ewoms/models/blackoil/blackoilextensivequantities.hh renamed to ‎opm/models/blackoil/blackoilextensivequantities.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "blackoilpolymermodules.hh"
3434
#include "blackoilenergymodules.hh"
3535

36-
#include <ewoms/models/common/multiphasebaseextensivequantities.hh>
36+
#include <opm/models/common/multiphasebaseextensivequantities.hh>
3737

3838
namespace Opm {
3939

‎ewoms/models/blackoil/blackoilfoammodules.hh renamed to ‎opm/models/blackoil/blackoilfoammodules.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#define EWOMS_BLACK_OIL_FOAM_MODULE_HH
3030

3131
#include "blackoilproperties.hh"
32-
//#include <ewoms/io/vtkblackoilfoammodule.hh>
33-
#include <ewoms/models/common/quantitycallbacks.hh>
32+
//#include <opm/models/io/vtkblackoilfoammodule.hh>
33+
#include <opm/models/common/quantitycallbacks.hh>
3434

3535
#include <opm/material/common/Tabulated1DFunction.hpp>
3636
//#include <opm/material/common/IntervalTabulated2DFunction.hpp>

‎ewoms/models/blackoil/blackoilindices.hh renamed to ‎opm/models/blackoil/blackoilindices.hh

File renamed without changes.

‎ewoms/models/blackoil/blackoilintensivequantities.hh renamed to ‎opm/models/blackoil/blackoilintensivequantities.hh

File renamed without changes.

‎ewoms/models/blackoil/blackoillocalresidual.hh renamed to ‎opm/models/blackoil/blackoillocalresidual.hh

File renamed without changes.

‎ewoms/models/blackoil/blackoilmodel.hh renamed to ‎opm/models/blackoil/blackoilmodel.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
#include "blackoilfoammodules.hh"
4747
#include "blackoildarcyfluxmodule.hh"
4848

49-
#include <ewoms/models/common/multiphasebasemodel.hh>
50-
#include <ewoms/io/vtkcompositionmodule.hh>
51-
#include <ewoms/io/vtkblackoilmodule.hh>
49+
#include <opm/models/common/multiphasebasemodel.hh>
50+
#include <opm/models/io/vtkcompositionmodule.hh>
51+
#include <opm/models/io/vtkblackoilmodule.hh>
5252

5353
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
5454
#include <opm/material/common/Unused.hpp>

‎ewoms/models/blackoil/blackoilnewtonmethod.hh renamed to ‎opm/models/blackoil/blackoilnewtonmethod.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include "blackoilproperties.hh"
3232

33-
#include <ewoms/common/signum.hh>
33+
#include <opm/models/utils/signum.hh>
3434

3535
#include <opm/material/common/Unused.hpp>
3636

‎ewoms/models/blackoil/blackoilpolymermodules.hh renamed to ‎opm/models/blackoil/blackoilpolymermodules.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#define EWOMS_BLACK_OIL_POLYMER_MODULE_HH
3030

3131
#include "blackoilproperties.hh"
32-
#include <ewoms/io/vtkblackoilpolymermodule.hh>
33-
#include <ewoms/models/common/quantitycallbacks.hh>
32+
#include <opm/models/io/vtkblackoilpolymermodule.hh>
33+
#include <opm/models/common/quantitycallbacks.hh>
3434

3535
#include <opm/material/common/Tabulated1DFunction.hpp>
3636
#include <opm/material/common/IntervalTabulated2DFunction.hpp>

‎ewoms/models/blackoil/blackoilprimaryvariables.hh renamed to ‎opm/models/blackoil/blackoilprimaryvariables.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "blackoilenergymodules.hh"
3535
#include "blackoilfoammodules.hh"
3636

37-
#include <ewoms/disc/common/fvbaseprimaryvariables.hh>
37+
#include <opm/models/discretization/common/fvbaseprimaryvariables.hh>
3838

3939
#include <dune/common/fvector.hh>
4040

‎ewoms/models/blackoil/blackoilproblem.hh renamed to ‎opm/models/blackoil/blackoilproblem.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include "blackoilproperties.hh"
3232

33-
#include <ewoms/models/common/multiphasebaseproblem.hh>
33+
#include <opm/models/common/multiphasebaseproblem.hh>
3434

3535
#include <opm/material/common/Unused.hpp>
3636

‎ewoms/models/blackoil/blackoilproperties.hh renamed to ‎opm/models/blackoil/blackoilproperties.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#ifndef EWOMS_BLACK_OIL_PROPERTIES_HH
3030
#define EWOMS_BLACK_OIL_PROPERTIES_HH
3131

32-
#include <ewoms/models/common/multiphasebaseproperties.hh>
32+
#include <opm/models/common/multiphasebaseproperties.hh>
3333

3434
BEGIN_PROPERTIES
3535

‎ewoms/models/blackoil/blackoilratevector.hh renamed to ‎opm/models/blackoil/blackoilratevector.hh

File renamed without changes.

‎ewoms/models/blackoil/blackoilsolventmodules.hh renamed to ‎opm/models/blackoil/blackoilsolventmodules.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#define EWOMS_BLACK_OIL_SOLVENT_MODULE_HH
3030

3131
#include "blackoilproperties.hh"
32-
#include <ewoms/io/vtkblackoilsolventmodule.hh>
33-
#include <ewoms/models/common/quantitycallbacks.hh>
32+
#include <opm/models/io/vtkblackoilsolventmodule.hh>
33+
#include <opm/models/common/quantitycallbacks.hh>
3434

3535
#include <opm/material/fluidsystems/blackoilpvt/SolventPvt.hpp>
3636
#include <opm/material/common/Tabulated1DFunction.hpp>

‎ewoms/models/blackoil/blackoiltwophaseindices.hh renamed to ‎opm/models/blackoil/blackoiltwophaseindices.hh

File renamed without changes.

‎ewoms/models/common/darcyfluxmodule.hh renamed to ‎opm/models/common/darcyfluxmodule.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#define EWOMS_DARCY_FLUX_MODULE_HH
3232

3333
#include "multiphasebaseproperties.hh"
34-
#include <ewoms/models/common/quantitycallbacks.hh>
34+
#include <opm/models/common/quantitycallbacks.hh>
3535

3636
#include <opm/material/common/Valgrind.hpp>
3737
#include <opm/material/common/Unused.hpp>

‎ewoms/models/common/diffusionmodule.hh renamed to ‎opm/models/common/diffusionmodule.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#ifndef EWOMS_DIFFUSION_MODULE_HH
2929
#define EWOMS_DIFFUSION_MODULE_HH
3030

31-
#include <ewoms/disc/common/fvbaseproperties.hh>
32-
#include <ewoms/models/common/quantitycallbacks.hh>
31+
#include <opm/models/discretization/common/fvbaseproperties.hh>
32+
#include <opm/models/common/quantitycallbacks.hh>
3333

3434
#include <opm/material/common/Valgrind.hpp>
3535
#include <opm/material/common/Unused.hpp>

‎ewoms/models/common/energymodule.hh renamed to ‎opm/models/common/energymodule.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#ifndef EWOMS_ENERGY_MODULE_HH
3030
#define EWOMS_ENERGY_MODULE_HH
3131

32-
#include <ewoms/disc/common/fvbaseproperties.hh>
33-
#include <ewoms/models/common/quantitycallbacks.hh>
32+
#include <opm/models/discretization/common/fvbaseproperties.hh>
33+
#include <opm/models/common/quantitycallbacks.hh>
3434

3535
#include <opm/material/common/Valgrind.hpp>
3636
#include <opm/material/common/Unused.hpp>

‎ewoms/models/common/flux.hh renamed to ‎opm/models/common/flux.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#ifndef EWOMS_VELOCITY_MODULES_HH
3030
#define EWOMS_VELOCITY_MODULES_HH
3131

32-
#include <ewoms/models/common/darcyfluxmodule.hh>
33-
#include <ewoms/models/common/forchheimerfluxmodule.hh>
32+
#include <opm/models/common/darcyfluxmodule.hh>
33+
#include <opm/models/common/forchheimerfluxmodule.hh>
3434

3535
#endif

‎ewoms/models/common/forchheimerfluxmodule.hh renamed to ‎opm/models/common/forchheimerfluxmodule.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
#include "darcyfluxmodule.hh"
3434

35-
#include <ewoms/disc/common/fvbaseproperties.hh>
35+
#include <opm/models/discretization/common/fvbaseproperties.hh>
3636

3737
#include <opm/material/common/Valgrind.hpp>
3838
#include <opm/material/common/Unused.hpp>

‎ewoms/models/common/multiphasebaseextensivequantities.hh renamed to ‎opm/models/common/multiphasebaseextensivequantities.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030

3131
#include "multiphasebaseproperties.hh"
3232

33-
#include <ewoms/models/common/quantitycallbacks.hh>
34-
#include <ewoms/disc/common/fvbaseextensivequantities.hh>
35-
#include <ewoms/common/parametersystem.hh>
33+
#include <opm/models/common/quantitycallbacks.hh>
34+
#include <opm/models/discretization/common/fvbaseextensivequantities.hh>
35+
#include <opm/models/utils/parametersystem.hh>
3636

3737
#include <opm/material/common/Valgrind.hpp>
3838
#include <opm/material/common/Unused.hpp>

‎ewoms/models/common/multiphasebasemodel.hh renamed to ‎opm/models/common/multiphasebasemodel.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
#include "multiphasebaseproblem.hh"
3535
#include "multiphasebaseextensivequantities.hh"
3636

37-
#include <ewoms/models/common/flux.hh>
38-
#include <ewoms/disc/vcfv/vcfvdiscretization.hh>
37+
#include <opm/models/common/flux.hh>
38+
#include <opm/models/discretization/vcfv/vcfvdiscretization.hh>
3939

4040
#include <opm/material/fluidmatrixinteractions/NullMaterial.hpp>
4141
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>

‎ewoms/models/common/multiphasebaseproblem.hh renamed to ‎opm/models/common/multiphasebaseproblem.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
#include "multiphasebaseproperties.hh"
3232

33-
#include <ewoms/disc/common/fvbaseproblem.hh>
34-
#include <ewoms/disc/common/fvbaseproperties.hh>
33+
#include <opm/models/discretization/common/fvbaseproblem.hh>
34+
#include <opm/models/discretization/common/fvbaseproperties.hh>
3535

3636
#include <opm/material/fluidmatrixinteractions/NullMaterial.hpp>
3737
#include <opm/material/common/Means.hpp>

‎ewoms/models/common/multiphasebaseproperties.hh renamed to ‎opm/models/common/multiphasebaseproperties.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#ifndef EWOMS_MULTI_PHASE_BASE_PROPERTIES_HH
3131
#define EWOMS_MULTI_PHASE_BASE_PROPERTIES_HH
3232

33-
#include <ewoms/disc/common/fvbaseproperties.hh>
34-
#include <ewoms/io/vtkmultiphasemodule.hh>
35-
#include <ewoms/io/vtktemperaturemodule.hh>
33+
#include <opm/models/discretization/common/fvbaseproperties.hh>
34+
#include <opm/models/io/vtkmultiphasemodule.hh>
35+
#include <opm/models/io/vtktemperaturemodule.hh>
3636

3737
BEGIN_PROPERTIES
3838

‎ewoms/models/common/quantitycallbacks.hh renamed to ‎opm/models/common/quantitycallbacks.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#ifndef EWOMS_QUANTITY_CALLBACKS_HH
3030
#define EWOMS_QUANTITY_CALLBACKS_HH
3131

32-
#include <ewoms/disc/common/fvbaseproperties.hh>
32+
#include <opm/models/discretization/common/fvbaseproperties.hh>
3333

3434
#include <opm/material/common/MathToolbox.hpp>
3535
#include <opm/material/common/Valgrind.hpp>

‎ewoms/models/discretefracture/discretefractureextensivequantities.hh renamed to ‎opm/models/discretefracture/discretefractureextensivequantities.hh

File renamed without changes.

‎ewoms/models/discretefracture/discretefractureintensivequantities.hh renamed to ‎opm/models/discretefracture/discretefractureintensivequantities.hh

File renamed without changes.

‎ewoms/models/discretefracture/discretefracturelocalresidual.hh renamed to ‎opm/models/discretefracture/discretefracturelocalresidual.hh

File renamed without changes.

‎ewoms/models/discretefracture/discretefracturemodel.hh renamed to ‎opm/models/discretefracture/discretefracturemodel.hh

File renamed without changes.

‎ewoms/models/discretefracture/discretefractureprimaryvariables.hh renamed to ‎opm/models/discretefracture/discretefractureprimaryvariables.hh

File renamed without changes.

‎ewoms/models/discretefracture/discretefractureproblem.hh renamed to ‎opm/models/discretefracture/discretefractureproblem.hh

File renamed without changes.

‎ewoms/models/discretefracture/discretefractureproperties.hh renamed to ‎opm/models/discretefracture/discretefractureproperties.hh

File renamed without changes.

‎ewoms/models/discretefracture/fracturemapper.hh renamed to ‎opm/models/discretefracture/fracturemapper.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#ifndef EWOMS_FRACTURE_MAPPER_HH
2828
#define EWOMS_FRACTURE_MAPPER_HH
2929

30-
#include <ewoms/common/propertysystem.hh>
30+
#include <opm/models/utils/propertysystem.hh>
3131

3232
#include <algorithm>
3333
#include <set>

‎ewoms/disc/common/baseauxiliarymodule.hh renamed to ‎opm/models/discretization/common/baseauxiliarymodule.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#ifndef EWOMS_BASE_AUXILIARY_MODULE_HH
2828
#define EWOMS_BASE_AUXILIARY_MODULE_HH
2929

30-
#include <ewoms/common/propertysystem.hh>
30+
#include <opm/models/utils/propertysystem.hh>
3131

32-
#include <ewoms/disc/common/fvbaseproperties.hh>
32+
#include <opm/models/discretization/common/fvbaseproperties.hh>
3333

3434
#include <set>
3535
#include <vector>

‎ewoms/disc/common/fvbaseadlocallinearizer.hh renamed to ‎opm/models/discretization/common/fvbaseadlocallinearizer.hh

File renamed without changes.

‎ewoms/disc/common/fvbaseboundarycontext.hh renamed to ‎opm/models/discretization/common/fvbaseboundarycontext.hh

File renamed without changes.

‎ewoms/disc/common/fvbaseconstraints.hh renamed to ‎opm/models/discretization/common/fvbaseconstraints.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#ifndef EWOMS_FV_BASE_CONSTRAINTS_HH
2929
#define EWOMS_FV_BASE_CONSTRAINTS_HH
3030

31-
#include <ewoms/common/propertysystem.hh>
31+
#include <opm/models/utils/propertysystem.hh>
3232
#include <opm/material/common/Valgrind.hpp>
3333

3434
BEGIN_PROPERTIES

‎ewoms/disc/common/fvbaseconstraintscontext.hh renamed to ‎opm/models/discretization/common/fvbaseconstraintscontext.hh

File renamed without changes.

‎ewoms/disc/common/fvbasediscretization.hh renamed to ‎opm/models/discretization/common/fvbasediscretization.hh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,10 @@
5050
#include <opm/models/parallel/gridcommhandles.hh>
5151
#include <opm/models/parallel/threadmanager.hh>
5252
#include <opm/simulators/linalg/nullborderlistmanager.hh>
53-
#include <ewoms/common/simulator.hh>
54-
#include <ewoms/common/alignedallocator.hh>
55-
#include <ewoms/common/timer.hh>
56-
#include <ewoms/common/timerguard.hh>
53+
#include <opm/models/utils/simulator.hh>
54+
#include <opm/models/utils/alignedallocator.hh>
55+
#include <opm/models/utils/timer.hh>
56+
#include <opm/models/utils/timerguard.hh>
5757
#include <opm/simulators/linalg/matrixblock.hh>
5858

5959
#include <opm/material/common/MathToolbox.hpp>

‎ewoms/disc/common/fvbaseelementcontext.hh renamed to ‎opm/models/discretization/common/fvbaseelementcontext.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include "fvbaseproperties.hh"
3232

33-
#include <ewoms/common/alignedallocator.hh>
33+
#include <opm/models/utils/alignedallocator.hh>
3434

3535
#include <opm/material/common/Unused.hpp>
3636
#include <opm/material/common/Exceptions.hpp>

‎ewoms/disc/common/fvbaseextensivequantities.hh renamed to ‎opm/models/discretization/common/fvbaseextensivequantities.hh

File renamed without changes.

‎ewoms/disc/common/fvbasefdlocallinearizer.hh renamed to ‎opm/models/discretization/common/fvbasefdlocallinearizer.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#ifndef EWOMS_FV_BASE_FD_LOCAL_LINEARIZER_HH
2929
#define EWOMS_FV_BASE_FD_LOCAL_LINEARIZER_HH
3030

31-
#include <ewoms/common/propertysystem.hh>
32-
#include <ewoms/common/parametersystem.hh>
31+
#include <opm/models/utils/propertysystem.hh>
32+
#include <opm/models/utils/parametersystem.hh>
3333

3434
#include <opm/material/common/MathToolbox.hpp>
3535
#include <opm/material/common/Valgrind.hpp>

‎ewoms/disc/common/fvbasegradientcalculator.hh renamed to ‎opm/models/discretization/common/fvbasegradientcalculator.hh

File renamed without changes.

‎ewoms/disc/common/fvbaseintensivequantities.hh renamed to ‎opm/models/discretization/common/fvbaseintensivequantities.hh

File renamed without changes.

‎ewoms/disc/common/fvbaselinearizer.hh renamed to ‎opm/models/discretization/common/fvbaselinearizer.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <opm/models/parallel/gridcommhandles.hh>
3434
#include <opm/models/parallel/threadmanager.hh>
3535
#include <opm/models/parallel/threadedentityiterator.hh>
36-
#include <ewoms/disc/common/baseauxiliarymodule.hh>
36+
#include <opm/models/discretization/common/baseauxiliarymodule.hh>
3737

3838
#include <opm/material/common/Exceptions.hpp>
3939

‎ewoms/disc/common/fvbaselocalresidual.hh renamed to ‎opm/models/discretization/common/fvbaselocalresidual.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
#include "fvbaseproperties.hh"
3232

33-
#include <ewoms/common/parametersystem.hh>
34-
#include <ewoms/common/alignedallocator.hh>
33+
#include <opm/models/utils/parametersystem.hh>
34+
#include <opm/models/utils/alignedallocator.hh>
3535

3636
#include <opm/material/common/Valgrind.hpp>
3737
#include <opm/material/common/Unused.hpp>

‎ewoms/disc/common/fvbasenewtonconvergencewriter.hh renamed to ‎opm/models/discretization/common/fvbasenewtonconvergencewriter.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#ifndef EWOMS_FV_BASE_NEWTON_CONVERGENCE_WRITER_HH
2929
#define EWOMS_FV_BASE_NEWTON_CONVERGENCE_WRITER_HH
3030

31-
#include <ewoms/io/vtkmultiwriter.hh>
32-
#include <ewoms/common/propertysystem.hh>
31+
#include <opm/models/io/vtkmultiwriter.hh>
32+
#include <opm/models/utils/propertysystem.hh>
3333

3434
#include <iostream>
3535

‎ewoms/disc/common/fvbasenewtonmethod.hh renamed to ‎opm/models/discretization/common/fvbasenewtonmethod.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
#include "fvbasenewtonconvergencewriter.hh"
3232

33-
#include <ewoms/nonlinear/newtonmethod.hh>
34-
#include <ewoms/common/propertysystem.hh>
33+
#include <opm/models/nonlinear/newtonmethod.hh>
34+
#include <opm/models/utils/propertysystem.hh>
3535

3636
namespace Opm {
3737

‎ewoms/disc/common/fvbaseprimaryvariables.hh renamed to ‎opm/models/discretization/common/fvbaseprimaryvariables.hh

File renamed without changes.

‎ewoms/disc/common/fvbaseproblem.hh renamed to ‎opm/models/discretization/common/fvbaseproblem.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030

3131
#include "fvbaseproperties.hh"
3232

33-
#include <ewoms/io/vtkmultiwriter.hh>
34-
#include <ewoms/io/restart.hh>
35-
#include <ewoms/disc/common/restrictprolong.hh>
33+
#include <opm/models/io/vtkmultiwriter.hh>
34+
#include <opm/models/io/restart.hh>
35+
#include <opm/models/discretization/common/restrictprolong.hh>
3636

3737
#include <opm/material/common/Unused.hpp>
3838
#include <opm/material/common/Exceptions.hpp>

‎ewoms/disc/common/fvbaseproperties.hh renamed to ‎opm/models/discretization/common/fvbaseproperties.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
#include "fvbaseproperties.hh"
3535
#include "fvbasefdlocallinearizer.hh"
3636

37-
#include <ewoms/common/basicproperties.hh>
38-
#include <ewoms/io/vtkprimaryvarsmodule.hh>
37+
#include <opm/models/utils/basicproperties.hh>
38+
#include <opm/models/io/vtkprimaryvarsmodule.hh>
3939
#include <opm/simulators/linalg/parallelbicgstabbackend.hh>
4040

4141
BEGIN_PROPERTIES

‎ewoms/disc/common/restrictprolong.hh renamed to ‎opm/models/discretization/common/restrictprolong.hh

File renamed without changes.

‎ewoms/disc/ecfv/ecfvbaseoutputmodule.hh renamed to ‎opm/models/discretization/ecfv/ecfvbaseoutputmodule.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#include "ecfvproperties.hh"
3232

33-
#include <ewoms/io/vtkmultiwriter.hh>
33+
#include <opm/models/io/vtkmultiwriter.hh>
3434

3535
namespace Opm {
3636
/*!

‎ewoms/disc/ecfv/ecfvdiscretization.hh renamed to ‎opm/models/discretization/ecfv/ecfvdiscretization.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "ecfvbaseoutputmodule.hh"
3737

3838
#include <opm/simulators/linalg/elementborderlistfromgrid.hh>
39-
#include <ewoms/disc/common/fvbasediscretization.hh>
39+
#include <opm/models/discretization/common/fvbasediscretization.hh>
4040

4141
#if HAVE_DUNE_FEM
4242
#include <dune/fem/space/common/functionspace.hh>

‎ewoms/disc/ecfv/ecfvgridcommhandlefactory.hh renamed to ‎opm/models/discretization/ecfv/ecfvgridcommhandlefactory.hh

File renamed without changes.

‎ewoms/disc/ecfv/ecfvproperties.hh renamed to ‎opm/models/discretization/ecfv/ecfvproperties.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
#ifndef EWOMS_ECFV_PROPERTIES_HH
3030
#define EWOMS_ECFV_PROPERTIES_HH
3131

32-
#include <ewoms/disc/common/fvbaseproperties.hh>
32+
#include <opm/models/discretization/common/fvbaseproperties.hh>
3333

34-
#include <ewoms/common/propertysystem.hh>
34+
#include <opm/models/utils/propertysystem.hh>
3535

3636
BEGIN_PROPERTIES
3737

‎ewoms/disc/ecfv/ecfvstencil.hh renamed to ‎opm/models/discretization/ecfv/ecfvstencil.hh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#ifndef EWOMS_ECFV_STENCIL_HH
2929
#define EWOMS_ECFV_STENCIL_HH
3030

31-
#include <ewoms/common/quadraturegeometries.hh>
31+
#include <opm/models/utils/quadraturegeometries.hh>
3232

3333
#include <opm/material/common/ConditionalStorage.hpp>
3434

0 commit comments

Comments
 (0)