mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
changed: introduce a struct StandardWellConnections::Properties
this holds the various properties for a connection
This commit is contained in:
parent
61e5ce3d73
commit
fafca7b382
@ -39,6 +39,16 @@ class StandardWellConnections
|
||||
public:
|
||||
StandardWellConnections(const WellInterfaceIndices<FluidSystem,Indices,Scalar>& well);
|
||||
|
||||
struct Properties
|
||||
{
|
||||
std::vector<Scalar> b_perf;
|
||||
std::vector<Scalar> rsmax_perf;
|
||||
std::vector<Scalar> rvmax_perf;
|
||||
std::vector<Scalar> rvwmax_perf;
|
||||
std::vector<Scalar> rswmax_perf;
|
||||
std::vector<Scalar> surf_dens_perf;
|
||||
};
|
||||
|
||||
void computePropertiesForPressures(const WellState& well_state,
|
||||
const std::function<Scalar(int,int)>& getTemperature,
|
||||
const std::function<Scalar(int)>& getSaltConcentration,
|
||||
|
@ -1576,14 +1576,21 @@ namespace Opm
|
||||
// 1. Compute properties required by computePressureDelta().
|
||||
// Note that some of the complexity of this part is due to the function
|
||||
// taking std::vector<double> arguments, and not Eigen objects.
|
||||
std::vector<double> b_perf;
|
||||
std::vector<double> rsmax_perf;
|
||||
std::vector<double> rvmax_perf;
|
||||
std::vector<double> rvwmax_perf;
|
||||
std::vector<double> rswmax_perf;
|
||||
std::vector<double> surf_dens_perf;
|
||||
computePropertiesForWellConnectionPressures(ebosSimulator, well_state, b_perf, rsmax_perf, rvmax_perf, rvwmax_perf, rswmax_perf, surf_dens_perf);
|
||||
computeWellConnectionDensitesPressures(ebosSimulator, well_state, b_perf, rsmax_perf, rvmax_perf, rvwmax_perf, rswmax_perf, surf_dens_perf, deferred_logger);
|
||||
StdWellEval::StdWellConnections::Properties props;
|
||||
computePropertiesForWellConnectionPressures(ebosSimulator, well_state,
|
||||
props.b_perf,
|
||||
props.rsmax_perf,
|
||||
props.rvmax_perf,
|
||||
props.rvwmax_perf,
|
||||
props.rswmax_perf,
|
||||
props.surf_dens_perf);
|
||||
computeWellConnectionDensitesPressures(ebosSimulator, well_state,
|
||||
props.b_perf,
|
||||
props.rsmax_perf,
|
||||
props.rvmax_perf,
|
||||
props.rvwmax_perf,
|
||||
props.rswmax_perf,
|
||||
props.surf_dens_perf, deferred_logger);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user