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

Merge pull request #4349 from akva2/runspec_improvements

Browse Source 
Small Runspec improvements
This commit is contained in:
Bård Skaflestad 2023-01-05 14:14:21 +01:00 committed by GitHub
commit 63c6b102d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/eclgenerictracermodel.cc
View File

@ -31,7 +31,7 @@
#include <opm/grid/polyhedralgrid.hh> #include <opm/grid/polyhedralgrid.hh>
#include <opm/models/discretization/ecfv/ecfvstencil.hh> #include <opm/models/discretization/ecfv/ecfvstencil.hh>
#include <opm/input/eclipse/EclipseState/EclipseState.hpp> #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/input/eclipse/EclipseState/Runspec.hpp> #include <opm/input/eclipse/EclipseState/Phase.hpp>
#include <opm/input/eclipse/EclipseState/Tables/TracerVdTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/TracerVdTable.hpp>
#include <dune/istl/operators.hh> #include <dune/istl/operators.hh>

9
opm/simulators/wells/BlackoilWellModel.hpp
View File

@ -28,6 +28,7 @@
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#include <cassert> #include <cassert>
#include <cstddef>
#include <map> #include <map>
#include <memory> #include <memory>
#include <optional> #include <optional>
@ -37,10 +38,6 @@
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <stddef.h>
#include <opm/input/eclipse/EclipseState/Runspec.hpp>
#include <opm/input/eclipse/Schedule/Schedule.hpp> #include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/Schedule/Well/WellTestState.hpp> #include <opm/input/eclipse/Schedule/Well/WellTestState.hpp>
#include <opm/input/eclipse/Schedule/Group/GuideRate.hpp> #include <opm/input/eclipse/Schedule/Group/GuideRate.hpp>
@ -343,9 +340,9 @@ namespace Opm {
const ModelParameters param_; const ModelParameters param_;
size_t global_num_cells_{}; std::size_t global_num_cells_{};
// the number of the cells in the local grid // the number of the cells in the local grid
size_t local_num_cells_{}; std::size_t local_num_cells_{};
double gravity_{}; double gravity_{};
std::vector<double> depth_{}; std::vector<double> depth_{};
bool alternative_well_rate_init_{}; bool alternative_well_rate_init_{};

2
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -132,7 +132,7 @@ namespace Opm {
const auto& connectionSet = well.getConnections(); const auto& connectionSet = well.getConnections();
wellCells.reserve(connectionSet.size()); wellCells.reserve(connectionSet.size());
for ( size_t c=0; c < connectionSet.size(); c++ ) for (std::size_t c = 0; c < connectionSet.size(); c++)
{ {
const auto& connection = connectionSet.get(c); const auto& connection = connectionSet.get(c);
int compressed_idx = compressedIndexForInterior(connection.global_index()); int compressed_idx = compressedIndexForInterior(connection.global_index());

2
opm/simulators/wells/GroupState.hpp
View File

@ -25,7 +25,7 @@
#include <opm/core/props/BlackoilPhases.hpp> #include <opm/core/props/BlackoilPhases.hpp>
#include <opm/input/eclipse/Schedule/Group/Group.hpp> #include <opm/input/eclipse/Schedule/Group/Group.hpp>
#include <opm/input/eclipse/EclipseState/Runspec.hpp> #include <opm/input/eclipse/EclipseState/Phase.hpp>
#include <opm/input/eclipse/Schedule/Group/GPMaint.hpp> #include <opm/input/eclipse/Schedule/Group/GPMaint.hpp>
#include <opm/simulators/wells/WellContainer.hpp> #include <opm/simulators/wells/WellContainer.hpp>

2
opm/simulators/wells/MultisegmentWell.hpp
View File

@ -25,8 +25,6 @@
#include <opm/simulators/wells/WellInterface.hpp> #include <opm/simulators/wells/WellInterface.hpp>
#include <opm/simulators/wells/MultisegmentWellEval.hpp> #include <opm/simulators/wells/MultisegmentWellEval.hpp>
#include <opm/input/eclipse/EclipseState/Runspec.hpp>
namespace Opm namespace Opm
{ {
class DeferredLogger; class DeferredLogger;

3
opm/simulators/wells/StandardWell.hpp
View File

@ -39,7 +39,6 @@
#include <opm/models/blackoil/blackoilmicpmodules.hh> #include <opm/models/blackoil/blackoilmicpmodules.hh>
#include <opm/material/densead/Evaluation.hpp> #include <opm/material/densead/Evaluation.hpp>
#include <opm/input/eclipse/EclipseState/Runspec.hpp>
#include <opm/input/eclipse/Schedule/ScheduleTypes.hpp> #include <opm/input/eclipse/Schedule/ScheduleTypes.hpp>
#include <opm/simulators/wells/StandardWellEval.hpp> #include <opm/simulators/wells/StandardWellEval.hpp>
@ -61,7 +60,7 @@ namespace Opm
{ {
public: public:
typedef WellInterface<TypeTag> Base; using Base = WellInterface<TypeTag>;
using StdWellEval = StandardWellEval<GetPropType<TypeTag, Properties::FluidSystem>, using StdWellEval = StandardWellEval<GetPropType<TypeTag, Properties::FluidSystem>,
GetPropType<TypeTag, Properties::Indices>, GetPropType<TypeTag, Properties::Indices>,
GetPropType<TypeTag, Properties::Scalar>>; GetPropType<TypeTag, Properties::Scalar>>;

2
opm/simulators/wells/WellGroupControls.cpp
View File

@ -22,7 +22,7 @@
#include <config.h> #include <config.h>
#include <opm/simulators/wells/WellGroupControls.hpp> #include <opm/simulators/wells/WellGroupControls.hpp>
#include <opm/input/eclipse/EclipseState/Runspec.hpp> #include <opm/input/eclipse/EclipseState/Phase.hpp>
#include <opm/input/eclipse/Schedule/Schedule.hpp> #include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/Schedule/Group/Group.hpp> #include <opm/input/eclipse/Schedule/Group/Group.hpp>
#include <opm/input/eclipse/Schedule/ScheduleTypes.hpp> #include <opm/input/eclipse/Schedule/ScheduleTypes.hpp>