mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Chase API Update
The WBP result type is now top-level.
This commit is contained in:
@@ -2331,7 +2331,7 @@ namespace Opm {
|
||||
{
|
||||
auto wbpResult = data::WellBlockAveragePressures{};
|
||||
|
||||
using Calculated = typename PAvgCalculator<Scalar>::Result::WBPMode;
|
||||
using Calculated = typename PAvgCalculatorResult<Scalar>::WBPMode;
|
||||
using Output = data::WellBlockAvgPress::Quantity;
|
||||
|
||||
this->wbpCalculationService_.collectDynamicValues();
|
||||
|
||||
@@ -259,7 +259,7 @@ inferBlockAveragePressures(const std::size_t calcIndex,
|
||||
}
|
||||
|
||||
template<class Scalar>
|
||||
const typename Opm::PAvgCalculator<Scalar>::Result&
|
||||
const Opm::PAvgCalculatorResult<Scalar>&
|
||||
Opm::ParallelWBPCalculation<Scalar>::
|
||||
averagePressures(const std::size_t calcIndex) const
|
||||
{
|
||||
|
||||
@@ -164,7 +164,7 @@ public:
|
||||
///
|
||||
/// \return Result set from most recent call to member function \c
|
||||
/// inferBlockAveragePressures() for \c calcIndex.
|
||||
const typename PAvgCalculator<Scalar>::Result&
|
||||
const PAvgCalculatorResult<Scalar>&
|
||||
averagePressures(const std::size_t calcIndex) const;
|
||||
|
||||
private:
|
||||
|
||||
@@ -599,7 +599,7 @@ BOOST_AUTO_TEST_CASE(TopOfFormation_Well_OpenConns)
|
||||
cse.wbpCalcService.inferBlockAveragePressures(calcIndex, controls, gravity, refDepth);
|
||||
|
||||
const auto avgPress = cse.wbpCalcService.averagePressures(calcIndex);
|
||||
using WBPMode = Opm::PAvgCalculator<double>::Result::WBPMode;
|
||||
using WBPMode = Opm::PAvgCalculatorResult<double>::WBPMode;
|
||||
|
||||
BOOST_CHECK_CLOSE(avgPress.value(WBPMode::WBP) , 1254.806625666667, 1.0e-8);
|
||||
BOOST_CHECK_CLOSE(avgPress.value(WBPMode::WBP4), 1295.348292333333, 1.0e-8);
|
||||
|
||||
Reference in New Issue
Block a user