added a scalar test

CMakeLists.txt

@@ -116,4 +116,8 @@ install(DIRECTORY doc/man1 DESTINATION ${CMAKE_INSTALL_MANDIR}
   FILES_MATCHING PATTERN "*.1")
 =======
 opm_add_test(test_chiflash)
+<<<<<<< HEAD
 >>>>>>> bb846316 ([WIP] Add ChiFlash and test. Not compiling.)
+=======
+opm_add_test(test_chiflash_scalar)
+>>>>>>> f08ec1f9 (added a scalar test)

opm/material/constraintsolvers/ChiFlash.hpp

@@ -95,7 +95,8 @@ class ChiFlash
         using InputEval = typename FluidState::Scalar;
         using Matrix = Dune::FieldMatrix<InputEval, numEq, numEq>;
         using Vetor = Dune::FieldVector<InputEval, numEq>;
-        using FlashEval = Opm::DenseAd::Evaluation</*Scalar=*/InputEval, /*numDerivs=*/numEq>;
+        //using FlashEval = Opm::DenseAd::Evaluation</*Scalar=*/InputEval, /*numDerivs=*/numEq>;
+        using FlashEval = typename FluidState::Scalar;
         using FlashDefectVector = Dune::FieldVector<FlashEval, numEq>;
         using FlashFluidState = Opm::CompositionalFluidState<FlashEval, FluidSystem, /*energy=*/false>;
 
@@ -149,8 +150,9 @@ class ChiFlash
                 if (verbosity >= 1) {
                     std::cout << "Calculate composition using Newton." << std::endl;
                 }
-                newtonCompositionUpdate_(K, static_cast<DenseAd::Evaluation<double, 2>&>(L), fluidState, globalComposition, verbosity);
-
+                //newtonCompositionUpdate_(K, static_cast<DenseAd::Evaluation<double, 2>&>(L), fluidState, globalComposition, verbosity);
+                newtonCompositionUpdate_(K, L, fluidState, globalComposition, verbosity);
+                //throw std::runtime_error(" Newton not implemented for now" );
             }
 
             // Successive substitution

tests/test_chiflash_scalar.cpp

@@ -0,0 +1,128 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
+*/
+/*!
+ * \file
+ *
+ * \brief This is test for the ChiFlash flash solver.
+ */
+#include "config.h"
+
+#include <opm/material/constraintsolvers/ChiFlash.hpp>
+#include <opm/material/fluidsystems/chifluid/twophasefluidsystem.hh>
+
+#include <opm/material/densead/Evaluation.hpp>
+#include <opm/material/constraintsolvers/ComputeFromReferencePhase.hpp>
+// #include <opm/material/constraintsolvers/NcpFlash.hpp>
+#include <opm/material/fluidstates/CompositionalFluidState.hpp>
+// #include <opm/material/fluidsystems/Spe5FluidSystem.hpp>
+#include <opm/material/fluidmatrixinteractions/LinearMaterial.hpp>
+// #include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
+
+#include <dune/common/parallel/mpihelper.hh>
+
+void testChiFlash()
+{
+
+
+    using Scalar = double;
+    using FluidSystem = Opm::TwoPhaseThreeComponentFluidSystem<Scalar>;
+
+    constexpr auto numComponents = FluidSystem::numComponents;
+    //using Evaluation = Opm::DenseAd::Evaluation<double, numComponents>;
+    typedef Dune::FieldVector<Scalar, numComponents> ComponentVector;
+    typedef Opm::CompositionalFluidState<Scalar, FluidSystem> FluidState;
+
+    // input
+    Scalar p_init = 100.*1.e5; // 100 bar
+    ComponentVector comp;
+    comp(0) = MFCOMP0;comp(1) = MFCOMP1;
+    ComponentVector sat;
+    sat[0] = 1.0; sat[1] = 1.0-sat[0];
+    Scalar temp = 303.0;
+    // From co2-compositional branch, it uses
+    // typedef typename FluidSystem::template ParameterCache<Scalar> ParameterCache;
+
+    FluidState fs;
+    // TODO: no capillary pressure for now
+
+    fs.setPressure(FluidSystem::oilPhaseIdx, p_init);
+    fs.setPressure(FluidSystem::gasPhaseIdx, p_init);
+
+    fs.setMoleFraction(FluidSystem::oilPhaseIdx, FluidSystem::Comp0Idx, comp[0]);
+    fs.setMoleFraction(FluidSystem::oilPhaseIdx, FluidSystem::Comp1Idx, comp[1]);
+
+    fs.setMoleFraction(FluidSystem::gasPhaseIdx, FluidSystem::Comp0Idx, comp[0]);
+    fs.setMoleFraction(FluidSystem::gasPhaseIdx, FluidSystem::Comp1Idx, comp[1]);
+
+    fs.setSaturation(FluidSystem::oilPhaseIdx, sat[0]);
+    fs.setSaturation(FluidSystem::gasPhaseIdx, sat[1]);
+
+    fs.setTemperature(temp);
+
+    // ParameterCache paramCache;
+    {
+        typename FluidSystem::template ParameterCache<Scalar> paramCache;
+        paramCache.updatePhase(fs, FluidSystem::oilPhaseIdx);
+        paramCache.updatePhase(fs, FluidSystem::gasPhaseIdx);
+        fs.setDensity(FluidSystem::oilPhaseIdx, FluidSystem::density(fs, paramCache, FluidSystem::oilPhaseIdx));
+        fs.setDensity(FluidSystem::gasPhaseIdx, FluidSystem::density(fs, paramCache, FluidSystem::gasPhaseIdx));
+    }
+
+    ComponentVector zInit(0.); // TODO; zInit needs to be normalized.
+    {
+        Scalar sumMoles = 0.0;
+        for (unsigned phaseIdx = 0; phaseIdx < FluidSystem::numPhases; ++phaseIdx) {
+            for (unsigned compIdx = 0; compIdx < numComponents; ++compIdx) {
+                Scalar tmp = Opm::getValue(fs.molarity(phaseIdx, compIdx) * fs.saturation(phaseIdx));
+                zInit[compIdx] += Opm::max(tmp, 1e-8);
+                sumMoles += tmp;
+            }
+        }
+        zInit /= sumMoles;
+    }
+    const double flash_tolerance = -1.; // just to test the setup in co2-compositional
+    const int flash_verbosity = 1;
+    const std::string flash_twophase_method = "ssi";
+
+    // Set initial K and L
+    for (unsigned compIdx = 0; compIdx < numComponents; ++compIdx) {
+        const Scalar Ktmp = fs.wilsonK_(compIdx);
+        fs.setKvalue(compIdx, Ktmp);
+    }
+    const Scalar Ltmp = -1.0;
+    fs.setLvalue(Ltmp);
+
+    const int spatialIdx = 0;
+    using Flash = Opm::ChiFlash<double, Scalar, FluidSystem>;
+    Flash::solve(fs, zInit, spatialIdx, flash_verbosity, flash_twophase_method, flash_tolerance);
+
+}
+
+int main(int argc, char **argv)
+{
+    Dune::MPIHelper::instance(argc, argv);
+
+    testChiFlash();
+
+    return 0;
+}