From c406216c7f1def017387ac87f892628003491ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ove=20S=C3=A6vareid?= Date: Thu, 10 Jun 2021 13:55:06 +0200 Subject: [PATCH] Removed some tentative stuff. --- ebos/eclgenerictracermodel.hh | 2 - ebos/ecltracermodel.hh | 79 +++++------------------------------ 2 files changed, 11 insertions(+), 70 deletions(-) diff --git a/ebos/eclgenerictracermodel.hh b/ebos/eclgenerictracermodel.hh index a56b2b10d..db59f1753 100644 --- a/ebos/eclgenerictracermodel.hh +++ b/ebos/eclgenerictracermodel.hh @@ -50,8 +50,6 @@ class EclGenericTracerModel { public: using TracerMatrix = Dune::BCRSMatrix>; using TracerVector = Dune::BlockVector>; - using DualTracerMatrix = Dune::BCRSMatrix>; - using DualTracerVector = Dune::BlockVector>; using CartesianIndexMapper = Dune::CartesianIndexMapper; /*! diff --git a/ebos/ecltracermodel.hh b/ebos/ecltracermodel.hh index a9e37a1ec..c8cf58a60 100644 --- a/ebos/ecltracermodel.hh +++ b/ebos/ecltracermodel.hh @@ -78,7 +78,6 @@ class EclTracerModel : public EclGenericTracerModel; using TracerVector = typename BaseType::TracerVector; - using DualTracerVector = typename BaseType::DualTracerVector; enum { numEq = getPropValue() }; enum { numPhases = FluidSystem::numPhases }; @@ -96,8 +95,6 @@ public: , wat_(TracerBatch(waterPhaseIdx)) , oil_(TracerBatch(oilPhaseIdx)) , gas_(TracerBatch(gasPhaseIdx)) - , oilS_(TracerBatch(oilPhaseIdx)) - , gasS_(TracerBatch(gasPhaseIdx)) { } @@ -159,7 +156,6 @@ protected: // evaluate water storage volume(s) in a single cell template void computeVolume_(LhsEval& freeVolume, - LhsEval& dissolvedVolume, const int tracerPhaseIdx, const ElementContext& elemCtx, unsigned scvIdx, @@ -180,29 +176,11 @@ protected: else freeVolume = phaseVolume * variable(1.0, 0); - if (FluidSystem::enableDissolvedGas() && tracerPhaseIdx == gasPhaseIdx) { - dissolvedVolume = - decay(fs.saturation(oilPhaseIdx)) - *decay(fs.invB(oilPhaseIdx)) - *decay(fs.Rs()) - *decay(intQuants.porosity()); - } - - if (FluidSystem::enableVaporizedOil() && tracerPhaseIdx == oilPhaseIdx) { - dissolvedVolume = - decay(fs.saturation(gasPhaseIdx)) - *decay(fs.invB(gasPhaseIdx)) - *decay(fs.Rv()) - *decay(intQuants.porosity()); - } - } // evaluate the flux(es) over one face void computeFlux_(TracerEvaluation & freeFlux, - TracerEvaluation & dissolvedFlux, bool & isUpFree, - bool & isUpDissolved, const int tracerPhaseIdx, const ElementContext& elemCtx, unsigned scvfIdx, @@ -232,35 +210,6 @@ protected: freeFlux = A*v*b*1.0; isUpFree = false; } - - if (FluidSystem::enableDissolvedGas() && tracerPhaseIdx == gasPhaseIdx) { - v = decay(extQuants.volumeFlux(oilPhaseIdx)); - b = decay(fs.invB(oilPhaseIdx))*decay(fs.Rs()); - upIdx = extQuants.upstreamIndex(oilPhaseIdx); - if (inIdx == upIdx) { - dissolvedFlux += A*v*b*variable(1.0, 0); - isUpDissolved = true; - } - else { - dissolvedFlux += A*v*b*1.0; - isUpDissolved = false; - } - } - - if (FluidSystem::enableVaporizedOil() && tracerPhaseIdx == oilPhaseIdx) { - v = decay(extQuants.volumeFlux(gasPhaseIdx)); - b = decay(fs.invB(gasPhaseIdx))*decay(fs.Rv()); - upIdx = extQuants.upstreamIndex(gasPhaseIdx); - if (inIdx == upIdx) { - dissolvedFlux += A*v*b*variable(1.0, 0); - isUpDissolved = true; - } - else { - dissolvedFlux += A*v*b*1.0; - isUpDissolved = false; - } - } - } template @@ -279,8 +228,6 @@ protected: for (int tIdx =0; tIdx < tr.numTracer(); ++tIdx) tr.residual_[tIdx] = 0.0; - size_t numGridDof = simulator_.model().numGridDof(); - //std::vector volumes(numGridDof, 0.0); ElementContext elemCtx(simulator_); auto elemIt = simulator_.gridView().template begin(); auto elemEndIt = simulator_.gridView().template end(); @@ -299,7 +246,6 @@ protected: size_t I = elemCtx.globalSpaceIndex(/*dofIdx=*/ 0, /*timIdx=*/0); size_t I1 = elemCtx.globalSpaceIndex(/*dofIdx=*/ 0, /*timIdx=*/1); - //volumes[I] = scvVolume; Scalar storageOfTimeIndex1[tr.numTracer()]; if (elemCtx.enableStorageCache()) { @@ -308,15 +254,15 @@ protected: } } else { - Scalar fVolume1, sVolume1; - computeVolume_(fVolume1, sVolume1, tr.phaseIdx_, elemCtx, 0, /*timIdx=*/1); + Scalar fVolume1; + computeVolume_(fVolume1, tr.phaseIdx_, elemCtx, 0, /*timIdx=*/1); for (int tIdx =0; tIdx < tr.numTracer(); ++tIdx) { storageOfTimeIndex1[tIdx] = fVolume1*tr.concentrationInitial_[tIdx][I1]; } } - TracerEvaluation fVolume, sVolume; - computeVolume_(fVolume, sVolume, tr.phaseIdx_, elemCtx, 0, /*timIdx=*/0); + TracerEvaluation fVolume; + computeVolume_(fVolume, tr.phaseIdx_, elemCtx, 0, /*timIdx=*/0); for (int tIdx =0; tIdx < tr.numTracer(); ++tIdx) { Scalar storageOfTimeIndex0 = fVolume.value()*tr.concentration_[tIdx][I]; Scalar localStorage = (storageOfTimeIndex0 - storageOfTimeIndex1[tIdx]) * scvVolume/dt; @@ -326,12 +272,12 @@ protected: size_t numInteriorFaces = elemCtx.numInteriorFaces(/*timIdx=*/0); for (unsigned scvfIdx = 0; scvfIdx < numInteriorFaces; scvfIdx++) { - TracerEvaluation flux, sFlux; + TracerEvaluation flux; const auto& face = elemCtx.stencil(0).interiorFace(scvfIdx); unsigned j = face.exteriorIndex(); unsigned J = elemCtx.globalSpaceIndex(/*dofIdx=*/ j, /*timIdx=*/0); - bool isUpF, isUpS; - computeFlux_(flux, sFlux, isUpF, isUpS, tr.phaseIdx_, elemCtx, scvfIdx, 0); + bool isUpF; + computeFlux_(flux, isUpF, tr.phaseIdx_, elemCtx, scvfIdx, 0); int globalUpIdx = isUpF ? I : J; for (int tIdx =0; tIdx < tr.numTracer(); ++tIdx) { tr.residual_[tIdx][I][0] += flux.value()*tr.concentration_[tIdx][globalUpIdx]; //residual + flux @@ -404,8 +350,8 @@ protected: for (; elemIt != elemEndIt; ++ elemIt) { elemCtx.updateAll(*elemIt); int globalDofIdx = elemCtx.globalSpaceIndex(0, /*timIdx=*/0); - Scalar fVolume, sVolume; - computeVolume_(fVolume, sVolume, tr.phaseIdx_, elemCtx, 0, /*timIdx=*/0); + Scalar fVolume; + computeVolume_(fVolume, tr.phaseIdx_, elemCtx, 0, /*timIdx=*/0); for (int tIdx =0; tIdx < tr.numTracer(); ++tIdx) { tr.storageOfTimeIndex1_[tIdx][globalDofIdx] = fVolume*tr.concentrationInitial_[tIdx][globalDofIdx]; } @@ -467,7 +413,7 @@ protected: void prepareTracerBatches() { - for (int tracerIdx=0; tracerIdxtracerPhaseIdx_.size(); ++tracerIdx) { + for (size_t tracerIdx=0; tracerIdxtracerPhaseIdx_.size(); ++tracerIdx) { if (this->tracerPhaseIdx_[tracerIdx] == FluidSystem::waterPhaseIdx) { if (! FluidSystem::phaseIsActive(FluidSystem::waterPhaseIdx)){ throw std::runtime_error("Water tracer specified for non-water fluid system:" + this->tracerNames_[tracerIdx]); @@ -519,7 +465,7 @@ protected: TracerBatch(int phaseIdx) : phaseIdx_(phaseIdx) {} - const int numTracer() const {return idx_.size(); } + int numTracer() const {return idx_.size(); } void addTracer(const int idx, const TV & concentration) { @@ -535,9 +481,6 @@ protected: TracerBatch wat_; TracerBatch oil_; TracerBatch gas_; - - TracerBatch oilS_; - TracerBatch gasS_; }; } // namespace Opm