OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2025-02-25 18:45:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

Downstream of filesystem reorganisation in opm-common

Browse Source
This commit is contained in:
Joakim Hove 2021-12-14 13:26:53 +01:00
parent 29f255ec65
commit cc00c1444f
39 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/upscale_relperm_benchmark.cpp
View File

@ -112,7 +112,7 @@
#include <opm/upscaling/RelPermUtils.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
// Choose model:
// - Small: MODEL_TYPE 1 (35751 active cells, ~5 MB)

2
examples/cpchop.cpp
View File

@ -28,7 +28,7 @@
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/common/utility/numeric/MonotCubicInterpolator.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/output/eclipse/EclipseGridInspector.hpp>

2
examples/cpchop_depthtrend.cpp
View File

@ -27,7 +27,7 @@
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/upscaling/CornerpointChopper.hpp>

6
examples/cpregularize.cpp
View File

@ -35,8 +35,8 @@
#include <config.h>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Parser/Parser.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/common/utility/platform_dependent/disable_warnings.h>
@ -46,7 +46,7 @@
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/upscaling/CornerpointChopper.hpp>
#include <opm/output/eclipse/EclipseGridInspector.hpp>

2
examples/exp_variogram.cpp
View File

@ -38,7 +38,7 @@
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/upscaling/CornerpointChopper.hpp>

2
examples/grdecldips.cpp
View File

@ -28,7 +28,7 @@
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/common/utility/parameters/ParameterGroup.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/upscaling/CornerpointChopper.hpp>
#include <opm/output/eclipse/EclipseGridInspector.hpp>

2
examples/known_answer_test.cpp
View File

@ -48,7 +48,7 @@
#include <opm/common/utility/parameters/ParameterGroup.hpp>
#include <opm/grid/utility/StopWatch.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/grid/CpGrid.hpp>

6
examples/mimetic_aniso_solver_test.cpp
View File

@ -35,8 +35,8 @@
#include "config.h"
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Parser/Parser.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/common/utility/platform_dependent/disable_warnings.h>
@ -50,7 +50,7 @@
#include <opm/grid/CpGrid.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/common/utility/parameters/ParameterGroup.hpp>
#include <opm/output/eclipse/EclipseGridInspector.hpp>

2
examples/mimetic_periodic_test.cpp
View File

@ -35,7 +35,7 @@
#include "config.h"
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/common/utility/parameters/ParameterGroup.hpp>
#include <opm/grid/CpGrid.hpp>

2
examples/mimetic_solver_test.cpp
View File

@ -56,7 +56,7 @@
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/common/utility/parameters/ParameterGroup.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/grid/CpGrid.hpp>

2
examples/upscale_cap.cpp
View File

@ -62,7 +62,7 @@
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/common/utility/numeric/MonotCubicInterpolator.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/upscaling/RelPermUtils.hpp>
#include <opm/upscaling/SinglePhaseUpscaler.hpp>

2
examples/upscale_cond.cpp
View File

@ -59,7 +59,7 @@
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/common/utility/numeric/MonotCubicInterpolator.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/upscaling/RelPermUtils.hpp>
#include <opm/upscaling/SinglePhaseUpscaler.hpp>

4
examples/upscale_elasticity.cpp
View File

@ -28,8 +28,8 @@
#include <dune/common/version.hh>
#include <dune/common/parallel/mpihelper.hh>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Parser/Parser.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/common/utility/platform_dependent/reenable_warnings.h>

2
examples/upscale_relperm.cpp
View File

@ -66,7 +66,7 @@
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/upscaling/RelPermUtils.hpp>
#include <opm/upscaling/SinglePhaseUpscaler.hpp>

4
opm/elasticity/elasticity_upscale.hpp
View File

@ -42,8 +42,8 @@
#include <opm/elasticity/mortar_schur_precond.hpp>
#include <opm/elasticity/uzawa_solver.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Parser/Parser.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
namespace Opm {
namespace Elasticity {

2
opm/elasticity/elasticity_upscale_impl.hpp
View File

@ -18,7 +18,7 @@
#include <omp.h>
#endif
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/input/eclipse/Deck/DeckKeyword.hpp>
namespace Opm {
namespace Elasticity {

4
opm/porsol/common/ReservoirPropertyCommon.hpp
View File

@ -36,10 +36,10 @@
#ifndef OPENRS_RESERVOIRPROPERTYCOMMON_HEADER
#define OPENRS_RESERVOIRPROPERTYCOMMON_HEADER
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/porsol/common/Matrix.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
namespace Opm
{

4
opm/porsol/common/ReservoirPropertyCommon_impl.hpp
View File

@ -37,8 +37,8 @@
#define OPENRS_RESERVOIRPROPERTYCOMMON_IMPL_HEADER
#include <opm/output/eclipse/EclipseGridInspector.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Deck/DeckKeyword.hpp>
#include <fstream>
#include <array>

2
opm/porsol/common/Rock.hpp
View File

@ -24,7 +24,7 @@
#include <opm/porsol/common/Matrix.hpp>
#include <opm/porsol/common/ReservoirPropertyCommon.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
namespace Opm
{

2
opm/porsol/common/SimulatorBase.hpp
View File

@ -41,7 +41,7 @@
#include <opm/common/utility/numeric/SparseVector.hpp>
#include <opm/grid/utility/SparseTable.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/grid/common/Volumes.hpp>
#include <opm/grid/CpGrid.hpp>

2
opm/porsol/common/Wells.hpp
View File

@ -22,7 +22,7 @@
#include <opm/common/ErrorMacros.hpp>
#include <opm/grid/utility/SparseTable.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <dune/common/fvector.hh>
#include <vector>

2
opm/porsol/common/setupBoundaryConditions.hpp
View File

@ -37,7 +37,7 @@
#define OPENRS_SETUPBOUNDARYCONDITIONS_HEADER
#include <opm/common/utility/parameters/ParameterGroup.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/porsol/common/BoundaryConditions.hpp>
#include <opm/porsol/common/PeriodicHelpers.hpp>

6
opm/porsol/common/setupGridAndProps.hpp
View File

@ -37,11 +37,11 @@
#define OPM_SETUPGRIDANDPROPS_HEADER
#include <opm/common/utility/parameters/ParameterGroup.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/grid/CpGrid.hpp>
#include <opm/porsol/common/ReservoirPropertyCapillary.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Parser/Parser.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/common/utility/platform_dependent/disable_warnings.h>

2
opm/porsol/euler/EulerUpstreamImplicit_impl.hpp
View File

@ -39,7 +39,7 @@
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/Average.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/grid/common/Volumes.hpp>
#include <opm/grid/utility/StopWatch.hpp>
#include <opm/porsol/common/ImplicitTransportDefs.hpp>

2
opm/porsol/euler/EulerUpstream_impl.hpp
View File

@ -41,7 +41,7 @@
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/Average.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/grid/common/Volumes.hpp>
#include <opm/porsol/euler/CflCalculator.hpp>
#include <opm/grid/utility/StopWatch.hpp>

2
opm/porsol/euler/ImplicitCapillarity_impl.hpp
View File

@ -38,7 +38,7 @@
#include <opm/common/ErrorMacros.hpp>
#include <opm/core/utility/Average.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/common/utility/numeric/RootFinders.hpp>
#include <opm/grid/utility/StopWatch.hpp>
#include <opm/grid/common/Volumes.hpp>

12
opm/upscaling/CornerpointChopper.hpp
View File

@ -20,12 +20,12 @@
#ifndef OPM_CORNERPOINTCHOPPER_HEADER_INCLUDED
#define OPM_CORNERPOINTCHOPPER_HEADER_INCLUDED
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Units/UnitSystem.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Deck/DeckRecord.hpp>
#include <opm/parser/eclipse/Deck/DeckItem.hpp>
#include <opm/input/eclipse/Parser/Parser.hpp>
#include <opm/input/eclipse/Units/UnitSystem.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Deck/DeckKeyword.hpp>
#include <opm/input/eclipse/Deck/DeckRecord.hpp>
#include <opm/input/eclipse/Deck/DeckItem.hpp>
#include <iostream>
#include <fstream>
#include <string>

2
opm/upscaling/ParserAdditions.cpp
View File

@ -21,7 +21,7 @@
#include <opm/json/JsonObject.hpp>
#include <opm/parser/eclipse/Parser/ParserKeyword.hpp>
#include <opm/input/eclipse/Parser/ParserKeyword.hpp>
namespace {
void add_RHO(Opm::Parser& parser)

2
opm/upscaling/ParserAdditions.hpp
View File

@ -20,7 +20,7 @@
#ifndef OPM_UPSCALING_PARSER_ADDITIONS_HPP
#define OPM_UPSCALING_PARSER_ADDITIONS_HPP
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/input/eclipse/Parser/Parser.hpp>
namespace Opm {

6
opm/upscaling/RelPermUtils.cpp
View File

@ -21,10 +21,10 @@
#include <opm/upscaling/RelPermUtils.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/P.hpp>
#include <opm/parser/eclipse/Parser/ParserKeywords/S.hpp>
#include <opm/input/eclipse/Parser/ParserKeywords/P.hpp>
#include <opm/input/eclipse/Parser/ParserKeywords/S.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <algorithm>
#include <cmath>

4
opm/upscaling/RelPermUtils.hpp
View File

@ -24,8 +24,8 @@
#ifndef OPM_UPSCALING_RELPERM_UTILS_HPP
#define OPM_UPSCALING_RELPERM_UTILS_HPP
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Parser/Parser.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/common/utility/numeric/MonotCubicInterpolator.hpp>

2
opm/upscaling/SteadyStateUpscalerImplicit_impl.hpp
View File

@ -41,7 +41,7 @@
#include <opm/porsol/common/SimulatorUtilities.hpp>
#include <opm/porsol/common/ReservoirPropertyFixedMobility.hpp>
#include <opm/porsol/euler/MatchSaturatedVolumeFunctor.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/upscaling/writeECLData.hpp>
#include <algorithm>

2
opm/upscaling/SteadyStateUpscalerManager.hpp
View File

@ -39,7 +39,7 @@
#include <opm/upscaling/SteadyStateUpscaler.hpp>
#include <opm/upscaling/UpscalingTraits.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/grid/utility/SparseTable.hpp>
#include <cmath>
#include <fstream>

2
opm/upscaling/SteadyStateUpscalerManagerImplicit.hpp
View File

@ -39,7 +39,7 @@
#include <opm/upscaling/SteadyStateUpscalerImplicit.hpp>
#include <opm/upscaling/UpscalingTraits.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/grid/utility/SparseTable.hpp>
#include <cmath>
#include <fstream>

2
opm/upscaling/SteadyStateUpscaler_impl.hpp
View File

@ -40,7 +40,7 @@
#include <opm/porsol/common/MatrixInverse.hpp>
#include <opm/porsol/common/SimulatorUtilities.hpp>
#include <opm/porsol/common/ReservoirPropertyFixedMobility.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <algorithm>
#include <iostream>

2
opm/upscaling/UpscalerBase.hpp
View File

@ -35,7 +35,7 @@
#ifndef OPM_UPSCALERBASE_HEADER
#define OPM_UPSCALERBASE_HEADER
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/common/utility/parameters/ParameterGroup.hpp>

4
opm/upscaling/initCPGrid.cpp
View File

@ -32,8 +32,8 @@
#include <opm/common/ErrorMacros.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Parser/Parser.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/grid/CpGrid.hpp>

2
opm/upscaling/writeECLData.cpp
View File

@ -23,7 +23,7 @@
#endif
#include <opm/upscaling/writeECLData.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <opm/io/eclipse/OutputStream.hpp>
#include <opm/output/eclipse/DoubHEAD.hpp>

6
tests/common/test_gravitypressure.cpp
View File

@ -34,10 +34,10 @@
#include <opm/upscaling/RelPermUtils.hpp>
#undef UNITTEST_TRESPASS_PRIVATE_PROPERTY_DP
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/input/eclipse/Parser/Parser.hpp>
#include <opm/input/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Units/Units.hpp>
#include <opm/input/eclipse/Units/Units.hpp>
#include <cmath>
#include <cstddef>