OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing the compilation of test_chiflash

Browse Source 
one reason is some code does not compile with DUNE2.6. And DUNE2.6 is
still supported by OPM.
This commit is contained in:
Kai Bao 2022-06-21 15:53:25 +02:00
parent 82c6bfe610
commit 530157c092
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
opm/material/constraintsolvers/ChiFlash.hpp
View File

@ -1062,8 +1062,11 @@ protected:
(primary_fluid_state, primary_z, pri_jac, pri_res); (primary_fluid_state, primary_z, pri_jac, pri_res);
} }
SecondaryNewtonMatrix xx; // the following code does not compile with DUNE2.6
pri_jac.solve(xx,sec_jac); // SecondaryNewtonMatrix xx;
// pri_jac.solve(xx, sec_jac);
pri_jac.invert();
sec_jac.template leftmultiply(pri_jac);
using InputEval = typename FluidState::Scalar; using InputEval = typename FluidState::Scalar;
using ComponentVectorMoleFraction = Dune::FieldVector<InputEval, numComponents>; using ComponentVectorMoleFraction = Dune::FieldVector<InputEval, numComponents>;
@ -1095,11 +1098,11 @@ protected:
std::vector<double> deri(num_deri, 0.); std::vector<double> deri(num_deri, 0.);
// derivatives from P // derivatives from P
for (unsigned idx = 0; idx < num_deri; ++idx) { for (unsigned idx = 0; idx < num_deri; ++idx) {
deri[idx] = - xx[compIdx][0] * p_l.derivative(idx); deri[idx] = - sec_jac[compIdx][0] * p_l.derivative(idx);
} }
for (unsigned cIdx = 0; cIdx < numComponents; ++cIdx) { for (unsigned cIdx = 0; cIdx < numComponents; ++cIdx) {
const double pz = -xx[compIdx][cIdx + 1]; const double pz = -sec_jac[compIdx][cIdx + 1];
const auto& zi = z[cIdx]; const auto& zi = z[cIdx];
for (unsigned idx = 0; idx < num_deri; ++idx) { for (unsigned idx = 0; idx < num_deri; ++idx) {
deri[idx] += pz * zi.derivative(idx); deri[idx] += pz * zi.derivative(idx);
@ -1110,10 +1113,10 @@ protected:
} }
// handling y // handling y
for (unsigned idx = 0; idx < num_deri; ++idx) { for (unsigned idx = 0; idx < num_deri; ++idx) {
deri[idx] = - xx[compIdx + numComponents][0]* p_v.derivative(idx); deri[idx] = - sec_jac[compIdx + numComponents][0]* p_v.derivative(idx);
} }
for (unsigned cIdx = 0; cIdx < numComponents; ++cIdx) { for (unsigned cIdx = 0; cIdx < numComponents; ++cIdx) {
const double pz = -xx[compIdx + numComponents][cIdx + 1]; const double pz = -sec_jac[compIdx + numComponents][cIdx + 1];
const auto& zi = z[cIdx]; const auto& zi = z[cIdx];
for (unsigned idx = 0; idx < num_deri; ++idx) { for (unsigned idx = 0; idx < num_deri; ++idx) {
deri[idx] += pz * zi.derivative(idx); deri[idx] += pz * zi.derivative(idx);
@ -1126,10 +1129,10 @@ protected:
// handling derivatives of L // handling derivatives of L
std::vector<double> deriL(num_deri, 0.); std::vector<double> deriL(num_deri, 0.);
for (unsigned idx = 0; idx < num_deri; ++idx) { for (unsigned idx = 0; idx < num_deri; ++idx) {
deriL[idx] = - xx[2*numComponents][0] * p_v.derivative(idx); deriL[idx] = - sec_jac[2*numComponents][0] * p_v.derivative(idx);
} }
for (unsigned cIdx = 0; cIdx < numComponents; ++cIdx) { for (unsigned cIdx = 0; cIdx < numComponents; ++cIdx) {
const double pz = -xx[2*numComponents][cIdx + 1]; const double pz = -sec_jac[2*numComponents][cIdx + 1];
const auto& zi = z[cIdx]; const auto& zi = z[cIdx];
for (unsigned idx = 0; idx < num_deri; ++idx) { for (unsigned idx = 0; idx < num_deri; ++idx) {
deriL[idx] += pz * zi.derivative(idx); deriL[idx] += pz * zi.derivative(idx);

4
tests/test_chiflash.cpp
View File

@ -87,8 +87,8 @@ void testChiFlash()
typename FluidSystem::template ParameterCache<Evaluation> paramCache; typename FluidSystem::template ParameterCache<Evaluation> paramCache;
paramCache.updatePhase(fluid_state, FluidSystem::oilPhaseIdx); paramCache.updatePhase(fluid_state, FluidSystem::oilPhaseIdx);
paramCache.updatePhase(fluid_state, FluidSystem::gasPhaseIdx); paramCache.updatePhase(fluid_state, FluidSystem::gasPhaseIdx);
fluid_state.setDensity(FluidSystem::oilPhaseIdx, FluidSystem::density(fs, paramCache, FluidSystem::oilPhaseIdx)); fluid_state.setDensity(FluidSystem::oilPhaseIdx, FluidSystem::density(fluid_state, paramCache, FluidSystem::oilPhaseIdx));
fluid_state.setDensity(FluidSystem::gasPhaseIdx, FluidSystem::density(fs, paramCache, FluidSystem::gasPhaseIdx)); fluid_state.setDensity(FluidSystem::gasPhaseIdx, FluidSystem::density(fluid_state, paramCache, FluidSystem::gasPhaseIdx));
} }
ComponentVector z(0.); // TODO; z needs to be normalized. ComponentVector z(0.); // TODO; z needs to be normalized.