mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-11-23 01:36:25 -06:00
rename StandardWellGeneric to StandardWellConnections
This commit is contained in:
Arne Morten Kvarving
parent
0389465bbf
commit
b08c165384
@ -97,9 +97,9 @@ list (APPEND MAIN_SOURCE_FILES
|
||||
opm/simulators/wells/SegmentState.cpp
|
||||
opm/simulators/wells/SingleWellState.cpp
|
||||
opm/simulators/wells/StandardWellAssemble.cpp
|
||||
opm/simulators/wells/StandardWellConnections.cpp
|
||||
opm/simulators/wells/StandardWellEquations.cpp
|
||||
opm/simulators/wells/StandardWellEval.cpp
|
||||
opm/simulators/wells/StandardWellGeneric.cpp
|
||||
opm/simulators/wells/StandardWellPrimaryVariables.cpp
|
||||
opm/simulators/wells/TargetCalculator.cpp
|
||||
opm/simulators/wells/VFPHelpers.cpp
|
||||
@ -384,9 +384,9 @@ list (APPEND PUBLIC_HEADER_FILES
|
||||
opm/simulators/wells/StandardWell.hpp
|
||||
opm/simulators/wells/StandardWell_impl.hpp
|
||||
opm/simulators/wells/StandardWellAssemble.hpp
|
||||
opm/simulators/wells/StandardWellConnections.hpp
|
||||
opm/simulators/wells/StandardWellEquations.hpp
|
||||
opm/simulators/wells/StandardWellEval.hpp
|
||||
opm/simulators/wells/StandardWellGeneric.hpp
|
||||
opm/simulators/wells/StandardWellPrimaryVariables.hpp
|
||||
opm/simulators/wells/TargetCalculator.hpp
|
||||
opm/simulators/wells/VFPHelpers.hpp
|
||||
|
||||
@ -25,7 +25,6 @@
|
||||
|
||||
#include <opm/simulators/timestepping/ConvergenceReport.hpp>
|
||||
#include <opm/simulators/wells/RateConverter.hpp>
|
||||
#include <opm/simulators/wells/StandardWellGeneric.hpp>
|
||||
#include <opm/simulators/wells/VFPInjProperties.hpp>
|
||||
#include <opm/simulators/wells/VFPProdProperties.hpp>
|
||||
#include <opm/simulators/wells/WellInterface.hpp>
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <opm/simulators/wells/StandardWellGeneric.hpp>
|
||||
#include <opm/simulators/wells/StandardWellConnections.hpp>
|
||||
|
||||
#include <opm/simulators/wells/ParallelWellInfo.hpp>
|
||||
#include <opm/simulators/wells/WellInterfaceGeneric.hpp>
|
||||
@ -29,17 +29,17 @@ namespace Opm
|
||||
{
|
||||
|
||||
template<class Scalar>
|
||||
StandardWellGeneric<Scalar>::
|
||||
StandardWellGeneric(const WellInterfaceGeneric& baseif)
|
||||
: baseif_(baseif)
|
||||
, perf_densities_(baseif_.numPerfs())
|
||||
, perf_pressure_diffs_(baseif_.numPerfs())
|
||||
StandardWellConnections<Scalar>::
|
||||
StandardWellConnections(const WellInterfaceGeneric& well)
|
||||
: perf_densities_(well_.numPerfs())
|
||||
, perf_pressure_diffs_(well_.numPerfs())
|
||||
, well_(well)
|
||||
{
|
||||
}
|
||||
|
||||
template<class Scalar>
|
||||
void
|
||||
StandardWellGeneric<Scalar>::
|
||||
StandardWellConnections<Scalar>::
|
||||
computeConnectionPressureDelta()
|
||||
{
|
||||
// Algorithm:
|
||||
@ -56,13 +56,13 @@ computeConnectionPressureDelta()
|
||||
// perforation for each well, for which it will be the
|
||||
// difference to the reference (bhp) depth.
|
||||
|
||||
const int nperf = baseif_.numPerfs();
|
||||
const int nperf = well_.numPerfs();
|
||||
perf_pressure_diffs_.resize(nperf, 0.0);
|
||||
auto z_above = baseif_.parallelWellInfo().communicateAboveValues(baseif_.refDepth(), baseif_.perfDepth());
|
||||
auto z_above = well_.parallelWellInfo().communicateAboveValues(well_.refDepth(), well_.perfDepth());
|
||||
|
||||
for (int perf = 0; perf < nperf; ++perf) {
|
||||
const double dz = baseif_.perfDepth()[perf] - z_above[perf];
|
||||
perf_pressure_diffs_[perf] = dz * perf_densities_[perf] * baseif_.gravity();
|
||||
const double dz = well_.perfDepth()[perf] - z_above[perf];
|
||||
perf_pressure_diffs_[perf] = dz * perf_densities_[perf] * well_.gravity();
|
||||
}
|
||||
|
||||
// 2. Compute pressure differences to the reference point (bhp) by
|
||||
@ -71,9 +71,9 @@ computeConnectionPressureDelta()
|
||||
// This accumulation must be done per well.
|
||||
const auto beg = perf_pressure_diffs_.begin();
|
||||
const auto end = perf_pressure_diffs_.end();
|
||||
baseif_.parallelWellInfo().partialSumPerfValues(beg, end);
|
||||
well_.parallelWellInfo().partialSumPerfValues(beg, end);
|
||||
}
|
||||
|
||||
template class StandardWellGeneric<double>;
|
||||
template class StandardWellConnections<double>;
|
||||
|
||||
}
|
||||
@ -20,8 +20,8 @@
|
||||
*/
|
||||
|
||||
|
||||
#ifndef OPM_STANDARDWELL_GENERIC_HEADER_INCLUDED
|
||||
#define OPM_STANDARDWELL_GENERIC_HEADER_INCLUDED
|
||||
#ifndef OPM_STANDARDWELL_CONNECTIONS_HEADER_INCLUDED
|
||||
#define OPM_STANDARDWELL_CONNECTIONS_HEADER_INCLUDED
|
||||
|
||||
#include <vector>
|
||||
|
||||
@ -31,27 +31,28 @@ namespace Opm
|
||||
class WellInterfaceGeneric;
|
||||
|
||||
template<class Scalar>
|
||||
class StandardWellGeneric
|
||||
class StandardWellConnections
|
||||
{
|
||||
protected:
|
||||
StandardWellGeneric(const WellInterfaceGeneric& baseif);
|
||||
public:
|
||||
StandardWellConnections(const WellInterfaceGeneric& well);
|
||||
|
||||
void computeConnectionPressureDelta();
|
||||
|
||||
// Base interface reference
|
||||
const WellInterfaceGeneric& baseif_;
|
||||
|
||||
// densities of the fluid in each perforation
|
||||
std::vector<double> perf_densities_;
|
||||
// pressure drop between different perforations
|
||||
std::vector<double> perf_pressure_diffs_;
|
||||
|
||||
double getRho() const
|
||||
Scalar getRho() const
|
||||
{
|
||||
return this->perf_densities_.empty() ? 0.0 : perf_densities_[0];
|
||||
}
|
||||
|
||||
// densities of the fluid in each perforation
|
||||
std::vector<Scalar> perf_densities_;
|
||||
// pressure drop between different perforations
|
||||
std::vector<Scalar> perf_pressure_diffs_;
|
||||
|
||||
private:
|
||||
// Base interface reference
|
||||
const WellInterfaceGeneric& well_;
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif // OPM_STANDARDWELL_GENERIC_HEADER_INCLUDED
|
||||
#endif // OPM_STANDARDWELL_CONNECTIONS_HEADER_INCLUDED
|
||||
@ -49,7 +49,7 @@ namespace Opm
|
||||
template<class FluidSystem, class Indices, class Scalar>
|
||||
StandardWellEval<FluidSystem,Indices,Scalar>::
|
||||
StandardWellEval(const WellInterfaceIndices<FluidSystem,Indices,Scalar>& baseif)
|
||||
: StandardWellGeneric<Scalar>(baseif)
|
||||
: StandardWellConnections<Scalar>(baseif)
|
||||
, baseif_(baseif)
|
||||
, primary_variables_(baseif_)
|
||||
, F0_(numWellConservationEq)
|
||||
|
||||
@ -23,8 +23,8 @@
|
||||
#ifndef OPM_STANDARDWELL_EVAL_HEADER_INCLUDED
|
||||
#define OPM_STANDARDWELL_EVAL_HEADER_INCLUDED
|
||||
|
||||
#include <opm/simulators/wells/StandardWellConnections.hpp>
|
||||
#include <opm/simulators/wells/StandardWellEquations.hpp>
|
||||
#include <opm/simulators/wells/StandardWellGeneric.hpp>
|
||||
#include <opm/simulators/wells/StandardWellPrimaryVariables.hpp>
|
||||
|
||||
#include <opm/material/densead/DynamicEvaluation.hpp>
|
||||
@ -45,7 +45,7 @@ template<class FluidSystem, class Indices, class Scalar> class WellInterfaceIndi
|
||||
class WellState;
|
||||
|
||||
template<class FluidSystem, class Indices, class Scalar>
|
||||
class StandardWellEval : public StandardWellGeneric<Scalar>
|
||||
class StandardWellEval : public StandardWellConnections<Scalar>
|
||||
{
|
||||
protected:
|
||||
using PrimaryVariables = StandardWellPrimaryVariables<FluidSystem,Indices,Scalar>;
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
|
||||
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
|
||||
|
||||
#include <opm/simulators/wells/StandardWellGeneric.hpp>
|
||||
#include <opm/simulators/wells/WellInterfaceIndices.hpp>
|
||||
#include <opm/simulators/wells/WellState.hpp>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user