diff --git a/bin/testing/runtest.py b/bin/testing/runtest.py
old mode 100644
new mode 100755
index 078a8d2c6883b072e69c4b9580ba3cca64fbd919..4967075550584b206d6e372821bbd1d864901ee2
--- a/bin/testing/runtest.py
+++ b/bin/testing/runtest.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
import argparse
import os, sys
import subprocess
diff --git a/cmake/modules/DumuxTestMacros.cmake b/cmake/modules/DumuxTestMacros.cmake
index ef5d5381743ada68fdf2f60c6260f206d7ebfbe8..6777ecef7002fb0cfbc8f6f35bc29c06c5542260 100644
--- a/cmake/modules/DumuxTestMacros.cmake
+++ b/cmake/modules/DumuxTestMacros.cmake
@@ -13,6 +13,9 @@
# - further arguments: are optional and are used as arguments for calling the test
###
macro(add_dumux_test dumux_test dumux_test_executable dumux_test_executable_source)
+
+ message(WARNING "add_dumux_test is deprecated. Use dune_add_test directly now that we require dune 2.5")
+
# if present, symlink the grids folder
set(grids_directory ${CMAKE_CURRENT_SOURCE_DIR}/grids)
if(EXISTS ${grids_directory} AND IS_DIRECTORY ${grids_directory})
diff --git a/dumux/CMakeLists.txt b/dumux/CMakeLists.txt
index a8e7f0f33e13e29735b6d997152bd73f9b74f514..87cb87d8609fb96482771c7c36cd522ef43d221c 100644
--- a/dumux/CMakeLists.txt
+++ b/dumux/CMakeLists.txt
@@ -1,13 +1,11 @@
add_subdirectory("common")
add_subdirectory("discretization")
add_subdirectory("freeflow")
-add_subdirectory("geomechanics")
add_subdirectory("implicit")
add_subdirectory("io")
add_subdirectory("linear")
add_subdirectory("material")
add_subdirectory("mixeddimension")
-add_subdirectory("multidomain")
add_subdirectory("nonlinear")
add_subdirectory("parallel")
add_subdirectory("porousmediumflow")
diff --git a/dumux/assembly/boxlocalassembler.hh b/dumux/assembly/boxlocalassembler.hh
new file mode 100644
index 0000000000000000000000000000000000000000..83409952594377e3f431691414bc1344a2c30d38
--- /dev/null
+++ b/dumux/assembly/boxlocalassembler.hh
@@ -0,0 +1,1381 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief An assembler for the global linear system for fully implicit models
+ * and cell-centered discretization schemes using Newton's method.
+ */
+#ifndef DUMUX_BOX_LOCAL_ASSEMBLER_HH
+#define DUMUX_BOX_LOCAL_ASSEMBLER_HH
+
+#include <dune/istl/matrixindexset.hh>
+#include <dune/istl/bvector.hh>
+
+#include <dumux/assembly/diffmethod.hh>
+
+namespace Dumux {
+
+/*!
+ * \ingroup ImplicitModel
+ * \brief An assembler for the local contributions (per element) to the global
+ * linear system for fully implicit models and cell-centered discretization schemes.
+ */
+template<class TypeTag,
+ DiffMethod DM = DiffMethod::numeric,
+ bool implicit = true>
+class BoxLocalAssembler;
+
+
+template<class TypeTag>
+class BoxLocalAssembler<TypeTag,
+ DiffMethod::numeric,
+ /*implicit=*/true>
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ElementResidualVector = Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, NumEqVector)>;
+ using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
+ using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
+
+ static constexpr int dim = GridView::dimension;
+
+public:
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix. The element residual is written into the right hand side.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, jac, res, element, curSol);
+
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac,
+ const Element& element, const SolutionVector& curSol)
+ {
+ auto dummyresidual = curSol;
+ assemble_(assembler, jac, dummyresidual, element, curSol);
+ }
+
+ /*!
+ * \brief Assemble the residual only
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, res, element, curSol);
+ }
+
+ /*!
+ * \brief Computes the epsilon used for numeric differentiation
+ * for a given value of a primary variable.
+ *
+ * \param priVar The value of the primary variable
+ */
+ static Scalar numericEpsilon(const Scalar priVar)
+ {
+ // define the base epsilon as the geometric mean of 1 and the
+ // resolution of the scalar type. E.g. for standard 64 bit
+ // floating point values, the resolution is about 10^-16 and
+ // the base epsilon is thus approximately 10^-8.
+ /*
+ static const Scalar baseEps
+ = Dumux::geometricMean<Scalar>(std::numeric_limits<Scalar>::epsilon(), 1.0);
+ */
+ static const Scalar baseEps = 1e-10;
+ assert(std::numeric_limits<Scalar>::epsilon()*1e4 < baseEps);
+ // the epsilon value used for the numeric differentiation is
+ // now scaled by the absolute value of the primary variable...
+ return baseEps*(std::abs(priVar) + 1.0);
+ }
+
+private:
+ /*!
+ * \brief Computes the residual
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static void assemble_(Assembler& assembler, SolutionVector& r,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bind(element, fvGeometry, curSol);
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
+
+ const bool isStationary = localResidual.isStationary();
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ if (!isStationary)
+ prevElemVolVars.bindElement(element, fvGeometry, localResidual.prevSol());
+
+ // the element boundary types
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // the actual element's current residual
+ ElementResidualVector residual(0.0);
+ if (isStationary)
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+ }
+ else
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+ }
+
+ for (const auto& scv : scvs(fvGeometry))
+ r[scv.dofIndex()] += residual[scv.indexInElement()];
+
+ // enforce Dirichlet boundaries by setting the residual to (privar - dirichletvalue)
+ if (elemBcTypes.hasDirichlet())
+ {
+ for (const auto& scvI : scvs(fvGeometry))
+ {
+ const auto bcTypes = elemBcTypes[scvI.indexInElement()];
+ if (bcTypes.hasDirichlet())
+ {
+ const auto dirichletValues = problem.dirichlet(element, scvI);
+
+ // set the dirichlet conditions in residual and jacobian
+ for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
+ {
+ if (bcTypes.isDirichlet(eqIdx))
+ {
+ const auto pvIdx = bcTypes.eqToDirichletIndex(eqIdx);
+ assert(0 <= pvIdx && pvIdx < numEq);
+
+ const auto& priVars = curElemVolVars[scvI].priVars();
+ r[scvI.dofIndex()][eqIdx] = priVars[pvIdx] - dirichletValues[pvIdx];
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static void assemble_(Assembler& assembler, JacobianMatrix& A, SolutionVector& r,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ const auto& fvGridGeometry = assembler.fvGridGeometry();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // prepare the local views
+ auto fvGeometry = localView(fvGridGeometry);
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bind(element, fvGeometry, curSol);
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
+
+ const bool isStationary = localResidual.isStationary();
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ if (!isStationary)
+ prevElemVolVars.bindElement(element, fvGeometry, localResidual.prevSol());
+
+ // check for boundaries on the element
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // create the element solution
+ ElementSolutionVector elemSol(element, curSol, fvGeometry);
+
+ // the actual element's current residual
+ ElementResidualVector residual(0.0);
+ if (isStationary)
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+ }
+ else
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+ }
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+ // //
+ // Calculate derivatives of all dofs in stencil with respect to the dofs in the element. In the //
+ // neighboring elements we do so by computing the derivatives of the fluxes which depend on the //
+ // actual element. In the actual element we evaluate the derivative of the entire residual. //
+ // //
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+
+ static const int numericDifferenceMethod = getParamFromGroup<int>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Implicit.NumericDifferenceMethod");
+
+ // calculation of the derivatives
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ // dof index and corresponding actual pri vars
+ const auto dofIdx = scv.dofIndex();
+ auto& volVars = getVolVarAccess(gridVariables.curGridVolVars(), curElemVolVars, scv);
+ VolumeVariables origVolVars(volVars);
+
+ // add precalculated residual for this scv into the global container
+ r[dofIdx] += residual[scv.indexInElement()];
+
+ // calculate derivatives w.r.t to the privars at the dof at hand
+ for (int pvIdx = 0; pvIdx < numEq; pvIdx++)
+ {
+ ElementResidualVector partialDeriv(element.subEntities(dim));
+ Scalar eps = numericEpsilon(volVars.priVar(pvIdx));
+ Scalar delta = 0;
+
+ // calculate the residual with the forward deflected primary variables
+ if (numericDifferenceMethod >= 0)
+ {
+ // we are not using backward differences, i.e. we need to
+ // calculate f(x + \epsilon)
+
+ // deflect primary variables
+ elemSol[scv.indexInElement()][pvIdx] += eps;
+ delta += eps;
+
+ // update the volume variables connected to the dof
+ volVars.update(elemSol, problem, element, scv);
+
+ // store the deflected residual
+ if (isStationary)
+ {
+ partialDeriv = localResidual.eval(problem, element, fvGeometry,
+ curElemVolVars,
+ elemBcTypes, elemFluxVarsCache);
+ }
+ else
+ {
+ partialDeriv = localResidual.eval(problem, element, fvGeometry,
+ prevElemVolVars, curElemVolVars,
+ elemBcTypes, elemFluxVarsCache);
+ }
+ }
+ else
+ {
+ // we are using backward differences, i.e. we don't need
+ // to calculate f(x + \epsilon) and we can recycle the
+ // (already calculated) residual f(x)
+ partialDeriv = residual;
+ }
+
+ if (numericDifferenceMethod <= 0)
+ {
+ // we are not using forward differences, i.e. we
+ // need to calculate f(x - \epsilon)
+
+ // deflect the primary variables
+ elemSol[scv.indexInElement()][pvIdx] -= delta + eps;
+ delta += eps;
+
+ // update the volume variables connected to the dof
+ volVars.update(elemSol, problem, element, scv);
+
+ // subtract the deflected residual from the derivative storage
+ // store the deflected residual
+ if (isStationary)
+ {
+ partialDeriv -= localResidual.eval(problem, element, fvGeometry,
+ curElemVolVars,
+ elemBcTypes, elemFluxVarsCache);
+ }
+ else
+ {
+ partialDeriv -= localResidual.eval(problem, element, fvGeometry,
+ prevElemVolVars, curElemVolVars,
+ elemBcTypes, elemFluxVarsCache);
+ }
+ }
+ else
+ {
+ // we are using forward differences, i.e. we don't need to
+ // calculate f(x - \epsilon) and we can recycle the
+ // (already calculated) residual f(x)
+ partialDeriv -= residual;
+ }
+
+ // divide difference in residuals by the magnitude of the
+ // deflections between the two function evaluation
+ partialDeriv /= delta;
+
+ // update the global stiffness matrix with the current partial derivatives
+ for (auto&& scvJ : scvs(fvGeometry))
+ {
+ for (int eqIdx = 0; eqIdx < numEq; eqIdx++)
+ {
+ // A[i][col][eqIdx][pvIdx] is the rate of change of
+ // the residual of equation 'eqIdx' at dof 'i'
+ // depending on the primary variable 'pvIdx' at dof
+ // 'col'.
+ A[scvJ.dofIndex()][dofIdx][eqIdx][pvIdx] += partialDeriv[scvJ.indexInElement()][eqIdx];
+ }
+ }
+
+ // restore the original state of the scv's volume variables
+ volVars = origVolVars;
+
+ // restore the original element solution
+ elemSol[scv.indexInElement()][pvIdx] = curSol[scv.dofIndex()][pvIdx];
+ }
+
+ // TODO additional dof dependencies
+ }
+
+ // enforce Dirichlet boundaries by overwriting partial derivatives with 1 or 0
+ // and set the residual to (privar - dirichletvalue)
+ if (elemBcTypes.hasDirichlet())
+ {
+ for (const auto& scvI : scvs(fvGeometry))
+ {
+ const auto bcTypes = elemBcTypes[scvI.indexInElement()];
+ if (bcTypes.hasDirichlet())
+ {
+ const auto dirichletValues = problem.dirichlet(element, scvI);
+
+ // set the dirichlet conditions in residual and jacobian
+ for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
+ {
+ if (bcTypes.isDirichlet(eqIdx))
+ {
+ const auto pvIdx = bcTypes.eqToDirichletIndex(eqIdx);
+ assert(0 <= pvIdx && pvIdx < numEq);
+
+ const auto& priVars = curElemVolVars[scvI].priVars();
+ r[scvI.dofIndex()][eqIdx] = priVars[pvIdx] - dirichletValues[pvIdx];
+ for (const auto& scvJ : scvs(fvGeometry))
+ {
+ A[scvI.dofIndex()][scvJ.dofIndex()][eqIdx] = 0.0;
+ if (scvI.indexInElement() == scvJ.indexInElement())
+ A[scvI.dofIndex()][scvI.dofIndex()][eqIdx][pvIdx] = 1.0;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+private:
+ template<class T = TypeTag>
+ static typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return elemVolVars[scv]; }
+
+ template<class T = TypeTag>
+ static typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return gridVolVars.volVars(scv.elementIndex(), scv.indexInElement()); }
+
+}; // implicit BoxAssembler with numeric Jacobian
+
+template<class TypeTag>
+class BoxLocalAssembler<TypeTag,
+ DiffMethod::numeric,
+ /*implicit=*/false>
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ElementResidualVector = Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, NumEqVector)>;
+ using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
+ using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
+
+ static constexpr int dim = GridView::dimension;
+
+public:
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix. The element residual is written into the right hand side.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, jac, res, element, curSol);
+
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac,
+ const Element& element, const SolutionVector& curSol)
+ {
+ auto dummyresidual = curSol;
+ assemble_(assembler, jac, dummyresidual, element, curSol);
+ }
+
+ /*!
+ * \brief Assemble the residual only
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, res, element, curSol);
+ }
+
+ /*!
+ * \brief Computes the epsilon used for numeric differentiation
+ * for a given value of a primary variable.
+ *
+ * \param priVar The value of the primary variable
+ */
+ static Scalar numericEpsilon(const Scalar priVar)
+ {
+ // define the base epsilon as the geometric mean of 1 and the
+ // resolution of the scalar type. E.g. for standard 64 bit
+ // floating point values, the resolution is about 10^-16 and
+ // the base epsilon is thus approximately 10^-8.
+ /*
+ static const Scalar baseEps
+ = Dumux::geometricMean<Scalar>(std::numeric_limits<Scalar>::epsilon(), 1.0);
+ */
+ static const Scalar baseEps = 1e-10;
+ assert(std::numeric_limits<Scalar>::epsilon()*1e4 < baseEps);
+ // the epsilon value used for the numeric differentiation is
+ // now scaled by the absolute value of the primary variable...
+ return baseEps*(std::abs(priVar) + 1.0);
+ }
+
+private:
+ /*!
+ * \brief Computes the residual
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static void assemble_(Assembler& assembler, SolutionVector& r,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // using an explicit assembler doesn't make sense for stationary problems
+ if (localResidual.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Using explicit jacobian assembler with stationary local residual");
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bindElement(element, fvGeometry, curSol);
+
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ prevElemVolVars.bind(element, fvGeometry, localResidual.prevSol());
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, prevElemVolVars);
+
+ // the element boundary types
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // the actual element's current residual
+ auto residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+
+ auto storageResidual = localResidual.evalStorage(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+ residual += storageResidual;
+
+ for (const auto& scv : scvs(fvGeometry))
+ r[scv.dofIndex()] += residual[scv.indexInElement()];
+
+ // enforce Dirichlet boundaries by setting the residual to (privar - dirichletvalue)
+ if (elemBcTypes.hasDirichlet())
+ {
+ for (const auto& scvI : scvs(fvGeometry))
+ {
+ const auto bcTypes = elemBcTypes[scvI.indexInElement()];
+ if (bcTypes.hasDirichlet())
+ {
+ const auto dirichletValues = problem.dirichlet(element, scvI);
+
+ // set the dirichlet conditions in residual and jacobian
+ for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
+ {
+ if (bcTypes.isDirichlet(eqIdx))
+ {
+ const auto pvIdx = bcTypes.eqToDirichletIndex(eqIdx);
+ assert(0 <= pvIdx && pvIdx < numEq);
+
+ const auto& priVars = curElemVolVars[scvI].priVars();
+ r[scvI.dofIndex()][eqIdx] = priVars[pvIdx] - dirichletValues[pvIdx];
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static void assemble_(Assembler& assembler, JacobianMatrix& A, SolutionVector& r,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // using an explicit assembler doesn't make sense for stationary problems
+ if (localResidual.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Using explicit jacobian assembler with stationary local residual");
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bindElement(element, fvGeometry, curSol);
+
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ prevElemVolVars.bind(element, fvGeometry, localResidual.prevSol());
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, prevElemVolVars);
+
+ // the element boundary types
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // get the element solution
+ const auto numVert = element.subEntities(dim);
+ ElementSolutionVector elemSol(numVert);
+ for (const auto& scv : scvs(fvGeometry))
+ elemSol[scv.indexInElement()] = localResidual.prevSol()[scv.dofIndex()];
+
+ // the actual element's previous time step residual
+ auto residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+
+ auto storageResidual = localResidual.evalStorage(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+
+ residual += storageResidual;
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+ // //
+ // Calculate derivatives of all dofs in stencil with respect to the dofs in the element. In the //
+ // neighboring elements we do so by computing the derivatives of the fluxes which depend on the //
+ // actual element. In the actual element we evaluate the derivative of the entire residual. //
+ // //
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+
+ static const int numericDifferenceMethod = GET_PARAM_FROM_GROUP(TypeTag, int, Implicit, NumericDifferenceMethod);
+
+ // calculation of the derivatives
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ // dof index and corresponding actual pri vars
+ const auto dofIdx = scv.dofIndex();
+ auto& volVars = getVolVarAccess(gridVariables.curGridVolVars(), curElemVolVars, scv);
+ VolumeVariables origVolVars(volVars);
+
+ // add precalculated residual for this scv into the global container
+ r[dofIdx] += residual[scv.indexInElement()];
+
+ // calculate derivatives w.r.t to the privars at the dof at hand
+ for (int pvIdx = 0; pvIdx < numEq; pvIdx++)
+ {
+ ElementSolutionVector partialDeriv(element.subEntities(dim));
+ Scalar eps = numericEpsilon(volVars.priVar(pvIdx));
+ Scalar delta = 0;
+
+ // calculate the residual with the forward deflected primary variables
+ if (numericDifferenceMethod >= 0)
+ {
+ // we are not using backward differences, i.e. we need to
+ // calculate f(x + \epsilon)
+
+ // deflect primary variables
+ elemSol[scv.indexInElement()][pvIdx] += eps;
+ delta += eps;
+
+ // update the volume variables connected to the dof
+ volVars.update(elemSol, problem, element, scv);
+
+ partialDeriv = localResidual.evalStorage(problem, element, fvGeometry,
+ prevElemVolVars, curElemVolVars,
+ elemBcTypes, elemFluxVarsCache);
+ }
+ else
+ {
+ // we are using backward differences, i.e. we don't need
+ // to calculate f(x + \epsilon) and we can recycle the
+ // (already calculated) residual f(x)
+ partialDeriv = residual;
+ }
+
+ if (numericDifferenceMethod <= 0)
+ {
+ // we are not using forward differences, i.e. we
+ // need to calculate f(x - \epsilon)
+
+ // deflect the primary variables
+ elemSol[scv.indexInElement()][pvIdx] -= delta + eps;
+ delta += eps;
+
+ // update the volume variables connected to the dof
+ volVars.update(elemSol, problem, element, scv);
+
+ partialDeriv -= localResidual.evalStorage(problem, element, fvGeometry,
+ prevElemVolVars, curElemVolVars,
+ elemBcTypes, elemFluxVarsCache);
+ }
+ else
+ {
+ // we are using forward differences, i.e. we don't need to
+ // calculate f(x - \epsilon) and we can recycle the
+ // (already calculated) residual f(x)
+ partialDeriv -= residual;
+ }
+
+ // divide difference in residuals by the magnitude of the
+ // deflections between the two function evaluation
+ partialDeriv /= delta;
+
+ // update the global stiffness matrix with the current partial derivatives
+ for (int eqIdx = 0; eqIdx < numEq; eqIdx++)
+ {
+ // A[i][col][eqIdx][pvIdx] is the rate of change of
+ // the residual of equation 'eqIdx' at dof 'i'
+ // depending on the primary variable 'pvIdx' at dof
+ // 'col'.
+ A[dofIdx][dofIdx][eqIdx][pvIdx] += partialDeriv[scv.indexInElement()][eqIdx];
+ }
+
+ // restore the original state of the scv's volume variables
+ volVars = origVolVars;
+
+ // restore the original element solution
+ elemSol[scv.indexInElement()][pvIdx] = curSol[scv.dofIndex()][pvIdx];
+ }
+
+ // TODO additional dof dependencies
+ }
+
+ // enforce Dirichlet boundaries by overwriting partial derivatives with 1 or 0
+ // and set the residual to (privar - dirichletvalue)
+ if (elemBcTypes.hasDirichlet())
+ {
+ for (const auto& scvI : scvs(fvGeometry))
+ {
+ const auto bcTypes = elemBcTypes[scvI.indexInElement()];
+ if (bcTypes.hasDirichlet())
+ {
+ const auto dirichletValues = problem.dirichlet(element, scvI);
+
+ // set the dirichlet conditions in residual and jacobian
+ for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
+ {
+ if (bcTypes.isDirichlet(eqIdx))
+ {
+ const auto pvIdx = bcTypes.eqToDirichletIndex(eqIdx);
+ assert(0 <= pvIdx && pvIdx < numEq);
+
+ const auto& priVars = curElemVolVars[scvI].priVars();
+ r[scvI.dofIndex()][eqIdx] = priVars[pvIdx] - dirichletValues[pvIdx];
+ A[scvI.dofIndex()][scvI.dofIndex()][eqIdx][pvIdx] = 1.0;
+ }
+ }
+ }
+ }
+ }
+ }
+private:
+ template<class T = TypeTag>
+ static typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return elemVolVars[scv]; }
+
+ template<class T = TypeTag>
+ static typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return gridVolVars.volVars(scv.elementIndex(), scv.indexInElement()); }
+
+}; // explicit BoxAssembler with numeric Jacobian
+
+template<class TypeTag>
+class BoxLocalAssembler<TypeTag,
+ DiffMethod::analytic,
+ /*implicit=*/true>
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ElementResidualVector = Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, NumEqVector)>;
+ using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
+ using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
+
+ static constexpr int dim = GridView::dimension;
+
+public:
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix. The element residual is written into the right hand side.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, jac, res, element, curSol);
+
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac,
+ const Element& element, const SolutionVector& curSol)
+ {
+ auto dummyresidual = curSol;
+ assemble_(assembler, jac, dummyresidual, element, curSol);
+ }
+
+ /*!
+ * \brief Assemble the residual only
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, res, element, curSol);
+ }
+
+private:
+ /*!
+ * \brief Computes the residual
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static void assemble_(Assembler& assembler, SolutionVector& r,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bind(element, fvGeometry, curSol);
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
+
+ const bool isStationary = localResidual.isStationary();
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ if (!isStationary)
+ prevElemVolVars.bindElement(element, fvGeometry, localResidual.prevSol());
+
+ // the element boundary types
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // the actual element's current residual
+ ElementResidualVector residual(0.0);
+ if (isStationary)
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+ }
+ else
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+ }
+
+ for (const auto& scv : scvs(fvGeometry))
+ r[scv.dofIndex()] += residual[scv.indexInElement()];
+
+ // enforce Dirichlet boundaries by setting the residual to (privar - dirichletvalue)
+ if (elemBcTypes.hasDirichlet())
+ {
+ for (const auto& scvI : scvs(fvGeometry))
+ {
+ const auto bcTypes = elemBcTypes[scvI.indexInElement()];
+ if (bcTypes.hasDirichlet())
+ {
+ const auto dirichletValues = problem.dirichlet(element, scvI);
+
+ // set the dirichlet conditions in residual and jacobian
+ for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
+ {
+ if (bcTypes.isDirichlet(eqIdx))
+ {
+ const auto pvIdx = bcTypes.eqToDirichletIndex(eqIdx);
+ assert(0 <= pvIdx && pvIdx < numEq);
+
+ const auto& priVars = curElemVolVars[scvI].priVars();
+ r[scvI.dofIndex()][eqIdx] = priVars[pvIdx] - dirichletValues[pvIdx];
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static void assemble_(Assembler& assembler, JacobianMatrix& A, SolutionVector& r,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ const auto& fvGridGeometry = assembler.fvGridGeometry();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // prepare the local views
+ auto fvGeometry = localView(fvGridGeometry);
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bind(element, fvGeometry, curSol);
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
+
+ const bool isStationary = localResidual.isStationary();
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ if (!isStationary)
+ prevElemVolVars.bindElement(element, fvGeometry, localResidual.prevSol());
+
+ // check for boundaries on the element
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // the actual element's current residual
+ ElementResidualVector residual(0.0);
+ if (isStationary)
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+ }
+ else
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+ }
+
+ for (auto&& scv : scvs(fvGeometry))
+ r[scv.dofIndex()] += residual[scv.indexInElement()];
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+ // //
+ // Calculate derivatives of all dofs in stencil with respect to the dofs in the element. In the //
+ // neighboring elements we do so by computing the derivatives of the fluxes which depend on the //
+ // actual element. In the actual element we evaluate the derivative of the entire residual. //
+ // //
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+
+ // calculation of the source and storage derivatives
+ for (const auto& scv : scvs(fvGeometry))
+ {
+ // dof index and corresponding actual pri vars
+ const auto dofIdx = scv.dofIndex();
+ const auto& volVars = curElemVolVars[scv];
+
+ // derivative of this scv residual w.r.t the d.o.f. of the same scv (because of mass lumping)
+ // only if the problem is instationary we add derivative of storage term
+ if (!isStationary)
+ localResidual.addStorageDerivatives(A[dofIdx][dofIdx],
+ problem,
+ element,
+ fvGeometry,
+ volVars,
+ scv);
+
+ // derivative of this scv residual w.r.t the d.o.f. of the same scv (because of mass lumping)
+ // add source term derivatives
+ localResidual.addSourceDerivatives(A[dofIdx][dofIdx],
+ problem,
+ element,
+ fvGeometry,
+ volVars,
+ scv);
+ }
+
+ // localJacobian[scvIdx][otherScvIdx][eqIdx][priVarIdx] of the fluxes
+ for (const auto& scvf : scvfs(fvGeometry))
+ {
+ if (!scvf.boundary())
+ {
+ // add flux term derivatives
+ localResidual.addFluxDerivatives(A,
+ problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemFluxVarsCache,
+ scvf);
+ }
+
+ // the boundary gets special treatment to simplify
+ // for the user
+ else
+ {
+ const auto& insideScv = fvGeometry.scv(scvf.insideScvIdx());
+ if (elemBcTypes[insideScv.indexInElement()].hasNeumann())
+ {
+ // add flux term derivatives
+ localResidual.addRobinFluxDerivatives(A[insideScv.dofIndex()],
+ problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemFluxVarsCache,
+ scvf);
+ }
+ }
+ }
+
+ // enforce Dirichlet boundaries by overwriting partial derivatives with 1 or 0
+ // and set the residual to (privar - dirichletvalue)
+ if (elemBcTypes.hasDirichlet())
+ {
+ for (const auto& scvI : scvs(fvGeometry))
+ {
+ const auto bcTypes = elemBcTypes[scvI.indexInElement()];
+ if (bcTypes.hasDirichlet())
+ {
+ const auto dirichletValues = problem.dirichlet(element, scvI);
+
+ // set the dirichlet conditions in residual and jacobian
+ for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
+ {
+ if (bcTypes.isDirichlet(eqIdx))
+ {
+ const auto pvIdx = bcTypes.eqToDirichletIndex(eqIdx);
+ assert(0 <= pvIdx && pvIdx < numEq);
+
+ const auto& priVars = curElemVolVars[scvI].priVars();
+ r[scvI.dofIndex()][eqIdx] = priVars[pvIdx] - dirichletValues[pvIdx];
+ for (const auto& scvJ : scvs(fvGeometry))
+ {
+ A[scvI.dofIndex()][scvJ.dofIndex()][eqIdx] = 0.0;
+ if (scvI.indexInElement() == scvJ.indexInElement())
+ A[scvI.dofIndex()][scvI.dofIndex()][eqIdx][pvIdx] = 1.0;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // TODO additional dof dependencies
+ }
+
+}; // implicit BoxAssembler with analytic Jacobian
+
+template<class TypeTag>
+class BoxLocalAssembler<TypeTag,
+ DiffMethod::analytic,
+ /*implicit=*/false>
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ElementResidualVector = Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, NumEqVector)>;
+ using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
+ using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
+
+ static constexpr int dim = GridView::dimension;
+
+public:
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix. The element residual is written into the right hand side.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, jac, res, element, curSol);
+
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac,
+ const Element& element, const SolutionVector& curSol)
+ {
+ auto dummyresidual = curSol;
+ assemble_(assembler, jac, dummyresidual, element, curSol);
+ }
+
+ /*!
+ * \brief Assemble the residual only
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, res, element, curSol);
+ }
+
+private:
+ /*!
+ * \brief Computes the residual
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static void assemble_(Assembler& assembler, SolutionVector& r,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // using an explicit assembler doesn't make sense for stationary problems
+ if (localResidual.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Using explicit jacobian assembler with stationary local residual");
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bindElement(element, fvGeometry, curSol);
+
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ prevElemVolVars.bind(element, fvGeometry, localResidual.prevSol());
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, prevElemVolVars);
+
+ // the element boundary types
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // the actual element's current residual
+ auto residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+
+ auto storageResidual = localResidual.evalStorage(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+ residual += storageResidual;
+
+ for (const auto& scv : scvs(fvGeometry))
+ r[scv.dofIndex()] += residual[scv.indexInElement()];
+
+ // enforce Dirichlet boundaries by setting the residual to (privar - dirichletvalue)
+ if (elemBcTypes.hasDirichlet())
+ {
+ for (const auto& scvI : scvs(fvGeometry))
+ {
+ const auto bcTypes = elemBcTypes[scvI.indexInElement()];
+ if (bcTypes.hasDirichlet())
+ {
+ const auto dirichletValues = problem.dirichlet(element, scvI);
+
+ // set the dirichlet conditions in residual and jacobian
+ for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
+ {
+ if (bcTypes.isDirichlet(eqIdx))
+ {
+ const auto pvIdx = bcTypes.eqToDirichletIndex(eqIdx);
+ assert(0 <= pvIdx && pvIdx < numEq);
+
+ const auto& priVars = curElemVolVars[scvI].priVars();
+ r[scvI.dofIndex()][eqIdx] = priVars[pvIdx] - dirichletValues[pvIdx];
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static void assemble_(Assembler& assembler, JacobianMatrix& A, SolutionVector& r,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // using an explicit assembler doesn't make sense for stationary problems
+ if (localResidual.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Using explicit jacobian assembler with stationary local residual");
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bindElement(element, fvGeometry, curSol);
+
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ prevElemVolVars.bind(element, fvGeometry, localResidual.prevSol());
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, prevElemVolVars);
+
+ // the element boundary types
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // the actual element's current residual
+ auto residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+
+ auto storageResidual = localResidual.evalStorage(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+ residual += storageResidual;
+
+ for (const auto& scv : scvs(fvGeometry))
+ r[scv.dofIndex()] += residual[scv.indexInElement()];
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+ // //
+ // Calculate derivatives of all dofs in stencil with respect to the dofs in the element. In the //
+ // neighboring elements we do so by computing the derivatives of the fluxes which depend on the //
+ // actual element. In the actual element we evaluate the derivative of the entire residual. //
+ // //
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+
+ // calculation of the source and storage derivatives
+ for (const auto& scv : scvs(fvGeometry))
+ {
+ // dof index and corresponding actual pri vars
+ const auto dofIdx = scv.dofIndex();
+ const auto& volVars = curElemVolVars[scv];
+
+ // derivative of this scv residual w.r.t the d.o.f. of the same scv (because of mass lumping)
+ // only if the problem is instationary we add derivative of storage term
+ localResidual.addStorageDerivatives(A[dofIdx][dofIdx],
+ problem,
+ element,
+ fvGeometry,
+ volVars,
+ scv);
+ }
+
+ // enforce Dirichlet boundaries by overwriting partial derivatives with 1 or 0
+ // and set the residual to (privar - dirichletvalue)
+ if (elemBcTypes.hasDirichlet())
+ {
+ for (const auto& scvI : scvs(fvGeometry))
+ {
+ const auto bcTypes = elemBcTypes[scvI.indexInElement()];
+ if (bcTypes.hasDirichlet())
+ {
+ const auto dirichletValues = problem.dirichlet(element, scvI);
+
+ // set the dirichlet conditions in residual and jacobian
+ for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
+ {
+ if (bcTypes.isDirichlet(eqIdx))
+ {
+ const auto pvIdx = bcTypes.eqToDirichletIndex(eqIdx);
+ assert(0 <= pvIdx && pvIdx < numEq);
+
+ const auto& priVars = curElemVolVars[scvI].priVars();
+ r[scvI.dofIndex()][eqIdx] = priVars[pvIdx] - dirichletValues[pvIdx];
+ A[scvI.dofIndex()][scvI.dofIndex()][eqIdx][pvIdx] = 1.0;
+ }
+ }
+ }
+ }
+ }
+
+ // TODO additional dof dependencies
+ }
+
+}; // explicit BoxAssembler with analytic Jacobian
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/assembly/ccassembler.hh b/dumux/assembly/ccassembler.hh
new file mode 100644
index 0000000000000000000000000000000000000000..fb38b1af5cb072da7d1ea80d2517f4a80d6b7af1
--- /dev/null
+++ b/dumux/assembly/ccassembler.hh
@@ -0,0 +1,386 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief An assembler for the global linear system
+ * for fully implicit models and cell-centered discretization schemes.
+ */
+#ifndef DUMUX_CC_ASSEMBLER_HH
+#define DUMUX_CC_ASSEMBLER_HH
+
+#include <dune/istl/matrixindexset.hh>
+
+#include <dumux/common/timeloop.hh>
+#include <dumux/implicit/properties.hh>
+#include <dumux/implicit/localresidual.hh>
+#include <dumux/discretization/methods.hh>
+
+#include "diffmethod.hh"
+#include "cclocalassembler.hh"
+
+namespace Dumux {
+
+/*!
+ * \ingroup ImplicitModel
+ * \brief An assembler for the global linear system
+ * for fully implicit models and cell-centered discretization schemes.
+ */
+template<class TypeTag, DiffMethod diffMethod, bool isImplicit = true>
+class CCAssembler
+{
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using LocalResidual = typename GET_PROP_TYPE(TypeTag, LocalResidual);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using TimeLoop = TimeLoopBase<Scalar>;
+ using LocalAssembler = CCLocalAssembler<TypeTag, diffMethod, isImplicit>;
+
+public:
+ using ResidualType = SolutionVector;
+
+ //! The constructor for stationary problems
+ CCAssembler(std::shared_ptr<const Problem> problem,
+ std::shared_ptr<const FVGridGeometry> fvGridGeometry,
+ std::shared_ptr<GridVariables> gridVariables)
+ : problem_(problem)
+ , fvGridGeometry_(fvGridGeometry)
+ , gridVariables_(gridVariables)
+ , stationary_(true)
+ {
+ static_assert(isImplicit, "Explicit assembler for stationary problem doesn't make sense!");
+ }
+
+ //! The constructor for instationary problems
+ CCAssembler(std::shared_ptr<const Problem> problem,
+ std::shared_ptr<const FVGridGeometry> fvGridGeometry,
+ std::shared_ptr<GridVariables> gridVariables,
+ std::shared_ptr<TimeLoop> timeLoop)
+ : problem_(problem)
+ , fvGridGeometry_(fvGridGeometry)
+ , gridVariables_(gridVariables)
+ , localResidual_(timeLoop)
+ , stationary_(false)
+ {}
+
+ /*!
+ * \brief Assembles the global Jacobian of the residual
+ * and the residual for the current solution.
+ */
+ void assembleJacobianAndResidual(const SolutionVector& curSol)
+ {
+ if (!stationary_ && localResidual_.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Assembling instationary problem but previous solution was not set!");
+
+ if(!jacobian_)
+ {
+ jacobian_ = std::make_shared<JacobianMatrix>();
+ jacobian_->setBuildMode(JacobianMatrix::random);
+ setJacobianPattern();
+ }
+
+ if(!residual_)
+ {
+ residual_ = std::make_shared<SolutionVector>();
+ setResidualSize();
+ }
+
+ resetJacobian_();
+ resetResidual_();
+
+ bool succeeded;
+ // try assembling the global linear system
+ try
+ {
+ // let the local assembler add the element contributions
+ for (const auto element : elements(gridView()))
+ LocalAssembler::assemble(*this, *jacobian_, *residual_, element, curSol);
+
+ // if we get here, everything worked well
+ succeeded = true;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+ }
+ // throw exception if a problem ocurred
+ catch (NumericalProblem &e)
+ {
+ std::cout << "rank " << gridView().comm().rank()
+ << " caught an exception while assembling:" << e.what()
+ << "\n";
+ succeeded = false;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+ }
+ if (!succeeded)
+ DUNE_THROW(NumericalProblem, "A process did not succeed in linearizing the system");
+ }
+
+ /*!
+ * \brief Assembles only the global Jacobian of the residual.
+ */
+ void assembleJacobian(const SolutionVector& curSol)
+ {
+ if (!stationary_ && localResidual_.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Assembling instationary problem but previous solution was not set!");
+
+ if(!jacobian_)
+ {
+ jacobian_ = std::make_shared<JacobianMatrix>();
+ jacobian_->setBuildMode(JacobianMatrix::random);
+ setJacobianPattern();
+ }
+
+ resetJacobian_();
+
+ bool succeeded;
+ // try assembling the global linear system
+ try
+ {
+ // let the local assembler add the element contributions
+ for (const auto element : elements(gridView()))
+ LocalAssembler::assemble(*this, *jacobian_, element, curSol);
+
+ // if we get here, everything worked well
+ succeeded = true;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+ }
+ // throw exception if a problem ocurred
+ catch (NumericalProblem &e)
+ {
+ std::cout << "rank " << gridView().comm().rank()
+ << " caught an exception while assembling:" << e.what()
+ << "\n";
+ succeeded = false;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+ }
+ if (!succeeded)
+ DUNE_THROW(NumericalProblem, "A process did not succeed in linearizing the system");
+ }
+
+ //! compute the residuals
+ void assembleResidual(const SolutionVector& curSol)
+ {
+ if(!residual_)
+ {
+ residual_ = std::make_shared<SolutionVector>();
+ setResidualSize();
+ }
+
+ assembleResidual(*residual_, curSol);
+ }
+
+ //! compute the residuals
+ void assembleResidual(ResidualType& r, const SolutionVector& curSol) const
+ {
+ if (!stationary_ && localResidual_.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Assembling instationary problem but previous solution was not set!");
+
+ // let the local assembler add the element contributions
+ for (const auto element : elements(gridView()))
+ LocalAssembler::assemble(*this, r, element, curSol);
+ }
+
+ //! computes the global residual
+ Scalar globalResidual(const SolutionVector& curSol) const
+ {
+ ResidualType residual(numDofs());
+ assembleResidual(residual, curSol);
+
+ // calculate the square norm of the residual
+ Scalar result2 = residual.two_norm2();
+ if (gridView().comm().size() > 1)
+ result2 = gridView().comm().sum(result2);
+
+ using std::sqrt;
+ return sqrt(result2);
+ }
+
+ /*!
+ * \brief Tells the assembler which jacobian and residual to use.
+ * This also resizes the containers to the required sizes and sets the
+ * sparsity pattern of the jacobian matrix.
+ */
+ void setLinearSystem(std::shared_ptr<JacobianMatrix> A,
+ std::shared_ptr<SolutionVector> r)
+ {
+ jacobian_ = A;
+ residual_ = r;
+
+ // check and/or set the BCRS matrix's build mode
+ if (jacobian_->buildMode() == JacobianMatrix::BuildMode::unknown)
+ jacobian_->setBuildMode(JacobianMatrix::random);
+ else if (jacobian_->buildMode() != JacobianMatrix::BuildMode::random)
+ DUNE_THROW(Dune::NotImplemented, "Only BCRS matrices with random build mode are supported at the moment");
+
+ setJacobianPattern();
+ setResidualSize();
+ }
+
+ /*!
+ * \brief The version without arguments uses the default constructor to create
+ * the jacobian and residual objects in this assembler.
+ */
+ void setLinearSystem()
+ {
+ jacobian_ = std::make_shared<JacobianMatrix>();
+ jacobian_->setBuildMode(JacobianMatrix::random);
+
+ residual_ = std::make_shared<SolutionVector>();
+
+ setJacobianPattern();
+ setResidualSize();
+ }
+
+ /*!
+ * \brief Sets the solution from which to start the time integration. Has to be
+ * called prior to assembly for time-dependent problems.
+ */
+ void setPreviousSolution(const SolutionVector& u)
+ { localResidual_.setPreviousSolution(u); }
+
+ /*!
+ * \brief Return the solution that has been set as the previous one.
+ */
+ const SolutionVector& prevSol() const
+ { return localResidual_.prevSol(); }
+
+ /*!
+ * \brief Resizes the jacobian and sets the jacobian' sparsity pattern.
+ */
+ void setJacobianPattern()
+ {
+ // resize the jacobian and the residual
+ const auto numDofs = this->numDofs();
+ jacobian_->setSize(numDofs, numDofs);
+ residual_->resize(numDofs);
+
+ // get occupation pattern of the jacobian
+ Dune::MatrixIndexSet occupationPattern;
+ occupationPattern.resize(numDofs, numDofs);
+
+ // matrix pattern for implicit jacobians
+ if (isImplicit)
+ {
+ for (unsigned int globalI = 0; globalI < numDofs; ++globalI)
+ {
+ occupationPattern.add(globalI, globalI);
+ for (const auto& dataJ : fvGridGeometry().connectivityMap()[globalI])
+ occupationPattern.add(dataJ.globalJ, globalI);
+
+ // reserve index for additional user defined DOF dependencies
+ // const auto& additionalDofDependencies = problem().getAdditionalDofDependencies(globalI);
+ // for (auto globalJ : additionalDofDependencies)
+ // occupationPattern.add(globalI, globalJ);
+ }
+ }
+
+ // matrix pattern for explicit jacobians -> diagonal matrix
+ else
+ {
+ for (unsigned int globalI = 0; globalI < numDofs; ++globalI)
+ occupationPattern.add(globalI, globalI);
+ }
+
+ // export pattern to jacobian
+ occupationPattern.exportIdx(*jacobian_);
+ }
+
+ /*!
+ * \brief Resizes the residual
+ */
+ void setResidualSize()
+ { residual_->resize(this->numDofs()); }
+
+ //! cell-centered schemes have one dof per cell
+ std::size_t numDofs() const
+ { return gridView().size(0); }
+
+ const Problem& problem() const
+ { return *problem_; }
+
+ const FVGridGeometry& fvGridGeometry() const
+ { return *fvGridGeometry_; }
+
+ const GridView& gridView() const
+ { return fvGridGeometry().gridView(); }
+
+ GridVariables& gridVariables()
+ { return *gridVariables_; }
+
+ const GridVariables& gridVariables() const
+ { return *gridVariables_; }
+
+ JacobianMatrix& jacobian()
+ {
+ if (!residual_)
+ DUNE_THROW(Dune::InvalidStateException, "No jacobian was set.");
+ return *jacobian_;
+ }
+
+ SolutionVector& residual()
+ {
+ if (!residual_)
+ DUNE_THROW(Dune::InvalidStateException, "No residual was set.");
+ return *residual_;
+ }
+
+ const LocalResidual& localResidual() const
+ { return localResidual_; }
+
+private:
+ // reset the global linear system of equations.
+ // TODO: if partial reassemble is enabled, this means
+ // that the jacobian matrix must only be erased partially!
+ void resetResidual_()
+ {
+ (*residual_) = 0.0;
+ }
+ void resetJacobian_()
+ {
+ (*jacobian_) = 0.0;
+ }
+
+ // pointer to the problem to be solved
+ std::shared_ptr<const Problem> problem_;
+
+ // the finite volume geometry of the grid
+ std::shared_ptr<const FVGridGeometry> fvGridGeometry_;
+
+ // the variables container for the grid
+ std::shared_ptr<GridVariables> gridVariables_;
+
+ // shared pointers to the jacobian matrix and residual
+ std::shared_ptr<JacobianMatrix> jacobian_;
+ std::shared_ptr<SolutionVector> residual_;
+
+ // class computing the residual of an element
+ LocalResidual localResidual_;
+
+ // if this assembler is assembling a time dependent problem
+ bool stationary_;
+};
+
+} // namespace Dumux
+
+#endif
diff --git a/dumux/assembly/cclocalassembler.hh b/dumux/assembly/cclocalassembler.hh
new file mode 100644
index 0000000000000000000000000000000000000000..47d917f5d78f543816d96304e72d12a9a73f11b3
--- /dev/null
+++ b/dumux/assembly/cclocalassembler.hh
@@ -0,0 +1,1396 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief An assembler for the global linear system for fully implicit models
+ * and cell-centered discretization schemes using Newton's method.
+ */
+#ifndef DUMUX_CC_LOCAL_ASSEMBLER_HH
+#define DUMUX_CC_LOCAL_ASSEMBLER_HH
+
+#include <dune/istl/matrixindexset.hh>
+#include <dune/istl/bvector.hh>
+
+#include <dumux/assembly/diffmethod.hh>
+
+namespace Dumux {
+
+/*!
+ * \ingroup ImplicitModel
+ * \brief An assembler for the local contributions (per element) to the global
+ * linear system for fully implicit models and cell-centered discretization schemes.
+ */
+template<class TypeTag,
+ DiffMethod DM = DiffMethod::numeric,
+ bool implicit = true>
+class CCLocalAssembler;
+
+
+template<class TypeTag>
+class CCLocalAssembler<TypeTag,
+ DiffMethod::numeric,
+ /*implicit=*/true>
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
+ using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
+
+ static constexpr bool enableGlobalFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache);
+
+public:
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix. The element residual is written into the right hand side.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ const auto globalI = assembler.fvGridGeometry().elementMapper().index(element);
+ res[globalI] = assemble_(assembler, jac, element, curSol);
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, jac, element, curSol);
+ }
+
+ /*!
+ * \brief Assemble the residual only
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ const auto globalI = assembler.fvGridGeometry().elementMapper().index(element);
+ res[globalI] = assemble_(assembler, element, curSol);
+ }
+
+ /*!
+ * \brief Computes the epsilon used for numeric differentiation
+ * for a given value of a primary variable.
+ *
+ * \param priVar The value of the primary variable
+ */
+ static Scalar numericEpsilon(const Scalar priVar)
+ {
+ // define the base epsilon as the geometric mean of 1 and the
+ // resolution of the scalar type. E.g. for standard 64 bit
+ // floating point values, the resolution is about 10^-16 and
+ // the base epsilon is thus approximately 10^-8.
+ /*
+ static const Scalar baseEps
+ = Dumux::geometricMean<Scalar>(std::numeric_limits<Scalar>::epsilon(), 1.0);
+ */
+ static const Scalar baseEps = 1e-10;
+ assert(std::numeric_limits<Scalar>::epsilon()*1e4 < baseEps);
+ // the epsilon value used for the numeric differentiation is
+ // now scaled by the absolute value of the primary variable...
+ return baseEps*(std::abs(priVar) + 1.0);
+ }
+
+private:
+ /*!
+ * \brief Computes the residual
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static NumEqVector assemble_(Assembler& assembler,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // is the actual element a ghost element?
+ const bool isGhost = (element.partitionType() == Dune::GhostEntity);
+ if (isGhost) return NumEqVector(0.0);
+
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bind(element, fvGeometry, curSol);
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
+
+ const bool isStationary = localResidual.isStationary();
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ if (!isStationary)
+ prevElemVolVars.bindElement(element, fvGeometry, localResidual.prevSol());
+
+ // for compatibility with box models
+ ElementBoundaryTypes elemBcTypes;
+
+ // the actual element's current residual
+ NumEqVector residual(0.0);
+ if (isStationary)
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ else
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+
+ return residual;
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static NumEqVector assemble_(Assembler& assembler, JacobianMatrix& A,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ const auto& fvGridGeometry = assembler.fvGridGeometry();
+ const auto& connectivityMap = fvGridGeometry.connectivityMap();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bind(element, fvGeometry, curSol);
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
+
+ const bool isStationary = localResidual.isStationary();
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ if (!isStationary)
+ prevElemVolVars.bindElement(element, fvGeometry, localResidual.prevSol());
+
+ // the global dof of the actual element
+ const auto globalI = fvGridGeometry.elementMapper().index(element);
+
+ // check for boundaries on the element
+ // TODO Do we need them for cell-centered models?
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // is the actual element a ghost element?
+ const bool isGhost = (element.partitionType() == Dune::GhostEntity);
+
+ // the actual element's current residual
+ NumEqVector residual(0.0);
+ if (!isGhost)
+ {
+ if (isStationary)
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ else
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ }
+
+
+ // TODO Do we really need this??????????
+ // this->model_().updatePVWeights(fvGeometry);
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+ // //
+ // Calculate derivatives of all dofs in stencil with respect to the dofs in the element. In the //
+ // neighboring elements we do so by computing the derivatives of the fluxes which depend on the //
+ // actual element. In the actual element we evaluate the derivative of the entire residual. //
+ // //
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+
+ static const std::string group = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ static const int numericDifferenceMethod = getParamFromGroup<int>(group, "Implicit.NumericDifferenceMethod");
+
+ // get stencil informations
+ const auto numNeighbors = connectivityMap[globalI].size();
+
+ // container to store the neighboring elements
+ std::vector<Element> neighborElements;
+ neighborElements.reserve(numNeighbors);
+
+ // get the elements in which we need to evaluate the fluxes
+ // and calculate these in the undeflected state
+ Dune::BlockVector<NumEqVector> origFlux(numNeighbors);
+ origFlux = 0.0;
+ unsigned int j = 0;
+ for (const auto& dataJ : connectivityMap[globalI])
+ {
+ neighborElements.emplace_back(fvGridGeometry.element(dataJ.globalJ));
+ for (const auto scvfIdx : dataJ.scvfsJ)
+ {
+ origFlux[j] += localResidual.evalFlux(problem,
+ neighborElements.back(),
+ fvGeometry,
+ curElemVolVars,
+ elemFluxVarsCache,
+ fvGeometry.scvf(scvfIdx));
+ }
+ // increment neighbor counter
+ ++j;
+ }
+
+ // reference to the element's scv (needed later) and corresponding vol vars
+ const auto& scv = fvGeometry.scv(globalI);
+ auto& curVolVars = getVolVarAccess(gridVariables.curGridVolVars(), curElemVolVars, scv);
+
+ // save a copy of the original privars and vol vars in order
+ // to restore the original solution after deflection
+ const auto origPriVars = curSol[globalI];
+ const auto origVolVars = curVolVars;
+
+ // element solution container to be deflected
+ ElementSolutionVector elemSol({origPriVars});
+
+ // derivatives in the neighbors with repect to the current elements
+ Dune::BlockVector<NumEqVector> neighborDeriv(numNeighbors);
+ for (int pvIdx = 0; pvIdx < numEq; pvIdx++)
+ {
+ // reset derivatives of element dof with respect to itself
+ // as well as neighbor derivatives
+ NumEqVector partialDeriv(0.0);
+ neighborDeriv = 0.0;
+
+ if (isGhost)
+ partialDeriv[pvIdx] = 1.0;
+
+ Scalar eps = numericEpsilon(curVolVars.priVar(pvIdx));
+ Scalar delta = 0;
+
+ if (numericDifferenceMethod >= 0)
+ {
+ // we are not using backward differences, i.e. we need to
+ // calculate f(x + \epsilon)
+
+ // deflect primary variables
+ elemSol[0][pvIdx] += eps;
+ delta += eps;
+
+ // update the volume variables and the flux var cache
+ curVolVars.update(elemSol, problem, element, scv);
+ if (enableGlobalFluxVarsCache)
+ gridVariables.gridFluxVarsCache().updateElement(element, fvGeometry, curElemVolVars);
+ else
+ elemFluxVarsCache.update(element, fvGeometry, curElemVolVars);
+
+ // calculate the residual with the deflected primary variables
+ if (!isGhost)
+ {
+ if (isStationary)
+ {
+ partialDeriv = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ else
+ {
+ partialDeriv = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ }
+
+ // calculate the fluxes in the neighbors with the deflected primary variables
+ for (std::size_t k = 0; k < numNeighbors; ++k)
+ for (auto scvfIdx : connectivityMap[globalI][k].scvfsJ)
+ {
+ neighborDeriv[k] += localResidual.evalFlux(problem,
+ neighborElements[k],
+ fvGeometry,
+ curElemVolVars,
+ elemFluxVarsCache,
+ fvGeometry.scvf(scvfIdx));
+ }
+ }
+ else
+ {
+ // we are using backward differences, i.e. we don't need
+ // to calculate f(x + \epsilon) and we can recycle the
+ // (already calculated) residual f(x)
+ if (!isGhost)
+ partialDeriv = residual;
+ neighborDeriv = origFlux;
+ }
+
+ if (numericDifferenceMethod <= 0)
+ {
+ // we are not using forward differences, i.e. we
+ // need to calculate f(x - \epsilon)
+
+ // deflect the primary variables
+ elemSol[0][pvIdx] -= delta + eps;
+ delta += eps;
+
+ // update the volume variables and the flux var cache
+ curVolVars.update(elemSol, problem, element, scv);
+ if (enableGlobalFluxVarsCache)
+ gridVariables.gridFluxVarsCache().updateElement(element, fvGeometry, curElemVolVars);
+ else
+ elemFluxVarsCache.update(element, fvGeometry, curElemVolVars);
+
+ // calculate the residual with the deflected primary variables and subtract it
+ if (!isGhost)
+ {
+ if (isStationary)
+ {
+ partialDeriv -= localResidual.eval(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ else
+ {
+ partialDeriv -= localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ }
+
+ // calculate the fluxes into element with the deflected primary variables
+ for (std::size_t k = 0; k < numNeighbors; ++k)
+ for (auto scvfIdx : connectivityMap[globalI][k].scvfsJ)
+ {
+ neighborDeriv[k] += localResidual.evalFlux(problem,
+ neighborElements[k],
+ fvGeometry,
+ curElemVolVars,
+ elemFluxVarsCache,
+ fvGeometry.scvf(scvfIdx));
+ }
+ }
+ else
+ {
+ // we are using forward differences, i.e. we don't need to
+ // calculate f(x - \epsilon) and we can recycle the
+ // (already calculated) residual f(x)
+ if (!isGhost)
+ partialDeriv -= residual;
+ neighborDeriv -= origFlux;
+ }
+
+ // divide difference in residuals by the magnitude of the
+ // deflections between the two function evaluation
+ if (!isGhost)
+ partialDeriv /= delta;
+ neighborDeriv /= delta;
+
+ // restore the original state of the scv's volume variables
+ curVolVars = origVolVars;
+
+ // restore the current element solution
+ elemSol[0][pvIdx] = origPriVars[pvIdx];
+
+ // add the current partial derivatives to the global jacobian matrix
+ for (int eqIdx = 0; eqIdx < numEq; eqIdx++)
+ {
+ // the diagonal entries
+ A[globalI][globalI][eqIdx][pvIdx] += partialDeriv[eqIdx];
+
+ // off-diagonal entries
+ j = 0;
+ for (const auto& dataJ : connectivityMap[globalI])
+ A[dataJ.globalJ][globalI][eqIdx][pvIdx] += neighborDeriv[j++][eqIdx];
+ }
+ }
+
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ // //
+ // Calculate derivatives of the dofs in the element with respect to user-defined additional //
+ // dof dependencies. We do so by evaluating the change in the source term of the current //
+ // element with respect to the primary variables at the given additional dofs. //
+ // //
+ //////////////////////////////////////////////////////////////////////////////////////////////
+
+ // const auto& additionalDofDepedencies = problem.getAdditionalDofDependencies(globalI);
+ // if (!additionalDofDepedencies.empty() && !isGhost)
+ // {
+ // // compute the source in the undeflected state
+ // auto source = localResidual.computeSource(element, fvGeometry, curElemVolVars, scv);
+ // source *= -scv.volume()*curVolVarsI.extrusionFactor();
+
+ // // deflect solution at given dofs and recalculate the source
+ // for (auto globalJ : additionalDofDependencies)
+ // {
+ // const auto& scvJ = fvGeometry.scv(globalJ);
+ // auto& curVolVarsJ = curElemVolVars[scv];
+ // const auto& elementJ = fvGridGeometry.element(globalJ);
+
+ // // save a copy of the original privars and volvars
+ // // to restore original solution after deflection
+ // const auto origPriVars = curSol[globalJ];
+ // const auto origVolVarsJ = curVolVarsJ;
+
+ // // derivatives with repect to the additional DOF we depend on
+ // for (int pvIdx = 0; pvIdx < numEq; pvIdx++)
+ // {
+ // // derivatives of element dof with respect to itself
+ // NumEqVector partialDeriv(0.0);
+ // const auto eps = numericEpsilon(curVolVarsJ.priVar(pvIdx));
+ // Scalar delta = 0;
+
+ // if (numericDifferenceMethod >= 0)
+ // {
+ // // we are not using backward differences, i.e. we need to
+ // // calculate f(x + \epsilon)
+
+ // // deflect primary variables
+ // curSol[globalJ][pvIdx] += eps;
+ // delta += eps;
+
+ // // update the volume variables and the flux var cache
+ // curVolVarsJ.update(gridVariables.elementSolution(elementJ, curSol), problem, elementJ, scvJ);
+
+ // // calculate the source with the deflected primary variables
+ // auto deflSource = localResidual.computeSource(element, fvGeometry, curElemVolVars, scv);
+ // deflSource *= -scv.volume()*curVolVarsI.extrusionFactor();
+ // partialDeriv = std::move(deflSource);
+ // }
+ // else
+ // {
+ // // we are using backward differences, i.e. we don't need
+ // // to calculate f(x + \epsilon) and we can recycle the
+ // // (already calculated) source f(x)
+ // partialDeriv = source;
+ // }
+
+ // if (numericDifferenceMethod <= 0)
+ // {
+ // // we are not using forward differences, i.e. we
+ // // need to calculate f(x - \epsilon)
+
+ // // deflect the primary variables
+ // curSol[globalJ][pvIdx] -= delta + eps;
+ // delta += eps;
+
+ // // update the volume variables and the flux var cache
+ // curVolVarsJ.update(gridVariables.elementSolution(elementJ, curSol), problem, elementJ, scvJ);
+
+ // // calculate the source with the deflected primary variables and subtract
+ // auto deflSource = localResidual.computeSource(element, fvGeometry, curElemVolVars, scv);
+ // deflSource *= -scv.volume()*curVolVarsI.extrusionFactor();
+ // partialDeriv -= std::move(deflSource);
+ // }
+ // else
+ // {
+ // // we are using forward differences, i.e. we don't need to
+ // // calculate f(x - \epsilon) and we can recycle the
+ // // (already calculated) source f(x)
+ // partialDeriv -= source;
+ // }
+
+ // // divide difference in residuals by the magnitude of the
+ // // deflections between the two function evaluation
+ // partialDeriv /= delta;
+
+ // // restore the original state of the dofs privars and the volume variables
+ // curSol[globalJ] = origPriVars;
+ // curVolVarsJ = origVolVarsJ;
+
+ // // add the current partial derivatives to the global jacobian matrix
+ // for (int eqIdx = 0; eqIdx < numEq; eqIdx++)
+ // A[globalI][globalJ][eqIdx][pvIdx] += partialDeriv[eqIdx];
+ // }
+ // }
+ // }
+
+ // return the original residual
+ return residual;
+ }
+private:
+ template<class T = TypeTag>
+ static typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return elemVolVars[scv]; }
+
+ template<class T = TypeTag>
+ static typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return gridVolVars.volVars(scv); }
+};
+
+//! Explicit assembler with numeric differentiation
+template<class TypeTag>
+class CCLocalAssembler<TypeTag,
+ DiffMethod::numeric,
+ /*implicit=*/false>
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
+ using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
+
+public:
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix. The element residual is written into the right hand side.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ const auto globalI = assembler.fvGridGeometry().elementMapper().index(element);
+ res[globalI] = assemble_(assembler, jac, element, curSol);
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, jac, element, curSol);
+ }
+
+ /*!
+ * \brief Assemble the residual only
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ const auto globalI = assembler.fvGridGeometry().elementMapper().index(element);
+ res[globalI] = assemble_(assembler, element, curSol);
+ }
+
+ /*!
+ * \brief Computes the epsilon used for numeric differentiation
+ * for a given value of a primary variable.
+ *
+ * \param priVar The value of the primary variable
+ */
+ static Scalar numericEpsilon(const Scalar priVar)
+ {
+ // define the base epsilon as the geometric mean of 1 and the
+ // resolution of the scalar type. E.g. for standard 64 bit
+ // floating point values, the resolution is about 10^-16 and
+ // the base epsilon is thus approximately 10^-8.
+ /*
+ static const Scalar baseEps
+ = Dumux::geometricMean<Scalar>(std::numeric_limits<Scalar>::epsilon(), 1.0);
+ */
+ static const Scalar baseEps = 1e-10;
+ assert(std::numeric_limits<Scalar>::epsilon()*1e4 < baseEps);
+ // the epsilon value used for the numeric differentiation is
+ // now scaled by the absolute value of the primary variable...
+ return baseEps*(std::abs(priVar) + 1.0);
+ }
+
+private:
+
+ /*!
+ * \brief Computes the residual
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static NumEqVector assemble_(Assembler& assembler,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // is the actual element a ghost element?
+ const bool isGhost = (element.partitionType() == Dune::GhostEntity);
+ if (isGhost) return NumEqVector(0.0);
+
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // using an explicit assembler doesn't make sense for stationary problems
+ if (localResidual.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Using explicit jacobian assembler with stationary local residual");
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bindElement(element, fvGeometry, curSol);
+
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ prevElemVolVars.bind(element, fvGeometry, localResidual.prevSol());
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, prevElemVolVars);
+
+ // compatibility with box method
+ ElementBoundaryTypes elemBcTypes;
+
+ // the actual element's previous time step residual
+ auto residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+
+ auto storageResidual = localResidual.evalStorage(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+
+ residual += storageResidual;
+
+ return residual;
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static NumEqVector assemble_(Assembler& assembler, JacobianMatrix& A,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ const auto& fvGridGeometry = assembler.fvGridGeometry();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // using an explicit assembler doesn't make sense for stationary problems
+ if (localResidual.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Using explicit jacobian assembler with stationary local residual");
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bindElement(element, fvGeometry, curSol);
+
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ prevElemVolVars.bind(element, fvGeometry, localResidual.prevSol());
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, prevElemVolVars);
+
+ // the global dof of the actual element
+ const auto globalI = fvGridGeometry.elementMapper().index(element);
+
+ // check for boundaries on the element
+ // TODO Do we need them for cell-centered models?
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // is the actual element a ghost element?
+ const bool isGhost = (element.partitionType() == Dune::GhostEntity);
+
+ // the actual element's previous time step residual
+ NumEqVector residual(0.0), storageResidual(0.0);
+ if (!isGhost)
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+
+ storageResidual = localResidual.evalStorage(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+
+ residual += storageResidual;
+ }
+
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+ // Calculate derivatives of all dofs in stencil with respect to the dofs in the element. In the //
+ // neighboring elements all derivatives are zero. For the assembled element only the storage //
+ // derivatives are non-zero. //
+ //////////////////////////////////////////////////////////////////////////////////////////////////
+
+ static const std::string group = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ static const int numericDifferenceMethod = getParamFromGroup<int>(group, "Implicit.NumericDifferenceMethod");
+
+ // reference to the element's scv (needed later) and corresponding vol vars
+ const auto& scv = fvGeometry.scv(globalI);
+ auto& curVolVars = getVolVarAccess(gridVariables.curGridVolVars(), curElemVolVars, scv);
+
+ // save a copy of the original privars and vol vars in order
+ // to restore the original solution after deflection
+ const auto origPriVars = curSol[globalI];
+ const auto origVolVars = curVolVars;
+
+ // element solution container to be deflected
+ ElementSolutionVector elemSol({origPriVars});
+
+ // derivatives in the neighbors with repect to the current elements
+ for (int pvIdx = 0; pvIdx < numEq; pvIdx++)
+ {
+ // reset derivatives of element dof with respect to itself
+ // as well as neighbor derivatives
+ NumEqVector partialDeriv(0.0);
+
+ if (isGhost)
+ partialDeriv[pvIdx] = 1.0;
+
+ Scalar eps = numericEpsilon(curVolVars.priVar(pvIdx));
+ Scalar delta = 0;
+
+ if (numericDifferenceMethod >= 0)
+ {
+ // we are not using backward differences, i.e. we need to
+ // calculate f(x + \epsilon)
+
+ // deflect primary variables
+ elemSol[0][pvIdx] += eps;
+ delta += eps;
+
+ // update the volume variables and the flux var cache
+ curVolVars.update(elemSol, problem, element, scv);
+
+ // calculate the residual with the deflected primary variables
+ if (!isGhost)
+ {
+ partialDeriv = localResidual.evalStorage(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ }
+ else
+ {
+ // we are using backward differences, i.e. we don't need
+ // to calculate f(x + \epsilon) and we can recycle the
+ // (already calculated) residual f(x)
+ if (!isGhost)
+ partialDeriv = storageResidual;
+ }
+
+ if (numericDifferenceMethod <= 0)
+ {
+ // we are not using forward differences, i.e. we
+ // need to calculate f(x - \epsilon)
+
+ // deflect the primary variables
+ elemSol[0][pvIdx] -= delta + eps;
+ delta += eps;
+
+ // update the volume variables and the flux var cache
+ curVolVars.update(elemSol, problem, element, scv);
+
+ // calculate the residual with the deflected primary variables and subtract it
+ if (!isGhost)
+ {
+ partialDeriv -= localResidual.evalStorage(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ }
+ else
+ {
+ // we are using forward differences, i.e. we don't need to
+ // calculate f(x - \epsilon) and we can recycle the
+ // (already calculated) residual f(x)
+ if (!isGhost)
+ partialDeriv -= storageResidual;
+ }
+
+ // divide difference in residuals by the magnitude of the
+ // deflections between the two function evaluation
+ if (!isGhost)
+ partialDeriv /= delta;
+
+ // restore the original state of the scv's volume variables
+ curVolVars = origVolVars;
+
+ // restore the current element solution
+ elemSol[0][pvIdx] = origPriVars[pvIdx];
+
+ // add the current partial derivatives to the global jacobian matrix
+ for (int eqIdx = 0; eqIdx < numEq; eqIdx++)
+ {
+ // the diagonal entries
+ A[globalI][globalI][eqIdx][pvIdx] += partialDeriv[eqIdx];
+ }
+ }
+
+ // return the original residual
+ return residual;
+ }
+private:
+ template<class T = TypeTag>
+ static typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return elemVolVars[scv]; }
+
+ template<class T = TypeTag>
+ static typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return gridVolVars.volVars(scv); }
+};
+
+//! implicit assembler using analytic differentiation
+template<class TypeTag>
+class CCLocalAssembler<TypeTag,
+ DiffMethod::analytic,
+ /*implicit=*/true>
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
+ using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
+ using IndexType = typename GET_PROP_TYPE(TypeTag, GridView)::IndexSet::IndexType;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
+
+public:
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix. The element residual is written into the right hand side.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ const auto globalI = assembler.fvGridGeometry().elementMapper().index(element);
+ res[globalI] = assemble_(assembler, jac, element, curSol);
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, jac, element, curSol);
+ }
+
+ /*!
+ * \brief Assemble the residual only
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ const auto globalI = assembler.fvGridGeometry().elementMapper().index(element);
+ res[globalI] = assemble_(assembler, element, curSol);
+ }
+
+private:
+
+ /*!
+ * \brief Computes the residual
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static NumEqVector assemble_(Assembler& assembler,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // is the actual element a ghost element?
+ const bool isGhost = (element.partitionType() == Dune::GhostEntity);
+ if (isGhost) return NumEqVector(0.0);
+
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bind(element, fvGeometry, curSol);
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
+
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+
+ // check for boundaries on the element
+ // TODO Do we need them for cell-centered models?
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ NumEqVector residual(0.0);
+ if (!localResidual.isStationary())
+ {
+ prevElemVolVars.bindElement(element, fvGeometry, localResidual.prevSol());
+
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ else
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+
+ return residual;
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static NumEqVector assemble_(Assembler& assembler, JacobianMatrix& A,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ const auto& fvGridGeometry = assembler.fvGridGeometry();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bind(element, fvGeometry, curSol);
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
+
+ const bool isStationary = localResidual.isStationary();
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ if (!isStationary)
+ prevElemVolVars.bindElement(element, fvGeometry, localResidual.prevSol());
+
+ // the global dof of the actual element
+ const auto globalI = fvGridGeometry.elementMapper().index(element);
+
+ // check for boundaries on the element
+ // TODO Do we need them for cell-centered models?
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // is the actual element a ghost element?
+ const bool isGhost = (element.partitionType() == Dune::GhostEntity);
+
+ // the actual element's current residual (will be returned by this function)
+ NumEqVector residual(0.0);
+ if (!isGhost)
+ {
+ if (isStationary)
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ else
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+ }
+ }
+
+ // get reference to the element's current vol vars
+ const auto& scv = fvGeometry.scv(globalI);
+ const auto& volVars = curElemVolVars[scv];
+
+ // if the problem is instationary, add derivative of storage term
+ if (!isStationary)
+ localResidual.addStorageDerivatives(A[globalI][globalI],
+ problem,
+ element,
+ fvGeometry,
+ volVars,
+ scv);
+
+ // add source term derivatives
+ localResidual.addSourceDerivatives(A[globalI][globalI],
+ problem,
+ element,
+ fvGeometry,
+ volVars,
+ scv);
+
+ // add flux derivatives for each scvf
+ for (const auto& scvf : scvfs(fvGeometry))
+ {
+ if (!scvf.boundary())
+ {
+ localResidual.addFluxDerivatives(A[globalI],
+ problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemFluxVarsCache,
+ scvf);
+ }
+ else
+ {
+ const auto& bcTypes = problem.boundaryTypes(element, scvf);
+
+ // add Dirichlet boundary flux derivatives
+ if (bcTypes.hasDirichlet() && !bcTypes.hasNeumann())
+ {
+ localResidual.addCCDirichletFluxDerivatives(A[globalI],
+ problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemFluxVarsCache,
+ scvf);
+ }
+ // add Robin ("solution dependent Neumann") boundary flux derivatives
+ else if (bcTypes.hasNeumann() && !bcTypes.hasDirichlet())
+ {
+ localResidual.addRobinFluxDerivatives(A[globalI],
+ problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ elemFluxVarsCache,
+ scvf);
+ }
+ else
+ DUNE_THROW(Dune::NotImplemented, "Mixed boundary conditions. Use pure boundary conditions by converting Dirichlet BCs to Robin BCs");
+ }
+ }
+
+ // TODO Do we really need this??????????
+ // this->model_().updatePVWeights(fvGeometry);
+
+ // TODO: Additional dof dependencies???
+
+ // return element residual
+ return residual;
+ }
+};
+
+//! explicit assembler using analytic differentiation
+template<class TypeTag>
+class CCLocalAssembler<TypeTag,
+ DiffMethod::analytic,
+ /*implicit=*/false>
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
+ using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
+ using IndexType = typename GET_PROP_TYPE(TypeTag, GridView)::IndexSet::IndexType;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
+
+public:
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix. The element residual is written into the right hand side.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ const auto globalI = assembler.fvGridGeometry().elementMapper().index(element);
+ res[globalI] = assemble_(assembler, jac, element, curSol);
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac,
+ const Element& element, const SolutionVector& curSol)
+ {
+ assemble_(assembler, jac, element, curSol);
+ }
+
+ /*!
+ * \brief Assemble the residual only
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ const auto globalI = assembler.fvGridGeometry().elementMapper().index(element);
+ res[globalI] = assemble_(assembler, element, curSol);
+ }
+
+private:
+
+ /*!
+ * \brief Computes the residual
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static NumEqVector assemble_(Assembler& assembler,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // is the actual element a ghost element?
+ const bool isGhost = (element.partitionType() == Dune::GhostEntity);
+ if (isGhost) return NumEqVector(0.0);
+
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // using an explicit assembler doesn't make sense for stationary problems
+ if (localResidual.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Using explicit jacobian assembler with stationary local residual");
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bindElement(element, fvGeometry, curSol);
+
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ prevElemVolVars.bind(element, fvGeometry, localResidual.prevSol());
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, prevElemVolVars);
+
+ // check for boundaries on the element
+ // TODO Do we need them for cell-centered models?
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // the actual element's previous time step residual
+ auto residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+
+ auto storageResidual = localResidual.evalStorage(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+
+ residual += storageResidual;
+
+ return residual;
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ *
+ * \return The element residual at the current solution.
+ */
+ template<class Assembler>
+ static NumEqVector assemble_(Assembler& assembler, JacobianMatrix& A,
+ const Element& element, const SolutionVector& curSol)
+ {
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ const auto& fvGridGeometry = assembler.fvGridGeometry();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // using an explicit assembler doesn't make sense for stationary problems
+ if (localResidual.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Using explicit jacobian assembler with stationary local residual");
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bindElement(element, fvGeometry, curSol);
+
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ prevElemVolVars.bind(element, fvGeometry, localResidual.prevSol());
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, prevElemVolVars);
+
+ // the global dof of the actual element
+ const auto globalI = fvGridGeometry.elementMapper().index(element);
+
+ // check for boundaries on the element
+ // TODO Do we need them for cell-centered models?
+ ElementBoundaryTypes elemBcTypes;
+ elemBcTypes.update(problem, element, fvGeometry);
+
+ // is the actual element a ghost element?
+ const bool isGhost = (element.partitionType() == Dune::GhostEntity);
+
+ // the actual element's previous time step residual
+ NumEqVector residual(0.0), storageResidual(0.0);
+ if (!isGhost)
+ {
+ residual = localResidual.eval(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+
+ storageResidual = localResidual.evalStorage(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ elemBcTypes,
+ elemFluxVarsCache)[0];
+
+ residual += storageResidual;
+ }
+
+ // get reference to the element's current vol vars
+ const auto& scv = fvGeometry.scv(globalI);
+ const auto& volVars = curElemVolVars[scv];
+
+ // add derivative of storage term
+ localResidual.addStorageDerivatives(A[globalI][globalI],
+ problem,
+ element,
+ fvGeometry,
+ volVars,
+ scv);
+
+ // return the original residual
+ return residual;
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/test/geomechanics/el2p/el2pco2tables.hh b/dumux/assembly/diffmethod.hh
similarity index 79%
rename from test/geomechanics/el2p/el2pco2tables.hh
rename to dumux/assembly/diffmethod.hh
index 74b3a6f958278623fc586bb433f50a383e7ffaff..88e7a17d8ba5356fbfc4fa8930280785f5789628 100644
--- a/test/geomechanics/el2p/el2pco2tables.hh
+++ b/dumux/assembly/diffmethod.hh
@@ -16,25 +16,22 @@
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
-/**
+/*!
* \file
- *
- * \brief Provides the class with the tabulated values of CO2
+ * \brief An enum class to define various methods available in order to compute
+ the derivatives of the residual i.e. the entries in the jacobian matrix.
*/
-#ifndef DUMUX_EL2P_CO2TABLES_HH
-#define DUMUX_EL2P_CO2TABLES_HH
+#ifndef DUMUX_JACOBIAN_DIFFERENTIATION_METHODS_HH
+#define DUMUX_JACOBIAN_DIFFERENTIATION_METHODS_HH
-#include <cassert>
-#include <dumux/material/components/co2tablereader.hh>
-namespace Dumux
-{
-namespace El2P
+namespace Dumux {
+
+enum class DiffMethod
{
-// the real work is done by some external program which provides
-// ready-to-use tables.
-#include "co2values.inc"
-}
-}
+ numeric, analytic, automatic
+};
+
+} // end namespace Dumux
#endif
diff --git a/dumux/assembly/fvassembler.hh b/dumux/assembly/fvassembler.hh
new file mode 100644
index 0000000000000000000000000000000000000000..79a947932b3627cbb54f02bcf4f28617a9ccd12a
--- /dev/null
+++ b/dumux/assembly/fvassembler.hh
@@ -0,0 +1,421 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief An assembler for the global linear system
+ * for fully implicit models and vertex-centered discretization schemes.
+ */
+#ifndef DUMUX_FV_ASSEMBLER_HH
+#define DUMUX_FV_ASSEMBLER_HH
+
+#include <type_traits>
+
+#include <dune/istl/matrixindexset.hh>
+
+#include <dumux/common/timeloop.hh>
+#include <dumux/implicit/localresidual.hh>
+#include <dumux/discretization/methods.hh>
+
+#include "diffmethod.hh"
+#include "boxlocalassembler.hh"
+#include "cclocalassembler.hh"
+
+namespace Dumux {
+
+/*!
+ * \ingroup ImplicitModel
+ * \brief An assembler for the global linear system
+ * for fully implicit models and cell-centered discretization schemes.
+ */
+template<class TypeTag, DiffMethod diffMethod, bool isImplicit = true>
+class FVAssembler
+{
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using LocalResidual = typename GET_PROP_TYPE(TypeTag, LocalResidual);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using TimeLoop = TimeLoopBase<Scalar>;
+
+ static constexpr int dim = GridView::dimension;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr int dofCodim = isBox ? dim : 0;
+
+ using LocalAssembler = std::conditional_t<isBox, BoxLocalAssembler<TypeTag, diffMethod, isImplicit>,
+ CCLocalAssembler<TypeTag, diffMethod, isImplicit>>;
+
+public:
+ using ResidualType = SolutionVector;
+
+ //! The constructor for stationary problems
+ FVAssembler(std::shared_ptr<const Problem> problem,
+ std::shared_ptr<const FVGridGeometry> fvGridGeometry,
+ std::shared_ptr<GridVariables> gridVariables)
+ : problem_(problem)
+ , fvGridGeometry_(fvGridGeometry)
+ , gridVariables_(gridVariables)
+ , stationary_(true)
+ {
+ static_assert(isImplicit, "Explicit assembler for stationary problem doesn't make sense!");
+ }
+
+ //! The constructor for instationary problems
+ FVAssembler(std::shared_ptr<const Problem> problem,
+ std::shared_ptr<const FVGridGeometry> fvGridGeometry,
+ std::shared_ptr<GridVariables> gridVariables,
+ std::shared_ptr<TimeLoop> timeLoop)
+ : problem_(problem)
+ , fvGridGeometry_(fvGridGeometry)
+ , gridVariables_(gridVariables)
+ , localResidual_(timeLoop)
+ , stationary_(false)
+ {}
+
+ /*!
+ * \brief Assembles the global Jacobian of the residual
+ * and the residual for the current solution.
+ */
+ void assembleJacobianAndResidual(const SolutionVector& curSol)
+ {
+ if (!stationary_ && localResidual_.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Assembling instationary problem but previous solution was not set!");
+
+ if(!jacobian_)
+ {
+ jacobian_ = std::make_shared<JacobianMatrix>();
+ jacobian_->setBuildMode(JacobianMatrix::random);
+ setJacobianPattern();
+ }
+
+ if(!residual_)
+ {
+ residual_ = std::make_shared<SolutionVector>();
+ setResidualSize();
+ }
+
+ resetJacobian_();
+ resetResidual_();
+
+ bool succeeded;
+ // try assembling the global linear system
+ try
+ {
+ // let the local assembler add the element contributions
+ for (const auto element : elements(gridView()))
+ LocalAssembler::assemble(*this, *jacobian_, *residual_, element, curSol);
+
+ // if we get here, everything worked well
+ succeeded = true;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+ }
+ // throw exception if a problem ocurred
+ catch (NumericalProblem &e)
+ {
+ std::cout << "rank " << gridView().comm().rank()
+ << " caught an exception while assembling:" << e.what()
+ << "\n";
+ succeeded = false;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+ }
+ if (!succeeded)
+ DUNE_THROW(NumericalProblem, "A process did not succeed in linearizing the system");
+ }
+
+ /*!
+ * \brief Assembles only the global Jacobian of the residual.
+ */
+ void assembleJacobian(const SolutionVector& curSol)
+ {
+ if (!stationary_ && localResidual_.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Assembling instationary problem but previous solution was not set!");
+
+ if(!jacobian_)
+ {
+ jacobian_ = std::make_shared<JacobianMatrix>();
+ jacobian_->setBuildMode(JacobianMatrix::random);
+ setJacobianPattern();
+ }
+
+ resetJacobian_();
+
+ bool succeeded;
+ // try assembling the global linear system
+ try
+ {
+ // let the local assembler add the element contributions
+ for (const auto element : elements(gridView()))
+ LocalAssembler::assemble(*this, *jacobian_, element, curSol);
+
+ // if we get here, everything worked well
+ succeeded = true;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+ }
+ // throw exception if a problem ocurred
+ catch (NumericalProblem &e)
+ {
+ std::cout << "rank " << gridView().comm().rank()
+ << " caught an exception while assembling:" << e.what()
+ << "\n";
+ succeeded = false;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+ }
+ if (!succeeded)
+ DUNE_THROW(NumericalProblem, "A process did not succeed in linearizing the system");
+ }
+
+ //! compute the residuals
+ void assembleResidual(const SolutionVector& curSol)
+ {
+ if(!residual_)
+ {
+ residual_ = std::make_shared<SolutionVector>();
+ setResidualSize();
+ }
+
+ assembleResidual(*residual_, curSol);
+ }
+
+ //! compute the residuals
+ void assembleResidual(ResidualType& r, const SolutionVector& curSol) const
+ {
+ if (!stationary_ && localResidual_.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Assembling instationary problem but previous solution was not set!");
+
+ // update the grid variables for the case of active caching
+ gridVariables_->update(curSol);
+
+ // let the local assembler add the element contributions
+ for (const auto element : elements(gridView()))
+ LocalAssembler::assemble(*this, r, element, curSol);
+ }
+
+ //! computes the residual norm
+ Scalar residualNorm(const SolutionVector& curSol) const
+ {
+ ResidualType residual(numDofs());
+ assembleResidual(residual, curSol);
+
+ // calculate the square norm of the residual
+ Scalar result2 = residual.two_norm2();
+ if (gridView().comm().size() > 1)
+ result2 = gridView().comm().sum(result2);
+
+ using std::sqrt;
+ return sqrt(result2);
+ }
+
+ /*!
+ * \brief Tells the assembler which jacobian and residual to use.
+ * This also resizes the containers to the required sizes and sets the
+ * sparsity pattern of the jacobian matrix.
+ */
+ void setLinearSystem(std::shared_ptr<JacobianMatrix> A,
+ std::shared_ptr<SolutionVector> r)
+ {
+ jacobian_ = A;
+ residual_ = r;
+
+ // check and/or set the BCRS matrix's build mode
+ if (jacobian_->buildMode() == JacobianMatrix::BuildMode::unknown)
+ jacobian_->setBuildMode(JacobianMatrix::random);
+ else if (jacobian_->buildMode() != JacobianMatrix::BuildMode::random)
+ DUNE_THROW(Dune::NotImplemented, "Only BCRS matrices with random build mode are supported at the moment");
+
+ setJacobianPattern();
+ setResidualSize();
+ }
+
+ /*!
+ * \brief The version without arguments uses the default constructor to create
+ * the jacobian and residual objects in this assembler.
+ */
+ void setLinearSystem()
+ {
+ jacobian_ = std::make_shared<JacobianMatrix>();
+ jacobian_->setBuildMode(JacobianMatrix::random);
+
+ residual_ = std::make_shared<SolutionVector>();
+
+ setJacobianPattern();
+ setResidualSize();
+ }
+
+ /*!
+ * \brief Sets the solution from which to start the time integration. Has to be
+ * called prior to assembly for time-dependent problems.
+ */
+ void setPreviousSolution(const SolutionVector& u)
+ { localResidual_.setPreviousSolution(u); }
+
+ /*!
+ * \brief Return the solution that has been set as the previous one.
+ */
+ const SolutionVector& prevSol() const
+ { return localResidual_.prevSol(); }
+
+ /*!
+ * \brief Resizes the jacobian and sets the jacobian' sparsity pattern.
+ */
+
+ void setJacobianPattern()
+ {
+ // resize the jacobian and the residual
+ const auto numDofs = this->numDofs();
+ jacobian_->setSize(numDofs, numDofs);
+
+ // get occupation pattern of the jacobian
+ Dune::MatrixIndexSet occupationPattern;
+ occupationPattern.resize(numDofs, numDofs);
+
+ // matrix pattern for implicit jacobians
+ if (isImplicit)
+ setImplicitJacobianPattern_(occupationPattern, numDofs);
+
+ // matrix pattern for explicit jacobians -> diagonal matrix
+ else
+ for (unsigned int globalI = 0; globalI < numDofs; ++globalI)
+ occupationPattern.add(globalI, globalI);
+
+ // export pattern to jacobian
+ occupationPattern.exportIdx(*jacobian_);
+ }
+
+ /*!
+ * \brief Resizes the residual
+ */
+ void setResidualSize()
+ { residual_->resize(numDofs()); }
+
+ //! cell-centered schemes have one dof per cell
+ std::size_t numDofs() const
+ { return gridView().size(dofCodim); }
+
+ const Problem& problem() const
+ { return *problem_; }
+
+ const FVGridGeometry& fvGridGeometry() const
+ { return *fvGridGeometry_; }
+
+ const GridView& gridView() const
+ { return fvGridGeometry().gridView(); }
+
+ GridVariables& gridVariables()
+ { return *gridVariables_; }
+
+ const GridVariables& gridVariables() const
+ { return *gridVariables_; }
+
+ JacobianMatrix& jacobian()
+ {
+ if (!residual_)
+ DUNE_THROW(Dune::InvalidStateException, "No jacobian was set.");
+ return *jacobian_;
+ }
+
+ SolutionVector& residual()
+ {
+ if (!residual_)
+ DUNE_THROW(Dune::InvalidStateException, "No residual was set.");
+ return *residual_;
+ }
+
+ const LocalResidual& localResidual() const
+ { return localResidual_; }
+
+private:
+ // reset the residual to 0.0
+ void resetResidual_()
+ {
+ (*residual_) = 0.0;
+ }
+
+ // reset the jacobian to 0.0
+ void resetJacobian_()
+ {
+ (*jacobian_) = 0.0;
+ }
+
+ //! Implicit jacobian pattern for cell-centered fv schemes
+ template<typename T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) != DiscretizationMethods::Box, void>
+ setImplicitJacobianPattern_(Dune::MatrixIndexSet& pattern, std::size_t numDofs)
+ {
+ for (unsigned int globalI = 0; globalI < numDofs; ++globalI)
+ {
+ pattern.add(globalI, globalI);
+ for (const auto& dataJ : fvGridGeometry().connectivityMap()[globalI])
+ pattern.add(dataJ.globalJ, globalI);
+
+ // reserve index for additional user defined DOF dependencies
+ // const auto& additionalDofDependencies = problem().getAdditionalDofDependencies(globalI);
+ // for (auto globalJ : additionalDofDependencies)
+ // pattern.add(globalI, globalJ);
+ }
+ }
+
+ //! Implicit jacobian pattern for vertex-centered fv schemes
+ template<typename T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::Box, void>
+ setImplicitJacobianPattern_(Dune::MatrixIndexSet& pattern, std::size_t numDofs)
+ {
+ for (const auto& element : elements(fvGridGeometry().gridView()))
+ {
+ for (unsigned int vIdx = 0; vIdx < element.subEntities(dim); ++vIdx)
+ {
+ const auto globalI = fvGridGeometry().vertexMapper().subIndex(element, vIdx, dim);
+ for (unsigned int vIdx2 = vIdx; vIdx2 < element.subEntities(dim); ++vIdx2)
+ {
+ const auto globalJ = fvGridGeometry().vertexMapper().subIndex(element, vIdx2, dim);
+ pattern.add(globalI, globalJ);
+ pattern.add(globalJ, globalI);
+ }
+ }
+ }
+ }
+
+ // pointer to the problem to be solved
+ std::shared_ptr<const Problem> problem_;
+
+ // the finite volume geometry of the grid
+ std::shared_ptr<const FVGridGeometry> fvGridGeometry_;
+
+ // the variables container for the grid
+ std::shared_ptr<GridVariables> gridVariables_;
+
+ // shared pointers to the jacobian matrix and residual
+ std::shared_ptr<JacobianMatrix> jacobian_;
+ std::shared_ptr<SolutionVector> residual_;
+
+ // class computing the residual of an element
+ LocalResidual localResidual_;
+
+ // if this assembler is assembling a time dependent problem
+ bool stationary_;
+};
+
+} // namespace Dumux
+
+#endif
diff --git a/dumux/assembly/staggeredfvassembler.hh b/dumux/assembly/staggeredfvassembler.hh
new file mode 100644
index 0000000000000000000000000000000000000000..a41cd37b2e6a76585ba1c58208fc36a5d5ba0db1
--- /dev/null
+++ b/dumux/assembly/staggeredfvassembler.hh
@@ -0,0 +1,455 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief An assembler for the global linear system
+ * for fully implicit models and vertex-centered discretization schemes.
+ */
+#ifndef DUMUX_STAGGERED_FV_ASSEMBLER_HH
+#define DUMUX_STAGGERED_FV_ASSEMBLER_HH
+
+#include <type_traits>
+
+#include <dune/istl/matrixindexset.hh>
+
+#include <dumux/common/timeloop.hh>
+#include <dumux/implicit/staggered/localresidual.hh>
+#include <dumux/discretization/methods.hh>
+
+#include "diffmethod.hh"
+#include "staggeredlocalassembler.hh"
+
+namespace Dumux {
+
+/*!
+ * \ingroup ImplicitModel
+ * \brief An assembler for the global linear system
+ * for fully implicit models and cell-centered discretization schemes.
+ */
+template<class TypeTag, DiffMethod diffMethod, bool isImplicit = true>
+class StaggeredFVAssembler
+{
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using LocalResidual = typename GET_PROP_TYPE(TypeTag, LocalResidual);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using TimeLoop = TimeLoopBase<Scalar>;
+
+ static constexpr int dim = GridView::dimension;
+
+ using LocalAssembler =StaggeredLocalAssembler<TypeTag, diffMethod, isImplicit>;
+
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
+ using CCToCCMatrixBlock = typename GET_PROP(TypeTag, JacobianMatrix)::MatrixBlockCCToCC;
+ using CCToFaceMatrixBlock = typename GET_PROP(TypeTag, JacobianMatrix)::MatrixBlockCCToFace;
+ using FaceToFaceMatrixBlock = typename GET_PROP(TypeTag, JacobianMatrix)::MatrixBlockFaceToFace;
+ using FaceToCCMatrixBlock = typename GET_PROP(TypeTag, JacobianMatrix)::MatrixBlockFaceToCC;
+
+public:
+ using ResidualType = SolutionVector;
+
+ //! The constructor for stationary problems
+ StaggeredFVAssembler(std::shared_ptr<const Problem> problem,
+ std::shared_ptr<const FVGridGeometry> fvGridGeometry,
+ std::shared_ptr<GridVariables> gridVariables)
+ : problem_(problem)
+ , fvGridGeometry_(fvGridGeometry)
+ , gridVariables_(gridVariables)
+ , stationary_(true)
+ {
+ static_assert(isImplicit, "Explicit assembler for stationary problem doesn't make sense!");
+ }
+
+ //! The constructor for instationary problems
+ StaggeredFVAssembler(std::shared_ptr<const Problem> problem,
+ std::shared_ptr<const FVGridGeometry> fvGridGeometry,
+ std::shared_ptr<GridVariables> gridVariables,
+ std::shared_ptr<TimeLoop> timeLoop)
+ : problem_(problem)
+ , fvGridGeometry_(fvGridGeometry)
+ , gridVariables_(gridVariables)
+ , localResidual_(timeLoop)
+ , stationary_(false)
+ {}
+
+ /*!
+ * \brief Assembles the global Jacobian of the residual
+ * and the residual for the current solution.
+ */
+ void assembleJacobianAndResidual(const SolutionVector& curSol)
+ {
+ if (!stationary_ && localResidual_.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Assembling instationary problem but previous solution was not set!");
+
+ if(!jacobian_)
+ {
+ setLinearSystem();
+ }
+
+ if(!residual_)
+ {
+ residual_ = std::make_shared<SolutionVector>();
+ setResidualSize();
+ }
+
+ resetJacobian_();
+ resetResidual_();
+
+ bool succeeded;
+ // try assembling the global linear system
+ try
+ {
+ // let the local assembler add the element contributions
+ for (const auto element : elements(gridView()))
+ LocalAssembler::assembleJacobianAndResidual(*this, *jacobian_, *residual_, element, curSol);
+
+ // if we get here, everything worked well
+ succeeded = true;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+
+ // printmatrix(std::cout, (*jacobian_)[cellCenterIdx][cellCenterIdx], "A11", "");
+ // printmatrix(std::cout, (*jacobian_)[cellCenterIdx][faceIdx], "A12", "");
+ // printmatrix(std::cout, (*jacobian_)[faceIdx][cellCenterIdx], "A21", "");
+ // printmatrix(std::cout, (*jacobian_)[faceIdx][faceIdx], "A22", "");
+ }
+ // throw exception if a problem ocurred
+ catch (NumericalProblem &e)
+ {
+ std::cout << "rank " << gridView().comm().rank()
+ << " caught an exception while assembling:" << e.what()
+ << "\n";
+ succeeded = false;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+ }
+ if (!succeeded)
+ DUNE_THROW(NumericalProblem, "A process did not succeed in linearizing the system");
+ }
+
+ /*!
+ * \brief Assembles only the global Jacobian of the residual.
+ */
+ void assembleJacobian(const SolutionVector& curSol)
+ {
+ if (!stationary_ && localResidual_.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Assembling instationary problem but previous solution was not set!");
+
+ if(!jacobian_)
+ {
+ jacobian_ = std::make_shared<JacobianMatrix>();
+ jacobian_->setBuildMode(JacobianMatrix::random);
+ setJacobianPattern();
+ }
+
+ resetJacobian_();
+
+ bool succeeded;
+ // try assembling the global linear system
+ try
+ {
+ // let the local assembler add the element contributions
+ for (const auto element : elements(gridView()))
+ LocalAssembler::assemble(*this, *jacobian_, element, curSol);
+
+ // if we get here, everything worked well
+ succeeded = true;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+ }
+ // throw exception if a problem ocurred
+ catch (NumericalProblem &e)
+ {
+ std::cout << "rank " << gridView().comm().rank()
+ << " caught an exception while assembling:" << e.what()
+ << "\n";
+ succeeded = false;
+ if (gridView().comm().size() > 1)
+ succeeded = gridView().comm().min(succeeded);
+ }
+ if (!succeeded)
+ DUNE_THROW(NumericalProblem, "A process did not succeed in linearizing the system");
+ }
+
+ //! compute the residuals
+ void assembleResidual(const SolutionVector& curSol)
+ {
+ if(!residual_)
+ {
+ residual_ = std::make_shared<SolutionVector>();
+ setResidualSize();
+ }
+
+ assembleResidual(*residual_, curSol);
+ }
+
+ //! compute the residuals
+ void assembleResidual(ResidualType& r, const SolutionVector& curSol) const
+ {
+ if (!stationary_ && localResidual_.isStationary())
+ DUNE_THROW(Dune::InvalidStateException, "Assembling instationary problem but previous solution was not set!");
+
+ // let the local assembler add the element contributions
+ for (const auto element : elements(gridView()))
+ LocalAssembler::assemble(*this, r, element, curSol);
+ }
+
+ //! computes the residual norm
+ Scalar residualNorm(const SolutionVector& curSol) const
+ {
+ ResidualType residual;
+ residual[cellCenterIdx].resize(fvGridGeometry().numCellCenterDofs());
+ residual[faceIdx].resize(fvGridGeometry().numFaceDofs());
+ assembleResidual(residual, curSol);
+
+ // calculate the square norm of the residual
+ Scalar result2 = residual.two_norm2();
+ if (gridView().comm().size() > 1)
+ result2 = gridView().comm().sum(result2);
+
+ using std::sqrt;
+ return sqrt(result2);
+ }
+
+ /*!
+ * \brief Tells the assembler which jacobian and residual to use.
+ * This also resizes the containers to the required sizes and sets the
+ * sparsity pattern of the jacobian matrix.
+ */
+ void setLinearSystem(std::shared_ptr<JacobianMatrix> A,
+ std::shared_ptr<SolutionVector> r)
+ {
+ jacobian_ = A;
+ residual_ = r;
+ //
+ // check and/or set the BCRS matrix's build mode
+ // convenience references
+ CCToCCMatrixBlock& A11 = (*jacobian_)[cellCenterIdx][cellCenterIdx];
+ CCToFaceMatrixBlock& A12 = (*jacobian_)[cellCenterIdx][faceIdx];
+ FaceToCCMatrixBlock& A21 = (*jacobian_)[faceIdx][cellCenterIdx];
+ FaceToFaceMatrixBlock& A22 = (*jacobian_)[faceIdx][faceIdx];
+
+ A11.setBuildMode(CCToCCMatrixBlock::random);
+ A12.setBuildMode(CCToFaceMatrixBlock::random);
+ A21.setBuildMode(FaceToCCMatrixBlock::random);
+ A22.setBuildMode(FaceToFaceMatrixBlock::random);
+
+ setJacobianPattern();
+ setResidualSize();
+ // if (jacobian_->buildMode() == JacobianMatrix::BuildMode::unknown)
+ // jacobian_->setBuildMode(JacobianMatrix::random);
+ // else if (jacobian_->buildMode() != JacobianMatrix::BuildMode::random)
+ // DUNE_THROW(Dune::NotImplemented, "Only BCRS matrices with random build mode are supported at the moment");
+ //
+ // setJacobianPattern();
+ // setResidualSize();
+ }
+
+ /*!
+ * \brief The version without arguments uses the default constructor to create
+ * the jacobian and residual objects in this assembler.
+ */
+ void setLinearSystem()
+ {
+ jacobian_ = std::make_shared<JacobianMatrix>();
+
+ // convenience references
+ CCToCCMatrixBlock& A11 = (*jacobian_)[cellCenterIdx][cellCenterIdx];
+ CCToFaceMatrixBlock& A12 = (*jacobian_)[cellCenterIdx][faceIdx];
+ FaceToCCMatrixBlock& A21 = (*jacobian_)[faceIdx][cellCenterIdx];
+ FaceToFaceMatrixBlock& A22 = (*jacobian_)[faceIdx][faceIdx];
+
+ A11.setBuildMode(CCToCCMatrixBlock::random);
+ A12.setBuildMode(CCToFaceMatrixBlock::random);
+ A21.setBuildMode(FaceToCCMatrixBlock::random);
+ A22.setBuildMode(FaceToFaceMatrixBlock::random);
+
+ residual_ = std::make_shared<SolutionVector>();
+
+ setJacobianPattern();
+ setResidualSize();
+ }
+
+ /*!
+ * \brief Sets the solution from which to start the time integration. Has to be
+ * called prior to assembly for time-dependent problems.
+ */
+ void setPreviousSolution(const SolutionVector& u)
+ { localResidual_.setPreviousSolution(u); }
+
+ /*!
+ * \brief Return the solution that has been set as the previous one.
+ */
+ const SolutionVector& prevSol() const
+ { return localResidual_.prevSol(); }
+
+ /*!
+ * \brief Resizes the jacobian and sets the jacobian' sparsity pattern.
+ */
+
+ void setJacobianPattern()
+ {
+ // resize the jacobian and the residual
+ const auto numDofsCC = fvGridGeometry().numCellCenterDofs();
+ const auto numDofsFace = fvGridGeometry().numFaceDofs();
+
+ // convenience references
+ CCToCCMatrixBlock& A11 = (*jacobian_)[cellCenterIdx][cellCenterIdx];
+ CCToFaceMatrixBlock& A12 = (*jacobian_)[cellCenterIdx][faceIdx];
+ FaceToCCMatrixBlock& A21 = (*jacobian_)[faceIdx][cellCenterIdx];
+ FaceToFaceMatrixBlock& A22 = (*jacobian_)[faceIdx][faceIdx];
+
+ // set the size of the sub-matrizes
+ A11.setSize(numDofsCC, numDofsCC);
+ A12.setSize(numDofsCC, numDofsFace);
+ A21.setSize(numDofsFace, numDofsCC);
+ A22.setSize(numDofsFace, numDofsFace);
+
+
+ // set occupation pattern of the jacobian
+ Dune::MatrixIndexSet occupationPatternA11;
+ Dune::MatrixIndexSet occupationPatternA12;
+ Dune::MatrixIndexSet occupationPatternA21;
+ Dune::MatrixIndexSet occupationPatternA22;
+ occupationPatternA11.resize(numDofsCC, numDofsCC);
+ occupationPatternA12.resize(numDofsCC, numDofsFace);
+ occupationPatternA21.resize(numDofsFace, numDofsCC);
+ occupationPatternA22.resize(numDofsFace, numDofsFace);
+
+ const auto& connectivityMap = fvGridGeometry().connectivityMap();
+
+ // evaluate the acutal pattern
+ for (const auto& element : elements(fvGridGeometry().gridView()))
+ {
+ // the global index of the element at hand
+ const auto ccGlobalI = fvGridGeometry().elementMapper().index(element);
+
+ for (auto&& ccGlobalJ : connectivityMap(cellCenterIdx, cellCenterIdx, ccGlobalI))
+ occupationPatternA11.add(ccGlobalI, ccGlobalJ);
+ for (auto&& faceGlobalJ : connectivityMap(cellCenterIdx, faceIdx, ccGlobalI))
+ occupationPatternA12.add(ccGlobalI, faceGlobalJ);
+
+ auto fvGeometry = localView(fvGridGeometry());
+ fvGeometry.bindElement(element);
+
+ // loop over sub control faces
+ for (auto&& scvf : scvfs(fvGeometry))
+ {
+ const auto faceGlobalI = scvf.dofIndex();
+ for (auto&& ccGlobalJ : connectivityMap(faceIdx, cellCenterIdx, scvf.index()))
+ occupationPatternA21.add(faceGlobalI, ccGlobalJ);
+ for (auto&& faceGlobalJ : connectivityMap(faceIdx, faceIdx, scvf.index()))
+ occupationPatternA22.add(faceGlobalI, faceGlobalJ);
+ }
+ }
+
+ occupationPatternA11.exportIdx(A11);
+ occupationPatternA12.exportIdx(A12);
+ occupationPatternA21.exportIdx(A21);
+ occupationPatternA22.exportIdx(A22);
+ }
+
+ /*!
+ * \brief Resizes the residual
+ */
+ void setResidualSize()
+ {
+ (*residual_)[cellCenterIdx].resize(fvGridGeometry().numCellCenterDofs());
+ (*residual_)[faceIdx].resize(fvGridGeometry().numFaceDofs());
+ }
+
+ const Problem& problem() const
+ { return *problem_; }
+
+ const FVGridGeometry& fvGridGeometry() const
+ { return *fvGridGeometry_; }
+
+ const GridView& gridView() const
+ { return fvGridGeometry().gridView(); }
+
+ GridVariables& gridVariables()
+ { return *gridVariables_; }
+
+ const GridVariables& gridVariables() const
+ { return *gridVariables_; }
+
+ JacobianMatrix& jacobian()
+ {
+ if (!residual_)
+ DUNE_THROW(Dune::InvalidStateException, "No jacobian was set.");
+ return *jacobian_;
+ }
+
+ SolutionVector& residual()
+ {
+ if (!residual_)
+ DUNE_THROW(Dune::InvalidStateException, "No residual was set.");
+ return *residual_;
+ }
+
+ const LocalResidual& localResidual() const
+ { return localResidual_; }
+
+private:
+ // reset the residual to 0.0
+ void resetResidual_()
+ {
+ (*residual_)[cellCenterIdx] = 0.0;
+ (*residual_)[faceIdx] = 0.0;
+ }
+
+ // reset the jacobian to 0.0
+ void resetJacobian_()
+ {
+ (*jacobian_)[cellCenterIdx][cellCenterIdx] = 0.0;
+ (*jacobian_)[cellCenterIdx][faceIdx] = 0.0;
+ (*jacobian_)[faceIdx][cellCenterIdx] = 0.0;
+ (*jacobian_)[faceIdx][faceIdx] = 0.0;
+ }
+
+ // pointer to the problem to be solved
+ std::shared_ptr<const Problem> problem_;
+
+ // the finite volume geometry of the grid
+ std::shared_ptr<const FVGridGeometry> fvGridGeometry_;
+
+ // the variables container for the grid
+ std::shared_ptr<GridVariables> gridVariables_;
+
+ // shared pointers to the jacobian matrix and residual
+ std::shared_ptr<JacobianMatrix> jacobian_;
+ std::shared_ptr<SolutionVector> residual_;
+
+ // class computing the residual of an element
+ LocalResidual localResidual_;
+
+ // if this assembler is assembling a time dependent problem
+ bool stationary_;
+};
+
+} // namespace Dumux
+
+#endif
diff --git a/dumux/assembly/staggeredlocalassembler.hh b/dumux/assembly/staggeredlocalassembler.hh
new file mode 100644
index 0000000000000000000000000000000000000000..65dad662104a2c5ff5995191aa2d799d0d383709
--- /dev/null
+++ b/dumux/assembly/staggeredlocalassembler.hh
@@ -0,0 +1,625 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief An assembler for the global linear system for fully implicit models
+ * and cell-centered discretization schemes using Newton's method.
+ */
+#ifndef DUMUX_CC_LOCAL_ASSEMBLER_HH
+#define DUMUX_CC_LOCAL_ASSEMBLER_HH
+
+#include <dune/istl/matrixindexset.hh>
+#include <dune/istl/bvector.hh>
+
+#include <dumux/common/basicproperties.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/implicit/staggered/primaryvariables.hh>
+#include <dumux/discretization/staggered/facesolution.hh>
+
+namespace Dumux {
+
+/*!
+ * \ingroup ImplicitModel
+ * \brief An assembler for the local contributions (per element) to the global
+ * linear system for fully implicit models and cell-centered discretization schemes.
+ */
+template<class TypeTag,
+ DiffMethod DM = DiffMethod::numeric,
+ bool implicit = true>
+class StaggeredLocalAssembler;
+
+
+template<class TypeTag>
+class StaggeredLocalAssembler<TypeTag,
+ DiffMethod::numeric,
+ /*implicit=*/true>
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
+ using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
+ using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+
+ using NumCellCenterEqVector = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
+ using NumFaceEqVector = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
+
+ using FaceSolutionVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
+ using FaceSolution = typename GET_PROP_TYPE(TypeTag, StaggeredFaceSolution);
+
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
+
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ using PriVarIndices = typename Dumux::PriVarIndices<TypeTag>;
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
+ using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
+ using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
+ using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+
+ static constexpr bool enableGlobalFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache);
+
+public:
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix. The element residual is written into the right hand side.
+ */
+ template<class Assembler>
+ static void assembleJacobianAndResidual(Assembler& assembler, JacobianMatrix& jac, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
+
+ // get some references for convenience
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // prepare the local views
+ auto fvGeometry = localView(assembler.fvGridGeometry());
+ fvGeometry.bind(element);
+
+ auto curElemVolVars = localView(gridVariables.curGridVolVars());
+ curElemVolVars.bind(element, fvGeometry, curSol);
+
+ auto elemFluxVarsCache = localView(gridVariables.gridFluxVarsCache());
+ elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
+
+ auto curElemFaceVars = localView(gridVariables.curGridFaceVars());
+ curElemFaceVars.bind(element, fvGeometry, curSol);
+
+ const bool isStationary = localResidual.isStationary();
+ auto prevElemVolVars = localView(gridVariables.prevGridVolVars());
+ auto prevElemFaceVars = localView(gridVariables.prevGridFaceVars());
+ if (!isStationary)
+ {
+ prevElemVolVars.bindElement(element, fvGeometry, localResidual.prevSol());
+ prevElemFaceVars.bindElement(element, fvGeometry, localResidual.prevSol());
+ }
+
+ // for compatibility with box models
+ ElementBoundaryTypes elemBcTypes;
+
+ const auto cellCenterGlobalI = assembler.fvGridGeometry().elementMapper().index(element);
+ res[cellCenterIdx][cellCenterGlobalI] = localResidual.evalCellCenter(problem,
+ element,
+ fvGeometry,
+ prevElemVolVars,
+ curElemVolVars,
+ prevElemFaceVars,
+ curElemFaceVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+
+ // treat the local residua of the face dofs:
+ // create a cache to reuse some results for the calculation of the derivatives
+ FaceSolutionVector faceResidualCache;
+ faceResidualCache.resize(fvGeometry.numScvf());
+ faceResidualCache = 0.0;
+
+ for(auto&& scvf : scvfs(fvGeometry))
+ {
+ faceResidualCache[scvf.localFaceIdx()] = localResidual.evalFace(problem,
+ element,
+ fvGeometry,
+ scvf,
+ prevElemVolVars,
+ curElemVolVars,
+ prevElemFaceVars,
+ curElemFaceVars,
+ elemBcTypes,
+ elemFluxVarsCache);
+
+ res[faceIdx][scvf.dofIndex()] += faceResidualCache[scvf.localFaceIdx()] ;
+ }
+
+ // calculate derivatives of all dofs in stencil with respect to the dofs in the element
+ evalPartialDerivatives_(assembler,
+ element,
+ fvGeometry,
+ curSol,
+ prevElemVolVars,
+ curElemVolVars,
+ prevElemFaceVars,
+ curElemFaceVars,
+ elemFluxVarsCache,
+ elemBcTypes,
+ jac,
+ res[cellCenterIdx][cellCenterGlobalI],
+ faceResidualCache);
+
+ }
+
+ /*!
+ * \brief Computes the derivatives with respect to the given element and adds them
+ * to the global matrix.
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, JacobianMatrix& jac,
+ const Element& element, const SolutionVector& curSol)
+ {
+ std::cout << "calling wrong \n";
+ assemble_(assembler, jac, element, curSol);
+ }
+
+ /*!
+ * \brief Assemble the residual only
+ */
+ template<class Assembler>
+ static void assemble(Assembler& assembler, SolutionVector& res,
+ const Element& element, const SolutionVector& curSol)
+ {
+ std::cout << "calling wrong \n";
+ // using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ // typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ // typename DofTypeIndices::FaceIdx faceIdx;
+
+ // const auto cellCenterGlobalI = assembler.fvGridGeometry().elementMapper().index(element);
+ // res[cellCenterIdx][cellCenterGlobalI] = localResidual.evalCellCenter(problem,
+ // element,
+ // fvGeometry,
+ // prevElemVolVars,
+ // curElemVolVars,
+ // curGlobalFaceVars,
+ // prevGlobalFaceVars,
+ // elemBcTypes,
+ // elemFluxVarsCache)[0];
+
+
+
+ // treat the local residua of the face dofs:
+ // create a cache to reuse some results for the calculation of the derivatives
+ // FaceSolutionVector faceResidualCache;
+ // faceResidualCache.resize(assembler.fvGridGeometry().numScvf());
+ // faceResidualCache = 0.0;
+ //
+ // auto fvGeometry = localView(assembler.fvGridGeometry());
+ // fvGeometry.bind(element);
+ // auto faceResiduals = assembleFace_(assembler, element, curSol);
+ //
+ // for(auto&& scvf : scvfs(fvGeometry))
+ // {
+ // res[faceIdx][scvf.dofIndex()] += faceResiduals[scvf.localFaceIdx()];
+ // faceResidualCache[scvf.localFaceIdx()] = faceResiduals[scvf.localFaceIdx()];
+ // }
+ }
+
+ /*!
+ * \brief Computes the epsilon used for numeric differentiation
+ * for a given value of a primary variable.
+ *
+ * \param priVar The value of the primary variable
+ */
+ static Scalar numericEpsilon(const Scalar priVar)
+ {
+ // define the base epsilon as the geometric mean of 1 and the
+ // resolution of the scalar type. E.g. for standard 64 bit
+ // floating point values, the resolution is about 10^-16 and
+ // the base epsilon is thus approximately 10^-8.
+ /*
+ static const Scalar baseEps
+ = Dumux::geometricMean<Scalar>(std::numeric_limits<Scalar>::epsilon(), 1.0);
+ */
+ static const Scalar baseEps = 1e-10;
+ assert(std::numeric_limits<Scalar>::epsilon()*1e4 < baseEps);
+ // the epsilon value used for the numeric differentiation is
+ // now scaled by the absolute value of the primary variable...
+ return baseEps*(std::abs(priVar) + 1.0);
+ }
+
+protected:
+ template<class Assembler>
+ static void evalPartialDerivatives_(Assembler& assembler,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const SolutionVector& curSol,
+ const ElementVolumeVariables& prevElemVolVars,
+ ElementVolumeVariables& curElemVolVars,
+ const ElementFaceVariables& prevElemFaceVars,
+ ElementFaceVariables& curElemFaceVars,
+ ElementFluxVariablesCache& elemFluxVarsCache,
+ const ElementBoundaryTypes& elemBcTypes,
+ JacobianMatrix& matrix,
+ const NumCellCenterEqVector& ccResidual,
+ const FaceSolutionVector& faceResidualCache)
+{
+ // compute the derivatives of the cell center residuals with respect to cell center dofs
+ dCCdCC_(assembler, element, fvGeometry, curSol, prevElemVolVars, curElemVolVars, prevElemFaceVars, curElemFaceVars, elemFluxVarsCache, elemBcTypes, matrix, ccResidual);
+
+ // compute the derivatives of the cell center residuals with respect to face dofs
+ dCCdFace_(assembler, element, fvGeometry, curSol, prevElemVolVars, curElemVolVars, prevElemFaceVars, curElemFaceVars, elemFluxVarsCache, elemBcTypes, matrix, ccResidual);
+
+ // compute the derivatives of the face residuals with respect to cell center dofs
+ dFacedCC_(assembler, element, fvGeometry, curSol, prevElemVolVars, curElemVolVars, prevElemFaceVars, curElemFaceVars, elemFluxVarsCache, elemBcTypes, matrix, faceResidualCache);
+
+ // compute the derivatives of the face residuals with respect to face dofs
+ dFacedFace_(assembler, element, fvGeometry, curSol, prevElemVolVars, curElemVolVars, prevElemFaceVars, curElemFaceVars, elemFluxVarsCache, elemBcTypes, matrix, faceResidualCache);
+}
+
+/*!
+* \brief Computes the derivatives of the cell center residuals with respect to cell center dofs
+*/
+template<class Assembler>
+static void dCCdCC_(Assembler& assembler,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const SolutionVector& curSol,
+ const ElementVolumeVariables& prevElemVolVars,
+ ElementVolumeVariables& curElemVolVars,
+ const ElementFaceVariables& prevElemFaceVars,
+ const ElementFaceVariables& curElemFaceVars,
+ ElementFluxVariablesCache& elemFluxVarsCache,
+ const ElementBoundaryTypes& elemBcTypes,
+ JacobianMatrix& matrix,
+ const NumCellCenterEqVector& ccResidual)
+{
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // build derivatives with for cell center dofs w.r.t. cell center dofs
+ const auto cellCenterGlobalI = assembler.fvGridGeometry().elementMapper().index(element);
+
+ const auto& connectivityMap = assembler.fvGridGeometry().connectivityMap();
+
+ for(const auto& globalJ : connectivityMap(cellCenterIdx, cellCenterIdx, cellCenterGlobalI))
+ {
+ // get the volVars of the element with respect to which we are going to build the derivative
+ auto&& scvJ = fvGeometry.scv(globalJ);
+ const auto elementJ = fvGeometry.fvGridGeometry().element(globalJ);
+ auto& curVolVars = getVolVarAccess(gridVariables.curGridVolVars(), curElemVolVars, scvJ);
+ VolumeVariables origVolVars(curVolVars);
+
+ for(auto pvIdx : PriVarIndices(cellCenterIdx))
+ {
+ PrimaryVariables priVars(CellCenterPrimaryVariables(curSol[cellCenterIdx][globalJ]),
+ FacePrimaryVariables(0.0));
+
+ const Scalar eps = numericEpsilon(priVars[pvIdx], cellCenterIdx, cellCenterIdx);
+ priVars[pvIdx] += eps;
+ ElementSolutionVector elemSol{std::move(priVars)};
+ curVolVars.update(elemSol, problem, elementJ, scvJ);
+
+ const auto deflectedResidual = localResidual.evalCellCenter(problem, element, fvGeometry, prevElemVolVars, curElemVolVars,
+ prevElemFaceVars, curElemFaceVars,
+ elemBcTypes, elemFluxVarsCache);
+
+ auto partialDeriv = (deflectedResidual - ccResidual);
+ partialDeriv /= eps;
+
+ // update the global jacobian matrix with the current partial derivatives
+ updateGlobalJacobian_(matrix[cellCenterIdx][cellCenterIdx], cellCenterGlobalI, globalJ, pvIdx, partialDeriv);
+
+ // restore the original volVars
+ curVolVars = origVolVars;
+ }
+ }
+}
+
+/*!
+* \brief Computes the derivatives of the cell center residuals with respect to face dofs
+*/
+template<class Assembler>
+static void dCCdFace_(Assembler& assembler,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const SolutionVector& curSol,
+ const ElementVolumeVariables& prevElemVolVars,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFaceVariables& prevElemFaceVars,
+ ElementFaceVariables& curElemFaceVars,
+ ElementFluxVariablesCache& elemFluxVarsCache,
+ const ElementBoundaryTypes& elemBcTypes,
+ JacobianMatrix& matrix,
+ const NumCellCenterEqVector& ccResidual)
+{
+ // build derivatives with for cell center dofs w.r.t. face dofs
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+
+ // build derivatives with for cell center dofs w.r.t. cell center dofs
+ const auto cellCenterGlobalI = assembler.fvGridGeometry().elementMapper().index(element);
+
+ for(const auto& scvfJ : scvfs(fvGeometry))
+ {
+ const auto globalJ = scvfJ.dofIndex();
+
+ // get the faceVars of the face with respect to which we are going to build the derivative
+ auto& faceVars = getFaceVarAccess(gridVariables.curGridFaceVars(), curElemFaceVars, scvfJ);
+ const auto origFaceVars(faceVars);
+
+ for(auto pvIdx : PriVarIndices(faceIdx))
+ {
+ FacePrimaryVariables facePriVars(curSol[faceIdx][globalJ]);
+ const Scalar eps = numericEpsilon(facePriVars[pvIdx], cellCenterIdx, faceIdx);
+ facePriVars[pvIdx] += eps;
+
+ faceVars.updateOwnFaceOnly(facePriVars);
+
+ const auto deflectedResidual = localResidual.evalCellCenter(problem, element, fvGeometry,
+ prevElemVolVars, curElemVolVars,
+ prevElemFaceVars, curElemFaceVars,
+ elemBcTypes, elemFluxVarsCache);
+
+ auto partialDeriv = (deflectedResidual - ccResidual);
+ partialDeriv /= eps;
+
+ // update the global jacobian matrix with the current partial derivatives
+ updateGlobalJacobian_(matrix[cellCenterIdx][faceIdx], cellCenterGlobalI, globalJ, pvIdx - Indices::faceOffset, partialDeriv);
+
+ // restore the original faceVars
+ faceVars = origFaceVars;
+ }
+ }
+}
+
+/*!
+* \brief Computes the derivatives of the face residuals with respect to cell center dofs
+*/
+template<class Assembler>
+static void dFacedCC_(Assembler& assembler,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const SolutionVector& curSol,
+ const ElementVolumeVariables& prevElemVolVars,
+ ElementVolumeVariables& curElemVolVars,
+ const ElementFaceVariables& prevElemFaceVars,
+ const ElementFaceVariables& curElemFaceVars,
+ ElementFluxVariablesCache& elemFluxVarsCache,
+ const ElementBoundaryTypes& elemBcTypes,
+ JacobianMatrix& matrix,
+ const FaceSolutionVector& cachedResidual)
+{
+ for(auto&& scvf : scvfs(fvGeometry))
+ {
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ auto& gridVariables = assembler.gridVariables();
+ const auto& connectivityMap = assembler.fvGridGeometry().connectivityMap();
+
+ // set the actual dof index
+ const auto faceGlobalI = scvf.dofIndex();
+
+ // build derivatives with for face dofs w.r.t. cell center dofs
+ for(const auto& globalJ : connectivityMap(faceIdx, cellCenterIdx, scvf.index()))
+ {
+ // get the volVars of the element with respect to which we are going to build the derivative
+ auto&& scvJ = fvGeometry.scv(globalJ);
+ const auto elementJ = fvGeometry.fvGridGeometry().element(globalJ);
+ auto& curVolVars = getVolVarAccess(gridVariables.curGridVolVars(), curElemVolVars, scvJ);
+ VolumeVariables origVolVars(curVolVars);
+
+ for(auto pvIdx : PriVarIndices(cellCenterIdx))
+ {
+ PrimaryVariables priVars(CellCenterPrimaryVariables(curSol[cellCenterIdx][globalJ]),
+ FacePrimaryVariables(0.0));
+
+ const Scalar eps = numericEpsilon(priVars[pvIdx], faceIdx, cellCenterIdx);
+ priVars[pvIdx] += eps;
+ ElementSolutionVector elemSol{std::move(priVars)};
+ curVolVars.update(elemSol, problem, elementJ, scvJ);
+
+ const auto deflectedResidual = localResidual.evalFace(problem, element, fvGeometry, scvf,
+ prevElemVolVars, curElemVolVars,
+ prevElemFaceVars, curElemFaceVars,
+ elemBcTypes, elemFluxVarsCache);
+
+ auto partialDeriv = (deflectedResidual - cachedResidual[scvf.localFaceIdx()]);
+ partialDeriv /= eps;
+
+ // update the global jacobian matrix with the current partial derivatives
+ updateGlobalJacobian_(matrix[faceIdx][cellCenterIdx], faceGlobalI, globalJ, pvIdx, partialDeriv);
+
+ // restore the original volVars
+ curVolVars = origVolVars;
+ }
+ }
+ }
+}
+
+/*!
+* \brief Computes the derivatives of the face residuals with respect to cell center dofs
+*/
+template<class Assembler>
+static void dFacedFace_(Assembler& assembler,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const SolutionVector& curSol,
+ const ElementVolumeVariables& prevElemVolVars,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFaceVariables& prevElemFaceVars,
+ ElementFaceVariables& curElemFaceVars,
+ ElementFluxVariablesCache& elemFluxVarsCache,
+ const ElementBoundaryTypes& elemBcTypes,
+ JacobianMatrix& matrix,
+ const FaceSolutionVector& cachedResidual)
+{
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::FaceIdx faceIdx;
+
+ const auto& problem = assembler.problem();
+ auto& localResidual = assembler.localResidual();
+ const auto& connectivityMap = assembler.fvGridGeometry().connectivityMap();
+ auto& gridVariables = assembler.gridVariables();
+
+ for(auto&& scvf : scvfs(fvGeometry))
+ {
+ // set the actual dof index
+ const auto faceGlobalI = scvf.dofIndex();
+
+ // build derivatives with for face dofs w.r.t. cell center dofs
+ for(const auto& globalJ : connectivityMap(faceIdx, faceIdx, scvf.index()))
+ {
+ // get the faceVars of the face with respect to which we are going to build the derivative
+ auto& faceVars = getFaceVarAccess(gridVariables.curGridFaceVars(), curElemFaceVars, scvf);
+ const auto origFaceVars(faceVars);
+
+ for(auto pvIdx : PriVarIndices(faceIdx))
+ {
+ auto faceSolution = FaceSolution(scvf, curSol[faceIdx], assembler.fvGridGeometry());
+
+ const Scalar eps = numericEpsilon(faceSolution[globalJ][pvIdx], faceIdx, faceIdx);
+
+ faceSolution[globalJ][pvIdx] += eps;
+ faceVars.update(faceSolution, problem, element, fvGeometry, scvf);
+
+ const auto deflectedResidual = localResidual.evalFace(problem, element, fvGeometry, scvf,
+ prevElemVolVars, curElemVolVars,
+ prevElemFaceVars, curElemFaceVars,
+ elemBcTypes, elemFluxVarsCache);
+
+ auto partialDeriv = (deflectedResidual - cachedResidual[scvf.localFaceIdx()]);
+ partialDeriv /= eps;
+
+ // update the global jacobian matrix with the current partial derivatives
+ updateGlobalJacobian_(matrix[faceIdx][faceIdx], faceGlobalI, globalJ, pvIdx - Indices::faceOffset, partialDeriv);
+
+ // restore the original faceVars
+ faceVars = origFaceVars;
+ }
+ }
+ }
+}
+
+
+
+static Scalar numericEpsilon(const Scalar priVar, const int idx1, const int idx2)
+{
+ // define the base epsilon as the geometric mean of 1 and the
+ // resolution of the scalar type. E.g. for standard 64 bit
+ // floating point values, the resolution is about 10^-16 and
+ // the base epsilon is thus approximately 10^-8.
+ /*
+ static const Scalar baseEps
+ = Dumux::geometricMean<Scalar>(std::numeric_limits<Scalar>::epsilon(), 1.0);
+ */
+ using BaseEpsilon = typename GET_PROP(TypeTag, BaseEpsilon);
+ const std::array<std::array<Scalar, 2>, 2> baseEps_ = BaseEpsilon::getEps();
+
+
+ static const Scalar baseEps = baseEps_[idx1][idx2];
+ assert(std::numeric_limits<Scalar>::epsilon()*1e4 < baseEps);
+ // the epsilon value used for the numeric differentiation is
+ // now scaled by the absolute value of the primary variable...
+ return baseEps*(std::abs(priVar) + 1.0);
+}
+
+
+/*!
+ * \brief Updates the current global Jacobian matrix with the
+ * partial derivatives of all equations in regard to the
+ * primary variable 'pvIdx' at dof 'col'. Specialization for cc methods.
+ */
+template<class SubMatrix, class CCOrFacePrimaryVariables>
+static void updateGlobalJacobian_(SubMatrix& matrix,
+ const int globalI,
+ const int globalJ,
+ const int pvIdx,
+ const CCOrFacePrimaryVariables &partialDeriv)
+{
+ for (int eqIdx = 0; eqIdx < partialDeriv.size(); eqIdx++)
+ {
+ // A[i][col][eqIdx][pvIdx] is the rate of change of
+ // the residual of equation 'eqIdx' at dof 'i'
+ // depending on the primary variable 'pvIdx' at dof
+ // 'col'.
+
+ assert(pvIdx >= 0);
+ assert(eqIdx < matrix[globalI][globalJ].size());
+ assert(pvIdx < matrix[globalI][globalJ][eqIdx].size());
+ matrix[globalI][globalJ][eqIdx][pvIdx] += partialDeriv[eqIdx];
+ Valgrind::CheckDefined(matrix[globalI][globalJ][eqIdx][pvIdx]);
+ }
+}
+
+
+
+
+
+private:
+ template<class T = TypeTag>
+ static typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return elemVolVars[scv]; }
+
+ template<class T = TypeTag>
+ static typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return gridVolVars.volVars(scv); }
+
+ template<class T = TypeTag>
+ static typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalFaceVariablesCache), FaceVariables&>::type
+ getFaceVarAccess(GlobalFaceVars& gridFaceVars, ElementFaceVariables& elemFaceVars, const SubControlVolumeFace& scvf)
+ { return elemFaceVars[scvf]; }
+
+ template<class T = TypeTag>
+ static typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalFaceVariablesCache), FaceVariables&>::type
+ getFaceVarAccess(GlobalFaceVars& gridFaceVars, ElementFaceVariables& elemFaceVars, const SubControlVolumeFace& scvf)
+ { return gridFaceVars.faceVars(scvf.index()); }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/common/CMakeLists.txt b/dumux/common/CMakeLists.txt
index ae96888e3071fb347b4e0cc6a830849bef5ae9e6..0c592474f02d951e1d7cce20f7839b7d98f5b6b8 100644
--- a/dumux/common/CMakeLists.txt
+++ b/dumux/common/CMakeLists.txt
@@ -1,3 +1,4 @@
+add_subdirectory(start)
#install headers
install(FILES
diff --git a/dumux/discretization/cellcentered/mpfa/omethodfps/helper.hh b/dumux/common/balanceequationopts.hh
similarity index 67%
rename from dumux/discretization/cellcentered/mpfa/omethodfps/helper.hh
rename to dumux/common/balanceequationopts.hh
index 4ea6e4619d0e05582745d07360141c146a9c6d31..ad401689f282469ce08ae5bc21b5537e770119ac 100644
--- a/dumux/discretization/cellcentered/mpfa/omethodfps/helper.hh
+++ b/dumux/common/balanceequationopts.hh
@@ -18,25 +18,32 @@
*****************************************************************************/
/*!
* \file
- * \brief Helper class to get the required information on an interaction volume.
+ * \brief Class to set options used by the local residual when
+ * when evaluating the balance equations.
*/
-#ifndef DUMUX_DISCRETIZATION_CC_MPFAO_FPS_HELPER_HH
-#define DUMUX_DISCRETIZATION_CC_MPFAO_FPS_HELPER_HH
-
-#include <dumux/discretization/cellcentered/mpfa/omethod/helper.hh>
+#ifndef BALANCE_EQUATION_OPTIONS_HH
+#define BALANCE_EQUATION_OPTIONS_HH
namespace Dumux
{
+
/*!
- * \ingroup Mpfa
- * \brief Helper class to get the required information on an interaction volume.
- * We simply forward to the mpfa-o method here.
+ * \ingroup BC
+ * \brief Class to specify the type of a boundary.
*/
-template<class TypeTag, int dim, int dimWorld>
-class MpfaMethodHelper<TypeTag, MpfaMethods::oMethodFps, dim, dimWorld>
-: public MpfaMethodHelper<TypeTag, MpfaMethods::oMethod, dim, dimWorld>
-{};
+template <class TypeTag>
+class BalanceEquationOptions
+{
+public:
+
+ //! If a certain component is balanced in this model
+ // per default all phases are balanced. See e.g. Richards for an example where
+ // the air component exists but is not balanced. Or the tracer model where the
+ // carrier phase main component exists but is not balanced.
+ static constexpr bool mainComponentIsBalanced(int phaseIdx)
+ { return true; }
+};
-} // end namespace
+}
#endif
diff --git a/dumux/common/basicproperties.hh b/dumux/common/basicproperties.hh
index 304615485c68403b86d51015a7405b845a068a45..b05adb450cc2afa9dabef3675156c1c75d1a7b44 100644
--- a/dumux/common/basicproperties.hh
+++ b/dumux/common/basicproperties.hh
@@ -29,137 +29,48 @@
#include <dune/common/parametertree.hh>
#include <dune/common/fvector.hh>
+#include <dune/grid/common/mcmgmapper.hh>
+
+#include <dune/istl/bvector.hh>
+#include <dune/istl/bcrsmatrix.hh>
+
+#include <dumux/common/balanceequationopts.hh>
#include <dumux/common/propertysystem.hh>
+#include <dumux/common/properties.hh>
+
#include <dumux/common/parameters.hh>
#include <dumux/common/pointsource.hh>
+#include <dumux/common/boundarytypes.hh>
+#include <dumux/io/defaultvtkoutputfields.hh>
#include <dumux/io/gridcreator.hh>
namespace Dumux
{
namespace Properties
{
-///////////////////////////////////
-// Type tag definitions:
-///////////////////////////////////
-
-//! Type tag for all models.
+//! Type tag for numeric models.
NEW_TYPE_TAG(NumericModel);
-/////////////////////////////////////////////
-// Property names which are always available:
-/////////////////////////////////////////////
-
-//! Property to specify the type of scalar values.
-NEW_PROP_TAG(Scalar);
-
-//! Property which provides a Dune::ParameterTree.
-NEW_PROP_TAG(ParameterTree);
-
-//! Property which defines the group that is queried for parameters by default
-NEW_PROP_TAG(ModelParameterGroup);
-
-//! Property which defines the group that is queried for grid (creator) parameters by default
-NEW_PROP_TAG(GridParameterGroup);
-
-//! Property which provides a GridCreator (manages grids)
-NEW_PROP_TAG(GridCreator);
-
-//! The DUNE grid type
-NEW_PROP_TAG(Grid);
-
-//! The number of equations to solve (equal to number of primary variables)
-NEW_PROP_TAG(NumEq);
-
-//! A vector of primary variables
-NEW_PROP_TAG(PrimaryVariables);
-
-//! A vector of size number equations that can be used for
-//! Neumann fluxes, sources, residuals, ...
-NEW_PROP_TAG(NumEqVector);
-
-//! The type of the grid view according to the grid type
-NEW_PROP_TAG(GridView);
-
-//! Property to specify the type of a problem which has to be solved
-NEW_PROP_TAG(Problem);
-
-//! Property defining the type of the model which is used to solve the problem
-NEW_PROP_TAG(Model);
-
-//! Property defining the type of point source used
-NEW_PROP_TAG(PointSource);
-
-//! Property defining the class that computes which sub control volume point sources belong to
-NEW_PROP_TAG(PointSourceHelper);
-
-/*!
- * \brief Specify the maximum size of a time integration [s].
- *
- * The default is to not limit the step size.
- */
-NEW_PROP_TAG(TimeManagerMaxTimeStepSize);
-
-//! Property to define the output level
-NEW_PROP_TAG(VtkOutputLevel);
-
-///////////////////////////////////
-// Default values for properties:
-///////////////////////////////////
-
//! Set the default type of scalar values to double
SET_TYPE_PROP(NumericModel, Scalar, double);
+//! Use the leaf grid view if not defined otherwise
+SET_TYPE_PROP(NumericModel, GridView, typename GET_PROP_TYPE(TypeTag, Grid)::LeafGridView);
+
//! Set the default vector with size number of equations to a field vector
-SET_TYPE_PROP(NumericModel, NumEqVector, Dune::FieldVector<typename GET_PROP_TYPE(TypeTag, Scalar),
- GET_PROP_VALUE(TypeTag, NumEq) >);
+SET_TYPE_PROP(NumericModel, NumEqVector, Dune::FieldVector<typename GET_PROP_TYPE(TypeTag, Scalar), GET_PROP_VALUE(TypeTag, NumEq)>);
//! Set the default primary variable vector to a vector of size of number of equations
SET_TYPE_PROP(NumericModel, PrimaryVariables, typename GET_PROP_TYPE(TypeTag, NumEqVector));
-//! use an unlimited time step size by default
-SET_SCALAR_PROP(NumericModel, TimeManagerMaxTimeStepSize, std::numeric_limits<typename GET_PROP_TYPE(TypeTag,Scalar)>::max());
-
-//! Set the ParameterTree property
-SET_PROP(NumericModel, ParameterTree)
-{
- typedef Dune::ParameterTree type;
-
- static Dune::ParameterTree &tree()
- {
- static Dune::ParameterTree obj_;
- return obj_;
- }
-
- static Dune::ParameterTree &compileTimeParams()
- {
- static Dune::ParameterTree obj_;
- return obj_;
- }
-
- static Dune::ParameterTree &runTimeParams()
- {
- static Dune::ParameterTree obj_;
- return obj_;
- }
-
- static Dune::ParameterTree &deprecatedRunTimeParams()
- {
- static Dune::ParameterTree obj_;
- return obj_;
- }
-
- static Dune::ParameterTree &unusedNewRunTimeParams()
- {
- static Dune::ParameterTree obj_;
- return obj_;
- }
-};
-
//! use the global group as default for the model's parameter group
SET_STRING_PROP(NumericModel, ModelParameterGroup, "");
-//! use the Grid group as default for the grid parameter group
-SET_STRING_PROP(NumericModel, GridParameterGroup, "Grid");
+//! do not specific any model-specific default parameters here
+SET_PROP(NumericModel, ModelDefaultParameters)
+{
+ static void defaultParams(Dune::ParameterTree& tree, const std::string& group = "") { }
+};
//! Use the DgfGridCreator by default
SET_TYPE_PROP(NumericModel, GridCreator, GridCreator<TypeTag>);
@@ -173,6 +84,53 @@ SET_TYPE_PROP(NumericModel, PointSourceHelper, BoundingBoxTreePointSourceHelper<
//! Set default output level to 0 -> only primary variables are added to output
SET_INT_PROP(NumericModel, VtkOutputLevel, 0);
+//! Set the default to a function throwing a NotImplemented error
+SET_TYPE_PROP(NumericModel, VtkOutputFields, DefaultVtkOutputFields);
+
+//! Mapper for the grid view's vertices.
+#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
+SET_TYPE_PROP(NumericModel,
+ VertexMapper,
+ Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView)>);
+#else
+SET_TYPE_PROP(NumericModel,
+ VertexMapper,
+ Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView),
+ Dune::MCMGVertexLayout>);
+#endif
+
+//! Mapper for the grid view's elements.
+#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
+SET_TYPE_PROP(NumericModel,
+ ElementMapper,
+ Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView)>);
+#else
+SET_TYPE_PROP(NumericModel,
+ ElementMapper,
+ Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView),
+ Dune::MCMGElementLayout>);
+#endif
+
+//! The type of a solution for the whole grid at a fixed time
+SET_TYPE_PROP(NumericModel, SolutionVector, Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, PrimaryVariables)>);
+
+//! Set the type of a global jacobian matrix from the solution types
+SET_PROP(NumericModel, JacobianMatrix)
+{
+private:
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
+ using MatrixBlock = typename Dune::FieldMatrix<Scalar, numEq, numEq>;
+public:
+ using type = typename Dune::BCRSMatrix<MatrixBlock>;
+};
+
+//! Boundary types at a single degree of freedom
+SET_TYPE_PROP(NumericModel, BoundaryTypes, BoundaryTypes<GET_PROP_VALUE(TypeTag, NumEq)>);
+
+//! Set the default class for the balance equation options
+SET_TYPE_PROP(NumericModel, BalanceEqOpts, BalanceEquationOptions<TypeTag>);
+
} // namespace Properties
} // namespace Dumux
diff --git a/dumux/implicit/problem.hh b/dumux/common/fvproblem.hh
similarity index 53%
rename from dumux/implicit/problem.hh
rename to dumux/common/fvproblem.hh
index 1b12e536bc7cdda2e39d7d27bd97632cc6bc3475..e05e831ca9e8a5f9a72f62b52fc81eed86197403 100644
--- a/dumux/implicit/problem.hh
+++ b/dumux/common/fvproblem.hh
@@ -18,54 +18,53 @@
*****************************************************************************/
/*!
* \file
- * \brief Base class for all fully implicit problems
+ * \brief Base class for all problems
*/
-#ifndef DUMUX_IMPLICIT_PROBLEM_HH
-#define DUMUX_IMPLICIT_PROBLEM_HH
+#ifndef DUMUX_FV_PROBLEM_HH
+#define DUMUX_FV_PROBLEM_HH
-#include "properties.hh"
-#include "model.hh"
+#include <memory>
-#include <dumux/io/restart.hh>
+#include <dune/common/version.hh>
+#include <dune/common/fvector.hh>
+#include <dune/grid/common/gridenums.hh>
-#include <dumux/implicit/adaptive/gridadapt.hh>
-#include <dumux/common/boundingboxtree.hh>
+#include <dumux/common/properties.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/parallel/vertexhandles.hh>
+#include <dumux/discretization/methods.hh>
-#include <dune/common/version.hh>
+//#include <dumux/io/restart.hh>
+//#include <dumux/implicit/adaptive/gridadapt.hh>
namespace Dumux
{
/*!
- * \ingroup ImplicitBaseProblems
- * \brief Base class for all fully implicit problems
+ * \ingroup Problems
+ * \brief Base class for all finite-volume problems
*
- * \note All quantities are specified assuming a threedimensional
- * world. Problems discretized using 2D grids are assumed to be
- * extruded by \f$1 m\f$ and 1D grids are assumed to have a
- * cross section of \f$1m \times 1m\f$.
+ * \note All quantities (regarding the units) are specified assuming a
+ * three-dimensional world. Problems discretized using 2D grids
+ * are assumed to be extruded by \f$1 m\f$ and 1D grids are assumed
+ * to have a cross section of \f$1m \times 1m\f$.
*/
template<class TypeTag>
-class ImplicitProblem
+class FVProblem
{
using Implementation = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using IndexType = typename GridView::IndexSet::IndexType;
- using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
- using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
- using NewtonMethod = typename GET_PROP_TYPE(TypeTag, NewtonMethod);
- using NewtonController = typename GET_PROP_TYPE(TypeTag, NewtonController);
- using Model = typename GET_PROP_TYPE(TypeTag, Model);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
- using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
- using ElementMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using PointSource = typename GET_PROP_TYPE(TypeTag, PointSource);
using PointSourceHelper = typename GET_PROP_TYPE(TypeTag, PointSourceHelper);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
@@ -76,100 +75,72 @@ class ImplicitProblem
using Element = typename GridView::template Codim<0>::Entity;
using Vertex = typename GridView::template Codim<dim>::Entity;
- using Intersection = typename GridView::Intersection;
using CoordScalar = typename GridView::ctype;
using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dim : 0 };
-
- enum { adaptiveGrid = GET_PROP_VALUE(TypeTag, AdaptiveGrid) };
-
- using GridAdaptModel = ImplicitGridAdapt<TypeTag, adaptiveGrid>;
- using BoundingBoxTree = Dumux::BoundingBoxTree<GridView>;
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
- using VtkOutputModule = typename GET_PROP_TYPE(TypeTag, VtkOutputModule);
-
- // copying a problem is not a good idea
- ImplicitProblem(const ImplicitProblem &);
+ // using GridAdaptModel = ImplicitGridAdapt<TypeTag, adaptiveGrid>;
public:
/*!
* \brief Constructor
*
- * \param timeManager The TimeManager which is used by the simulation
* \param gridView The simulation's idea about physical space
*/
- ImplicitProblem(TimeManager &timeManager, const GridView &gridView)
- : gridView_(gridView)
- , bBoxMin_(std::numeric_limits<double>::max())
- , bBoxMax_(-std::numeric_limits<double>::max())
-#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
- , elementMapper_(gridView, Dune::mcmgElementLayout())
- , vertexMapper_(gridView, Dune::mcmgVertexLayout())
-#else
- , elementMapper_(gridView)
- , vertexMapper_(gridView)
-#endif
- , timeManager_(&timeManager)
- , newtonMethod_(asImp_())
- , newtonCtl_(asImp_())
-
+ FVProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : fvGridGeometry_(fvGridGeometry)
{
- // calculate the bounding box of the local partition of the grid view
- for (const auto& vertex : vertices(gridView)) {
- for (int i=0; i<dimWorld; i++) {
- using std::min;
- using std::max;
- bBoxMin_[i] = min(bBoxMin_[i], vertex.geometry().corner(0)[i]);
- bBoxMax_[i] = max(bBoxMax_[i], vertex.geometry().corner(0)[i]);
- }
- }
-
- // communicate to get the bounding box of the whole domain
- if (gridView.comm().size() > 1)
- for (int i = 0; i < dimWorld; ++i) {
- bBoxMin_[i] = gridView.comm().min(bBoxMin_[i]);
- bBoxMax_[i] = gridView.comm().max(bBoxMax_[i]);
- }
-
// set a default name for the problem
- simName_ = "sim";
- maxTimeStepSize_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, MaxTimeStepSize);
+ problemName_ = getParamFromGroup<std::string>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Problem.Name");
+
+ // TODO this has to be moved to the main file most probably
+ // // if we are calculating on an adaptive grid get the grid adapt model
+ // if (adaptiveGrid)
+ // gridAdapt_ = std::make_shared<GridAdaptModel>(asImp_());
+ // gridAdapt().init();
- // if we are calculating on an adaptive grid get the grid adapt model
- if (adaptiveGrid)
- gridAdapt_ = std::make_shared<GridAdaptModel>(asImp_());
+ // compute which scvs contain point sources
+ computePointSourceMap(pointSourceMap_);
}
/*!
- * \brief Called by the TimeManager in order to
- * initialize the problem.
+ * \brief The problem name.
*
- * If you overload this method don't forget to call
- * ParentType::init()
+ * This is used as a prefix for files generated by the simulation.
+ * It could be either overwritten by the problem files, or simply
+ * declared over the setName() function in the application file.
*/
- void init()
+ const std::string& name() const
{
- vtkOutputModule_ = std::make_shared<VtkOutputModule>(asImp_());
-
- // set the initial condition of the model
- model().init(asImp_());
+ return problemName_;
+ }
- // initialize grid adapt model if we have an adaptive grid
- if (adaptiveGrid)
- {
- gridAdapt().init();
- }
- computePointSourceMap_();
+ /*!
+ * \brief Set the problem name.
+ *
+ * This static method sets the simulation name, which should be
+ * called before the application problem is declared! If not, the
+ * default name "sim" will be used.
+ *
+ * \param newName The problem's name
+ */
+ void setName(const std::string& newName)
+ {
+ problemName_ = newName;
}
+ /*!
+ * \name Boundary conditions and sources defining the problem
+ */
+ // \{
+
/*!
* \brief Specifies which kind of boundary condition should be
* used for which equation on a given boundary segment.
*
- * \param values The boundary types for the conservation equations
- * \param vertex The vertex for which the boundary type is set
+ * \param element The finite element
+ * \param scv The sub control volume
*/
BoundaryTypes boundaryTypes(const Element &element,
const SubControlVolume &scv) const
@@ -186,8 +157,8 @@ public:
* \brief Specifies which kind of boundary condition should be
* used for which equation on a given boundary segment.
*
- * \param values The boundary types for the conservation equations
- * \param intersection The intersection for which the boundary type is set
+ * \param element The finite element
+ * \param scvf The sub control volume face
*/
BoundaryTypes boundaryTypes(const Element &element,
const SubControlVolumeFace &scvf) const
@@ -204,7 +175,6 @@ public:
* \brief Specifies which kind of boundary condition should be
* used for which equation on a given boundary segment.
*
- * \param values The boundary types for the conservation equations
* \param globalPos The position of the finite volume in global coordinates
*/
BoundaryTypes boundaryTypesAtPos(const GlobalPosition &globalPos) const
@@ -220,8 +190,8 @@ public:
* \brief Evaluate the boundary conditions for a dirichlet
* control volume.
*
- * \param values The dirichlet values for the primary variables
- * \param scvFace the sub control volume face
+ * \param element The finite element
+ * \param scvf the sub control volume face
*
* The method returns the boundary types information.
*/
@@ -279,19 +249,17 @@ public:
* \f$ [ \textnormal{unit of conserved quantity} / (m^2 \cdot s )] \f$
* \param element The finite element
* \param fvGeometry The finite-volume geometry
- * \param intersection The intersection between element and boundary
- * \param scvIdx The local subcontrolvolume index
- * \param boundaryFaceIdx The index of the boundary face
* \param elemVolVars All volume variables for the element
+ * \param scvf The sub control volume face
*
* For this method, the \a values parameter stores the flux
* in normal direction of each phase. Negative values mean influx.
* E.g. for the mass balance that would the mass flux in \f$ [ kg / (m^2 \cdot s)] \f$.
*/
- PrimaryVariables neumann(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolvars,
- const SubControlVolumeFace& scvf) const
+ ResidualVector neumann(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolvars,
+ const SubControlVolumeFace& scvf) const
{
// forward it to the interface with only the global position
return asImp_().neumannAtPos(scvf.ipGlobal());
@@ -301,19 +269,17 @@ public:
* \brief Evaluate the boundary conditions for a neumann
* boundary segment.
*
- * \param values The neumann values for the conservation equations in units of
- * \f$ [ \textnormal{unit of conserved quantity} / (m^2 \cdot s )] \f$
* \param globalPos The position of the boundary face's integration point in global coordinates
*
* For this method, the \a values parameter stores the flux
* in normal direction of each phase. Negative values mean influx.
* E.g. for the mass balance that would be the mass flux in \f$ [ kg / (m^2 \cdot s)] \f$.
*/
- PrimaryVariables neumannAtPos(const GlobalPosition &globalPos) const
+ ResidualVector neumannAtPos(const GlobalPosition &globalPos) const
{
//! As a default, i.e. if the user's problem does not overload any neumann method
//! return no-flow Neumann boundary conditions at all Neumann boundaries
- return PrimaryVariables(0.0);
+ return ResidualVector(0.0);
}
/*!
@@ -324,22 +290,20 @@ public:
* potentially solution dependent and requires some quantities that
* are specific to the fully-implicit method.
*
- * \param values The source and sink values for the conservation equations in units of
- * \f$ [ \textnormal{unit of conserved quantity} / (m^3 \cdot s )] \f$
* \param element The finite element
* \param fvGeometry The finite-volume geometry
* \param elemVolVars All volume variables for the element
- * \param scv The subcontrolvolume
+ * \param scv The sub control volume
*
* For this method, the \a values parameter stores the conserved quantity rate
* generated or annihilate per volume unit. Positive values mean
* that the conserved quantity is created, negative ones mean that it vanishes.
* E.g. for the mass balance that would be a mass rate in \f$ [ kg / (m^3 \cdot s)] \f$.
*/
- PrimaryVariables source(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolume &scv) const
+ ResidualVector source(const Element &element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolume &scv) const
{
// forward to solution independent, fully-implicit specific interface
return asImp_().sourceAtPos(scv.center());
@@ -349,8 +313,6 @@ public:
* \brief Evaluate the source term for all phases within a given
* sub-control-volume.
*
- * \param values The source and sink values for the conservation equations in units of
- * \f$ [ \textnormal{unit of conserved quantity} / (m^3 \cdot s )] \f$
* \param globalPos The position of the center of the finite volume
* for which the source term ought to be
* specified in global coordinates
@@ -360,11 +322,11 @@ public:
* that the conserved quantity is created, negative ones mean that it vanishes.
* E.g. for the mass balance that would be a mass rate in \f$ [ kg / (m^3 \cdot s)] \f$.
*/
- PrimaryVariables sourceAtPos(const GlobalPosition &globalPos) const
+ ResidualVector sourceAtPos(const GlobalPosition &globalPos) const
{
//! As a default, i.e. if the user's problem does not overload any source method
//! return 0.0 (no source terms)
- return PrimaryVariables(0.0);
+ return ResidualVector(0.0);
}
/*!
@@ -390,11 +352,11 @@ public:
* solution dependent and requires some quantities that
* are specific to the fully-implicit method.
*
- * \param pointSource A single point source
+ * \param source A single point source
* \param element The finite element
* \param fvGeometry The finite-volume geometry
- * \param scvIdx The local subcontrolvolume index
* \param elemVolVars All volume variables for the element
+ * \param scv The sub control volume
*
* For this method, the \a values() method of the point sources returns
* the absolute conserved quantity rate generated or annihilate in
@@ -430,17 +392,107 @@ public:
void pointSourceAtPos(PointSource& pointSource,
const GlobalPosition &globalPos) const {}
+ /*!
+ * \brief Adds contribution of point sources for a specific sub control volume
+ * to the values.
+ * Caution: Only overload this method in the implementation if you know
+ * what you are doing.
+ */
+ ResidualVector scvPointSources(const Element &element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolume &scv) const
+ {
+ ResidualVector source(0);
+ auto scvIdx = scv.indexInElement();
+ auto key = std::make_pair(fvGridGeometry_->gridView().indexSet().index(element), scvIdx);
+ if (pointSourceMap_.count(key))
+ {
+ // call the solDependent function. Herein the user might fill/add values to the point sources
+ // we make a copy of the local point sources here
+ auto pointSources = pointSourceMap_.at(key);
+
+ // Add the contributions to the dof source values
+ // We divide by the volume. In the local residual this will be multiplied with the same
+ // factor again. That's because the user specifies absolute values in kg/s.
+ const Scalar volume = scv.volume()*elemVolVars[scv].extrusionFactor();
+
+ for (auto&& pointSource : pointSources)
+ {
+ // Note: two concepts are implemented here. The PointSource property can be set to a
+ // customized point source function achieving variable point sources,
+ // see TimeDependentPointSource for an example. The second imitated the standard
+ // dumux source interface with solDependentPointSource / pointSourceAtPos, methods
+ // that can be overloaded in the actual problem class also achieving variable point sources.
+ // The first one is more convenient for simple function like a time dependent source.
+ // The second one might be more convenient for e.g. a solution dependent point source.
+
+ // we do an update e.g. used for TimeDependentPointSource
+ pointSource.update(asImp_(), element, fvGeometry, elemVolVars, scv);
+ // call convienience problem interface function
+ asImp_().pointSource(pointSource, element, fvGeometry, elemVolVars, scv);
+ // at last take care about multiplying with the correct volume
+ pointSource /= volume;
+ // add the point source values to the local residual
+ source += pointSource.values();
+ }
+ }
+
+ return source;
+ }
+
+ //! Compute the point source map, i.e. which scvs have point source contributions
+ template<class PointSourceMap>
+ void computePointSourceMap(PointSourceMap& pointSourceMap)
+ {
+ // clear the given point source maps in case it's not empty
+ pointSourceMap.clear();
+
+ // get and apply point sources if any given in the problem
+ std::vector<PointSource> sources;
+ asImp_().addPointSources(sources);
+
+ // if there are point sources compute the DOF to point source map
+ if (!sources.empty())
+ {
+ // calculate point source locations and save them in a map
+ PointSourceHelper::computePointSourceMap(*fvGridGeometry_,
+ sources,
+ pointSourceMap);
+ }
+ }
/*!
- * \brief Evaluate the initial value for an element (for cc models) or vertex (for box models)
+ * \brief Applies the initial solution for all degrees of freedom of the grid.
*
- * \param entity The entity (element or vertex)
+ */
+ void applyInitialSolution(SolutionVector& sol) const
+ {
+ // set the initial values by forwarding to a specialized method
+ applyInitialSolutionImpl_(sol, std::integral_constant<bool, isBox>());
+
+ // add up the primary variables which cross process borders
+ if (isBox && fvGridGeometry_->gridView().comm().size() > 1)
+ {
+ VertexHandleSum<PrimaryVariables, SolutionVector, VertexMapper>
+ sumPVHandle(sol, fvGridGeometry_->vertexMapper());
+ fvGridGeometry_->gridView().communicate(sumPVHandle,
+ Dune::InteriorBorder_InteriorBorder_Interface,
+ Dune::ForwardCommunication);
+ }
+ }
+
+ /*!
+ * \brief Evaluate the initial value for
+ * an element (for cell-centered models)
+ * or vertex (for box / vertex-centered models)
+ *
+ * \param entity The dof entity (element or vertex)
*/
template<class Entity>
- PrimaryVariables initial(const Entity& entity)
+ PrimaryVariables initial(const Entity& entity) const
{
static_assert(int(Entity::codimension) == 0 || int(Entity::codimension) == dim, "Entity must be element or vertex");
-
return asImp_().initialAtPos(entity.geometry().center());
}
@@ -491,6 +543,8 @@ public:
return 1.0;
}
+ // \}
+
/*!
* \name Simulation steering
*/
@@ -499,288 +553,62 @@ public:
/*!
* \brief Called by the time manager before the time integration.
*/
- void preTimeStep()
- {
- // If adaptivity is used, this method adapts the grid.
- // Remeber to call the parent class function if this is overwritten
- // on a lower problem level when using an adaptive grid
- if (adaptiveGrid && timeManager().timeStepIndex() > 0)
- {
- this->gridAdapt().adaptGrid();
-
- // if the grid changed recompute the source map and the bounding box tree
- if (asImp_().gridChanged())
- {
- // update bounding box tree if it exists
- if (boundingBoxTree_)
- boundingBoxTree_ = std::make_shared<BoundingBoxTree>(gridView_);
- computePointSourceMap_();
- }
- }
- }
-
- /*!
- * \brief Called by TimeManager in order to do a time
- * integration on the model.
- */
- void timeIntegration()
- {
- const int maxFails =
- GET_PARAM_FROM_GROUP(TypeTag, int, Implicit, MaxTimeStepDivisions);
- for (int i = 0; i < maxFails; ++i) {
- if (model_.update(newtonMethod_, newtonCtl_))
- return;
-
- Scalar dt = timeManager().timeStepSize();
- Scalar nextDt = dt / 2;
- timeManager().setTimeStepSize(nextDt);
-
- // update failed
- std::cout << "Newton solver did not converge with dt="<<dt<<" seconds. Retrying with time step of "
- << nextDt << " seconds\n";
- }
-
- // if the simulation run is about to abort, write restart files for the current and previous time steps:
- // write restart file for the current time step
- serialize();
-
- //write restart file for the previous time step:
- //set the time manager and the solution vector to the previous time step
- const Scalar time = timeManager().time();
- timeManager().setTime(time - timeManager().previousTimeStepSize());
- const auto curSol = model_.curSol();
- model_.curSol() = model_.prevSol();
- //write restart file
- serialize();
- //reset time manager and solution vector
- model_.curSol() = curSol;
- timeManager().setTime(time);
-
- DUNE_THROW(Dune::MathError,
- "Newton solver didn't converge after "
- << maxFails
- << " time-step divisions. dt="
- << timeManager().timeStepSize()
- << ".\nThe solutions of the current and the previous time steps "
- << "have been saved to restart files.");
- }
-
- /*!
- * \brief Returns the newton method object
- */
- NewtonMethod &newtonMethod()
- { return newtonMethod_; }
-
- /*!
- * \copydoc newtonMethod()
- */
- const NewtonMethod &newtonMethod() const
- { return newtonMethod_; }
-
- /*!
- * \brief Returns the newton contoller object
- */
- NewtonController &newtonController()
- { return newtonCtl_; }
-
- /*!
- * \copydoc newtonController()
- */
- const NewtonController &newtonController() const
- { return newtonCtl_; }
-
- /*!
- * \brief Called by TimeManager whenever a solution for a
- * time step has been computed and the simulation time has
- * been updated.
- *
- * \param dt The current time-step size
- */
- Scalar nextTimeStepSize(const Scalar dt)
- {
- return newtonCtl_.suggestTimeStepSize(dt);
- }
-
- /*!
- * \brief Returns true if a restart file should be written to
- * disk.
- *
- * The default behavior is to write one restart file every 5 time
- * steps. This file is intended to be overwritten by the
- * implementation.
- */
- bool shouldWriteRestartFile() const
- {
- return timeManager().timeStepIndex() > 0 &&
- (timeManager().timeStepIndex() % 10 == 0);
- }
-
- /*!
- * \brief Returns true if the current solution should be written to
- * disk (i.e. as a VTK file)
- *
- * The default behavior is to write out the solution for
- * every time step. This function is intended to be overwritten by the
- * implementation.
- */
- bool shouldWriteOutput() const
- { return true; }
-
- /*!
- * \brief Returns the user specified maximum time step size
- *
- * Overload in problem for custom needs.
- */
- Scalar maxTimeStepSize() const
- {
- return maxTimeStepSize_;
- }
-
- /*!
- * \brief Called by the time manager after the time integration to
- * do some post processing on the solution.
- */
- void postTimeStep()
- { }
-
- /*!
- * \brief Called by the time manager after everything which can be
- * done about the current time step is finished and the
- * model should be prepared to do the next time integration.
- */
- void advanceTimeLevel()
- {
- model_.advanceTimeLevel();
- }
-
- /*!
- * \brief Called when the end of an simulation episode is reached.
- *
- * Typically a new episode should be started in this method.
- */
- void episodeEnd()
- {
- std::cerr << "The end of an episode is reached, but the problem "
- << "does not override the episodeEnd() method. "
- << "Doing nothing!\n";
- }
- // \}
-
- /*!
- * \brief The problem name.
- *
- * This is used as a prefix for files generated by the simulation.
- * It could be either overwritten by the problem files, or simply
- * declared over the setName() function in the application file.
- */
- const std::string& name() const
- {
- return simName_;
- }
-
- /*!
- * \brief Set the problem name.
- *
- * This static method sets the simulation name, which should be
- * called before the application problem is declared! If not, the
- * default name "sim" will be used.
- *
- * \param newName The problem's name
- */
- void setName(const std::string& newName)
- {
- simName_ = newName;
- }
-
- /*!
- * \brief The GridView which used by the problem.
- */
- const GridView &gridView() const
- { return gridView_; }
-
- /*!
- * \brief The coordinate of the corner of the GridView's bounding
- * box with the smallest values.
- */
- const GlobalPosition &bBoxMin() const
- { return bBoxMin_; }
-
- /*!
- * \brief The coordinate of the corner of the GridView's bounding
- * box with the largest values.
- */
- const GlobalPosition &bBoxMax() const
- { return bBoxMax_; }
-
- /*!
- * \brief Determines if globalPos is a corner of the grid, this is needed for
- * the multidomain models.
- *
- * \param globalPos The global position
- * \param eps The epsilon for comparing the locations
- */
- bool isCornerPoint(const GlobalPosition &globalPos, Scalar eps = 1e-8)
- {
- for (unsigned int dimIdx = 0; dimIdx < dimWorld; dimIdx++)
- {
- if (!(globalPos[dimIdx] < asImp_().bBoxMin()[dimIdx] + eps
- || globalPos[dimIdx] > asImp_().bBoxMax()[dimIdx] - eps))
- return false;
- }
- return true;
- }
-
- /*!
- * \brief Returns the mapper for vertices to indices for constant grids.
- */
- const VertexMapper &vertexMapper() const
- { return vertexMapper_; }
-
- /*!
- * \brief Returns the mapper for elements to indices for constant grids.
- */
- const ElementMapper &elementMapper() const
- { return elementMapper_; }
-
- /*!
- * \brief Returns the mapper for vertices to indices for possibly adaptive grids.
- */
- VertexMapper &vertexMapper()
- { return vertexMapper_; }
-
- /*!
- * \brief Returns the mapper for elements to indices for possibly adaptive grids.
- */
- ElementMapper &elementMapper()
- { return elementMapper_; }
-
- /*!
- * \brief Returns TimeManager object used by the simulation
- */
- TimeManager &timeManager()
- { return *timeManager_; }
-
- /*!
- * \copydoc timeManager()
- */
- const TimeManager &timeManager() const
- { return *timeManager_; }
-
- /*!
- * \brief Returns numerical model used for the problem.
- */
- Model &model()
- { return model_; }
-
- /*!
- * \copydoc model()
- */
- const Model &model() const
- { return model_; }
+ // TODO most likely move to the main file
+ // void preTimeStep()
+ // {
+ // // If adaptivity is used, this method adapts the grid.
+ // // Remeber to call the parent class function if this is overwritten
+ // // on a lower problem level when using an adaptive grid
+ // if (adaptiveGrid && timeManager().timeStepIndex() > 0)
+ // {
+ // this->gridAdapt().adaptGrid();
+
+ // // if the grid changed recompute the source map and the bounding box tree
+ // if (asImp_().gridChanged())
+ // {
+ // computePointSourceMap();
+ // }
+ // }
+ // }
+
+ /*!
+ * \brief TODO serialization
+ */
+ // void timeIntegration()
+ // {
+ // // if the simulation run is about to abort, write restart files for the current and previous time steps:
+ // // write restart file for the current time step
+ // serialize();
+
+ // //write restart file for the previous time step:
+ // //set the time manager and the solution vector to the previous time step
+ // const Scalar time = timeManager().time();
+ // timeManager().setTime(time - timeManager().previousTimeStepSize());
+ // const auto curSol = model_.curSol();
+ // model_.curSol() = model_.prevSol();
+ // //write restart file
+ // serialize();
+ // //reset time manager and solution vector
+ // model_.curSol() = curSol;
+ // timeManager().setTime(time);
+ // }
+
+ // TODO could be move to the episode manager that is user implemented?
+ // /*!
+ // * \brief Called when the end of an simulation episode is reached.
+ // *
+ // * Typically a new episode should be started in this method.
+ // */
+ // void episodeEnd()
+ // {
+ // std::cerr << "The end of an episode is reached, but the problem "
+ // << "does not override the episodeEnd() method. "
+ // << "Doing nothing!\n";
+ // }
// \}
/*!
- * \name Restart mechanism
+ * \name TODO: Restart mechanism
*/
// \{
@@ -793,18 +621,18 @@ public:
* name and uses the extension <tt>.drs</tt>. (Dumux ReStart
* file.) See Restart for details.
*/
- void serialize()
- {
- typedef Restart Restarter;
- Restarter res;
- res.serializeBegin(asImp_());
- if (gridView().comm().rank() == 0)
- std::cout << "Serialize to file '" << res.fileName() << "'\n";
-
- timeManager().serialize(res);
- asImp_().serialize(res);
- res.serializeEnd();
- }
+ // void serialize()
+ // {
+ // typedef Restart Restarter;
+ // Restarter res;
+ // res.serializeBegin(asImp_());
+ // if (gridView().comm().rank() == 0)
+ // std::cout << "Serialize to file '" << res.fileName() << "'\n";
+
+ // timeManager().serialize(res);
+ // asImp_().serialize(res);
+ // res.serializeEnd();
+ // }
/*!
* \brief This method writes the complete state of the problem
@@ -819,12 +647,12 @@ public:
*
* \param res The serializer object
*/
- template <class Restarter>
- void serialize(Restarter &res)
- {
- vtkOutputModule_->serialize(res);
- model().serialize(res);
- }
+ // template <class Restarter>
+ // void serialize(Restarter &res)
+ // {
+ // vtkOutputModule_->serialize(res);
+ // model().serialize(res);
+ // }
/*!
* \brief Load a previously saved state of the whole simulation
@@ -833,19 +661,19 @@ public:
* \param tRestart The simulation time on which the program was
* written to disk.
*/
- void restart(const Scalar tRestart)
- {
- typedef Restart Restarter;
+ // void restart(const Scalar tRestart)
+ // {
+ // typedef Restart Restarter;
- Restarter res;
+ // Restarter res;
- res.deserializeBegin(asImp_(), tRestart);
- if (gridView().comm().rank() == 0)
- std::cout << "Deserialize from file '" << res.fileName() << "'\n";
- timeManager().deserialize(res);
- asImp_().deserialize(res);
- res.deserializeEnd();
- }
+ // res.deserializeBegin(asImp_(), tRestart);
+ // if (gridView().comm().rank() == 0)
+ // std::cout << "Deserialize from file '" << res.fileName() << "'\n";
+ // timeManager().deserialize(res);
+ // asImp_().deserialize(res);
+ // res.deserializeEnd();
+ // }
/*!
* \brief This method restores the complete state of the problem
@@ -857,140 +685,16 @@ public:
*
* \param res The deserializer object
*/
- template <class Restarter>
- void deserialize(Restarter &res)
- {
- vtkOutputModule_->deserialize(res);
- model().deserialize(res);
- }
+ // template <class Restarter>
+ // void deserialize(Restarter &res)
+ // {
+ // vtkOutputModule_->deserialize(res);
+ // model().deserialize(res);
+ // }
// \}
- /*!
- * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
- */
- void addVtkOutputFields(VtkOutputModule& outputModule) const
- {}
-
- /*!
- * \brief Write the relevant secondary variables of the current
- * solution into an VTK output file.
- */
- void writeOutput(const bool verbose = true)
- {
- // write the current result to disk
- if (verbose && gridView().comm().rank() == 0)
- std::cout << "Writing result file for \"" << asImp_().name() << "\"\n";
-
- vtkOutputModule_->write(timeManager().time() + timeManager().timeStepSize());
- }
-
- /*!
- * \brief Returns a reference to the grid
- */
- Grid &grid()
- {
- return GridCreator::grid();
- }
-
- /*!
- * \brief Returns whether the grid has changed
- */
- bool gridChanged() const
- {
- if (adaptiveGrid)
- return asImp_().gridAdapt().wasAdapted();
- else
- return false;
- }
-
- /*!
- * \brief Returns adaptivity model used for the problem.
- */
- GridAdaptModel& gridAdapt()
- {
- return *gridAdapt_;
- }
-
- /*!
- * \brief Returns adaptivity model used for the problem.
- */
- const GridAdaptModel& gridAdapt() const
- {
- return *gridAdapt_;
- }
-
- /*!
- * \brief Returns the bounding box tree of the grid
- */
- BoundingBoxTree& boundingBoxTree()
- {
- if(!boundingBoxTree_)
- boundingBoxTree_ = std::make_shared<BoundingBoxTree>(gridView_);
-
- return *boundingBoxTree_;
- }
-
- /*!
- * \brief Returns the bounding box tree of the grid
- */
- const BoundingBoxTree& boundingBoxTree() const
- {
- if(!boundingBoxTree_)
- DUNE_THROW(Dune::InvalidStateException, "BoundingBoxTree was not initialized in the problem yet!");
-
- return *boundingBoxTree_;
- }
-
- /*!
- * \brief Adds contribution of point sources for a specific sub control volume
- * to the values.
- * Caution: Only overload this method in the implementation if you know
- * what you are doing.
- */
- PrimaryVariables scvPointSources(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolume &scv) const
- {
- PrimaryVariables source(0);
- auto scvIdx = scv.indexInElement();
- auto key = std::make_pair(this->gridView().indexSet().index(element), scvIdx);
- if (pointSourceMap_.count(key))
- {
- // call the solDependent function. Herein the user might fill/add values to the point sources
- // we make a copy of the local point sources here
- auto pointSources = pointSourceMap_.at(key);
-
- // Add the contributions to the dof source values
- // We divide by the volume. In the local residual this will be multiplied with the same
- // factor again. That's because the user specifies absolute values in kg/s.
- const Scalar volume = scv.volume()*elemVolVars[scv].extrusionFactor();
-
- for (auto&& pointSource : pointSources)
- {
- // Note: two concepts are implemented here. The PointSource property can be set to a
- // customized point source function achieving variable point sources,
- // see TimeDependentPointSource for an example. The second imitated the standard
- // dumux source interface with solDependentPointSource / pointSourceAtPos, methods
- // that can be overloaded in the actual problem class also achieving variable point sources.
- // The first one is more convenient for simple function like a time dependent source.
- // The second one might be more convenient for e.g. a solution dependent point source.
-
- // we do an update e.g. used for TimeDependentPointSource
- pointSource.update(asImp_(), element, fvGeometry, elemVolVars, scv);
- // call convienience problem interface function
- asImp_().pointSource(pointSource, element, fvGeometry, elemVolVars, scv);
- // at last take care about multiplying with the correct volume
- pointSource /= volume;
- // add the point source values to the local residual
- source += pointSource.values();
- }
- }
-
- return source;
- }
-
+ // TODO this can probably be a setter function for the assembler
/*!
* \brief Function to add additional DOF dependencies, i.e. the residual of DOF globalIdx depends
* on additional DOFs not included in the discretization schemes' occupation pattern
@@ -1002,9 +706,10 @@ public:
* This function is used when creating the matrix and when computing entries of the jacobian matrix
* Per default we don't have additional DOFs
*/
- std::vector<IndexType> getAdditionalDofDependencies(IndexType globalIdx) const
- { return std::vector<IndexType>(); }
+ // std::vector<IndexType> getAdditionalDofDependencies(IndexType globalIdx) const
+ // { return std::vector<IndexType>(); }
+ // TODO is this necessary or can it just be meshed?
/*!
* \brief Function to set intersections as interior boundaries. This functionality is only
* available for models using cell-centered schemes. The corresponding boundary
@@ -1016,34 +721,13 @@ public:
*
* Per default we don't have interior boundaries
*/
- template<class T = TypeTag>
- bool isInteriorBoundary(const Element& element, const Intersection& intersection) const
- { return false; }
+ // template<class T = TypeTag>
+ // bool isInteriorBoundary(const Element& element, const Intersection& intersection) const
+ // { return false; }
- /*!
- * \brief Capability to introduce problem-specific routines at the
- * beginning of the grid adaptation
- *
- * Function is called at the beginning of the standard grid
- * modification routine, GridAdapt::adaptGrid() .
- */
- void preAdapt()
- {}
-
- /*!
- * \brief Capability to introduce problem-specific routines after grid adaptation
- *
- * Function is called at the end of the standard grid
- * modification routine, GridAdapt::adaptGrid() , to allow
- * for problem-specific output etc.
- */
- void postAdapt()
- {}
-
- VtkOutputModule& vtkOutputModule() const
- {
- return *vtkOutputModule_;
- }
+ //! The finite volume grid geometry
+ const FVGridGeometry& fvGridGeometry() const
+ { return *fvGridGeometry_; }
protected:
//! Returns the implementation of the problem (i.e. static polymorphism)
@@ -1054,56 +738,42 @@ protected:
const Implementation &asImp_() const
{ return *static_cast<const Implementation *>(this); }
- //! Compute the point source map, i.e. which scvs have point source contributions
- void computePointSourceMap_()
+private:
+ /*!
+ * \brief Applies the initial solution for the box method
+ */
+ void applyInitialSolutionImpl_(SolutionVector& sol, /*isBox=*/std::true_type) const
{
- // get and apply point sources if any given in the problem
- std::vector<PointSource> sources;
- asImp_().addPointSources(sources);
- // if there are point sources compute the DOF to point source map
- if (!sources.empty())
+ for (const auto& vertex : vertices(fvGridGeometry_->gridView()))
{
- // make sure the bounding box tree exists
- if(!boundingBoxTree_)
- boundingBoxTree_ = std::make_shared<BoundingBoxTree>(gridView_);
-
- // calculate point source locations and save them in a map
- pointSourceMap_.clear();
- PointSourceHelper::computePointSourceMap(asImp_(),
- this->boundingBoxTree(),
- sources,
- pointSourceMap_);
+ const auto dofIdxGlobal = fvGridGeometry_->vertexMapper().index(vertex);
+ sol[dofIdxGlobal] = asImp_().initial(vertex);
}
}
+ /*!
+ * \brief Applies the initial solution for cell-centered methods
+ */
+ void applyInitialSolutionImpl_(SolutionVector& sol, /*isBox=*/std::false_type) const
+ {
+ for (const auto& element : elements(fvGridGeometry_->gridView()))
+ {
+ const auto dofIdxGlobal = fvGridGeometry_->elementMapper().index(element);
+ sol[dofIdxGlobal] = asImp_().initial(element);
+ }
+ }
-private:
- std::string simName_;
- const GridView gridView_;
-
- GlobalPosition bBoxMin_;
- GlobalPosition bBoxMax_;
-
- ElementMapper elementMapper_;
- VertexMapper vertexMapper_;
-
- TimeManager *timeManager_;
- Scalar maxTimeStepSize_;
-
- Model model_;
-
- NewtonMethod newtonMethod_;
- NewtonController newtonCtl_;
-
- std::shared_ptr<VtkOutputModule> vtkOutputModule_;
+ //! The finite volume grid geometry
+ std::shared_ptr<const FVGridGeometry> fvGridGeometry_;
- std::shared_ptr<GridAdaptModel> gridAdapt_;
+ //! The name of the problem
+ std::string problemName_;
- std::shared_ptr<BoundingBoxTree> boundingBoxTree_;
- std::map<std::pair<unsigned int, unsigned int>, std::vector<PointSource> > pointSourceMap_;
+ //! A map from an scv to a vector of point sources
+ std::map<std::pair<unsigned int, unsigned int>,
+ std::vector<PointSource> > pointSourceMap_;
};
-} // namespace Dumux
-#include <dumux/implicit/adaptive/gridadaptpropertydefaults.hh>
+} // end namespace Dumux
#endif
diff --git a/dumux/common/loggingparametertree.hh b/dumux/common/loggingparametertree.hh
new file mode 100644
index 0000000000000000000000000000000000000000..19d4b9c746067e33a7e6b3a9938078a197de1915
--- /dev/null
+++ b/dumux/common/loggingparametertree.hh
@@ -0,0 +1,462 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief A parameter tree that logs which parameters have been used
+ */
+#ifndef DUMUX_LOGGING_PARAMETER_TREE_HH
+#define DUMUX_LOGGING_PARAMETER_TREE_HH
+
+#include <iomanip>
+#include <iostream>
+#include <string>
+
+#include <dune/common/parametertree.hh>
+
+#include <dumux/common/exceptions.hh>
+#include <dumux/common/parameters.hh>
+
+namespace Dumux
+{
+/*!
+ * \ingroup Common
+ * \brief A parameter tree that logs which parameters have been used
+ */
+class LoggingParameterTree
+{
+
+public:
+ /*
+ * \brief A logging parameter tree is always attached to an existingparameter tree
+ */
+ LoggingParameterTree() = delete;
+
+ /*
+ * \brief Create LoggingParameterTree from ParameterTree
+ */
+ LoggingParameterTree(const Dune::ParameterTree& params, const Dune::ParameterTree& defaultParams)
+ : params_(params), defaultParams_(defaultParams) {}
+
+ /** \brief test for key
+ *
+ * Tests whether given key exists.
+ *
+ * \param key key name
+ * \return true if key exists in structure, otherwise false
+ */
+ bool hasKey(const std::string& key) const
+ { return params_.hasKey(key); }
+
+
+ /** \brief print the hierarchical parameter tree to stream
+ *
+ * \param stream the output stream to print to
+ */
+ void report(std::ostream& stream = std::cout) const
+ { params_.report(stream); }
+
+ /** \brief print distinct substructure to stream
+ *
+ * Prints all entries with given prefix.
+ *
+ * \param stream Stream to print to
+ * \param prefix for key and substructure names
+ */
+ void reportAll(std::ostream& stream = std::cout) const
+ {
+ stream << "\n# Runtime-specified parameters used:" << std::endl;
+ usedRuntimeParams_.report(stream);
+
+ stream << "\n# Default parameters used:" << std::endl;
+ usedDefaultParams_.report(stream);
+
+ const auto unusedParams = getUnusedKeys();
+ if (!unusedParams.empty())
+ {
+ stream << "\n# Unused parameters:" << std::endl;
+ for (const auto& key : unusedParams)
+ stream << key << " = \"" << params_[key] << "\"" << std::endl;
+ }
+ }
+
+
+ /** \brief get value as string
+ *
+ * Returns pure string value for given key.
+ *
+ * \param key key name
+ * \param defaultValue default if key does not exist
+ * \return value as string
+ * \note This might be quite slow so call it only once,
+ * e.g. on initialization of the class configured by runtime parameters
+ */
+ std::string get(const std::string& key, const std::string& defaultValue) const
+ {
+ if (params_.hasKey(key))
+ {
+ // log that we used this parameter
+ const auto returnValue = params_[key];
+ usedRuntimeParams_[key] = returnValue;
+ return returnValue;
+ }
+
+ return defaultValue;
+ }
+
+ /** \brief get value as string, preferably from the sub-tree corresponding
+ * to a given prefix. The sub-tree is searched backwards for the parameter
+ * until its "first" occurrence.
+ *
+ * Returns pure string value for given key.
+ *
+ * \param groupPrefix The prefix of the sub tree the search should start in
+ * \param key key name
+ * \param defaultValue default if key does not exist
+ * \return value as string
+ * \note This might be quite slow so call it only once,
+ * e.g. on initialization of the class configured by runtime parameters
+ */
+ std::string getFromGroup(const std::string& groupPrefix,
+ const std::string& key,
+ const std::string& defaultValue) const
+ {
+ if (groupPrefix == "")
+ return get(key, defaultValue);
+
+ // first, look for the compound key
+ std::string compoundKey = groupPrefix + "." + key;
+ if (params_.hasKey(compoundKey))
+ {
+ // log that we used this parameter
+ const auto returnValue = params_[compoundKey];
+ usedRuntimeParams_[compoundKey] = returnValue;
+ return returnValue;
+ }
+
+ // search backwards until key is found
+ std::string prefix = groupPrefix;
+ auto dot = prefix.rfind(".");
+ while (dot != std::string::npos)
+ {
+ prefix = prefix.substr(0, dot);
+ compoundKey = prefix + "." + key;
+ if (params_.hasKey(compoundKey))
+ {
+ // log that we used this parameter
+ const auto returnValue = params_[compoundKey];
+ usedRuntimeParams_[compoundKey] = returnValue;
+ return returnValue;
+ }
+
+ // look for the next dot in the current prefix
+ dot = prefix.rfind(".");
+ }
+
+ // finally, look for the key without prefix
+ return get(key, defaultValue);
+ }
+
+ /** \brief get value as string
+ *
+ * Returns pure string value for given key.
+ *
+ * \todo This is a hack so get("my_key", "xyz") compiles
+ * (without this method "xyz" resolves to bool instead of std::string)
+ * \param key key name
+ * \param defaultValue default if key does not exist
+ * \return value as string
+ * \note This might be quite slow so call it only once,
+ * e.g. on initialization of the class configured by runtime parameters
+ */
+ std::string get(const std::string& key, const char* defaultValue) const
+ {
+ const std::string dv = defaultValue;
+ return get(key, dv);
+ }
+
+ /** \brief get value as string, preferably from the sub-tree corresponding
+ * to a given prefix. The sub-tree is searched for the parameter
+ * recursively until its "first" occurrence.
+ *
+ * Returns pure string value for given key.
+ *
+ * \param groupPrefix The prefix of the sub tree the search should start in
+ * \param key key name
+ * \param defaultValue default if key does not exist
+ * \return value as string
+ * \note This might be quite slow so call it only once,
+ * e.g. on initialization of the class configured by runtime parameters
+ */
+ std::string getFromGroup(const std::string& groupPrefix,
+ const std::string& key,
+ const char* defaultValue) const
+ {
+ const std::string dv = defaultValue;
+ return getFromGroup(groupPrefix, key, dv);
+ }
+
+
+ /** \brief get value converted to a certain type
+ *
+ * Returns value as type T for given key.
+ *
+ * \tparam T type of returned value.
+ * \param key key name
+ * \param defaultValue default if key does not exist
+ * \return value converted to T
+ * \note This might be quite slow so call it only once,
+ * e.g. on initialization of the class configured by runtime parameters
+ */
+ template<typename T>
+ T get(const std::string& key, const T& defaultValue) const
+ {
+ if (params_.hasKey(key))
+ {
+ // log that we used this parameter
+ usedRuntimeParams_[key] = params_[key];
+ return params_.template get<T>(key);
+ }
+
+ return defaultValue;
+ }
+
+ /** \brief get value as string, preferably from the sub-tree corresponding
+ * to a given prefix. The sub-tree is searched for the parameter
+ * recursively until its "first" occurrence.
+ *
+ * Returns pure string value for given key.
+ *
+ * \param groupPrefix The prefix of the sub tree the search should start in
+ * \param key key name
+ * \param defaultValue default if key does not exist
+ * \return value as string
+ * \note This might be quite slow so call it only once,
+ * e.g. on initialization of the class configured by runtime parameters
+ */
+ template<typename T>
+ T getFromGroup(const std::string& groupPrefix,
+ const std::string& key,
+ const T& defaultValue) const
+ {
+ if (groupPrefix == "")
+ return get<T>(key, defaultValue);
+
+ // first, look for the compound key
+ std::string compoundKey = groupPrefix + "." + key;
+ if (params_.hasKey(compoundKey))
+ {
+ // log that we used this parameter
+ usedRuntimeParams_[compoundKey] = params_[compoundKey];
+ return params_.template get<T>(compoundKey);
+ }
+
+ // search backwards until key is found
+ std::string prefix = groupPrefix;
+ auto dot = prefix.rfind(".");
+ while (dot != std::string::npos)
+ {
+ prefix = prefix.substr(0, dot);
+ compoundKey = prefix + "." + key;
+ if (params_.hasKey(compoundKey))
+ {
+ // log that we used this parameter
+ usedRuntimeParams_[compoundKey] = params_[compoundKey];
+ return params_.template get<T>(compoundKey);
+ }
+
+ // look for the next dot in the current prefix
+ dot = prefix.rfind(".");
+ }
+
+ // finally, look for the key without prefix
+ return get<T>(key, defaultValue);
+ }
+
+ /** \brief Get value
+ *
+ * \tparam T Type of the value
+ * \param key Key name
+ * \throws RangeError if key does not exist
+ * \throws NotImplemented Type is not supported
+ * \return value as T
+ * \note This might be quite slow so call it only once,
+ * e.g. on initialization of the class configured by runtime parameters
+ */
+ template <class T>
+ T get(const std::string& key) const
+ {
+ if (params_.hasKey(key))
+ {
+ // log that we used this parameter
+ usedRuntimeParams_[key] = params_[key];
+ return params_.template get<T>(key);
+ }
+
+ else if(defaultParams_.hasKey(key))
+ {
+ // use the default
+ usedDefaultParams_[key] = defaultParams_[key];
+ return defaultParams_.template get<T>(key);
+ }
+
+ DUNE_THROW(Dumux::ParameterException, "Key " << key << " not found in the parameter tree");
+ }
+
+ /** \brief get value as string, preferably from the sub-tree corresponding
+ * to a given prefix. The sub-tree is searched for the parameter
+ * recursively until its "first" occurrence.
+ *
+ * Returns pure string value for given key.
+ *
+ * \param groupPrefix The prefix of the sub tree the search should start in
+ * \param key key name
+ * \return value as string
+ * \note This might be quite slow so call it only once,
+ * e.g. on initialization of the class configured by runtime parameters
+ */
+ template<typename T>
+ T getFromGroup(const std::string& groupPrefix,
+ const std::string& key) const
+ {
+ if (groupPrefix == "")
+ return get<T>(key);
+
+ // first, look for the compound key
+ std::string compoundKey = groupPrefix + "." + key;
+ if (params_.hasKey(compoundKey))
+ {
+ // log that we used this parameter
+ usedRuntimeParams_[compoundKey] = params_[compoundKey];
+ return params_.template get<T>(compoundKey);
+ }
+
+ // search backwards until key is found
+ std::string prefix = groupPrefix;
+ auto dot = prefix.rfind(".");
+ while (dot != std::string::npos)
+ {
+ prefix = prefix.substr(0, dot);
+ compoundKey = prefix + "." + key;
+ if (params_.hasKey(compoundKey))
+ {
+ // log that we used this parameter
+ usedRuntimeParams_[compoundKey] = params_[compoundKey];
+ return params_.template get<T>(compoundKey);
+ }
+
+ // look for the next dot in the current prefix
+ dot = prefix.rfind(".");
+ }
+ // reset the compoundKey
+ compoundKey = groupPrefix + "." + key;
+
+ // if the backward search did not succeed, try the bare key without any prefix
+ if (params_.hasKey(key))
+ {
+ // log that we used this parameter
+ usedRuntimeParams_[key] = params_[key];
+ return params_.template get<T>(key);
+ }
+
+ // if this did not work, repeat the procedure using the default parameters
+ else if(defaultParams_.hasKey(compoundKey))
+ {
+ // use the default
+ usedDefaultParams_[compoundKey] = defaultParams_[compoundKey];
+ return defaultParams_.template get<T>(compoundKey);
+ }
+
+ else
+ {
+ // search backwards until key is found
+ std::string prefix = groupPrefix;
+ auto dot = prefix.rfind(".");
+ while (dot != std::string::npos)
+ {
+ prefix = prefix.substr(0, dot);
+ compoundKey = prefix + "." + key;
+ if (defaultParams_.hasKey(compoundKey))
+ {
+ // log that we used this parameter
+ usedDefaultParams_[compoundKey] = defaultParams_[compoundKey];
+ return defaultParams_.template get<T>(compoundKey);
+ }
+
+ // look for the next dot in the current prefix
+ dot = prefix.rfind(".");
+ }
+
+ if(defaultParams_.hasKey(key))
+ {
+ // use the default
+ usedDefaultParams_[key] = defaultParams_[key];
+ return defaultParams_.template get<T>(key);
+ }
+
+ DUNE_THROW(Dumux::ParameterException, "Key " << key << " not found in the parameter tree");
+ }
+ }
+
+ /** \brief Find the keys that haven't been used yet
+ *
+ * \retuns unusedParams Container storing unused keys
+ * \note Useful for debugging purposes
+ */
+ std::vector<std::string> getUnusedKeys() const
+ {
+ std::vector<std::string> unusedParams;
+ findUnusedKeys(params_, unusedParams);
+ return unusedParams;
+ }
+
+private:
+ /** \brief Find the keys that haven't been used yet recursively
+ *
+ * \param tree The tree to look in for unused keys
+ * \param unusedParams Container to store unused keys
+ * \param prefix the prefix attached to the key
+ */
+ void findUnusedKeys(const Dune::ParameterTree& tree,
+ std::vector<std::string>& unusedParams,
+ const std::string& prefix = "") const
+ {
+ // loop over all keys of the current tree
+ // store keys which were not accessed
+ const auto& keys = tree.getValueKeys();
+ for (const auto& key : keys)
+ if (!usedRuntimeParams_.hasKey(prefix + key))
+ unusedParams.push_back(prefix + key);
+
+ // recursively loop over all subtrees
+ const auto& subTreeKeys = tree.getSubKeys();
+ for (const auto& key : subTreeKeys)
+ findUnusedKeys(tree.sub(key), unusedParams, prefix + key + ".");
+ }
+
+ const Dune::ParameterTree& params_;
+ const Dune::ParameterTree& defaultParams_;
+
+ // logging caches
+ mutable Dune::ParameterTree usedRuntimeParams_;
+ mutable Dune::ParameterTree usedDefaultParams_;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/common/parameters.hh b/dumux/common/parameters.hh
index f06f2d1c2cca33615b7c768387faa18c83042c16..597e724d4f14487048ccc7f10671e61403e5b0c0 100644
--- a/dumux/common/parameters.hh
+++ b/dumux/common/parameters.hh
@@ -31,11 +31,16 @@
#include <list>
#include <sstream>
#include <unordered_map>
+#include <fstream>
#include <dune/common/parametertree.hh>
+#include <dune/common/parametertreeparser.hh>
+#include <dune/common/parallel/mpihelper.hh>
#include <dumux/common/propertysystem.hh>
#include <dumux/common/exceptions.hh>
+#include <dumux/common/defaultusagemessage.hh>
+#include <dumux/common/loggingparametertree.hh>
/*!
* \ingroup Parameter
@@ -50,10 +55,8 @@
* GET_PARAM(TypeTag, Scalar, UpwindWeight);
* \endcode
*/
-#define GET_PARAM(TypeTag, ParamType, ParamName) \
- ::Dumux::Parameters::get<TypeTag, \
- ParamType, \
- PTAG_(ParamName)>(#ParamName, #ParamName)
+// #define GET_PARAM(TypeTag, ParamType, ParamName)
+// ::Dumux::template getParam_UsingDeprecatedMacro<ParamType>(std::string(#ParamName), GET_PROP_VALUE(TypeTag, ParamName))
/*!
* \ingroup Parameter
@@ -72,9 +75,8 @@
* \endcode
*/
#define GET_PARAM_FROM_GROUP(TypeTag, ParamType, GroupName, ParamName) \
- ::Dumux::Parameters::get<TypeTag, \
- ParamType, \
- PTAG_(GroupName##ParamName)>(#GroupName#ParamName, #GroupName, #ParamName)
+ ::Dumux::template getParam_UsingDeprecatedMacro<ParamType>(std::string(#GroupName) + "." + std::string(#ParamName))
+
/*!
* \ingroup Parameter
@@ -89,7 +91,7 @@
* \endcode
*/
#define GET_RUNTIME_PARAM(TypeTag, ParamType, ParamName) \
- ::Dumux::Parameters::getRuntime<TypeTag, ParamType>(#ParamName)
+ ::Dumux::template getParam_UsingDeprecatedMacro<ParamType>(std::string(#ParamName))
/*!
* \ingroup Parameter
@@ -118,7 +120,7 @@
* \endcode
*/
#define GET_RUNTIME_PARAM_CSTRING(TypeTag, ParamType, ParamName) \
- ::Dumux::Parameters::getRuntime<TypeTag, ParamType>(ParamName)
+ ::Dumux::template getParam_UsingDeprecatedMacro<ParamType>(std::string(ParamName))
/*!
* \ingroup Parameter
@@ -136,7 +138,7 @@
* \endcode
*/
#define GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, ParamType, GroupName, ParamName) \
- ::Dumux::Parameters::getRuntime<TypeTag, ParamType>(#GroupName, #ParamName)
+ ::Dumux::template getParam_UsingDeprecatedMacro<ParamType>(std::string(#GroupName) + "." + std::string(#ParamName))
/*!
* \ingroup Parameter
@@ -167,343 +169,263 @@
* \endcode
*/
#define GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, ParamType, GroupName, ParamName) \
- ::Dumux::Parameters::getRuntime<TypeTag, ParamType>(GroupName, #ParamName)
+ ::Dumux::template getParam_UsingDeprecatedMacro<ParamType>(std::string(GroupName) + "." + std::string(#ParamName))
namespace Dumux
{
-namespace Properties
-{
-NEW_PROP_TAG(ParameterTree);
-NEW_PROP_TAG(ModelParameterGroup);
-} // namespace Properties
-
-namespace Parameters {
-
-template <class TypeTag>
-void findUnusedKeys_(std::list<std::string> &unusedParams,
- const Dune::ParameterTree &tree,
- const std::string prefix="")
-{
- typedef typename GET_PROP(TypeTag, ParameterTree) Params;
- const Dune::ParameterTree &rt = Params::runTimeParams();
- const Dune::ParameterTree &drt = Params::deprecatedRunTimeParams();
-
- // loop over all keys of the current tree
- const Dune::ParameterTree::KeyVector &keys =
- tree.getValueKeys();
- for (unsigned int i = 0; i < keys.size(); ++i) {
- std::string canonicalName = prefix + keys[i];
-
- // store keys which were not accessed
- if (!rt.hasKey(canonicalName) && !drt.hasKey(canonicalName))
- {
- unusedParams.push_back(canonicalName);
- }
- }
-
- // loop over all subtrees
- const Dune::ParameterTree::KeyVector &subKeys =
- tree.getSubKeys();
- for (unsigned int i = 0; i < subKeys.size(); ++i) {
- std::string newPrefix = prefix + subKeys[i] + ".";
-
- findUnusedKeys_<TypeTag>(unusedParams,
- tree.sub(subKeys[i]),
- newPrefix);
- }
-
-}
-
-template <class TypeTag>
-bool hasDeprecatedKeys_(const Dune::ParameterTree &tree)
-{
- typedef typename GET_PROP(TypeTag, ParameterTree) Params;
- const Dune::ParameterTree &drt = Params::deprecatedRunTimeParams();
-
- // loop over all keys of the current tree
- const Dune::ParameterTree::KeyVector &keys =
- tree.getValueKeys();
- for (unsigned int i = 0; i < keys.size(); ++i) {
- std::string canonicalName = keys[i];
-
- // check whether the key was accessed
- if (drt.hasKey(canonicalName))
- return true;
- }
- return false;
-}
-
-/*!
- * \ingroup Parameter
- * \brief Print the run- and compile-time parameters.
- */
-template <class TypeTag>
-void print(std::ostream &os = std::cout)
-{
- typedef typename GET_PROP(TypeTag, ParameterTree) Params;
-
- const Dune::ParameterTree &tree = Params::tree();
- const Dune::ParameterTree &rt = Params::runTimeParams();
- const Dune::ParameterTree &ct = Params::compileTimeParams();
- const Dune::ParameterTree &drt = Params::deprecatedRunTimeParams();
- const Dune::ParameterTree &unrt = Params::unusedNewRunTimeParams();
- os << "# Run-time specified parameters:" << std::endl;
- rt.report(os);
-
- if (hasDeprecatedKeys_<TypeTag>(tree))
- {
- os << "# DEPRECATED run-time specified parameters:" << std::endl;
- drt.report(os);
- os << "# Replace by:" << std::endl;
- unrt.report(os);
- }
+//! The runtime parameter managing class
+class Parameters {
- os << "# Compile-time specified parameters:" << std::endl;
- ct.report(os);
+ using DefaultParams = std::function<void (Dune::ParameterTree&)>;
+ using Usage = std::function<void (const char *, const std::string &)>;
- std::list<std::string> unusedParams;
- findUnusedKeys_<TypeTag>(unusedParams, tree);
+public:
- if (unusedParams.size() > 0)
+ //! Initialize the parameter tree singletons
+ static void init(int argc, char **argv, const Usage& usage)
{
- os << "# UNUSED parameters:" << std::endl;
- for (auto it = unusedParams.begin(); it != unusedParams.end(); ++it)
- {
- os << *it << " = \"" << tree.get(*it, "") << "\"" << std::endl;
- }
+ init(argc, argv, [] (Dune::ParameterTree&) {}, "", usage);
}
-}
-const char *getString_(const char *foo = 0)
-{ return foo; }
-
-template <class TypeTag>
-class Param
-{
- typedef typename GET_PROP(TypeTag, ParameterTree) Params;
-public:
- template <class ParamType, class PropTag>
- static const ParamType &get(const char *propertyName,
- const char *groupOrParamName,
- const char *paramNameOrNil = 0)
+ //! Initialize the parameter tree singletons
+ static void init(int argc, char **argv,
+ std::string parameterFileName,
+ const Usage& usage = [](const char *, const std::string &){})
{
- static const ParamType &value = retrieve_<ParamType, PropTag>(propertyName, groupOrParamName, paramNameOrNil);
- return value;
+ init(argc, argv, [] (Dune::ParameterTree&) {}, parameterFileName, usage);
}
- template <class ParamType>
- static const ParamType &getRuntime(const char *groupOrParamName,
- const char *paramNameOrNil = 0)
+ //! Initialize the parameter tree singletons
+ static void init(int argc, char **argv,
+ const DefaultParams& defaultParams = [] (Dune::ParameterTree&) {},
+ std::string parameterFileName = "",
+ const Usage& usage = [](const char *, const std::string &){})
{
- return retrieveRuntime_<ParamType>(groupOrParamName, paramNameOrNil);
- }
-
-private:
- struct Blubb {
- std::string propertyName;
- std::string paramTypeName;
- std::string groupName;
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
- Blubb &operator=(const Blubb &b)
+ // check whether the user wanted to see the help message
+ for (int i = 1; i < argc; ++i)
{
- propertyName = b.propertyName;
- paramTypeName = b.paramTypeName;
- groupName = b.groupName;
- return *this;
+ if (std::string("--help") == argv[i] || std::string("-h") == argv[i])
+ {
+ // return usage message and return;
+ if (mpiHelper.rank() == 0)
+ usage(argv[0], defaultUsageMessage(argv[0]));
+
+ exit(0);
+ }
}
- };
- template <class ParamType, class PropTag>
- static const ParamType &retrieve_(const char *propertyName,
- const char *groupOrParamName,
- const char *paramNameOrNil = 0)
- {
- const char *paramName, *groupName;
- if (paramNameOrNil && strlen(paramNameOrNil) > 0) {
- groupName = groupOrParamName;
- paramName = paramNameOrNil;
- }
- else {
- groupName = "";
- paramName = groupOrParamName;
- }
+ // apply the default parameters
+ globalDefaultParameters(defaultParamTree());
+ defaultParams(defaultParamTree());
- // prefix the parameter name by 'GroupName.'. E.g. 'Newton'
- // and 'WriteConvergence' becomes 'Newton.WriteConvergence'
- // with the default value specified by the
- // 'NewtonWriteConvergence' property. in an INI file this
- // would look like:
- //
- // [Newton]
- // WriteConvergence = true
- std::string canonicalName(paramName);
- if (strlen(groupName) > 0) {
- canonicalName.insert(0, ".");
- canonicalName.insert(0, groupName);
+ // parse paramters from the command line
+ for (int i = 1; i < argc; ++i)
+ {
+ if (argv[i][0] != '-' && i == 1)
+ {
+ // try to pass first argument as parameter file
+ parameterFileName = argv[1];
+ continue;
+ }
+
+ if (argv[i][0] != '-')
+ DUNE_THROW(ParameterException, "-> Command line argument " << i << " (='" << argv[i] << "') is invalid. <-");
+
+ if (i+1 == argc)
+ DUNE_THROW(ParameterException, "-> No argument given for parameter '" << argv[i] << "'! <-");
+
+ // check for the ParameterFile argument
+ if (argv[i]+1 == std::string("ParameterFile")) // +1 removes the '-'
+ {
+ parameterFileName = argv[i+1];
+ ++i;
+ }
+
+ // add all other options as key value pairs
+ else
+ {
+ // read a -MyOpt VALUE option
+ std::string paramName = argv[i]+1; // +1 removes the '-'
+ std::string paramValue = argv[i+1];
+ ++i; // In the case of '-MyOpt VALUE' each pair counts as two arguments
+
+ // Put the key=value pair into the parameter tree
+ paramTree()[paramName] = paramValue;
+ }
}
- std::string modelParamGroup(GET_PROP_VALUE(TypeTag, ModelParameterGroup));
- // prefix the parameter with the parameter group of the
- // model. this allows things like sub-model specific parameters like
- //
- // [Stokes.Newton]
- // WriteConvergence = false
- // [Darcy.Newton]
- // WriteConvergence = true
- if (modelParamGroup.size()) {
- canonicalName.insert(0, ".");
- canonicalName.insert(0, modelParamGroup);
+ // otherwise use the default name (executable name + .input)
+ if (parameterFileName == "")
+ {
+ if (mpiHelper.size() > 1)
+ std::cout << "Rank " << mpiHelper.rank() << ": ";
+ std::cout << "No parameter file given. "
+ << "Defaulting to '"
+ << argv[0]
+ << ".input' for input file.\n";
+
+ parameterFileName = std::string(argv[0]) + ".input";
}
- static ParamType value;
- // retrieve actual parameter from the parameter tree
- ParamType defaultValue = GET_PROP_VALUE_(TypeTag, PropTag);
- if (!Params::tree().hasKey(canonicalName) && Params::tree().hasKey(paramName))//functionality to catch deprecated params
+ // open and check whether the parameter file exists.
+ std::ifstream parameterFile(parameterFileName.c_str());
+ if (!parameterFile.is_open())
{
- value = Params::tree().template get<ParamType>(paramName, defaultValue);
-// std::cout<<"\nWarning: Using the parameter: "<<paramName<<" without group name: "<<groupName<<" is deprecated!"<<"\n\n";
+ if (mpiHelper.size() > 1)
+ std::cout << "Rank " << mpiHelper.rank() << ": ";
+ std::cout << " -> Could not open file '"
+ << parameterFileName
+ << "'. <- \n\n";
+
+ usage(argv[0], defaultUsageMessage(argv[0]));
+
+ DUNE_THROW(ParameterException, "Error opening input file " << parameterFileName << ".");
}
else
- value = Params::tree().template get<ParamType>(canonicalName, defaultValue);
-
- // remember whether the parameter was taken from the parameter
- // tree or the default from the property system was taken.
- Dune::ParameterTree &rt = Params::runTimeParams();
- Dune::ParameterTree &ct = Params::compileTimeParams();
- Dune::ParameterTree &drt = Params::deprecatedRunTimeParams();
- Dune::ParameterTree &unrt = Params::unusedNewRunTimeParams();
- if (Params::tree().hasKey(canonicalName)) {
- rt[canonicalName] = Params::tree()[canonicalName];
- }
- else if (Params::tree().hasKey(paramName))//functionality to catch deprecated params
{
- drt[paramName] = Params::tree()[paramName];
- unrt[canonicalName] = Params::tree()[paramName];
- }
- else {
- std::string s;
- std::ostringstream oss(s);
- oss << defaultValue;
- ct[canonicalName] = oss.str();
+ // read parameters from the file without overwriting the command line params
+ // because the command line arguments have precedence
+ Dune::ParameterTreeParser::readINITree(parameterFileName,
+ paramTree(),
+ /*overwrite=*/false);
}
- return value;
+ parameterFile.close();
}
- template <class ParamType>
- static const ParamType &retrieveRuntime_(const char *groupOrParamName, const char *paramNameOrNil = 0)
+ //! prints all used and unused parameters
+ static void print()
{
- const char *paramName, *groupName;
- if (paramNameOrNil && paramNameOrNil[0] != '\0') {
- groupName = groupOrParamName;
- paramName = paramNameOrNil;
- }
- else {
- groupName = "";
- paramName = groupOrParamName;
- }
-
- static std::string modelParamGroup(GET_PROP(TypeTag, ModelParameterGroup)::value);
-
- std::string canonicalName(modelParamGroup);
+ getTree().reportAll();
+ }
- // prefix the parameter with the parameter group of the
- // model. this allows things like sub-model specific parameters like
- //
- // [Stokes.Newton]
- // WriteConvergence = false
- // [Darcy.Newton]
- // WriteConvergence = true
- if (modelParamGroup.size()) {
- canonicalName.push_back('.');
- }
+ //! returns the logging parameter tree recording which parameters are used during the simulation
+ static const LoggingParameterTree& getTree()
+ {
+ static LoggingParameterTree tree(paramTree(), defaultParamTree());
+ return tree;
+ }
- // prefix the parameter name by 'GroupName.'. E.g. 'Newton'
- // and 'WriteConvergence' becomes 'Newton.WriteConvergence'
- // with the default value specified by the
- // 'NewtonWriteConvergence' property. in an INI file this
- // would look like:
- //
- // [Newton]
- // WriteConvergence = true
- if (strlen(groupName) > 0) {
- canonicalName.append(groupName);
- canonicalName.push_back('.');
- }
+private:
- // append the name of the parameter
- canonicalName.append(paramName);
-
- // cache parameters using a hash_map (Dune::Parameter tree is slow!)
- typedef std::unordered_map<std::string, ParamType> ParamCache;
- static ParamCache paramCache;
- typename ParamCache::iterator it = paramCache.find(canonicalName);
- if (it != paramCache.end())
- return it->second;
-
- it = paramCache.find(paramName);
- if (it != paramCache.end())
- return it->second;
-
- // retrieve actual parameter from the parameter tree
- if (!Params::tree().hasKey(canonicalName) && !Params::tree().hasKey(paramName)) {
- DUNE_THROW(::Dumux::ParameterException,
- "Mandatory parameter '" << canonicalName
- << "' was not specified");
- }
+ //! the actual internal parameter tree storing all user-specfied runtime parameters
+ static Dune::ParameterTree& paramTree()
+ {
+ static Dune::ParameterTree tree;
+ return tree;
+ }
- // update the cache
- ParamType value;
- if (!Params::tree().hasKey(canonicalName) && Params::tree().hasKey(paramName))//functionality to catch deprecated params
- {
- value = Params::tree().template get<ParamType>(paramName);
- paramCache[paramName] = value;
+ //! the parameter tree storing the Dumux global defaults for some parameters
+ static Dune::ParameterTree& defaultParamTree()
+ {
+ static Dune::ParameterTree tree;
+ return tree;
+ }
- // remember whether the parameter was taken from the parameter
- // tree or the default from the property system was taken.
- Dune::ParameterTree &drt = Params::deprecatedRunTimeParams();
- Dune::ParameterTree &unrt = Params::unusedNewRunTimeParams();
+ //! This method puts all default arguments into the parameter tree
+ //! we do this once per simulation on call to Parameters::init();
+ static void globalDefaultParameters(Dune::ParameterTree& params)
+ {
+ // parameters in the implicit group
+ params["Implicit.UpwindWeight"] = "1.0";
+ params["Implicit.EnablePartialReassemble"] = "false";
+ params["Implicit.EnableJacobianRecycling"] = "false";
+ params["Implicit.NumericDifferenceMethod"] = "1";
+
+ // parameters in the linear solver group
+ params["LinearSolver.GMResRestart"] = "10";
+ params["LinearSolver.MaxIterations"] = "250";
+ params["LinearSolver.PreconditionerIterations"] = "1";
+ params["LinearSolver.PreconditionerRelaxation"] = "1.0";
+ params["LinearSolver.ResidualReduction"] = "1e-13";
+ params["LinearSolver.Verbosity"] = "0";
+
+ // parameters in the problem group
+ params["Problem.EnableGravity"] = "true";
+
+ // parameters in the newton group
+ params["Newton.MaxSteps"] = "18";
+ params["Newton.TargetSteps"] = "10";
+ params["Newton.UseLineSearch"] = "false";
+ params["Newton.EnableShiftCriterion"] = "true";
+ params["Newton.MaxRelativeShift"] = "1e-8";
+ params["Newton.EnableResidualCriterion"] = "false";
+ params["Newton.ResidualReduction"] = "1e-5";
+ params["Newton.EnableAbsoluteResidualCriterion"] = "false";
+ params["Newton.MaxAbsoluteResidual"] = "1e-5";
+ params["Newton.SatisfyResidualAndShiftCriterion"] = "false";
+
+ // parameters in the time loop group
+ params["TimeLoop.MaxTimeStepSize"] = "1e300";
+ params["TimeLoop.MaxTimeStepDivisions"] = "10";
+
+ // parameters in the vtk group
+ params["Vtk.AddVelocity"] = "false";
+ params["Vtk.AddProcessRank"] = "true";
+
+ // parameters in the mpfa group
+ params["Mpfa.Q"] = "0.0";
+ }
+};
- drt[paramName] = Params::tree()[paramName];
- unrt[canonicalName] = Params::tree()[paramName];
- return paramCache[paramName];
- }
- else
- {
- value = Params::tree().template get<ParamType>(canonicalName);
- paramCache[canonicalName] = value;
+// a free function to set model- or problem-specific default parameters
+void setParam(Dune::ParameterTree& params,
+ const std::string& group,
+ const std::string& key,
+ const std::string& value)
+{
+ if(group == "")
+ params[key] = value;
+ else
+ params[group + "." + key] = value;
+}
- // remember whether the parameter was taken from the parameter
- // tree or the default from the property system was taken.
- Dune::ParameterTree &rt = Params::runTimeParams();
+// a free function to get a parameter from the parameter tree singleton
+// e.g. auto endTime = getParam<double>("TimeManager.TEnd");
+template<typename T, typename... Args>
+T getParam(Args&&... args)
+{
+ const auto& p = Parameters::getTree();
+ return p.template get<T>(std::forward<Args>(args)... );
+}
- rt[canonicalName] = Params::tree()[canonicalName];
- return paramCache[canonicalName];
- }
- }
-};
+// a free function to get a parameter from the parameter tree singleton
+// e.g. auto endTime = getParam<double>("TimeManager.TEnd");
+template<typename T, typename... Args>
+T getParamFromGroup(Args&&... args)
+{
+ const auto& p = Parameters::getTree();
+ return p.template getFromGroup<T>(std::forward<Args>(args)... );
+}
-template <class TypeTag, class ParamType, class PropTag>
-const ParamType &get(const char *propertyName,
- const char *paramOrGroupName,
- const char *paramNameOrNil = 0)
+// a free function to check whether a key exists
+bool haveParam(const std::string& param)
{
- return Param<TypeTag>::template get<ParamType, PropTag>(propertyName,
- paramOrGroupName,
- paramNameOrNil);
+ const auto& p = Parameters::getTree();
+ return p.hasKey(param);
}
-template <class TypeTag, class ParamType>
-const ParamType &getRuntime(const char *paramOrGroupName,
- const char *paramNameOrNil = 0)
+// a free function to check whether a key exists
+template<typename... Args>
+bool haveParamInGroup(const std::string& paramGroup, const std::string& param)
{
- return Param<TypeTag>::template getRuntime<ParamType>(paramOrGroupName,
- paramNameOrNil);
+ const auto& p = Parameters::getTree();
+ if (paramGroup == "")
+ return p.hasKey(param);
+ else
+ return p.hasKey(paramGroup + "." + param);
}
-} // namespace Parameters
+template<typename T, typename... Args>
+DUNE_DEPRECATED_MSG("Using preprocessor MACROS for getting parameters is deprecated on next. Please use the new getParam method.")
+T getParam_UsingDeprecatedMacro(Args&&... args)
+{
+ const auto& p = Parameters::getTree();
+ return p.template get<T>(std::forward<Args>(args)... );
+}
} // namespace Dumux
-
#endif
diff --git a/dumux/common/pointsource.hh b/dumux/common/pointsource.hh
index ed3e716c7febe779daaea0d4ea86ea18a12c57a0..4b67f80beba9bccdfeed758152a630e788336138 100644
--- a/dumux/common/pointsource.hh
+++ b/dumux/common/pointsource.hh
@@ -27,27 +27,14 @@
#include <functional>
-#include <dumux/common/boundingboxtree.hh>
+#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/common/propertysystem.hh>
+#include <dumux/common/boundingboxtree.hh>
-namespace Dumux
-{
+#include <dumux/discretization/methods.hh>
-namespace Properties
+namespace Dumux
{
-// Property forward declarations
-NEW_PROP_TAG(ElementVolumeVariables);
-NEW_PROP_TAG(FVElementGeometry);
-NEW_PROP_TAG(GridView);
-NEW_PROP_TAG(ImplicitIsBox);
-NEW_PROP_TAG(PointSource);
-NEW_PROP_TAG(PrimaryVariables);
-NEW_PROP_TAG(Problem);
-NEW_PROP_TAG(Scalar);
-NEW_PROP_TAG(TimeManager);
-NEW_PROP_TAG(SubControlVolume);
-} // end namespace Properties
// forward declarations
template<class TypeTag>
@@ -214,66 +201,6 @@ private:
IdType id_;
};
-/*!
- * \ingroup Common
- * \brief A point source class for time dependent point sources
- */
-template<class TypeTag>
-class TimeDependentPointSource : public PointSource<TypeTag>
-{
- typedef PointSource<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
- typedef typename GridView::template Codim<0>::Entity Element;
-
- static const int dimworld = GridView::dimensionworld;
- typedef typename Dune::FieldVector<Scalar, dimworld> GlobalPosition;
- // a function that takes a TimeManager and a GlobalPosition
- // and returns the PointSource values as PrimaryVariables
- typedef typename std::function<PrimaryVariables(const TimeManager&, const GlobalPosition&)> ValueFunction;
-
-public:
- //! Constructor for sol dependent point sources, when there is no
- // value known at the time of initialization
- DUNE_DEPRECATED_MSG("Will be removed after release of Dumux 3.0. Use the more general SolDependentPointSource class.")
- TimeDependentPointSource(GlobalPosition pos,
- ValueFunction valueFunction)
- : ParentType(pos, PrimaryVariables(0)), valueFunction_(valueFunction) {}
-
- //! an update function called before adding the value
- // to the local residual in the problem in scvPointSources
- // to be overloaded by derived classes
- void update(const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- const ElementVolumeVariables &elemVolVars,
- const SubControlVolume &scv)
- { this->values_ = valueFunction_(problem.timeManager(), this->position()); }
-
- //! Convenience = operator overload modifying only the values
- TimeDependentPointSource& operator= (const PrimaryVariables& values)
- {
- ParentType::operator=(values);
- return *this;
- }
-
- //! Convenience = operator overload modifying only the values
- TimeDependentPointSource& operator= (Scalar s)
- {
- ParentType::operator=(s);
- return *this;
- }
-
-private:
- ValueFunction valueFunction_;
-};
-
/*!
* \ingroup Common
* \brief A point source class for time dependent point sources
@@ -286,7 +213,6 @@ class SolDependentPointSource : public PointSource<TypeTag>
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
@@ -294,8 +220,7 @@ class SolDependentPointSource : public PointSource<TypeTag>
static const int dimworld = GridView::dimensionworld;
using GlobalPosition = typename Dune::FieldVector<Scalar, dimworld>;
- // a function that takes a TimeManager and a GlobalPosition
- // and returns the PointSource values as PrimaryVariables
+ // returns the PointSource values as PrimaryVariables
using ValueFunction = typename std::function<PrimaryVariables(const Problem &problem,
const Element &element,
const FVElementGeometry &fvGeometry,
@@ -346,26 +271,25 @@ private:
template<class TypeTag>
class BoundingBoxTreePointSourceHelper
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PointSource) PointSource;
-
- static const int dim = GridView::dimension;
- static const int dimworld = GridView::dimensionworld;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using PointSource = typename GET_PROP_TYPE(TypeTag, PointSource);
- typedef Dumux::BoundingBoxTree<GridView> BoundingBoxTree;
+ static constexpr int dim = GridView::dimension;
+ static constexpr int dimworld = GridView::dimensionworld;
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dim : 0 };
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr int dofCodim = isBox ? dim : 0;
public:
//! calculate a DOF index to point source map from given vector of point sources
- static void computePointSourceMap(const Problem& problem,
- const BoundingBoxTree& boundingBoxTree,
+ static void computePointSourceMap(const FVGridGeometry& fvGridGeometry,
std::vector<PointSource>& sources,
std::map<std::pair<unsigned int, unsigned int>, std::vector<PointSource> >& pointSourceMap)
{
+ const auto& boundingBoxTree = fvGridGeometry.boundingBoxTree();
+
for (auto&& source : sources)
{
// compute in which elements the point source falls
@@ -378,9 +302,8 @@ public:
if(isBox)
{
// check in which subcontrolvolume(s) we are
- // TODO mapper/problem in bboxtree would allow to make this much better
const auto element = boundingBoxTree.entity(eIdx);
- auto fvGeometry = localView(problem.model().fvGridGeometry());
+ auto fvGeometry = localView(fvGridGeometry);
fvGeometry.bindElement(element);
const auto globalPos = source.position();
diff --git a/dumux/common/properties.hh b/dumux/common/properties.hh
new file mode 100644
index 0000000000000000000000000000000000000000..cb03e8348de6ba7a5988adbebbd6b9a33283ba84
--- /dev/null
+++ b/dumux/common/properties.hh
@@ -0,0 +1,179 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \ingroup Properties
+ * \file
+ *
+ * \brief Collects a list of properties used by the core of Dumux.
+ */
+
+#include <dumux/common/propertysystem.hh>
+
+namespace Dumux
+{
+namespace Properties
+{
+///////////////////////////////////////
+// Basic properties of numeric models:
+///////////////////////////////////////
+NEW_PROP_TAG(Scalar); //! Property to specify the type of scalar values.
+NEW_PROP_TAG(ModelParameterGroup); //! Property which defines the group that is queried for parameters by default
+NEW_PROP_TAG(ModelDefaultParameters); //! Property which defines the group that is queried for parameters by default
+NEW_PROP_TAG(GridCreator); //! Property which provides a GridCreator (manages grids)
+NEW_PROP_TAG(Grid); //! The DUNE grid type
+NEW_PROP_TAG(NumEq); //! The number of equations to solve (equal to number of primary variables)
+NEW_PROP_TAG(Indices); //! Enumerations for the numeric model
+NEW_PROP_TAG(PrimaryVariables); //! A vector of primary variables
+NEW_PROP_TAG(NumEqVector); //! A vector of size number equations that can be used for Neumann fluxes, sources, residuals, ...
+NEW_PROP_TAG(GridView); //! The type of the grid view according to the grid type
+NEW_PROP_TAG(Problem); //! Property to specify the type of a problem which has to be solved
+NEW_PROP_TAG(PointSource); //! Property defining the type of point source used
+NEW_PROP_TAG(PointSourceHelper); //! Property defining the class that computes which sub control volume point sources belong to
+NEW_PROP_TAG(VtkOutputLevel); //! Property to define the output level
+NEW_PROP_TAG(VtkOutputFields); //! A class helping models to define default vtk output parameters
+NEW_PROP_TAG(BaseLocalResidual); //! The type of the base class of the local residual (specific to a discretization scheme)
+NEW_PROP_TAG(JacobianMatrix); //! Type of the global jacobian matrix
+NEW_PROP_TAG(SolutionVector); //! Vector containing all primary variable vector of the grid
+NEW_PROP_TAG(BoundaryTypes); //! Stores the boundary types of a single degree of freedom
+NEW_PROP_TAG(DiscretizationMethod); //! Property for the used discretization method
+NEW_PROP_TAG(VertexMapper); //! mapper for vertices
+NEW_PROP_TAG(ElementMapper); //! mapper for elements
+
+//! The type of the local residual function, i.e. the equation to be solved. Must inherit
+//! from the BaseLocalResidual property and fulfill its interfaces.
+NEW_PROP_TAG(LocalResidual);
+
+//! TODO: Remove this property as soon as the decoupled models are integrated
+NEW_PROP_TAG(LinearSolver);
+
+
+////////////////////////////////////////////////
+// Basic properties regarding balance equations
+/////////////////////////////////////////////////
+NEW_PROP_TAG(UseMoles); //! Property whether to use moles or kg as amount unit for balance equations
+NEW_PROP_TAG(ReplaceCompEqIdx); //! The component balance index that should be replaced by the total mass/mole balance
+NEW_PROP_TAG(BalanceEqOpts); //! A class that collects options for the evaluation of the balance equations
+
+
+/////////////////////////////////////////////
+// Properties used by finite volume schemes:
+/////////////////////////////////////////////
+NEW_PROP_TAG(ElementBoundaryTypes); //! Stores the boundary types on an element
+NEW_PROP_TAG(ElementSolutionVector); //! A vector of primary variables within an element
+NEW_PROP_TAG(AssemblyMap); //! Connectivity map (transposed) used for assembling the Jacobian matrix entries
+
+NEW_PROP_TAG(SubControlVolume); //! The type of the sub control volume
+NEW_PROP_TAG(SubControlVolumeFace); //! The type of the sub control volume face
+NEW_PROP_TAG(FVElementGeometry); //! The type of the local finite volume geometry (iterators over scvs, scvfs)
+NEW_PROP_TAG(FVGridGeometry); //! The type of the global finite volume geometry
+NEW_PROP_TAG(EnableFVGridGeometryCache); //! specifies if geometric data is saved (faster, but more memory consuming)
+
+NEW_PROP_TAG(VolumeVariables); //! The secondary variables within a sub-control volume
+NEW_PROP_TAG(ElementVolumeVariables); //! The type for a local (element/stencil) container for the volume variables
+NEW_PROP_TAG(GlobalVolumeVariables); //! The type for a global container for the volume variables
+NEW_PROP_TAG(EnableGlobalVolumeVariablesCache); //! If disabled, the volume variables are not stored (reduces memory, but is slower)
+NEW_PROP_TAG(FluxVariables); //! Container storing the different types of flux variables
+NEW_PROP_TAG(FluxVariablesCache); //! Stores data associated with flux vars
+NEW_PROP_TAG(ElementFluxVariablesCache); //! A local vector of flux variable caches per element
+NEW_PROP_TAG(GlobalFluxVariablesCache); //! The global vector of flux variable containers
+NEW_PROP_TAG(EnableGlobalFluxVariablesCache); //! specifies if data on flux vars should be saved (faster, but more memory consuming)
+NEW_PROP_TAG(GridVariables); //! The grid variables object managing variable data on the grid (volvars/fluxvars cache)
+
+
+/////////////////////////////////////////////////////////////////
+// Additional properties used by the cell-centered mpfa schemes:
+/////////////////////////////////////////////////////////////////
+NEW_PROP_TAG(MpfaMethod); //! Specifies the mpfa method to be used
+NEW_PROP_TAG(MpfaHelper); //! A Helper class depending on the mpfa method and grid dimension
+NEW_PROP_TAG(PrimaryInteractionVolume); //! The primary interaction volume type
+NEW_PROP_TAG(SecondaryInteractionVolume); //! The secondary interaction volume type used e.g. on the boundaries
+
+
+/////////////////////////////////////////////////////////////
+// Properties used by models involving flow in porous media:
+/////////////////////////////////////////////////////////////
+NEW_PROP_TAG(EnergyLocalResidual); //! The local residual of the energy equation
+NEW_PROP_TAG(EnableAdvection); //! specifies if advection is considered in the model
+NEW_PROP_TAG(AdvectionType); //! The type for the calculation the advective fluxes
+NEW_PROP_TAG(SolutionDependentAdvection); //! specifies if the parameters for the advective fluxes depend on the solution
+NEW_PROP_TAG(EnableMolecularDiffusion); //! specifies if molecular diffusive fluxes are considered in the model
+NEW_PROP_TAG(MolecularDiffusionType); //! The type for the calculation of the molecular diffusion fluxes
+NEW_PROP_TAG(SolutionDependentMolecularDiffusion); //! specifies if the parameters for the diffusive fluxes depend on the solution
+NEW_PROP_TAG(EnableEnergyBalance); //! Specifies if the model solves an energy equation
+NEW_PROP_TAG(HeatConductionType); //! The type for the calculation of the heat conduction fluxes
+NEW_PROP_TAG(SolutionDependentHeatConduction); //! specifies if the parameters for the heat conduction fluxes depend on the solution
+
+NEW_PROP_TAG(NumPhases); //! Number of fluid phases in the system
+NEW_PROP_TAG(PhaseIdx); //! A phase index to allow using a two-phase fluidsystem for one-phase models
+NEW_PROP_TAG(NumComponents); //! Number of fluid phases in the system
+NEW_PROP_TAG(SpatialParams); //! The type of the spatial parameters object
+NEW_PROP_TAG(FluidSystem); //! The type of the fluid system to use
+NEW_PROP_TAG(Fluid); //! The fluid used for the default fluid system
+NEW_PROP_TAG(FluidState); //! The type of the fluid state to use
+NEW_PROP_TAG(PrimaryVariableSwitch); //! The primary variable switch needed for compositional models
+NEW_PROP_TAG(EffectiveDiffusivityModel); //! The employed model for the computation of the effective diffusivity
+NEW_PROP_TAG(ThermalConductivityModel); //! Model to be used for the calculation of the effective conductivity
+NEW_PROP_TAG(VelocityOutput); //! specifies the velocity calculation module to be used
+
+NEW_PROP_TAG(MaterialLaw); //! The material law which ought to be used (extracted from the spatial parameters)
+NEW_PROP_TAG(MaterialLawParams); //! The context material law (extracted from the spatial parameters)
+NEW_PROP_TAG(WettingPhase); //! The wetting phase for two-phase models
+NEW_PROP_TAG(NonwettingPhase); //! The non-wetting phase for two-phase models
+NEW_PROP_TAG(Formulation); //! The formulation of the model
+
+/////////////////////////////////////////////////////////////
+// non-isothermal porous medium flow models
+/////////////////////////////////////////////////////////////
+NEW_PROP_TAG(IsothermalVtkOutputFields);
+NEW_PROP_TAG(IsothermalVolumeVariables);
+NEW_PROP_TAG(IsothermalLocalResidual);
+NEW_PROP_TAG(IsothermalIndices);
+NEW_PROP_TAG(IsothermalNumEq);
+
+// specify if we evaluate the permeability in the volume (for discontinuous fields)
+// or at the scvf center for analytical permeability fields (e.g. convergence studies)
+NEW_PROP_TAG(EvaluatePermeabilityAtScvfIP);
+
+
+//////////////////////////////////////////////////////////////
+// Additional properties used by the 2pnc and 2pncmin models:
+//////////////////////////////////////////////////////////////
+NEW_PROP_TAG(Chemistry); //!< The chemistry class with which solves equlibrium reactions
+NEW_PROP_TAG(NumMajorComponents); //!< Number of major fluid components which are considered in the calculation of the phase density
+NEW_PROP_TAG(SetMoleFractionsForWettingPhase); //!< Set the mole fraction in the wetting or non-wetting phase
+
+/////////////////////////////////////////////////////////////
+// Properties used by the staggered-grid discretization method
+/////////////////////////////////////////////////////////////
+NEW_PROP_TAG(NumEqCellCenter); //! The number of equations for cell-centered dofs
+NEW_PROP_TAG(NumEqFace); //! The number of equations for face dofs
+NEW_PROP_TAG(CellCenterSolutionVector); //! The solution vector type for cell-centered dofs
+NEW_PROP_TAG(FaceSolutionVector); //! The solution vector type for face dofs
+NEW_PROP_TAG(GlobalFaceVars); //! Class containing face-related data
+NEW_PROP_TAG(CellCenterPrimaryVariables); //! The primary variables container type for cell-centered dofs
+NEW_PROP_TAG(FacePrimaryVariables); //! The primary variables container type for face dofs
+NEW_PROP_TAG(IntersectionMapper); //! Specifies the intersection mapper
+NEW_PROP_TAG(DofTypeIndices); //! Specifies index types for accessing the multi type block vectors/matrices
+NEW_PROP_TAG(StaggeredGeometryHelper); //! Specifies a helper class for the staggered grid geometry
+NEW_PROP_TAG(StaggeredPrimaryVariables); //! The hybrid primary variables container type
+NEW_PROP_TAG(BaseEpsilon); //! A base epsilon for numerical differentiation, can contain multiple values
+NEW_PROP_TAG(FaceVariables); //! Class containing local face-related data
+NEW_PROP_TAG(BoundaryValues); //! Class containing local boundary data
+}
+}
diff --git a/dumux/common/staggeredfvproblem.hh b/dumux/common/staggeredfvproblem.hh
new file mode 100644
index 0000000000000000000000000000000000000000..384bbcd3cc62d210a4c12ef3400a86185bc7d51d
--- /dev/null
+++ b/dumux/common/staggeredfvproblem.hh
@@ -0,0 +1,159 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Base class for all problems
+ */
+#ifndef DUMUX_STAGGERD_FV_PROBLEM_HH
+#define DUMUX_STAGGERD_FV_PROBLEM_HH
+
+#include <dumux/discretization/staggered/properties.hh>
+#include <dumux/common/fvproblem.hh>
+
+namespace Dumux
+{
+/*!
+ * \ingroup Problems
+ * \brief Base class for all finite-volume problems
+ *
+ * \note All quantities (regarding the units) are specified assuming a
+ * three-dimensional world. Problems discretized using 2D grids
+ * are assumed to be extruded by \f$1 m\f$ and 1D grids are assumed
+ * to have a cross section of \f$1m \times 1m\f$.
+ */
+template<class TypeTag>
+class StaggeredFVProblem : public FVProblem<TypeTag>
+{
+ using ParentType = FVProblem<TypeTag>;
+ using Implementation = typename GET_PROP_TYPE(TypeTag, Problem);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using PointSource = typename GET_PROP_TYPE(TypeTag, PointSource);
+ using PointSourceHelper = typename GET_PROP_TYPE(TypeTag, PointSourceHelper);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using InitialValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
+
+ enum {
+ dim = GridView::dimension,
+ dimWorld = GridView::dimensionworld
+ };
+
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Vertex = typename GridView::template Codim<dim>::Entity;
+ using CoordScalar = typename GridView::ctype;
+ using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
+
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
+
+ // using GridAdaptModel = ImplicitGridAdapt<TypeTag, adaptiveGrid>;
+
+public:
+ /*!
+ * \brief Constructor
+ *
+ * \param gridView The simulation's idea about physical space
+ */
+ StaggeredFVProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
+ { }
+
+ /*!
+ * \brief Evaluate the initial value for a control volume.
+ *
+ * \param globalPos The global position
+ */
+ PrimaryVariables initialAtPos(const GlobalPosition &globalPos) const
+ {
+ // Throw an exception (there is no reasonable default value
+ // for initial values)
+ DUNE_THROW(Dune::InvalidStateException,
+ "The problem does not provide "
+ "an initial() or an initialAtPos() method.");
+ }
+
+ /*!
+ * \brief Evaluate the initial value for
+ * an element (for cell-centered models)
+ * or vertex (for box / vertex-centered models)
+ *
+ * \param entity The dof entity (element or vertex)
+ */
+ template<class Entity>
+ InitialValues initial(const Entity& entity) const
+ {
+ // static_assert(int(Entity::codimension) == 0 || int(Entity::codimension) == dim, "Entity must be element or vertex");
+ return asImp_().initialAtPos(entity.center());
+ }
+
+ /*!
+ * \brief Applies the initial solution for all degrees of freedom of the grid.
+ *
+ */
+ void applyInitialSolution(SolutionVector& sol) const
+ {
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
+ {
+ auto fvGeometry = localView(this->fvGridGeometry());
+ fvGeometry.bindElement(element);
+
+ // loop over sub control volumes
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ // let the problem do the dirty work of nailing down
+ // the initial solution.
+ auto initPriVars = asImp_().initial(scv)[cellCenterIdx];
+ auto dofIdxGlobal = scv.dofIndex();
+ sol[cellCenterIdx][dofIdxGlobal] += initPriVars;
+ }
+
+ // loop over faces
+ for(auto&& scvf : scvfs(fvGeometry))
+ {
+ auto initPriVars = asImp_().initial(scvf)[faceIdx][scvf.directionIndex()];
+ sol[faceIdx][scvf.dofIndex()] = initPriVars;
+ }
+ }
+ }
+
+protected:
+ //! Returns the implementation of the problem (i.e. static polymorphism)
+ Implementation &asImp_()
+ { return *static_cast<Implementation *>(this); }
+
+ //! \copydoc asImp_()
+ const Implementation &asImp_() const
+ { return *static_cast<const Implementation *>(this); }
+
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/common/start/CMakeLists.txt b/dumux/common/start/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c20379f327c871c45a63487b5472353594567246
--- /dev/null
+++ b/dumux/common/start/CMakeLists.txt
@@ -0,0 +1,4 @@
+#install headers
+install(FILES
+instationarynonlinear.hh
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/common/start)
diff --git a/dumux/common/start/instationarynonlinear.hh b/dumux/common/start/instationarynonlinear.hh
new file mode 100644
index 0000000000000000000000000000000000000000..8811872d64373e93075bf732aca41826f4b8c450
--- /dev/null
+++ b/dumux/common/start/instationarynonlinear.hh
@@ -0,0 +1,371 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief Todo
+ */
+
+#ifndef DUMUX_INSTATIONARYNONLINEAR_START_HH
+#define DUMUX_INSTATIONARYNONLINEAR_START_HH
+
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+namespace Dumux
+{
+//! Forward declaration of the discretization method-specific implementation
+template <class TypeTag, DiscretizationMethods discMeth, DiffMethod diffMeth, bool isImplicit>
+struct InstationaryNonLinearSimulationImpl;
+
+/*!
+ * \ingroup Simulation
+ * \brief Struct that contains the program flow for the solution of instationary non-linear problems.
+ *
+ * \note Per default we use numerical differentiation for the assembly of the jacobian matrix
+ * and a fully implicit time integration scheme.
+ */
+template <class TypeTag, DiffMethod diffMeth = DiffMethod::numeric, bool isImplicit = true>
+using InstationaryNonLinearSimulation = InstationaryNonLinearSimulationImpl<TypeTag,
+ GET_PROP_VALUE(TypeTag, DiscretizationMethod),
+ diffMeth,
+ isImplicit>;
+
+//! Specialization for the cell-centered tpfa scheme
+template <class TypeTag, DiffMethod diffMeth, bool isImplicit>
+struct InstationaryNonLinearSimulationImpl<TypeTag, DiscretizationMethods::CCTpfa, diffMeth, isImplicit>
+{
+ static int start(int argc, char** argv)
+ {
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(0));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, diffMeth, isImplicit>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = typename GET_PROP_TYPE(TypeTag, LinearSolver);
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->elementMapper());
+
+ // the non-linear solver
+ using NewtonController = typename GET_PROP_TYPE(TypeTag, NewtonController);
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+ }
+};
+
+//! Specialization for the box scheme
+template <class TypeTag, DiffMethod diffMeth, bool isImplicit>
+struct InstationaryNonLinearSimulationImpl<TypeTag, DiscretizationMethods::Box, diffMeth, isImplicit>
+{
+ static int start(int argc, char** argv)
+ {
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(GridView::dimension));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, diffMeth, isImplicit>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = typename GET_PROP_TYPE(TypeTag, LinearSolver);
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->vertexMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+ }
+};
+
+//! Specialization for cell-centered mpfa schemes (uses the same as tpfa)
+template <class TypeTag, DiffMethod diffMeth, bool isImplicit>
+struct InstationaryNonLinearSimulationImpl<TypeTag, DiscretizationMethods::CCMpfa, diffMeth, isImplicit>
+ : public InstationaryNonLinearSimulationImpl<TypeTag, DiscretizationMethods::CCTpfa, diffMeth, isImplicit> {};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/common/timeloop.hh b/dumux/common/timeloop.hh
new file mode 100644
index 0000000000000000000000000000000000000000..e55f3fba204763769ca176fe13ec4ae141912b88
--- /dev/null
+++ b/dumux/common/timeloop.hh
@@ -0,0 +1,493 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Manages the handling of time dependent problems
+ */
+#ifndef DUMUX_TIME_LOOP_HH
+#define DUMUX_TIME_LOOP_HH
+
+#include <algorithm>
+#include <queue>
+
+#include <dune/common/float_cmp.hh>
+#include <dune/common/timer.hh>
+#include <dune/common/parallel/mpihelper.hh>
+
+#include "propertysystem.hh"
+#include "parameters.hh"
+
+namespace Dumux
+{
+/*!
+ * \ingroup SimControl
+ * \brief Manages the handling of time dependent problems.
+ *
+ * This class facilitates the time management of the simulation.
+ * It doesn't manage any user data, but keeps track of what the
+ * current time, time step size and "episode" of the
+ * simulation is. It triggers the initialization of the problem and
+ * is responsible for the time control of a simulation run.
+ *
+ * The time manager allows to specify a sequence of "episodes" which
+ * determine the boundary conditions of a problem. This approach
+ * is handy if the problem is not static, i.e. the boundary
+ * conditions change over time.
+ *
+ * An episode is a span of simulated time in which
+ * the problem behaves in a specific way. It is characterized by
+ * the (simulation) time it starts, its length and a consecutive
+ * index starting at 0.
+ */
+
+//! The abstract base class
+//! only contains the methods needed during the assembly
+////////////////////////////////////////////////////////////////////
+//! TODO this might not be necessary if t and dt are actually passed into
+//! a time stepping method that forwards it everywhere nedded
+//! Then the time loop always stays contained in the main file
+////////////////////////////////////////////////////////////////////
+template<class Scalar>
+class TimeLoopBase
+{
+public:
+ //! Abstract base class needs virtual constructor
+ virtual ~TimeLoopBase() {};
+
+ /*!
+ * \brief Return the time \f$\mathrm{[s]}\f$ before the time integration.
+ * To get the time after the time integration you have to add timeStepSize() to
+ * time().
+ */
+ virtual Scalar time() const = 0;
+
+ /*!
+ * \brief Returns the suggested time step length \f$\mathrm{[s]}\f$ so that we
+ * don't miss the beginning of the next episode or cross
+ * the end of the simulation.
+ */
+ virtual Scalar timeStepSize() const = 0;
+};
+
+//! The default time loop for instationary simulations
+template <class Scalar>
+class TimeLoop : public TimeLoopBase<Scalar>
+{
+public:
+ TimeLoop(Scalar startTime, Scalar dt, Scalar tEnd, bool verbose = true)
+ : timer_(false)
+ {
+ verbose_ =
+ verbose &&
+ Dune::MPIHelper::getCollectiveCommunication().rank() == 0;
+
+ time_ = startTime;
+ endTime_ = tEnd;
+
+ timeStepSize_ = dt;
+ previousTimeStepSize_ = timeStepSize_;
+ maxTimeStepSize_ = std::numeric_limits<Scalar>::max();
+ timeStepIdx_ = 0;
+ finished_ = false;
+ }
+
+ /*!
+ * \name Simulated time and time step management
+ * @{
+ */
+
+ /*!
+ * \brief Tells the time loop to start tracking the time.
+ */
+ void start()
+ {
+ timer_.start();
+ cpuTime_ = 0.0;
+ }
+
+ /*!
+ * \brief Advance time step.
+ */
+ void advanceTimeStep()
+ {
+ timeStepIdx_++;
+ time_ += timeStepSize_;
+ }
+
+ /*!
+ * \brief Set the current simulated time, don't change the current
+ * time step index.
+ *
+ * \param t The time \f$\mathrm{[s]}\f$ which should be jumped to
+ */
+ void setTime(Scalar t)
+ { time_ = t; }
+
+ /*!
+ * \brief Set the current simulated time and the time step index.
+ *
+ * \param t The time \f$\mathrm{[s]}\f$ which should be jumped to
+ * \param stepIdx The new time step index
+ */
+ void setTime(Scalar t, int stepIdx)
+ { time_ = t; timeStepIdx_ = stepIdx; }
+
+ /*!
+ * \brief Return the time \f$\mathrm{[s]}\f$ before the time integration.
+ * To get the time after the time integration you have to add timeStepSize() to
+ * time().
+ */
+ virtual Scalar time() const
+ { return time_; }
+
+ /*!
+ * \brief Returns the number of (simulated) seconds which the simulation runs.
+ */
+ Scalar endTime() const
+ { return endTime_; }
+
+ /*!
+ * \brief Set the time of simulated seconds at which the simulation runs.
+ *
+ * \param t The time \f$\mathrm{[s]}\f$ at which the simulation is finished
+ */
+ void setEndTime(Scalar t)
+ { endTime_ = t; }
+
+ /*!
+ * \brief Returns the current wall time (cpu time).
+ */
+ double wallTime() const
+ { return cpuTime_; }
+
+ /*!
+ * \brief Set the current time step size to a given value.
+ *
+ * If the step size would exceed the length of the current
+ * episode, the timeStep() method will take care that the step
+ * size won't exceed the episode or the end of the simulation,
+ * though.
+ * \note Always call this after TimeLoop::advanceTimeStep()
+ *
+ * \param dt The new value for the time step size \f$\mathrm{[s]}\f$
+ */
+ void setTimeStepSize(Scalar dt)
+ {
+ using std::min;
+ computeMaxTimeStepSize_();
+ timeStepSize_ = min(dt, maxTimeStepSize_);
+ }
+
+ /*!
+ * \brief Set the maximum time step size to a given value.
+ *
+ * \param dt The new value for the maximum time step size \f$\mathrm{[s]}\f$
+ */
+ void setMaxTimeStepSize(Scalar maxDt)
+ { maxTimeStepSize_ = maxDt; }
+
+ /*!
+ * \brief Returns the suggested time step length \f$\mathrm{[s]}\f$ so that we
+ * don't miss the beginning of the next episode or cross
+ * the end of the simulation.
+ */
+ virtual Scalar timeStepSize() const
+ { return timeStepSize_; }
+
+ /*!
+ * \brief Returns the size of the previous time step \f$\mathrm{[s]}\f$.
+ */
+ Scalar previousTimeStepSize() const
+ { return previousTimeStepSize_; }
+
+ /*!
+ * \brief Returns number of time steps which have been
+ * executed since the beginning of the simulation.
+ */
+ int timeStepIndex() const
+ { return timeStepIdx_; }
+
+ /*!
+ * \brief Specify whether the simulation is finished
+ *
+ * \param finished If true the simulation is considered finished
+ * before the end time is reached, else it is only
+ * considered finished if the end time is reached.
+ */
+ void setFinished(bool finished = true)
+ { finished_ = finished; }
+
+ /*!
+ * \brief Returns true if the simulation is finished.
+ *
+ * This is the case if either setFinished(true) has been called or
+ * if the end time is reached.
+ */
+ bool finished() const
+ { return finished_ || time_ >= endTime_; }
+
+ /*!
+ * \brief Returns true if the simulation is finished after the
+ * time level is incremented by the current time step size.
+ */
+ bool willBeFinished() const
+ { return finished_ || time_ + timeStepSize_ >= endTime_; }
+
+ /*!
+ * \brief The current maximum time step size
+ * \note This gets aligned on every setTimeStepSize call to end time
+ * and other possible check points
+ */
+ Scalar maxTimeStepSize() const
+ { return maxTimeStepSize_; }
+
+ /*!
+ * \brief State info on cpu time.
+ */
+ void reportTimeStep()
+ {
+ auto timeStepCpuTime = timer_.elapsed();
+ cpuTime_ += timeStepCpuTime;
+
+ if (verbose_)
+ {
+ std::cout << "Time step " << timeStepIdx_ << " done in "
+ << timeStepCpuTime << " seconds. "
+ << "Wall time: " << cpuTime_
+ << ", time: " << time_
+ << ", time step size: " << timeStepSize_
+ << std::endl;
+ }
+
+ timer_.reset();
+ }
+
+ /*!
+ * \brief Print final status and stops tracking the time.
+ */
+ template <class Communicator>
+ void finalize(const Communicator& comm = Dune::MPIHelper::getCollectiveCommunication())
+ {
+ timer_.stop();
+ cpuTime_ += timer_.elapsed();
+
+ if (verbose_)
+ {
+ std::cout << "Simulation took " << cpuTime_ << " seconds on "
+ << comm.size() << " processes.\n";
+ }
+
+ if (comm.size() > 1)
+ cpuTime_ = comm.sum(cpuTime_);
+
+ if (verbose_)
+ {
+ std::cout << "The cumulative CPU time was " << cpuTime_ << " seconds.\n";
+ }
+ }
+
+ //! If the time loop has verbose output
+ bool verbose() const
+ { return verbose_; }
+
+ /*
+ * @}
+ */
+
+private:
+ //! Computes the maximum timestep size respecting end time
+ //! and possibly episodes (TODO)
+ void computeMaxTimeStepSize_()
+ {
+ if (finished())
+ {
+ maxTimeStepSize_ = 0.0;
+ return;
+ }
+
+ using std::max;
+ using std::min;
+
+ // TODO check for episodes if there is an episode manager
+ maxTimeStepSize_ = min(maxTimeStepSize_, max<Scalar>(0.0, endTime_ - time_));
+ }
+
+ Dune::Timer timer_;
+ Scalar time_;
+ Scalar endTime_;
+ double cpuTime_;
+
+ Scalar timeStepSize_;
+ Scalar previousTimeStepSize_;
+ Scalar maxTimeStepSize_;
+ int timeStepIdx_;
+ bool finished_;
+ bool verbose_;
+};
+
+//! A time loop with a check point mechanism
+template <class Scalar>
+class CheckPointTimeLoop : public TimeLoop<Scalar>
+{
+public:
+ CheckPointTimeLoop(Scalar startTime, Scalar dt, Scalar tEnd, bool verbose = true)
+ : TimeLoop<Scalar>(startTime, dt, tEnd, verbose)
+ {
+ periodicCheckPoints_ = false;
+ deltaPeriodicCheckPoint_ = 0.0;
+ lastPeriodicCheckPoint_ = startTime;
+ isCheckPoint_ = false;
+ }
+
+ /*!
+ * \brief Advance time step.
+ */
+ void advanceTimeStep()
+ {
+ // advance time index and time
+ TimeLoop<Scalar>::advanceTimeStep();
+
+ //! Check point management, TimeLoop::isCheckPoint() has to be called after this!
+ // if we reached a periodic check point
+ if (periodicCheckPoints_ && Dune::FloatCmp::eq(this->time(), lastPeriodicCheckPoint_ + deltaPeriodicCheckPoint_, 1e-3*this->timeStepSize()))
+ {
+ lastPeriodicCheckPoint_ += deltaPeriodicCheckPoint_;
+ isCheckPoint_ = true;
+ }
+
+ // or a manually set check point
+ else if (!checkPoints_.empty() && Dune::FloatCmp::eq(this->time(), checkPoints_.front(), 1e-3*this->timeStepSize()))
+ {
+ checkPoints_.pop();
+ isCheckPoint_ = true;
+ }
+
+ // if not reset the check point flag
+ else
+ {
+ isCheckPoint_ = false;
+ }
+ }
+
+ /*!
+ * \brief Set the current time step size to a given value.
+ *
+ * If the step size would exceed the length of the current
+ * episode, the timeStep() method will take care that the step
+ * size won't exceed the episode or the end of the simulation,
+ * though.
+ * \note Always call this after TimeLoop::advanceTimeStep()
+ *
+ * \param dt The new value for the time step size \f$\mathrm{[s]}\f$
+ */
+ void setTimeStepSize(Scalar dt)
+ {
+ using std::min;
+ TimeLoop<Scalar>::setTimeStepSize(min(dt, computeStepSizeRespectingCheckPoints_()));
+ }
+
+ /*!
+ * \brief Set the maximum time step size to a given value.
+ *
+ * \param dt The new value for the maximum time step size \f$\mathrm{[s]}\f$
+ */
+ void setPeriodicCheckPoint(Scalar interval)
+ {
+ periodicCheckPoints_ = true;
+ deltaPeriodicCheckPoint_ = interval;
+ if (this->verbose())
+ std::cout << "Enabled periodic check points every " << interval << " seconds." << std::endl;
+ }
+
+ //! Whether now is a time checkpoint
+ //! has to be called after TimeLoop::advanceTimeStep()
+ bool isCheckPoint() const
+ { return isCheckPoint_; }
+
+ //! Adds a checkPoint to the queue
+ void setCheckPoint(Scalar t)
+ {
+ if (!checkPoints_.empty())
+ {
+ if (t < checkPoints_.back())
+ {
+ if (this->verbose())
+ std::cerr << "--- Couldn't insert checkpoint as it is earlier than the last check point in the queue.\n"
+ << "--- Checkpoints can only be inserted in ascending order." << std::endl;
+ }
+ else
+ checkPoints_.push(t);
+ }
+ else
+ checkPoints_.push(t);
+ }
+
+ //! Adds check points to the queue
+ //! \param tList list of check points ascending in time
+ void setCheckPoint(std::initializer_list<Scalar>&& tList)
+ {
+ if (!checkPoints_.empty())
+ {
+ for (auto&& t : tList)
+ {
+ if (t < checkPoints_.back())
+ {
+ if (this->verbose())
+ std::cerr << "--- Couldn't insert checkpoint as it is earlier than the last check point in the queue.\n"
+ << "--- Checkpoints can only be inserted in ascending order." << std::endl;
+ }
+ else
+ checkPoints_.emplace(t);
+ }
+ }
+ else
+ {
+ for (auto&& t : tList)
+ checkPoints_.emplace(t);
+ }
+ }
+
+private:
+ /*!
+ * \brief Aligns dt to the next check point
+ */
+ Scalar computeStepSizeRespectingCheckPoints_() const
+ {
+ using std::min;
+ auto maxDt = std::numeric_limits<Scalar>::max();
+
+ if (periodicCheckPoints_)
+ maxDt = min(maxDt, lastPeriodicCheckPoint_ + deltaPeriodicCheckPoint_ - this->time());
+
+ if (!checkPoints_.empty())
+ maxDt = min(maxDt, checkPoints_.front() - this->time());
+
+ return maxDt;
+ }
+
+ bool periodicCheckPoints_;
+ Scalar deltaPeriodicCheckPoint_;
+ Scalar lastPeriodicCheckPoint_;
+ std::queue<Scalar> checkPoints_;
+ bool isCheckPoint_;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/freeflow/staggeredni/propertydefaults.hh b/dumux/common/timesteppingscheme.hh
similarity index 54%
rename from dumux/freeflow/staggeredni/propertydefaults.hh
rename to dumux/common/timesteppingscheme.hh
index cd81fd2bbccb27f62b06e1ed69967d020de5c410..a0937297367bb1b8d5af106a7d5772249f26d4ba 100644
--- a/dumux/freeflow/staggeredni/propertydefaults.hh
+++ b/dumux/common/timesteppingscheme.hh
@@ -17,45 +17,63 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup OnePModel
* \file
- *
- * \brief Defines the properties required for the one-phase fully implicit model.
+ * \brief Manages the handling of time dependent problems
*/
-#ifndef DUMUX_NAVIER_STOKES_NI_PROPERTY_DEFAULTS_HH
-#define DUMUX_NAVIER_STOKES_NI_PROPERTY_DEFAULTS_HH
+#ifndef DUMUX_TIME_STEPPING_SCHEME_HH
+#define DUMUX_TIME_STEPPING_SCHEME_HH
-#include "indices.hh"
+#include "parameters.hh"
namespace Dumux
{
-// \{
-
-///////////////////////////////////////////////////////////////////////////
-// default property values for the non-isothermal single phase model
-///////////////////////////////////////////////////////////////////////////
-namespace Properties {
-
-SET_PROP(NavierStokesNonIsothermal, NumEqCellCenter)
+/*!
+ * \brief The abstract time stepping parameter interface
+ */
+template <class Scalar>
+class TimeSteppingParams
{
-private:
- static constexpr auto isothermalNumEqCellCenter = GET_PROP_VALUE(TypeTag, IsothermalNumEqCellCenter);
+
public:
- static constexpr auto value = isothermalNumEqCellCenter + 1;
-};
+ //! Pure abstract base classes have virtual destructor
+ virtual ~TimeSteppingScheme () {}
+
+ //! Returns if the time stepping scheme is implicit
+ virtual constexpr bool implicit() const = 0;
-SET_TYPE_PROP(NavierStokesNonIsothermal, Model, NavierStokesNonIsothermalModel<TypeTag>);
+ //! The number of stages in the time stepping scheme
+ virtual std::size_t numStages() const = 0;
-SET_TYPE_PROP(NavierStokesNonIsothermal, Indices, NavierStokesNonIsothermalIndices<TypeTag>);
+ //! The a parameters of the time stepping scheme
+ virtual Scalar a(int stage, int i) const = 0;
-SET_BOOL_PROP(NavierStokesNonIsothermal, EnableEnergyBalance, true);
+ //! The b parameters of the time stepping scheme
+ virtual Scalar b(int stage, int i) const = 0;
-SET_TYPE_PROP(NavierStokesNonIsothermal, HeatConductionType, FouriersLaw<TypeTag>);
+ //! The d parameters of the time stepping scheme
+ virtual Scalar d(int i) const = 0;
+
+ //! The name of the time stepping scheme
+ virtual std::string name() const = 0;
+};
-} // end namespace Properties
+/*!
+ * \brief The time stepping scheme class
+ */
+template <class Scalar>
+class TimeSteppingScheme
+{
+
+public:
+ TimeSteppingScheme(std::shared_ptr<TimeSteppingParams> method)
+ : method_(method)
+ {}
+
+private:
+ std::shared_ptr<TimeSteppingParams> method_;
+
+};
} // end namespace Dumux
diff --git a/dumux/discretization/basefvgridgeometry.hh b/dumux/discretization/basefvgridgeometry.hh
new file mode 100644
index 0000000000000000000000000000000000000000..c2bda59cebba51cc605acdba6f3025773b990a1a
--- /dev/null
+++ b/dumux/discretization/basefvgridgeometry.hh
@@ -0,0 +1,207 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Base class for all finite volume grid geometries
+ */
+#ifndef DUMUX_DISCRETIZATION_BASE_FV_GRID_GEOMETRY_HH
+#define DUMUX_DISCRETIZATION_BASE_FV_GRID_GEOMETRY_HH
+
+#include <dune/common/version.hh>
+#include <dune/grid/common/mcmgmapper.hh>
+
+#include <dumux/common/boundingboxtree.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup ImplicitModel
+ * \brief Base class for all finite volume grid geometries
+ */
+template<class TypeTag>
+class BaseFVGridGeometry
+{
+ using Implementation = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using ElementMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
+ using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using BoundingBoxTree = Dumux::BoundingBoxTree<GridView>;
+
+ static const int dim = GridView::dimension;
+ static const int dimWorld = GridView::dimensionworld;
+ using CoordScalar = typename GridView::ctype;
+ using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
+
+public:
+ //! Constructor
+ BaseFVGridGeometry(const GridView& gridView)
+ : gridView_(gridView)
+#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
+ , elementMapper_(gridView, Dune::mcmgElementLayout())
+ , vertexMapper_(gridView, Dune::mcmgVertexLayout())
+#else
+ , elementMapper_(gridView)
+ , vertexMapper_(gridView)
+#endif
+ , bBoxMin_(std::numeric_limits<double>::max())
+ , bBoxMax_(-std::numeric_limits<double>::max())
+ {
+ //! Compute the bouding box of the entire domain, for e.g. setting boundary conditions
+ computeGlobalBoundingBox_();
+ }
+
+ /*!
+ * \brief Return a local restriction of this global object
+ * The local object is only functional after calling its bind/bindElement method
+ * This is a free function that will be found by means of ADL
+ */
+ friend inline FVElementGeometry localView(const Implementation& fvGridGeometry)
+ { return FVElementGeometry(fvGridGeometry); }
+
+ /*!
+ * \brief Update all fvElementGeometries (do this again after grid adaption)
+ */
+ void update()
+ {
+ //! Update the mappers
+ vertexMapper_.update();
+ elementMapper_.update();
+
+ //! Compute the bouding box of the entire domain, for e.g. setting boundary conditions
+ computeGlobalBoundingBox_();
+
+ //! reset bounding box tree until requested the next time
+ boundingBoxTree_.reset(nullptr);
+ }
+
+ /*!
+ * \brief Return the gridView this global object lives on
+ */
+ const GridView& gridView() const
+ { return gridView_; }
+
+ /*!
+ * \brief Returns the mapper for vertices to indices for constant grids.
+ */
+ const VertexMapper &vertexMapper() const
+ { return vertexMapper_; }
+
+ /*!
+ * \brief Returns the mapper for elements to indices for constant grids.
+ */
+ const ElementMapper &elementMapper() const
+ { return elementMapper_; }
+
+ /*!
+ * \brief Returns the mapper for vertices to indices for possibly adaptive grids.
+ */
+ VertexMapper &vertexMapper()
+ { return vertexMapper_; }
+
+ /*!
+ * \brief Returns the mapper for elements to indices for possibly adaptive grids.
+ */
+ ElementMapper &elementMapper()
+ { return elementMapper_; }
+
+ /*!
+ * \brief Returns the bounding box tree of the grid
+ */
+ BoundingBoxTree& boundingBoxTree()
+ {
+ if(!boundingBoxTree_)
+ boundingBoxTree_ = std::make_unique<BoundingBoxTree>(gridView_);
+
+ return *boundingBoxTree_;
+ }
+
+ /*!
+ * \brief Returns the bounding box tree of the grid
+ */
+ const BoundingBoxTree& boundingBoxTree() const
+ {
+ if(!boundingBoxTree_)
+ boundingBoxTree_ = std::make_unique<BoundingBoxTree>(gridView_);
+
+ return *boundingBoxTree_;
+ }
+
+ /*!
+ * \brief The coordinate of the corner of the GridView's bounding
+ * box with the smallest values.
+ */
+ const GlobalPosition &bBoxMin() const
+ { return bBoxMin_; }
+
+ /*!
+ * \brief The coordinate of the corner of the GridView's bounding
+ * box with the largest values.
+ */
+ const GlobalPosition &bBoxMax() const
+ { return bBoxMax_; }
+
+private:
+
+ //! Compute the bouding box of the entire domain, for e.g. setting boundary conditions
+ void computeGlobalBoundingBox_()
+ {
+ // calculate the bounding box of the local partition of the grid view
+ for (const auto& vertex : vertices(gridView_))
+ {
+ for (int i=0; i<dimWorld; i++)
+ {
+ using std::min;
+ using std::max;
+ bBoxMin_[i] = min(bBoxMin_[i], vertex.geometry().corner(0)[i]);
+ bBoxMax_[i] = max(bBoxMax_[i], vertex.geometry().corner(0)[i]);
+ }
+ }
+
+ // communicate to get the bounding box of the whole domain
+ if (gridView_.comm().size() > 1)
+ {
+ for (int i = 0; i < dimWorld; ++i)
+ {
+ bBoxMin_[i] = gridView_.comm().min(bBoxMin_[i]);
+ bBoxMax_[i] = gridView_.comm().max(bBoxMax_[i]);
+ }
+ }
+ }
+
+ // the process grid view
+ const GridView gridView_;
+
+ // entity mappers
+ ElementMapper elementMapper_;
+ VertexMapper vertexMapper_;
+
+ // the bounding box tree of the grid view for effecient element intersections
+ mutable std::unique_ptr<BoundingBoxTree> boundingBoxTree_;
+
+ // the bounding box of the whole domain
+ GlobalPosition bBoxMin_;
+ GlobalPosition bBoxMax_;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/discretization/box/boxgeometryhelper.hh b/dumux/discretization/box/boxgeometryhelper.hh
index 39ad1776e93d99dc5b2e77f44126c10faf446741..61877fbe936ceeef5c1162740a140266ea286797 100644
--- a/dumux/discretization/box/boxgeometryhelper.hh
+++ b/dumux/discretization/box/boxgeometryhelper.hh
@@ -27,30 +27,24 @@
#include <dune/geometry/multilineargeometry.hh>
#include <dune/geometry/referenceelements.hh>
-#include <dumux/implicit/box/properties.hh>
#include <dumux/common/math.hh>
namespace Dumux
{
//! Create sub control volumes and sub control volume face geometries
-template<class GridView, int dim>
+template<class GridView, int dim, class ScvType, class ScvfType>
class BoxGeometryHelper;
//! A class to create sub control volume and sub control volume face geometries per element
-template <class GridView>
-class BoxGeometryHelper<GridView, 1>
+template <class GridView, class ScvType, class ScvfType>
+class BoxGeometryHelper<GridView, 1, ScvType, ScvfType>
{
private:
using Scalar = typename GridView::ctype;
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
-
- using ScvGeometry = Dune::CachedMultiLinearGeometry<Scalar, dim, dimWorld>;
- using ScvfGeometry = Dune::CachedMultiLinearGeometry<Scalar, dim-1, dimWorld>;
-
- using GlobalPosition = typename ScvGeometry::GlobalCoordinate;
- using PointVector = std::vector<GlobalPosition>;
+ using GlobalPosition = typename Dune::FieldVector<Scalar, GridView::dimensionworld>;
+ using ScvCornerStorage = typename ScvType::Traits::CornerStorage;
+ using ScvfCornerStorage = typename ScvfType::Traits::CornerStorage;
using Element = typename GridView::template Codim<0>::Entity;
using Intersection = typename GridView::Intersection;
@@ -66,7 +60,7 @@ public:
p({geometry.center(), geometry.corner(0), geometry.corner(1)}) {}
//! Create a vector with the scv corners
- PointVector getScvCorners(unsigned int localScvIdx) const
+ ScvCornerStorage getScvCorners(unsigned int localScvIdx) const
{
//! Only build the maps the first time we call this function
static const std::uint8_t map[2][2] =
@@ -75,25 +69,25 @@ public:
{2, 0}
};
- return PointVector( {p[map[localScvIdx][0]],
- p[map[localScvIdx][1]]} );
+ return ScvCornerStorage{ {p[map[localScvIdx][0]],
+ p[map[localScvIdx][1]]} };
}
//! Create a vector with the corners of sub control volume faces
- PointVector getScvfCorners(unsigned int localScvfIdx) const
+ ScvfCornerStorage getScvfCorners(unsigned int localScvfIdx) const
{
- return PointVector({p[0]});
+ return ScvfCornerStorage{{p[0]}};
}
//! Create the sub control volume face geometries on the boundary
- PointVector getBoundaryScvfCorners(const typename Intersection::Geometry& geometry,
- unsigned int indexInIntersection) const
+ ScvfCornerStorage getBoundaryScvfCorners(const typename Intersection::Geometry& geometry,
+ unsigned int indexInIntersection) const
{
- return PointVector({geometry.corner(0)});
+ return ScvfCornerStorage{{geometry.corner(0)}};
}
//! get scvf normal vector
- GlobalPosition normal(const PointVector& scvfCorners,
+ GlobalPosition normal(const ScvfCornerStorage& scvfCorners,
const std::vector<unsigned int>& scvIndices) const
{
auto normal = p[2] - p[1];
@@ -102,13 +96,13 @@ public:
}
//! get scv volume
- Scalar scvVolume(const PointVector& scvCorners) const
+ Scalar scvVolume(const ScvCornerStorage& scvCorners) const
{
return (scvCorners[1] - scvCorners[0]).two_norm();
}
//! get scvf area
- Scalar scvfArea(const PointVector& scvfCorners) const
+ Scalar scvfArea(const ScvfCornerStorage& scvfCorners) const
{
return 1.0;
}
@@ -120,23 +114,19 @@ private:
};
//! A class to create sub control volume and sub control volume face geometries per element
-template <class GridView>
-class BoxGeometryHelper<GridView, 2>
+template <class GridView, class ScvType, class ScvfType>
+class BoxGeometryHelper<GridView, 2, ScvType, ScvfType>
{
using Scalar = typename GridView::ctype;
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
-
- using ScvGeometry = Dune::CachedMultiLinearGeometry<Scalar, dim, dimWorld>;
- using ScvfGeometry = Dune::CachedMultiLinearGeometry<Scalar, dim-1, dimWorld>;
-
- using GlobalPosition = typename ScvGeometry::GlobalCoordinate;
- using PointVector = std::vector<GlobalPosition>;
+ using GlobalPosition = typename Dune::FieldVector<Scalar, GridView::dimensionworld>;
+ using ScvCornerStorage = typename ScvType::Traits::CornerStorage;
+ using ScvfCornerStorage = typename ScvfType::Traits::CornerStorage;
using Element = typename GridView::template Codim<0>::Entity;
using Intersection = typename GridView::Intersection;
- using ReferenceElements = typename Dune::ReferenceElements<Scalar, dim>;
+ using ReferenceElements = typename Dune::ReferenceElements<Scalar, GridView::dimension>;
+ static constexpr int dimWorld = GridView::dimensionworld;
//! the maximum number of helper points used to construct the geometries
//! Using a statically sized point array is much faster than dynamic allocation
@@ -163,7 +153,7 @@ public:
}
//! Create a vector with the scv corners
- PointVector getScvCorners(unsigned int localScvIdx) const
+ ScvCornerStorage getScvCorners(unsigned int localScvIdx) const
{
// proceed according to number of corners of the element
switch (corners_)
@@ -180,10 +170,10 @@ public:
{vo+2, fo+1, fo+2, 0}
};
- return PointVector( {p[map[localScvIdx][0]],
- p[map[localScvIdx][1]],
- p[map[localScvIdx][2]],
- p[map[localScvIdx][3]]} );
+ return ScvCornerStorage{ {p[map[localScvIdx][0]],
+ p[map[localScvIdx][1]],
+ p[map[localScvIdx][2]],
+ p[map[localScvIdx][3]]} };
}
case 4: // quadrilateral
{
@@ -198,21 +188,21 @@ public:
{vo+3, fo+3, fo+1, 0}
};
- return PointVector( {p[map[localScvIdx][0]],
- p[map[localScvIdx][1]],
- p[map[localScvIdx][2]],
- p[map[localScvIdx][3]]} );
+ return ScvCornerStorage{ {p[map[localScvIdx][0]],
+ p[map[localScvIdx][1]],
+ p[map[localScvIdx][2]],
+ p[map[localScvIdx][3]]} };
}
default:
- DUNE_THROW(Dune::NotImplemented, "Box scv geometries for dim=" << dim
- << " dimWorld=" << dimWorld
+ DUNE_THROW(Dune::NotImplemented, "Box scv geometries for dim=" << GridView::dimension
+ << " dimWorld=" << GridView::dimensionworld
<< " corners=" << corners_);
}
}
//! Create a vector with the corners of sub control volume faces
- PointVector getScvfCorners(unsigned int localScvfIdx) const
+ ScvfCornerStorage getScvfCorners(unsigned int localScvfIdx) const
{
// proceed according to number of corners
switch (corners_)
@@ -228,8 +218,8 @@ public:
{0, fo+2}
};
- return PointVector( {p[map[localScvfIdx][0]],
- p[map[localScvfIdx][1]]} );
+ return ScvfCornerStorage{ {p[map[localScvfIdx][0]],
+ p[map[localScvfIdx][1]]} };
}
case 4: // quadrilateral
{
@@ -243,24 +233,24 @@ public:
{fo+3, 0}
};
- return PointVector( {p[map[localScvfIdx][0]],
- p[map[localScvfIdx][1]]} );
+ return ScvfCornerStorage{ {p[map[localScvfIdx][0]],
+ p[map[localScvfIdx][1]]} };
}
default:
- DUNE_THROW(Dune::NotImplemented, "Box scvf geometries for dim=" << dim
- << " dimWorld=" << dimWorld
+ DUNE_THROW(Dune::NotImplemented, "Box scvf geometries for dim=" << GridView::dimension
+ << " dimWorld=" << GridView::dimensionworld
<< " corners=" << corners_);
}
}
//! Create the sub control volume face geometries on the boundary
- PointVector getBoundaryScvfCorners(const typename Intersection::Geometry& geometry,
- unsigned int indexInIntersection) const
+ ScvfCornerStorage getBoundaryScvfCorners(const typename Intersection::Geometry& geometry,
+ unsigned int indexInIntersection) const
{
if (indexInIntersection == 0)
- return PointVector({geometry.corner(0), geometry.center()});
+ return ScvfCornerStorage({geometry.corner(0), geometry.center()});
else if (indexInIntersection == 1)
- return PointVector({geometry.center(), geometry.corner(1)});
+ return ScvfCornerStorage({geometry.center(), geometry.corner(1)});
else
DUNE_THROW(Dune::InvalidStateException, "local index exceeds the number of corners of 2d intersections");
}
@@ -268,7 +258,7 @@ public:
//! get scvf normal vector for dim == 2, dimworld == 3
template <int w = dimWorld>
typename std::enable_if<w == 3, GlobalPosition>::type
- normal(const PointVector& scvfCorners,
+ normal(const ScvfCornerStorage& scvfCorners,
const std::vector<unsigned int>& scvIndices) const
{
const auto v1 = elementGeometry_.corner(1) - elementGeometry_.corner(0);
@@ -290,7 +280,7 @@ public:
//! get scvf normal vector for dim == 2, dimworld == 2
template <int w = dimWorld>
typename std::enable_if<w == 2, GlobalPosition>::type
- normal(const PointVector& scvfCorners,
+ normal(const ScvfCornerStorage& scvfCorners,
const std::vector<unsigned int>& scvIndices) const
{
const auto t = scvfCorners[1] - scvfCorners[0];
@@ -302,7 +292,7 @@ public:
//! get scv volume for dim == 2, dimworld == 3
template <int w = dimWorld>
typename std::enable_if<w == 3, Scalar>::type
- scvVolume(const PointVector& p) const
+ scvVolume(const ScvCornerStorage& p) const
{
return 0.5*Dumux::crossProduct(p[3]-p[0], p[2]-p[1]).two_norm();
}
@@ -310,13 +300,13 @@ public:
//! get scv volume for dim == 2, dimworld == 2
template <int w = dimWorld>
typename std::enable_if<w == 2, Scalar>::type
- scvVolume(const PointVector& p) const
+ scvVolume(const ScvCornerStorage& p) const
{
return 0.5*Dumux::crossProduct(p[3]-p[0], p[2]-p[1]);
}
//! get scvf area
- Scalar scvfArea(const PointVector& p) const
+ Scalar scvfArea(const ScvfCornerStorage& p) const
{
return (p[1]-p[0]).two_norm();
}
@@ -328,22 +318,19 @@ private:
};
//! A class to create sub control volume and sub control volume face geometries per element
-template <class GridView>
-class BoxGeometryHelper<GridView, 3>
+template <class GridView, class ScvType, class ScvfType>
+class BoxGeometryHelper<GridView, 3, ScvType, ScvfType>
{
using Scalar = typename GridView::ctype;
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
-
- using ScvGeometry = Dune::CachedMultiLinearGeometry<Scalar, dim, dimWorld>;
- using ScvfGeometry = Dune::CachedMultiLinearGeometry<Scalar, dim-1, dimWorld>;
-
- using GlobalPosition = typename ScvGeometry::GlobalCoordinate;
- using PointVector = std::vector<GlobalPosition>;
+ using GlobalPosition = typename Dune::FieldVector<Scalar, GridView::dimensionworld>;
+ using ScvCornerStorage = typename ScvType::Traits::CornerStorage;
+ using ScvfCornerStorage = typename ScvfType::Traits::CornerStorage;
using Element = typename GridView::template Codim<0>::Entity;
using Intersection = typename GridView::Intersection;
+ static constexpr auto dim = GridView::dimension;
+ static constexpr auto dimWorld = GridView::dimensionworld;
using ReferenceElements = typename Dune::ReferenceElements<Scalar, dim>;
using FaceReferenceElements = typename Dune::ReferenceElements<Scalar, dim-1>;
@@ -374,7 +361,7 @@ public:
}
//! Create a vector with the scv corners
- PointVector getScvCorners(unsigned int localScvIdx) const
+ ScvCornerStorage getScvCorners(unsigned int localScvIdx) const
{
// proceed according to number of corners of the element
switch (corners_)
@@ -393,14 +380,14 @@ public:
{vo+3, eo+3, eo+5, fo+2, eo+4, fo+1, fo+3, 0}
};
- return PointVector( {p[map[localScvIdx][0]],
- p[map[localScvIdx][1]],
- p[map[localScvIdx][2]],
- p[map[localScvIdx][3]],
- p[map[localScvIdx][4]],
- p[map[localScvIdx][5]],
- p[map[localScvIdx][6]],
- p[map[localScvIdx][7]]} );
+ return ScvCornerStorage{ {p[map[localScvIdx][0]],
+ p[map[localScvIdx][1]],
+ p[map[localScvIdx][2]],
+ p[map[localScvIdx][3]],
+ p[map[localScvIdx][4]],
+ p[map[localScvIdx][5]],
+ p[map[localScvIdx][6]],
+ p[map[localScvIdx][7]]} };
}
case 8: // hexahedron
{
@@ -420,14 +407,14 @@ public:
{vo+7, eo+9, eo+11, fo+5, eo+3, fo+1, fo+3, 0},
};
- return PointVector( {p[map[localScvIdx][0]],
- p[map[localScvIdx][1]],
- p[map[localScvIdx][2]],
- p[map[localScvIdx][3]],
- p[map[localScvIdx][4]],
- p[map[localScvIdx][5]],
- p[map[localScvIdx][6]],
- p[map[localScvIdx][7]]} );
+ return ScvCornerStorage{ {p[map[localScvIdx][0]],
+ p[map[localScvIdx][1]],
+ p[map[localScvIdx][2]],
+ p[map[localScvIdx][3]],
+ p[map[localScvIdx][4]],
+ p[map[localScvIdx][5]],
+ p[map[localScvIdx][6]],
+ p[map[localScvIdx][7]]} };
}
default:
DUNE_THROW(Dune::NotImplemented, "Box scv geometries for dim=" << dim
@@ -437,7 +424,7 @@ public:
}
//! Create a vector with the scvf corners
- PointVector getScvfCorners(unsigned int localScvfIdx) const
+ ScvfCornerStorage getScvfCorners(unsigned int localScvfIdx) const
{
// proceed according to number of corners of the element
switch (corners_)
@@ -457,10 +444,10 @@ public:
{eo+5, fo+2, fo+3, 0}
};
- return PointVector( {p[map[localScvfIdx][0]],
- p[map[localScvfIdx][1]],
- p[map[localScvfIdx][2]],
- p[map[localScvfIdx][3]]} );
+ return ScvfCornerStorage{ {p[map[localScvfIdx][0]],
+ p[map[localScvfIdx][1]],
+ p[map[localScvfIdx][2]],
+ p[map[localScvfIdx][3]]} };
}
case 8: // hexahedron
{
@@ -483,10 +470,10 @@ public:
{eo+11, fo+5, fo+3, 0}
};
- return PointVector( {p[map[localScvfIdx][0]],
- p[map[localScvfIdx][1]],
- p[map[localScvfIdx][2]],
- p[map[localScvfIdx][3]]} );
+ return ScvfCornerStorage{ {p[map[localScvfIdx][0]],
+ p[map[localScvfIdx][1]],
+ p[map[localScvfIdx][2]],
+ p[map[localScvfIdx][3]]} };
}
default:
DUNE_THROW(Dune::NotImplemented, "Box scv geometries for dim=" << dim
@@ -496,8 +483,8 @@ public:
}
//! Create the sub control volume face geometries on the boundary
- PointVector getBoundaryScvfCorners(const typename Intersection::Geometry& geometry,
- unsigned int indexInIntersection) const
+ ScvfCornerStorage getBoundaryScvfCorners(const typename Intersection::Geometry& geometry,
+ unsigned int indexInIntersection) const
{
// extract the corners of the sub control volumes
const auto& referenceElement = FaceReferenceElements::general(geometry.type());
@@ -531,10 +518,10 @@ public:
{vo+2, fo+1, fo+2, 0}
};
- return PointVector( {pi[map[indexInIntersection][0]],
- pi[map[indexInIntersection][1]],
- pi[map[indexInIntersection][2]],
- pi[map[indexInIntersection][3]]} );
+ return ScvfCornerStorage{ {pi[map[indexInIntersection][0]],
+ pi[map[indexInIntersection][1]],
+ pi[map[indexInIntersection][2]],
+ pi[map[indexInIntersection][3]]} };
}
case 4: // quadrilateral
{
@@ -549,10 +536,10 @@ public:
{vo+3, fo+3, fo+1, 0}
};
- return PointVector( {pi[map[indexInIntersection][0]],
- pi[map[indexInIntersection][1]],
- pi[map[indexInIntersection][2]],
- pi[map[indexInIntersection][3]]} );
+ return ScvfCornerStorage{ {pi[map[indexInIntersection][0]],
+ pi[map[indexInIntersection][1]],
+ pi[map[indexInIntersection][2]],
+ pi[map[indexInIntersection][3]]} };
}
default:
DUNE_THROW(Dune::NotImplemented, "Box scvf boundary geometries for dim=" << dim
@@ -562,7 +549,7 @@ public:
}
//! get scvf normal vector
- GlobalPosition normal(const PointVector& p,
+ GlobalPosition normal(const ScvfCornerStorage& p,
const std::vector<unsigned int>& scvIndices) const
{
auto normal = Dumux::crossProduct(p[1]-p[0], p[2]-p[0]);
@@ -577,7 +564,7 @@ public:
}
//! get scv volume
- Scalar scvVolume(const PointVector& p) const
+ Scalar scvVolume(const ScvCornerStorage& p) const
{
// after Grandy 1997, Efficient computation of volume of hexahedron
const auto v = p[7]-p[0];
@@ -587,7 +574,7 @@ public:
}
//! get scvf area
- Scalar scvfArea(const PointVector& p) const
+ Scalar scvfArea(const ScvfCornerStorage& p) const
{
// after Wolfram alpha quadrilateral area
return 0.5*Dumux::crossProduct(p[3]-p[0], p[2]-p[1]).two_norm();
diff --git a/dumux/discretization/box/darcyslaw.hh b/dumux/discretization/box/darcyslaw.hh
index e76e7123d5d449255e21790d8581251cc8fc1093..4d8eadc42fba11995ce80d3d96e8887b2e350c27 100644
--- a/dumux/discretization/box/darcyslaw.hh
+++ b/dumux/discretization/box/darcyslaw.hh
@@ -32,7 +32,6 @@
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
#include <dune/localfunctions/lagrange/pqkfactory.hh>
@@ -40,12 +39,6 @@
namespace Dumux
{
-namespace Properties
-{
-// forward declaration of properties
-NEW_PROP_TAG(ProblemEnableGravity);
-}
-
/*!
* \ingroup DarcysLaw
* \brief Specialization of Darcy's Law for the box method.
@@ -57,6 +50,7 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethods::Box>
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElemFluxVarCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
+ using FluxVarCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
@@ -69,7 +63,7 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethods::Box>
enum { dimWorld = GridView::dimensionworld};
using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
- using DimVector = Dune::FieldVector<Scalar, dimWorld>;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
@@ -95,15 +89,12 @@ public:
outsideK *= outsideVolVars.extrusionFactor();
const auto K = problem.spatialParams().harmonicMean(insideK, outsideK, scvf.unitOuterNormal());
+ static const bool enableGravity = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Problem.EnableGravity");
- const auto& jacInvT = fluxVarCache.jacInvT();
- const auto& shapeJacobian = fluxVarCache.shapeJacobian();
const auto& shapeValues = fluxVarCache.shapeValues();
- static const bool enableGravity = GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity);
-
// evaluate gradP - rho*g at integration point
- DimVector gradP(0.0);
+ GlobalPosition gradP(0.0);
Scalar rho(0.0);
for (auto&& scv : scvs(fvGeometry))
{
@@ -113,30 +104,59 @@ public:
rho += volVars.density(phaseIdx)*shapeValues[scv.indexInElement()][0];
// the global shape function gradient
- DimVector gradN;
- jacInvT.mv(shapeJacobian[scv.indexInElement()][0], gradN);
- gradP.axpy(volVars.pressure(phaseIdx), gradN);
+ gradP.axpy(volVars.pressure(phaseIdx), fluxVarCache.gradN(scv.indexInElement()));
}
if (enableGravity)
gradP.axpy(-rho, problem.gravityAtPos(scvf.center()));
// apply the permeability and return the flux
- auto KGradP = applyPermeability_(K, gradP);
+ const auto KGradP = applyPermeability_(K, gradP);
return -1.0*(KGradP*scvf.unitOuterNormal())*scvf.area();
}
+ // compute transmissibilities ti for analytical jacobians
+ static std::vector<Scalar> calculateTransmissibilities(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf,
+ const FluxVarCache& fluxVarCache)
+ {
+ const auto& insideScv = fvGeometry.scv(scvf.insideScvIdx());
+ const auto& outsideScv = fvGeometry.scv(scvf.outsideScvIdx());
+ const auto& insideVolVars = elemVolVars[insideScv];
+ const auto& outsideVolVars = elemVolVars[outsideScv];
+
+ auto insideK = insideVolVars.permeability();
+ auto outsideK = outsideVolVars.permeability();
+
+ // scale with correct extrusion factor
+ insideK *= insideVolVars.extrusionFactor();
+ outsideK *= outsideVolVars.extrusionFactor();
+
+ const auto K = problem.spatialParams().harmonicMean(insideK, outsideK, scvf.unitOuterNormal());
+
+ std::vector<Scalar> ti(fvGeometry.numScv());
+ for (const auto& scv : scvs(fvGeometry))
+ ti[scv.indexInElement()] =
+ -1.0*(applyPermeability_(K, fluxVarCache.gradN(scv.indexInElement()))
+ *scvf.unitOuterNormal())*scvf.area();
+
+ return ti;
+ }
+
private:
- inline static DimVector applyPermeability_(const DimWorldMatrix& K, const DimVector& gradI)
+ inline static GlobalPosition applyPermeability_(const DimWorldMatrix& K, const GlobalPosition& gradI)
{
- DimVector result(0.0);
+ GlobalPosition result(0.0);
K.mv(gradI, result);
return result;
}
- inline static DimVector applyPermeability_(const Scalar k, const DimVector& gradI)
+ inline static GlobalPosition applyPermeability_(const Scalar k, const GlobalPosition& gradI)
{
- DimVector result(gradI);
+ GlobalPosition result(gradI);
result *= k;
return result;
}
diff --git a/dumux/discretization/box/elementfluxvariablescache.hh b/dumux/discretization/box/elementfluxvariablescache.hh
index 97fb569f4b4fb451e2909c90a64a7970984ee67a..fa684d08c50854d5ed5223729604dbdf6b3d1dab 100644
--- a/dumux/discretization/box/elementfluxvariablescache.hh
+++ b/dumux/discretization/box/elementfluxvariablescache.hh
@@ -23,8 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_BOX_ELEMENT_FLUXVARSCACHE_HH
#define DUMUX_DISCRETIZATION_BOX_ELEMENT_FLUXVARSCACHE_HH
-#include <dumux/implicit/properties.hh>
-
namespace Dumux
{
@@ -70,7 +68,7 @@ public:
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
- eIdx_ = globalFluxVarsCache().problem_().elementMapper().index(element);
+ eIdx_ = fvGeometry.fvGridGeometry().elementMapper().index(element);
}
void bindScvf(const Element& element,
@@ -83,7 +81,7 @@ public:
// access operator
const FluxVariablesCache& operator [](const SubControlVolumeFace& scvf) const
- { return globalFluxVarsCache().get(eIdx_, scvf.index()); }
+ { return globalFluxVarsCache().cache(eIdx_, scvf.index()); }
//! The global object we are a restriction of
const GlobalFluxVariablesCache& globalFluxVarsCache() const
@@ -132,7 +130,7 @@ public:
// temporary resizing of the cache
fluxVarsCache_.resize(fvGeometry.numScvf());
for (auto&& scvf : scvfs(fvGeometry))
- (*this)[scvf].update(globalFluxVarsCache().problem_(), element, fvGeometry, elemVolVars, scvf);
+ (*this)[scvf].update(globalFluxVarsCache().problem(), element, fvGeometry, elemVolVars, scvf);
}
void bindScvf(const Element& element,
@@ -141,7 +139,7 @@ public:
const SubControlVolumeFace& scvf)
{
fluxVarsCache_.resize(fvGeometry.numScvf());
- (*this)[scvf].update(globalFluxVarsCache().problem_(), element, fvGeometry, elemVolVars, scvf);
+ (*this)[scvf].update(globalFluxVarsCache().problem(), element, fvGeometry, elemVolVars, scvf);
}
// access operator
@@ -161,6 +159,6 @@ private:
std::vector<FluxVariablesCache> fluxVarsCache_;
};
-} // end namespace
+} // end namespace Dumux
#endif
diff --git a/dumux/discretization/box/elementsolution.hh b/dumux/discretization/box/elementsolution.hh
new file mode 100644
index 0000000000000000000000000000000000000000..6921b5cdd9ca9e43c4f5fd1a42f73533efd9ca20
--- /dev/null
+++ b/dumux/discretization/box/elementsolution.hh
@@ -0,0 +1,102 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief The local element solution class for the box method
+ */
+#ifndef DUMUX_BOX_ELEMENT_SOLUTION_HH
+#define DUMUX_BOX_ELEMENT_SOLUTION_HH
+
+#include <dune/istl/bvector.hh>
+#include <dumux/common/properties.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup BoxModel
+ * \brief The element solution vector
+ */
+template<class TypeTag>
+class BoxElementSolution
+{
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+
+public:
+ //! Default constructors
+ BoxElementSolution() = default;
+ BoxElementSolution(BoxElementSolution&& other) = default;
+ BoxElementSolution(const BoxElementSolution& other) = default;
+
+ //! Constructor with element and solution and gridgeometry
+ BoxElementSolution(const Element& element, const SolutionVector& sol,
+ const FVGridGeometry& fvGridGeometry)
+ {
+ update(element, sol, fvGridGeometry);
+ }
+
+ //! Constructor with element and solution and elementgeometry (only works for box)
+ BoxElementSolution(const Element& element, const SolutionVector& sol,
+ const FVElementGeometry& fvGeometry)
+ {
+ update(element, sol, fvGeometry);
+ }
+
+ //! extract the element solution from the solution vector using a mapper
+ void update(const Element& element, const SolutionVector& sol,
+ const FVGridGeometry& fvGridGeometry)
+ {
+ const auto numVert = element.subEntities(GridView::dimension);
+ priVars_.resize(numVert);
+ for (int vIdx = 0; vIdx < numVert; ++vIdx)
+ priVars_[vIdx] = sol[fvGridGeometry.vertexMapper().subIndex(element, vIdx, GridView::dimension)];
+ }
+
+ //! extract the element solution from the solution vector using a local fv geometry
+ void update(const Element& element, const SolutionVector& sol,
+ const FVElementGeometry& fvGeometry)
+ {
+ const auto numVert = element.subEntities(GridView::dimension);
+ priVars_.resize(numVert);
+ for (const auto& scv : scvs(fvGeometry))
+ priVars_[scv.indexInElement()] = sol[scv.dofIndex()];
+ }
+
+ //! bracket operator const access
+ template<typename IndexType>
+ const PrimaryVariables& operator [](IndexType i) const
+ { return priVars_[i]; }
+
+ //! bracket operator access
+ template<typename IndexType>
+ PrimaryVariables& operator [](IndexType i)
+ { return priVars_[i]; }
+
+private:
+ Dune::BlockVector<PrimaryVariables> priVars_;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/discretization/box/elementvolumevariables.hh b/dumux/discretization/box/elementvolumevariables.hh
index 3ef2e870a49c8ebc7f3bac8dff01056f912fad0d..7857a531e61fe9d3c0566a9b563fd67305c8d831 100644
--- a/dumux/discretization/box/elementvolumevariables.hh
+++ b/dumux/discretization/box/elementvolumevariables.hh
@@ -23,8 +23,7 @@
#ifndef DUMUX_DISCRETIZATION_BOX_ELEMENT_VOLUMEVARIABLES_HH
#define DUMUX_DISCRETIZATION_BOX_ELEMENT_VOLUMEVARIABLES_HH
-#include <dumux/implicit/properties.hh>
-#include <dumux/implicit/model.hh>
+#include <dumux/discretization/methods.hh>
namespace Dumux
{
@@ -41,7 +40,6 @@ class BoxElementVolumeVariables
template<class TypeTag>
class BoxElementVolumeVariables<TypeTag,/*enableGlobalVolVarCache*/true>
{
- friend ImplicitModel<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
@@ -54,7 +52,7 @@ class BoxElementVolumeVariables<TypeTag,/*enableGlobalVolVarCache*/true>
static const int dim = GridView::dimension;
using Element = typename GridView::template Codim<0>::Entity;
- enum{ isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
public:
//! Constructor
@@ -81,7 +79,7 @@ public:
const FVElementGeometry& fvGeometry,
const SolutionVector& sol)
{
- eIdx_ = globalVolVars().problem_().elementMapper().index(element);
+ eIdx_ = fvGeometry.fvGridGeometry().elementMapper().index(element);
}
//! The global volume variables object we are a restriction of
@@ -106,6 +104,7 @@ class BoxElementVolumeVariables<TypeTag, /*enableGlobalVolVarCache*/false>
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using IndexType = typename GridView::IndexSet::IndexType;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
static const int dim = GridView::dimension;
using Element = typename GridView::template Codim<0>::Entity;
@@ -129,15 +128,15 @@ public:
const SolutionVector& sol)
{
// get the solution at the dofs of the element
- auto elemSol = globalVolVars().problem_().model().elementSolution(element, sol);
+ ElementSolutionVector elemSol(element, sol, fvGeometry);
// resize volume variables to the required size
volumeVariables_.resize(fvGeometry.numScv());
for (auto&& scv : scvs(fvGeometry))
{
// TODO: INTERFACE SOLVER
- // globalVolVars().problem_().model().boxInterfaceConditionSolver().updateScvVolVars(element, scv, sol);
- volumeVariables_[scv.indexInElement()].update(elemSol, globalVolVars().problem_(), element, scv);
+ // globalVolVars().problem().model().boxInterfaceConditionSolver().updateScvVolVars(element, scv, sol);
+ volumeVariables_[scv.indexInElement()].update(elemSol, globalVolVars().problem(), element, scv);
}
}
diff --git a/dumux/discretization/box/fickslaw.hh b/dumux/discretization/box/fickslaw.hh
index 50c778472249dd55c8dc69df0bcc9c4a759032e4..81797cf2ed6bde2dd877ab3e98e01232c8cd805f 100644
--- a/dumux/discretization/box/fickslaw.hh
+++ b/dumux/discretization/box/fickslaw.hh
@@ -29,7 +29,6 @@
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
namespace Dumux
@@ -52,7 +51,6 @@ class FicksLawImplementation<TypeTag, DiscretizationMethods::Box>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Model = typename GET_PROP_TYPE(TypeTag, Model);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
@@ -61,6 +59,8 @@ class FicksLawImplementation<TypeTag, DiscretizationMethods::Box>
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
+ using FluxVarCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
+ using BalanceEqOpts = typename GET_PROP_TYPE(TypeTag, BalanceEqOpts);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using IndexType = typename GridView::IndexSet::IndexType;
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
@@ -95,23 +95,12 @@ public:
// evaluate gradX at integration point and interpolate density
const auto& fluxVarsCache = elemFluxVarsCache[scvf];
- const auto& jacInvT = fluxVarsCache.jacInvT();
- const auto& shapeJacobian = fluxVarsCache.shapeJacobian();
const auto& shapeValues = fluxVarsCache.shapeValues();
+ // density interpolation
Scalar rho(0.0);
- std::vector<GlobalPosition> gradN(fvGeometry.numScv());
-
for (auto&& scv : scvs(fvGeometry))
- {
- const auto& volVars = elemVolVars[scv];
-
- // density interpolation
- rho += volVars.molarDensity(phaseIdx)*shapeValues[scv.indexInElement()][0];
-
- // the ansatz function gradient
- jacInvT.mv(shapeJacobian[scv.indexInElement()][0], gradN[scv.indexInElement()]);
- }
+ rho += elemVolVars[scv].molarDensity(phaseIdx)*shapeValues[scv.indexInElement()][0];
for (int compIdx = 0; compIdx < numComponents; compIdx++)
{
@@ -121,11 +110,11 @@ public:
// effective diffusion tensors
using EffDiffModel = typename GET_PROP_TYPE(TypeTag, EffectiveDiffusivityModel);
auto insideD = EffDiffModel::effectiveDiffusivity(insideVolVars.porosity(),
- insideVolVars.saturation(phaseIdx),
- insideVolVars.diffusionCoefficient(phaseIdx, compIdx));
+ insideVolVars.saturation(phaseIdx),
+ insideVolVars.diffusionCoefficient(phaseIdx, compIdx));
auto outsideD = EffDiffModel::effectiveDiffusivity(outsideVolVars.porosity(),
- outsideVolVars.saturation(phaseIdx),
- outsideVolVars.diffusionCoefficient(phaseIdx, compIdx));
+ outsideVolVars.saturation(phaseIdx),
+ outsideVolVars.diffusionCoefficient(phaseIdx, compIdx));
// scale by extrusion factor
insideD *= insideVolVars.extrusionFactor();
@@ -140,18 +129,68 @@ public:
const auto& volVars = elemVolVars[scv];
// the mole/mass fraction gradient
- gradX.axpy(volVars.moleFraction(phaseIdx, compIdx), gradN[scv.indexInElement()]);
+ gradX.axpy(volVars.moleFraction(phaseIdx, compIdx), fluxVarsCache.gradN(scv.indexInElement()));
}
// apply the diffusion tensor and return the flux
auto DGradX = applyDiffusionTensor_(D, gradX);
componentFlux[compIdx] = -1.0*rho*(DGradX*scvf.unitOuterNormal())*scvf.area();
- if (Model::mainComponentIsBalanced(phaseIdx) && !FluidSystem::isTracerFluidSystem())
+ if (BalanceEqOpts::mainComponentIsBalanced(phaseIdx) && !FluidSystem::isTracerFluidSystem())
componentFlux[phaseIdx] -= componentFlux[compIdx];
}
return componentFlux;
}
+ // compute transmissibilities ti for analytical jacobians
+ static std::array<std::vector<Scalar>, numComponents>
+ calculateTransmissibilities(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf,
+ const FluxVarCache& fluxVarCache,
+ const int phaseIdx)
+ {
+ Scalar rho(0.0);
+ const auto& shapeValues = fluxVarCache.shapeValues();
+ for (auto&& scv : scvs(fvGeometry))
+ rho += elemVolVars[scv].molarDensity(phaseIdx)*shapeValues[scv.indexInElement()][0];
+
+ const auto& insideVolVars = elemVolVars[scvf.insideScvIdx()];
+ const auto& outsideVolVars = elemVolVars[scvf.outsideScvIdx()];
+
+ std::array<std::vector<Scalar>, numComponents> ti;
+ for (int compIdx = 0; compIdx < numComponents; compIdx++)
+ {
+ if(FluidSystem::isMainComponent(compIdx, phaseIdx))
+ continue;
+
+ // effective diffusion tensors
+ using EffDiffModel = typename GET_PROP_TYPE(TypeTag, EffectiveDiffusivityModel);
+ auto insideD = EffDiffModel::effectiveDiffusivity(insideVolVars.porosity(),
+ insideVolVars.saturation(phaseIdx),
+ insideVolVars.diffusionCoefficient(phaseIdx, compIdx));
+ auto outsideD = EffDiffModel::effectiveDiffusivity(outsideVolVars.porosity(),
+ outsideVolVars.saturation(phaseIdx),
+ outsideVolVars.diffusionCoefficient(phaseIdx, compIdx));
+
+ // scale by extrusion factor
+ insideD *= insideVolVars.extrusionFactor();
+ outsideD *= outsideVolVars.extrusionFactor();
+
+ // the resulting averaged diffusion tensor
+ const auto D = problem.spatialParams().harmonicMean(insideD, outsideD, scvf.unitOuterNormal());
+
+ ti[compIdx].resize(fvGeometry.numScv());
+ for (auto&& scv : scvs(fvGeometry))
+ ti[compIdx][scv.indexInElement()] =
+ -rho*(applyDiffusionTensor_(D, fluxVarCache.gradN(scv.indexInElement()))
+ *scvf.unitOuterNormal())*scvf.area();
+ }
+
+ return ti;
+ }
+
private:
static GlobalPosition applyDiffusionTensor_(const DimWorldMatrix& D, const GlobalPosition& gradI)
{
diff --git a/dumux/discretization/box/fourierslaw.hh b/dumux/discretization/box/fourierslaw.hh
index a19160a3720ab5417d51324c7957315c1833217c..0c1c71429ceaa3d7e2015e6397f594ad685f6ce8 100644
--- a/dumux/discretization/box/fourierslaw.hh
+++ b/dumux/discretization/box/fourierslaw.hh
@@ -29,7 +29,6 @@
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
namespace Dumux
diff --git a/dumux/discretization/box/fvelementgeometry.hh b/dumux/discretization/box/fvelementgeometry.hh
index 0c52731976584db0d29deabea060635236b78694..d48e80e0266c16a189cf3f38df0023ee8be1ae26 100644
--- a/dumux/discretization/box/fvelementgeometry.hh
+++ b/dumux/discretization/box/fvelementgeometry.hh
@@ -30,7 +30,6 @@
#include <dumux/discretization/scvandscvfiterators.hh>
#include <dumux/discretization/box/boxgeometryhelper.hh>
-#include <dumux/implicit/box/properties.hh>
namespace Dumux
{
@@ -54,7 +53,6 @@ template<class TypeTag>
class BoxFVElementGeometry<TypeTag, true>
{
using ThisType = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using IndexType = typename GridView::IndexSet::IndexType;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
@@ -150,7 +148,7 @@ public:
void bindElement(const Element& element)
{
elementPtr_ = &element;
- eIdx_ = fvGridGeometry().problem_().elementMapper().index(element);
+ eIdx_ = fvGridGeometry().elementMapper().index(element);
}
//! The global finite volume geometry we are a restriction of
@@ -188,7 +186,7 @@ class BoxFVElementGeometry<TypeTag, false>
using FeLocalBasis = typename FeCache::FiniteElementType::Traits::LocalBasisType;
using ReferenceElements = typename Dune::ReferenceElements<CoordScalar, dim>;
- using GeometryHelper = BoxGeometryHelper<GridView, dim>;
+ using GeometryHelper = BoxGeometryHelper<GridView, dim, SubControlVolume, SubControlVolumeFace>;
public:
//! Constructor
@@ -263,7 +261,7 @@ public:
void bindElement(const Element& element)
{
elementPtr_ = &element;
- eIdx_ = fvGridGeometry().problem_().elementMapper().index(element);
+ eIdx_ = fvGridGeometry().elementMapper().index(element);
makeElementGeometries(element);
}
@@ -275,7 +273,7 @@ private:
void makeElementGeometries(const Element& element)
{
- auto eIdx = fvGridGeometry().problem_().elementMapper().index(element);
+ auto eIdx = fvGridGeometry().elementMapper().index(element);
// get the element geometry
auto elementGeometry = element.geometry();
@@ -289,7 +287,7 @@ private:
for (unsigned int scvLocalIdx = 0; scvLocalIdx < elementGeometry.corners(); ++scvLocalIdx)
{
// get asssociated dof index
- auto dofIdxGlobal = fvGridGeometry().problem_().vertexMapper().subIndex(element, scvLocalIdx, dim);
+ auto dofIdxGlobal = fvGridGeometry().vertexMapper().subIndex(element, scvLocalIdx, dim);
// add scv to the local container
scvs_[scvLocalIdx] = SubControlVolume(geometryHelper,
diff --git a/dumux/discretization/box/fvgridgeometry.hh b/dumux/discretization/box/fvgridgeometry.hh
index 3d1f8bb9d6b767e0174f88ee5c9da3524b521449..6e7a8149a34e8339dc197e4a2a2028fe427c0e3c 100644
--- a/dumux/discretization/box/fvgridgeometry.hh
+++ b/dumux/discretization/box/fvgridgeometry.hh
@@ -22,16 +22,15 @@
* This builds up the sub control volumes and sub control volume faces
* for each element of the grid partition.
*/
-#ifndef DUMUX_DISCRETIZATION_BOX_GLOBAL_FVGEOMETRY_HH
-#define DUMUX_DISCRETIZATION_BOX_GLOBAL_FVGEOMETRY_HH
+#ifndef DUMUX_DISCRETIZATION_BOX_GRID_FVGEOMETRY_HH
+#define DUMUX_DISCRETIZATION_BOX_GRID_FVGEOMETRY_HH
#include <dune/geometry/referenceelements.hh>
#include <dune/localfunctions/lagrange/pqkfactory.hh>
+#include <dumux/discretization/basefvgridgeometry.hh>
#include <dumux/discretization/box/boxgeometryhelper.hh>
#include <dumux/discretization/box/fvelementgeometry.hh>
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/common/elementmap.hh>
namespace Dumux
{
@@ -48,18 +47,17 @@ class BoxFVGridGeometry
// specialization in case the FVElementGeometries are stored
template<class TypeTag>
-class BoxFVGridGeometry<TypeTag, true>
+class BoxFVGridGeometry<TypeTag, true> : public BaseFVGridGeometry<TypeTag>
{
+ using ParentType = BaseFVGridGeometry<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using IndexType = typename GridView::IndexSet::IndexType;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
using Element = typename GridView::template Codim<0>::Entity;
- //! The local class needs access to the scv, scvfs
- //! as they are globally cached
- friend typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using CoordScalar = typename GridView::ctype;
@@ -71,12 +69,17 @@ class BoxFVGridGeometry<TypeTag, true>
using FeLocalBasis = typename FeCache::FiniteElementType::Traits::LocalBasisType;
using ReferenceElements = typename Dune::ReferenceElements<CoordScalar, dim>;
- using GeometryHelper = BoxGeometryHelper<GridView, dim>;
+ using GeometryHelper = BoxGeometryHelper<GridView, dim, SubControlVolume, SubControlVolumeFace>;
public:
//! Constructor
BoxFVGridGeometry(const GridView gridView)
- : gridView_(gridView) {}
+ : ParentType(gridView) {}
+
+ //! the vertex mapper is the dofMapper
+ //! this is convenience to have better chance to have the same main files for box/tpfa/mpfa...
+ const VertexMapper& dofMapper() const
+ { return this->vertexMapper(); }
//! The total number of sub control volumes
std::size_t numScv() const
@@ -91,30 +94,32 @@ public:
std::size_t numBoundaryScvf() const
{ return numBoundaryScvf_; }
- //! Return the gridView this global object lives on
- const GridView& gridView() const
- { return gridView_; }
+ //! The total number of degrees of freedom
+ std::size_t numDofs()
+ { return this->gridView().size(dim); }
//! update all fvElementGeometries (do this again after grid adaption)
- void update(const Problem& problem)
+ void update()
{
- problemPtr_ = &problem;
+ ParentType::update();
scvs_.clear();
scvfs_.clear();
- auto numElements = gridView_.size(0);
+ auto numElements = this->gridView().size(0);
scvs_.resize(numElements);
scvfs_.resize(numElements);
+ boundaryDofIndices_.resize(numDofs(), false);
+
numScv_ = 0;
numScvf_ = 0;
numBoundaryScvf_ = 0;
// Build the SCV and SCV faces
- for (const auto& element : elements(gridView_))
+ for (const auto& element : elements(this->gridView()))
{
// fill the element map with seeds
- auto eIdx = problem.elementMapper().index(element);
+ auto eIdx = this->elementMapper().index(element);
// count
numScv_ += element.subEntities(dim);
@@ -131,7 +136,7 @@ public:
scvs_[eIdx].resize(elementGeometry.corners());
for (unsigned int scvLocalIdx = 0; scvLocalIdx < elementGeometry.corners(); ++scvLocalIdx)
{
- auto dofIdxGlobal = problem.vertexMapper().subIndex(element, scvLocalIdx, dim);
+ auto dofIdxGlobal = this->vertexMapper().subIndex(element, scvLocalIdx, dim);
scvs_[eIdx][scvLocalIdx] = SubControlVolume(geometryHelper,
scvLocalIdx,
@@ -157,7 +162,7 @@ public:
}
// construct the sub control volume faces on the domain boundary
- for (const auto& intersection : intersections(gridView_, element))
+ for (const auto& intersection : intersections(this->gridView(), element))
{
if (intersection.boundary())
{
@@ -183,21 +188,22 @@ public:
// increment local counter
scvfLocalIdx++;
}
+
+ // add all vertices on the intersection to the set of
+ // boundary vertices
+ const auto fIdx = intersection.indexInInside();
+ const auto numFaceVerts = referenceElement.size(fIdx, 1, dim);
+ for (int localVIdx = 0; localVIdx < numFaceVerts; ++localVIdx)
+ {
+ const auto vIdx = referenceElement.subEntity(fIdx, 1, localVIdx, dim);
+ const auto vIdxGlobal = this->vertexMapper().subIndex(element, vIdx, dim);
+ boundaryDofIndices_[vIdxGlobal] = true;
+ }
}
}
}
}
- /*!
- * \brief Return a local restriction of this global object
- * The local object is only functional after calling its bind/bindElement method
- * This is a free function that will be found by means of ADL
- */
- friend FVElementGeometry localView(const BoxFVGridGeometry& global)
- {
- return FVElementGeometry(global);
- }
-
//! The finite element cache for creating local FE bases
const FeCache& feCache() const
{ return feCache_; }
@@ -210,35 +216,37 @@ public:
const std::vector<SubControlVolumeFace>& scvfs(IndexType eIdx) const
{ return scvfs_[eIdx]; }
+ //! If a vertex / d.o.f. is on the boundary
+ bool dofOnBoundary(unsigned int dofIdx) const
+ { return boundaryDofIndices_[dofIdx]; }
+
private:
- const Problem& problem_() const
- { return *problemPtr_; }
- const Problem* problemPtr_;
const FeCache feCache_;
- GridView gridView_;
std::vector<std::vector<SubControlVolume>> scvs_;
std::vector<std::vector<SubControlVolumeFace>> scvfs_;
// TODO do we need those?
std::size_t numScv_;
std::size_t numScvf_;
std::size_t numBoundaryScvf_;
+
+ // vertices on the boudary
+ std::vector<bool> boundaryDofIndices_;
};
// specialization in case the FVElementGeometries are not stored
template<class TypeTag>
-class BoxFVGridGeometry<TypeTag, false>
+class BoxFVGridGeometry<TypeTag, false> : public BaseFVGridGeometry<TypeTag>
{
+ using ParentType = BaseFVGridGeometry<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using IndexType = typename GridView::IndexSet::IndexType;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
-
- //! The local class needs access to the problem
- friend typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
static const int dim = GridView::dimension;
static const int dimWorld = GridView::dimensionworld;
@@ -256,8 +264,12 @@ class BoxFVGridGeometry<TypeTag, false>
public:
//! Constructor
BoxFVGridGeometry(const GridView gridView)
- : gridView_(gridView)
- {}
+ : ParentType(gridView) {}
+
+ //! the vertex mapper is the dofMapper
+ //! this is convenience to have better chance to have the same main files for box/tpfa/mpfa...
+ const VertexMapper& dofMapper() const
+ { return this->vertexMapper(); }
//! The total number of sub control volumes
std::size_t numScv() const
@@ -272,59 +284,64 @@ public:
std::size_t numBoundaryScvf() const
{ return numBoundaryScvf_; }
- //! Return the gridView this global object lives on
- const GridView& gridView() const
- { return gridView_; }
+ //! The total number of degrees of freedom
+ std::size_t numDofs() const
+ { return this->gridView().size(dim); }
//! update all fvElementGeometries (do this again after grid adaption)
- void update(const Problem& problem)
+ void update()
{
- problemPtr_ = &problem;
+ ParentType::update();
+
+ boundaryDofIndices_.resize(numDofs(), false);
// save global data on the grid's scvs and scvfs
// TODO do we need those information?
numScv_ = 0;
numScvf_ = 0;
numBoundaryScvf_ = 0;
- for (const auto& element : elements(gridView_))
+ for (const auto& element : elements(this->gridView()))
{
numScv_ += element.subEntities(dim);
numScvf_ += element.subEntities(dim-1);
+ const auto elementGeometry = element.geometry();
+ const auto& referenceElement = ReferenceElements::general(elementGeometry.type());
+
// store the sub control volume face indices on the domain boundary
- for (const auto& intersection : intersections(gridView_, element))
+ for (const auto& intersection : intersections(this->gridView(), element))
{
if (intersection.boundary())
{
- auto isGeometry = intersection.geometry();
+ const auto isGeometry = intersection.geometry();
numScvf_ += isGeometry.corners();
numBoundaryScvf_ += isGeometry.corners();
+
+ // add all vertices on the intersection to the set of
+ // boundary vertices
+ const auto fIdx = intersection.indexInInside();
+ const auto numFaceVerts = referenceElement.size(fIdx, 1, dim);
+ for (int localVIdx = 0; localVIdx < numFaceVerts; ++localVIdx)
+ {
+ const auto vIdx = referenceElement.subEntity(fIdx, 1, localVIdx, dim);
+ const auto vIdxGlobal = this->vertexMapper().subIndex(element, vIdx, dim);
+ boundaryDofIndices_[vIdxGlobal] = true;
+ }
}
}
}
}
- /*!
- * \brief Return a local restriction of this global object
- * The local object is only functional after calling its bind/bindElement method
- * This is a free function that will be found by means of ADL
- */
- friend FVElementGeometry localView(const BoxFVGridGeometry& global)
- {
- return FVElementGeometry(global);
- }
-
//! The finite element cache for creating local FE bases
const FeCache& feCache() const
{ return feCache_; }
-private:
+ //! If a vertex / d.o.f. is on the boundary
+ bool dofOnBoundary(unsigned int dofIdx) const
+ { return boundaryDofIndices_[dofIdx]; }
- const Problem& problem_() const
- { return *problemPtr_; }
+private:
- GridView gridView_;
- const Problem* problemPtr_;
const FeCache feCache_;
// Information on the global number of geometries
@@ -332,8 +349,11 @@ private:
std::size_t numScv_;
std::size_t numScvf_;
std::size_t numBoundaryScvf_;
+
+ // vertices on the boudary
+ std::vector<bool> boundaryDofIndices_;
};
-} // end namespace
+} // end namespace Dumux
#endif
diff --git a/dumux/discretization/box/globalfluxvariablescache.hh b/dumux/discretization/box/globalfluxvariablescache.hh
index de58e8141b5cf302f6daeea4fa5d1e7ebe70f0c6..d1196df20e943ac21496ba310d58bf4f3f60f5f7 100644
--- a/dumux/discretization/box/globalfluxvariablescache.hh
+++ b/dumux/discretization/box/globalfluxvariablescache.hh
@@ -20,10 +20,9 @@
* \file
* \brief Global flux variable cache
*/
-#ifndef DUMUX_DISCRETIZATION_BOX_GLOBAL_FLUXVARSCACHE_HH
-#define DUMUX_DISCRETIZATION_BOX_GLOBAL_FLUXVARSCACHE_HH
+#ifndef DUMUX_DISCRETIZATION_BOX_GRID_FLUXVARSCACHE_HH
+#define DUMUX_DISCRETIZATION_BOX_GRID_FLUXVARSCACHE_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/box/elementfluxvariablescache.hh>
namespace Dumux
@@ -33,7 +32,7 @@ namespace Dumux
* \ingroup ImplicitModel
* \brief Base class for the flux variables cache vector, we store one cache per face
*/
-template<class TypeTag, bool EnableGlobalFluxVariablesCache>
+template<class TypeTag, bool EnableGridFluxVariablesCache>
class BoxGlobalFluxVariablesCache
{};
@@ -44,10 +43,11 @@ class BoxGlobalFluxVariablesCache
template<class TypeTag>
class BoxGlobalFluxVariablesCache<TypeTag, true>
{
- // the local class needs access to the problem
- friend BoxElementFluxVariablesCache<TypeTag, true>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
using IndexType = typename GridView::IndexSet::IndexType;
using Element = typename GridView::template Codim<0>::Entity;
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
@@ -57,24 +57,30 @@ class BoxGlobalFluxVariablesCache<TypeTag, true>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
public:
- void update(Problem& problem)
+ BoxGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+
+ void update(const FVGridGeometry& fvGridGeometry,
+ const GridVolumeVariables& gridVolVars,
+ const SolutionVector& sol,
+ bool forceUpdate = false)
{
- problemPtr_ = &problem;
- fluxVarsCache_.resize(problem.gridView().size(0));
- for (const auto& element : elements(problem.gridView()))
+ // Here, we do not do anything unless it is a forced update
+ if (forceUpdate)
{
- auto eIdx = problem.elementMapper().index(element);
- // bind the geometries and volume variables to the element (all the elements in stencil)
- auto fvGeometry = localView(problem.model().fvGridGeometry());
- fvGeometry.bind(element);
+ fluxVarsCache_.resize(fvGridGeometry.gridView().size(0));
+ for (const auto& element : elements(fvGridGeometry.gridView()))
+ {
+ auto eIdx = fvGridGeometry.elementMapper().index(element);
+ // bind the geometries and volume variables to the element (all the elements in stencil)
+ auto fvGeometry = localView(fvGridGeometry);
+ fvGeometry.bind(element);
- auto elemVolVars = localView(problem.model().curGlobalVolVars());
- elemVolVars.bind(element, fvGeometry, problem.model().curSol());
+ auto elemVolVars = localView(gridVolVars);
+ elemVolVars.bind(element, fvGeometry, sol);
- fluxVarsCache_[eIdx].resize(fvGeometry.numScvf());
- for (auto&& scvf : scvfs(fvGeometry))
- {
- this->get(eIdx, scvf.index()).update(problem, element, fvGeometry, elemVolVars, scvf);
+ fluxVarsCache_[eIdx].resize(fvGeometry.numScvf());
+ for (auto&& scvf : scvfs(fvGeometry))
+ cache(eIdx, scvf.index()).update(problem(), element, fvGeometry, elemVolVars, scvf);
}
}
}
@@ -87,18 +93,18 @@ public:
friend inline ElementFluxVariablesCache localView(const BoxGlobalFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
-private:
- const Problem& problem_() const
+ const Problem& problem() const
{ return *problemPtr_; }
// access operator
- const FluxVariablesCache& get(IndexType eIdx, IndexType scvfIdx) const
+ const FluxVariablesCache& cache(IndexType eIdx, IndexType scvfIdx) const
{ return fluxVarsCache_[eIdx][scvfIdx]; }
// access operator
- FluxVariablesCache& get(IndexType eIdx, IndexType scvfIdx)
+ FluxVariablesCache& cache(IndexType eIdx, IndexType scvfIdx)
{ return fluxVarsCache_[eIdx][scvfIdx]; }
+private:
// currently bound element
const Problem* problemPtr_;
std::vector<std::vector<FluxVariablesCache>> fluxVarsCache_;
@@ -111,10 +117,11 @@ private:
template<class TypeTag>
class BoxGlobalFluxVariablesCache<TypeTag, false>
{
- // the local class needs access to the problem
- friend BoxElementFluxVariablesCache<TypeTag, false>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
using IndexType = typename GridView::IndexSet::IndexType;
using Element = typename GridView::template Codim<0>::Entity;
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
@@ -124,9 +131,12 @@ class BoxGlobalFluxVariablesCache<TypeTag, false>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
public:
+ BoxGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
- void update(Problem& problem)
- { problemPtr_ = &problem; }
+ void update(const FVGridGeometry& fvGridGeometry,
+ const GridVolumeVariables& gridVolVars,
+ const SolutionVector& sol,
+ bool forceUpdate = false) {}
/*!
* \brief Return a local restriction of this global object
@@ -136,11 +146,10 @@ public:
friend inline ElementFluxVariablesCache localView(const BoxGlobalFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
-private:
- const Problem& problem_() const
+ const Problem& problem() const
{ return *problemPtr_; }
- // currently bound element
+private:
const Problem* problemPtr_;
};
diff --git a/dumux/discretization/box/globalvolumevariables.hh b/dumux/discretization/box/globalvolumevariables.hh
index 3b50d93842d29d98ac42c2ac9f9d6c3e2ae5d745..27e9f0b768804cc53162dee79508d9aac6bcd104 100644
--- a/dumux/discretization/box/globalvolumevariables.hh
+++ b/dumux/discretization/box/globalvolumevariables.hh
@@ -23,7 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_BOX_GLOBAL_VOLUMEVARIABLES_HH
#define DUMUX_DISCRETIZATION_BOX_GLOBAL_VOLUMEVARIABLES_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/box/elementvolumevariables.hh>
namespace Dumux
@@ -41,11 +40,6 @@ class BoxGlobalVolumeVariables
template<class TypeTag>
class BoxGlobalVolumeVariables<TypeTag,/*enableGlobalVolVarCache*/true>
{
- // The local class needs to access and change volVars
- friend BoxElementVolumeVariables<TypeTag, true>;
- // The local jacobian needs to access and change volVars for derivative calculation
- friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
-
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
@@ -54,37 +48,32 @@ class BoxGlobalVolumeVariables<TypeTag,/*enableGlobalVolVarCache*/true>
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using IndexType = typename GridView::IndexSet::IndexType;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
static const int dim = GridView::dimension;
using Element = typename GridView::template Codim<0>::Entity;
- enum{ isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
-
public:
- void update(Problem& problem, const SolutionVector& sol)
- {
- problemPtr_ = &problem;
+ BoxGlobalVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
- volumeVariables_.resize(problem.gridView().size(0));
- for (const auto& element : elements(problem.gridView()))
+ void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol)
+ {
+ volumeVariables_.resize(fvGridGeometry.gridView().size(0));
+ for (const auto& element : elements(fvGridGeometry.gridView()))
{
- auto eIdx = problem_().elementMapper().index(element);
+ auto eIdx = fvGridGeometry.elementMapper().index(element);
- auto fvGeometry = localView(problem.model().fvGridGeometry());
+ auto fvGeometry = localView(fvGridGeometry);
fvGeometry.bindElement(element);
// get the element solution
- auto elemSol = problem.model().elementSolution(element, sol);
+ ElementSolutionVector elemSol(element, sol, fvGeometry);
// update the volvars of the element
volumeVariables_[eIdx].resize(fvGeometry.numScv());
for (auto&& scv : scvs(fvGeometry))
- {
- volumeVariables_[eIdx][scv.indexInElement()].update(elemSol,
- problem,
- element,
- scv);
- }
+ volumeVariables_[eIdx][scv.indexInElement()].update(elemSol, problem(), element, scv);
}
}
@@ -102,13 +91,11 @@ public:
VolumeVariables& volVars(const IndexType eIdx, const IndexType scvIdx)
{ return volumeVariables_[eIdx][scvIdx]; }
-private:
- const Problem& problem_() const
+ const Problem& problem() const
{ return *problemPtr_; }
+private:
const Problem* problemPtr_;
-
- IndexType eIdx_;
std::vector<std::vector<VolumeVariables>> volumeVariables_;
};
@@ -117,17 +104,16 @@ private:
template<class TypeTag>
class BoxGlobalVolumeVariables<TypeTag, /*enableGlobalVolVarCache*/false>
{
- // prev vol vars have to be a friend class in order for the assignment operator to work
- friend BoxElementVolumeVariables<TypeTag, false>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
public:
+ BoxGlobalVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
- void update(Problem& problem, const SolutionVector& sol)
- { problemPtr_ = &problem; }
+ void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) {}
/*!
* \brief Return a local restriction of this global object
@@ -137,14 +123,13 @@ public:
friend inline ElementVolumeVariables localView(const BoxGlobalVolumeVariables& global)
{ return ElementVolumeVariables(global); }
-private:
-
- Problem& problem_() const
+ const Problem& problem() const
{ return *problemPtr_;}
- Problem* problemPtr_;
+private:
+ const Problem* problemPtr_;
};
-} // end namespace
+} // end namespace Dumux
#endif
diff --git a/dumux/discretization/box/properties.hh b/dumux/discretization/box/properties.hh
new file mode 100644
index 0000000000000000000000000000000000000000..58b9fc6102f4cf141219742292eecb9cd5e570db
--- /dev/null
+++ b/dumux/discretization/box/properties.hh
@@ -0,0 +1,180 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \ingroup Properties
+ * \file
+ *
+ * \brief Defines a type tag and some properties for models using the box scheme.
+ */
+
+#ifndef DUMUX_BOX_PROPERTIES_HH
+#define DUMUX_BOX_PROPERTIES_HH
+
+#include <dune/common/fvector.hh>
+#include <dune/geometry/multilineargeometry.hh>
+
+#include <dumux/discretization/methods.hh>
+#include <dumux/discretization/fvproperties.hh>
+
+#include <dumux/implicit/box/elementboundarytypes.hh>
+#include <dumux/implicit/box/localresidual.hh>
+
+#include <dumux/discretization/box/subcontrolvolume.hh>
+#include <dumux/discretization/box/subcontrolvolumeface.hh>
+#include <dumux/discretization/box/elementsolution.hh>
+#include <dumux/discretization/box/globalfluxvariablescache.hh>
+#include <dumux/discretization/box/elementfluxvariablescache.hh>
+#include <dumux/discretization/box/globalvolumevariables.hh>
+#include <dumux/discretization/box/elementvolumevariables.hh>
+#include <dumux/discretization/box/fvgridgeometry.hh>
+#include <dumux/discretization/box/fvelementgeometry.hh>
+
+namespace Dumux
+{
+namespace Properties
+{
+//! Type tag for the box scheme.
+NEW_TYPE_TAG(BoxModel, INHERITS_FROM(FiniteVolumeModel));
+
+//! Set the corresponding discretization method property
+SET_PROP(BoxModel, DiscretizationMethod)
+{
+ static const DiscretizationMethods value = DiscretizationMethods::Box;
+};
+
+//! Set the default for the FVElementGeometry vector
+SET_TYPE_PROP(BoxModel, FVGridGeometry, BoxFVGridGeometry<TypeTag,
+ GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
+
+//! Set the default for the FVElementGeometry vector
+SET_TYPE_PROP(BoxModel, FVElementGeometry, BoxFVElementGeometry<TypeTag,
+ GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
+
+//! The sub control volume
+SET_PROP(BoxModel, SubControlVolume)
+{
+private:
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
+ static const int dim = Grid::dimension;
+ static const int dimWorld = Grid::dimensionworld;
+
+ // we use geometry traits that use static corner vectors to and a fixed geometry type
+ template <class ct>
+ struct ScvfMLGTraits : public Dune::MultiLinearGeometryTraits<ct>
+ {
+ // we use static vectors to store the corners as we know
+ // the number of corners in advance (2^(dim) corners (1<<(dim))
+ template< int mydim, int cdim >
+ struct CornerStorage
+ {
+ using Type = std::array< Dune::FieldVector< ct, cdim >, (1<<(dim)) >;
+ };
+
+ // we know all scvfs will have the same geometry type
+ template< int mydim >
+ struct hasSingleGeometryType
+ {
+ static const bool v = true;
+ static const unsigned int topologyId = Dune::Impl::CubeTopology< mydim >::type::id;
+ };
+ };
+
+ struct ScvGeometryTraits
+ {
+ using GridIndexType = typename Grid::LeafGridView::IndexSet::IndexType;
+ using LocalIndexType = unsigned int;
+ using Scalar = typename Grid::ctype;
+ using Geometry = Dune::MultiLinearGeometry<Scalar, dim, dimWorld, ScvfMLGTraits<Scalar>>;
+ using CornerStorage = typename ScvfMLGTraits<Scalar>::template CornerStorage<dim, dimWorld>::Type;
+ using GlobalPosition = typename CornerStorage::value_type;
+ };
+public:
+ using type = BoxSubControlVolume<ScvGeometryTraits>;
+};
+
+SET_PROP(BoxModel, SubControlVolumeFace)
+{
+private:
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
+ static const int dim = Grid::dimension;
+ static const int dimWorld = Grid::dimensionworld;
+
+ // we use geometry traits that use static corner vectors to and a fixed geometry type
+ template <class ct>
+ struct ScvfMLGTraits : public Dune::MultiLinearGeometryTraits<ct>
+ {
+ // we use static vectors to store the corners as we know
+ // the number of corners in advance (2^(dim-1) corners (1<<(dim-1))
+ template< int mydim, int cdim >
+ struct CornerStorage
+ {
+ using Type = std::array< Dune::FieldVector< ct, cdim >, (1<<(dim-1)) >;
+ };
+
+ // we know all scvfs will have the same geometry type
+ template< int mydim >
+ struct hasSingleGeometryType
+ {
+ static const bool v = true;
+ static const unsigned int topologyId = Dune::Impl::CubeTopology< mydim >::type::id;
+ };
+ };
+
+ struct ScvfGeometryTraits
+ {
+ using GridIndexType = typename Grid::LeafGridView::IndexSet::IndexType;
+ using LocalIndexType = unsigned int;
+ using Scalar = typename Grid::ctype;
+ using Geometry = Dune::MultiLinearGeometry<Scalar, dim-1, dimWorld, ScvfMLGTraits<Scalar>>;
+ using CornerStorage = typename ScvfMLGTraits<Scalar>::template CornerStorage<dim-1, dimWorld>::Type;
+ using GlobalPosition = typename CornerStorage::value_type;
+ };
+public:
+ using type = BoxSubControlVolumeFace<ScvfGeometryTraits>;
+};
+
+//! Set the solution vector type for an element
+SET_TYPE_PROP(BoxModel, ElementSolutionVector, BoxElementSolution<TypeTag>);
+
+//! Set the default for the ElementBoundaryTypes
+SET_TYPE_PROP(BoxModel, ElementBoundaryTypes, BoxElementBoundaryTypes<TypeTag>);
+
+//! The global volume variables vector class
+SET_TYPE_PROP(BoxModel, GlobalVolumeVariables, BoxGlobalVolumeVariables<TypeTag,
+ GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
+
+//! The element volume variables vector class
+SET_TYPE_PROP(BoxModel, ElementVolumeVariables, BoxElementVolumeVariables<TypeTag,
+ GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
+
+//! The global flux variables cache vector class
+SET_TYPE_PROP(BoxModel, GlobalFluxVariablesCache, BoxGlobalFluxVariablesCache<TypeTag,
+ GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+
+//! The local flux variables cache vector class
+SET_TYPE_PROP(BoxModel, ElementFluxVariablesCache, BoxElementFluxVariablesCache<TypeTag,
+ GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+
+//! Set the BaseLocalResidual to BoxLocalResidual
+SET_TYPE_PROP(BoxModel, BaseLocalResidual, BoxLocalResidual<TypeTag>);
+
+} // namespace Properties
+} // namespace Dumux
+
+#endif
diff --git a/dumux/discretization/box/subcontrolvolume.hh b/dumux/discretization/box/subcontrolvolume.hh
index a9e22d33f85818bc272605b521556235423b4856..b29f786ed3f55b478bca36bc98e2a6b89a11a91f 100644
--- a/dumux/discretization/box/subcontrolvolume.hh
+++ b/dumux/discretization/box/subcontrolvolume.hh
@@ -23,36 +23,37 @@
#ifndef DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH
#define DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUME_HH
-#include <dune/common/fvector.hh>
#include <dumux/discretization/subcontrolvolumebase.hh>
#include <dumux/discretization/box/boxgeometryhelper.hh>
#include <dumux/common/math.hh>
namespace Dumux
{
-template<class G, typename I>
-class BoxSubControlVolume : public SubControlVolumeBase<BoxSubControlVolume<G, I>, G, I>
+template<class ScvGeometryTraits>
+class BoxSubControlVolume : public SubControlVolumeBase<BoxSubControlVolume<ScvGeometryTraits>, ScvGeometryTraits>
{
- using ParentType = SubControlVolumeBase<BoxSubControlVolume<G, I>, G, I>;
- using Geometry = G;
- using IndexType = I;
-
- using Scalar = typename Geometry::ctype;
+ using ParentType = SubControlVolumeBase<BoxSubControlVolume<ScvGeometryTraits>, ScvGeometryTraits>;
+ using Geometry = typename ScvGeometryTraits::Geometry;
+ using GridIndexType = typename ScvGeometryTraits::GridIndexType;
+ using LocalIndexType = typename ScvGeometryTraits::LocalIndexType;
+ using Scalar = typename ScvGeometryTraits::Scalar;
+ using GlobalPosition = typename ScvGeometryTraits::GlobalPosition;
+ using CornerStorage = typename ScvGeometryTraits::CornerStorage;
enum { dim = Geometry::mydimension };
- enum { dimworld = Geometry::coorddimension };
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
-
public:
+ //! state the traits public and thus export all types
+ using Traits = ScvGeometryTraits;
+
//! The default constructor
BoxSubControlVolume() = default;
// the contructor in the box case
template<class GeometryHelper>
BoxSubControlVolume(const GeometryHelper& geometryHelper,
- IndexType scvIdx,
- IndexType elementIndex,
- IndexType dofIndex)
+ LocalIndexType scvIdx,
+ GridIndexType elementIndex,
+ GridIndexType dofIndex)
: corners_(geometryHelper.getScvCorners(scvIdx)),
center_(0.0),
volume_(geometryHelper.scvVolume(corners_)),
@@ -86,13 +87,13 @@ public:
}
//! The global index of this scv
- IndexType indexInElement() const
+ LocalIndexType indexInElement() const
{
return scvIdx_;
}
//! The index of the dof this scv is embedded in
- IndexType dofIndex() const
+ GridIndexType dofIndex() const
{
return dofIndex_;
}
@@ -105,25 +106,25 @@ public:
}
//! The global index of the element this scv is embedded in
- IndexType elementIndex() const
+ GridIndexType elementIndex() const
{
return elementIndex_;
}
//! Return the corner for the given local index
- GlobalPosition corner(unsigned int localIdx) const
+ GlobalPosition corner(LocalIndexType localIdx) const
{
assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
return corners_[localIdx];
}
private:
- std::vector<GlobalPosition> corners_;
+ CornerStorage corners_;
GlobalPosition center_;
Scalar volume_;
- IndexType elementIndex_;
- IndexType scvIdx_;
- IndexType dofIndex_;
+ GridIndexType elementIndex_;
+ LocalIndexType scvIdx_;
+ GridIndexType dofIndex_;
};
} // end namespace
diff --git a/dumux/discretization/box/subcontrolvolumeface.hh b/dumux/discretization/box/subcontrolvolumeface.hh
index 915f322acbefc7e0b718955fc454ad405c3ba7d9..77af3b7ec4959af3525c070bb9dce48d7c107992 100644
--- a/dumux/discretization/box/subcontrolvolumeface.hh
+++ b/dumux/discretization/box/subcontrolvolumeface.hh
@@ -24,7 +24,7 @@
#define DUMUX_DISCRETIZATION_BOX_SUBCONTROLVOLUMEFACE_HH
#include <utility>
-#include <dune/common/fvector.hh>
+#include <dune/geometry/type.hh>
#include <dumux/discretization/subcontrolvolumefacebase.hh>
#include <dumux/discretization/box/boxgeometryhelper.hh>
@@ -36,19 +36,17 @@ namespace Dumux
* \brief Class for a sub control volume face in the box method, i.e a part of the boundary
* of a sub control volume we compute fluxes on. We simply use the base class here.
*/
-template<class G, typename I>
-class BoxSubControlVolumeFace : public SubControlVolumeFaceBase<BoxSubControlVolumeFace<G, I>, G, I>
+template<class ScvfGeometryTraits>
+class BoxSubControlVolumeFace
+: public SubControlVolumeFaceBase<BoxSubControlVolumeFace<ScvfGeometryTraits>, ScvfGeometryTraits>
{
- using ParentType = SubControlVolumeFaceBase<BoxSubControlVolumeFace<G, I>, G, I>;
- using Geometry = G;
- using IndexType = I;
-
- using Scalar = typename Geometry::ctype;
- static const int dim = Geometry::mydimension;
- static const int dimworld = Geometry::coorddimension;
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
- using LocalPosition = Dune::FieldVector<Scalar, dim>;
+ using ParentType = SubControlVolumeFaceBase<BoxSubControlVolumeFace<ScvfGeometryTraits>, ScvfGeometryTraits>;
+ using GridIndexType = typename ScvfGeometryTraits::GridIndexType;
+ using LocalIndexType = typename ScvfGeometryTraits::LocalIndexType;
+ using Scalar = typename ScvfGeometryTraits::Scalar;
+ using GlobalPosition = typename ScvfGeometryTraits::GlobalPosition;
+ using CornerStorage = typename ScvfGeometryTraits::CornerStorage;
+ using Geometry = typename ScvfGeometryTraits::Geometry;
public:
//! The default constructor
@@ -59,8 +57,8 @@ public:
BoxSubControlVolumeFace(const GeometryHelper& geometryHelper,
const Element& element,
const typename Element::Geometry& elemGeometry,
- IndexType scvfIndex,
- const std::vector<IndexType>& scvIndices,
+ GridIndexType scvfIndex,
+ const std::vector<LocalIndexType>& scvIndices,
bool boundary = false)
: corners_(geometryHelper.getScvfCorners(scvfIndex)),
center_(0.0),
@@ -80,9 +78,9 @@ public:
BoxSubControlVolumeFace(const GeometryHelper& geometryHelper,
const Intersection& intersection,
const typename Intersection::Geometry& isGeometry,
- unsigned int indexInIntersection,
- IndexType scvfIndex,
- const std::vector<IndexType>& scvIndices,
+ LocalIndexType indexInIntersection,
+ GridIndexType scvfIndex,
+ const std::vector<LocalIndexType>& scvIndices,
bool boundary = false)
: corners_(geometryHelper.getBoundaryScvfCorners(isGeometry, indexInIntersection)),
center_(0.0),
@@ -128,21 +126,21 @@ public:
}
//! index of the inside sub control volume for spatial param evaluation
- IndexType insideScvIdx() const
+ LocalIndexType insideScvIdx() const
{
return scvIndices_[0];
}
//! index of the outside sub control volume for spatial param evaluation
// This results in undefined behaviour if boundary is true
- IndexType outsideScvIdx() const
+ LocalIndexType outsideScvIdx() const
{
assert(!boundary());
return scvIndices_[1];
}
//! The global index of this sub control volume face
- IndexType index() const
+ GridIndexType index() const
{
return scvfIndex_;
}
@@ -156,16 +154,16 @@ public:
//! The geometry of the sub control volume face
Geometry geometry() const
{
- return Geometry(Dune::GeometryType(Dune::GeometryType::cube, dim), corners_);
+ return Geometry(Dune::GeometryTypes::cube(Geometry::mydimension), corners_);
}
private:
- std::vector<GlobalPosition> corners_;
+ CornerStorage corners_;
GlobalPosition center_;
GlobalPosition unitOuterNormal_;
Scalar area_;
- IndexType scvfIndex_;
- std::vector<IndexType> scvIndices_;
+ GridIndexType scvfIndex_;
+ std::vector<LocalIndexType> scvIndices_;
bool boundary_;
};
diff --git a/dumux/implicit/cellcentered/assemblymap.hh b/dumux/discretization/cellcentered/connectivitymap.hh
similarity index 82%
rename from dumux/implicit/cellcentered/assemblymap.hh
rename to dumux/discretization/cellcentered/connectivitymap.hh
index a2bb34b5e815c174f51b13778bf035e44bd1b398..2c7447599bce86118902c3633b0198c5bade164e 100644
--- a/dumux/implicit/cellcentered/assemblymap.hh
+++ b/dumux/discretization/cellcentered/connectivitymap.hh
@@ -22,19 +22,17 @@
* that contribute to the derivative calculation. This is used for
* finite-volume schemes with symmetric sparsity pattern in the global matrix.
*/
-#ifndef DUMUX_CC_ASSEMBLY_MAP_HH
-#define DUMUX_CC_ASSEMBLY_MAP_HH
+#ifndef DUMUX_CC_CONNECTIVITY_MAP_HH
+#define DUMUX_CC_CONNECTIVITY_MAP_HH
-#include <dune/istl/bcrsmatrix.hh>
-
-#include <dumux/implicit/properties.hh>
+#include <vector>
namespace Dumux
{
/*!
* \ingroup CellCentered
- * \brief A simple version of the assembly map for cellcentered schemes.
+ * \brief A simple version of the connectivity map for cellcentered schemes.
* This implementation works for schemes in which for a given cell I only
* those cells J have to be prepared in whose stencil the cell I appears.
* This means that for the flux calculations in the cells J (in order to compute
@@ -43,12 +41,11 @@ namespace Dumux
* scvfs in the cells J in which the cell I is in the stencil.
*/
template<class TypeTag>
-class CCSimpleAssemblyMap
+class CCSimpleConnectivityMap
{
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
-
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using IndexType = typename GridView::IndexSet::IndexType;
struct DataJ
@@ -56,7 +53,7 @@ class CCSimpleAssemblyMap
IndexType globalJ;
std::vector<IndexType> scvfsJ;
// A list of additional scvfs is needed for compatibility
- // reasons with more complex assembly maps (see mpfa)
+ // reasons with more complex connectivity maps (see mpfa)
std::vector<IndexType> additionalScvfs;
};
@@ -65,20 +62,20 @@ class CCSimpleAssemblyMap
public:
/*!
- * \brief Initialize the AssemblyMap object.
+ * \brief Initialize the ConnectivityMap object.
*
- * \param problem The problem which we want to simulate.
+ * \param fvGridGeometry The grid's finite volume geometry.
*/
- void init(const Problem& problem)
+ void update(const FVGridGeometry& fvGridGeometry)
{
map_.clear();
- map_.resize(problem.gridView().size(0));
- for (const auto& element : elements(problem.gridView()))
+ map_.resize(fvGridGeometry.gridView().size(0));
+ for (const auto& element : elements(fvGridGeometry.gridView()))
{
// We are looking for the elements I, for which this element J is in the flux stencil
- auto globalJ = problem.elementMapper().index(element);
+ auto globalJ = fvGridGeometry.elementMapper().index(element);
- auto fvGeometry = localView(problem.model().fvGridGeometry());
+ auto fvGeometry = localView(fvGridGeometry);
fvGeometry.bindElement(element);
// obtain the data of J in elements I
@@ -87,8 +84,7 @@ public:
// loop over sub control faces
for (auto&& scvf : scvfs(fvGeometry))
{
- FluxVariables fluxVars;
- const auto& stencil = fluxVars.computeStencil(problem, element, fvGeometry, scvf);
+ const auto& stencil = FluxVariables::computeStencil(element, fvGeometry, scvf);
// insert our index in the neighbor stencils of the elements in the flux stencil
for (auto globalI : stencil)
diff --git a/dumux/discretization/cellcentered/elementsolution.hh b/dumux/discretization/cellcentered/elementsolution.hh
new file mode 100644
index 0000000000000000000000000000000000000000..2fac13fd913f112325dbfc5d212fa93f8ba6a9ba
--- /dev/null
+++ b/dumux/discretization/cellcentered/elementsolution.hh
@@ -0,0 +1,94 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief The local element solution class for cell-centered methods
+ */
+#ifndef DUMUX_CC_ELEMENT_SOLUTION_HH
+#define DUMUX_CC_ELEMENT_SOLUTION_HH
+
+#include <dune/istl/bvector.hh>
+#include <dumux/common/properties.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup CCModel
+ * \brief The element solution vector
+ */
+template<class TypeTag>
+class CCElementSolution
+{
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+
+public:
+ //! Default constructors
+ CCElementSolution() = default;
+ CCElementSolution(CCElementSolution&& other) = default;
+ CCElementSolution(const CCElementSolution& other) = default;
+
+ //! Constructor with element and solution
+ CCElementSolution(const Element& element, const SolutionVector& sol,
+ const FVGridGeometry& fvGridGeometry)
+ : CCElementSolution(sol[fvGridGeometry.elementMapper().index(element)])
+ {}
+
+ //! Constructor with a primary variable object
+ CCElementSolution(PrimaryVariables&& priVars)
+ : priVars_(std::move(priVars)) {}
+
+ //! Constructor with a primary variable object
+ CCElementSolution(const PrimaryVariables& priVars)
+ : priVars_(priVars) {}
+
+ //! extract the element solution from the solution vector using a mapper
+ void update(const Element& element, const SolutionVector& sol,
+ const FVGridGeometry& fvGridGeometry)
+ {
+ priVars_ = sol[fvGridGeometry.elementMapper().index(element)];
+ }
+
+ //! bracket operator const access
+ template<typename IndexType>
+ const PrimaryVariables& operator [](IndexType i) const
+ {
+ assert(i == 0 && "Index exceeds valid range!");
+ return priVars_;
+ }
+
+ //! bracket operator access
+ template<typename IndexType>
+ PrimaryVariables& operator [](IndexType i)
+ {
+ assert(i == 0 && "Index exceeds valid range!");
+ return priVars_;
+ }
+
+private:
+ PrimaryVariables priVars_;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/discretization/cellcentered/globalvolumevariables.hh b/dumux/discretization/cellcentered/globalvolumevariables.hh
index 9b358da95ccd7f5b8600f3a618812a90f35016f3..3b707b8ff490e72949dac34ebfd41ef6151c7852 100644
--- a/dumux/discretization/cellcentered/globalvolumevariables.hh
+++ b/dumux/discretization/cellcentered/globalvolumevariables.hh
@@ -23,9 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_CC_GLOBAL_VOLUMEVARIABLES_HH
#define DUMUX_DISCRETIZATION_CC_GLOBAL_VOLUMEVARIABLES_HH
-#include <dumux/implicit/properties.hh>
-#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
-
namespace Dumux
{
@@ -41,17 +38,10 @@ class CCGlobalVolumeVariables
template<class TypeTag>
class CCGlobalVolumeVariables<TypeTag, /*enableGlobalVolVarsCache*/true>
{
- // The local class needs to access and change volVars
- friend typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- // The local jacobian needs to access and change volVars for derivative calculation
- friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
- // as does the primary variable switch
- friend class PrimaryVariableSwitch<TypeTag>;
- friend typename GET_PROP_TYPE(TypeTag, PrimaryVariableSwitch);
-
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
@@ -62,24 +52,24 @@ class CCGlobalVolumeVariables<TypeTag, /*enableGlobalVolVarsCache*/true>
using Element = typename GridView::template Codim<0>::Entity;
public:
- void update(Problem& problem, const SolutionVector& sol)
- {
- problemPtr_ = &problem;
+ CCGlobalVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
- auto numScv = problem.model().fvGridGeometry().numScv();
- auto numBoundaryScvf = problem.model().fvGridGeometry().numBoundaryScvf();
+ void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol)
+ {
+ const auto numScv = fvGridGeometry.numScv();
+ const auto numBoundaryScvf = fvGridGeometry.numBoundaryScvf();
volumeVariables_.resize(numScv + numBoundaryScvf);
- for (const auto& element : elements(problem.gridView()))
+ for (const auto& element : elements(fvGridGeometry.gridView()))
{
- auto fvGeometry = localView(problem.model().fvGridGeometry());
+ auto fvGeometry = localView(fvGridGeometry);
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
- volumeVariables_[scv.dofIndex()].update(problem.model().elementSolution(element, sol),
- problem,
- element,
- scv);
+ {
+ const ElementSolution elemSol({sol[scv.dofIndex()]});
+ volumeVariables_[scv.dofIndex()].update(elemSol, problem(), element, scv);
+ }
// handle the boundary volume variables
for (auto&& scvf : scvfs(fvGeometry))
@@ -89,15 +79,15 @@ public:
continue;
// check if boundary is a pure dirichlet boundary
- const auto bcTypes = problem.boundaryTypes(element, scvf);
+ const auto bcTypes = problem().boundaryTypes(element, scvf);
if (bcTypes.hasOnlyDirichlet())
{
const auto insideScvIdx = scvf.insideScvIdx();
const auto& insideScv = fvGeometry.scv(insideScvIdx);
- const ElementSolution dirichletPriVars({problem.dirichlet(element, scvf)});
+ const ElementSolution dirichletPriVars({problem().dirichlet(element, scvf)});
volumeVariables_[scvf.outsideScvIdx()].update(dirichletPriVars,
- problem,
+ problem(),
element,
insideScv);
}
@@ -133,12 +123,12 @@ public:
VolumeVariables& volVars(const IndexType scvIdx, const IndexType localIdx)
{ return volumeVariables_[scvIdx]; }
-private:
- const Problem& problem_() const
+ //! The problem we are solving
+ const Problem& problem() const
{ return *problemPtr_; }
+private:
const Problem* problemPtr_;
-
std::vector<VolumeVariables> volumeVariables_;
};
@@ -147,15 +137,15 @@ private:
template<class TypeTag>
class CCGlobalVolumeVariables<TypeTag, /*enableGlobalVolVarsCache*/false>
{
- // local class needs access to the problem
- friend typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
public:
- void update(Problem& problem, const SolutionVector& sol)
- { problemPtr_ = &problem; }
+ CCGlobalVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
+
+ void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) {}
/*!
* \brief Return a local restriction of this global object
@@ -165,11 +155,12 @@ public:
friend inline ElementVolumeVariables localView(const CCGlobalVolumeVariables& global)
{ return ElementVolumeVariables(global); }
-private:
- Problem& problem_() const
+ //! The problem we are solving
+ const Problem& problem() const
{ return *problemPtr_;}
- Problem* problemPtr_;
+private:
+ const Problem* problemPtr_;
};
} // end namespace
diff --git a/dumux/implicit/cellcentered/mpfa/assemblymap.hh b/dumux/discretization/cellcentered/mpfa/connectivitymap.hh
similarity index 68%
rename from dumux/implicit/cellcentered/mpfa/assemblymap.hh
rename to dumux/discretization/cellcentered/mpfa/connectivitymap.hh
index 76b6bca57a3928ff6ec4e86903acff330dae3132..a49d46822e730043263ec50c4b0b6bcaa296f4b1 100644
--- a/dumux/implicit/cellcentered/mpfa/assemblymap.hh
+++ b/dumux/discretization/cellcentered/mpfa/connectivitymap.hh
@@ -21,29 +21,34 @@
* \brief Stores the face indices corresponding to the neighbors of an element
* that contribute to the derivative calculation
*/
-#ifndef DUMUX_CC_MPFA_ASSEMBLY_MAP_HH
-#define DUMUX_CC_MPFA_ASSEMBLY_MAP_HH
+#ifndef DUMUX_CC_MPFA_CONNECTIVITY_MAP_HH
+#define DUMUX_CC_MPFA_CONNECTIVITY_MAP_HH
-#include <dumux/implicit/cellcentered/assemblymap.hh>
-#include <dumux/implicit/cellcentered/mpfa/generalassemblymap.hh>
+#include <dumux/discretization/cellcentered/mpfa/methods.hh>
+#include <dumux/discretization/cellcentered/connectivitymap.hh>
+#include <dumux/discretization/cellcentered/mpfa/generalconnectivitymap.hh>
namespace Dumux
{
//! Forward declaration of method specific implementation of the assembly map
template<class TypeTag, MpfaMethods method>
-class CCMpfaAssemblyMapImplementation;
+class CCMpfaConnectivityMapImplementation;
// //! The Assembly map for models using mpfa methods
template<class TypeTag>
-using CCMpfaAssemblyMap = CCMpfaAssemblyMapImplementation<TypeTag, GET_PROP_VALUE(TypeTag, MpfaMethod)>;
+using CCMpfaConnectivityMap = CCMpfaConnectivityMapImplementation<TypeTag, GET_PROP_VALUE(TypeTag, MpfaMethod)>;
//! The default is the general assembly map for mpfa schemes
template<class TypeTag, MpfaMethods method>
-class CCMpfaAssemblyMapImplementation : public CCMpfaGeneralAssemblyMap<TypeTag> {};
+class CCMpfaConnectivityMapImplementation : public CCMpfaGeneralConnectivityMap<TypeTag> {};
//! The o-method can use the simple assembly map
template<class TypeTag>
-class CCMpfaAssemblyMapImplementation<TypeTag, MpfaMethods::oMethod> : public CCSimpleAssemblyMap<TypeTag> {};
+class CCMpfaConnectivityMapImplementation<TypeTag, MpfaMethods::oMethod> : public CCSimpleConnectivityMap<TypeTag> {};
+
+//! The o-method with full pressure support can use the simple assembly map
+template<class TypeTag>
+class CCMpfaConnectivityMapImplementation<TypeTag, MpfaMethods::oMethodFps> : public CCSimpleConnectivityMap<TypeTag> {};
}
#endif
diff --git a/dumux/discretization/cellcentered/mpfa/darcyslaw.hh b/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
index 32a452d93f4718c2e7dd5418d285cdffa1ad96a3..1e3612e9ff6fb3aef8d49b3c12e51eeaeec2f773 100644
--- a/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/darcyslaw.hh
@@ -18,140 +18,131 @@
*****************************************************************************/
/*!
* \file
- * \brief This file contains the data which is required to calculate
+ * \brief This file contains the class which is required to calculate
* volume and mass fluxes of fluid phases over a face of a finite volume by means
- * of the Darcy approximation. Specializations are provided for the different discretization methods.
+ * of the Darcy approximation. This specializations is for cell-centered schemes
+ * using multi-point flux approximation.
*/
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_DARCYS_LAW_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_DARCYS_LAW_HH
-#include <dumux/implicit/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
+#include <dumux/common/properties.hh>
namespace Dumux
{
-namespace Properties
-{
-// forward declaration of properties
-NEW_PROP_TAG(ProblemEnableGravity);
-NEW_PROP_TAG(MpfaHelper);
-NEW_PROP_TAG(BoundaryInteractionVolume);
-}
-
/*!
- * \ingroup DarcysLaw
+ * \ingroup Mpfa
* \brief Specialization of Darcy's Law for the CCMpfa method.
*/
template <class TypeTag>
class DarcysLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
{
- using Implementation = typename GET_PROP_TYPE(TypeTag, AdvectionType);
-
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
- using MpfaHelper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
// Always use the dynamic type for vectors (compatibility with the boundary)
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using CoefficientVector = typename BoundaryInteractionVolume::Vector;
+ using PrimaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using CoefficientVector = typename PrimaryInteractionVolume::Traits::DynamicVector;
+ using DataHandle = typename PrimaryInteractionVolume::Traits::DataHandle;
static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
- static constexpr bool useTpfaBoundary = GET_PROP_VALUE(TypeTag, UseTpfaBoundary);
- static constexpr bool enableInteriorBoundaries = GET_PROP_VALUE(TypeTag, EnableInteriorBoundaries);
+ static constexpr int dim = GridView::dimension;
+ static constexpr int dimWorld = GridView::dimensionworld;
+
+ //! Class that fills the cache corresponding to mpfa Darcy's Law
+ class MpfaDarcysLawCacheFiller
+ {
+ public:
+ //! Function to fill an MpfaDarcysLawCache of a given scvf
+ //! This interface has to be met by any advection-related cache filler class
+ template<class FluxVariablesCacheFiller>
+ static void fill(FluxVariablesCache& scvfFluxVarsCache,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf,
+ const FluxVariablesCacheFiller& fluxVarsCacheFiller)
+ {
+ // get interaction volume from the flux vars cache filler & upate the cache
+ if (fvGeometry.fvGridGeometry().vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
+ scvfFluxVarsCache.updateAdvection(fluxVarsCacheFiller.secondaryInteractionVolume(),
+ fluxVarsCacheFiller.dataHandle(),
+ scvf);
+ else
+ scvfFluxVarsCache.updateAdvection(fluxVarsCacheFiller.primaryInteractionVolume(),
+ fluxVarsCacheFiller.dataHandle(),
+ scvf);
+ }
+ };
//! The cache used in conjunction with the mpfa Darcy's Law
class MpfaDarcysLawCache
{
// We always use the dynamic types here to be compatible on the boundary
- using Stencil = typename BoundaryInteractionVolume::GlobalIndexSet;
- using PositionVector = typename BoundaryInteractionVolume::PositionVector;
+ using Stencil = typename PrimaryInteractionVolume::Traits::DynamicGlobalIndexContainer;
+ using DirichletDataContainer = typename PrimaryInteractionVolume::DirichletDataContainer;
public:
+ // export the filler type
+ using Filler = MpfaDarcysLawCacheFiller;
+
//! update cached objects
template<class InteractionVolume>
- void updateAdvection(const InteractionVolume& iv, const SubControlVolumeFace &scvf)
+ void updateAdvection(const InteractionVolume& iv, const DataHandle& dataHandle, const SubControlVolumeFace &scvf)
{
const auto& localFaceData = iv.getLocalFaceData(scvf);
+
// update the quantities that are equal for all phases
- advectionVolVarsStencil_ = iv.volVarsStencil();
- advectionVolVarsPositions_ = iv.volVarsPositions();
- advectionTij_ = iv.getTransmissibilities(localFaceData);
+ advectionSwitchFluxSign_ = localFaceData.isOutside();
+ advectionVolVarsStencil_ = &dataHandle.volVarsStencil();
+ advectionDirichletData_ = &dataHandle.dirichletData();
- // The neumann fluxes always have to be set per phase
- for (unsigned int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
- phaseNeumannFluxes_[phaseIdx] = iv.getNeumannFlux(localFaceData, phaseIdx);
+ // the transmissibilities on surface grids have to be obtained from the outside
+ if (dim == dimWorld)
+ advectionTij_ = &dataHandle.T()[localFaceData.ivLocalScvfIndex()];
+ else
+ advectionTij_ = localFaceData.isOutside() ?
+ &dataHandle.outsideTij()[localFaceData.ivLocalOutsideScvfIndex()] :
+ &dataHandle.T()[localFaceData.ivLocalScvfIndex()];
}
- //! Returns the volume variables indices necessary for flux computation
- //! This includes all participating boundary volume variables. Since we
- //! do not allow mixed BC for the mpfa this is the same for all phases.
- const Stencil& advectionVolVarsStencil() const
- { return advectionVolVarsStencil_; }
-
- //! Returns the position on which the volume variables live. This is
- //! necessary as we need to evaluate gravity also for the boundary volvars
- const PositionVector& advectionVolVarsPositions() const
- { return advectionVolVarsPositions_; }
+ //! Returns the stencil for advective scvf flux computation
+ const Stencil& advectionVolVarsStencil() const { return *advectionVolVarsStencil_; }
//! Returns the transmissibilities associated with the volume variables
//! All phases flow through the same rock, thus, tij are equal for all phases
- const CoefficientVector& advectionTij() const
- { return advectionTij_; }
+ const CoefficientVector& advectionTij() const { return *advectionTij_; }
- //! If the useTpfaBoundary property is set to false, the boundary conditions
- //! are put into the local systems leading to possible contributions on all faces
- Scalar advectionNeumannFlux(unsigned int phaseIdx) const
- { return phaseNeumannFluxes_[phaseIdx]; }
+ //! On faces that are "outside" w.r.t. a face in the interaction volume,
+ //! we have to take the negative value of the fluxes, i.e. multiply by -1.0
+ bool advectionSwitchFluxSign() const { return advectionSwitchFluxSign_; }
- private:
- // Quantities associated with advection
- Stencil advectionVolVarsStencil_;
- PositionVector advectionVolVarsPositions_;
- CoefficientVector advectionTij_;
- std::array<Scalar, numPhases> phaseNeumannFluxes_;
- };
+ //! Returns the data on dirichlet boundary conditions affecting
+ //! the flux computation on this face
+ const DirichletDataContainer& advectionDirichletData() const { return *advectionDirichletData_; }
- //! Class that fills the cache corresponding to mpfa Darcy's Law
- class MpfaDarcysLawCacheFiller
- {
- public:
- //! Function to fill an MpfaDarcysLawCache of a given scvf
- //! This interface has to be met by any advection-related cache filler class
- template<class FluxVariablesCacheFiller>
- static void fill(FluxVariablesCache& scvfFluxVarsCache,
- const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf,
- const FluxVariablesCacheFiller& fluxVarsCacheFiller)
- {
- // get interaction volume from the flux vars cache filler & upate the cache
- if (problem.model().fvGridGeometry().isInBoundaryInteractionVolume(scvf))
- scvfFluxVarsCache.updateAdvection(fluxVarsCacheFiller.boundaryInteractionVolume(), scvf);
- else
- scvfFluxVarsCache.updateAdvection(fluxVarsCacheFiller.interactionVolume(), scvf);
- }
+ private:
+ bool advectionSwitchFluxSign_;
+ const Stencil* advectionVolVarsStencil_;
+ const CoefficientVector* advectionTij_;
+ const DirichletDataContainer* advectionDirichletData_;
};
public:
// state the discretization method this implementation belongs to
static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCMpfa;
- // state the type for the corresponding cache and its filler
+ // export the type for the corresponding cache
using Cache = MpfaDarcysLawCache;
- using CacheFiller = MpfaDarcysLawCacheFiller;
static Scalar flux(const Problem& problem,
const Element& element,
@@ -161,30 +152,19 @@ public:
const unsigned int phaseIdx,
const ElementFluxVariablesCache& elemFluxVarsCache)
{
- static const bool gravity = GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity);
+ static const bool gravity = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Problem.EnableGravity");
+ // Calculate the interface density for gravity evaluation
+ const auto rho = interpolateDensity(elemVolVars, scvf, phaseIdx);
+
+ // prepare computations
+ unsigned int i = 0;
+ Scalar scvfFlux(0.0);
const auto& fluxVarsCache = elemFluxVarsCache[scvf];
- const auto& volVarsStencil = fluxVarsCache.advectionVolVarsStencil();
- const auto& volVarsPositions = fluxVarsCache.advectionVolVarsPositions();
const auto& tij = fluxVarsCache.advectionTij();
- const bool isInteriorBoundary = enableInteriorBoundaries && fluxVarsCache.isInteriorBoundary();
- // For interior Neumann boundaries when using Tpfa on boundaries, return the user-specified flux
- // We assume phaseIdx = eqIdx here.
- if (isInteriorBoundary
- && useTpfaBoundary
- && fluxVarsCache.interiorBoundaryDataSelf().faceType() == MpfaFaceTypes::interiorNeumann)
- return scvf.area()*
- elemVolVars[scvf.insideScvIdx()].extrusionFactor()*
- problem.neumann(element, fvGeometry, elemVolVars, scvf)[phaseIdx];
-
- // Calculate the interface density for gravity evaluation
- const auto rho = Implementation::interpolateDensity(fvGeometry, elemVolVars, scvf, fluxVarsCache, phaseIdx, isInteriorBoundary);
-
- // calculate Tij*pj
- Scalar flux(0.0);
- unsigned int localIdx = 0;
- for (const auto volVarIdx : volVarsStencil)
+ // add contributions from cell-centered unknowns
+ for (const auto volVarIdx : fluxVarsCache.advectionVolVarsStencil())
{
const auto& volVars = elemVolVars[volVarIdx];
Scalar h = volVars.pressure(phaseIdx);
@@ -193,52 +173,51 @@ public:
if (gravity)
{
// gravitational acceleration in the center of the actual element
- const auto x = volVarsPositions[localIdx];
+ const auto x = fvGeometry.scv(volVarIdx).center();
const auto g = problem.gravityAtPos(x);
-
h -= rho*(g*x);
}
- flux += tij[localIdx++]*h;
+ scvfFlux += tij[i++]*h;
}
- // if no interior boundaries are present, return the flux
- if (!enableInteriorBoundaries)
- return useTpfaBoundary ? flux : flux + fluxVarsCache.advectionNeumannFlux(phaseIdx);
+ // add contributions from possible dirichlet boundary conditions
+ for (const auto& d : fluxVarsCache.advectionDirichletData())
+ {
+ const auto& volVars = elemVolVars[d.volVarIndex()];
+ Scalar h = volVars.pressure(phaseIdx);
+
+ // maybe add gravitational acceleration
+ if (gravity)
+ {
+ const auto x = d.ipGlobal();
+ const auto g = problem.gravityAtPos(x);
+ h -= rho*(g*x);
+ }
- // Handle interior boundaries
- flux += Implementation::computeInteriorBoundaryContribution(problem, fvGeometry, elemVolVars, fluxVarsCache, phaseIdx, rho);
+ scvfFlux += tij[i++]*h;
+ }
- // return overall resulting flux
- return useTpfaBoundary ? flux : flux + fluxVarsCache.advectionNeumannFlux(phaseIdx);
+ // return the flux (maybe adjust the sign)
+ return fluxVarsCache.advectionSwitchFluxSign() ? -scvfFlux : scvfFlux;
}
- static Scalar interpolateDensity(const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
+private:
+ static Scalar interpolateDensity(const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf,
- const FluxVariablesCache& fluxVarsCache,
- const unsigned int phaseIdx,
- const bool isInteriorBoundary)
+ const unsigned int phaseIdx)
{
- static const bool gravity = GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity);
+ static const bool gravity = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Problem.EnableGravity");
if (!gravity)
return Scalar(0.0);
else
{
- // Treat interior Dirichlet boundaries differently
- if (isInteriorBoundary)
- {
- const auto& data = fluxVarsCache.interiorBoundaryDataSelf();
- if (data.faceType() == MpfaFaceTypes::interiorDirichlet)
- return data.facetVolVars(fvGeometry).density(phaseIdx);
- }
-
// use arithmetic mean of the densities around the scvf
if (!scvf.boundary())
{
Scalar rho = elemVolVars[scvf.insideScvIdx()].density(phaseIdx);
- for (auto outsideIdx : scvf.outsideScvIndices())
+ for (const auto outsideIdx : scvf.outsideScvIndices())
rho += elemVolVars[outsideIdx].density(phaseIdx);
return rho/(scvf.outsideScvIndices().size()+1);
}
@@ -246,44 +225,6 @@ public:
return elemVolVars[scvf.outsideScvIdx()].density(phaseIdx);
}
}
-
- static Scalar computeInteriorBoundaryContribution(const Problem& problem,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const FluxVariablesCache& fluxVarsCache,
- unsigned int phaseIdx, Scalar rho)
- {
- static const bool gravity = GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity);
-
- // obtain the transmissibilites associated with all pressures
- const auto& tij = fluxVarsCache.advectionTij();
-
- // the interior dirichlet boundaries local indices start after
- // the cell and the domain Dirichlet boundary pressures
- const auto startIdx = fluxVarsCache.advectionVolVarsStencil().size();
-
- // add interior Dirichlet boundary contributions
- Scalar flux = 0.0;
- for (auto&& data : fluxVarsCache.interiorBoundaryData())
- {
- if (data.faceType() == MpfaFaceTypes::interiorDirichlet)
- {
- Scalar h = data.facetVolVars(fvGeometry).pressure(phaseIdx);
-
- if (gravity)
- {
- const auto x = fvGeometry.scvf(data.scvfIndex()).ipGlobal();
- const auto g = problem.gravityAtPos(x);
-
- h -= rho*(g*x);
- }
-
- flux += tij[startIdx + data.localIndexInInteractionVolume()]*h;
- }
- }
-
- return flux;
- }
};
} // end namespace
diff --git a/dumux/discretization/cellcentered/mpfa/dualgridindexset.hh b/dumux/discretization/cellcentered/mpfa/dualgridindexset.hh
new file mode 100644
index 0000000000000000000000000000000000000000..d6e54463fd3a3fe7a51f615be072e9e33dd95c3f
--- /dev/null
+++ b/dumux/discretization/cellcentered/mpfa/dualgridindexset.hh
@@ -0,0 +1,204 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Base class for the index sets of the dual grid in mpfa schemes.
+ */
+#ifndef DUMUX_DISCRETIZATION_MPFA_DUALGRID_INDEXSET_BASE_HH
+#define DUMUX_DISCRETIZATION_MPFA_DUALGRID_INDEXSET_BASE_HH
+
+#include <dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup Mpfa
+ * \brief Nodal index set for the dual grid of mpfa schemes.
+ */
+template<class TypeTag>
+class DualGridNodalIndexSet
+{
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using IndexType = typename GridView::IndexSet::IndexType;
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using PrimaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using LocalIndexType = typename PrimaryInteractionVolume::Traits::LocalIndexType;
+ using LocalIndexContainer = typename PrimaryInteractionVolume::Traits::DynamicLocalIndexContainer;
+ using GlobalIndexContainer = typename PrimaryInteractionVolume::Traits::DynamicGlobalIndexContainer;
+
+ static const int dim = GridView::dimension;
+
+public:
+ //! constructor
+ DualGridNodalIndexSet() : numBoundaryScvfs_(0) {}
+
+ // Inserts data for a given scvf. This should only called once per scvf!
+ void insert(const SubControlVolumeFace& scvf)
+ {
+ insert(scvf.boundary(),
+ scvf.index(),
+ scvf.insideScvIdx(),
+ scvf.outsideScvIndices());
+ }
+
+ // Inserts data for a given scvf. This should only called once per scvf!
+ void insert(const bool boundary,
+ const IndexType scvfIdx,
+ const IndexType insideScvIdx,
+ const std::vector<IndexType>& outsideScvIndices)
+ {
+ // this should always be called only once
+ assert( std::find(scvfIndices_.begin(), scvfIndices_.end(), scvfIdx ) == scvfIndices_.end() && "scvf has already been inserted!");
+
+ // the local index of the scvf data about to be inserted
+ const LocalIndexType curScvfLocalIdx = scvfIndices_.size();
+
+ // add global scvf data
+ GlobalIndexContainer scvIndices;
+ scvIndices.reserve(outsideScvIndices.size()+1);
+ scvIndices.push_back(insideScvIdx);
+ scvIndices.insert(scvIndices.end(), outsideScvIndices.begin(), outsideScvIndices.end());
+
+ // if scvf is on boundary, increase counter
+ if (boundary)
+ numBoundaryScvfs_++;
+
+ // insert data on the new scv
+ scvfIndices_.push_back(scvfIdx);
+ scvfIsOnBoundary_.push_back(boundary);
+ scvfNeighborScvIndices_.emplace_back( std::move(scvIndices) );
+
+ // if entry for the inside scv exists append scvf local index, create otherwise
+ auto it = std::find( scvIndices_.begin(), scvIndices_.end(), insideScvIdx );
+ if (it != scvIndices_.end())
+ localScvfIndicesInScv_[ std::distance(scvIndices_.begin(), it) ].push_back(curScvfLocalIdx);
+ else
+ {
+ LocalIndexContainer localScvfIndices;
+ localScvfIndices.reserve(dim);
+ localScvfIndices.push_back(curScvfLocalIdx);
+ localScvfIndicesInScv_.emplace_back( std::move(localScvfIndices) );
+ scvIndices_.push_back(insideScvIdx);
+ }
+ }
+
+ //! returns the number of scvs
+ std::size_t numScvs() const { return scvIndices_.size(); }
+
+ //! returns the number of scvfs
+ std::size_t numScvfs() const { return scvfIndices_.size(); }
+
+ //! returns the number of boundary scvfs
+ std::size_t numBoundaryScvfs() const { return numBoundaryScvfs_; }
+
+ //! returns the global scv indices connected to this dual grid node
+ const GlobalIndexContainer& globalScvIndices() const { return scvIndices_; }
+
+ //! returns the global scvf indices connected to this dual grid node
+ const GlobalIndexContainer& globalScvfIndices() const { return scvfIndices_; }
+
+ //! returns the global scv idx of the i-th scv
+ IndexType scvIdxGlobal(unsigned int i) const { return scvIndices_[i]; }
+
+ //! returns the index of the i-th scvf
+ IndexType scvfIdxGlobal(unsigned int i) const { return scvfIndices_[i]; }
+
+ //! returns the global index of the j-th scvf embedded in the i-th scv
+ IndexType scvfIdxGlobal(unsigned int i, unsigned int j) const
+ {
+ assert(j < dim); // only dim faces can be embedded in an scv
+ return scvfIndices_[ localScvfIndicesInScv_[i][j] ];
+ }
+
+ //! returns the nodel-local index of the j-th scvf embedded in the i-th scv
+ IndexType scvfIdxLocal(unsigned int i, unsigned int j) const
+ {
+ assert(j < dim); // only dim faces can be embedded in an scv
+ return localScvfIndicesInScv_[i][j];
+ }
+
+ //! returns whether or not the i-th scvf touches the boundary
+ bool scvfIsOnBoundary(unsigned int i) const { return scvfIsOnBoundary_[i]; }
+
+ //! returns the indices of the neighboring scvs of the i-th scvf
+ const GlobalIndexContainer& neighboringScvIndices(unsigned int i) const
+ { return scvfNeighborScvIndices_[i]; }
+
+private:
+ //! the indices of the scvs around a dual grid node
+ GlobalIndexContainer scvIndices_;
+ //! maps to each scv a list of scvf indices embedded in it
+ std::vector<LocalIndexContainer> localScvfIndicesInScv_;
+
+ //! the indices of the scvfs around a dual grid node
+ GlobalIndexContainer scvfIndices_;
+ //! maps to each scvf a boolean to indicate if it is on the boundary
+ std::vector<bool> scvfIsOnBoundary_;
+ //! maps to each scvf a list of neighbouring scv indices
+ //! ordering: 0 - inside scv idx; 1..n - outside scv indices
+ std::vector<GlobalIndexContainer> scvfNeighborScvIndices_;
+ //! stores how many boundary scvfs are embedded in this dual grid node
+ std::size_t numBoundaryScvfs_;
+};
+
+/*!
+ * \ingroup Mpfa
+ * \brief Class for the index sets of the dual grid in mpfa schemes.
+ */
+template<class TypeTag>
+class CCMpfaDualGridIndexSet
+{
+ using ParentType = std::vector<DualGridNodalIndexSet<TypeTag>>;
+
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using IndexType = typename GridView::IndexSet::IndexType;
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+
+ static const int dim = GridView::dimension;
+
+public:
+ using NodalIndexSet = DualGridNodalIndexSet<TypeTag>;
+
+ //! default constructor
+ CCMpfaDualGridIndexSet() = delete;
+
+ //! constructor
+ explicit CCMpfaDualGridIndexSet(const GridView& gridView) : nodalIndexSets_(gridView.size(dim)) {}
+
+ //! access with an scvf
+ const NodalIndexSet& operator[] (const SubControlVolumeFace& scvf) const
+ { return nodalIndexSets_[scvf.vertexIndex()]; }
+ NodalIndexSet& operator[] (const SubControlVolumeFace& scvf)
+ { return nodalIndexSets_[scvf.vertexIndex()]; }
+
+ //! access with an index
+ const NodalIndexSet& operator[] (IndexType i) const
+ { return nodalIndexSets_[i]; }
+ NodalIndexSet& operator[] (IndexType i)
+ { return nodalIndexSets_[i]; }
+
+private:
+ std::vector<NodalIndexSet> nodalIndexSets_;
+};
+} // end namespace
+
+
+#endif
diff --git a/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh b/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
index 1a8a507918e4d46aa01369cee9dc5508f624b429..bdb03f4fc631dbfc80dba7c7eea1e94d7f5f353b 100644
--- a/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh
@@ -23,8 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_CCMPFA_ELEMENT_FLUXVARSCACHE_HH
#define DUMUX_DISCRETIZATION_CCMPFA_ELEMENT_FLUXVARSCACHE_HH
-#include <dumux/implicit/properties.hh>
-
#include "fluxvariablescachefiller.hh"
namespace Dumux
@@ -45,9 +43,6 @@ class CCMpfaElementFluxVariablesCache;
template<class TypeTag>
class CCMpfaElementFluxVariablesCache<TypeTag, true>
{
- // the local jacobian needs to be able to update the cache during assembly
- friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
-
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using IndexType = typename GridView::IndexSet::IndexType;
@@ -78,9 +73,14 @@ public:
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf) {}
+ // Specialization for the global caching being enabled - do nothing here
+ void update(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars) {}
+
// access operators in the case of caching
const FluxVariablesCache& operator [](const SubControlVolumeFace& scvf) const
- { return (*globalFluxVarsCachePtr_)[scvf.index()]; }
+ { return (*globalFluxVarsCachePtr_)[scvf]; }
//! The global object we are a restriction of
const GlobalFluxVariablesCache& globalFluxVarsCache() const
@@ -88,11 +88,6 @@ public:
private:
const GlobalFluxVariablesCache* globalFluxVarsCachePtr_;
-
- // Specialization for the global caching being enabled - do nothing here
- void update(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars) {}
};
/*!
@@ -102,8 +97,9 @@ private:
template<class TypeTag>
class CCMpfaElementFluxVariablesCache<TypeTag, false>
{
- // the local jacobian needs to be able to update the cache during assembly
- friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
+ // the flux variables cache filler needs to be friend to fill
+ // the interaction volumes and data handles
+ friend CCMpfaFluxVariablesCacheFiller<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
@@ -115,6 +111,12 @@ class CCMpfaElementFluxVariablesCache<TypeTag, false>
using GlobalFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FluxVariablesCacheFiller = CCMpfaFluxVariablesCacheFiller<TypeTag>;
+ using MpfaHelper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
+ using PrimaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using SecondaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, SecondaryInteractionVolume);
+ using DataHandle = typename PrimaryInteractionVolume::Traits::DataHandle;
+
+ static constexpr int dim = GridView::dimension;
public:
CCMpfaElementFluxVariablesCache(const GlobalFluxVariablesCache& global)
@@ -136,53 +138,61 @@ public:
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
- fluxVarsCache_.clear();
- globalScvfIndices_.clear();
+ // clear data
+ clear_();
- const auto& problem = globalFluxVarsCache().problem_();
+ // some references for convenience
+ const auto& problem = globalFluxVarsCache().problem();
+ const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
- const auto globalI = problem.elementMapper().index(element);
- const auto& assemblyMapI = problem.model().localJacobian().assemblyMap()[globalI];
+ // the assembly map of the given element
+ const auto& assemblyMapI = fvGridGeometry.connectivityMap()[fvGridGeometry.elementMapper().index(element)];
- // reserve memory
+ // reserve memory for scvf index container
unsigned int numNeighborScvfs = 0;
- for (auto&& dataJ : assemblyMapI)
+ for (const auto& dataJ : assemblyMapI)
numNeighborScvfs += dataJ.scvfsJ.size();
- globalScvfIndices_.reserve(fvGeometry.numScvf() + numNeighborScvfs);
-
- // first add all the indices inside the element
- for (auto&& scvf : scvfs(fvGeometry))
- globalScvfIndices_.push_back(scvf.index());
+ globalScvfIndices_.resize(fvGeometry.numScvf() + numNeighborScvfs);
- // for the indices in the neighbors, use assembly map of the local jacobian
- for (auto&& dataJ : assemblyMapI)
+ // set the scvf indices in scvf index container
+ unsigned int i = 0;
+ for (const auto& scvf : scvfs(fvGeometry))
+ globalScvfIndices_[i++] = scvf.index();
+ for (const auto& dataJ : assemblyMapI)
for (auto scvfIdx : dataJ.scvfsJ)
- globalScvfIndices_.push_back(scvfIdx);
+ globalScvfIndices_[i++] = scvfIdx;
+
+ // reserve memory estimate for interaction volumes and corresponding data
+ const auto numIvEstimate = getNoInteractionVolumesEstimate_(element, assemblyMapI);
+ const auto maxBoundaryIv = element.subEntities(dim);
+ primaryInteractionVolumes_.reserve(numIvEstimate);
+ secondaryInteractionVolumes_.reserve(maxBoundaryIv);
+ primaryIvDataHandles_.reserve(numIvEstimate);
+ secondaryIvDataHandles_.reserve(maxBoundaryIv);
// helper class to fill flux variables caches
FluxVariablesCacheFiller filler(problem);
- // prepare all the caches of the scvfs inside the corresponding interaction volumes
+ // resize the cache container
fluxVarsCache_.resize(globalScvfIndices_.size());
- for (auto&& scvf : scvfs(fvGeometry))
+
+ // go through the caches and fill them
+ i = 0;
+ for (const auto& scvf : scvfs(fvGeometry))
{
- auto& scvfCache = (*this)[scvf];
+ auto& scvfCache = fluxVarsCache_[i++];
if (!scvfCache.isUpdated())
- filler.fill(*this, scvfCache, element, fvGeometry, elemVolVars, scvf);
+ filler.fill(*this, scvfCache, element, fvGeometry, elemVolVars, scvf, true);
}
- // prepare the caches in the remaining neighbors
- for (auto&& dataJ : assemblyMapI)
+ for (const auto& dataJ : assemblyMapI)
{
- for (auto scvfIdx : dataJ.scvfsJ)
+ const auto elementJ = fvGridGeometry.element(dataJ.globalJ);
+ for (const auto scvfIdx : dataJ.scvfsJ)
{
- const auto& scvf = fvGeometry.scvf(scvfIdx);
- auto& scvfCache = (*this)[scvf];
+ auto& scvfCache = fluxVarsCache_[i++];
if (!scvfCache.isUpdated())
- {
- auto elementJ = problem.model().fvGridGeometry().element(dataJ.globalJ);
- filler.fill(*this, scvfCache, elementJ, fvGeometry, elemVolVars, scvf);
- }
+ filler.fill(*this, scvfCache, elementJ, fvGeometry, elemVolVars, fvGeometry.scvf(scvfIdx), true);
}
}
}
@@ -196,6 +206,48 @@ public:
DUNE_THROW(Dune::NotImplemented, "Local element binding of the flux variables cache in mpfa schemes");
}
+ // This function is used to update the transmissibilities if the volume variables have changed
+ // Results in undefined behaviour if called before bind() or with a different element
+ void update(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars)
+ {
+ // update only if transmissibilities are solution-dependent
+ if (FluxVariablesCacheFiller::isSolDependent)
+ {
+ const auto& problem = globalFluxVarsCache().problem();
+ const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
+ const auto& assemblyMapI = fvGridGeometry.connectivityMap()[fvGridGeometry.elementMapper().index(element)];
+
+ // helper class to fill flux variables caches
+ FluxVariablesCacheFiller filler(problem);
+
+ // set all the caches to "outdated"
+ for (auto& cache : fluxVarsCache_)
+ cache.setUpdateStatus(false);
+
+ // go through the caches maybe update them
+ unsigned int i = 0;
+ for (const auto& scvf : scvfs(fvGeometry))
+ {
+ auto& scvfCache = fluxVarsCache_[i++];
+ if (!scvfCache.isUpdated())
+ filler.fill(*this, scvfCache, element, fvGeometry, elemVolVars, scvf);
+ }
+
+ for (const auto& dataJ : assemblyMapI)
+ {
+ const auto elementJ = fvGridGeometry.element(dataJ.globalJ);
+ for (const auto scvfIdx : dataJ.scvfsJ)
+ {
+ auto& scvfCache = fluxVarsCache_[i++];
+ if (!scvfCache.isUpdated())
+ filler.fill(*this, scvfCache, elementJ, fvGeometry, elemVolVars, fvGeometry.scvf(scvfIdx));
+ }
+ }
+ }
+ }
+
// access operators in the case of no caching
const FluxVariablesCache& operator [](const SubControlVolumeFace& scvf) const
{ return fluxVarsCache_[getLocalScvfIdx_(scvf.index())]; }
@@ -216,57 +268,54 @@ public:
private:
const GlobalFluxVariablesCache* globalFluxVarsCachePtr_;
- // This function updates the transmissibilities after the solution has been deflected during jacobian assembly
- void update(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars)
+ void clear_()
{
- static const bool isSolIndependent = FluxVariablesCacheFiller::isSolutionIndependent();
-
- if (!isSolIndependent)
- {
- const auto& problem = globalFluxVarsCache().problem_();
-
- // helper class to fill flux variables caches
- FluxVariablesCacheFiller filler(problem);
-
- // set all the caches to "outdated"
- for (auto& cache : fluxVarsCache_)
- cache.setUpdateStatus(false);
-
- // the global index of the element at hand
- const auto globalI = problem.elementMapper().index(element);
-
- // Let the filler do the update of the cache
- for (unsigned int localScvfIdx = 0; localScvfIdx < globalScvfIndices_.size(); ++localScvfIdx)
- {
- const auto& scvf = fvGeometry.scvf(globalScvfIndices_[localScvfIdx]);
+ fluxVarsCache_.clear();
+ globalScvfIndices_.clear();
+ primaryInteractionVolumes_.clear();
+ secondaryInteractionVolumes_.clear();
+ primaryIvDataHandles_.clear();
+ secondaryIvDataHandles_.clear();
+ }
- auto& scvfCache = fluxVarsCache_[localScvfIdx];
- if (!scvfCache.isUpdated())
- {
- // obtain the corresponding element
- const auto scvfInsideScvIdx = scvf.insideScvIdx();
- const auto insideElement = scvfInsideScvIdx == globalI ?
- element :
- problem.model().fvGridGeometry().element(scvfInsideScvIdx);
+ // get number of interaction volumes that are going to be required
+ template<class AssemblyMap>
+ std::size_t getNoInteractionVolumesEstimate_(const Element& element, const AssemblyMap& assemblyMap)
+ {
+ //! Get the mpfa method only once per simulation
+ static const MpfaMethods method = GET_PROP_VALUE(TypeTag, MpfaMethod);
- filler.update(*this, scvfCache, insideElement, fvGeometry, elemVolVars, scvf);
- }
- }
+ if (method == MpfaMethods::oMethod || method == MpfaMethods::oMethodFps)
+ return element.subEntities(dim);
+ else if (method == MpfaMethods::lMethod)
+ {
+ std::size_t numInsideScvfs = MpfaHelper::getNumLocalScvfs(element.geometry().type());
+ std::size_t numOutsideScvf = 0;
+ for (const auto& dataJ : assemblyMap) numOutsideScvf += dataJ.scvfsJ.size();
+ return numOutsideScvf - numInsideScvfs;
}
+ else
+ DUNE_THROW(Dune::NotImplemented, "number of interaction volumes estimate for chosen mpfa scheme");
}
// get index of an scvf in the local container
- int getLocalScvfIdx_(const int scvfIdx) const
+ unsigned int getLocalScvfIdx_(const int scvfIdx) const
{
auto it = std::find(globalScvfIndices_.begin(), globalScvfIndices_.end(), scvfIdx);
assert(it != globalScvfIndices_.end() && "Could not find the flux vars cache for scvfIdx");
return std::distance(globalScvfIndices_.begin(), it);
}
+
+ // the local flux vars caches and the index set
std::vector<FluxVariablesCache> fluxVarsCache_;
std::vector<IndexType> globalScvfIndices_;
+
+ // store the interaction volumes and handles
+ std::vector<PrimaryInteractionVolume> primaryInteractionVolumes_;
+ std::vector<SecondaryInteractionVolume> secondaryInteractionVolumes_;
+ std::vector<DataHandle> primaryIvDataHandles_;
+ std::vector<DataHandle> secondaryIvDataHandles_;
};
} // end namespace
diff --git a/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh b/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
index 03481e6a7f80d29a3c0b2f33b02ef2ef75236b73..d7285035c6ba05ea5dd6ed82e1909c0da17662e5 100644
--- a/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
+++ b/dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh
@@ -23,9 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_CCMPFA_ELEMENT_VOLUMEVARIABLES_HH
#define DUMUX_DISCRETIZATION_CCMPFA_ELEMENT_VOLUMEVARIABLES_HH
-#include <dumux/implicit/properties.hh>
-#include "facetypes.hh"
-
namespace Dumux
{
@@ -101,7 +98,6 @@ class CCMpfaElementVolumeVariables<TypeTag, /*enableGlobalVolVarsCache*/false>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using IndexType = typename GridView::IndexSet::IndexType;
- static const bool useTpfaBoundary = GET_PROP_VALUE(TypeTag, UseTpfaBoundary);
static const int dim = GridView::dimension;
using Element = typename GridView::template Codim<0>::Entity;
@@ -117,23 +113,23 @@ public:
const FVElementGeometry& fvGeometry,
const SolutionVector& sol)
{
- const auto& problem = globalVolVars().problem_();
- const auto& fvGridGeometry = problem.model().fvGridGeometry();
+ const auto& problem = globalVolVars().problem();
+ const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
+ const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
// stencil information
- const auto globalI = problem.elementMapper().index(element);
- const auto& assemblyMapI = problem.model().localJacobian().assemblyMap()[globalI];
- const auto numDofs = assemblyMapI.size() + 1;
+ const auto globalI = fvGridGeometry.elementMapper().index(element);
+ const auto& assemblyMapI = fvGridGeometry.connectivityMap()[globalI];
+ const auto numVolVars = assemblyMapI.size() + 1;
// resize local containers to the required size (for internal elements)
- volumeVariables_.resize(numDofs);
- volVarIndices_.resize(numDofs);
- int localIdx = 0;
+ volumeVariables_.resize(numVolVars);
+ volVarIndices_.resize(numVolVars);
+ unsigned int localIdx = 0;
// update the volume variables of the element at hand
- auto eIdx = problem.elementMapper().index(element);
- auto&& scvI = fvGeometry.scv(eIdx);
- volumeVariables_[localIdx].update(problem.model().elementSolution(element, sol),
+ const auto& scvI = fvGeometry.scv(globalI);
+ volumeVariables_[localIdx].update(ElementSolution(sol[globalI]),
problem,
element,
scvI);
@@ -144,8 +140,8 @@ public:
for (auto&& dataJ : assemblyMapI)
{
const auto& elementJ = fvGridGeometry.element(dataJ.globalJ);
- auto&& scvJ = fvGeometry.scv(dataJ.globalJ);
- volumeVariables_[localIdx].update(problem.model().elementSolution(elementJ, sol),
+ const auto& scvJ = fvGeometry.scv(dataJ.globalJ);
+ volumeVariables_[localIdx].update(ElementSolution(sol[dataJ.globalJ]),
problem,
elementJ,
scvJ);
@@ -154,106 +150,87 @@ public:
}
// eventually prepare boundary volume variables
- auto estimate = boundaryVolVarsEstimate_(element, fvGeometry);
- if (estimate > 0)
+ const auto maxNumBoundaryVolVars = maxNumBoundaryVolVars_(fvGeometry);
+ if (maxNumBoundaryVolVars > 0)
{
- volumeVariables_.reserve(numDofs+estimate);
- volVarIndices_.reserve(numDofs+estimate);
+ volumeVariables_.reserve(numVolVars+maxNumBoundaryVolVars);
+ volVarIndices_.reserve(numVolVars+maxNumBoundaryVolVars);
// treat the BCs inside the element
- if (element.hasBoundaryIntersections())
+ for (const auto& scvf : scvfs(fvGeometry))
{
- for (auto&& scvf : scvfs(fvGeometry))
+ // if we are not on a boundary, skip to the next scvf
+ if (!scvf.boundary())
+ continue;
+
+ const auto bcTypes = problem.boundaryTypes(element, scvf);
+
+ // on dirichlet boundaries use dirichlet values
+ if (bcTypes.hasOnlyDirichlet())
{
- // if we are not on a boundary, skip to the next scvf
- if (!scvf.boundary())
- continue;
-
- // on dirichlet boundaries use dirichlet values
- if (MpfaHelper::getMpfaFaceType(problem, element, scvf) == MpfaFaceTypes::dirichlet)
- {
- // boundary volume variables
- VolumeVariables dirichletVolVars;
- dirichletVolVars.update(ElementSolution({problem.dirichlet(element, scvf)}),
- problem,
- element,
- scvI);
-
- volumeVariables_.emplace_back(std::move(dirichletVolVars));
- volVarIndices_.push_back(scvf.outsideScvIdx());
- }
- // use the inside volume variables for neumann boundaries
- else if (!useTpfaBoundary)
- {
- volumeVariables_.emplace_back(volumeVariables_[0]);
- volVarIndices_.push_back(scvf.outsideScvIdx());
- }
+ // boundary volume variables
+ VolumeVariables dirichletVolVars;
+ dirichletVolVars.update(ElementSolution(problem.dirichlet(element, scvf)),
+ problem,
+ element,
+ scvI);
+
+ volumeVariables_.emplace_back(std::move(dirichletVolVars));
+ volVarIndices_.push_back(scvf.outsideScvIdx());
+ }
+ // use the inside volume variables for neumann boundaries
+ else
+ {
+ volumeVariables_.emplace_back(volumeVariables_[0]);
+ volVarIndices_.push_back(scvf.outsideScvIdx());
}
}
// Update boundary volume variables in the neighbors
- for (auto&& scvf : scvfs(fvGeometry))
+ for (const auto& scvf : scvfs(fvGeometry))
{
- // skip the rest if the scvf does not touch a domain boundary
- if (!fvGridGeometry.touchesDomainBoundary(scvf))
- continue;
+ if (fvGridGeometry.vertexUsesPrimaryInteractionVolume(scvf.vertexIndex()))
+ {
+ const auto& nodalIndexSet = gridIvIndexSets.primaryIndexSet(scvf).nodalIndexSet();
+
+ // if present, insert boundary vol vars
+ if (nodalIndexSet.numBoundaryScvfs() > 0)
+ addBoundaryVolVars_(problem, fvGeometry, nodalIndexSet);
- // loop over all the scvfs in the interaction region
- const auto& ivSeed = fvGridGeometry.boundaryInteractionVolumeSeed(scvf);
- for (auto scvfIdx : ivSeed.globalScvfIndices())
+ }
+ else
{
- auto&& ivScvf = fvGeometry.scvf(scvfIdx);
- // only proceed for scvfs on the boundary and not in the inside element
- if (!ivScvf.boundary() || ivScvf.insideScvIdx() == eIdx)
- continue;
-
- auto insideScvIdx = ivScvf.insideScvIdx();
- auto insideElement = fvGridGeometry.element(insideScvIdx);
-
- // on dirichlet boundaries use dirichlet values
- if (MpfaHelper::getMpfaFaceType(problem, insideElement, ivScvf) == MpfaFaceTypes::dirichlet)
- {
- // boundary volume variables
- VolumeVariables dirichletVolVars;
- auto&& ivScv = fvGeometry.scv(insideScvIdx);
- dirichletVolVars.update(ElementSolution({problem.dirichlet(insideElement, ivScvf)}),
- problem,
- insideElement,
- ivScv);
-
- volumeVariables_.emplace_back(std::move(dirichletVolVars));
- volVarIndices_.push_back(ivScvf.outsideScvIdx());
- }
- // use the inside volume variables for neumann boundaries
- else if (!useTpfaBoundary)
- {
- volumeVariables_.emplace_back((*this)[insideScvIdx]);
- volVarIndices_.push_back(ivScvf.outsideScvIdx());
- }
+ const auto& nodalIndexSet = gridIvIndexSets.secondaryIndexSet(scvf).nodalIndexSet();
+
+ // if present, insert boundary vol vars
+ if (nodalIndexSet.numBoundaryScvfs() > 0)
+ addBoundaryVolVars_(problem, fvGeometry, nodalIndexSet);
}
}
}
- //! Check if user added additional DOF dependencies, i.e. the residual of DOF globalI depends
- //! on additional DOFs not included in the discretization schemes' occupation pattern
- const auto& additionalDofDependencies = problem.getAdditionalDofDependencies(globalI);
- if (!additionalDofDependencies.empty())
- {
- volumeVariables_.resize(volumeVariables_.size() + additionalDofDependencies.size());
- volVarIndices_.resize(volVarIndices_.size() + additionalDofDependencies.size());
- for (auto globalJ : additionalDofDependencies)
- {
- const auto& elementJ = fvGeometry.fvGridGeometry().element(globalJ);
- auto&& scvJ = fvGeometry.scv(globalJ);
-
- volumeVariables_[localIdx].update(problem.model().elementSolution(elementJ, sol),
- problem,
- elementJ,
- scvJ);
- volVarIndices_[localIdx] = scvJ.dofIndex();
- ++localIdx;
- }
- }
+ // //! TODO Check if user added additional DOF dependencies, i.e. the residual of DOF globalI depends
+ // //! on additional DOFs not included in the discretization schemes' occupation pattern
+ // const auto& additionalDofDependencies = problem.getAdditionalDofDependencies(globalI);
+ // if (!additionalDofDependencies.empty())
+ // {
+ // volumeVariables_.reserve(volumeVariables_.size() + additionalDofDependencies.size());
+ // volVarIndices_.reserve(volVarIndices_.size() + additionalDofDependencies.size());
+ // for (auto globalJ : additionalDofDependencies)
+ // {
+ // const auto& elementJ = fvGridGeometry.element(globalJ);
+ // const auto& scvJ = fvGeometry.scv(globalJ);
+
+ // VolumeVariables additionalVolVars;
+ // additionalVolVars.update(ElementSolution(elementJ, sol, fvGridGeometry),
+ // problem,
+ // elementJ,
+ // scvJ);
+
+ // volumeVariables_.emplace_back(std::move(additionalVolVars));
+ // volVarIndices_.push_back(globalJ);
+ // }
+ // }
}
// Binding of an element, prepares only the volume variables of the element
@@ -261,14 +238,14 @@ public:
const FVElementGeometry& fvGeometry,
const SolutionVector& sol)
{
- auto eIdx = globalVolVars().problem_().elementMapper().index(element);
+ auto eIdx = fvGeometry.fvGridGeometry().elementMapper().index(element);
volumeVariables_.resize(1);
volVarIndices_.resize(1);
// update the volume variables of the element
- auto&& scv = fvGeometry.scv(eIdx);
- volumeVariables_[0].update(globalVolVars().problem_().model().elementSolution(element, sol),
- globalVolVars().problem_(),
+ const auto& scv = fvGeometry.scv(eIdx);
+ volumeVariables_[0].update(ElementSolution(sol[scv.dofIndex()]),
+ globalVolVars().problem(),
element,
scv);
volVarIndices_[0] = scv.dofIndex();
@@ -293,22 +270,66 @@ public:
private:
const GlobalVolumeVariables* globalVolVarsPtr_;
- //! checks whether an scvf touches the boundary and returns an estimate of how many
- //! boundary vol vars will be necessary. In 2d, this is the sum of faces touching
- //! the boundary, which should be correct. In 3d, we count each face double - probably
- //! too much for hexahedrons but might be even too little for simplices.
- int boundaryVolVarsEstimate_(const Element& element,
- const FVElementGeometry& fvGeometry)
+ //! Computes how many boundary vol vars come into play for flux calculations
+ //! on this element. This number is probably almost always higher than the actually
+ //! needed number of volume variables. However, memory is not an issue for the global
+ //! caching being deactivated and we want to make sure we reserve enough memory here.
+ // TODO: What about non-symmetric schemes? Is there a better way for estimating this?
+ std::size_t maxNumBoundaryVolVars_(const FVElementGeometry& fvGeometry)
{
- int bVolVarEstimate = 0;
- for (auto&& scvf : scvfs(fvGeometry))
+ const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
+ const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
+
+ std::size_t numBoundaryVolVars = 0;
+ for (const auto& scvf : scvfs(fvGeometry))
{
- bool boundary = scvf.boundary();
- if (boundary || (!boundary && fvGeometry.fvGridGeometry().touchesDomainBoundary(scvf)))
- bVolVarEstimate += dim-1;
+ if (fvGridGeometry.vertexUsesPrimaryInteractionVolume(scvf.vertexIndex()))
+ numBoundaryVolVars += gridIvIndexSets.primaryIndexSet(scvf).nodalIndexSet().numBoundaryScvfs();
+ else
+ numBoundaryVolVars += gridIvIndexSets.secondaryIndexSet(scvf).nodalIndexSet().numBoundaryScvfs();
}
- return bVolVarEstimate;
+ return numBoundaryVolVars;
+ }
+
+ //! adds the volume variables from a given nodal index set to the local containers
+ template<class NodalIndexSet>
+ void addBoundaryVolVars_(const Problem& problem, const FVElementGeometry& fvGeometry, const NodalIndexSet& nodalIndexSet)
+ {
+ // check each scvf in the index set for boundary presence
+ for (auto scvfIdx : nodalIndexSet.globalScvfIndices())
+ {
+ const auto& ivScvf = fvGeometry.scvf(scvfIdx);
+
+ // only proceed for scvfs on the boundary and not in the inside element
+ if (!ivScvf.boundary() || ivScvf.insideScvIdx() == volVarIndices_[0])
+ continue;
+
+ const auto insideScvIdx = ivScvf.insideScvIdx();
+ const auto insideElement = fvGeometry.fvGridGeometry().element(insideScvIdx);
+ const auto bcTypes = problem.boundaryTypes(insideElement, ivScvf);
+
+ // on dirichlet boundaries use dirichlet values
+ if (bcTypes.hasOnlyDirichlet())
+ {
+ // boundary volume variables
+ VolumeVariables dirichletVolVars;
+ const auto& ivScv = fvGeometry.scv(insideScvIdx);
+ dirichletVolVars.update(ElementSolution(problem.dirichlet(insideElement, ivScvf)),
+ problem,
+ insideElement,
+ ivScv);
+
+ volumeVariables_.emplace_back(std::move(dirichletVolVars));
+ volVarIndices_.push_back(ivScvf.outsideScvIdx());
+ }
+ // use the inside volume variables for neumann boundaries
+ else
+ {
+ volumeVariables_.emplace_back((*this)[insideScvIdx]);
+ volVarIndices_.push_back(ivScvf.outsideScvIdx());
+ }
+ }
}
int getLocalIdx_(const int volVarIdx) const
diff --git a/dumux/discretization/cellcentered/mpfa/facetypes.hh b/dumux/discretization/cellcentered/mpfa/facetypes.hh
deleted file mode 100644
index c278de9e3913b3938248805445b65d5cdc696280..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/facetypes.hh
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Face types of the sub control volume faces in cell-centered mpfa methods.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_FACETYPES_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_FACETYPES_HH
-
-namespace Dumux
-{
- enum class MpfaFaceTypes : unsigned int
- {
- interior,
- neumann,
- dirichlet,
- interiorNeumann,
- interiorDirichlet
- };
-} // end namespace
-
-#endif
\ No newline at end of file
diff --git a/dumux/discretization/cellcentered/mpfa/fickslaw.hh b/dumux/discretization/cellcentered/mpfa/fickslaw.hh
index d871c54541b468a92012941c8167f169df28592e..7298b2f74f9bdbb3760a4cc0f394f6ec3bfdf0d2 100644
--- a/dumux/discretization/cellcentered/mpfa/fickslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/fickslaw.hh
@@ -18,142 +18,137 @@
*****************************************************************************/
/*!
* \file
- * \brief This file contains the data which is required to calculate
+ * \brief This file contains the class which is required to calculate
* molar and mass fluxes of a component in a fluid phase over a face of a finite volume by means
* of Fick's Law for cell-centered MPFA models.
*/
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_FICKS_LAW_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_FICKS_LAW_HH
-#include <memory>
-
-#include <dune/common/float_cmp.hh>
-
#include <dumux/common/math.hh>
-#include <dumux/common/parameters.hh>
-
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/properties.hh>
namespace Dumux
{
/*!
- * \ingroup CCMpfaFicksLaw
+ * \ingroup Mpfa
* \brief Specialization of Fick's Law for the CCMpfa method.
*/
template <class TypeTag>
class FicksLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
{
- using Implementation = typename GET_PROP_TYPE(TypeTag, MolecularDiffusionType);
-
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Model = typename GET_PROP_TYPE(TypeTag, Model);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using MpfaHelper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using Element = typename GridView::template Codim<0>::Entity;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
+ using BalanceEqOpts = typename GET_PROP_TYPE(TypeTag, BalanceEqOpts);
// Always use the dynamic type for vectors (compatibility with the boundary)
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using CoefficientVector = typename BoundaryInteractionVolume::Vector;
-
- using Element = typename GridView::template Codim<0>::Entity;
- using IndexType = typename GridView::IndexSet::IndexType;
+ using PrimaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using CoefficientVector = typename PrimaryInteractionVolume::Traits::DynamicVector;
+ using DataHandle = typename PrimaryInteractionVolume::Traits::DataHandle;
+ static constexpr int dim = GridView::dimension;
+ static constexpr int dimWorld = GridView::dimensionworld;
static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
static constexpr int numComponents = GET_PROP_VALUE(TypeTag,NumComponents);
- static constexpr bool useTpfaBoundary = GET_PROP_VALUE(TypeTag, UseTpfaBoundary);
- static constexpr bool enableInteriorBoundaries = GET_PROP_VALUE(TypeTag, EnableInteriorBoundaries);
using ComponentFluxVector = Dune::FieldVector<Scalar, numComponents>;
+ //! Class that fills the cache corresponding to mpfa Fick's Law
+ class MpfaFicksLawCacheFiller
+ {
+ public:
+ //! Function to fill an MpfaFicksLawCache of a given scvf
+ //! This interface has to be met by any diffusion-related cache filler class
+ template<class FluxVariablesCacheFiller>
+ static void fill(FluxVariablesCache& scvfFluxVarsCache,
+ unsigned int phaseIdx, unsigned int compIdx,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf,
+ const FluxVariablesCacheFiller& fluxVarsCacheFiller)
+ {
+ // get interaction volume from the flux vars cache filler & upate the cache
+ if (fvGeometry.fvGridGeometry().vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
+ scvfFluxVarsCache.updateDiffusion(fluxVarsCacheFiller.secondaryInteractionVolume(),
+ fluxVarsCacheFiller.dataHandle(),
+ scvf, phaseIdx, compIdx);
+ else
+ scvfFluxVarsCache.updateDiffusion(fluxVarsCacheFiller.primaryInteractionVolume(),
+ fluxVarsCacheFiller.dataHandle(),
+ scvf, phaseIdx, compIdx);
+ }
+ };
+
//! The cache used in conjunction with the mpfa Fick's Law
class MpfaFicksLawCache
{
- // We always use the dynamic types here to be compatible on the boundary
- using Stencil = typename BoundaryInteractionVolume::GlobalIndexSet;
- using PositionVector = typename BoundaryInteractionVolume::PositionVector;
+ // We always use the dynamic types here to be compatible on the boundary
+ using Stencil = typename PrimaryInteractionVolume::Traits::DynamicGlobalIndexContainer;
+ using DirichletDataContainer = typename PrimaryInteractionVolume::DirichletDataContainer;
public:
- //! The constructor. Initializes the Neumann flux to zero
- MpfaFicksLawCache() { componentNeumannFluxes_.fill(0.0); }
+ // export filler type
+ using Filler = MpfaFicksLawCacheFiller;
// update cached objects for the diffusive fluxes
- template<typename InteractionVolume>
- void updateDiffusion(const InteractionVolume& iv, const SubControlVolumeFace &scvf,
+ template<class InteractionVolume>
+ void updateDiffusion(const InteractionVolume& iv,
+ const DataHandle& dataHandle,
+ const SubControlVolumeFace &scvf,
unsigned int phaseIdx, unsigned int compIdx)
{
const auto& localFaceData = iv.getLocalFaceData(scvf);
- diffusionTij_[phaseIdx][compIdx] = iv.getTransmissibilities(localFaceData);
- // get the stencil only for the first call
- if (phaseIdx == 0 && compIdx == 0)
- diffusionVolVarsStencil_ = iv.volVarsStencil();
-
- //! For compositional models, we associate neumann fluxes with the phases (main components)
- //! This is done in the AdvectionCache. However, in single-phasic models we solve the phase AND
- //! the component mass balance equations. Thus, in this case we have diffusive neumann contributions.
- //! we assume compIdx = eqIdx
- if (numPhases == 1 && phaseIdx != compIdx)
- componentNeumannFluxes_[compIdx] = iv.getNeumannFlux(localFaceData, compIdx);
+ // update the quantities that are equal for all phases
+ diffusionSwitchFluxSign_[phaseIdx][compIdx] = localFaceData.isOutside();
+ diffusionVolVarsStencil_[phaseIdx][compIdx] = &dataHandle.volVarsStencil();
+ diffusionDirichletData_[phaseIdx][compIdx] = &dataHandle.dirichletData();
+
+ // the transmissibilities on surface grids have to be obtained from the outside
+ if (dim == dimWorld)
+ diffusionTij_[phaseIdx][compIdx] = &dataHandle.T()[localFaceData.ivLocalScvfIndex()];
+ else
+ diffusionTij_[phaseIdx][compIdx] = localFaceData.isOutside() ?
+ &dataHandle.outsideTij()[localFaceData.ivLocalOutsideScvfIndex()] :
+ &dataHandle.T()[localFaceData.ivLocalScvfIndex()];
}
//! Returns the volume variables indices necessary for diffusive flux
//! computation. This includes all participating boundary volume variables
//! and it can be different for the phases & components.
const Stencil& diffusionVolVarsStencil(unsigned int phaseIdx, unsigned int compIdx) const
- { return diffusionVolVarsStencil_; }
+ { return diffusionVolVarsStencil_[phaseIdx][compIdx]; }
+
+ //! On faces that are "outside" w.r.t. a face in the interaction volume,
+ //! we have to take the negative value of the fluxes, i.e. multiply by -1.0
+ bool diffusionSwitchFluxSign(unsigned int phaseIdx, unsigned int compIdx) const
+ { return diffusionSwitchFluxSign_[phaseIdx][compIdx]; }
//! Returns the transmissibilities associated with the volume variables
//! This can be different for the phases & components.
const CoefficientVector& diffusionTij(unsigned int phaseIdx, unsigned int compIdx) const
{ return diffusionTij_[phaseIdx][compIdx]; }
- //! If the useTpfaBoundary property is set to false, the boundary conditions
- //! are put into the local systems leading to possible contributions on all faces
- Scalar componentNeumannFlux(unsigned int compIdx) const
- {
- assert(numPhases == 1);
- return componentNeumannFluxes_[compIdx];
- }
+ //! Returns the data on dirichlet boundary conditions affecting
+ //! the flux computation on this face
+ const DirichletDataContainer& diffusionDirichletData(unsigned int phaseIdx, unsigned int compIdx) const
+ { return diffusionDirichletData_[phaseIdx][compIdx]; }
private:
- // Quantities associated with molecular diffusion
- Stencil diffusionVolVarsStencil_;
- std::array< std::array<CoefficientVector, numComponents>, numPhases> diffusionTij_;
-
- // diffusive neumann flux for single-phasic models
- std::array<Scalar, numComponents> componentNeumannFluxes_;
- };
-
- //! Class that fills the cache corresponding to mpfa Darcy's Law
- class MpfaFicksLawCacheFiller
- {
- public:
- //! Function to fill an MpfaFicksLawCache of a given scvf
- //! This interface has to be met by any diffusion-related cache filler class
- template<class FluxVariablesCacheFiller>
- static void fill(FluxVariablesCache& scvfFluxVarsCache,
- unsigned int phaseIdx, unsigned int compIdx,
- const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf,
- const FluxVariablesCacheFiller& fluxVarsCacheFiller)
- {
- // get interaction volume from the flux vars cache filler & upate the cache
- if (problem.model().fvGridGeometry().isInBoundaryInteractionVolume(scvf))
- scvfFluxVarsCache.updateDiffusion(fluxVarsCacheFiller.boundaryInteractionVolume(), scvf, phaseIdx, compIdx);
- else
- scvfFluxVarsCache.updateDiffusion(fluxVarsCacheFiller.interactionVolume(), scvf, phaseIdx, compIdx);
- }
+ std::array< std::array<bool, numComponents>, numPhases> diffusionSwitchFluxSign_;
+ std::array< std::array<const Stencil*, numComponents>, numPhases> diffusionVolVarsStencil_;
+ std::array< std::array<const DirichletDataContainer*, numComponents>, numPhases> diffusionDirichletData_;
+ std::array< std::array<const CoefficientVector*, numComponents>, numPhases> diffusionTij_;
};
public:
@@ -162,7 +157,6 @@ public:
// state the type for the corresponding cache and its filler
using Cache = MpfaFicksLawCache;
- using CacheFiller = MpfaFicksLawCacheFiller;
static ComponentFluxVector flux (const Problem& problem,
const Element& element,
@@ -176,139 +170,70 @@ public:
for (int compIdx = 0; compIdx < numComponents; compIdx++)
{
if(compIdx == FluidSystem::getMainComponent(phaseIdx))
- continue;
-
- const auto& fluxVarsCache = elemFluxVarsCache[scvf];
- const auto& volVarsStencil = fluxVarsCache.diffusionVolVarsStencil(phaseIdx, compIdx);
- const auto& tij = fluxVarsCache.diffusionTij(phaseIdx, compIdx);
-
- const bool isInteriorBoundary = enableInteriorBoundaries && fluxVarsCache.isInteriorBoundary();
- // For interior Neumann boundaries when using Tpfa for Neumann boundary conditions, we simply
- // return the user-specified flux. Note that for compositional models we attribute the influxes
- // to the major components, thus we do it per phase in Darcy's law. However, for single-phasic models
- // wesolve the phase mass balance equation AND the transport equation, thus, in that case we incorporate
- // the Neumann BCs here. We assume compIdx = eqIdx.
- // Note that this way of including interior Neumann fluxes fails for mpnc models where n != m.
- if (numPhases == 1
- && isInteriorBoundary
- && useTpfaBoundary
- && fluxVarsCache.interiorBoundaryDataSelf().faceType() == MpfaFaceTypes::interiorNeumann)
- componentFlux[compIdx] = scvf.area()*
- elemVolVars[scvf.insideScvIdx()].extrusionFactor()*
- problem.neumann(element, fvGeometry, elemVolVars, scvf)[compIdx];
-
+ continue;
// get the scaling factor for the effective diffusive fluxes
- const auto effFactor = Implementation::computeEffectivityFactor(fvGeometry, elemVolVars, scvf, fluxVarsCache, phaseIdx, isInteriorBoundary);
+ const auto effFactor = computeEffectivityFactor(elemVolVars, scvf, phaseIdx);
// if factor is zero, the flux will end up zero anyway
if (effFactor == 0.0)
- {
- componentFlux[compIdx] = 0.0;
continue;
- }
-
- // lambda functions depending on if we use mole or mass fractions
- auto getX = [phaseIdx, compIdx] (const auto& volVars)
- { return volVars.moleFraction(phaseIdx, compIdx); };
-
- auto getRho = [phaseIdx] (const auto& volVars)
- { return volVars.molarDensity(phaseIdx); };
// calculate the density at the interface
- const auto rho = Implementation::interpolateDensity(fvGeometry, elemVolVars, scvf, fluxVarsCache, getRho, isInteriorBoundary);
+ const auto rho = interpolateDensity(elemVolVars, scvf, phaseIdx);
- // calculate Tij*xj
+ // prepare computations
Scalar flux(0.0);
- unsigned int localIdx = 0;
- for (const auto volVarIdx : volVarsStencil)
- flux += tij[localIdx++]*getX(elemVolVars[volVarIdx]);
+ unsigned int i = 0;
+ const auto& fluxVarsCache = elemFluxVarsCache[scvf];
+ const auto& tij = fluxVarsCache.diffusionTij(phaseIdx, compIdx);
- // if no interior boundaries are present, return effective mass flux
- if (!enableInteriorBoundaries)
- componentFlux[compIdx] = useTpfaBoundary ? flux*rho*effFactor : flux*rho*effFactor + fluxVarsCache.componentNeumannFlux(compIdx);
+ // calculate Tij*xj
+ for (const auto volVarIdx : fluxVarsCache.diffusionVolVarsStencil(phaseIdx, compIdx))
+ flux += tij[i++]*elemVolVars[volVarIdx].moleFraction(phaseIdx, compIdx);
- else
- {
- // Handle interior boundaries
- flux += Implementation::computeInteriorBoundaryContribution(fvGeometry, elemVolVars, fluxVarsCache, getX, phaseIdx, compIdx);
+ // add contributions from dirichlet BCs
+ for (const auto& d : fluxVarsCache.diffusionDirichletData(phaseIdx, compIdx))
+ flux += tij[i++]*elemVolVars[d.volVarIndex()].moleFraction(phaseIdx, compIdx);
- // return overall resulting flux
- componentFlux[compIdx] = useTpfaBoundary ? flux*rho*effFactor : flux*rho*effFactor + fluxVarsCache.componentNeumannFlux(compIdx);
- }
+ componentFlux[compIdx] = fluxVarsCache.diffusionSwitchFluxSign(phaseIdx, compIdx) ? -1.0*flux*rho*effFactor : flux*rho*effFactor;
}
// accumulate the phase component flux
for(int compIdx = 0; compIdx < numComponents; compIdx++)
- if(compIdx != FluidSystem::getMainComponent(phaseIdx) && Model::mainComponentIsBalanced(phaseIdx) && !FluidSystem::isTracerFluidSystem())
+ if(compIdx != FluidSystem::getMainComponent(phaseIdx) && BalanceEqOpts::mainComponentIsBalanced(phaseIdx) && !FluidSystem::isTracerFluidSystem())
componentFlux[FluidSystem::getMainComponent(phaseIdx)] -= componentFlux[compIdx];
return componentFlux;
}
- template<typename GetRhoFunction>
- static Scalar interpolateDensity(const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
+private:
+ static Scalar interpolateDensity(const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf,
- const FluxVariablesCache& fluxVarsCache,
- const GetRhoFunction& getRho,
- const bool isInteriorBoundary)
+ const unsigned int phaseIdx)
{
-
- // maybe use the density of the interior BC on the facet
- if (isInteriorBoundary)
- {
- const auto& data = fluxVarsCache.interiorBoundaryDataSelf();
- if (data.faceType() == MpfaFaceTypes::interiorDirichlet)
- return getRho(data.facetVolVars(fvGeometry));
- }
-
// use arithmetic mean of the densities around the scvf
if (!scvf.boundary())
{
- Scalar rho = getRho(elemVolVars[scvf.insideScvIdx()]);
- for (auto outsideIdx : scvf.outsideScvIndices())
- rho += getRho(elemVolVars[outsideIdx]);
+ Scalar rho = elemVolVars[scvf.insideScvIdx()].molarDensity(phaseIdx);
+ for (const auto outsideIdx : scvf.outsideScvIndices())
+ rho += elemVolVars[outsideIdx].molarDensity(phaseIdx);
return rho/(scvf.outsideScvIndices().size()+1);
}
else
- return getRho(elemVolVars[scvf.outsideScvIdx()]);
+ return elemVolVars[scvf.outsideScvIdx()].molarDensity(phaseIdx);
}
//! Here we want to calculate the factors with which the diffusion coefficient has to be
//! scaled to get the effective diffusivity. For this we use the effective diffusivity with
//! a diffusion coefficient of 1.0 as input. Then we scale the transmissibilites during flux
//! calculation (above) with the harmonic average of the two factors
- static Scalar computeEffectivityFactor(const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
+ static Scalar computeEffectivityFactor(const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf,
- const FluxVariablesCache& fluxVarsCache,
- const unsigned int phaseIdx,
- const bool isInteriorBoundary)
+ const unsigned int phaseIdx)
{
using EffDiffModel = typename GET_PROP_TYPE(TypeTag, EffectiveDiffusivityModel);
- // Treat interior boundaries differently
- if (isInteriorBoundary)
- {
- const auto& data = fluxVarsCache.interiorBoundaryDataSelf();
- // use harmonic mean between the interior and the facet volvars
- if (data.faceType() == MpfaFaceTypes::interiorDirichlet)
- {
- const auto& insideVolVars = elemVolVars[scvf.insideScvIdx()];
- const auto factor = EffDiffModel::effectiveDiffusivity(insideVolVars.porosity(),
- insideVolVars.saturation(phaseIdx),
- /*Diffusion coefficient*/ 1.0);
-
- const auto facetVolVars = data.facetVolVars(fvGeometry);
- const auto outsideFactor = EffDiffModel::effectiveDiffusivity(facetVolVars.porosity(),
- facetVolVars.saturation(phaseIdx),
- /*Diffusion coefficient*/ 1.0);
-
- return harmonicMean(factor, outsideFactor);
- }
- }
-
// use the harmonic mean between inside and outside
const auto& insideVolVars = elemVolVars[scvf.insideScvIdx()];
const auto factor = EffDiffModel::effectiveDiffusivity(insideVolVars.porosity(),
@@ -319,7 +244,7 @@ public:
{
// interpret outside factor as arithmetic mean
Scalar outsideFactor = 0.0;
- for (auto outsideIdx : scvf.outsideScvIndices())
+ for (const auto outsideIdx : scvf.outsideScvIndices())
{
const auto& outsideVolVars = elemVolVars[outsideIdx];
outsideFactor += EffDiffModel::effectiveDiffusivity(outsideVolVars.porosity(),
@@ -334,29 +259,6 @@ public:
return factor;
}
-
- template<typename GetXFunction>
- static Scalar computeInteriorBoundaryContribution(const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const FluxVariablesCache& fluxVarsCache,
- const GetXFunction& getX,
- unsigned int phaseIdx, unsigned int compIdx)
- {
- // obtain the transmissibilites associated with all pressures
- const auto& tij = fluxVarsCache.diffusionTij(phaseIdx, compIdx);
-
- // the interior dirichlet boundaries local indices start after
- // the cell and the domain Dirichlet boundary pressures
- const auto startIdx = fluxVarsCache.diffusionVolVarsStencil(phaseIdx, compIdx).size();
-
- // add interior Dirichlet boundary contributions
- Scalar flux = 0.0;
- for (auto&& data : fluxVarsCache.interiorBoundaryData())
- if (data.faceType() == MpfaFaceTypes::interiorDirichlet)
- flux += tij[startIdx + data.localIndexInInteractionVolume()]*getX(data.facetVolVars(fvGeometry));
-
- return flux;
- }
};
} // end namespace
diff --git a/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh b/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh
index fa7f698142ecdddd77922d2c22403a8d68b4f2cc..ee92e33030a7f8c878bc8fd2ffd8f7ac529cbdad 100644
--- a/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh
+++ b/dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh
@@ -23,20 +23,12 @@
#ifndef DUMUX_DISCRETIZATION_CCMPFA_FLUXVARSCACHE_FILLER_HH
#define DUMUX_DISCRETIZATION_CCMPFA_FLUXVARSCACHE_FILLER_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
#include <dumux/discretization/cellcentered/mpfa/tensorlambdafactory.hh>
namespace Dumux
{
-//! forward declaration of properties
-namespace Properties
-{
-NEW_PROP_TAG(NumPhases);
-NEW_PROP_TAG(NumComponents);
-};
-
/*!
* \ingroup ImplicitModel
* \brief Helper class to fill the flux var caches
@@ -46,13 +38,13 @@ class CCMpfaFluxVariablesCacheFiller
{
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
+ using PrimaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using SecondaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, SecondaryInteractionVolume);
+ using DataHandle = typename PrimaryInteractionVolume::Traits::DataHandle;
using Element = typename GridView::template Codim<0>::Entity;
@@ -64,14 +56,11 @@ class CCMpfaFluxVariablesCacheFiller
static constexpr bool soldependentDiffusion = GET_PROP_VALUE(TypeTag, SolutionDependentMolecularDiffusion);
static constexpr bool soldependentHeatConduction = GET_PROP_VALUE(TypeTag, SolutionDependentHeatConduction);
- enum ProcessIndices : unsigned int
- {
- advectionIdx,
- diffusionIdx,
- heatConductionIdx
- };
-
public:
+ static constexpr bool isSolDependent = (doAdvection && soldependentAdvection) ||
+ (doDiffusion && soldependentDiffusion) ||
+ (doHeatConduction && soldependentHeatConduction);
+
//! The constructor. Sets the problem pointer
CCMpfaFluxVariablesCacheFiller(const Problem& problem) : problemPtr_(&problem) {}
@@ -84,7 +73,7 @@ public:
* \param fvGeometry The finite volume geometry
* \param elemVolVars The element volume variables
* \param scvf The corresponding sub-control volume face
- * \param doSubCaches Array of bools indicating which sub caches have to be updated
+ * \param forceUpdateAll if true, forces all caches to be updated (even the solution-independent ones)
*/
template<class FluxVariablesCacheContainer>
void fill(FluxVariablesCacheContainer& fluxVarsCacheContainer,
@@ -93,79 +82,87 @@ public:
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf,
- const std::array<bool, 3>& doSubCaches = std::array<bool, 3>({true, true, true}))
+ bool forceUpdateAll = false)
{
// Set pointers
elementPtr_ = &element;
fvGeometryPtr_ = &fvGeometry;
elemVolVarsPtr_ = &elemVolVars;
- scvfPtr_ = &scvf;
// prepare interaction volume and fill caches of all the scvfs connected to it
- const auto& fvGridGeometry = problem().model().fvGridGeometry();
- if (fvGridGeometry.isInBoundaryInteractionVolume(scvf))
+ const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
+ if (fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
{
- bIv_ = std::make_unique<BoundaryInteractionVolume>(fvGridGeometry.boundaryInteractionVolumeSeed(scvf),
- problem(),
- fvGeometry,
- elemVolVars);
+ if (forceUpdateAll)
+ {
+ // the local index of the interaction volume to be created in its container
+ const auto ivIndexInContainer = fluxVarsCacheContainer.secondaryInteractionVolumes_.size();
+
+ // prepare the locally cached boundary interaction volume
+ const auto& indexSet = fvGridGeometry.gridInteractionVolumeIndexSets().secondaryIndexSet(scvf);
+ fluxVarsCacheContainer.secondaryInteractionVolumes_.emplace_back();
+ secondaryIv_ = &fluxVarsCacheContainer.secondaryInteractionVolumes_.back();
+ secondaryIv_->setUpLocalScope(indexSet, problem(), fvGeometry);
+
+ // prepare the corresponding data handle
+ fluxVarsCacheContainer.secondaryIvDataHandles_.emplace_back();
+ ivDataHandle_ = &fluxVarsCacheContainer.secondaryIvDataHandles_.back();
+ secondaryIv_->prepareDataHandle(*ivDataHandle_);
+
+ // fill the caches for all the scvfs in the interaction volume
+ fillCachesInInteractionVolume_(fluxVarsCacheContainer, *secondaryIv_, *ivDataHandle_, ivIndexInContainer, true);
+ }
+ else
+ {
+ const auto ivIndexInContainer = scvfFluxVarsCache.ivIndexInContainer();
+ secondaryIv_ = &fluxVarsCacheContainer.secondaryInteractionVolumes_[ivIndexInContainer];
+ ivDataHandle_ = &fluxVarsCacheContainer.secondaryIvDataHandles_[ivIndexInContainer];
- // fill the caches for all the scvfs in the interaction volume
- fillCachesInInteractionVolume_(fluxVarsCacheContainer, scvfFluxVarsCache, boundaryInteractionVolume(), doSubCaches);
+ // fill the caches for all the scvfs in the interaction volume
+ fillCachesInInteractionVolume_(fluxVarsCacheContainer, *secondaryIv_, *ivDataHandle_, ivIndexInContainer);
+ }
}
else
{
- iv_ = std::make_unique<InteractionVolume>(fvGridGeometry.interactionVolumeSeed(scvf),
- problem(),
- fvGeometry,
- elemVolVars);
+ if (forceUpdateAll)
+ {
+ // the local index of the interaction volume to be created in its container
+ const auto ivIndexInContainer = fluxVarsCacheContainer.primaryInteractionVolumes_.size();
+
+ // prepare the locally cached boundary interaction volume
+ const auto& indexSet = fvGridGeometry.gridInteractionVolumeIndexSets().primaryIndexSet(scvf);
+ fluxVarsCacheContainer.primaryInteractionVolumes_.emplace_back();
+ primaryIv_ = &fluxVarsCacheContainer.primaryInteractionVolumes_.back();
+ primaryIv_->setUpLocalScope(indexSet, problem(), fvGeometry);
+
+ // prepare the corresponding data handle
+ fluxVarsCacheContainer.primaryIvDataHandles_.emplace_back();
+ ivDataHandle_ = &fluxVarsCacheContainer.primaryIvDataHandles_.back();
+ primaryIv_->prepareDataHandle(*ivDataHandle_);
+
+ // fill the caches for all the scvfs in the interaction volume
+ fillCachesInInteractionVolume_(fluxVarsCacheContainer, *primaryIv_, *ivDataHandle_, ivIndexInContainer, true);
+ }
+ else
+ {
+ const auto ivIndexInContainer = scvfFluxVarsCache.ivIndexInContainer();
+ primaryIv_ = &fluxVarsCacheContainer.primaryInteractionVolumes_[ivIndexInContainer];
+ ivDataHandle_ = &fluxVarsCacheContainer.primaryIvDataHandles_[ivIndexInContainer];
- // fill the caches for all the scvfs in the interaction volume
- fillCachesInInteractionVolume_(fluxVarsCacheContainer, scvfFluxVarsCache, interactionVolume(), doSubCaches);
+ // fill the caches for all the scvfs in the interaction volume
+ fillCachesInInteractionVolume_(fluxVarsCacheContainer, *primaryIv_, *ivDataHandle_, ivIndexInContainer);
+ }
}
}
- /*!
- * \brief function to update the flux variables caches during derivative calculation
- *
- * \copydoc fill
- */
- template<class FluxVariablesCacheContainer>
- void update(FluxVariablesCacheContainer& fluxVarsCacheContainer,
- FluxVariablesCache& scvfFluxVarsCache,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf)
- {
- // array of bool with which we indicate the sub-caches which have to be
- // filled. During update, we only update solution-dependent quantities.
- static const std::array<bool, 3> doSubCaches = []()
- {
- std::array<bool, 3> doCaches;
- doCaches[ProcessIndices::advectionIdx] = doAdvection && soldependentAdvection;
- doCaches[ProcessIndices::diffusionIdx] = doDiffusion && soldependentDiffusion;
- doCaches[ProcessIndices::heatConductionIdx] = doHeatConduction && soldependentHeatConduction;
- return doCaches;
- } ();
-
- // forward to fill routine
- fill(fluxVarsCacheContainer, scvfFluxVarsCache, element, fvGeometry, elemVolVars, scvf, doSubCaches);
- }
-
- static bool isSolutionIndependent()
- {
- static const bool isSolDependent = (doAdvection && soldependentAdvection) ||
- (doDiffusion && soldependentDiffusion) ||
- (doHeatConduction && soldependentHeatConduction);
- return !isSolDependent;
- }
+ const PrimaryInteractionVolume& primaryInteractionVolume() const
+ { return *primaryIv_; }
- const InteractionVolume& interactionVolume() const
- { return *iv_.get(); }
+ const SecondaryInteractionVolume& secondaryInteractionVolume() const
+ { return *secondaryIv_; }
- const BoundaryInteractionVolume& boundaryInteractionVolume() const
- { return *bIv_.get(); }
+ const DataHandle& dataHandle() const
+ { return *ivDataHandle_; }
private:
@@ -181,129 +178,118 @@ private:
const ElementVolumeVariables& elemVolVars() const
{ return *elemVolVarsPtr_; }
- const SubControlVolumeFace& scvFace() const
- { return *scvfPtr_; }
-
- InteractionVolume& interactionVolume()
- { return *iv_.get(); }
-
- BoundaryInteractionVolume& boundaryInteractionVolume()
- { return *bIv_.get(); }
-
//! Method to fill the flux var caches within an interaction volume
template<class FluxVariablesCacheContainer, class InteractionVolumeType>
void fillCachesInInteractionVolume_(FluxVariablesCacheContainer& fluxVarsCacheContainer,
- FluxVariablesCache& scvfFluxVarsCache,
InteractionVolumeType& iv,
- const std::array<bool, 3>& doSubCaches)
+ DataHandle& handle,
+ unsigned int ivIndexInContainer,
+ bool forceUpdateAll = false)
{
- // First we upate the interior boundary data and set the update status.
- // We store pointers to the other flux var caches and the elements they are embedded in simultaneously.
- // This way we have to obtain this data only once and can use it again in the sub-cache fillers.
- const auto numOtherScvfs = iv.globalLocalScvfPairedData().size()-1;
- std::vector<FluxVariablesCache*> otherFluxVarCaches(numOtherScvfs);
- std::vector<Element> otherElements(numOtherScvfs);
-
- scvfFluxVarsCache.updateInteriorBoundaryData(iv, scvFace());
- scvfFluxVarsCache.setUpdateStatus(true);
-
- const auto curScvfIdx = scvFace().index();
- unsigned int otherScvfIdx = 0;
- for (const auto& dataPair : iv.globalLocalScvfPairedData())
+ // First we upate data which are not dependent on the physical processes.
+ // We store pointers to the other flux var caches, so that we have to obtain
+ // this data only once and can use it again in the sub-cache fillers.
+ if (forceUpdateAll)
{
- const auto& scvfJ = *dataPair.first;
- if (curScvfIdx == scvfJ.index())
- continue;
-
- // get the element scvfJ is embedded in
- const auto scvfJInsideScvIndex = scvfJ.insideScvIdx();
- otherElements[otherScvfIdx] = scvfJInsideScvIndex == scvFace().insideScvIdx() ?
- element() :
- problem().model().fvGridGeometry().element(scvfJInsideScvIndex);
-
- // get the corresponding flux var cache
- otherFluxVarCaches[otherScvfIdx] = &fluxVarsCacheContainer[scvfJ];
- otherFluxVarCaches[otherScvfIdx]->updateInteriorBoundaryData(iv, scvfJ);
- otherFluxVarCaches[otherScvfIdx]->setUpdateStatus(true);
- otherScvfIdx++;
- }
+ const auto numGlobalScvfs = iv.localFaceData().size();
+ std::vector<const SubControlVolumeFace*> ivScvfs(numGlobalScvfs);
+ std::vector<FluxVariablesCache*> ivFluxVarCaches(numGlobalScvfs);
+
+ unsigned int i = 0;
+ for (const auto& d : iv.localFaceData())
+ {
+ // obtain the scvf
+ const auto& scvfJ = fvGeometry().scvf(d.globalScvfIndex());
+ ivScvfs[i] = &scvfJ;
+ ivFluxVarCaches[i] = &fluxVarsCacheContainer[scvfJ];
+ ivFluxVarCaches[i]->setIvIndexInContainer(ivIndexInContainer);
+ ivFluxVarCaches[i]->setUpdateStatus(true);
+ i++;
+ }
- //! Maybe update the advective quantities
- if (doSubCaches[ProcessIndices::advectionIdx])
- fillAdvection(fluxVarsCacheContainer, scvfFluxVarsCache, iv, otherFluxVarCaches, otherElements);
+ fillAdvection(fluxVarsCacheContainer, iv, handle, ivScvfs, ivFluxVarCaches);
+ fillDiffusion(fluxVarsCacheContainer, iv, handle, ivScvfs, ivFluxVarCaches);
+ fillHeatConduction(fluxVarsCacheContainer, iv, handle, ivScvfs, ivFluxVarCaches);
+ }
+ else
+ {
+ const auto numGlobalScvfs = iv.localFaceData().size();
+ std::vector<const SubControlVolumeFace*> ivScvfs(numGlobalScvfs);
+ std::vector<FluxVariablesCache*> ivFluxVarCaches(numGlobalScvfs);
- //! Maybe update the diffusive quantities
- if (doSubCaches[ProcessIndices::diffusionIdx])
- fillDiffusion(fluxVarsCacheContainer, scvfFluxVarsCache, iv, otherFluxVarCaches, otherElements);
+ unsigned int i = 0;
+ for (const auto& d : iv.localFaceData())
+ {
+ // the iv index has been set already
+ const auto& scvfJ = fvGeometry().scvf(d.globalScvfIndex());
+ ivScvfs[i] = &scvfJ;
+ ivFluxVarCaches[i] = &fluxVarsCacheContainer[scvfJ];
+ ivFluxVarCaches[i]->setUpdateStatus(true);
+ i++;
+ }
- //! Maybe update quantities related to heat conduction
- if (doSubCaches[ProcessIndices::heatConductionIdx])
- fillHeatConduction(fluxVarsCacheContainer, scvfFluxVarsCache, iv, otherFluxVarCaches, otherElements);
+ if (doAdvection && soldependentAdvection)
+ fillAdvection(fluxVarsCacheContainer, iv, handle, ivScvfs, ivFluxVarCaches);
+ if (doDiffusion && soldependentDiffusion)
+ fillDiffusion(fluxVarsCacheContainer, iv, handle, ivScvfs, ivFluxVarCaches);
+ if (doHeatConduction && soldependentHeatConduction)
+ fillHeatConduction(fluxVarsCacheContainer, iv, handle, ivScvfs, ivFluxVarCaches);
+ }
}
//! method to fill the advective quantities
template<class FluxVariablesCacheContainer, class InteractionVolumeType, bool advectionEnabled = doAdvection>
typename std::enable_if<advectionEnabled>::type
fillAdvection(FluxVariablesCacheContainer& fluxVarsCacheContainer,
- FluxVariablesCache& scvfFluxVarsCache,
InteractionVolumeType& iv,
- const std::vector<FluxVariablesCache*>& otherFluxVarCaches,
- const std::vector<Element> otherElements)
+ DataHandle& handle,
+ const std::vector<const SubControlVolumeFace*>& ivScvfs,
+ const std::vector<FluxVariablesCache*>& ivFluxVarCaches)
{
using AdvectionType = typename GET_PROP_TYPE(TypeTag, AdvectionType);
- using AdvectionFiller = typename AdvectionType::CacheFiller;
+ using AdvectionFiller = typename AdvectionType::Cache::Filler;
static constexpr auto AdvectionMethod = AdvectionType::myDiscretizationMethod;
using LambdaFactory = TensorLambdaFactory<TypeTag, AdvectionMethod>;
+ // set the advection context in the data handle
+ handle.setAdvectionContext();
+
// maybe solve the local system subject to K (if AdvectionType uses mpfa)
if (AdvectionMethod == DiscretizationMethods::CCMpfa)
- iv.solveLocalSystem(LambdaFactory::getAdvectionLambda());
+ iv.solveLocalSystem(LambdaFactory::getAdvectionLambda(), problem(), fvGeometry(), elemVolVars(), handle);
- // fill the caches of all scvfs within this interaction volume
- AdvectionFiller::fill(scvfFluxVarsCache, problem(), element(), fvGeometry(), elemVolVars(), scvFace(), *this);
-
- unsigned int otherScvfIdx = 0;
- const auto curScvfIdx = scvFace().index();
- for (const auto& dataPair : iv.globalLocalScvfPairedData())
- {
- const auto& scvfJ = *dataPair.first;
- if (curScvfIdx == scvfJ.index())
- continue;
-
- // fill corresponding cache
- AdvectionFiller::fill(*otherFluxVarCaches[otherScvfIdx],
+ // fill advection caches
+ for (unsigned int i = 0; i < iv.localFaceData().size(); ++i)
+ AdvectionFiller::fill(*ivFluxVarCaches[i],
problem(),
- otherElements[otherScvfIdx],
+ iv.element(iv.localFaceData()[i].ivLocalInsideScvIndex()),
fvGeometry(),
elemVolVars(),
- scvfJ,
+ *ivScvfs[i],
*this);
- otherScvfIdx++;
- }
}
//! do nothing if advection is not enabled
template<class FluxVariablesCacheContainer, class InteractionVolumeType, bool advectionEnabled = doAdvection>
typename std::enable_if<!advectionEnabled>::type
fillAdvection(FluxVariablesCacheContainer& fluxVarsCacheContainer,
- FluxVariablesCache& scvfFluxVarsCache,
InteractionVolumeType& iv,
- const std::vector<FluxVariablesCache*>& otherFluxVarCaches,
- const std::vector<Element> otherElements)
- {}
+ DataHandle& handle,
+ const std::vector<const SubControlVolumeFace*>& ivScvfs,
+ const std::vector<FluxVariablesCache*>& ivFluxVarCaches) {}
//! method to fill the diffusive quantities
template<class FluxVariablesCacheContainer, class InteractionVolumeType, bool diffusionEnabled = doDiffusion>
typename std::enable_if<diffusionEnabled>::type
fillDiffusion(FluxVariablesCacheContainer& fluxVarsCacheContainer,
- FluxVariablesCache& scvfFluxVarsCache,
InteractionVolumeType& iv,
- const std::vector<FluxVariablesCache*>& otherFluxVarCaches,
- const std::vector<Element> otherElements)
+ DataHandle& handle,
+ const std::vector<const SubControlVolumeFace*>& ivScvfs,
+ const std::vector<FluxVariablesCache*>& ivFluxVarCaches)
{
using DiffusionType = typename GET_PROP_TYPE(TypeTag, MolecularDiffusionType);
- using DiffusionFiller = typename DiffusionType::CacheFiller;
+ using DiffusionFiller = typename DiffusionType::Cache::Filler;
static constexpr auto DiffusionMethod = DiffusionType::myDiscretizationMethod;
using LambdaFactory = TensorLambdaFactory<TypeTag, DiffusionMethod>;
@@ -318,33 +304,24 @@ private:
if (phaseIdx == compIdx)
continue;
+ // set the diffusion context in the data handle
+ handle.setDiffusionContext(phaseIdx, compIdx);
+
// solve the local system subject to the diffusion tensor (if uses mpfa)
if (DiffusionMethod == DiscretizationMethods::CCMpfa)
- iv.solveLocalSystem(LambdaFactory::getDiffusionLambda(phaseIdx, compIdx));
-
- // fill the caches of all scvfs within this interaction volume
- DiffusionFiller::fill(scvfFluxVarsCache, phaseIdx, compIdx, problem(), element(), fvGeometry(), elemVolVars(), scvFace(), *this);
-
- unsigned int otherScvfIdx = 0;
- const auto curScvfIdx = scvFace().index();
- for (const auto& dataPair : iv.globalLocalScvfPairedData())
- {
- const auto& scvfJ = *dataPair.first;
- if (curScvfIdx == scvfJ.index())
- continue;
+ iv.solveLocalSystem(LambdaFactory::getDiffusionLambda(phaseIdx, compIdx), problem(), fvGeometry(), elemVolVars(), handle);
- // fill corresponding cache
- DiffusionFiller::fill(*otherFluxVarCaches[otherScvfIdx],
+ // fill diffusion caches
+ for (unsigned int i = 0; i < iv.localFaceData().size(); ++i)
+ DiffusionFiller::fill(*ivFluxVarCaches[i],
phaseIdx,
compIdx,
problem(),
- otherElements[otherScvfIdx],
+ iv.element(iv.localFaceData()[i].ivLocalInsideScvIndex()),
fvGeometry(),
elemVolVars(),
- scvfJ,
+ *ivScvfs[i],
*this);
- otherScvfIdx++;
- }
}
}
}
@@ -353,75 +330,66 @@ private:
template<class FluxVariablesCacheContainer, class InteractionVolumeType, bool diffusionEnabled = doDiffusion>
typename std::enable_if<!diffusionEnabled>::type
fillDiffusion(FluxVariablesCacheContainer& fluxVarsCacheContainer,
- FluxVariablesCache& scvfFluxVarsCache,
InteractionVolumeType& iv,
- const std::vector<FluxVariablesCache*>& otherFluxVarCaches,
- const std::vector<Element> otherElements)
- {}
+ DataHandle& handle,
+ const std::vector<const SubControlVolumeFace*>& ivScvfs,
+ const std::vector<FluxVariablesCache*>& ivFluxVarCaches) {}
//! method to fill the quantities related to heat conduction
template<class FluxVariablesCacheContainer, class InteractionVolumeType, bool heatConductionEnabled = doHeatConduction>
typename std::enable_if<heatConductionEnabled>::type
fillHeatConduction(FluxVariablesCacheContainer& fluxVarsCacheContainer,
- FluxVariablesCache& scvfFluxVarsCache,
InteractionVolumeType& iv,
- const std::vector<FluxVariablesCache*>& otherFluxVarCaches,
- const std::vector<Element> otherElements)
+ DataHandle& handle,
+ const std::vector<const SubControlVolumeFace*>& ivScvfs,
+ const std::vector<FluxVariablesCache*>& ivFluxVarCaches)
{
using HeatConductionType = typename GET_PROP_TYPE(TypeTag, HeatConductionType);
- using HeatConductionFiller = typename HeatConductionType::CacheFiller;
+ using HeatConductionFiller = typename HeatConductionType::Cache::Filler;
static constexpr auto HeatConductionMethod = HeatConductionType::myDiscretizationMethod;
using LambdaFactory = TensorLambdaFactory<TypeTag, HeatConductionMethod>;
+ // set the advection context in the data handle
+ handle.setHeatConductionContext();
+
// maybe solve the local system subject to fourier coefficient
if (HeatConductionMethod == DiscretizationMethods::CCMpfa)
- iv.solveLocalSystem(LambdaFactory::getHeatConductionLambda());
-
- // fill the caches of all scvfs within this interaction volume
- HeatConductionFiller::fill(scvfFluxVarsCache, problem(), element(), fvGeometry(), elemVolVars(), scvFace(), *this);
-
- unsigned int otherScvfIdx = 0;
- const auto curScvfIdx = scvFace().index();
- for (const auto& dataPair : iv.globalLocalScvfPairedData())
- {
- const auto& scvfJ = *dataPair.first;
- if (curScvfIdx == scvfJ.index())
- continue;
+ iv.solveLocalSystem(LambdaFactory::getHeatConductionLambda(), problem(), fvGeometry(), elemVolVars(), handle);
- // fill corresponding cache
- HeatConductionFiller::fill(*otherFluxVarCaches[otherScvfIdx],
+ // fill heat conduction caches
+ for (unsigned int i = 0; i < iv.localFaceData().size(); ++i)
+ HeatConductionFiller::fill(*ivFluxVarCaches[i],
problem(),
- otherElements[otherScvfIdx],
+ iv.element(iv.localFaceData()[i].ivLocalInsideScvIndex()),
fvGeometry(),
elemVolVars(),
- scvfJ,
+ *ivScvfs[i],
*this);
- otherScvfIdx++;
- }
}
//! do nothing if heat conduction is disabled
template<class FluxVariablesCacheContainer, class InteractionVolumeType, bool heatConductionEnabled = doHeatConduction>
typename std::enable_if<!heatConductionEnabled>::type
fillHeatConduction(FluxVariablesCacheContainer& fluxVarsCacheContainer,
- FluxVariablesCache& scvfFluxVarsCache,
InteractionVolumeType& iv,
- const std::vector<FluxVariablesCache*>& otherFluxVarCaches,
- const std::vector<Element> otherElements)
- {}
+ DataHandle& handle,
+ const std::vector<const SubControlVolumeFace*>& ivScvfs,
+ const std::vector<FluxVariablesCache*>& ivFluxVarCaches) {}
const Problem* problemPtr_;
const Element* elementPtr_;
const FVElementGeometry* fvGeometryPtr_;
const ElementVolumeVariables* elemVolVarsPtr_;
- const SubControlVolumeFace* scvfPtr_;
- // We store pointers to an inner and boundary interaction volume
- // these are updated during the filling of the caches and the
+ // We store pointers to an inner and a boundary interaction volume.
+ // These are updated during the filling of the caches and the
// physics-related caches have access to them
- std::unique_ptr<InteractionVolume> iv_;
- std::unique_ptr<BoundaryInteractionVolume> bIv_;
+ PrimaryInteractionVolume* primaryIv_;
+ SecondaryInteractionVolume* secondaryIv_;
+
+ // pointer to the current interaction volume data handle
+ DataHandle* ivDataHandle_;
};
} // end namespace
diff --git a/dumux/discretization/cellcentered/mpfa/fourierslaw.hh b/dumux/discretization/cellcentered/mpfa/fourierslaw.hh
index 72b3dde8c123f509474b11bf555521580c73bffa..ed64163ef645e186d3380dd72eba0bc0edfea92b 100644
--- a/dumux/discretization/cellcentered/mpfa/fourierslaw.hh
+++ b/dumux/discretization/cellcentered/mpfa/fourierslaw.hh
@@ -18,34 +18,28 @@
*****************************************************************************/
/*!
* \file
- * \brief This file contains the data which is required to calculate
+ * \brief This file contains the class which is required to calculate
* heat conduction fluxes with Fourier's law for cell-centered MPFA models.
*/
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_FOURIERS_LAW_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_FOURIERS_LAW_HH
-#include <dune/common/float_cmp.hh>
-
-#include <dumux/common/math.hh>
-#include <dumux/common/parameters.hh>
-#include <dumux/implicit/properties.hh>
-#include <dumux/discretization/methods.hh>
+#include <dumux/common/properties.hh>
namespace Dumux
{
/*!
- * \ingroup FouriersLaw
+ * \ingroup Mpfa
* \brief Specialization of Fourier's Law for the CCMpfa method.
*/
template <class TypeTag>
class FouriersLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
{
- using Implementation = typename GET_PROP_TYPE(TypeTag, HeatConductionType);
-
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using MpfaHelper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
@@ -54,56 +48,14 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
// Always use the dynamic type for vectors (compatibility with the boundary)
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using CoefficientVector = typename BoundaryInteractionVolume::Vector;
-
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Element = typename GridView::template Codim<0>::Entity;
- using IndexType = typename GridView::IndexSet::IndexType;
-
- static constexpr bool useTpfaBoundary = GET_PROP_VALUE(TypeTag, UseTpfaBoundary);
- static constexpr bool enableInteriorBoundaries = GET_PROP_VALUE(TypeTag, EnableInteriorBoundaries);
+ using PrimaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using CoefficientVector = typename PrimaryInteractionVolume::Traits::DynamicVector;
+ using DataHandle = typename PrimaryInteractionVolume::Traits::DataHandle;
+ static constexpr int dim = GridView::dimension;
+ static constexpr int dimWorld = GridView::dimensionworld;
static constexpr int energyEqIdx = GET_PROP_TYPE(TypeTag, Indices)::energyEqIdx;
- //! The cache used in conjunction with the mpfa Fourier's Law
- class MpfaFouriersLawCache
- {
- using Stencil = typename BoundaryInteractionVolume::GlobalIndexSet;
- public:
- // update cached objects for heat conduction
- template<typename InteractionVolume>
- void updateHeatConduction(const InteractionVolume& iv, const SubControlVolumeFace &scvf)
- {
- const auto& localFaceData = iv.getLocalFaceData(scvf);
- heatConductionVolVarsStencil_ = iv.volVarsStencil();
- heatConductionTij_ = iv.getTransmissibilities(localFaceData);
- heatNeumannFlux_ = iv.getNeumannFlux(localFaceData, energyEqIdx);
- }
-
- //! Returns the volume variables indices necessary for heat conduction flux
- //! computation. This includes all participating boundary volume variables
- //! and it can be different for the phases & components.
- const Stencil& heatConductionVolVarsStencil() const
- { return heatConductionVolVarsStencil_; }
-
- //! Returns the transmissibilities associated with the volume variables
- //! This can be different for the phases & components.
- const CoefficientVector& heatConductionTij() const
- { return heatConductionTij_; }
-
- //! If the useTpfaBoundary property is set to false, the boundary conditions
- //! are put into the local systems leading to possible contributions on all faces
- Scalar heatNeumannFlux() const
- { return heatNeumannFlux_; }
-
- private:
- // Quantities associated with heat conduction
- Stencil heatConductionVolVarsStencil_;
- CoefficientVector heatConductionTij_;
- Scalar heatNeumannFlux_;
- };
-
//! Class that fills the cache corresponding to mpfa Darcy's Law
class MpfaFouriersLawCacheFiller
{
@@ -119,12 +71,67 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethods::CCMpfa>
const SubControlVolumeFace& scvf,
const FluxVariablesCacheFiller& fluxVarsCacheFiller)
{
- // get interaction volume from the flux vars cache filler & upate the cache
- if (problem.model().fvGridGeometry().isInBoundaryInteractionVolume(scvf))
- scvfFluxVarsCache.updateHeatConduction(fluxVarsCacheFiller.boundaryInteractionVolume(), scvf);
+ // get interaction volume from the flux vars cache filler & upate the cache
+ if (fvGeometry.fvGridGeometry().vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
+ scvfFluxVarsCache.updateHeatConduction(fluxVarsCacheFiller.secondaryInteractionVolume(),
+ fluxVarsCacheFiller.dataHandle(),
+ scvf);
+ else
+ scvfFluxVarsCache.updateHeatConduction(fluxVarsCacheFiller.primaryInteractionVolume(),
+ fluxVarsCacheFiller.dataHandle(),
+ scvf);
+ }
+ };
+
+ //! The cache used in conjunction with the mpfa Fourier's Law
+ class MpfaFouriersLawCache
+ {
+ // We always use the dynamic types here to be compatible on the boundary
+ using Stencil = typename PrimaryInteractionVolume::Traits::DynamicGlobalIndexContainer;
+ using DirichletDataContainer = typename PrimaryInteractionVolume::DirichletDataContainer;
+ public:
+ // export filler type
+ using Filler = MpfaFouriersLawCacheFiller;
+
+ // update cached objects for heat conduction
+ template<class InteractionVolume>
+ void updateHeatConduction(const InteractionVolume& iv, const DataHandle& dataHandle, const SubControlVolumeFace &scvf)
+ {
+ const auto& localFaceData = iv.getLocalFaceData(scvf);
+
+ // update the quantities that are equal for all phases
+ heatConductionSwitchFluxSign_ = localFaceData.isOutside();
+ heatConductionVolVarsStencil_ = &dataHandle.volVarsStencil();
+ heatConductionDirichletData_ = &dataHandle.dirichletData();
+
+ // the transmissibilities on surface grids have to be obtained from the outside
+ if (dim == dimWorld)
+ heatConductionTij_ = &dataHandle.T()[localFaceData.ivLocalScvfIndex()];
else
- scvfFluxVarsCache.updateHeatConduction(fluxVarsCacheFiller.interactionVolume(), scvf);
+ heatConductionTij_ = localFaceData.isOutside() ?
+ &dataHandle.outsideTij()[localFaceData.ivLocalOutsideScvfIndex()] :
+ &dataHandle.T()[localFaceData.ivLocalScvfIndex()];
}
+
+ //! Returns the stencil for heat conduction flux computation on an scvf
+ const Stencil& heatConductionVolVarsStencil() const { return *heatConductionVolVarsStencil_; }
+
+ //! Returns the transmissibilities associated with the volume variables
+ const CoefficientVector& heatConductionTij() const { return *heatConductionTij_; }
+
+ //! On faces that are "outside" w.r.t. a face in the interaction volume,
+ //! we have to take the negative value of the fluxes, i.e. multiply by -1.0
+ bool heatConductionSwitchFluxSign() const { return heatConductionSwitchFluxSign_; }
+
+ //! Returns the data on dirichlet boundary conditions affecting
+ //! the flux computation on this face
+ const DirichletDataContainer& heatConductionDirichletData() const { return *heatConductionDirichletData_; }
+
+ private:
+ bool heatConductionSwitchFluxSign_;
+ const Stencil* heatConductionVolVarsStencil_;
+ const CoefficientVector* heatConductionTij_;
+ const DirichletDataContainer* heatConductionDirichletData_;
};
public:
@@ -133,7 +140,6 @@ public:
// state the type for the corresponding cache and its filler
using Cache = MpfaFouriersLawCache;
- using CacheFiller = MpfaFouriersLawCacheFiller;
static Scalar flux(const Problem& problem,
const Element& element,
@@ -142,54 +148,22 @@ public:
const SubControlVolumeFace& scvf,
const ElementFluxVarsCache& elemFluxVarsCache)
{
+ // prepare computations
+ Scalar flux(0.0);
+ unsigned int i = 0;
const auto& fluxVarsCache = elemFluxVarsCache[scvf];
- const auto& volVarsStencil = fluxVarsCache.heatConductionVolVarsStencil();
const auto& tij = fluxVarsCache.heatConductionTij();
- const bool isInteriorBoundary = enableInteriorBoundaries && fluxVarsCache.isInteriorBoundary();
- // For interior Neumann boundaries when using Tpfa on boundaries, return the user-specified flux
- if (isInteriorBoundary
- && useTpfaBoundary
- && fluxVarsCache.interiorBoundaryDataSelf().faceType() == MpfaFaceTypes::interiorNeumann)
- return scvf.area()*
- elemVolVars[scvf.insideScvIdx()].extrusionFactor()*
- problem.neumann(element, fvGeometry, elemVolVars, scvf)[energyEqIdx];
-
// calculate Tij*tj
- Scalar flux(0.0);
- unsigned int localIdx = 0;
- for (const auto volVarIdx : volVarsStencil)
- flux += tij[localIdx++]*elemVolVars[volVarIdx].temperature();
-
- // if no interior boundaries are present, return heat conduction flux
- if (!enableInteriorBoundaries)
- return useTpfaBoundary ? flux : flux + fluxVarsCache.heatNeumannFlux();
+ for (const auto volVarIdx : fluxVarsCache.heatConductionVolVarsStencil())
+ flux += tij[i++]*elemVolVars[volVarIdx].temperature();
- // Handle interior boundaries
- flux += Implementation::computeInteriorBoundaryContribution(fvGeometry, elemVolVars, fluxVarsCache);
+ // add contributions from dirichlet BCs
+ for (const auto& d : fluxVarsCache.heatConductionDirichletData())
+ flux += tij[i++]*elemVolVars[d.volVarIndex()].temperature();
// return overall resulting flux
- return useTpfaBoundary ? flux : flux + fluxVarsCache.heatNeumannFlux();
- }
-
- static Scalar computeInteriorBoundaryContribution(const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const FluxVariablesCache& fluxVarsCache)
- {
- // obtain the transmissibilites associated with all pressures
- const auto& tij = fluxVarsCache.heatConductionTij();
-
- // the interior dirichlet boundaries local indices start after
- // the cell and the domain Dirichlet boundary pressures
- const auto startIdx = fluxVarsCache.heatConductionVolVarsStencil().size();
-
- // add interior Dirichlet boundary contributions
- Scalar flux = 0.0;
- for (auto&& data : fluxVarsCache.interiorBoundaryData())
- if (data.faceType() == MpfaFaceTypes::interiorDirichlet)
- flux += tij[startIdx + data.localIndexInInteractionVolume()]*data.facetVolVars(fvGeometry).temperature();
-
- return flux;
+ return fluxVarsCache.heatConductionSwitchFluxSign() ? -flux : flux;
}
};
diff --git a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
index b3707586dc77e5471d662669a5f0e505edfd7e23..1986b12cf55278acabd592a719b7b0990e51f85a 100644
--- a/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
+++ b/dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh
@@ -28,7 +28,6 @@
#include <dune/common/iteratorrange.hh>
#include <dumux/discretization/scvandscvfiterators.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
namespace Dumux
{
@@ -120,7 +119,7 @@ public:
return fvGridGeometry().scvfIndicesOfScv(scvIndices_[0]).size();
}
- //! Binding of an element, called by the local jacobian to prepare element assembly
+ //! Binding of an element, called by the local assembler to prepare element assembly
void bind(const Element& element)
{
this->bindElement(element);
@@ -129,8 +128,7 @@ public:
//! Bind only element-local
void bindElement(const Element& element)
{
- elementPtr_ = &element;
- scvIndices_ = std::vector<IndexType>({fvGridGeometry().problem_().elementMapper().index(*elementPtr_)});
+ scvIndices_ = std::vector<IndexType>({fvGridGeometry().elementMapper().index(element)});
}
//! The global finite volume geometry we are a restriction of
@@ -139,7 +137,6 @@ public:
private:
- const Element* elementPtr_;
std::vector<IndexType> scvIndices_;
const FVGridGeometry* fvGridGeometryPtr_;
};
@@ -249,15 +246,14 @@ public:
{ return scvfs_.size(); }
//! Binding of an element preparing the geometries of the whole stencil
- //! called by the local jacobian to prepare element assembly
+ //! called by the local assembler to prepare element assembly
void bind(const Element& element)
{
bindElement(element);
// get some references for convenience
- const auto& problem = fvGridGeometry().problem_();
- const auto globalI = problem.elementMapper().index(element);
- const auto& assemblyMapI = problem.model().localJacobian().assemblyMap()[globalI];
+ const auto globalI = fvGridGeometry().elementMapper().index(element);
+ const auto& assemblyMapI = fvGridGeometry().connectivityMap()[globalI];
// reserve memory
const auto numNeighbors = assemblyMapI.size();
@@ -269,7 +265,7 @@ public:
// make neighbor geometries
// use the assembly map to determine which faces are necessary
- for (auto&& dataJ : assemblyMapI)
+ for (const auto& dataJ : assemblyMapI)
makeNeighborGeometries(fvGridGeometry().element(dataJ.globalJ),
dataJ.globalJ,
dataJ.scvfsJ,
@@ -279,26 +275,26 @@ public:
if (dim < dimWorld)
makeFlipIndexSet();
- //! Check if user added additional DOF dependencies, i.e. the residual of DOF globalI depends
- //! on additional DOFs not included in the discretization schemes' occupation pattern
- const auto& additionalDofDependencies = problem.getAdditionalDofDependencies(globalI);
- if (!additionalDofDependencies.empty())
- {
- neighborScvs_.reserve(neighborScvs_.size() + additionalDofDependencies.size());
- neighborScvIndices_.reserve(neighborScvIndices_.size() + additionalDofDependencies.size());
- for (auto globalJ : additionalDofDependencies)
- {
- neighborScvs_.emplace_back(fvGridGeometry().element(globalJ).geometry(), globalJ);
- neighborScvIndices_.emplace_back(globalJ);
- }
- }
+ // //! TODO Check if user added additional DOF dependencies, i.e. the residual of DOF globalI depends
+ // //! on additional DOFs not included in the discretization schemes' occupation pattern
+ // const auto& additionalDofDependencies = problem.getAdditionalDofDependencies(globalI);
+ // if (!additionalDofDependencies.empty())
+ // {
+ // const auto newNumNeighbors = neighborScvs_.size() + additionalDofDependencies.size();
+ // neighborScvs_.reserve(newNumNeighbors);
+ // neighborScvIndices_.reserve(newNumNeighbors);
+ // for (auto globalJ : additionalDofDependencies)
+ // {
+ // neighborScvs_.emplace_back(fvGridGeometry().element(globalJ).geometry(), globalJ);
+ // neighborScvIndices_.emplace_back(globalJ);
+ // }
+ // }
}
//! Binding of an element preparing the geometries only inside the element
void bindElement(const Element& element)
{
clear();
- elementPtr_ = &element;
makeElementGeometries(element);
}
@@ -308,8 +304,7 @@ public:
private:
- //! Estimates the number of neighboring scvfs that have to be prepared
- //! The estimate holds for inner elements, overestimats on the boundary
+ //! Computes the number of neighboring scvfs that have to be prepared
template<class DataJ>
unsigned int numNeighborScvfs_(const std::vector<DataJ>& dataJVector)
{
@@ -322,11 +317,8 @@ private:
//! create scvs and scvfs of the bound element
void makeElementGeometries(const Element& element)
{
- // the problem
- const auto& problem = fvGridGeometry().problem_();
-
// make the scv
- auto eIdx = problem.elementMapper().index(element);
+ const auto eIdx = fvGridGeometry().elementMapper().index(element);
scvs_.emplace_back(element.geometry(), eIdx);
scvIndices_.emplace_back(eIdx);
@@ -335,10 +327,10 @@ private:
const auto& neighborVolVarIndices = fvGridGeometry().neighborVolVarIndices(eIdx);
// the quadrature point to be used on the scvf
- const Scalar q = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Mpfa, Q);
+ static const Scalar q = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Mpfa.Q");
// reserve memory for the scv faces
- auto numLocalScvf = scvFaceIndices.size();
+ const auto numLocalScvf = scvFaceIndices.size();
scvfIndices_.reserve(numLocalScvf);
scvfs_.reserve(numLocalScvf);
@@ -355,17 +347,13 @@ private:
// only make a new scvf if we haven't handled it yet
if (dim < dimWorld)
{
- auto indexInInside = is.indexInInside();
+ const auto indexInInside = is.indexInInside();
if(finishedFacets[indexInInside])
continue;
else
finishedFacets[indexInInside] = true;
}
- // get the intersection corners according to generic numbering
- auto numCorners = is.geometry().corners();
- std::vector<GlobalPosition> isCorners(numCorners);
-
// if outside level > inside level, use the outside element in the following
bool useNeighbor = is.neighbor() && is.outside().level() > element.level();
const auto& e = useNeighbor ? is.outside() : element;
@@ -373,22 +361,26 @@ private:
const auto eg = e.geometry();
const auto& refElement = ReferenceElements::general(eg.type());
- for (unsigned int c = 0; c < numCorners; ++c)
- isCorners[c] = eg.global(refElement.position(refElement.subEntity(indexInElement, 1, c, dim), dim));
+ // Set up a container with all relevant positions for scvf corner computation
+ const auto numCorners = is.geometry().corners();
+ const auto isPositions = MpfaHelper::computeScvfCornersOnIntersection(eg,
+ refElement,
+ indexInElement,
+ numCorners);
// make the scv faces belonging to each corner of the intersection
- for (unsigned int c = 0; c < numCorners; ++c)
+ for (int c = 0; c < numCorners; ++c)
{
// get the global vertex index the scv face is connected to
auto vIdxLocal = refElement.subEntity(indexInElement, 1, c, dim);
- auto vIdxGlobal = problem.vertexMapper().subIndex(e, vIdxLocal, dim);
+ auto vIdxGlobal = fvGridGeometry().vertexMapper().subIndex(e, vIdxLocal, dim);
// do not build scvfs connected to a processor boundary
if (fvGridGeometry().isGhostVertex(vIdxGlobal))
continue;
scvfs_.emplace_back(MpfaHelper(),
- MpfaHelper::getScvfCorners(isCorners, c),
+ MpfaHelper::getScvfCorners(isPositions, numCorners, c),
is.centerUnitOuterNormal(),
vIdxGlobal,
vIdxLocal,
@@ -396,8 +388,7 @@ private:
eIdx,
neighborVolVarIndices[scvfCounter],
q,
- is.boundary()
- );
+ is.boundary());
scvfIndices_.emplace_back(scvFaceIndices[scvfCounter]);
scvfCounter++;
@@ -421,7 +412,7 @@ private:
const auto& neighborVolVarIndices = fvGridGeometry().neighborVolVarIndices(eIdxGlobal);
// the quadrature point to be used on the scvf
- const Scalar q = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Mpfa, Q);
+ static const Scalar q = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Mpfa.Q");
// for network grids we only want to do one scvf per half facet
// this approach assumes conforming grids at branching facets
@@ -443,10 +434,6 @@ private:
finishedFacets[indexInInside] = true;
}
- // get the intersection corners according to generic numbering
- auto numCorners = is.geometry().corners();
- std::vector<GlobalPosition> isCorners(numCorners);
-
// if outside level > inside level, use the outside element in the following
bool useNeighbor = is.neighbor() && is.outside().level() > element.level();
const auto& e = useNeighbor ? is.outside() : element;
@@ -454,45 +441,54 @@ private:
const auto eg = e.geometry();
const auto& refElement = ReferenceElements::general(eg.type());
- for (unsigned int c = 0; c < numCorners; ++c)
- isCorners[c] = eg.global(refElement.position(refElement.subEntity(indexInElement, 1, c, dim), dim));
+ // Set up a container with all relevant positions for scvf corner computation
+ const auto numCorners = is.geometry().corners();
+ const auto isPositions = MpfaHelper::computeScvfCornersOnIntersection(eg,
+ refElement,
+ indexInElement,
+ numCorners);
// make the scv faces belonging to each corner of the intersection
- for (unsigned int c = 0; c < numCorners; ++c)
+ for (int c = 0; c < numCorners; ++c)
{
+ // only build the scvf if it is in the list of necessary indices
+ if (!MpfaHelper::vectorContainsValue(scvfIndices, scvFaceIndices[scvfCounter])
+ && !MpfaHelper::vectorContainsValue(additionalScvfs, scvFaceIndices[scvfCounter]))
+ {
+ // increment counter either way
+ scvfCounter++;
+ continue;
+ }
+
// get the global vertex index the scv face is connected to
auto vIdxLocal = refElement.subEntity(indexInElement, 1, c, dim);
- auto vIdxGlobal = fvGridGeometry().problem_().vertexMapper().subIndex(e, vIdxLocal, dim);
+ auto vIdxGlobal = fvGridGeometry().vertexMapper().subIndex(e, vIdxLocal, dim);
// do not build scvfs connected to a processor boundary
if (fvGridGeometry().isGhostVertex(vIdxGlobal))
continue;
- // only build the scvf if it is in the list of necessary indices
- if (MpfaHelper::contains(scvfIndices, scvFaceIndices[scvfCounter])
- || MpfaHelper::contains(additionalScvfs, scvFaceIndices[scvfCounter]))
- {
- neighborScvfs_.emplace_back(MpfaHelper(),
- MpfaHelper::getScvfCorners(isCorners, c),
- is.centerUnitOuterNormal(),
- vIdxGlobal,
- vIdxLocal,
- scvFaceIndices[scvfCounter],
- eIdxGlobal,
- neighborVolVarIndices[scvfCounter],
- q,
- is.boundary()
- );
-
- neighborScvfIndices_.emplace_back(scvFaceIndices[scvfCounter]);
- }
-
- // increment counter either way
+ // build scvf
+ neighborScvfs_.emplace_back(MpfaHelper(),
+ MpfaHelper::getScvfCorners(isPositions, numCorners, c),
+ is.centerUnitOuterNormal(),
+ vIdxGlobal,
+ vIdxLocal,
+ scvFaceIndices[scvfCounter],
+ eIdxGlobal,
+ neighborVolVarIndices[scvfCounter],
+ q,
+ is.boundary());
+
+ neighborScvfIndices_.emplace_back(scvFaceIndices[scvfCounter]);
+
+ // increment counter
scvfCounter++;
}
}
}
+ //! find the "flip" indices for all scvfs
void makeFlipIndexSet()
{
const auto numInsideScvfs = scvfIndices_.size();
@@ -502,7 +498,7 @@ private:
flipScvfIndices_.resize(numInsideScvfs);
for (unsigned int insideFace = 0; insideFace < numInsideScvfs; ++insideFace)
{
- auto&& scvf = scvfs_[insideFace];
+ const auto& scvf = scvfs_[insideFace];
if (scvf.boundary())
continue;
@@ -516,11 +512,11 @@ private:
const auto outsideScvIdx = scvf.outsideScvIdx(nIdx);
for (unsigned int outsideFace = 0; outsideFace < numNeighborScvfs; ++outsideFace)
{
- auto&& outsideScvf = neighborScvfs_[outsideFace];
+ const auto& outsideScvf = neighborScvfs_[outsideFace];
// check if outside face is the flip face
if (outsideScvf.insideScvIdx() == outsideScvIdx &&
outsideScvf.vertexIndex() == vIdxGlobal &&
- MpfaHelper::contains(outsideScvf.outsideScvIndices(), insideScvIdx))
+ MpfaHelper::vectorContainsValue(outsideScvf.outsideScvIndices(), insideScvIdx))
{
flipScvfIndices_[insideFace][nIdx] = outsideFace;
// there is always only one flip face in an outside element
@@ -534,7 +530,7 @@ private:
neighborFlipScvfIndices_.resize(numNeighborScvfs);
for (unsigned int outsideFace = 0; outsideFace < numNeighborScvfs; ++outsideFace)
{
- auto&& scvf = neighborScvfs_[outsideFace];
+ const auto& scvf = neighborScvfs_[outsideFace];
if (scvf.boundary())
continue;
@@ -553,10 +549,10 @@ private:
{
for (unsigned int insideFace = 0; insideFace < numInsideScvfs; ++insideFace)
{
- auto&& insideScvf = scvfs_[insideFace];
+ const auto& insideScvf = scvfs_[insideFace];
// check if the face is the flip face
if (insideScvf.vertexIndex() == vIdxGlobal &&
- MpfaHelper::contains(insideScvf.outsideScvIndices(), insideScvIdx))
+ MpfaHelper::vectorContainsValue(insideScvf.outsideScvIndices(), insideScvIdx))
{
neighborFlipScvfIndices_[outsideFace][nIdx] = insideFace;
// there is always only one flip face in an outside element
@@ -572,7 +568,7 @@ private:
// check if outside face is the flip face
if (outsideScvf.insideScvIdx() == neighborScvIdx &&
outsideScvf.vertexIndex() == vIdxGlobal &&
- MpfaHelper::contains(outsideScvf.outsideScvIndices(), insideScvIdx))
+ MpfaHelper::vectorContainsValue(outsideScvf.outsideScvIndices(), insideScvIdx))
{
neighborFlipScvfIndices_[outsideFace][nIdx] = outsideFace2;
// there is always only one flip face in an outside element
@@ -605,9 +601,6 @@ private:
neighborScvfs_.clear();
}
- // the bound element
- const Element* elementPtr_;
-
const FVGridGeometry* fvGridGeometryPtr_;
// local storage after binding an element
diff --git a/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh b/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
index 0626530515edd2a2f1f90c0f6297f5462fbe19cd..8c66ea962f31f9c54957d48401f44e0bedaaf40c 100644
--- a/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
+++ b/dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh
@@ -28,13 +28,18 @@
#include <dune/geometry/multilineargeometry.hh>
#include <dune/geometry/referenceelements.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
#include <dumux/common/elementmap.hh>
+#include <dumux/discretization/basefvgridgeometry.hh>
+#include <dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh>
+#include <dumux/discretization/cellcentered/mpfa/connectivitymap.hh>
+#include <dumux/discretization/cellcentered/mpfa/dualgridindexset.hh>
+#include <dumux/discretization/cellcentered/mpfa/gridinteractionvolumeindexsets.hh>
+
namespace Dumux
{
/*!
- * \ingroup ImplicitModel
+ * \ingroup Mpfa
* \brief Base class for the finite volume geometry vector for mpfa models
* This builds up the sub control volumes and sub control volume faces
* for each element.
@@ -43,155 +48,161 @@ template<class TypeTag, bool EnableFVElementGeometryCache>
class CCMpfaFVGridGeometry
{};
-// specialization in case the FVElementGeometries are stored
+// specialization in case the finite volume grid geometries are stored
template<class TypeTag>
-class CCMpfaFVGridGeometry<TypeTag, true>
+class CCMpfaFVGridGeometry<TypeTag, true> : public BaseFVGridGeometry<TypeTag>
{
- using Implementation = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
-
- //! The actual implementation might overwrite the update() routine
- friend Implementation;
- //! The local class needs access to the problem
- friend typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
-
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using ParentType = BaseFVGridGeometry<TypeTag>;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using ElementMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
using MpfaHelper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using GlobalInteractionVolumeSeeds = typename GET_PROP_TYPE(TypeTag, GlobalInteractionVolumeSeeds);
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using InteractionVolumeSeed = typename InteractionVolume::Seed;
- using BoundaryInteractionVolumeSeed = typename BoundaryInteractionVolume::Seed;
- using Element = typename GridView::template Codim<0>::Entity;
+ using GridIVIndexSets = CCMpfaGridInteractionVolumeIndexSets<TypeTag>;
+ using ConnectivityMap = CCMpfaConnectivityMap<TypeTag>;
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ static constexpr int dim = GridView::dimension;
+ static constexpr int dimWorld = GridView::dimensionworld;
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Vertex = typename GridView::template Codim<dim>::Entity;
+ using Intersection = typename GridView::Intersection;
using CoordScalar = typename GridView::ctype;
using IndexType = typename GridView::IndexSet::IndexType;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
- static constexpr int dim = GridView::dimension;
- static constexpr int dimWorld = GridView::dimensionworld;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+ using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
using ReferenceElements = typename Dune::ReferenceElements<CoordScalar, dim>;
- static constexpr bool enableInteriorBoundaries = GET_PROP_VALUE(TypeTag, EnableInteriorBoundaries);
-
public:
- //! Constructor
- CCMpfaFVGridGeometry(const GridView gridView)
- : gridView_(gridView), elementMap_(gridView), globalInteractionVolumeSeeds_(gridView) {}
+ using SecondaryIvIndicator = std::function<bool(const Element&, const Intersection&, bool)>;
+
+ //! Constructor without indicator function for secondary interaction volumes
+ //! Per default, we use the secondary IVs at branching points & boundaries
+ explicit CCMpfaFVGridGeometry(const GridView& gridView)
+ : ParentType(gridView)
+ , elementMap_(gridView)
+ , secondaryIvIndicator_([] (const Element& e, const Intersection& is, bool isBranching)
+ { return is.boundary() || isBranching; } )
+ {}
+
+ //! Constructor with user-defined indicator function for secondary interaction volumes
+ explicit CCMpfaFVGridGeometry(const GridView& gridView, const SecondaryIvIndicator& indicator)
+ : ParentType(gridView)
+ , elementMap_(gridView)
+ , secondaryIvIndicator_(indicator)
+ {}
+
+ //! the element mapper is the dofMapper
+ //! this is convenience to have better chance to have the same main files for box/tpfa/mpfa...
+ const ElementMapper& dofMapper() const
+ { return this->elementMapper(); }
- //! The total number of sub control volumes
+ /*!
+ * \brief Returns the total number of sub control volumes.
+ */
std::size_t numScv() const
{ return scvs_.size(); }
- //! The total number of sub control volume faces
+ /*!
+ * \brief Returns the total number of sub control volume faces.
+ */
std::size_t numScvf() const
{ return scvfs_.size(); }
- //! The total number of scvfs on the domain boundaries
- std::size_t numDomainBoundaryScvf() const
- { return numDomainBoundaryScvf_; }
-
- //! The total number of scvfs on the interior boundaries
- std::size_t numInteriorBoundaryScvf() const
- { return numInteriorBoundaryScvf_; }
-
- //! The total number of scvfs connected to branching points
- std::size_t numBranchingPointScvf() const
- { return numBranchingPointScvf_; }
-
- //! The total number of vertices connected to branching points
- std::size_t numBranchingPointVertices() const
- { return numBranchingPointVertices_; }
-
- //! The total number of vertices on interior and domain boundaries
- std::size_t numInteriorOrDomainBoundaryVertices() const
- { return numInteriorOrDomainBoundaryVertices_; }
+ /*!
+ * \brief Returns the number of scvfs on the domain boundary.
+ */
+ std::size_t numBoundaryScvf() const
+ { return numBoundaryScvf_; }
- // Get an element from a sub control volume contained in it
- Element element(const SubControlVolume& scv) const
- { return elementMap_.element(scv.elementIndex()); }
+ /*!
+ * \brief Returns the total number of degrees of freedom.
+ */
+ std::size_t numDofs() const
+ { return this->gridView().size(0); }
- // Get an element from a global element index
+ /*!
+ * \brief Gets an element from a global element index.
+ */
Element element(IndexType eIdx) const
{ return elementMap_.element(eIdx); }
- //! Get the inner interaction volume seed corresponding to an scvf
- const InteractionVolumeSeed& interactionVolumeSeed(const SubControlVolumeFace& scvf) const
- { return globalInteractionVolumeSeeds_.seed(scvf); }
+ /*!
+ * \brief Gets an element from a sub control volume contained in it.
+ */
+ Element element(const SubControlVolume& scv) const
+ { return elementMap_.element(scv.elementIndex()); }
- //! Get the boundary interaction volume seed corresponding to an scvf
- const BoundaryInteractionVolumeSeed& boundaryInteractionVolumeSeed(const SubControlVolumeFace& scvf) const
- { return globalInteractionVolumeSeeds_.boundarySeed(scvf); }
+ /*!
+ * \brief Returns true if primary interaction volumes are used around a given vertex,
+ * false otherwise.
+ */
+ bool vertexUsesPrimaryInteractionVolume(const Vertex& v) const
+ { return primaryInteractionVolumeVertices_[this->vertexMapper().index(v)]; }
- //! Returns whether or not an scvf is on an interior boundary
- bool isOnInteriorBoundary(const SubControlVolumeFace& scvf) const
- { return enableInteriorBoundaries ? interiorBoundaryScvfs_[scvf.index()] : false; }
+ /*!
+ * \brief Returns true if primary interaction volumes are used around a given vertex index,
+ * false otherwise.
+ */
+ bool vertexUsesPrimaryInteractionVolume(IndexType vIdxGlobal) const
+ { return primaryInteractionVolumeVertices_[vIdxGlobal]; }
- //! Returns whether or not an scvf touches the domain boundary
- bool touchesDomainBoundary(const SubControlVolumeFace& scvf) const
- { return domainBoundaryVertices_[scvf.vertexIndex()]; }
+ /*!
+ * \brief Returns if primary interaction volumes are used around a given vertex.
+ */
+ bool vertexUsesSecondaryInteractionVolume(const Vertex& v) const
+ { return secondaryInteractionVolumeVertices_[this->vertexMapper().index(v)]; }
- //! Returns whether or not an scvf touches the domain boundary
- bool touchesInteriorBoundary(const SubControlVolumeFace& scvf) const
- { return enableInteriorBoundaries ? interiorBoundaryVertices_[scvf.vertexIndex()] : false; }
+ /*!
+ * \brief Returns true if primary interaction volumes are used around a given vertex index,
+ * false otherwise.
+ */
+ bool vertexUsesSecondaryInteractionVolume(IndexType vIdxGlobal) const
+ { return secondaryInteractionVolumeVertices_[vIdxGlobal]; }
- //! Returns whether or not an scvf belongs to a boundary interaction volume
- bool isInBoundaryInteractionVolume(const SubControlVolumeFace& scvf) const
- { return touchesDomainBoundary(scvf) || touchesInteriorBoundary(scvf) || touchesBranchingPoint(scvf); }
+ /*!
+ * \brief Updates all finite volume geometries of the grid. Hhas to be called again after grid adaptation.
+ */
+ void update()
+ {
+ // stop the time required for the update
+ Dune::Timer timer;
- //! Returns whether or not an scvf touches a branching point (for dim < dimWorld)
- bool touchesBranchingPoint(const SubControlVolumeFace& scvf) const
- { return dim == dimWorld ? false : branchingVertices_[scvf.vertexIndex()]; }
+ // clear containers (necessary after grid refinement)
+ scvs_.clear();
+ scvfs_.clear();
+ scvfIndicesOfScv_.clear();
+ elementMap_.clear();
- //! update all fvElementGeometries (do this again after grid adaption)
- void update(const Problem& problem)
- {
- problemPtr_ = &problem;
+ // determine the number of geometric entities
+ const auto numVert = this->gridView().size(dim);
+ const auto numScvs = numDofs();
+ std::size_t numScvf = MpfaHelper::getGlobalNumScvf(this->gridView());
// resize containers
- const auto numVert = gridView_.size(dim);
- const auto numScvs = gridView_.size(0);
- const auto numScvfs = MpfaHelper::getGlobalNumScvf(gridView_);
-
scvs_.resize(numScvs);
- scvfs_.reserve(numScvfs);
+ scvfs_.reserve(numScvf);
scvfIndicesOfScv_.resize(numScvs);
elementMap_.resize(numScvs);
- // Keep track of domain (and mabybe interior) boundaries
- domainBoundaryVertices_.resize(numVert, false);
- std::vector<bool> interiorOrDomainBoundaryVertices(numVert, false);
- if (enableInteriorBoundaries)
- {
- interiorBoundaryVertices_.resize(numVert, false);
- interiorBoundaryScvfs_.resize(numScvfs, false);
- }
-
- // Maybe keep track of branching points
- if (dim < dimWorld)
- branchingVertices_.resize(gridView_.size(dim), false);
+ // Some methods require to use a second type of interaction volume, e.g.
+ // around vertices on the boundary or branching points (surface grids)
+ primaryInteractionVolumeVertices_.resize(numVert, true);
+ secondaryInteractionVolumeVertices_.resize(numVert, false);
// find vertices on processor boundaries
- const auto isGhostVertex = MpfaHelper::findGhostVertices(problem, gridView_);
+ const auto isGhostVertex = MpfaHelper::findGhostVertices(this->gridView(), this->vertexMapper());
- // the quadrature point to be used on the scvfs
- static const Scalar q = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Mpfa, Q);
+ // instantiate the dual grid index set (to be used for construction of interaction volumes)
+ CCMpfaDualGridIndexSet<TypeTag> dualIdSet(this->gridView());
// Build the SCVs and SCV faces
IndexType scvfIdx = 0;
- numDomainBoundaryScvf_ = 0;
- numInteriorBoundaryScvf_ = 0;
- numBranchingPointScvf_ = 0;
- numBranchingPointVertices_ = 0;
- numInteriorOrDomainBoundaryVertices_ = 0;
- for (const auto& element : elements(gridView_))
+ numBoundaryScvf_ = 0;
+ for (const auto& element : elements(this->gridView()))
{
- const auto eIdx = problem.elementMapper().index(element);
+ const auto eIdx = this->elementMapper().index(element);
// the element geometry
auto elementGeometry = element.geometry();
@@ -203,44 +214,34 @@ public:
std::vector<IndexType> scvfIndexSet;
scvfIndexSet.reserve(MpfaHelper::getNumLocalScvfs(elementGeometry.type()));
- // for network grids there might be multiple intersection with the same geometryInInside
+ // for network grids there might be multiple intersections with the same geometryInInside
// we indentify those by the indexInInside for now (assumes conforming grids at branching facets)
std::vector<std::vector<IndexType>> outsideIndices;
if (dim < dimWorld)
{
outsideIndices.resize(element.subEntities(1));
- for (const auto& intersection : intersections(gridView_, element))
+ for (const auto& intersection : intersections(this->gridView(), element))
{
if (intersection.neighbor())
{
const auto& outside = intersection.outside();
- auto nIdx = problem.elementMapper().index(outside);
+ auto nIdx = this->elementMapper().index(outside);
outsideIndices[intersection.indexInInside()].push_back(nIdx);
}
}
}
// construct the sub control volume faces
- for (const auto& is : intersections(gridView_, element))
+ for (const auto& is : intersections(this->gridView(), element))
{
const auto indexInInside = is.indexInInside();
const bool boundary = is.boundary();
const bool neighbor = is.neighbor();
- const bool interiorBoundary = enableInteriorBoundaries ? problem.isInteriorBoundary(element, is) : false;
- // for network grids, skip the rest if handled already
+ // for surface grids, skip the rest if handled already
if (dim < dimWorld && neighbor && outsideIndices[indexInInside].empty())
continue;
- // determine the outside volvar indices
- const std::vector<IndexType> nIndices = neighbor && dim == dimWorld ?
- std::vector<IndexType>({problem.elementMapper().index(is.outside())}) :
- std::vector<IndexType>();
-
- // get the intersection corners according to generic numbering
- const auto numCorners = is.geometry().corners();
- std::vector<GlobalPosition> isCorners(numCorners);
-
// if outside level > inside level, use the outside element in the following
const bool useNeighbor = neighbor && is.outside().level() > element.level();
const auto& e = useNeighbor ? is.outside() : element;
@@ -248,83 +249,70 @@ public:
const auto eg = e.geometry();
const auto& refElement = ReferenceElements::general(eg.type());
- for (unsigned int c = 0; c < numCorners; ++c)
- isCorners[c] = eg.global(refElement.position(refElement.subEntity(indexInElement, 1, c, dim), dim));
+ // Set up a container with all relevant positions for scvf corner computation
+ const auto numCorners = is.geometry().corners();
+ const auto isPositions = MpfaHelper::computeScvfCornersOnIntersection(eg,
+ refElement,
+ indexInElement,
+ numCorners);
+
+ // evaluate if vertices on this intersection use primary/secondary IVs
+ const bool isBranchingPoint = dim < dimWorld ? outsideIndices[indexInInside].size() > 1 : false;
+ const bool usesSecondaryIV = secondaryIvIndicator_(element, is, isBranchingPoint);
// make the scv faces belonging to each corner of the intersection
- for (unsigned int c = 0; c < numCorners; ++c)
+ for (std::size_t c = 0; c < numCorners; ++c)
{
// get the global vertex index the scv face is connected to
const auto vIdxLocal = refElement.subEntity(indexInElement, 1, c, dim);
- const auto vIdxGlobal = problem.vertexMapper().subIndex(e, vIdxLocal, dim);
+ const auto vIdxGlobal = this->vertexMapper().subIndex(e, vIdxLocal, dim);
// do not build scvfs connected to a processor boundary
if (isGhostVertex[vIdxGlobal])
continue;
- // is vertex on a branching point?
- if (dim < dimWorld && outsideIndices[indexInInside].size() > 1)
+ // if this vertex is tagged to use the secondary IVs, store info
+ if (usesSecondaryIV)
{
- if (!branchingVertices_[vIdxGlobal])
- numBranchingPointVertices_++;
- branchingVertices_[vIdxGlobal] = true;
- numBranchingPointScvf_++;
+ primaryInteractionVolumeVertices_[vIdxGlobal] = false;
+ secondaryInteractionVolumeVertices_[vIdxGlobal] = true;
}
- // make the scv face (for non-boundary scvfs on network grids, use precalculated outside indices)
- if (!boundary)
- {
- const auto& outsideScvIndices = dim == dimWorld ? nIndices : outsideIndices[indexInInside];
- scvfIndexSet.push_back(scvfIdx);
- scvfs_.emplace_back(MpfaHelper(),
- MpfaHelper::getScvfCorners(isCorners, c),
- is.centerUnitOuterNormal(),
- vIdxGlobal,
- vIdxLocal,
- scvfIdx,
- eIdx,
- outsideScvIndices,
- q,
- boundary
- );
- }
- else
- {
- const std::vector<IndexType> boundaryIdx = [&] ()
- {
- IndexType bIdx = numScvs + numDomainBoundaryScvf_++;
- return std::vector<IndexType>({bIdx});
- } ();
- scvfIndexSet.push_back(scvfIdx);
- scvfs_.emplace_back(MpfaHelper(),
- MpfaHelper::getScvfCorners(isCorners, c),
- is.centerUnitOuterNormal(),
- vIdxGlobal,
- vIdxLocal,
- scvfIdx,
- eIdx,
- boundaryIdx,
- q,
- boundary
- );
- }
-
- // if a new interior or domain boundary has been found, increase counter
- if ((boundary || interiorBoundary) && !interiorOrDomainBoundaryVertices[vIdxGlobal])
- {
- interiorOrDomainBoundaryVertices[vIdxGlobal] = true;
- numInteriorOrDomainBoundaryVertices_++;
- }
+ // the quadrature point to be used on the scvfs
+ static const Scalar q = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Mpfa.Q");
- // store info on which vertices are on the domain/interior boundary
- if (boundary)
- domainBoundaryVertices_[vIdxGlobal] = true;
- if (enableInteriorBoundaries && interiorBoundary)
- {
- interiorBoundaryVertices_[vIdxGlobal] = true;
- interiorBoundaryScvfs_[scvfIdx] = true;
- numInteriorBoundaryScvf_++;
- }
+ // make the scv face (for non-boundary scvfs on network grids, use precalculated outside indices)
+ const auto& outsideScvIndices = [&] ()
+ {
+ if (!boundary)
+ {
+ return dim == dimWorld ?
+ std::vector<IndexType>({this->elementMapper().index(is.outside())}) :
+ outsideIndices[indexInInside];
+ }
+ else
+ {
+ // compute boundary scv idx and increment counter
+ const IndexType bIdx = numScvs + numBoundaryScvf_;
+ numBoundaryScvf_++;
+ return std::vector<IndexType>(1, bIdx);
+ }
+ } ();
+
+ scvfIndexSet.push_back(scvfIdx);
+ scvfs_.emplace_back(MpfaHelper(),
+ MpfaHelper::getScvfCorners(isPositions, numCorners, c),
+ is.centerUnitOuterNormal(),
+ vIdxGlobal,
+ vIdxLocal,
+ scvfIdx,
+ eIdx,
+ outsideScvIndices,
+ q,
+ boundary);
+
+ // insert the scvf data into the dual grid index set
+ dualIdSet[vIdxGlobal].insert(scvfs_.back());
// increment scvf counter
scvfIdx++;
@@ -346,7 +334,7 @@ public:
if (dim < dimWorld)
{
flipScvfIndices_.resize(scvfs_.size());
- for (auto&& scvf : scvfs_)
+ for (const auto& scvf : scvfs_)
{
if (scvf.boundary())
continue;
@@ -356,14 +344,14 @@ public:
const auto insideScvIdx = scvf.insideScvIdx();
flipScvfIndices_[scvf.index()].resize(numOutsideScvs);
- for (unsigned int i = 0; i < numOutsideScvs; ++i)
+ for (std::size_t i = 0; i < numOutsideScvs; ++i)
{
const auto outsideScvIdx = scvf.outsideScvIdx(i);
for (auto outsideScvfIndex : scvfIndicesOfScv_[outsideScvIdx])
{
const auto& outsideScvf = this->scvf(outsideScvfIndex);
if (outsideScvf.vertexIndex() == vIdxGlobal &&
- MpfaHelper::contains(outsideScvf.outsideScvIndices(), insideScvIdx))
+ MpfaHelper::vectorContainsValue(outsideScvf.outsideScvIndices(), insideScvIdx))
{
flipScvfIndices_[scvf.index()][i] = outsideScvfIndex;
// there is always only one flip face in an outside element
@@ -375,272 +363,288 @@ public:
}
}
- // make sure we found as many scvfs as previously estimated
- assert(scvfIdx == numScvfs);
+ // building the geometries has finished
+ std::cout << "Initializing of the grid finite volume geometry took " << timer.elapsed() << " seconds." << std::endl;
- // Initialize the interaction volume seeds
- globalInteractionVolumeSeeds_.update(problem, interiorOrDomainBoundaryVertices);
+ // Initialize the grid interaction volume seeds
+ timer.reset();
+ ivIndexSets_.update(*this, std::move(dualIdSet));
+ std::cout << "Initializing of the grid interaction volume index sets took " << timer.elapsed() << " seconds." << std::endl;
+
+ // build the connectivity map for an efficient assembly
+ timer.reset();
+ connectivityMap_.update(*this);
+ std::cout << "Initializing of the connectivity map took " << timer.elapsed() << " seconds." << std::endl;
}
/*!
- * \brief Return a local restriction of this global object
- * The local object is only functional after calling its bind/bindElement method
- * This is a free function that will be found by means of ADL
+ * \brief Returns a sub control volume for a given global scv index.
*/
- friend inline FVElementGeometry localView(const Implementation& global)
- { return FVElementGeometry(global); }
-
- //! Get a sub control volume with a global scv index
const SubControlVolume& scv(IndexType scvIdx) const
{ return scvs_[scvIdx]; }
- //! Get a sub control volume face with a global scvf index
+ /*!
+ * \brief Returns a sub control volume face for a given global scvf index.
+ */
const SubControlVolumeFace& scvf(IndexType scvfIdx) const
{ return scvfs_[scvfIdx]; }
+ /*!
+ * \brief Returns the "flipped" scvf, i.e. the correspongin scvf in an outside element.
+ * The second argument is optional and only comes into play on network/surface grids.
+ */
const SubControlVolumeFace& flipScvf(IndexType scvfIdx, unsigned int outsideScvfIdx = 0) const
{ return scvfs_[flipScvfIndices_[scvfIdx][outsideScvfIdx]]; }
- //! Get the sub control volume face indices of an scv by global index
+ /*!
+ * \brief Returns the sub control volume face indices of an scv by global index.
+ */
const std::vector<IndexType>& scvfIndicesOfScv(IndexType scvIdx) const
{ return scvfIndicesOfScv_[scvIdx]; }
- //! Return a const reference to the grid view
- const GridView& gridView() const
- { return gridView_; }
-
-private:
-
- const Problem& problem_() const
- { return *problemPtr_; }
+ /*!
+ * \brief Returns the connectivity map of which dofs have derivatives with respect
+ * to a given dof.
+ */
+ const ConnectivityMap& connectivityMap() const
+ { return connectivityMap_; }
- const Problem* problemPtr_;
- GridView gridView_;
+ /*!
+ * \brief Returns the grit interaction volume seeds class.
+ */
+ const GridIVIndexSets& gridInteractionVolumeIndexSets() const
+ { return ivIndexSets_; }
- // vectors that store the geometries
+private:
+ // mappers
Dumux::ElementMap<GridView> elementMap_;
+ ConnectivityMap connectivityMap_;
+
+ // the finite volume grid geometries
std::vector<SubControlVolume> scvs_;
std::vector<SubControlVolumeFace> scvfs_;
- // vectors that store the global data
+ // containers storing the global data
std::vector<std::vector<IndexType>> scvfIndicesOfScv_;
- std::vector<bool> domainBoundaryVertices_;
- std::vector<bool> interiorBoundaryScvfs_;
- std::vector<bool> interiorBoundaryVertices_;
- std::vector<bool> branchingVertices_;
- std::size_t numInteriorOrDomainBoundaryVertices_;
- std::size_t numDomainBoundaryScvf_;
- std::size_t numInteriorBoundaryScvf_;
- std::size_t numBranchingPointScvf_;
- std::size_t numBranchingPointVertices_;
+ std::vector<bool> primaryInteractionVolumeVertices_;
+ std::vector<bool> secondaryInteractionVolumeVertices_;
+ std::size_t numBoundaryScvf_;
+
// needed for embedded surface and network grids (dim < dimWorld)
std::vector<std::vector<IndexType>> flipScvfIndices_;
- // the global interaction volume seeds
- GlobalInteractionVolumeSeeds globalInteractionVolumeSeeds_;
+ // The grid interaction volume index set
+ GridIVIndexSets ivIndexSets_;
+
+ // Indicator function on where to use the secondary IVs
+ SecondaryIvIndicator secondaryIvIndicator_;
};
// specialization in case the FVElementGeometries are not stored
template<class TypeTag>
-class CCMpfaFVGridGeometry<TypeTag, false>
+class CCMpfaFVGridGeometry<TypeTag, false> : public BaseFVGridGeometry<TypeTag>
{
- //! The local fvGeometry needs access to the problem
- friend typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
-
- using Implementation = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using ParentType = BaseFVGridGeometry<TypeTag>;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using MpfaHelper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using GlobalInteractionVolumeSeeds = typename GET_PROP_TYPE(TypeTag, GlobalInteractionVolumeSeeds);
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using InteractionVolumeSeed = typename InteractionVolume::Seed;
- using BoundaryInteractionVolumeSeed = typename BoundaryInteractionVolume::Seed;
- using Element = typename GridView::template Codim<0>::Entity;
-
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using CoordScalar = typename GridView::ctype;
- using IndexType = typename GridView::IndexSet::IndexType;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
+ using GridIVIndexSets = CCMpfaGridInteractionVolumeIndexSets<TypeTag>;
+ using ConnectivityMap = CCMpfaConnectivityMap<TypeTag>;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using ElementMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Vertex = typename GridView::template Codim<dim>::Entity;
+ using Intersection = typename GridView::Intersection;
+ using CoordScalar = typename GridView::ctype;
+ using IndexType = typename GridView::IndexSet::IndexType;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+ using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
using ReferenceElements = typename Dune::ReferenceElements<CoordScalar, dim>;
- static constexpr bool enableInteriorBoundaries = GET_PROP_VALUE(TypeTag, EnableInteriorBoundaries);
-
public:
- //! Constructor
- CCMpfaFVGridGeometry(const GridView gridView)
- : gridView_(gridView), elementMap_(gridView), globalInteractionVolumeSeeds_(gridView_) {}
+ using SecondaryIvIndicator = std::function<bool(const Element&, const Intersection&, bool)>;
+
+ //! Constructor without indicator function for secondary interaction volumes
+ //! Per default, we use the secondary IVs at branching points & boundaries
+ explicit CCMpfaFVGridGeometry(const GridView& gridView)
+ : ParentType(gridView)
+ , elementMap_(gridView)
+ , secondaryIvIndicator_([] (const Element& e, const Intersection& is, bool isBranching)
+ { return is.boundary() || isBranching; } )
+ {}
+
+ //! Constructor with user-defined indicator function for secondary interaction volumes
+ explicit CCMpfaFVGridGeometry(const GridView& gridView, const SecondaryIvIndicator& indicator)
+ : ParentType(gridView)
+ , elementMap_(gridView)
+ , secondaryIvIndicator_(indicator)
+ {}
+
+ //! the element mapper is the dofMapper
+ //! this is convenience to have better chance to have the same main files for box/tpfa/mpfa...
+ const ElementMapper& dofMapper() const
+ { return this->elementMapper(); }
- //! The total number of sub control volumes
+ /*!
+ * \brief Returns the total number of sub control volumes.
+ */
std::size_t numScv() const
{ return numScvs_; }
- //! The total number of sub control volume faces
+ /*!
+ * \brief Returns the total number of sub control volume faces.
+ */
std::size_t numScvf() const
{ return numScvf_; }
- //! The total number of scvfs on the interior boundaries
- std::size_t numDomainBoundaryScvf() const
- { return numDomainBoundaryScvf_; }
-
- //! The total number of scvfs on the interior boundaries
- std::size_t numInteriorBoundaryScvf() const
- { return numInteriorBoundaryScvf_; }
-
- //! The total number of scvfs connected to branching points
- std::size_t numBranchingPointScvf() const
- { return numBranchingPointScvf_; }
-
- //! The total number of vertices connected to branching points
- std::size_t numBranchingPointVertices() const
- { return numBranchingPointVertices_; }
-
- //! The total number of vertices on the boundary
- std::size_t numInteriorOrDomainBoundaryVertices() const
- { return numInteriorOrDomainBoundaryVertices_; }
+ /*!
+ * \brief Returns the number of scvfs on the domain boundary.
+ */
+ std::size_t numBoundaryScvf() const
+ { return numBoundaryScvf_; }
- // Get an element from a sub control volume contained in it
- Element element(const SubControlVolume& scv) const
- { return elementMap_.element(scv.elementIndex()); }
+ /*!
+ * \brief Returns the total number of degrees of freedom.
+ */
+ std::size_t numDofs() const
+ { return this->gridView().size(0); }
- // Get an element from a global element index
+ /*!
+ * \brief Gets an element from a global element index.
+ */
Element element(IndexType eIdx) const
{ return elementMap_.element(eIdx); }
- //! Return the gridView this global object lives on
- const GridView& gridView() const
- { return gridView_; }
-
- //! Get the inner interaction volume seed corresponding to an scvf
- const InteractionVolumeSeed& interactionVolumeSeed(const SubControlVolumeFace& scvf) const
- { return globalInteractionVolumeSeeds_.seed(scvf); }
-
- //! Get the boundary interaction volume seed corresponding to an scvf
- const BoundaryInteractionVolumeSeed& boundaryInteractionVolumeSeed(const SubControlVolumeFace& scvf) const
- { return globalInteractionVolumeSeeds_.boundarySeed(scvf); }
+ /*!
+ * \brief Gets an element from a sub control volume contained in it.
+ */
+ Element element(const SubControlVolume& scv) const
+ { return elementMap_.element(scv.elementIndex()); }
- //! Returns whether or not an scvf is on an interior boundary
- bool isOnInteriorBoundary(const SubControlVolumeFace& scvf) const
- { return enableInteriorBoundaries ? interiorBoundaryScvfs_[scvf.index()] : false; }
+ /*!
+ * \brief Returns true if primary interaction volumes are used around a given vertex,
+ * false otherwise.
+ */
+ bool vertexUsesPrimaryInteractionVolume(const Vertex& v) const
+ { return primaryInteractionVolumeVertices_[this->vertexMapper().index(v)]; }
- //! Returns whether or not an scvf touches the domain boundary
- bool touchesDomainBoundary(const SubControlVolumeFace& scvf) const
- { return domainBoundaryVertices_[scvf.vertexIndex()]; }
+ /*!
+ * \brief Returns true if primary interaction volumes are used around a given vertex index,
+ * false otherwise.
+ */
+ bool vertexUsesPrimaryInteractionVolume(IndexType vIdxGlobal) const
+ { return primaryInteractionVolumeVertices_[vIdxGlobal]; }
- //! Returns whether or not an scvf touches the domain boundary
- bool touchesInteriorBoundary(const SubControlVolumeFace& scvf) const
- { return enableInteriorBoundaries ? interiorBoundaryVertices_[scvf.vertexIndex()] : false; }
+ /*!
+ * \brief Returns if primary interaction volumes are used around a given vertex.
+ */
+ bool vertexUsesSecondaryInteractionVolume(const Vertex& v) const
+ { return secondaryInteractionVolumeVertices_[this->vertexMapper().index(v)]; }
- //! Returns whether or not an scvf belongs to a boundary interaction volume
- bool isInBoundaryInteractionVolume(const SubControlVolumeFace& scvf) const
- { return touchesDomainBoundary(scvf) || touchesInteriorBoundary(scvf) || touchesBranchingPoint(scvf); }
+ /*!
+ * \brief Returns true if primary interaction volumes are used around a given vertex index,
+ * false otherwise.
+ */
+ bool vertexUsesSecondaryInteractionVolume(IndexType vIdxGlobal) const
+ { return secondaryInteractionVolumeVertices_[vIdxGlobal]; }
- //! Returns whether or not a vertex is on a processor boundary
- bool isGhostVertex(const IndexType vIdxGlobal) const
- { return ghostVertices_[vIdxGlobal]; }
+ /*!
+ * \brief Returns true if a given vertex lies on a processor boundary inside a ghost element.
+ */
+ bool isGhostVertex(const Vertex& v) const
+ { return isGhostVertex_[this->vertexMapper().index(v)]; }
- //! Returns whether or not an scvf touches a branching point (for dim < dimWorld)
- bool touchesBranchingPoint(const SubControlVolumeFace& scvf) const
- { return dim < dimWorld ? branchingVertices_[scvf.vertexIndex()] : false; }
+ /*!
+ * \brief Returns true if the vertex corresponding to a given vertex index lies on a
+ * processor boundary inside a ghost element.
+ */
+ bool isGhostVertex(IndexType vIdxGlobal) const
+ { return isGhostVertex_[vIdxGlobal]; }
- //! update all fvElementGeometries (do this again after grid adaption)
- void update(const Problem& problem)
+ /*!
+ * \brief Updates all finite volume geometries of the grid. Has to be called again after grid adaption.
+ */
+ void update()
{
- problemPtr_ = &problem;
+ // stop the time required for the update
+ Dune::Timer timer;
- // resize the containers
- const auto numScvfs = MpfaHelper::getGlobalNumScvf(gridView_);
- const auto numVert = gridView_.size(dim);
- numScvs_ = gridView_.size(0);
+ // clear containers (necessary after grid refinement)
+ scvfIndicesOfScv_.clear();
+ neighborVolVarIndices_.clear();
+ elementMap_.clear();
- elementMap_.resize(numScvs_);
+ // resize containers
+ numScvs_ = numDofs();
scvfIndicesOfScv_.resize(numScvs_);
neighborVolVarIndices_.resize(numScvs_);
+ elementMap_.resize(numScvs_);
- // keep track of the domain (and maybe interior) boundaries
- domainBoundaryVertices_.resize(numVert, false);
- std::vector<bool> interiorOrDomainBoundaryVertices(numVert, false);
- if (enableInteriorBoundaries)
- {
- interiorBoundaryScvfs_.resize(numScvfs, false);
- interiorBoundaryVertices_.resize(numVert, false);
- }
+ // Some methods require to use a second type of interaction volume, e.g.
+ // around vertices on the boundary or branching points (surface grids)
+ const auto numVert = this->gridView().size(dim);
+ primaryInteractionVolumeVertices_.resize(numVert, true);
+ secondaryInteractionVolumeVertices_.resize(numVert, false);
- // keep track of branching points
- if (dim < dimWorld)
- branchingVertices_.resize(gridView_.size(dim), false);
+ // find vertices on processor boundaries HERE!!
+ isGhostVertex_ = MpfaHelper::findGhostVertices(this->gridView(), this->vertexMapper());
- // find vertices on processor boundaries
- ghostVertices_ = MpfaHelper::findGhostVertices(problem, gridView_);
+ // instantiate the dual grid index set (to be used for construction of interaction volumes)
+ CCMpfaDualGridIndexSet<TypeTag> dualIdSet(this->gridView());
- // Store necessary info on SCVs and SCV faces
- // reset counters for the tracking of the indices
+ // Build the SCVs and SCV faces
numScvf_ = 0;
- numDomainBoundaryScvf_ = 0;
- numInteriorBoundaryScvf_ = 0;
- numBranchingPointScvf_ = 0;
- numBranchingPointVertices_ = 0;
- numInteriorOrDomainBoundaryVertices_ = 0;
- for (const auto& element : elements(gridView_))
+ numBoundaryScvf_ = 0;
+ for (const auto& element : elements(this->gridView()))
{
- const auto eIdx = problem.elementMapper().index(element);
+ const auto eIdx = this->elementMapper().index(element);
+
+ // the element geometry
+ auto elementGeometry = element.geometry();
// fill the element map with seeds
elementMap_[eIdx] = element.seed();
- // the element geometry and reference element
- auto eg = element.geometry();
-
// the element-wise index sets for finite volume geometry
- const auto numLocalFaces = MpfaHelper::getNumLocalScvfs(eg.type());
+ const auto numLocalFaces = MpfaHelper::getNumLocalScvfs(elementGeometry.type());
std::vector<IndexType> scvfsIndexSet;
std::vector< std::vector<IndexType> > neighborVolVarIndexSet;
scvfsIndexSet.reserve(numLocalFaces);
neighborVolVarIndexSet.reserve(numLocalFaces);
- // for network grids there might be multiple intersection with the same geometryInInside
+ // for network grids there might be multiple intersections with the same geometryInInside
// we indentify those by the indexInInside for now (assumes conforming grids at branching facets)
std::vector<std::vector<IndexType>> outsideIndices;
if (dim < dimWorld)
{
outsideIndices.resize(element.subEntities(1));
- for (const auto& intersection : intersections(gridView_, element))
+ for (const auto& intersection : intersections(this->gridView(), element))
{
if (intersection.neighbor())
{
const auto& outside = intersection.outside();
- auto nIdx = problem.elementMapper().index(outside);
+ auto nIdx = this->elementMapper().index(outside);
outsideIndices[intersection.indexInInside()].push_back(nIdx);
}
}
}
- unsigned int localFaceIdx = 0;
// construct the sub control volume faces
- for (const auto& is : intersections(gridView_, element))
+ for (const auto& is : intersections(this->gridView(), element))
{
const auto indexInInside = is.indexInInside();
const bool boundary = is.boundary();
const bool neighbor = is.neighbor();
- const bool interiorBoundary = enableInteriorBoundaries ? problem.isInteriorBoundary(element, is) : false;
- // for network grids, skip the rest if handled already
+ // for surface grids, skip the rest if handled already
if (dim < dimWorld && neighbor && outsideIndices[indexInInside].empty())
continue;
- // determine the outside volvar indices
- const std::vector<IndexType> nIndices = neighbor && dim == dimWorld ?
- std::vector<IndexType>({problem.elementMapper().index(is.outside())}) :
- std::vector<IndexType>();
-
// if outside level > inside level, use the outside element in the following
const bool useNeighbor = neighbor && is.outside().level() > element.level();
const auto& e = useNeighbor ? is.outside() : element;
@@ -648,63 +652,52 @@ public:
const auto eg = e.geometry();
const auto& refElement = ReferenceElements::general(eg.type());
- // make the scv faces of the intersection
- for (unsigned int c = 0; c < is.geometry().corners(); ++c)
+ // evaluate if vertices on this intersection use primary/secondary IVs
+ const bool isBranchingPoint = dim < dimWorld ? outsideIndices[indexInInside].size() > 1 : false;
+ const bool usesSecondaryIV = secondaryIvIndicator_(element, is, isBranchingPoint);
+
+ // make the scv faces belonging to each corner of the intersection
+ for (std::size_t c = 0; c < is.geometry().corners(); ++c)
{
- // get the global vertex index the scv face is connected to (mpfa-o method does not work for hanging nodes!)
+ // get the global vertex index the scv face is connected to
const auto vIdxLocal = refElement.subEntity(indexInElement, 1, c, dim);
- const auto vIdxGlobal = problem.vertexMapper().subIndex(e, vIdxLocal, dim);
+ const auto vIdxGlobal = this->vertexMapper().subIndex(e, vIdxLocal, dim);
// do not build scvfs connected to a processor boundary
- if (ghostVertices_[vIdxGlobal])
+ if (isGhostVertex_[vIdxGlobal])
continue;
- // is vertex on a branching point?
- if (dim < dimWorld && outsideIndices[indexInInside].size() > 1)
- {
- if (!branchingVertices_[vIdxGlobal])
- numBranchingPointVertices_++;
- branchingVertices_[vIdxGlobal] = true;
- numBranchingPointScvf_++;
- }
-
- // store information on the scv face (for inner scvfs on network grids use precalculated outside indices)
- if (!boundary)
- {
- const auto& outsideScvIndices = dim == dimWorld ? nIndices : outsideIndices[indexInInside];
- scvfsIndexSet.push_back(numScvf_++);
- neighborVolVarIndexSet.push_back(outsideScvIndices);
- }
- else
- {
- const std::vector<IndexType> boundaryIdx = [&] ()
- {
- IndexType bIdx = numScvs_ + numDomainBoundaryScvf_++;
- return std::vector<IndexType>({bIdx});
- } ();
- scvfsIndexSet.push_back(numScvf_++);
- neighborVolVarIndexSet.push_back(boundaryIdx);
- }
-
- // if a new interior or domain boundary has been found, increase counter
- if ((boundary || interiorBoundary) && !interiorOrDomainBoundaryVertices[vIdxGlobal])
+ // if this vertex is tagged to use the secondary IVs, store info
+ if (usesSecondaryIV)
{
- interiorOrDomainBoundaryVertices[vIdxGlobal] = true;
- numInteriorOrDomainBoundaryVertices_++;
+ primaryInteractionVolumeVertices_[vIdxGlobal] = false;
+ secondaryInteractionVolumeVertices_[vIdxGlobal] = true;
}
- // store info on which vertices are on the domain/interior boundary
- if (boundary)
- domainBoundaryVertices_[vIdxGlobal] = true;
- if (enableInteriorBoundaries && interiorBoundary)
- {
- interiorBoundaryVertices_[vIdxGlobal] = true;
- interiorBoundaryScvfs_[numScvf_-1] = true;
- numInteriorBoundaryScvf_++;
- }
-
- // increment counter
- localFaceIdx++;
+ // make the scv face (for non-boundary scvfs on network grids, use precalculated outside indices)
+ const auto& outsideScvIndices = [&] ()
+ {
+ if (!boundary)
+ {
+ return dim == dimWorld ?
+ std::vector<IndexType>({this->elementMapper().index(is.outside())}) :
+ outsideIndices[indexInInside];
+ }
+ else
+ {
+ // compute boundary scv idx and increment counter
+ const IndexType bIdx = numScvs_ + numBoundaryScvf_;
+ numBoundaryScvf_++;
+ return std::vector<IndexType>(1, bIdx);
+ }
+ } ();
+
+ // insert the scvf data into the dual grid index set
+ dualIdSet[vIdxGlobal].insert(boundary, numScvf_, eIdx, outsideScvIndices);
+
+ // store information on the scv face
+ scvfsIndexSet.push_back(numScvf_++);
+ neighborVolVarIndexSet.emplace_back(std::move(outsideScvIndices));
}
// for network grids, clear outside indices to not make a second scvf on that facet
@@ -717,57 +710,65 @@ public:
neighborVolVarIndices_[eIdx] = neighborVolVarIndexSet;
}
- // make sure we found as many scvfs as previously estimated
- assert(numScvf_ == numScvfs);
+ // building the geometries has finished
+ std::cout << "Initializing of the grid finite volume geometry took " << timer.elapsed() << " seconds." << std::endl;
+
+ // Initialize the grid interaction volume seeds
+ timer.reset();
+ ivIndexSets_.update(*this, std::move(dualIdSet));
+ std::cout << "Initializing of the grid interaction volume index sets took " << timer.elapsed() << " seconds." << std::endl;
- // Initialize the interaction volume seeds
- globalInteractionVolumeSeeds_.update(problem, interiorOrDomainBoundaryVertices);
+ // build the connectivity map for an effecient assembly
+ timer.reset();
+ connectivityMap_.update(*this);
+ std::cout << "Initializing of the connectivity map took " << timer.elapsed() << " seconds." << std::endl;
}
+ /*!
+ * \brief Returns the sub control volume face indices of an scv by global index.
+ */
const std::vector<IndexType>& scvfIndicesOfScv(IndexType scvIdx) const
{ return scvfIndicesOfScv_[scvIdx]; }
+ /*!
+ * \brief Returns the neighboring vol var indices for each scvf contained in an scv.
+ */
const std::vector< std::vector<IndexType> >& neighborVolVarIndices(IndexType scvIdx) const
{ return neighborVolVarIndices_[scvIdx]; }
/*!
- * \brief Return a local restriction of this global object
- * The local object is only functional after calling its bind/bindElement method
- * This is a free function that will be found by means of ADL
+ * \brief Returns the connectivity map of which dofs have derivatives with respect
+ * to a given dof.
*/
- friend inline FVElementGeometry localView(const Implementation& global)
- { return FVElementGeometry(global); }
-
-private:
+ const ConnectivityMap& connectivityMap() const
+ { return connectivityMap_; }
- const Problem& problem_() const
- { return *problemPtr_; }
-
- const Problem* problemPtr_;
+ /*!
+ * \brief Returns the grit interaction volume seeds class.
+ */
+ const GridIVIndexSets& gridInteractionVolumeIndexSets() const
+ { return ivIndexSets_; }
- GridView gridView_;
+private:
+ // mappers
+ Dumux::ElementMap<GridView> elementMap_;
+ ConnectivityMap connectivityMap_;
- // Information on the global number of geometries
+ // containers storing the global data
+ std::vector<std::vector<IndexType>> scvfIndicesOfScv_;
+ std::vector< std::vector< std::vector<IndexType> > > neighborVolVarIndices_;
+ std::vector<bool> primaryInteractionVolumeVertices_;
+ std::vector<bool> secondaryInteractionVolumeVertices_;
+ std::vector<bool> isGhostVertex_;
std::size_t numScvs_;
std::size_t numScvf_;
- std::size_t numDomainBoundaryScvf_;
- std::size_t numInteriorBoundaryScvf_;
- std::size_t numBranchingPointScvf_;
- std::size_t numBranchingPointVertices_;
- std::size_t numInteriorOrDomainBoundaryVertices_;
+ std::size_t numBoundaryScvf_;
- // vectors that store the global data
- Dumux::ElementMap<GridView> elementMap_;
- std::vector<std::vector<IndexType>> scvfIndicesOfScv_;
- std::vector< std::vector< std::vector<IndexType> > > neighborVolVarIndices_;
- std::vector<bool> domainBoundaryVertices_;
- std::vector<bool> interiorBoundaryScvfs_;
- std::vector<bool> interiorBoundaryVertices_;
- std::vector<bool> ghostVertices_;
- std::vector<bool> branchingVertices_;
-
- // the global interaction volume seeds
- GlobalInteractionVolumeSeeds globalInteractionVolumeSeeds_;
+ // The grid interaction volume index set
+ GridIVIndexSets ivIndexSets_;
+
+ // Indicator function on where to use the secondary IVs
+ SecondaryIvIndicator secondaryIvIndicator_;
};
} // end namespace
diff --git a/dumux/implicit/cellcentered/mpfa/generalassemblymap.hh b/dumux/discretization/cellcentered/mpfa/generalconnectivitymap.hh
similarity index 90%
rename from dumux/implicit/cellcentered/mpfa/generalassemblymap.hh
rename to dumux/discretization/cellcentered/mpfa/generalconnectivitymap.hh
index f0813505f28c6f1ef35d34ec85fdda2a5f17a0f9..3c455c515533c6b4143816140831226aaf95d5c6 100644
--- a/dumux/implicit/cellcentered/mpfa/generalassemblymap.hh
+++ b/dumux/discretization/cellcentered/mpfa/generalconnectivitymap.hh
@@ -21,10 +21,8 @@
* \brief Stores the face indices corresponding to the neighbors of an element
* that contribute to the derivative calculation
*/
-#ifndef DUMUX_CC_MPFA_GENERAL_ASSEMBLY_MAP_HH
-#define DUMUX_CC_MPFA_GENERAL_ASSEMBLY_MAP_HH
-
-#include <dumux/implicit/cellcentered/assemblymap.hh>
+#ifndef DUMUX_CC_MPFA_GENERAL_CONNECTIVITY_MAP_HH
+#define DUMUX_CC_MPFA_GENERAL_CONNECTIVITY_MAP_HH
namespace Dumux
{
@@ -38,15 +36,12 @@ namespace Dumux
* that are also required to set up the transmissibilities.
*/
template<class TypeTag>
-class CCMpfaGeneralAssemblyMap
+class CCMpfaGeneralConnectivityMap
{
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Element = typename GridView::template Codim<0>::Entity;
using MpfaHelper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
-
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using IndexType = typename GridView::IndexSet::IndexType;
// To each cell "globalI" there will be a list of "globalJ", in which globalI is part
@@ -64,19 +59,19 @@ class CCMpfaGeneralAssemblyMap
public:
/*!
- * \brief Initialize the AssemblyMap object.
+ * \brief Initialize the ConnectivityMap object.
*
- * \param problem The problem which we want to simulate.
+ * \param fvGridGeometry The grid's finite volume geometry.
*/
- void init(const Problem& problem)
+ void update(const FVGridGeometry& fvGridGeometry)
{
- map_.resize(problem.gridView().size(0));
- for (const auto& element : elements(problem.gridView()))
+ map_.resize(fvGridGeometry.gridView().size(0));
+ for (const auto& element : elements(fvGridGeometry.gridView()))
{
// We are looking for the elements I, for which this element J is in the flux stencil
- auto globalJ = problem.elementMapper().index(element);
+ auto globalJ = fvGridGeometry.elementMapper().index(element);
- auto fvGeometry = localView(problem.model().fvGridGeometry());
+ auto fvGeometry = localView(fvGridGeometry);
fvGeometry.bindElement(element);
// obtain the data of J in elements I
@@ -86,7 +81,7 @@ public:
for (auto&& scvf : scvfs(fvGeometry))
{
FluxVariables fluxVars;
- const auto& stencil = fluxVars.computeStencil(problem, element, fvGeometry, scvf);
+ const auto& stencil = fluxVars.computeStencil(element, fvGeometry, scvf);
// insert our index in the neighbor stencils of the elements in the flux stencil
for (auto globalI : stencil)
@@ -112,7 +107,7 @@ public:
// that are already in the list of scvfsJ later...
const auto scvfVectorAtVertex = MpfaHelper::getScvFacesAtVertex(scvf.vertexIndex(), element, fvGeometry);
std::vector<IndexType> scvfIndicesAtVertex(scvfVectorAtVertex.size());
- for (unsigned int i = 0; i < scvfVectorAtVertex.size(); ++i)
+ for (std::size_t i = 0; i < scvfVectorAtVertex.size(); ++i)
scvfIndicesAtVertex[i] = scvfVectorAtVertex[i]->index();
globalJDataJ.additionalScvfs.insert(globalJDataJ.additionalScvfs.end(),
scvfIndicesAtVertex.begin(),
@@ -170,7 +165,8 @@ public:
// delete those additionalScvfs indices that are already in the list of scvfs
dataJ.additionalScvfs.erase(std::remove_if(dataJ.additionalScvfs.begin(),
dataJ.additionalScvfs.end(),
- [&dataJ] (const auto& idx) { return MpfaHelper::contains(dataJ.scvfsJ, idx); }),
+ [&dataJ] (const auto& idx)
+ { return MpfaHelper::VectorContainsValue(dataJ.scvfsJ, idx); }),
dataJ.additionalScvfs.end());
// if entry for j exists in the map already add scvf and additional scvf indices, create otherwise
diff --git a/dumux/discretization/cellcentered/mpfa/globalfluxvariablescache.hh b/dumux/discretization/cellcentered/mpfa/globalfluxvariablescache.hh
index dfc65aa5cedd7628db1947d47e5ac46511f8f932..44d334a34fe6bb6849e9a50c461e5273023caea8 100644
--- a/dumux/discretization/cellcentered/mpfa/globalfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/mpfa/globalfluxvariablescache.hh
@@ -23,7 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_CCMPFA_GLOBAL_FLUXVARSCACHE_HH
#define DUMUX_DISCRETIZATION_CCMPFA_GLOBAL_FLUXVARSCACHE_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/cellcentered/mpfa/fluxvariablescachefiller.hh>
namespace Dumux
@@ -44,50 +43,117 @@ class CCMpfaGlobalFluxVariablesCache;
template<class TypeTag>
class CCMpfaGlobalFluxVariablesCache<TypeTag, true>
{
- // the local class need access to the problem
- friend typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
- // the filler needs access to the operators
+ // the flux variables cache filler needs to be friend to fill
+ // the interaction volumes and data handles
friend CCMpfaFluxVariablesCacheFiller<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using IndexType = typename GridView::IndexSet::IndexType;
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using PrimaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using SecondaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, SecondaryInteractionVolume);
+ using DataHandle = typename PrimaryInteractionVolume::Traits::DataHandle;
using FluxVariablesCacheFiller = CCMpfaFluxVariablesCacheFiller<TypeTag>;
public:
- // When global caching is enabled, precompute transmissibilities and stencils for all the scv faces
- void update(Problem& problem)
+ CCMpfaGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+
+ // When global caching is enabled, precompute transmissibilities for all scv faces
+ void update(const FVGridGeometry& fvGridGeometry,
+ const GridVolumeVariables& gridVolVars,
+ const SolutionVector& sol,
+ bool forceUpdate = false)
{
- problemPtr_ = &problem;
+ // only do the update if fluxes are solution dependent or if update is forced
+ if (FluxVariablesCacheFiller::isSolDependent || forceUpdate)
+ {
+ // clear data if forced update is desired
+ if (forceUpdate)
+ {
+ clear_();
+
+ const auto& gridIvIndexSets = fvGridGeometry.gridInteractionVolumeIndexSets();
+ const auto numPrimaryIvs = gridIvIndexSets.numPrimaryInteractionVolumes();
+ const auto numSecondaryIVs = gridIvIndexSets.numSecondaryInteractionVolumes();
+ primaryInteractionVolumes_.reserve(numPrimaryIvs);
+ secondaryInteractionVolumes_.reserve(numSecondaryIVs);
+ primaryIvDataHandles_.reserve(numPrimaryIvs);
+ secondaryIvDataHandles_.reserve(numSecondaryIVs);
+ }
- // instantiate helper class to fill the caches
- FluxVariablesCacheFiller filler(problem);
+ // reserve memory estimate for caches, interaction volumes and corresponding data
+ fluxVarsCache_.resize(fvGridGeometry.numScvf());
- const auto& fvGridGeometry = problem.model().fvGridGeometry();
- fluxVarsCache_.resize(fvGridGeometry.numScvf());
- for (const auto& element : elements(problem.gridView()))
+ // instantiate helper class to fill the caches
+ FluxVariablesCacheFiller filler(problem());
+
+ for (const auto& element : elements(fvGridGeometry.gridView()))
+ {
+ // Prepare the geometries within the elements of the stencil
+ auto fvGeometry = localView(fvGridGeometry);
+ fvGeometry.bind(element);
+
+ auto elemVolVars = localView(gridVolVars);
+ elemVolVars.bind(element, fvGeometry, sol);
+
+ // prepare all the caches of the scvfs inside the corresponding interaction volume
+ for (const auto& scvf : scvfs(fvGeometry))
+ if (!fluxVarsCache_[scvf.index()].isUpdated())
+ filler.fill(*this, fluxVarsCache_[scvf.index()], element, fvGeometry, elemVolVars, scvf, forceUpdate);
+ }
+ }
+ }
+
+ void updateElement(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars)
+ {
+ // update only if transmissibilities are solution-dependent
+ if (FluxVariablesCacheFiller::isSolDependent)
{
- // Prepare the geometries within the elements of the stencil
- auto fvGeometry = localView(fvGridGeometry);
- fvGeometry.bind(element);
+ const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
+ const auto& assemblyMapI = fvGridGeometry.connectivityMap()[fvGridGeometry.elementMapper().index(element)];
+
+ // helper class to fill flux variables caches
+ FluxVariablesCacheFiller filler(problem());
+
+ // first, set all the caches to "outdated"
+ for (const auto& scvf : scvfs(fvGeometry))
+ fluxVarsCache_[scvf.index()].setUpdateStatus(false);
+ for (const auto& dataJ : assemblyMapI)
+ for (const auto scvfIdx : dataJ.scvfsJ)
+ fluxVarsCache_[scvfIdx].setUpdateStatus(false);
- auto elemVolVars = localView(problem.model().curGlobalVolVars());
- elemVolVars.bind(element, fvGeometry, problem.model().curSol());
+ // go through the caches maybe update them
+ for (const auto& scvf : scvfs(fvGeometry))
+ {
+ auto& scvfCache = fluxVarsCache_[scvf.index()];
+ if (!scvfCache.isUpdated())
+ filler.fill(*this, scvfCache, element, fvGeometry, elemVolVars, scvf);
+ }
- // prepare all the caches of the scvfs inside the corresponding interaction volume
- for (auto&& scvf : scvfs(fvGeometry))
+ for (const auto& dataJ : assemblyMapI)
{
- if (!fluxVarsCache_[scvf.index()].isUpdated())
- filler.fill(*this, fluxVarsCache_[scvf.index()], element, fvGeometry, elemVolVars, scvf);
+ const auto elementJ = fvGridGeometry.element(dataJ.globalJ);
+ for (const auto scvfIdx : dataJ.scvfsJ)
+ {
+ auto& scvfCache = fluxVarsCache_[scvfIdx];
+ if (!scvfCache.isUpdated())
+ {
+ // update cache
+ const auto& scvf = fvGeometry.scvf(scvfIdx);
+ filler.fill(*this, scvfCache, elementJ, fvGeometry, elemVolVars, scvf);
+ }
+ }
}
}
}
@@ -100,8 +166,6 @@ public:
friend inline ElementFluxVariablesCache localView(const CCMpfaGlobalFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
-private:
-
// access operators in the case of caching
const FluxVariablesCache& operator [](const SubControlVolumeFace& scvf) const
{ return fluxVarsCache_[scvf.index()]; }
@@ -109,19 +173,28 @@ private:
FluxVariablesCache& operator [](const SubControlVolumeFace& scvf)
{ return fluxVarsCache_[scvf.index()]; }
- const FluxVariablesCache& operator [](IndexType scvfIdx) const
- { return fluxVarsCache_[scvfIdx]; }
+ const Problem& problem() const
+ { return *problemPtr_; }
- FluxVariablesCache& operator [](IndexType scvfIdx)
- { return fluxVarsCache_[scvfIdx]; }
+private:
- const Problem& problem_() const
- { return *problemPtr_; }
+ void clear_()
+ {
+ fluxVarsCache_.clear();
+ primaryInteractionVolumes_.clear();
+ secondaryInteractionVolumes_.clear();
+ primaryIvDataHandles_.clear();
+ secondaryIvDataHandles_.clear();
+ }
const Problem* problemPtr_;
-
std::vector<FluxVariablesCache> fluxVarsCache_;
- std::vector<IndexType> globalScvfIndices_;
+
+ // store the interaction volumes and handles
+ std::vector<PrimaryInteractionVolume> primaryInteractionVolumes_;
+ std::vector<SecondaryInteractionVolume> secondaryInteractionVolumes_;
+ std::vector<DataHandle> primaryIvDataHandles_;
+ std::vector<DataHandle> secondaryIvDataHandles_;
};
/*!
@@ -131,15 +204,28 @@ private:
template<class TypeTag>
class CCMpfaGlobalFluxVariablesCache<TypeTag, false>
{
- // the local class needs access to the problem
- friend typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
public:
+ CCMpfaGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+
// When global flux variables caching is disabled, we don't need to update the cache
- void update(Problem& problem)
- { problemPtr_ = &problem; }
+ void update(const FVGridGeometry& fvGridGeometry,
+ const GridVolumeVariables& gridVolVars,
+ const SolutionVector& sol,
+ bool forceUpdate = false) {}
+
+ void updateElement(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars) {}
/*!
* \brief Return a local restriction of this global object
@@ -149,11 +235,10 @@ public:
friend inline ElementFluxVariablesCache localView(const CCMpfaGlobalFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
-private:
-
- const Problem& problem_() const
+ const Problem& problem() const
{ return *problemPtr_; }
+private:
const Problem* problemPtr_;
};
diff --git a/dumux/discretization/cellcentered/mpfa/globalinteractionvolumeseeds.hh b/dumux/discretization/cellcentered/mpfa/globalinteractionvolumeseeds.hh
deleted file mode 100644
index e49919f688cdfa72b984b2eff8f925af00ee22b5..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/globalinteractionvolumeseeds.hh
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for the global interaction volume seeds of mpfa methods.
- */
-#ifndef DUMUX_DISCRETIZATION_MPFA_GLOBALINTERACTIONVOLUMESEEDS_HH
-#define DUMUX_DISCRETIZATION_MPFA_GLOBALINTERACTIONVOLUMESEEDS_HH
-
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/globalinteractionvolumeseedsbase.hh>
-#include "methods.hh"
-
-namespace Dumux
-{
-//! forward declaration of the actual method-specific implementation
-//! By default we simply inherit from the base class
-//! Actual implementations for other methods have to be provided below
-template<class TypeTag, MpfaMethods method>
-class CCMpfaGlobalInteractionVolumeSeedsImplementation;
-
-/*!
- * \ingroup Mpfa
- * \brief Base class for the creation and storage of the interaction volume seeds for mpfa methods.
- */
-template<class TypeTag>
-using CCMpfaGlobalInteractionVolumeSeeds = CCMpfaGlobalInteractionVolumeSeedsImplementation<TypeTag, GET_PROP_VALUE(TypeTag, MpfaMethod)>;
-
-} // end namespace
-
-// the specializations of this class differing from the default have to be included here
-#include <dumux/discretization/cellcentered/mpfa/omethod/globalinteractionvolumeseeds.hh>
-#include <dumux/discretization/cellcentered/mpfa/lmethod/globalinteractionvolumeseeds.hh>
-#include <dumux/discretization/cellcentered/mpfa/omethodfps/globalinteractionvolumeseeds.hh>
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/globalinteractionvolumeseedsbase.hh b/dumux/discretization/cellcentered/mpfa/globalinteractionvolumeseedsbase.hh
deleted file mode 100644
index 062997568e4f91394e75e762e9dc31190b8e4ca0..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/globalinteractionvolumeseedsbase.hh
+++ /dev/null
@@ -1,95 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for the global interaction volumes of the mpfa-o method.
- */
-#ifndef DUMUX_DISCRETIZATION_MPFA_GLOBALINTERACTIONVOLUMESEEDS_BASE_HH
-#define DUMUX_DISCRETIZATION_MPFA_GLOBALINTERACTIONVOLUMESEEDS_BASE_HH
-
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include "fvgridgeometry.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup MpfaO
- * \brief Base class for the creation and storage of the interaction volume seeds for mpfa methods.
- */
-template<class TypeTag>
-class CCMpfaGlobalInteractionVolumeSeedsBase
-{
- using Implementation = typename GET_PROP_TYPE(TypeTag, GlobalInteractionVolumeSeeds);
-
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Helper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using InteractionVolumeSeed = typename InteractionVolume::Seed;
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using BoundaryInteractionVolumeSeed = typename BoundaryInteractionVolume::Seed;
-
- using IndexType = typename GridView::IndexSet::IndexType;
-
-public:
- CCMpfaGlobalInteractionVolumeSeedsBase(const GridView& gridView) : gridView_(gridView) {}
-
- // initializes the interaction volumes or the seeds
- void update(const Problem& p, const std::vector<bool>& interiorOrDomainBoundaryVertices)
- {
- problemPtr_ = &p;
-
- // initialize the seeds according to the mpfa method
- asImp_().initializeSeeds(interiorOrDomainBoundaryVertices,
- scvfIndexMap_,
- seeds_,
- boundarySeeds_);
- }
-
- const InteractionVolumeSeed& seed(const SubControlVolumeFace& scvf) const
- { return seeds_[scvfIndexMap_[scvf.index()]]; }
-
- const BoundaryInteractionVolumeSeed& boundarySeed(const SubControlVolumeFace& scvf) const
- { return boundarySeeds_[scvfIndexMap_[scvf.index()]]; }
-
- const Problem& problem() const
- { return *problemPtr_; }
-
- const GridView& gridView() const
- { return gridView_; }
-
-private:
-
- const Implementation& asImp_() const
- { return *static_cast<Implementation*>(this); }
-
- Implementation& asImp_()
- { return *static_cast<Implementation*>(this); }
-
- const Problem* problemPtr_;
- GridView gridView_;
- std::vector<IndexType> scvfIndexMap_;
- std::vector<InteractionVolumeSeed> seeds_;
- std::vector<BoundaryInteractionVolumeSeed> boundarySeeds_;
-};
-} // end namespace
-
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/globalvolumevariables.hh b/dumux/discretization/cellcentered/mpfa/globalvolumevariables.hh
index d417f2dfc6b3e89694d180bd834740412dba57a6..afba9240f88515946bc88dc7949505a7f4f86645 100644
--- a/dumux/discretization/cellcentered/mpfa/globalvolumevariables.hh
+++ b/dumux/discretization/cellcentered/mpfa/globalvolumevariables.hh
@@ -55,7 +55,7 @@ class CCMpfaGlobalVolumeVariables<TypeTag, /*enableGlobalVolVarsCache*/true>
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using IndexType = typename GridView::IndexSet::IndexType;
@@ -95,7 +95,7 @@ public:
const auto& insideScv = fvGeometry.scv(insideScvIdx);
const auto dirichletPriVars = problem.dirichlet(element, scvf);
- volumeVariables_[scvf.outsideScvIdx()].update(ElementSolutionVector({dirichletPriVars}), problem, element, insideScv);
+ volumeVariables_[scvf.outsideScvIdx()].update(ElementSolutionVector(dirichletPriVars), problem, element, insideScv);
}
else
{
diff --git a/dumux/discretization/cellcentered/mpfa/gridinteractionvolumeindexsets.hh b/dumux/discretization/cellcentered/mpfa/gridinteractionvolumeindexsets.hh
new file mode 100644
index 0000000000000000000000000000000000000000..a1115cd2c88858cd44883e3201a38830c5913a07
--- /dev/null
+++ b/dumux/discretization/cellcentered/mpfa/gridinteractionvolumeindexsets.hh
@@ -0,0 +1,117 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Class for the grid interaction volume index sets of mpfa schemes.
+ */
+#ifndef DUMUX_DISCRETIZATION_MPFA_O_GRIDINTERACTIONVOLUME_INDEXSETS_HH
+#define DUMUX_DISCRETIZATION_MPFA_O_GRIDINTERACTIONVOLUME_INDEXSETS_HH
+
+#include <dumux/discretization/cellcentered/mpfa/dualgridindexset.hh>
+
+namespace Dumux
+{
+/*!
+ * \ingroup Mpfa
+ * \brief The grid interaction volume index sets class for the mpfa-o scheme.
+ */
+template<class TypeTag>
+class CCMpfaGridInteractionVolumeIndexSets
+{
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using IndexType = typename GridView::IndexSet::IndexType;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using PrimaryIV = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using PrimaryIVIndexSet = typename PrimaryIV::Traits::IndexSet;
+ using SecondaryIV = typename GET_PROP_TYPE(TypeTag, SecondaryInteractionVolume);
+ using SecondaryIVIndexSet = typename SecondaryIV::Traits::IndexSet;
+ using Helper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
+ using DualGridIndexSet = CCMpfaDualGridIndexSet<TypeTag>;
+
+ static const int dim = GridView::dimension;
+
+public:
+
+ void update(FVGridGeometry& fvGridGeometry, DualGridIndexSet&& dualGridIdSet)
+ {
+ dualGridIndexSet_ = std::make_unique<DualGridIndexSet>(std::move(dualGridIdSet));
+
+ // clear containers
+ primaryIVIndexSets_.clear();
+ secondaryIVIndexSets_.clear();
+ scvfIndexMap_.clear();
+
+ // find out how many primary & secondary interaction volumes are needed
+ numPrimaryIV_ = 0;
+ numSecondaryIV_ = 0;
+ for (const auto& vertex : vertices(fvGridGeometry.gridView()))
+ {
+ const auto vIdxGlobal = fvGridGeometry.vertexMapper().index(vertex);
+ if (fvGridGeometry.vertexUsesPrimaryInteractionVolume(vIdxGlobal))
+ numPrimaryIV_ += PrimaryIV::numInteractionVolumesAtVertex((*dualGridIndexSet_)[vIdxGlobal]);
+ else
+ numSecondaryIV_ += SecondaryIV::numInteractionVolumesAtVertex((*dualGridIndexSet_)[vIdxGlobal]);
+ }
+
+ // reserve memory
+ primaryIVIndexSets_.reserve(numPrimaryIV_);
+ secondaryIVIndexSets_.reserve(numSecondaryIV_);
+ scvfIndexMap_.resize(fvGridGeometry.numScvf());
+
+ // create interaction volume index sets around each vertex
+ for (const auto& vertex : vertices(fvGridGeometry.gridView()))
+ {
+ const auto vIdxGlobal = fvGridGeometry.vertexMapper().index(vertex);
+ if (fvGridGeometry.vertexUsesPrimaryInteractionVolume(vIdxGlobal))
+ PrimaryIV::addInteractionVolumeIndexSets(primaryIVIndexSets_, scvfIndexMap_, (*dualGridIndexSet_)[vIdxGlobal]);
+ else
+ SecondaryIV::addInteractionVolumeIndexSets(secondaryIVIndexSets_, scvfIndexMap_, (*dualGridIndexSet_)[vIdxGlobal]);
+ }
+ }
+
+ const PrimaryIVIndexSet& primaryIndexSet(const SubControlVolumeFace& scvf) const
+ { return primaryIndexSet(scvf.index()); }
+
+ const PrimaryIVIndexSet& primaryIndexSet(const IndexType scvfIdx) const
+ { return primaryIVIndexSets_[scvfIndexMap_[scvfIdx]]; }
+
+ const SecondaryIVIndexSet& secondaryIndexSet(const SubControlVolumeFace& scvf) const
+ { return secondaryIndexSet(scvf.index()); }
+
+ const SecondaryIVIndexSet& secondaryIndexSet(const IndexType scvfIdx) const
+ { return secondaryIVIndexSets_[scvfIndexMap_[scvfIdx]]; }
+
+ std::size_t numPrimaryInteractionVolumes() const { return numPrimaryIV_; }
+ std::size_t numSecondaryInteractionVolumes() const { return numSecondaryIV_; }
+
+private:
+ std::vector<PrimaryIVIndexSet> primaryIVIndexSets_;
+ std::vector<SecondaryIVIndexSet> secondaryIVIndexSets_;
+ std::vector<IndexType> scvfIndexMap_;
+
+ std::size_t numPrimaryIV_;
+ std::size_t numSecondaryIV_;
+
+ std::unique_ptr<DualGridIndexSet> dualGridIndexSet_;
+};
+} // end namespace
+
+
+#endif
diff --git a/dumux/discretization/cellcentered/mpfa/helper.hh b/dumux/discretization/cellcentered/mpfa/helper.hh
index 8983952c261a6ba631abfad28a6fae262bfdd2f9..26fe069a77b2afc22108000b7d1eb26b766bf790 100644
--- a/dumux/discretization/cellcentered/mpfa/helper.hh
+++ b/dumux/discretization/cellcentered/mpfa/helper.hh
@@ -18,26 +18,33 @@
*****************************************************************************/
/*!
* \file
- * \brief Helper class to get the required information on an interaction volume.
+ * \brief Helper class to get information required for mpfa scheme.
*/
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_HELPER_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_HELPER_HH
+#include <dune/geometry/type.hh>
+
#include "methods.hh"
-#include "facetypes.hh"
namespace Dumux
{
-// Mpfa method-specific implementation of the helper class (again dimension-dependent)
+/*!
+ * \brief Mpfa method-specific implementation of the helper class (dimension-dependent)
+ */
template<class TypeTag, MpfaMethods Method, int dim, int dimWorld>
class MpfaMethodHelper;
-// dimension-specific implementation of the helper class (common for all methods)
+/*!
+ * \brief Dimension-specific implementation of the helper class (common for all methods)
+ */
template<class TypeTag, int dim, int dimWorld>
class MpfaDimensionHelper;
-// Specialization for dim == 2, dimWorld == 2
+/*!
+ * \brief Specialization for dim == 2 & dimWorld == 2
+ */
template<class TypeTag>
class MpfaDimensionHelper<TypeTag, /*dim*/2, /*dimWorld*/2>
{
@@ -45,120 +52,146 @@ class MpfaDimensionHelper<TypeTag, /*dim*/2, /*dimWorld*/2>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
-
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
-
- // We know that dim = 2 and dimworld = 2, but
- // the dim = 2, dimWorld = 3 specialization forwards to some methods of this class
- // Thus, we need to get the GlobalPosition vector etc right
- static const int dim = GridView::dimension;
+ using ScvfCornerVector = typename SubControlVolumeFace::Traits::CornerStorage;
+ using InteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using ScvBasis = typename InteractionVolume::Traits::ScvBasis;
+
+ //! We know that dim = 2 & dimworld = 2. However, the specialization for
+ //! dim = 2 & dimWorld = 3 reuses some methods of this class, thus, we
+ //! obtain the world dimension from the grid view here to get the
+ //! GlobalPosition vector right. Be picky about the dimension though.
+ static_assert(GridView::dimension == 2, "The chosen mpfa helper expects a grid view with dim = 2");
+ static const int dim = 2;
static const int dimWorld = GridView::dimensionworld;
-
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using ScvfVector = std::array<const SubControlVolumeFace*, dim>;
- using LocalBasis = std::array<GlobalPosition, dim>;
- using PointVector = std::vector<GlobalPosition>;
- using FaceReferenceElements = typename Dune::ReferenceElements<Scalar, dim-1>;
+ //! Container to store the positions of intersections required for scvf
+ //! corner computation. In 2d, these are the center plus the two corners
+ using ScvfPositionsOnIntersection = std::array<GlobalPosition, 3>;
public:
- // Gets the two scv faces in the outer element, that share the vertex
- // orders them to form a right hand system, local indices can be deduced from on the rotational direction
- static ScvfVector getCommonAndNextScvFace(const SubControlVolumeFace& outsideScvf,
- const FVElementGeometry& fvGeometry,
- const bool clockWise)
- {
- LocalIndexType commonFaceIdx = clockWise ? 0 : 1;
- LocalIndexType nextFaceIdx = clockWise ? 1 : 0;
- auto vIdxGlobal = outsideScvf.vertexIndex();
-
- unsigned int count = 0;
- ScvfVector scvfVector({nullptr});
- for (auto&& scvf : scvfs(fvGeometry))
- {
- if (scvf.vertexIndex() == vIdxGlobal)
- {
- if (scvf.outsideScvIdx() == outsideScvf.insideScvIdx())
- {
- scvfVector[commonFaceIdx] = &scvf;
- count++;
- }
- else
- {
- scvfVector[nextFaceIdx] = &scvf;
- count++;
- }
- }
- }
-
- // make sure we found two faces
- assert(count == 2 && "did not find two scv faces sharing the vertex in the outside element");
- return scvfVector;
- }
-
- // calculates the inner normal vectors
- static LocalBasis calculateInnerNormals(const LocalBasis& localBasis)
+ /*!
+ * \brief Calculates the inner normal vectors to a given scv basis.
+ *
+ * \param scvBasis The basis of an scv
+ */
+ static ScvBasis calculateInnerNormals(const ScvBasis& scvBasis)
{
static const Dune::FieldMatrix<Scalar, dim, dim> R = {{0.0, 1.0}, {-1.0, 0.0}};
- // make sure the basis forms a right hand system
- assert(isRightHandSystem(localBasis) > 0 && "Local basis does not form a right hand system");
- LocalBasis innerNormals;
- R.mv(localBasis[1], innerNormals[0]);
- R.mv(localBasis[0], innerNormals[1]);
- innerNormals[1] *= -1;
+ ScvBasis innerNormals;
+ R.mv(scvBasis[1], innerNormals[0]);
+ R.mv(scvBasis[0], innerNormals[1]);
+
+ // adjust sign depending on basis being a RHS
+ if (!isRightHandSystem(scvBasis))
+ innerNormals[0] *= -1.0;
+ else
+ innerNormals[1] *= -1.0;
return innerNormals;
}
- // the determinant of the local basis is equal to the cross product for dim = dimWorld = 2
- static Scalar calculateDetX(const LocalBasis& localBasis)
+ /*!
+ * \brief Calculates the determinant of an scv basis.
+ * This is equal to the cross product for dim = dimWorld = 2
+ *
+ * \param scvBasis The basis of an scv
+ */
+ static Scalar calculateDetX(const ScvBasis& scvBasis)
{
- // make sure the basis forms a right hand system
- assert(isRightHandSystem(localBasis) > 0 && "Local basis does not form a right hand system");
- return crossProduct<Scalar>(localBasis[0], localBasis[1]);
+ using std::abs;
+ return abs(crossProduct<Scalar>(scvBasis[0], scvBasis[1]));
}
- // returns the global number of scvfs in the grid
+ /*!
+ * \brief Returns the global number of scvfs in the grid. Assumes the grid to be made up of only
+ * basic geometry types. Overlad this function if you want to use different geometry types.
+ *
+ * \param gridView The grid view to be checked
+ */
static std::size_t getGlobalNumScvf(const GridView& gridView)
- { return gridView.size(Dune::GeometryTypes::triangle)*6 + gridView.size(Dune::GeometryTypes::quadrilateral)*8; }
+ {
+ assert(gridView.size(Dune::GeometryTypes::triangle)
+ + gridView.size(Dune::GeometryTypes::quadrilateral) == gridView.size(0));
- //! Check whether or not the local basis forms a right hand system
- static bool isRightHandSystem(const LocalBasis& localBasis)
- { return !std::signbit(crossProduct<Scalar>(localBasis[0], localBasis[1])); }
+ return gridView.size(Dune::GeometryTypes::triangle)*6
+ + gridView.size(Dune::GeometryTypes::quadrilateral)*8;
+ }
- //! get sub control volume face corners on a given face geometry for the given local index
- static PointVector getScvfCorners(const PointVector& isCorners, unsigned int cornerIdx)
+ /*!
+ * \brief Checks whether or not a given scv basis forms a right hand system.
+ *
+ * \param scvBasis The basis of an scv
+ */
+ static bool isRightHandSystem(const ScvBasis& scvBasis)
+ { return !std::signbit(crossProduct<Scalar>(scvBasis[0], scvBasis[1])); }
+
+ /*!
+ * \brief Returns a vector containing the positions on a given intersection
+ * that are relevant for scvf corner computation.
+ * Ordering -> 1: facet center, 2: the two facet corners
+ *
+ * \param eg Geometry of the element the facet is embedded in
+ * \param refElement Reference element of the element the facet is embedded in
+ * \param indexInInside The local index of the facet in the element
+ * \param numCorners The number of corners on the facet
+ */
+ template<class ElementGeometry, class ReferenceElement>
+ static ScvfPositionsOnIntersection computeScvfCornersOnIntersection(const ElementGeometry& eg,
+ const ReferenceElement& refElement,
+ unsigned int indexInElement,
+ unsigned int numCorners)
{
- // compute intersection center (in 2d intersections have two corners)
- GlobalPosition center = isCorners[0] + isCorners[1];
- center /= 2;
+ ScvfPositionsOnIntersection p;
- if (cornerIdx == 0)
- return PointVector({center, isCorners[0]});
- else if (cornerIdx == 1)
- return PointVector({center, isCorners[1]});
- else
- DUNE_THROW(Dune::InvalidStateException, "local index exceeds the number of corners of 2d intersections");
+ // compute facet center and corners
+ p[0] = 0.0;
+ for (unsigned int c = 0; c < numCorners; ++c)
+ {
+ p[c+1] = eg.global(refElement.position(refElement.subEntity(indexInElement, 1, c, dim), dim));
+ p[0] += p[c+1];
+ }
+ p[0] /= numCorners;
+
+ return p;
}
- //! calculate integration point on an scvf
- static GlobalPosition getScvfIntegrationPoint(const PointVector& scvfCorners, Scalar q)
+ /*!
+ * \brief Returns the corners of the sub control volume face constructed
+ * in a corner (vertex) of an intersection.
+ *
+ * \param scvfCornerPositions Container with all scvf corners of the intersection
+ * \param numIntersectionCorners Number of corners of the intersection (required in 3d)
+ * \param cornerIdx Local vertex index on the intersection
+ */
+ static ScvfCornerVector getScvfCorners(const ScvfPositionsOnIntersection& p,
+ unsigned int numIntersectionCorners,
+ unsigned int cornerIdx)
{
- // ordering -> first corner: facet center, last corner: vertex
- if (q == 0.0)
- return scvfCorners[0];
+ // make sure the given input is admissible
+ assert(cornerIdx < 2 && "provided index exceeds the number of corners of facets in 2d");
- auto d = scvfCorners[1] - scvfCorners[0];
- d *= q;
- return scvfCorners[0] + d;
+ // create & return the scvf corner vector
+ if (cornerIdx == 0)
+ return ScvfCornerVector({p[0], p[1]});
+ else
+ return ScvfCornerVector({p[0], p[2]});
}
- //! calculate the area of a scvf
- static Scalar getScvfArea(const PointVector& scvfCorners)
+ /*!
+ * \brief Calculates the area of an scvf.
+ *
+ * \param scvfCorners Container with the corners of the scvf
+ */
+ static Scalar getScvfArea(const ScvfCornerVector& scvfCorners)
{ return (scvfCorners[1]-scvfCorners[0]).two_norm(); }
+ /*!
+ * \brief Calculates the number of scvfs in a given element geometry type.
+ *
+ * \param gt The element geometry type
+ */
static std::size_t getNumLocalScvfs(const Dune::GeometryType gt)
{
if (gt == Dune::GeometryTypes::triangle)
@@ -166,91 +199,73 @@ public:
else if (gt == Dune::GeometryTypes::quadrilateral)
return 8;
else
- DUNE_THROW(Dune::InvalidStateException, "unknown 2d geometry type " << gt);
+ DUNE_THROW(Dune::NotImplemented, "Mpfa for 2d geometry type " << gt);
}
};
-// Specialization for dim == 2, dimWorld == 3
+/*!
+ * \brief Specialization for dim == 2 & dimWorld == 2. Reuses some
+ * functionality of the specialization for dim = dimWorld = 2
+ */
template<class TypeTag>
-class MpfaDimensionHelper<TypeTag, /*dim*/2, /*dimWorld*/3>
+class MpfaDimensionHelper<TypeTag, /*dim*/2, /*dimWorld*/3> : public MpfaDimensionHelper<TypeTag, 2, 2>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
-
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
-
- // We know that dim = 2 and dimworld = 3
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using ScvfVector = std::array<const SubControlVolumeFace*, dim>;
- using LocalBasis = std::array<GlobalPosition, dim>;
- using PointVector = std::vector<GlobalPosition>;
+ using InteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using ScvBasis = typename InteractionVolume::Traits::ScvBasis;
public:
- // calculates the inner normal vectors
- static LocalBasis calculateInnerNormals(const LocalBasis& localBasis)
- {
- // make sure the basis forms a right hand system
- assert(isRightHandSystem(localBasis) > 0 && "Local basis does not form a right hand system");
+ /*!
+ * \brief Calculates the inner normal vectors to a given scv basis.
+ *
+ * \param scvBasis The basis of an scv
+ */
+ static ScvBasis calculateInnerNormals(const ScvBasis& scvBasis)
+ {
// compute vector normal to the basis plane
- auto normal = crossProduct<Scalar>(localBasis[0], localBasis[1]);
- normal /= normal.two_norm();
+ const auto normal = [&] () {
+ auto n = crossProduct<Scalar>(scvBasis[0], scvBasis[1]);
+ n /= n.two_norm();
+ return n;
+ } ();
// compute inner normals using the normal vector
- LocalBasis innerNormals;
- innerNormals[0] = crossProduct<Scalar>(localBasis[1], normal);
- innerNormals[1] = crossProduct<Scalar>(normal, localBasis[0]);
+ ScvBasis innerNormals;
+ innerNormals[0] = crossProduct<Scalar>(scvBasis[1], normal);
+ innerNormals[1] = crossProduct<Scalar>(normal, scvBasis[0]);
return innerNormals;
}
- // This is actually not the determinant of the basis for dim = 2 < dimWorld = 3
- // It simply is the area of the parallelogram spanned by the basis vectors
- static Scalar calculateDetX(const LocalBasis& localBasis)
- { return std::abs( crossProduct<Scalar>(localBasis[0], localBasis[1]).two_norm() ); }
-
- // returns the global number of scvfs in the grid
- static std::size_t getGlobalNumScvf(const GridView& gridView)
+ /*!
+ * \brief Calculates the determinant of an scv basis.
+ * For dim = 2 < dimWorld = 3 this is actually not the determinant of the
+ * basis but it is simply the area of the parallelofram spanned by the
+ * basis vectors.
+ *
+ * \param scvBasis The basis of an scv
+ */
+ static Scalar calculateDetX(const ScvBasis& scvBasis)
{
- Dune::GeometryType triangle, quadrilateral;
- triangle.makeTriangle();
- quadrilateral.makeQuadrilateral();
-
- return gridView.size(triangle)*6 + gridView.size(quadrilateral)*8;
+ using std::abs;
+ return abs(crossProduct<Scalar>(scvBasis[0], scvBasis[1]).two_norm());
}
- //! For 2d in 3d there is no unique basis forming a right hand system
- static bool isRightHandSystem(const LocalBasis& localBasis)
+ /*!
+ * \brief Checks whether or not a given scv basis forms a right hand system.
+ * Note that for dim = 2 < dimWorld = 3 the bases forming a right hand system
+ * are not unique.
+ *
+ * \param scvBasis The basis of an scv
+ */
+ static bool isRightHandSystem(const ScvBasis& scvBasis)
{ return true; }
-
- //! get sub control volume face corners on a given face geometry for the given local index
- static PointVector getScvfCorners(const PointVector& isCorners, unsigned int cornerIdx)
- { return MpfaDimensionHelper<TypeTag, dim, dim>::getScvfCorners(isCorners, cornerIdx); }
-
- //! calculate integration point on an scvf
- static GlobalPosition getScvfIntegrationPoint(const PointVector& scvfCorners, Scalar q)
- { return MpfaDimensionHelper<TypeTag, dim, dim>::getScvfIntegrationPoint(scvfCorners, q); }
-
- //! calculate the area of a scvf
- static Scalar getScvfArea(const PointVector& scvfCorners)
- { return MpfaDimensionHelper<TypeTag, dim, dim>::getScvfArea(scvfCorners); }
-
- static std::size_t getNumLocalScvfs(const Dune::GeometryType gt)
- { return MpfaDimensionHelper<TypeTag, dim, dim>::getNumLocalScvfs(gt); }
-
- static ScvfVector getCommonAndNextScvFace(const SubControlVolumeFace& outsideScvf,
- const FVElementGeometry& fvGeometry,
- const bool clockWise)
- { return MpfaDimensionHelper<TypeTag, dim, dim>::getCommonAndNextScvFace(outsideScvf, fvGeometry, clockWise); }
};
-// Specialization for dim == 3 (dimWorld has to be 3)
+/*!
+ * \brief Specialization for dim == 3 & dimWorld == 3.
+ */
template<class TypeTag>
class MpfaDimensionHelper<TypeTag, /*dim*/3, /*dimWorld*/3>
{
@@ -258,158 +273,224 @@ class MpfaDimensionHelper<TypeTag, /*dim*/3, /*dimWorld*/3>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
-
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
-
- // We know that dim = 3 and dimworld = 3
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
-
+ using ScvfCornerVector = typename SubControlVolumeFace::Traits::CornerStorage;
+ using InteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using ScvBasis = typename InteractionVolume::Traits::ScvBasis;
+
+ // Be picky about the dimensions
+ static_assert(GridView::dimension == 3 && GridView::dimensionworld == 3,
+ "The chosen mpfa helper expects a grid view with dim = 3 & dimWorld = 3");
+ static const int dim = 3;
+ static const int dimWorld = 3;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using ScvfVector = std::array<const SubControlVolumeFace*, dim>;
- using LocalBasis = std::array<GlobalPosition, dim>;
- using PointVector = std::vector<GlobalPosition>;
- using FaceReferenceElements = typename Dune::ReferenceElements<Scalar, dim-1>;
+ // container to store the positions of intersections required for
+ // scvf corner computation. Maximum number of points needed is 9
+ // for the supported geometry types (quadrilateral facet)
+ using ScvfPositionsOnIntersection = std::array<GlobalPosition, 9>;
public:
- // calculates the inner normal vectors
- static LocalBasis calculateInnerNormals(const LocalBasis& localBasis)
+ /*!
+ * \brief Calculates the inner normal vectors to a given scv basis.
+ *
+ * \param scvBasis The basis of an scv
+ */
+ static ScvBasis calculateInnerNormals(const ScvBasis& scvBasis)
{
- LocalBasis innerNormals;
+ ScvBasis innerNormals;
- innerNormals[0] = crossProduct<Scalar>(localBasis[1], localBasis[2]);
- innerNormals[1] = crossProduct<Scalar>(localBasis[2], localBasis[0]);
- innerNormals[2] = crossProduct<Scalar>(localBasis[0], localBasis[1]);
+ innerNormals[0] = crossProduct<Scalar>(scvBasis[1], scvBasis[2]);
+ innerNormals[1] = crossProduct<Scalar>(scvBasis[2], scvBasis[0]);
+ innerNormals[2] = crossProduct<Scalar>(scvBasis[0], scvBasis[1]);
+
+ if (!isRightHandSystem(scvBasis))
+ {
+ innerNormals[0] *= -1.0;
+ innerNormals[1] *= -1.0;
+ innerNormals[2] *= -1.0;
+ }
return innerNormals;
}
- // calculates the determinant of the local basis
- static Scalar calculateDetX(const LocalBasis& localBasis)
+ /*!
+ * \brief Calculates the determinant of an scv basis.
+ * This is equal to the cross product for dim = dimWorld = 2
+ *
+ * \param scvBasis The basis of an scv
+ */
+ static Scalar calculateDetX(const ScvBasis& scvBasis)
{
- assert(isRightHandSystem(localBasis) && "Local basis does not form a right hand system");
- return tripleProduct<Scalar>(localBasis[0], localBasis[1], localBasis[2]);
+ using std::abs;
+ return abs(tripleProduct<Scalar>(scvBasis[0], scvBasis[1], scvBasis[2]));
}
- // returns the global number of scvfs in the grid
+ /*!
+ * \brief Returns the global number of scvfs in the grid. Assumes the grid to be made up of only
+ * basic geometry types. Overload this function if you want to use different geometry types.
+ *
+ * \param gridView The grid view to be checked
+ */
static std::size_t getGlobalNumScvf(const GridView& gridView)
{
- Dune::GeometryType simplex, pyramid, prism, cube;
- simplex.makeTetrahedron();
- pyramid.makePyramid();
- prism.makePrism();
- cube.makeHexahedron();
-
- return gridView.size(simplex)*12 + gridView.size(pyramid)*16 + gridView.size(prism)*18 + gridView.size(cube)*24;
+ assert(gridView.size(Dune::GeometryTypes::tetrahedron)
+ + gridView.size(Dune::GeometryTypes::pyramid)
+ + gridView.size(Dune::GeometryTypes::prism)
+ + gridView.size(Dune::GeometryTypes::cube) == gridView.size(0));
+
+ return gridView.size(Dune::GeometryTypes::tetrahedron)*12
+ + gridView.size(Dune::GeometryTypes::pyramid)*16
+ + gridView.size(Dune::GeometryTypes::prism)*18
+ + gridView.size(Dune::GeometryTypes::cube)*24;
}
- //! Check whether or not the local basis forms a right hand system
- static bool isRightHandSystem(const LocalBasis& localBasis)
- { return !std::signbit(tripleProduct<Scalar>(localBasis[0], localBasis[1], localBasis[2])); }
-
- //! get sub control volume face corners on a given face geometry for the given local index
- static PointVector getScvfCorners(const PointVector& isCorners, unsigned int cornerIdx)
+ /*!
+ * \brief Checks whether or not a given scv basis forms a right hand system.
+ *
+ * \param scvBasis The basis of an scv
+ */
+ static bool isRightHandSystem(const ScvBasis& scvBasis)
+ { return !std::signbit(tripleProduct<Scalar>(scvBasis[0], scvBasis[1], scvBasis[2])); }
+
+ /*!
+ * \brief Returns a vector containing the positions on a given intersection
+ * that are relevant for scvf corner computation.
+ * Ordering -> 1: facet center, 2: facet corners, 3: edge centers
+ *
+ * \param eg Geometry of the element the facet is embedded in
+ * \param refElement Reference element of the element the facet is embedded in
+ * \param indexInElement The local index of the facet in the element
+ * \param numCorners The number of corners on the facet
+ */
+ template<class ElementGeometry, class ReferenceElement>
+ static ScvfPositionsOnIntersection computeScvfCornersOnIntersection(const ElementGeometry& eg,
+ const ReferenceElement& refElement,
+ unsigned int indexInElement,
+ unsigned int numCorners)
{
- // maximum number of necessary points is 9 (for quadrilateral)
- GlobalPosition p[9];
- auto numCorners = isCorners.size();
+ // The size of ScvfPositionsOnIntersection doesn't allow for faces with more than four corners!
+ ScvfPositionsOnIntersection p;
+ if (numCorners > 4)
+ DUNE_THROW(Dune::InvalidStateException, "Mpfa implementation cannot handle faces with more than 4 corners");
- // fill point vector with center and corners
+ // compute facet center and corners
p[0] = 0.0;
- for (int i = 0; i < numCorners; ++i)
+ for (unsigned int c = 0; c < numCorners; ++c)
{
- p[0] += isCorners[i];
- p[i+1] = isCorners[i];
+ p[c+1] = eg.global(refElement.position(refElement.subEntity(indexInElement, 1, c, dim), dim));
+ p[0] += p[c+1];
}
p[0] /= numCorners;
// proceed according to number of corners
switch (numCorners)
{
- case 3: // triangle
- {
- // add edge midpoints, there are 3 for triangles
- p[numCorners+1] = isCorners[1] + isCorners[0];
- p[numCorners+1] /= 2;
- p[numCorners+2] = isCorners[2] + isCorners[0];
- p[numCorners+2] /= 2;
- p[numCorners+3] = isCorners[2] + isCorners[1];
- p[numCorners+3] /= 2;
-
- //! Only build the maps the first time we encounter a triangle
- static const std::uint8_t vo = 1; //! vertex offset in point vector p
- static const std::uint8_t eo = 4; //! edge offset in point vector p
- static const std::uint8_t map[3][4] =
+ case 3: // triangle
{
- {0, eo+1, eo+0, vo+0},
- {0, eo+0, eo+2, vo+1},
- {0, eo+2, eo+1, vo+2}
- };
-
- return PointVector( {p[map[cornerIdx][0]],
- p[map[cornerIdx][1]],
- p[map[cornerIdx][2]],
- p[map[cornerIdx][3]]} );
- }
- case 4: // quadrilateral
- {
- // add edge midpoints, there are 4 for quadrilaterals
- p[numCorners+1] = isCorners[2] + isCorners[0];
- p[numCorners+1] /= 2;
- p[numCorners+2] = isCorners[3] + isCorners[1];
- p[numCorners+2] /= 2;
- p[numCorners+3] = isCorners[1] + isCorners[0];
- p[numCorners+3] /= 2;
- p[numCorners+4] = isCorners[3] + isCorners[2];
- p[numCorners+4] /= 2;
-
- //! Only build the maps the first time we encounter a quadrilateral
- static const std::uint8_t vo = 1; //! vertex offset in point vector p
- static const std::uint8_t eo = 5; //! face offset in point vector p
- static const std::uint8_t map[4][4] =
+ // add edge midpoints, there are 3 for triangles
+ p[numCorners+1] = p[2] + p[1];
+ p[numCorners+1] /= 2;
+ p[numCorners+2] = p[3] + p[1];
+ p[numCorners+2] /= 2;
+ p[numCorners+3] = p[3] + p[2];
+ p[numCorners+3] /= 2;
+ }
+ case 4: // quadrilateral
{
- {0, eo+0, eo+2, vo+0},
- {0, eo+2, eo+1, vo+1},
- {0, eo+3, eo+0, vo+2},
- {0, eo+1, eo+3, vo+3}
- };
-
- return PointVector( {p[map[cornerIdx][0]],
- p[map[cornerIdx][1]],
- p[map[cornerIdx][2]],
- p[map[cornerIdx][3]]} );
- }
- default:
- DUNE_THROW(Dune::NotImplemented, "Mpfa scvf corners for dim=" << dim
- << " dimWorld=" << dimWorld
- << " corners=" << numCorners);
+ // add edge midpoints, there are 4 for quadrilaterals
+ p[numCorners+1] = p[3] + p[1];
+ p[numCorners+1] /= 2;
+ p[numCorners+2] = p[4] + p[2];
+ p[numCorners+2] /= 2;
+ p[numCorners+3] = p[2] + p[1];
+ p[numCorners+3] /= 2;
+ p[numCorners+4] = p[4] + p[3];
+ p[numCorners+4] /= 2;
+ }
+ default:
+ DUNE_THROW(Dune::NotImplemented, "Mpfa scvf corners for dim = " << dim
+ << ", dimWorld = " << dimWorld
+ << ", corners = " << numCorners);
}
+
+ return p;
}
- //! calculate integration point on a scvf
- static GlobalPosition getScvfIntegrationPoint(const PointVector& scvfCorners, Scalar q)
+ /*!
+ * \brief Returns the corners of the sub control volume face constructed
+ * in a corner (vertex) of an intersection.
+ *
+ * \param scvfCornerPositions Container with all scvf corners of the intersection
+ * \param numIntersectionCorners Number of corners of the intersection
+ * \param cornerIdx Local vertex index on the intersection
+ */
+ static ScvfCornerVector getScvfCorners(const ScvfPositionsOnIntersection& p,
+ unsigned int numIntersectionCorners,
+ unsigned int cornerIdx)
{
- // scvfs in 3d are always quadrilaterals
- // ordering -> first corner: facet center, last corner: vertex
- if (q == 0.0)
- return scvfCorners[0];
-
- auto d = scvfCorners[3] - scvfCorners[0];
- d *= q;
- return scvfCorners[0] + d;
+ // proceed according to number of corners
+ // we assume the ordering according to the above method computeScvfCornersOnIntersection()
+ switch (numIntersectionCorners)
+ {
+ case 3: // triangle
+ {
+ //! Only build the maps the first time we encounter a triangle
+ static const std::uint8_t vo = 1; //! vertex offset in point vector p
+ static const std::uint8_t eo = 4; //! edge offset in point vector p
+ static const std::uint8_t map[3][4] =
+ {
+ {0, eo+1, eo+0, vo+0},
+ {0, eo+0, eo+2, vo+1},
+ {0, eo+2, eo+1, vo+2}
+ };
+
+ return ScvfCornerVector( {p[map[cornerIdx][0]],
+ p[map[cornerIdx][1]],
+ p[map[cornerIdx][2]],
+ p[map[cornerIdx][3]]} );
+ }
+ case 4: // quadrilateral
+ {
+ //! Only build the maps the first time we encounter a quadrilateral
+ static const std::uint8_t vo = 1; //! vertex offset in point vector p
+ static const std::uint8_t eo = 5; //! face offset in point vector p
+ static const std::uint8_t map[4][4] =
+ {
+ {0, eo+0, eo+2, vo+0},
+ {0, eo+2, eo+1, vo+1},
+ {0, eo+3, eo+0, vo+2},
+ {0, eo+1, eo+3, vo+3}
+ };
+
+ return ScvfCornerVector( {p[map[cornerIdx][0]],
+ p[map[cornerIdx][1]],
+ p[map[cornerIdx][2]],
+ p[map[cornerIdx][3]]} );
+ }
+ default:
+ DUNE_THROW(Dune::NotImplemented, "Mpfa scvf corners for dim = " << dim
+ << ", dimWorld = " << dimWorld
+ << ", corners = " << numIntersectionCorners);
+ }
}
- //! calculate scvf area
- static Scalar getScvfArea(const PointVector& scvfCorners)
+ /*!
+ * \brief Calculates the area of an scvf.
+ *
+ * \param scvfCorners Container with the corners of the scvf
+ */
+ static Scalar getScvfArea(const ScvfCornerVector& scvfCorners)
{
// after Wolfram alpha quadrilateral area
return 0.5*Dumux::crossProduct(scvfCorners[3]-scvfCorners[0], scvfCorners[2]-scvfCorners[1]).two_norm();
}
- //! determine the number of scvfs of an element
+ /*!
+ * \brief Calculates the number of scvfs in a given element geometry type.
+ *
+ * \param gt The element geometry type
+ */
static std::size_t getNumLocalScvfs(const Dune::GeometryType gt)
{
if (gt == Dune::GeometryType(Dune::GeometryType::simplex, 3))
@@ -421,7 +502,7 @@ public:
else if (gt == Dune::GeometryType(Dune::GeometryType::cube, 3))
return 24;
else
- DUNE_THROW(Dune::InvalidStateException, "unknown 3d geometry type " << gt);
+ DUNE_THROW(Dune::NotImplemented, "Mpfa for 3d geometry type " << gt);
}
};
@@ -434,140 +515,45 @@ template<class TypeTag, MpfaMethods Method, int dim, int dimWorld>
class CCMpfaHelperImplementation : public MpfaDimensionHelper<TypeTag, dim, dimWorld>,
public MpfaMethodHelper<TypeTag, Method, dim, dimWorld>
{
- using Implementation = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
using Element = typename GridView::template Codim<0>::Entity;
+ using IndexType = typename GridView::IndexSet::IndexType;
- using GlobalIndexType = typename GridView::IndexSet::IndexType;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
+ using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using ScvfCornerVector = typename SubControlVolumeFace::Traits::CornerStorage;
+ using InteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using LocalIndexType = typename InteractionVolume::Traits::LocalIndexType;
+ using ScvBasis = typename InteractionVolume::Traits::ScvBasis;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
- using ScvfVector = std::array<const SubControlVolumeFace*, dim>;
- using LocalBasis = std::array<GlobalPosition, dim>;
-
using CoordScalar = typename GridView::ctype;
using ReferenceElements = typename Dune::ReferenceElements<CoordScalar, dim>;
- static constexpr bool enableInteriorBoundaries = GET_PROP_VALUE(TypeTag, EnableInteriorBoundaries);
-
public:
- // returns shared pointers to the scv faces that share a vertex in the order of a right hand system
- static ScvfVector getScvFacesAtVertex(const GlobalIndexType vIdxGlobal,
- const Element& element,
- const FVElementGeometry& fvGeometry)
- {
- ScvfVector scvfVector({nullptr});
- LocalBasis basisVectors;
-
- // The element center
- auto elementCenter = element.geometry().center();
-
- LocalIndexType count = 0;
- for (auto&& scvf : scvfs(fvGeometry))
- {
- if (scvf.vertexIndex() == vIdxGlobal)
- {
- scvfVector[count] = &scvf;
- basisVectors[count] = scvf.ipGlobal();
- basisVectors[count] -= elementCenter;
- count++;
- }
- }
-
- // We should always find dim faces sharing the vertex
- assert(count == dim);
-
- // sort the scv faces to form a right hand system
- if (!Implementation::isRightHandSystem(basisVectors))
- std::swap(scvfVector[0], scvfVector[1]);
-
- return scvfVector;
- }
-
- // Finds the local index in an ScvfVector that corresponds to the face that shares a facet with the given outsideScvf
- static LocalIndexType getCommonFaceLocalIndex(const SubControlVolumeFace& outsideScvf,
- const ScvfVector& insideScvFaces)
- {
- auto outsideScvIdx = outsideScvf.insideScvIdx();
- for (int i = 0; i < insideScvFaces.size(); i++)
- if (contains(insideScvFaces[i]->outsideScvIndices(), outsideScvIdx))
- return i;
-
- DUNE_THROW(Dune::InvalidStateException, "Could not find corresponding scvf in the provided vector of scvfs.");
- }
-
- // Finds the local index in an ScvfVector that corresponds to a given scvf
- static LocalIndexType getLocalFaceIndex(const SubControlVolumeFace& scvf,
- const ScvfVector& scvFaces)
+ /*!
+ * \brief Calculates the integration point on an scvf.
+ *
+ * \param scvfCorners Container with the corners of the scvf
+ * \param q Parameterization of the integration point on the scvf
+ */
+ static GlobalPosition getScvfIntegrationPoint(const ScvfCornerVector& scvfCorners, Scalar q)
{
- for (int i = 0; i < scvFaces.size(); i++)
- if (scvFaces[i]->index() == scvf.index())
- return i;
-
- DUNE_THROW(Dune::InvalidStateException, "Could not find corresponding scvf in the provided vector of scvfs.");
- }
-
- // Returns the MpfaFaceType of an scv face
- static MpfaFaceTypes getMpfaFaceType(const Problem& problem,
- const Element& element,
- const SubControlVolumeFace& scvf)
- {
- // We do simplified checks if interior boundaries are disabled
- if (!enableInteriorBoundaries)
- {
- if (!scvf.boundary())
- return MpfaFaceTypes::interior;
-
- const auto bcTypes = problem.boundaryTypes(element, scvf);
- if (bcTypes.hasOnlyNeumann())
- return MpfaFaceTypes::neumann;
- if (bcTypes.hasOnlyDirichlet())
- return MpfaFaceTypes::dirichlet;
-
- // throw exception
- return throwBoundaryExceptionMessage(bcTypes);
- }
- else
- {
- const auto bcTypes = problem.boundaryTypes(element, scvf);
-
- // if we are on an interior boundary return interior types
- if (problem.model().fvGridGeometry().isOnInteriorBoundary(scvf))
- {
- if (bcTypes.hasOnlyNeumann())
- return MpfaFaceTypes::interiorNeumann;
- if (bcTypes.hasOnlyDirichlet())
- return MpfaFaceTypes::interiorDirichlet;
-
- // throw exception
- return throwBoundaryExceptionMessage(bcTypes);
- }
-
- if (scvf.boundary())
- {
- if (bcTypes.hasOnlyNeumann())
- return MpfaFaceTypes::neumann;
- if (bcTypes.hasOnlyDirichlet())
- return MpfaFaceTypes::dirichlet;
-
- // throw exception
- return throwBoundaryExceptionMessage(bcTypes);
- }
-
- // This is an interior scvf
- return MpfaFaceTypes::interior;
- }
+ // scvfs in 3d are always quadrilaterals
+ // ordering -> first corner: facet center, last corner: vertex
+ if (q == 0.0)
+ return scvfCorners[0];
+ const auto d = [&] () { auto tmp = scvfCorners.back() - scvfCorners.front(); tmp *= q; return tmp; } ();
+ return scvfCorners[0] + d;
}
- // returns a vector, which maps a bool (true if ghost vertex) to each vertex index
- static std::vector<bool> findGhostVertices(const Problem& problem, const GridView& gridView)
+ // returns a vector which maps true to each vertex on processor boundaries and false otherwise
+ // TODO: Does this really NOT work with ghosts? Adjust to make it work with ghosts or rename the function!
+ static std::vector<bool> findGhostVertices(const GridView& gridView, const VertexMapper& vertexMapper)
{
std::vector<bool> ghostVertices(gridView.size(dim), false);
@@ -590,11 +576,10 @@ public:
if (!is.neighbor() && !is.boundary())
{
const auto& refElement = ReferenceElements::general(element.geometry().type());
- for (unsigned int isVertex = 0; isVertex < is.geometry().corners(); ++isVertex)
+ for (int isVertex = 0; isVertex < is.geometry().corners(); ++isVertex)
{
const auto vIdxLocal = refElement.subEntity(is.indexInInside(), 1, isVertex, dim);
- const auto vIdxGlobal = problem.vertexMapper().subIndex(element, vIdxLocal, dim);
-
+ const auto vIdxGlobal = vertexMapper.subIndex(element, vIdxLocal, dim);
ghostVertices[vIdxGlobal] = true;
}
}
@@ -606,13 +591,11 @@ public:
//! returns whether or not a value exists in a vector
template<typename V1, typename V2>
- static bool contains(const std::vector<V1>& vector, const V2 value)
+ static bool vectorContainsValue(const std::vector<V1>& vector, const V2 value)
{ return std::find(vector.begin(), vector.end(), value) != vector.end(); }
// calculates the product of a transposed vector n, a Matrix M and another vector v (n^T M v)
- static Scalar nT_M_v(const GlobalPosition& n,
- const DimWorldMatrix& M,
- const GlobalPosition& v)
+ static Scalar nT_M_v(const GlobalPosition& n, const DimWorldMatrix& M, const GlobalPosition& v)
{
GlobalPosition tmp;
M.mv(v, tmp);
@@ -620,24 +603,10 @@ public:
}
// calculates the product of a transposed vector n, a Scalar M and another vector v (n^T M v)
- static Scalar nT_M_v(const GlobalPosition& n,
- const Scalar M,
- const GlobalPosition& v)
+ static Scalar nT_M_v(const GlobalPosition& n, const Scalar M, const GlobalPosition& v)
{
return M*(n*v);
}
-
-private:
- static MpfaFaceTypes throwBoundaryExceptionMessage(const BoundaryTypes& bcTypes)
- {
- // throw for outflow or mixed boundary conditions
- if (bcTypes.hasOutflow())
- DUNE_THROW(Dune::NotImplemented, "outflow BC for mpfa schemes");
- if (bcTypes.hasDirichlet() && bcTypes.hasNeumann())
- DUNE_THROW(Dune::InvalidStateException, "Mixed BC are not allowed for cellcentered schemes");
-
- DUNE_THROW(Dune::InvalidStateException, "unknown boundary condition type");
- }
};
/*!
@@ -651,11 +620,9 @@ using CCMpfaHelper = CCMpfaHelperImplementation<TypeTag,
GET_PROP_TYPE(TypeTag, GridView)::dimension,
GET_PROP_TYPE(TypeTag, GridView)::dimensionworld>;
-} // end namespace
+} // end namespace Dumux
// The implemented helper classes need to be included here
-#include <dumux/discretization/cellcentered/mpfa/lmethod/helper.hh>
#include <dumux/discretization/cellcentered/mpfa/omethod/helper.hh>
-#include <dumux/discretization/cellcentered/mpfa/omethodfps/helper.hh>
#endif
diff --git a/dumux/discretization/cellcentered/mpfa/hybridfps/fvgridgeometry.hh b/dumux/discretization/cellcentered/mpfa/hybridfps/fvgridgeometry.hh
deleted file mode 100644
index 5658f9466f5356c53e76a3046722fab444dd09fb..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/hybridfps/fvgridgeometry.hh
+++ /dev/null
@@ -1,281 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for the finite volume geometry vector for box models
- * This builds up the sub control volumes and sub control volume faces
- * for each element.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_O_HYBRIDFPS_FV_GRID_GEOMETRY_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_O_HYBRIDFPS_FV_GRID_GEOMETRY_HH
-
-#include <dune/geometry/multilineargeometry.hh>
-#include <dune/geometry/referenceelements.hh>
-
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/common/elementmap.hh>
-
-#include <dumux/discretization/cellcentered/mpfa/mpfageometryhelper.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup ImplicitModel
- * \brief Base class for the finite volume geometry vector for mpfa models
- * This builds up the sub control volumes and sub control volume faces
- * for each element.
- */
-template<class TypeTag, bool EnableFVElementGeometryCache>
-class CCMpfaOHybridFpsFVGridGeometry
-{};
-
-// specialization in case the FVElementGeometries are stored
-template<class TypeTag>
-class CCMpfaOHybridFpsFVGridGeometry<TypeTag, true>
-{
- //! The local class needs access to the scv, scvfs and the fv element geometry
- //! as they are globally cached
- friend typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
-
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using GlobalInteractionVolumeSeeds = typename GET_PROP_TYPE(TypeTag, GlobalInteractionVolumeSeeds);
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using InteractionVolumeSeed = typename InteractionVolume::Seed;
- using BoundaryInteractionVolumeSeed = typename BoundaryInteractionVolume::Seed;
- using Element = typename GridView::template Codim<0>::Entity;
-
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using CoordScalar = typename GridView::ctype;
- using IndexType = typename GridView::IndexSet::IndexType;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
-
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
-
- using DimVector = Dune::FieldVector<Scalar, dimWorld>;
- using ReferenceElements = typename Dune::ReferenceElements<CoordScalar, dim>;
- using MpfaGeometryHelper = Dumux::MpfaGeometryHelper<GridView, dim>;
-
-public:
- //! Constructor
- CCMpfaOHybridFpsFVGridGeometry(const GridView gridView)
- : gridView_(gridView), elementMap_(gridView), globalInteractionVolumeSeeds_(gridView) {}
-
- //! The total number of sub control volumes
- std::size_t numScv() const
- { return scvs_.size(); }
-
- //! The total number of sun control volume faces
- std::size_t numScvf() const
- { return scvfs_.size(); }
-
- //! The total number of boundary sub control volume faces
- std::size_t numBoundaryScvf() const
- { return numBoundaryScvf_; }
-
- // Get an element from a sub control volume contained in it
- Element element(const SubControlVolume& scv) const
- { return elementMap_.element(scv.elementIndex()); }
-
- // Get an element from a global element index
- Element element(IndexType eIdx) const
- { return elementMap_.element(eIdx); }
-
- //! Get the inner interaction volume seed corresponding to an scvf
- const InteractionVolumeSeed& interactionVolumeSeed(const SubControlVolumeFace& scvf) const
- { return globalInteractionVolumeSeeds_.seed(scvf); }
-
- //! Get the boundary interaction volume seed corresponding to an scvf
- const BoundaryInteractionVolumeSeed& boundaryInteractionVolumeSeed(const SubControlVolumeFace& scvf, const LocalIndexType eqIdx) const
- { return globalInteractionVolumeSeeds_.boundarySeed(scvf, eqIdx); }
-
- //! Returns whether or not a scvf touches the boundary (has to be called before getting an interaction volume)
- bool scvfTouchesBoundary(const SubControlVolumeFace& scvf) const
- { return fpsVertices_[scvf.vertexIndex()]; }
-
- //! update all fvElementGeometries (do this again after grid adaption)
- void update(const Problem& problem)
- {
- problemPtr_ = &problem;
-
- scvfs_.clear();
- // reserve memory
- IndexType numScvs = gridView_.size(0);
- scvs_.resize(numScvs);
- scvfs_.reserve(getNumScvf_());
- scvfIndicesOfScv_.resize(numScvs);
- fpsVertices_.resize(gridView_.size(dim), false);
- boundaryVertices_.resize(gridView_.size(dim), false);
- elementMap_.resize(numScvs);
-
- // the quadrature point to be used on the scvf
- const Scalar q = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Mpfa, Q);
-
- // Build the SCVs and SCV faces
- IndexType scvfIdx = 0;
- numBoundaryScvf_ = 0;
- for (const auto& element : elements(gridView_))
- {
- auto eIdx = problem.elementMapper().index(element);
-
- // fill the element map with seeds
- elementMap_[eIdx] = element.seed();
-
- // the element geometry and reference element
- auto elemGeometry = element.geometry();
- const auto& referenceElement = ReferenceElements::general(elemGeometry.type());
-
- // create sub control volume for this element
- scvs_[eIdx] = SubControlVolume(std::move(elemGeometry), eIdx);
-
- // The geometry helper class
- MpfaGeometryHelper geomHelper(elemGeometry);
-
- // The local scvf index set
- std::vector<IndexType> scvfIndexSet;
- scvfIndexSet.reserve(geomHelper.getNumLocalScvfs());
-
- // determine if element has to be handled by the fps scheme
- bool isFps = problem.spatialParams().isFpsElement(element);
-
- // construct the sub control volume faces
- for (const auto& intersection : intersections(gridView_, element))
- {
- // get the intersection geometry and some of its bools
- auto isGeometry = intersection.geometry();
- bool boundary = intersection.boundary();
- bool neighbor = intersection.neighbor();
-
- if (neighbor &&
- element.partitionType() == Dune::GhostEntity &&
- intersection.outside().partitionType() == Dune::GhostEntity)
- continue;
-
- // determine the outside volvar idx
- IndexType nIdx;
- if (neighbor)
- nIdx = problem.elementMapper().index(intersection.outside());
- else if (boundary)
- nIdx = numScvs + numBoundaryScvf_++;
- else
- continue;
-
- // make the scv faces of the intersection
- for (unsigned int faceScvfIdx = 0; faceScvfIdx < isGeometry.corners(); ++faceScvfIdx)
- {
- // get the global vertex index the scv face is connected to (mpfa-o method does not work for hanging nodes!)
- const auto vIdxLocal = referenceElement.subEntity(intersection.indexInInside(), 1, faceScvfIdx, dim);
- const auto vIdxGlobal = problem.vertexMapper().subIndex(element, vIdxLocal, dim);
-
- if (boundary || isFps || (!boundary && problem.spatialParams().isFpsElement(intersection.outside())))
- fpsVertices_[vIdxGlobal] = true;
- if (boundary)
- boundaryVertices_[vIdxGlobal] = true;
-
- // make the scv face
- scvfIndexSet.push_back(scvfIdx);
- scvfs_.emplace_back(SubControlVolumeFace(geomHelper,
- geomHelper.getScvfCorners(isGeometry, faceScvfIdx),
- intersection.centerUnitOuterNormal(),
- vIdxGlobal,
- scvfIdx,
- std::array<IndexType, 2>({{eIdx, nIdx}}),
- q,
- boundary
- ));
-
- // increment scvf counter
- scvfIdx++;
- }
- }
-
- // Save the scvf indices belonging to this scv to build up fv element geometries fast
- scvfIndicesOfScv_[eIdx] = scvfIndexSet;
- }
-
- // Initialize the interaction volume seeds, this will also initialize the vector of boundary vertices
- globalInteractionVolumeSeeds_.update(problem, fpsVertices_, boundaryVertices_);
- }
-
- /*!
- * \brief Return a local restriction of this global object
- * The local object is only functional after calling its bind/bindElement method
- * This is a free function that will be found by means of ADL
- */
- friend inline FVElementGeometry localView(const CCMpfaOHybridFpsFVGridGeometry& global)
- { return FVElementGeometry(global); }
-
- //! Get a sub control volume with a global scv index
- const SubControlVolume& scv(IndexType scvIdx) const
- { return scvs_[scvIdx]; }
-
- //! Get a sub control volume face with a global scvf index
- const SubControlVolumeFace& scvf(IndexType scvfIdx) const
- { return scvfs_[scvfIdx]; }
-
- //! Get the sub control volume face indices of an scv by global index
- const std::vector<IndexType>& scvfIndicesOfScv(IndexType scvIdx) const
- { return scvfIndicesOfScv_[scvIdx]; }
-
- template<int d = dim>
- typename std::enable_if<d == 2, IndexType>::type getNumScvf_() const
- {
- Dune::GeometryType triangle, quadrilateral;
- triangle.makeTriangle();
- quadrilateral.makeQuadrilateral();
-
- return gridView_.size(triangle)*6 + gridView_.size(quadrilateral)*8;
- }
-
- template<int d = dim>
- typename std::enable_if<d == 3, IndexType>::type getNumScvf_() const
- {
- Dune::GeometryType simplex, pyramid, prism, cube;
- simplex.makeTetrahedron();
- pyramid.makePyramid();
- prism.makePrism();
- cube.makeHexahedron();
-
- return gridView_.size(simplex)*12 + gridView_.size(pyramid)*16 + gridView_.size(prism)*18 + gridView_.size(cube)*24;
- }
-
-private:
- const Problem& problem_() const
- { return *problemPtr_; }
-
- const Problem* problemPtr_;
- GridView gridView_;
- Dumux::ElementMap<GridView> elementMap_;
- std::vector<SubControlVolume> scvs_;
- std::vector<SubControlVolumeFace> scvfs_;
- std::vector<std::vector<IndexType>> scvfIndicesOfScv_;
- std::vector<bool> fpsVertices_;
- std::vector<bool> boundaryVertices_;
- IndexType numBoundaryScvf_;
- GlobalInteractionVolumeSeeds globalInteractionVolumeSeeds_;
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/hybridfps/globalinteractionvolumeseeds.hh b/dumux/discretization/cellcentered/mpfa/hybridfps/globalinteractionvolumeseeds.hh
deleted file mode 100644
index 8201c4d7868d4306d4bcc122f5182c3b88dafbdd..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/hybridfps/globalinteractionvolumeseeds.hh
+++ /dev/null
@@ -1,158 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for the global interaction volumes of the mpfa-o method.
- */
-#ifndef DUMUX_DISCRETIZATION_MPFA_O_HYBRIDFPS_GLOBALINTERACTIONVOLUMESEEDS_HH
-#define DUMUX_DISCRETIZATION_MPFA_O_HYBRIDFPS_GLOBALINTERACTIONVOLUMESEEDS_HH
-
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup MpfaO
- * \brief Base class for the creation and storage of the interaction volume seeds for mpfa methods.
- */
-template<class TypeTag>
-class CCMpfaOHybridFpsGlobalInteractionVolumeSeeds
-{
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Helper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using InteractionVolumeOMethod = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using OSeed = typename InteractionVolumeOMethod::Seed;
- using InteractionVolumeFpsMethod = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using FpsSeed = typename InteractionVolumeFpsMethod::Seed;
- using Element = typename GridView::template Codim<0>::Entity;
-
- using IndexType = typename GridView::IndexSet::IndexType;
- using LocalIndexType = typename InteractionVolumeOMethod::LocalIndexType;
-
- static const int dim = GridView::dimension;
- static const int numEq = GET_PROP_VALUE(TypeTag, NumEq);
-
-public:
- CCMpfaOHybridFpsGlobalInteractionVolumeSeeds(const GridView gridView) : gridView_(gridView) {}
-
- // initializes the interaction volumes or the seeds
- void update(const Problem& problem, const std::vector<bool>& fpsVertices, const std::vector<bool>& boundaryVertices)
- {
- problemPtr_ = &problem;
- fpsSeeds_.clear();
- oSeeds_.clear();
-
- // -1 indicates that the scvf has not been handled yet
- auto numScvf = problem_().model().fvGridGeometry().numScvf();
- scvfIndexMap_.resize(numScvf, -1);
-
- // detect and handle the boundary first
- initializeFpsSeeds_(fpsVertices, boundaryVertices);
- initializeOSeeds_();
- }
-
- const OSeed& seed(const SubControlVolumeFace& scvf) const
- { return oSeeds_[scvfIndexMap_[scvf.index()]]; }
-
- const FpsSeed& boundarySeed(const SubControlVolumeFace& scvf, const LocalIndexType eqIdx) const
- { return fpsSeeds_[scvfIndexMap_[scvf.index()]]; }
-
-private:
- void initializeFpsSeeds_(const std::vector<bool>& fpsVertices, const std::vector<bool>& boundaryVertices)
- {
- fpsSeeds_.reserve(fpsVertices.size());
-
- IndexType fpsSeedIndex = 0;
- for (const auto& element : elements(gridView_))
- {
- auto fvGeometry = localView(problem_().model().fvGridGeometry());
- fvGeometry.bind(element);
- for (const auto& scvf : scvfs(fvGeometry))
- {
- // skip the rest if we already handled this face or if face doesn't belong to an fps element
- if (scvfIndexMap_[scvf.index()] != -1 || !fpsVertices[scvf.vertexIndex()])
- continue;
-
- // the fps interaction volume seed
- auto fpsSeed = Helper::makeBoundaryInteractionVolumeSeed(problem_(), element, fvGeometry, scvf, boundaryVertices[scvf.vertexIndex()]);
-
- // update the index map entries for the global scv faces in the interaction volume
- for (const auto& localScvfSeed : fpsSeed.scvfSeeds())
- for (const auto scvfIdxGlobal : localScvfSeed.globalScvfIndices())
- scvfIndexMap_[scvfIdxGlobal] = fpsSeedIndex;
-
- // store interaction volume and increment counter
- fpsSeeds_.emplace_back(std::move(fpsSeed));
- fpsSeedIndex++;
- }
- }
-
- // shrink fps seed vector to actual size
- fpsSeeds_.shrink_to_fit();
- }
-
- void initializeOSeeds_()
- {
- oSeeds_.reserve(problem_().gridView().size(dim));
-
- IndexType oSeedIndex = 0;
- for (const auto& element : elements(gridView_))
- {
- auto fvGeometry = localView(problem_().model().fvGridGeometry());
- fvGeometry.bind(element);
- for (const auto& scvf : scvfs(fvGeometry))
- {
- if (scvfIndexMap_[scvf.index()] != -1)
- continue;
-
- // the inner interaction volume seed
- auto seed = Helper::makeInnerInteractionVolumeSeed(problem_(), element, fvGeometry, scvf);
-
- // update the index map entries for the global scv faces in the interaction volume
- for (const auto& localScvf : seed.scvfSeeds())
- for (const auto scvfIdxGlobal : localScvf.globalScvfIndices())
- scvfIndexMap_[scvfIdxGlobal] = oSeedIndex;
-
- // store interaction volume and increment counter
- oSeeds_.emplace_back(std::move(seed));
- oSeedIndex++;
- }
- }
-
- // shrink seed vector to actual size
- oSeeds_.shrink_to_fit();
- }
-
- const Problem& problem_() const
- { return *problemPtr_; }
-
- const Problem* problemPtr_;
- GridView gridView_;
- std::vector<IndexType> scvfIndexMap_;
- std::vector<FpsSeed> fpsSeeds_;
- std::vector<OSeed> oSeeds_;
-};
-} // end namespace
-
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/hybridfps/helper.hh b/dumux/discretization/cellcentered/mpfa/hybridfps/helper.hh
deleted file mode 100644
index 695fc18d6a33da953caafbf4e67284e42d4a895c..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/hybridfps/helper.hh
+++ /dev/null
@@ -1,125 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Helper class to get the required information on an interaction volume.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFAO_HYBRID_FPS_HELPER_HH
-#define DUMUX_DISCRETIZATION_CC_MPFAO_HYBRID_FPS_HELPER_HH
-
-#include <dumux/discretization/cellcentered/mpfa/omethod/helper.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup Mpfa
- * \brief Helper class to get the required information on an interaction volume.
- * Specialization for the Mpfa-O method in two dimensions.
- */
-template<class TypeTag, int dim>
-class MpfaHelperBase<TypeTag, MpfaMethods::oMethodFpsHybrid, dim> : public MpfaHelperBase<TypeTag, MpfaMethods::oMethod, dim>
-{
- using Base = MpfaHelperBase<TypeTag, MpfaMethods::oMethod, dim>;
-
- using Implementation = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
-
- using GlobalIndexType = typename Base::GlobalIndexType;
- using LocalIndexType = typename Base::LocalIndexType;
- using GlobalIndexSet = typename Base::GlobalIndexSet;
- using LocalIndexSet = typename Base::LocalIndexSet;
-
- using InteractionVolumeSeed = typename InteractionVolume::Seed;
- using ScvSeed = typename InteractionVolumeSeed::LocalScvSeed;
- using ScvfSeed = typename InteractionVolumeSeed::LocalScvfSeed;
-
- using Element = typename GridView::template Codim<0>::Entity;
-
-public:
- static InteractionVolumeSeed makeInnerInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- {
- std::vector<ScvSeed> scvSeeds;
- std::vector<ScvfSeed> scvfSeeds;
-
- fillEntitySeeds_(scvSeeds, scvfSeeds, problem, element, fvGeometry, scvf, /*dummy*/0);
- return InteractionVolumeSeed(std::move(scvSeeds), std::move(scvfSeeds), false);
- }
-
- static InteractionVolumeSeed makeBoundaryInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf,
- const bool isBoundary)
- {
- std::vector<ScvSeed> scvSeeds;
- std::vector<ScvfSeed> scvfSeeds;
-
- fillEntitySeeds_(scvSeeds, scvfSeeds, problem, element, fvGeometry, scvf, isBoundary);
- return InteractionVolumeSeed(std::move(scvSeeds), std::move(scvfSeeds), isBoundary);
- }
-
-private:
- static void fillEntitySeeds_(std::vector<ScvSeed>& scvSeeds,
- std::vector<ScvfSeed>& scvfSeeds,
- const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf,
- const bool isBoundary)
- {
- // Get the two scv faces in the first scv
- auto scvfVector = Implementation::getScvFacesAtVertex(scvf.vertexIndex(), element, fvGeometry);
-
- // The global index of the first scv of the interaction region
- auto scvIdx0 = scvf.insideScvIdx();
-
- // rotate counter clockwise and create the entities
- Implementation::performRotation_(problem, scvfVector, scvSeeds, scvfSeeds, scvIdx0, /*dummy*/0);
-
- if (isBoundary)
- {
- // the local scvf index of the second local face of the first local scv
- LocalIndexType storeIdx = scvfSeeds.size();
-
- // clockwise rotation until hitting the boundary again
- Implementation::performRotation_(problem, scvfVector, scvSeeds, scvfSeeds, scvIdx0, /*dummy*/0, /*clockwise*/true);
-
- // Finish by creating the first scv
- scvSeeds.emplace(scvSeeds.begin(), ScvSeed(GlobalIndexSet({scvfVector[0]->index(), scvfVector[1]->index()}),
- LocalIndexSet({0, storeIdx}),
- scvIdx0));
- }
- else
- // Finish by creating the first scv
- scvSeeds.emplace(scvSeeds.begin(), ScvSeed(GlobalIndexSet({scvfVector[0]->index(), scvfVector[1]->index()}),
- LocalIndexSet({0, static_cast<LocalIndexType>(scvfSeeds.size()-1)}),
- scvIdx0));
- }
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/hybridfps/interactionvolume.hh b/dumux/discretization/cellcentered/mpfa/hybridfps/interactionvolume.hh
deleted file mode 100644
index 6e0b3242680b82ee10ae501de918ba080159786a..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/hybridfps/interactionvolume.hh
+++ /dev/null
@@ -1,72 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base classes for interaction volume of mpfa methods.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_O_HYBRID_FPS_INTERACTIONVOLUME_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_O_HYBRID_FPS_INTERACTIONVOLUME_HH
-
-#include <dumux/common/math.hh>
-
-#include <dune/localfunctions/lagrange/pqkfactory.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-
-#include <dumux/discretization/cellcentered/mpfa/omethodfps/interactionvolume.hh>
-
-namespace Dumux
-{
-//! Specialization of the interaction volume traits class
-template<class TypeTag>
-class CCMpfaOHybridFpsInteractionVolumeTraits : public CCMpfaOInteractionVolumeTraits<TypeTag>
-{
-public:
- // we will use the o method's interaction volume where necessary
- using BoundaryInteractionVolume = CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethodFps>;
-};
-
-/*!
- * \ingroup Mpfa
- * \brief Base class for the interaction volumes of the mpfa-o method with full pressure support.
- */
-template<class TypeTag>
-class CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethodFpsHybrid> : public CCMpfaOInteractionVolume<TypeTag, CCMpfaOHybridFpsInteractionVolumeTraits<TypeTag>>
-{
- using Traits = CCMpfaOHybridFpsInteractionVolumeTraits<TypeTag>;
- using ParentType = CCMpfaOInteractionVolume<TypeTag, Traits>;
-
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
-
- using IVSeed = typename Traits::Seed;
-
-public:
-
- CCMpfaInteractionVolumeImplementation(const IVSeed& seed,
- const Problem& problem,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars)
- : ParentType(seed, problem, fvGeometry, elemVolVars)
- {}
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/interactionvolume.hh b/dumux/discretization/cellcentered/mpfa/interactionvolume.hh
index 729fe9ed949c14f15a2f3729836ef262f7b4e05c..1a2d097d33e1742545a669b733e44dc9dfdca8c4 100644
--- a/dumux/discretization/cellcentered/mpfa/interactionvolume.hh
+++ b/dumux/discretization/cellcentered/mpfa/interactionvolume.hh
@@ -41,8 +41,8 @@ using CCMpfaInteractionVolume = CCMpfaInteractionVolumeImplementation<TypeTag, G
} // end namespace
// the specializations of this class for the available methods have to be included here
-#include <dumux/discretization/cellcentered/mpfa/lmethod/interactionvolume.hh>
+// #include <dumux/discretization/cellcentered/mpfa/lmethod/interactionvolume.hh>
#include <dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh>
-#include <dumux/discretization/cellcentered/mpfa/omethodfps/interactionvolume.hh>
+// #include <dumux/discretization/cellcentered/mpfa/omethodfps/interactionvolume.hh>
#endif
diff --git a/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh b/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh
index 144e7881fb81cad5e8b12ebd5c2195c0be1c2683..b4967c7fe356e484a331db4af8cd73e928e3da89 100644
--- a/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh
+++ b/dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh
@@ -18,21 +18,33 @@
*****************************************************************************/
/*!
* \file
- * \brief Base class for interaction volumes of mpfa methods. Defines the interface.
+ * \brief Base class for interaction volumes of mpfa methods.
*/
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_INTERACTIONVOLUMEBASE_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_INTERACTIONVOLUMEBASE_HH
+#include <dune/common/dynmatrix.hh>
+
#include <dumux/discretization/cellcentered/mpfa/methods.hh>
+#include <dumux/discretization/cellcentered/mpfa/interactionvolumedatahandle.hh>
+#include <dumux/discretization/cellcentered/mpfa/dualgridindexset.hh>
namespace Dumux
{
-//! Base class for the interaction volume traits
+
+/*!
+ * \ingroup Mpfa
+ * \brief Base class for the interaction volume traits. The types stated here
+ * have to be defined in interaction volume traits. It is recommended
+ * that different implementations inherit from this class and overwrite the
+ * desired types or publicly state the typedef of this base class.
+ */
template<class TypeTag>
class CCMpfaInteractionVolumeTraitsBase
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
static const int dim = GridView::dimension;
static const int dimWorld = GridView::dimensionworld;
@@ -40,96 +52,168 @@ class CCMpfaInteractionVolumeTraitsBase
public:
using LocalIndexType = std::uint8_t;
- using LocalIndexSet = std::vector<LocalIndexType>;
- using GlobalIndexType = typename GridView::IndexSet::IndexType;
- using GlobalIndexSet = std::vector<GlobalIndexType>;
+
+ //! The dynamic types are used e.g. by the mpfa-o method.
+ //! To be compatible with schemes using both dynamic and static
+ //! array types (e.g. L-method using mpfa-o interaction volumes
+ //! on the boudaries), other classes interacting with the interaction
+ //! volumes (e.g. flux vars cache) export the dynamic types. If your
+ //! scheme is fully static on the entire grid, overwrite these traits.
+ using DynamicLocalIndexContainer = std::vector<LocalIndexType>;
+ using DynamicGlobalIndexContainer = std::vector<typename GridView::IndexSet::IndexType>;
+ using DynamicMatrix = Dune::DynamicMatrix<Scalar>;
+ using DynamicVector = typename DynamicMatrix::row_type;
+
+ //! The data handle type. Uses the dynamic types as well per default...
+ using DataHandle = InteractionVolumeDataHandle<TypeTag>;
+
+ using ScvfVector = std::array<const SubControlVolumeFace*, dim>;
+ using ScvBasis = std::array<GlobalPosition, dim>;
//! for network grids this means that we assume the tensors
//! to be given in world coordinates! If a transformation of
//! given data has to be performed, it has to be done in the
- //! spatial parameters method where the permeability is returned
+ //! spatial parameters method where the tensor is returned or
+ //! in the volume variables where it is stored
using Tensor = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
};
/*!
* \ingroup Mpfa
- * \brief Base class for the interaction volumes of mpfa methods.
- * It defines the interface. Actual implementations should derive from this class.
+ * \brief Base class for the interaction volumes of mpfa methods. It defines
+ * the interface and actual implementations should derive from this class.
*/
-template<class TypeTag, typename Traits>
+template<class TypeTag, typename T>
class CCMpfaInteractionVolumeBase
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using DualGridNodalIndexSet = typename CCMpfaDualGridIndexSet<TypeTag>::NodalIndexSet;
+
+ using DataHandle = typename T::DataHandle;
+ using IndexSet = typename T::IndexSet;
+ using LocalIndexContainer = typename T::DynamicLocalIndexContainer;
+ using LocalIndexType = typename LocalIndexContainer::value_type;
+ using GlobalIndexContainer = typename T::DynamicGlobalIndexContainer;
+ using GlobalIndexType = typename GlobalIndexContainer::value_type;
+
+ static const int dim = GridView::dimension;
+ static const int dimWorld = GridView::dimensionworld;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
- // some types to be exported
- using BoundaryInteractionVolume = typename Traits::BoundaryInteractionVolume;
- using LocalIndexType = typename Traits::LocalIndexType;
- using LocalIndexSet = typename Traits::LocalIndexSet;
- using GlobalIndexType = typename Traits::GlobalIndexType;
- using GlobalIndexSet = typename Traits::GlobalIndexSet;
- using Vector = typename Traits::Vector;
- using PositionVector = typename Traits::PositionVector;
- using Seed = typename Traits::Seed;
-
- struct LocalFaceData
+ // state the traits type publicly
+ using Traits = T;
+
+ class LocalFaceData
{
- LocalIndexType localScvfIndex;
- LocalIndexType localScvIndex;
- bool isOutside;
-
- //! default constructor
- LocalFaceData() = default;
-
- //! Constructor fully initializing the members
- LocalFaceData(const LocalIndexType faceIndex,
- const LocalIndexType scvIndex,
- bool isOut)
- : localScvfIndex(faceIndex),
- localScvIndex(scvIndex),
- isOutside(isOut) {}
+ LocalIndexType ivLocalScvfIndex_; //! the iv-local scvf index this scvf maps to
+ LocalIndexType ivLocalInsideScvIndex_; //! the iv-local index of the scvfs' inside scv
+ LocalIndexType ivLocalOutsideScvfIndex_; //! the index of this scvf in the iv-local outside faces
+ LocalIndexType scvfLocalOutsideScvfIndex_; //! the index of this scvf in the scvf-local outside faces
+ GlobalIndexType globalScvfIndex_; //! the index of the corresponding global scvf
+ bool isOutside_; //! indicates if this face maps to the iv-local index from "outside"
+
+ public:
+ //! Constructor for "inside" faces
+ explicit LocalFaceData(LocalIndexType faceIndex,
+ LocalIndexType scvIndex,
+ GlobalIndexType globalScvfIndex)
+ : ivLocalScvfIndex_(faceIndex),
+ ivLocalInsideScvIndex_(scvIndex),
+ globalScvfIndex_(globalScvfIndex),
+ isOutside_(false) {}
+
+ //! Constructor for "outside" faces
+ explicit LocalFaceData(LocalIndexType faceIndex,
+ LocalIndexType scvIndex,
+ LocalIndexType indexInIvOutsideFaces,
+ LocalIndexType indexInScvfOutsideFaces,
+ GlobalIndexType globalScvfIndex)
+ : ivLocalScvfIndex_(faceIndex),
+ ivLocalInsideScvIndex_(scvIndex),
+ ivLocalOutsideScvfIndex_(indexInIvOutsideFaces),
+ scvfLocalOutsideScvfIndex_(indexInScvfOutsideFaces),
+ globalScvfIndex_(globalScvfIndex),
+ isOutside_(true) {}
+
+ //! The index of the scvf within the inside faces
+ LocalIndexType ivLocalScvfIndex() const { return ivLocalScvfIndex_; }
+ LocalIndexType ivLocalInsideScvIndex() const { return ivLocalInsideScvIndex_; }
+ LocalIndexType ivLocalOutsideScvfIndex() const { assert(isOutside_); return ivLocalOutsideScvfIndex_; }
+ LocalIndexType scvfLocalOutsideScvfIndex() const { assert(isOutside_); return scvfLocalOutsideScvfIndex_; }
+ GlobalIndexType globalScvfIndex() const { return globalScvfIndex_; }
+ bool isOutside() const { return isOutside_; }
};
- using GlobalLocalFaceDataPair = std::pair<const SubControlVolumeFace*, LocalFaceData>;
+ struct DirichletData
+ {
+ GlobalIndexType volVarIndex_;
+ GlobalPosition ipGlobal_;
- //! solves the local equation system for the computation of the transmissibilities
- template<typename GetTensorFunction>
- void solveLocalSystem(const GetTensorFunction& getTensor)
- { DUNE_THROW(Dune::NotImplemented, "Actual interaction volume implementation does not provide a solveLocalSystem() method."); }
+ public:
+ explicit DirichletData(const GlobalIndexType index, const GlobalPosition& ip)
+ : volVarIndex_(index)
+ , ipGlobal_(ip)
+ {}
- //! returns the indices of the volvars in the stencil of the interaction volume
- const GlobalIndexSet& volVarsStencil() const
- { DUNE_THROW(Dune::NotImplemented, "Actual interaction volume implementation does not provide a volVarsStencil() method."); }
+ const GlobalPosition& ipGlobal() const { return ipGlobal_; }
+ GlobalIndexType volVarIndex() const { return volVarIndex_; }
+ };
- //! returns the positions corresponding to the volvars in the stencil of the interaction volume (cell centers or scvf.ipGlobal() on boundary)
- const PositionVector& volVarsPositions() const
- { DUNE_THROW(Dune::NotImplemented, "Actual interaction volume implementation does not provide a volVarsPositions() method."); }
+ using DirichletDataContainer = std::vector<DirichletData>;
+ using LocalFaceDataContainer = std::vector<LocalFaceData>;
- //! returns the local index of an scvf in the IV and a boolean whether or not it is on the negative side of the local scvf (flux has to be inverted)
- LocalFaceData getLocalFaceData(const SubControlVolumeFace& scvf) const
- { DUNE_THROW(Dune::NotImplemented, "Actual interaction volume implementation does not provide a getLocalFaceData() method."); }
+ //! Sets up the local scope (geometries etc) for a given iv index set!
+ void setUpLocalScope(const IndexSet& indexSet,
+ const Problem& problem,
+ const FVElementGeometry& fvGeometry)
+ { DUNE_THROW(Dune::NotImplemented, "Interaction volume implementation does not provide a setUpLocalScope() method."); }
- //! returns the transmissibilities corresponding to a local scvf
- Vector getTransmissibilities(const LocalFaceData& localFaceData) const
- { DUNE_THROW(Dune::NotImplemented, "Actual interaction volume implementation does not provide a getTransmissibilities() method."); }
+ //! sets the sizes of the corresponding matrices in the data handle
+ void prepareDataHandle(DataHandle& dataHandle)
+ { DUNE_THROW(Dune::NotImplemented, "Interaction volume implementation does not provide a prepareDataHandle() method."); }
- //! returns the neumann flux corresponding to a local scvf
- Scalar getNeumannFlux(const LocalFaceData& localFaceData, unsigned int eqIdx) const
- { DUNE_THROW(Dune::NotImplemented, "Actual interaction volume implementation does not provide a getNeumannFlux() method."); }
+ //! solves for the transmissibilities subject to a given tensor
+ template<typename GetTensorFunction>
+ void solveLocalSystem(const GetTensorFunction& getTensor,
+ const Problem& problem,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ DataHandle& dataHandle)
+ { DUNE_THROW(Dune::NotImplemented, "Interaction volume implementation does not provide a solveLocalSystem() method."); }
- //! returns the local index in a vector for a given global index
- template<typename IdxType1, typename IdxType2>
- LocalIndexType findIndexInVector(const std::vector<IdxType1>& vector, const IdxType2 globalIdx) const
- {
- auto it = std::find(vector.begin(), vector.end(), globalIdx);
- assert(it != vector.end() && "could not find local index in the vector for the given global index!");
- return std::distance(vector.begin(), it);
- }
-
- //! returns GlobalLocalFaceDataPair objects for the scvfs involved in this interaction volume
- const std::vector<GlobalLocalFaceDataPair>& globalLocalScvfPairedData() const
- { DUNE_THROW(Dune::NotImplemented, "Actual interaction volume implementation does not provide a globalLocalScvfPairedData() method."); }
+ //! obtain the local data object for a given global scvf
+ const LocalFaceData& getLocalFaceData(const SubControlVolumeFace& scvf) const
+ { DUNE_THROW(Dune::NotImplemented, "Interaction volume implementation does not provide a getLocalFaceData() method."); }
+
+ //!returns a reference to the container with the local face data
+ const LocalFaceDataContainer& localFaceData() const
+ { DUNE_THROW(Dune::NotImplemented, "Interaction volume implementation does not provide a localFaceData() method."); }
+
+ //! returns a reference to the container with the data on Dirichlet boundaries
+ const DirichletDataContainer& dirichletData() const
+ { DUNE_THROW(Dune::NotImplemented, "Interaction volume implementation does not provide a dirichletData() method."); }
+
+ //! returns the indices of the volvars in the stencil of the interaction volume
+ const GlobalIndexContainer& volVarsStencil() const
+ { DUNE_THROW(Dune::NotImplemented, "Interaction volume implementation does not provide a volVarsStencil() method."); }
+
+ //! returns the number of interaction volumes living around a vertex
+ static std::size_t numInteractionVolumesAtVertex(const DualGridNodalIndexSet& nodalIndexSet)
+ { DUNE_THROW(Dune::NotImplemented, "Interaction volume implementation does not provide a numInteractionVolumesAtVertex() method."); }
+
+ //! adds the iv index sets living around a vertex to a given container
+ //! and stores the the corresponding index in a map for each scvf
+ template<class IvIndexSetContainer, class ScvfIndexMap>
+ static void addInteractionVolumeIndexSets(IvIndexSetContainer& ivIndexSetContainer,
+ ScvfIndexMap& scvfIndexMap,
+ const DualGridNodalIndexSet& nodalIndexSet)
+ { DUNE_THROW(Dune::NotImplemented, "Interaction volume implementation does not provide a numInteractionVolumesAtVertex() method."); }
};
} // end namespace
diff --git a/dumux/discretization/cellcentered/mpfa/interactionvolumedatahandle.hh b/dumux/discretization/cellcentered/mpfa/interactionvolumedatahandle.hh
new file mode 100644
index 0000000000000000000000000000000000000000..2b5d2385084893a369d1eac450fd623983458acd
--- /dev/null
+++ b/dumux/discretization/cellcentered/mpfa/interactionvolumedatahandle.hh
@@ -0,0 +1,435 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Data handle class for interaction volumes of mpfa methods.
+ * This class is passed to interaction volumes to store the necessary data in it.
+ */
+#ifndef DUMUX_DISCRETIZATION_CC_MPFA_INTERACTIONVOLUMEDATAHANDLE_HH
+#define DUMUX_DISCRETIZATION_CC_MPFA_INTERACTIONVOLUMEDATAHANDLE_HH
+
+namespace Dumux
+{
+ //! Empty data handle class
+ template<class TypeTag>
+ class EmptyDataHandle
+ {
+ //! we use the dynamic types here to be compatible on the boundary
+ using InteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using DirichletDataContainer = typename InteractionVolume::DirichletDataContainer;
+ using GlobalIndexContainer = typename InteractionVolume::Traits::DynamicGlobalIndexContainer;
+ using Matrix = typename InteractionVolume::Traits::DynamicMatrix;
+ using Vector = typename InteractionVolume::Traits::DynamicVector;
+
+ public:
+ //! diffusion caches need to set phase and component index
+ void setDiffusionContext(unsigned int phaseIdx, unsigned int compIdx) {}
+
+ //! functions to set the size of the matrices
+ void resizeT(unsigned int n, unsigned int m) {}
+ void resizeAB(unsigned int n, unsigned int m) {}
+ void resizeOutsideTij(unsigned int n, unsigned int m) {}
+
+ //! functions to set the pointers to stencil and Dirichlet data
+ void setVolVarsStencilPointer(const GlobalIndexContainer& stencil) {}
+ void setDirichletDataPointer(const DirichletDataContainer& data) {}
+
+ //! return functions for the stored data
+ const GlobalIndexContainer& volVarsStencil() const { return throw_<const GlobalIndexContainer&>(); }
+ const DirichletDataContainer& dirichletData() const { return throw_<DirichletDataContainer&>(); }
+
+ const Matrix& T() const { return throw_<const Matrix&>(); }
+ Matrix& T() { return throw_<Matrix&>(); }
+
+ const Matrix& AB() const { return throw_<const Matrix&>(); }
+ Matrix& AB() { return throw_<Matrix&>(); }
+
+ const Matrix& outsideTij() const { return throw_<const Matrix&>(); }
+ Matrix& outsideTij() { return throw_<Matrix&>(); }
+
+ private:
+ template<class ReturnType>
+ ReturnType throw_() const { DUNE_THROW(Dune::InvalidStateException, "Trying to access data for a deactivated physical process"); }
+ };
+
+ //! Data handle for quantities related to advection
+ template<class TypeTag, bool EnableAdvection>
+ class AdvectionDataHandle
+ {
+ //! we use the dynamic types here to be compatible on the boundary
+ using InteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using DirichletDataContainer = typename InteractionVolume::DirichletDataContainer;
+ using GlobalIndexContainer = typename InteractionVolume::Traits::DynamicGlobalIndexContainer;
+ using Matrix = typename InteractionVolume::Traits::DynamicMatrix;
+ using Vector = typename InteractionVolume::Traits::DynamicVector;
+
+ public:
+ //! functions to set the size of the matrices
+ void resizeT(unsigned int n, unsigned int m) { advectionT_.resize(n, m); }
+ void resizeAB(unsigned int n, unsigned int m) { advectionAB_.resize(n, m); }
+ void resizeOutsideTij(unsigned int n, unsigned int m) { advectionTout_.resize(n, m); }
+
+ //! functions to set the pointers to stencil and Dirichlet data
+ void setVolVarsStencilPointer(const GlobalIndexContainer& stencil) { advectionVolVarsStencil_ = &stencil; }
+ void setDirichletDataPointer(const DirichletDataContainer& data) { advectionDirichletData_ = &data; }
+
+ //! return functions for the stored data
+ const GlobalIndexContainer& volVarsStencil() const { return *advectionVolVarsStencil_; }
+ const DirichletDataContainer& dirichletData() const { return *advectionDirichletData_; }
+
+ const Matrix& T() const { return advectionT_; }
+ Matrix& T() { return advectionT_; }
+
+ const Matrix& AB() const { return advectionAB_; }
+ Matrix& AB() { return advectionAB_; }
+
+ const Matrix& outsideTij() const { return advectionTout_; }
+ Matrix& outsideTij() { return advectionTout_; }
+
+ private:
+ // advection-related variables
+ const GlobalIndexContainer* advectionVolVarsStencil_; //! Pointer to the global volvar indices (stored in the interaction volume)
+ const DirichletDataContainer* advectionDirichletData_; //! Pointer to the container with dirichlet data of the iv
+ Matrix advectionT_; //! The transmissibilities
+ Matrix advectionAB_; //! Coefficients for gradient reconstruction
+ Matrix advectionTout_; //! The transmissibilities associated with "outside" faces (only necessary on surface grids)
+ };
+
+ //! Data handle for quantities related to diffusion
+ template<class TypeTag, bool EnableDiffusion>
+ class DiffusionDataHandle
+ {
+ //! we use the dynamic types here to be compatible on the boundary
+ using InteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using DirichletDataContainer = typename InteractionVolume::DirichletDataContainer;
+ using GlobalIndexContainer = typename InteractionVolume::Traits::DynamicGlobalIndexContainer;
+ using Matrix = typename InteractionVolume::Traits::DynamicMatrix;
+ using Vector = typename InteractionVolume::Traits::DynamicVector;
+
+ static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
+ static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents);
+
+ public:
+ //! diffusion caches need to set phase and component index
+ void setDiffusionContext(unsigned int phaseIdx, unsigned int compIdx)
+ {
+ contextPhaseIdx_ = phaseIdx;
+ contextCompIdx_ = compIdx;
+ }
+
+ //! functions to set the size of the matrices
+ void resizeT(unsigned int n, unsigned int m)
+ {
+ for (auto& array : diffusionT_)
+ for (auto& matrix : array)
+ matrix.resize(n, m);
+ }
+
+ void resizeAB(unsigned int n, unsigned int m)
+ {
+ for (auto& array : diffusionAB_)
+ for (auto& matrix : array)
+ matrix.resize(n, m);
+ }
+
+ void resizeOutsideTij(unsigned int n, unsigned int m)
+ {
+ for (auto& array : diffusionTout_)
+ for (auto& matrix : array)
+ matrix.resize(n, m);
+ }
+
+ //! functions to set the pointers to stencil and Dirichlet data
+ void setVolVarsStencilPointer(const GlobalIndexContainer& stencil)
+ {
+ diffusionVolVarsStencil_[contextPhaseIdx_][contextCompIdx_] = &stencil;
+ }
+
+ void setDirichletDataPointer(const DirichletDataContainer& data)
+ {
+ diffusionDirichletData_[contextPhaseIdx_][contextCompIdx_] = &data;
+ }
+
+ //! return functions for the stored data
+ const GlobalIndexContainer& volVarsStencil() const
+ { return *diffusionVolVarsStencil_[contextPhaseIdx_][contextCompIdx_]; }
+
+ const DirichletDataContainer& dirichletData() const
+ { return *diffusionDirichletData_[contextPhaseIdx_][contextCompIdx_]; }
+
+ const Matrix& T() const { return diffusionT_[contextPhaseIdx_][contextCompIdx_]; }
+ Matrix& T() { return diffusionT_[contextPhaseIdx_][contextCompIdx_]; }
+
+ const Matrix& AB() const { return diffusionAB_[contextPhaseIdx_][contextCompIdx_]; }
+ Matrix& AB() { return diffusionAB_[contextPhaseIdx_][contextCompIdx_]; }
+
+ const Matrix& outsideTij() const { return diffusionTout_[contextPhaseIdx_][contextCompIdx_]; }
+ Matrix& outsideTij() { return diffusionTout_[contextPhaseIdx_][contextCompIdx_]; }
+
+ private:
+ // diffusion-related variables (see comments in AdvectionDataHandle)
+ unsigned int contextPhaseIdx_; //! The phase index set for the context
+ unsigned int contextCompIdx_; //! The component index set for the context
+ std::array<std::array<const GlobalIndexContainer*, numComponents>, numPhases> diffusionVolVarsStencil_;
+ std::array<std::array<const DirichletDataContainer*, numComponents>, numPhases> diffusionDirichletData_;
+ std::array<std::array<Matrix, numComponents>, numPhases> diffusionT_;
+ std::array<std::array<Matrix, numComponents>, numPhases> diffusionAB_;
+ std::array<std::array<Matrix, numComponents>, numPhases> diffusionTout_;
+ };
+
+ //! Data handle for quantities related to advection
+ template<class TypeTag, bool EnableHeatConduction>
+ class HeatConductionDataHandle
+ {
+ //! we use the dynamic types here to be compatible on the boundary
+ using InteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using DirichletDataContainer = typename InteractionVolume::DirichletDataContainer;
+ using GlobalIndexContainer = typename InteractionVolume::Traits::DynamicGlobalIndexContainer;
+ using Matrix = typename InteractionVolume::Traits::DynamicMatrix;
+ using Vector = typename InteractionVolume::Traits::DynamicVector;
+
+ public:
+ //! functions to set the size of the matrices
+ void resizeT(unsigned int n, unsigned int m) { heatConductionT_.resize(n, m); }
+ void resizeAB(unsigned int n, unsigned int m) { heatConductionAB_.resize(n, m); }
+ void resizeOutsideTij(unsigned int n, unsigned int m) { heatConductionTout_.resize(n, m); }
+
+ //! functions to set the pointers to stencil and Dirichlet data
+ void setVolVarsStencilPointer(const GlobalIndexContainer& stencil) { heatConductionVolVarsStencil_ = &stencil; }
+ void setDirichletDataPointer(const DirichletDataContainer& data) { heatConductionDirichletData_ = &data; }
+
+ //! return functions for the stored data
+ const GlobalIndexContainer& volVarsStencil() const { return *heatConductionVolVarsStencil_; }
+ const DirichletDataContainer& dirichletData() const { return *heatConductionDirichletData_; }
+
+ const Matrix& T() const { return heatConductionT_; }
+ Matrix& T() { return heatConductionT_; }
+
+ const Matrix& AB() const { return heatConductionAB_; }
+ Matrix& AB() { return heatConductionAB_; }
+
+ const Matrix& outsideTij() const { return heatConductionTout_; }
+ Matrix& outsideTij() { return heatConductionTout_; }
+
+ private:
+ // heat conduction-related variables
+ const GlobalIndexContainer* heatConductionVolVarsStencil_; //! Pointer to the global volvar indices (stored in the interaction volume)
+ const DirichletDataContainer* heatConductionDirichletData_; //! Pointer to the container with dirichlet data of the iv
+ Matrix heatConductionT_; //! The transmissibilities
+ Matrix heatConductionAB_; //! Coefficients for gradient reconstruction
+ Matrix heatConductionTout_; //! The transmissibilities associated with "outside" faces (only necessary on surface grids)
+ };
+
+ //! Process-dependet data handle when related process is disabled
+ template<class TypeTag> class AdvectionDataHandle<TypeTag, false> : public EmptyDataHandle<TypeTag> {};
+ template<class TypeTag> class DiffusionDataHandle<TypeTag, false> : public EmptyDataHandle<TypeTag> {};
+ template<class TypeTag> class HeatConductionDataHandle<TypeTag, false> : public EmptyDataHandle<TypeTag> {};
+
+ //! Interaction volume data handle class
+ template<class TypeTag>
+ class InteractionVolumeDataHandle : public AdvectionDataHandle<TypeTag, GET_PROP_VALUE(TypeTag, EnableAdvection)>,
+ public DiffusionDataHandle<TypeTag, GET_PROP_VALUE(TypeTag, EnableMolecularDiffusion)>,
+ public HeatConductionDataHandle<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>
+ {
+ using AdvectionHandle = AdvectionDataHandle<TypeTag, GET_PROP_VALUE(TypeTag, EnableAdvection)>;
+ using DiffusionHandle = DiffusionDataHandle<TypeTag, GET_PROP_VALUE(TypeTag, EnableMolecularDiffusion)>;
+ using HeatConductionHandle = HeatConductionDataHandle<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>;
+
+ //! we use the dynamic types here to be compatible on the boundary
+ using InteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using DirichletDataContainer = typename InteractionVolume::DirichletDataContainer;
+ using GlobalIndexContainer = typename InteractionVolume::Traits::DynamicGlobalIndexContainer;
+ using Matrix = typename InteractionVolume::Traits::DynamicMatrix;
+ using Vector = typename InteractionVolume::Traits::DynamicVector;
+
+ public:
+ enum class Contexts : unsigned int
+ {
+ undefined,
+ advection,
+ diffusion,
+ heatConduction
+ };
+
+ //! The constructor
+ InteractionVolumeDataHandle() : context_(Contexts::undefined) {}
+
+ //! set the context of the cache
+ void setAdvectionContext() { context_ = Contexts::advection; }
+ void setHeatConductionContext() { context_ = Contexts::heatConduction; }
+ void setDiffusionContext(unsigned int phaseIdx, unsigned int compIdx)
+ {
+ context_ = Contexts::diffusion;
+ DiffusionHandle::setDiffusionContext(phaseIdx, compIdx);
+ }
+
+ //! returns the current context
+ Contexts getContext() const { return context_; }
+
+ //! functions to set the size of the matrices
+ void resizeT(unsigned int n, unsigned int m)
+ {
+ AdvectionHandle::resizeT(n, m);
+ DiffusionHandle::resizeT(n, m);
+ HeatConductionHandle::resizeT(n, m);
+ }
+
+ void resizeAB(unsigned int n, unsigned int m)
+ {
+ AdvectionHandle::resizeAB(n, m);
+ DiffusionHandle::resizeAB(n, m);
+ HeatConductionHandle::resizeAB(n, m);
+ }
+
+ void resizeOutsideTij(unsigned int n, unsigned int m)
+ {
+ AdvectionHandle::resizeOutsideTij(n, m);
+ DiffusionHandle::resizeOutsideTij(n, m);
+ HeatConductionHandle::resizeOutsideTij(n, m);
+ }
+
+ //! functions to set the pointers to stencil and Dirichlet data
+ void setVolVarsStencilPointer(const GlobalIndexContainer& stencil)
+ {
+ if (context_ == Contexts::advection)
+ AdvectionHandle::setVolVarsStencilPointer(stencil);
+ else if (context_ == Contexts::diffusion)
+ DiffusionHandle::setVolVarsStencilPointer(stencil);
+ else if (context_ == Contexts::heatConduction)
+ HeatConductionHandle::setVolVarsStencilPointer(stencil);
+ else
+ DUNE_THROW(Dune::InvalidStateException, "No valid context set!");
+ }
+
+ void setDirichletDataPointer(const DirichletDataContainer& data)
+ {
+ if (context_ == Contexts::advection)
+ AdvectionHandle::setDirichletDataPointer(data);
+ else if (context_ == Contexts::diffusion)
+ DiffusionHandle::setDirichletDataPointer(data);
+ else if (context_ == Contexts::heatConduction)
+ HeatConductionHandle::setDirichletDataPointer(data);
+ else
+ DUNE_THROW(Dune::InvalidStateException, "No valid context set!");
+ }
+
+ //! return functions for the stored data
+ const GlobalIndexContainer& volVarsStencil() const
+ {
+ if (context_ == Contexts::advection)
+ return AdvectionHandle::volVarsStencil();
+ else if (context_ == Contexts::diffusion)
+ return DiffusionHandle::volVarsStencil();
+ else if (context_ == Contexts::heatConduction)
+ return HeatConductionHandle::volVarsStencil();
+ else
+ DUNE_THROW(Dune::InvalidStateException, "No valid context set!");
+ }
+
+ const DirichletDataContainer& dirichletData() const
+ {
+ if (context_ == Contexts::advection)
+ return AdvectionHandle::dirichletData();
+ else if (context_ == Contexts::diffusion)
+ return DiffusionHandle::dirichletData();
+ else if (context_ == Contexts::heatConduction)
+ return HeatConductionHandle::dirichletData();
+ else
+ DUNE_THROW(Dune::InvalidStateException, "No valid context set!");
+ }
+
+ const Matrix& T() const
+ {
+ if (context_ == Contexts::advection)
+ return AdvectionHandle::T();
+ else if (context_ == Contexts::diffusion)
+ return DiffusionHandle::T();
+ else if (context_ == Contexts::heatConduction)
+ return HeatConductionHandle::T();
+ else
+ DUNE_THROW(Dune::InvalidStateException, "No valid context set!");
+ }
+
+ Matrix& T()
+ {
+ if (context_ == Contexts::advection)
+ return AdvectionHandle::T();
+ else if (context_ == Contexts::diffusion)
+ return DiffusionHandle::T();
+ else if (context_ == Contexts::heatConduction)
+ return HeatConductionHandle::T();
+ else
+ DUNE_THROW(Dune::InvalidStateException, "No valid context set!");
+ }
+
+ const Matrix& AB() const
+ {
+ if (context_ == Contexts::advection)
+ return AdvectionHandle::AB();
+ else if (context_ == Contexts::diffusion)
+ return DiffusionHandle::AB();
+ else if (context_ == Contexts::heatConduction)
+ return HeatConductionHandle::AB();
+ else
+ DUNE_THROW(Dune::InvalidStateException, "No valid context set!");
+ }
+
+ Matrix& AB()
+ {
+ if (context_ == Contexts::advection)
+ return AdvectionHandle::AB();
+ else if (context_ == Contexts::diffusion)
+ return DiffusionHandle::AB();
+ else if (context_ == Contexts::heatConduction)
+ return HeatConductionHandle::AB();
+ else
+ DUNE_THROW(Dune::InvalidStateException, "No valid context set!");
+ }
+
+ const Matrix& outsideTij() const
+ {
+ if (context_ == Contexts::advection)
+ return AdvectionHandle::outsideTij();
+ else if (context_ == Contexts::diffusion)
+ return DiffusionHandle::outsideTij();
+ else if (context_ == Contexts::heatConduction)
+ return HeatConductionHandle::outsideTij();
+ else
+ DUNE_THROW(Dune::InvalidStateException, "No valid context set!");
+ }
+
+ Matrix& outsideTij()
+ {
+ if (context_ == Contexts::advection)
+ return AdvectionHandle::outsideTij();
+ else if (context_ == Contexts::diffusion)
+ return DiffusionHandle::outsideTij();
+ else if (context_ == Contexts::heatConduction)
+ return HeatConductionHandle::outsideTij();
+ else
+ DUNE_THROW(Dune::InvalidStateException, "No valid context set!");
+ }
+
+ private:
+ Contexts context_; //! The context variable
+ };
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/discretization/cellcentered/mpfa/interiorboundarydata.hh b/dumux/discretization/cellcentered/mpfa/interiorboundarydata.hh
deleted file mode 100644
index 9e58af0d2c79bb97d7dc678f9d4f2a7a27dd6821..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/interiorboundarydata.hh
+++ /dev/null
@@ -1,114 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief A class to store info on interior boundaries
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_INTERIORBOUNDARYDATA_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_INTERIORBOUNDARYDATA_HH
-
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup CCMpfa
- * \brief Class to store additional data related to interior boundary facets.
- */
-template<class TypeTag>
-class InteriorBoundaryData
-{
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Element = typename GridView::template Codim<0>::Entity;
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
-
- using IndexType = typename GridView::IndexSet::IndexType;
- using LocalIndexType = typename BoundaryInteractionVolume::LocalIndexType;
-
-public:
- //! the constructor
- InteriorBoundaryData(const Problem& problem,
- IndexType elementIndex,
- IndexType scvfIndex,
- LocalIndexType localIndex,
- MpfaFaceTypes faceType)
- : problemPtr_(&problem),
- elementIndex_(elementIndex),
- scvfIndex_(scvfIndex),
- localIndex_(localIndex),
- faceType_(faceType)
- {}
-
- //! returns the global index of the element/scv connected to the interior boundary
- IndexType elementIndex() const
- { return elementIndex_; }
-
- //! returns the global index of the scvf connected to the interior boundary
- IndexType scvfIndex() const
- { return scvfIndex_; }
-
- //! returns the local index i of the scvf within the interaction volume.
- //! This is either:
- //! - the i-th flux face index (interior neumann boundaries)
- //! - the i-th interior dirichlet face (interior dirichlet boundaries)
- LocalIndexType localIndexInInteractionVolume() const
- { return localIndex_; }
-
- //! returns the face type of this scvf
- MpfaFaceTypes faceType() const
- { return faceType_; }
-
- //! returns the volume variables for interior dirichlet boundaries
- VolumeVariables facetVolVars(const FVElementGeometry& fvGeometry) const
- {
- //! This can only be called for interior Dirichlet boundaries
- assert(faceType_ == MpfaFaceTypes::interiorDirichlet && "requesting Dirichlet vol vars for a face which is"
- "not marked as interior Dirichlet face.");
-
- const auto& scvf = fvGeometry.scvf(scvfIndex());
- const auto element = problem_().model().fvGridGeometry().element(scvf.insideScvIdx());
- const auto priVars = problem_().dirichlet(element, scvf);
-
- VolumeVariables volVars;
- volVars.update(ElementSolutionVector({priVars}),
- problem_(),
- element,
- fvGeometry.scv(elementIndex()));
-
- return volVars;
- }
-
-private:
- const Problem& problem_() const
- { return *problemPtr_; }
-
- const Problem* problemPtr_;
-
- IndexType elementIndex_;
- IndexType scvfIndex_;
- LocalIndexType localIndex_;
- MpfaFaceTypes faceType_;
-};
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/lmethod/globalinteractionvolumeseeds.hh b/dumux/discretization/cellcentered/mpfa/lmethod/globalinteractionvolumeseeds.hh
deleted file mode 100644
index eef54c3ccdf0303b899a9d45a4739e991bb57380..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/lmethod/globalinteractionvolumeseeds.hh
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for the global interaction volume seeds of mpfa methods.
- */
-#ifndef DUMUX_DISCRETIZATION_MPFA_L_GLOBALINTERACTIONVOLUMESEEDS_HH
-#define DUMUX_DISCRETIZATION_MPFA_L_GLOBALINTERACTIONVOLUMESEEDS_HH
-
-#include <dumux/discretization/cellcentered/mpfa/globalinteractionvolumeseedsbase.hh>
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup Mpfa
- * \brief Specialization of the class for the mpfa-l method.
- */
-template<class TypeTag>
-class CCMpfaGlobalInteractionVolumeSeedsImplementation<TypeTag, MpfaMethods::lMethod>
- : public CCMpfaGlobalInteractionVolumeSeedsBase<TypeTag>
-{
- using ParentType = CCMpfaGlobalInteractionVolumeSeedsBase<TypeTag>;
-
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Helper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
-
- using IndexType = typename InteractionVolume::GlobalIndexSet::value_type;
- using Element = typename GridView::template Codim<0>::Entity;
-
-public:
- CCMpfaGlobalInteractionVolumeSeedsImplementation(const GridView& gridView) : ParentType(gridView) {}
-
- template<typename SeedVector, typename BoundarySeedVector>
- void initializeSeeds(const std::vector<bool>& interiorOrDomainBoundaryVertices,
- std::vector<IndexType>& scvfIndexMap,
- SeedVector& seeds,
- BoundarySeedVector& boundarySeeds)
- {
- seeds.clear();
- boundarySeeds.clear();
- scvfIndexMap.clear();
-
- // reserve memory
- const auto numScvf = this->problem().model().fvGridGeometry().numScvf();
- const auto numIBScvf = this->problem().model().fvGridGeometry().numInteriorBoundaryScvf();
- const auto numDBScvf = this->problem().model().fvGridGeometry().numDomainBoundaryScvf();
- const auto numBPScvf = this->problem().model().fvGridGeometry().numBranchingPointScvf();
-
- const int numLMethodIVs = (numScvf-numIBScvf-numDBScvf-numBPScvf)/2;
- const auto numOMethodIVs = this->problem().model().fvGridGeometry().numInteriorOrDomainBoundaryVertices()
- + this->problem().model().fvGridGeometry().numBranchingPointVertices();
-
- if (numLMethodIVs > 0)
- seeds.reserve( numLMethodIVs );
- boundarySeeds.reserve(numOMethodIVs);
- scvfIndexMap.resize(numScvf);
-
- // Keep track of which faces have been handled already
- std::vector<bool> isFaceHandled(numScvf, false);
-
- IndexType boundarySeedIndex = 0;
- IndexType seedIndex = 0;
- for (const auto& element : elements(this->gridView()))
- {
- auto fvGeometry = localView(this->problem().model().fvGridGeometry());
- fvGeometry.bindElement(element);
-
- for (auto&& scvf : scvfs(fvGeometry))
- {
- // skip the rest if we already handled this face
- if (isFaceHandled[scvf.index()])
- continue;
-
- // make boundary interaction volume seeds (o-method seeds) on:
- // - interior boundaries
- // - domain boundaries
- // - branching points (l-method can not handle this)
- if (interiorOrDomainBoundaryVertices[scvf.vertexIndex()]
- || this->problem().model().fvGridGeometry().touchesBranchingPoint(scvf))
- {
- // make the boundary interaction volume seed
- boundarySeeds.emplace_back(Helper::makeBoundaryInteractionVolumeSeed(this->problem(),
- element,
- fvGeometry,
- scvf));
-
- // update the index map entries for the global scv faces in the interaction volume
- for (auto scvfIdxGlobal : boundarySeeds.back().globalScvfIndices())
- {
- scvfIndexMap[scvfIdxGlobal] = boundarySeedIndex;
- isFaceHandled[scvfIdxGlobal] = true;
- }
-
- // increment counter
- boundarySeedIndex++;
- }
- else
- {
- // make the inner interaction volume seed only if we are on highest level of all connected elements
- if (isLocalMaxLevel_(element, scvf))
- {
- seeds.emplace_back(Helper::makeInnerInteractionVolumeSeed(this->problem(),
- element,
- fvGeometry,
- scvf));
-
- // update the index map entries for the global scv faces in the interaction volume
- for (auto scvfIdxGlobal : seeds.back().globalScvfIndices())
- {
- scvfIndexMap[scvfIdxGlobal] = seedIndex;
- isFaceHandled[scvfIdxGlobal] = true;
- }
-
- // increment counter
- seedIndex++;
- }
- }
- }
- }
- }
-
- bool isLocalMaxLevel_(const Element& element, const SubControlVolumeFace& scvf) const
- { return this->problem().model().fvGridGeometry().element(scvf.outsideScvIdx()).level() <= element.level(); }
-};
-
-} // end namespace
-
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/lmethod/helper.hh b/dumux/discretization/cellcentered/mpfa/lmethod/helper.hh
deleted file mode 100644
index d7e03105ce05134cf78b10a91900a3041f37580d..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/lmethod/helper.hh
+++ /dev/null
@@ -1,244 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Helper class to get the required information on an interaction volume.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_L_HELPER_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_L_HELPER_HH
-
-#include <dumux/common/math.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-
-#include "localsubcontrolentityseeds.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup Mpfa
- * \brief Helper class to get the required information on an interaction volume.
- * Specialization for the Mpfa-L method in two dimensions.
- */
-template<class TypeTag>
-class MpfaMethodHelper<TypeTag, MpfaMethods::lMethod, /*dim*/2, /*dimWorld*/2>
-{
- using Implementation = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
-
- static const int dim = 2;
- static const int dimWorld = 2;
-
- // The mpfa-o helper class used to construct the boundary interaction volume seeds
- using oMethodHelper = CCMpfaHelperImplementation<TypeTag, MpfaMethods::oMethod, dim, dimWorld>;
-
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
-
- using Element = typename GridView::template Codim<0>::Entity;
-
- using InteractionVolumeSeed = typename InteractionVolume::Seed;
- using ScvSeed = typename InteractionVolumeSeed::LocalScvSeed;
- using OuterScvSeed = typename InteractionVolumeSeed::LocalOuterScvSeed;
- using BoundaryInteractionVolumeSeed = typename BoundaryInteractionVolume::Seed;
-
- using GlobalIndexSet = typename InteractionVolume::GlobalIndexSet;
- using GlobalIndexType = typename InteractionVolume::GlobalIndexType;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
- using Matrix = typename InteractionVolume::Matrix;
-public:
- static InteractionVolumeSeed makeInnerInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- {
- std::vector<ScvSeed> scvSeeds;
- std::vector<OuterScvSeed> outerScvSeeds;
- std::vector<GlobalIndexType> globalScvfIndices(2);
-
- // we'll have maximal 2 ScvSeeds and 2 OuterScvSeeds
- scvSeeds.reserve(2);
- outerScvSeeds.reserve(2);
-
- fillEntitySeeds_(scvSeeds, outerScvSeeds, globalScvfIndices, problem, element, fvGeometry, scvf);
-
- // return interaction volume seed
- return InteractionVolumeSeed(std::move(scvSeeds), std::move(outerScvSeeds), std::move(globalScvfIndices));
- }
-
- static BoundaryInteractionVolumeSeed makeBoundaryInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- { return oMethodHelper::makeBoundaryInteractionVolumeSeed(problem, element, fvGeometry, scvf); }
-
- template<class InteractionRegion>
- static LocalIndexType selectionCriterion(const InteractionRegion& I1,
- const InteractionRegion& I2,
- const Matrix& M1,
- const Matrix& M2)
- {
- Scalar t11, t12, t21, t22;
- t11 = M1[I1.contiFaceLocalIdx][0];
- t21 = M2[I2.contiFaceLocalIdx][0];
- if (I1.contiFaceLocalIdx == 0)
- {
- t12 = M1[I1.contiFaceLocalIdx][1];
- t22 = M2[I2.contiFaceLocalIdx][2];
- }
- else
- {
- t12 = M1[I1.contiFaceLocalIdx][2];
- t22 = M2[I2.contiFaceLocalIdx][1];
- }
-
- Scalar s1 = std::abs(t11-t12);
- Scalar s2 = std::abs(t22-t21);
-
- if (s1 < s2)
- return 0;
- else
- return 1;
- }
-
-private:
- static void fillEntitySeeds_(std::vector<ScvSeed>& scvSeeds,
- std::vector<OuterScvSeed>& outerScvSeeds,
- std::vector<GlobalIndexType>& globalScvfIndices,
- const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- {
- // make the first scv seed, we know this element will NOT be on the lowest local level
- const auto scvfVector = Implementation::getScvFacesAtVertex(scvf.vertexIndex(), element, fvGeometry);
- const auto localScvfIdx = Implementation::getLocalFaceIndex(scvf, scvfVector);
- scvSeeds.emplace_back( GlobalIndexSet({scvfVector[0]->index(), scvfVector[1]->index()}),
- scvf.insideScvIdx(),
- localScvfIdx );
-
- // get the surrounding elements and "outside" data
- LocalIndexType otherScvfIdx = 1-localScvfIdx;
- const auto e2 = problem.model().fvGridGeometry().element(scvf.outsideScvIdx());
- const auto e3 = problem.model().fvGridGeometry().element(scvfVector[otherScvfIdx]->outsideScvIdx());
-
- auto e2Geometry = localView(problem.model().fvGridGeometry());
- auto e3Geometry = localView(problem.model().fvGridGeometry());
-
- e2Geometry.bindElement(e2);
- e3Geometry.bindElement(e3);
-
- auto e2Scvfs = Implementation::getCommonAndNextScvFace(scvf, e2Geometry, /*clockwise?*/localScvfIdx == 1);
- auto e3Scvfs = Implementation::getCommonAndNextScvFace(*scvfVector[otherScvfIdx], e3Geometry, /*clockwise?*/localScvfIdx == 0);
-
- // we now know the two faces for which flux calculation will happen using this iv seed
- globalScvfIndices[0] = scvf.index();
- globalScvfIndices[1] = e2Scvfs[otherScvfIdx]->index();
-
- // scv seed for e2, we know the local common scvf index will be otherScvfIdx in 2d
- scvSeeds.emplace_back( GlobalIndexSet({e2Scvfs[0]->index(), e2Scvfs[1]->index()}),
- e2Scvfs[0]->insideScvIdx(),
- otherScvfIdx );
-
- // Outer seed for e3, we know the local common scvf index will be localScvfIdx in 2d
- outerScvSeeds.emplace_back(e3Scvfs[localScvfIdx]->insideScvIdx(),
- e3Scvfs[localScvfIdx]->index());
-
- // Outer seed for outside of e2, we know the local scvf index here will be localScvfIdx in 2d
- const auto e4 = problem.model().fvGridGeometry().element(e2Scvfs[localScvfIdx]->outsideScvIdx());
- auto e4Geometry = localView(problem.model().fvGridGeometry());
- e4Geometry.bindElement(e4);
- const auto e4Scvfs = Implementation::getCommonAndNextScvFace(*e2Scvfs[localScvfIdx], e4Geometry, /*clockwise?*/localScvfIdx == 1);
-
- outerScvSeeds.emplace_back(e4Scvfs[otherScvfIdx]->insideScvIdx(),
- e4Scvfs[otherScvfIdx]->index());
- }
-};
-
-/*!
- * \ingroup Mpfa
- * \brief Helper class to get the required information on an interaction volume.
- * Specialization for the Mpfa-L method for 2d embedded in 3d space.
- */
-template<class TypeTag>
-class MpfaMethodHelper<TypeTag, MpfaMethods::lMethod, /*dim*/2, /*dimWorld*/3>
-{
- using Implementation = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
-
- static const int dim = 2;
- static const int dimWorld = 3;
-
- // The mpfa-o helper class used to construct the boundary interaction volume seeds
- using oMethodHelper = CCMpfaHelperImplementation<TypeTag, MpfaMethods::oMethod, dim, dimWorld>;
-
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
-
- using Element = typename GridView::template Codim<0>::Entity;
-
- using InteractionVolumeSeed = typename InteractionVolume::Seed;
- using BoundaryInteractionVolumeSeed = typename BoundaryInteractionVolume::Seed;
-
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
- using Matrix = typename InteractionVolume::Matrix;
-public:
-
- //! We know that this is only called for scvfs NOT touching:
- //! - branching points
- //! - domain boundaries
- //! - interior boundaries
- //! Thus, here we can use the same algorithm as in the 2d case.
- static InteractionVolumeSeed makeInnerInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- {
- return MpfaMethodHelper<TypeTag, MpfaMethods::lMethod, 2, 2>::makeInnerInteractionVolumeSeed(problem,
- element,
- fvGeometry,
- scvf);
- }
-
- //! Here we simply forward to the o-method helper (we use o-interaction volumes on the boundary)
- static BoundaryInteractionVolumeSeed makeBoundaryInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- { return oMethodHelper::makeBoundaryInteractionVolumeSeed(problem, element, fvGeometry, scvf); }
-
- //! The selection criterion is the same as in the dim = 2 = dimWorld case
- template<class InteractionRegion>
- static LocalIndexType selectionCriterion(const InteractionRegion& I1,
- const InteractionRegion& I2,
- const Matrix& M1,
- const Matrix& M2)
- { return MpfaMethodHelper<TypeTag, MpfaMethods::lMethod, 2, 2>::selectionCriterion(I1, I2, M1, M2); }
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/lmethod/interactionregions.hh b/dumux/discretization/cellcentered/mpfa/lmethod/interactionregions.hh
deleted file mode 100644
index 17380bc1a95bd01334e766af94ce86e5109bbbe2..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/lmethod/interactionregions.hh
+++ /dev/null
@@ -1,146 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base classes for interaction volume of mpfa methods.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_L_INTERACTIONREGIONS_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_L_INTERACTIONREGIONS_HH
-
-namespace Dumux
-{
-/*!
- * \ingroup Mpfa
- * \brief Base class for the interaction regions of the mpfa-l method.
- */
-template<class TypeTag>
-struct InteractionRegion
-{
-private:
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using MpfaHelper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
-
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
-
- using Element = typename GridView::template Codim<0>::Entity;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
- using GlobalIndexType = typename InteractionVolume::GlobalIndexType;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using LocalBasis = std::array<GlobalPosition, dim>;
-
-public:
- LocalIndexType contiFaceLocalIdx;
- std::vector<GlobalIndexType> scvIndices;
- std::vector<GlobalPosition> scvCenters;
- std::vector<GlobalPosition> normal;
- std::vector<GlobalPosition> nu;
- std::vector<Scalar> detX;
- std::vector<Element> elements;
-
- std::array<GlobalIndexType, 2> globalScvfIndices;
-
- // Constructor signature for dim == 2
- template<class ScvSeed, class OuterScvSeed>
- InteractionRegion(const Problem& problem,
- const FVElementGeometry& fvGeometry,
- const ScvSeed& scvSeed,
- const OuterScvSeed& outerSeed1,
- const OuterScvSeed& outerSeed2,
- const Element& element1,
- const Element& element2,
- const Element& element3)
- {
- contiFaceLocalIdx = scvSeed.contiFaceLocalIdx();
- globalScvfIndices[0] = scvSeed.globalScvfIndices()[contiFaceLocalIdx];
- globalScvfIndices[1] = contiFaceLocalIdx == 0 ? outerSeed1.globalScvfIndex() : outerSeed2.globalScvfIndex();
-
- elements.resize(3);
- elements[0] = element1;
- elements[1] = element2;
- elements[2] = element3;
-
- // The participating sub control entities
- const auto& scv1 = fvGeometry.scv(scvSeed.globalIndex());
- const auto& scv2 = fvGeometry.scv(outerSeed1.globalIndex());
- const auto& scv3 = fvGeometry.scv(outerSeed2.globalIndex());
- const auto& scvf1 = fvGeometry.scvf(scvSeed.globalScvfIndices()[0]);
- const auto& scvf2 = fvGeometry.scvf(scvSeed.globalScvfIndices()[1]);
-
- // The necessary coordinates and normals
- GlobalPosition v = scvf1.vertexCorner();
- GlobalPosition f1 = scvf1.facetCorner();
- GlobalPosition f2 = scvf2.facetCorner();
-
- scvCenters.resize(3);
- scvCenters[0] = scv1.center();
- scvCenters[1] = scv2.center();
- scvCenters[2] = scv3.center();
-
- normal.resize(2);
- normal[0] = scvf1.unitOuterNormal();
- normal[0] *= scvf1.area();
- normal[1] = scvf2.unitOuterNormal();
- normal[1] *= scvf2.area();
-
- // indices of the participating scvs
- scvIndices.resize(3);
- scvIndices[0] = scv1.index();
- scvIndices[1] = scv2.index();
- scvIndices[2] = scv3.index();
-
- // set up the local basis of the elements
- LocalBasis basis1, basis2, basis3, basis4;
- basis1[0] = f1 - scvCenters[0];
- basis1[1] = f2 - scvCenters[0];
- basis2[0] = v - scvCenters[1];
- basis2[1] = f1 - scvCenters[1];
- basis3[0] = f2 - scvCenters[2];
- basis3[1] = v - scvCenters[2];
- basis4[0] = basis1[0];
- basis4[1] = v - scvCenters[0];
-
- // calculate nus
- const auto nus1 = MpfaHelper::calculateInnerNormals(basis1);
- const auto nus2 = MpfaHelper::calculateInnerNormals(basis2);
- const auto nus3 = MpfaHelper::calculateInnerNormals(basis3);
- const auto nus4 = MpfaHelper::calculateInnerNormals(basis1);
-
- nu.resize(7);
- nu[0] = nus1[0];
- nu[1] = nus1[1];
- nu[2] = nus2[0];
- nu[3] = nus2[1];
- nu[4] = nus3[0];
- nu[5] = nus3[1];
- nu[6] = nus4[0];
-
- detX.resize(3);
- detX[0] = MpfaHelper::calculateDetX(basis1);
- detX[1] = MpfaHelper::calculateDetX(basis2);
- detX[2] = MpfaHelper::calculateDetX(basis3);
- }
-};
-}; //end namespace
-
-#endif
\ No newline at end of file
diff --git a/dumux/discretization/cellcentered/mpfa/lmethod/interactionvolume.hh b/dumux/discretization/cellcentered/mpfa/lmethod/interactionvolume.hh
deleted file mode 100644
index 0515652a8547d822a8863e32e05930049229b35d..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/lmethod/interactionvolume.hh
+++ /dev/null
@@ -1,395 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base classes for interaction volume of mpfa methods.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_L_INTERACTIONVOLUME_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_L_INTERACTIONVOLUME_HH
-
-#include <dumux/common/math.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh>
-#include <dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-
-#include "interactionvolumeseed.hh"
-#include "interactionregions.hh"
-
-namespace Dumux
-{
-//! Specialization of the interaction volume traits class for the mpfa-o method
-template<class TypeTag>
-class CCMpfaLInteractionVolumeTraits : public CCMpfaInteractionVolumeTraitsBase<TypeTag>
-{
- using BaseTraits = CCMpfaInteractionVolumeTraitsBase<TypeTag>;
-
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
-
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
-
-public:
- using BoundaryInteractionVolume = CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethod>;
-
- // in the interaction region there will be dim faces and dim+1 cell pressures
- using PositionVector = std::vector<GlobalPosition>;
- using Matrix = Dune::FieldMatrix<Scalar, dim, dim+1>;
- using Vector = Dune::FieldVector<Scalar, dim+1>;
-
- using typename BaseTraits::LocalIndexSet;
- using typename BaseTraits::GlobalIndexSet;
- using Seed = CCMpfaLInteractionVolumeSeed<GlobalIndexSet, LocalIndexSet>;
-};
-
-/*!
- * \ingroup Mpfa
- * \brief Base class for the interaction volumes of the mpfa-l method.
- */
-template<class TypeTag>
-class CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::lMethod>
- : public CCMpfaInteractionVolumeBase<TypeTag, CCMpfaLInteractionVolumeTraits<TypeTag>>
-{
- // The interaction volume implementation has to be friend
- friend typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using Traits = CCMpfaLInteractionVolumeTraits<TypeTag>;
- using ParentType = CCMpfaInteractionVolumeBase<TypeTag, Traits>;
-
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using MpfaHelper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using InteriorBoundaryData = typename GET_PROP_TYPE(TypeTag, InteriorBoundaryData);
-
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
- using Element = typename GridView::template Codim<0>::Entity;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using LocalBasis = std::array<GlobalPosition, dim>;
- using InteractionRegion = Dumux::InteractionRegion<TypeTag>;
-
- using CoefficientVector = typename Traits::Vector;
- using Tensor = typename Traits::Tensor;
-
-public:
- using Matrix = typename Traits::Matrix;
- using typename ParentType::GlobalLocalFaceDataPair;
- using typename ParentType::LocalIndexType;
- using typename ParentType::LocalIndexSet;
- using typename ParentType::LocalFaceData;
- using typename ParentType::GlobalIndexType;
- using typename ParentType::GlobalIndexSet;
- using typename ParentType::PositionVector;
- using typename ParentType::Seed;
-
- using ScvSeedType = typename Seed::LocalScvSeed;
- using OuterScvSeedType = typename Seed::LocalOuterScvSeed;
-
- CCMpfaInteractionVolumeImplementation(const Seed& seed,
- const Problem& problem,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars)
- : seedPtr_(&seed),
- problemPtr_(&problem),
- fvGeometryPtr_(&fvGeometry),
- elemVolVarsPtr_(&elemVolVars),
- regionUnique_(seed.isUnique()),
- systemSolved_(false)
- {
- // set up the possible interaction regions
- setupInteractionRegions_(seed, fvGeometry);
- }
-
- template<typename GetTensorFunction>
- void solveLocalSystem(const GetTensorFunction& getTensor)
- {
- if (regionUnique_)
- {
- const auto& ir = interactionRegions_[0];
- T_ = assembleMatrix_(getTensor, ir);
- interactionRegionId_ = 0;
- updateGlobalLocalFaceData();
- systemSolved_ = true;
- }
- else
- {
- std::array<Matrix, 2> M;
- M[0] = assembleMatrix_(getTensor, interactionRegions_[0]);
- M[1] = assembleMatrix_(getTensor, interactionRegions_[1]);
-
- interactionRegionId_ = MpfaHelper::selectionCriterion(interactionRegions_[0], interactionRegions_[1], M[0], M[1]);
- updateGlobalLocalFaceData();
- systemSolved_ = true;
- T_ = M[interactionRegionId_];
- }
- }
-
- //! returns the local index pair. This holds the scvf's local index and a boolean whether or not the flux has to be inverted
- const LocalFaceData getLocalFaceData(const SubControlVolumeFace& scvf) const
- {
- assert(systemSolved_ && "Scvf Indices not set yet. You have to call solveLocalSystem() beforehand.");
- assert((scvf.index() == globalLocalScvfPairedData_[0].first->index()
- || scvf.index() == globalLocalScvfPairedData_[1].first->index())
- && "The provided scvf is not the flux face of the interaction volume.");
-
- if (globalLocalScvfPairedData_[0].first->index() == scvf.index())
- return globalLocalScvfPairedData_[0].second;
- else
- return globalLocalScvfPairedData_[1].second;
- }
-
- //! returns the transmissibilities corresponding to the bound scvf
- CoefficientVector getTransmissibilities(const LocalFaceData& localFaceData) const
- {
- assert(systemSolved_ && "Transmissibilities not calculated yet. You have to call solveLocalSystem() beforehand.");
-
- auto tij = T_[localFaceData.localScvfIndex];
- if (localFaceData.isOutside)
- tij *= -1.0;
- return tij;
- }
-
- const GlobalIndexSet& volVarsStencil() const
- {
- assert(systemSolved_ && "stencil not set yet. You have to call solveLocalSystem() beforehand.");
- return interactionRegion().scvIndices;
- }
-
- const PositionVector& volVarsPositions() const
- {
- assert(systemSolved_ && "stencil not set yet. You have to call solveLocalSystem() beforehand.");
- return interactionRegion().scvCenters;
- }
-
- const std::vector<GlobalLocalFaceDataPair>& globalLocalScvfPairedData() const
- { return globalLocalScvfPairedData_; }
-
- //! Boundaries will be treated by a different mpfa method (e.g. o method). Thus, on
- //! faces in l-method interaction volumes there will never be a Neumann flux contribution.
- Scalar getNeumannFlux(const LocalFaceData& localFaceData, unsigned int eqIdx) const
- { return 0.0; }
-
- //! See comment of getNeumannFlux()
- CoefficientVector getNeumannFluxTransformationCoefficients(const LocalFaceData& localFaceData) const
- { return CoefficientVector(0.0); }
-
- const Matrix& matrix() const
- { return T_; }
-
- const InteractionRegion& interactionRegion() const
- { return interactionRegions_[interactionRegionId_]; }
-
- // The l-method can't treat interior boundaries
- const std::vector<InteriorBoundaryData> interiorBoundaryData() const
- { return std::vector<InteriorBoundaryData>(); }
-
-private:
- //! Assembles and solves the local equation system
- //! Specialization for dim = 2
- template<typename GetTensorFunction, int d = dim>
- typename std::enable_if<d == 2, Matrix>::type
- assembleMatrix_(const GetTensorFunction& getTensor, const InteractionRegion& ir)
- {
- // the elements the scvs live in
- const auto& e1 = ir.elements[0];
- const auto& e2 = ir.elements[1];
- const auto& e3 = ir.elements[2];
-
- // the corresponding scvs
- const auto scv1 = fvGeometry_().scv(ir.scvIndices[0]);
- const auto scv2 = fvGeometry_().scv(ir.scvIndices[1]);
- const auto scv3 = fvGeometry_().scv(ir.scvIndices[2]);
-
- // Get diffusion tensors in the three scvs
- const auto T1 = getTensor(problem_(), e1, elemVolVars_()[scv1], fvGeometry_(), scv1);
- const auto T2 = getTensor(problem_(), e2, elemVolVars_()[scv2], fvGeometry_(), scv2);
- const auto T3 = getTensor(problem_(), e3, elemVolVars_()[scv3], fvGeometry_(), scv3);
-
- // required omega factors
- Scalar w111 = calculateOmega_(ir.normal[0], ir.nu[0], ir.detX[0], T1);
- Scalar w112 = calculateOmega_(ir.normal[0], ir.nu[1], ir.detX[0], T1);
- Scalar w123 = calculateOmega_(ir.normal[0], ir.nu[2], ir.detX[1], T2);
- Scalar w124 = calculateOmega_(ir.normal[0], ir.nu[3], ir.detX[1], T2);
-
- Scalar w211 = calculateOmega_(ir.normal[1], ir.nu[0], ir.detX[0], T1);
- Scalar w212 = calculateOmega_(ir.normal[1], ir.nu[1], ir.detX[0], T1);
- Scalar w235 = calculateOmega_(ir.normal[1], ir.nu[4], ir.detX[2], T3);
- Scalar w236 = calculateOmega_(ir.normal[1], ir.nu[5], ir.detX[2], T3);
-
- Scalar xi711 = calculateXi_(ir.nu[6], ir.nu[0], ir.detX[0]);
- Scalar xi712 = calculateXi_(ir.nu[6], ir.nu[1], ir.detX[0]);
-
- Dune::FieldMatrix<Scalar, dim, dim> C, A;
- Dune::FieldMatrix<Scalar, dim, dim+1> B;
-
- C[0][0] = -w111;
- C[0][1] = -w112;
- C[1][0] = -w211;
- C[1][1] = -w212;
-
- A[0][0] = w111 - w124 - w123*xi711;
- A[0][1] = w112 - w123*xi712;
- A[1][0] = w211 - w236*xi711;
- A[1][1] = w212 - w235 - w236*xi712;
-
- B[0][0] = w111 + w112 + w123*(1 - xi711 -xi712);
- B[0][1] = -w123 - w124;
- B[0][2] = 0.0;
- B[1][0] = w211 + w212 + w236*(1 - xi711 - xi712);
- B[1][1] = 0.0;
- B[1][2] = -w235 - w236;
-
- // T = C*A^-1*B + D
- A.invert();
- auto T = (A.leftmultiply(C)).rightmultiplyany(B);
- T[0][0] += w111 + w112;
- T[1][0] += w211 + w212;
-
- return T;
- }
-
- //! sets up the interaction regions for later transmissibility matrix calculation
- //! Specialization for dim = 2
- template<int d = dim>
- typename std::enable_if<d == 2>::type
- setupInteractionRegions_(const Seed& seed, const FVElementGeometry& fvGeometry)
- {
- const auto& fvGridGeometry = problem_().model().fvGridGeometry();
-
- interactionRegions_.reserve(2);
- auto&& scvSeed1 = seed.scvSeed(0);
- auto&& scvSeed2 = seed.scvSeed(1);
- auto&& outerScvSeed1 = seed.outerScvSeed(0);
- auto&& outerScvSeed2 = seed.outerScvSeed(1);
- auto e1 = fvGridGeometry.element(scvSeed1.globalIndex());
- auto e2 = fvGridGeometry.element(scvSeed2.globalIndex());
- auto e3 = fvGridGeometry.element(outerScvSeed1.globalIndex());
- auto e4 = fvGridGeometry.element(outerScvSeed2.globalIndex());
-
- // scvSeed1 is the one the seed construction began at
- if (scvSeed1.contiFaceLocalIdx() == 0)
- {
- interactionRegions_.emplace_back(problem_(), fvGeometry, scvSeed1, OuterScvSeedType(scvSeed2), outerScvSeed1, e1, e2, e3);
- interactionRegions_.emplace_back(problem_(), fvGeometry, scvSeed2, outerScvSeed2, OuterScvSeedType(scvSeed1), e2, e4, e1);
- }
- else
- {
- interactionRegions_.emplace_back(problem_(), fvGeometry, scvSeed1, outerScvSeed1, OuterScvSeedType(scvSeed2), e1, e3, e2);
- interactionRegions_.emplace_back(problem_(), fvGeometry, scvSeed2, OuterScvSeedType(scvSeed1), outerScvSeed2, e2, e1, e4);
- }
-
- // as an initial guess we set the first interaction region as the one used
- // this is updated after solution of the local system
- interactionRegionId_ = 0;
- updateGlobalLocalFaceData();
- }
-
- //! set the global&local face data according to the current choice for the interaction region
- void updateGlobalLocalFaceData()
- {
- const auto numPairs = globalLocalScvfPairedData_.size();
-
- // if no data has been stored yet, initialize
- if (numPairs == 0)
- {
- globalLocalScvfPairedData_.clear();
- globalLocalScvfPairedData_.reserve(2);
- globalLocalScvfPairedData_.emplace_back(&fvGeometry_().scvf(seed_().globalScvfIndices()[0]),
- LocalFaceData(interactionRegion().contiFaceLocalIdx, /*dummy*/0, false));
- globalLocalScvfPairedData_.emplace_back(&fvGeometry_().scvf(seed_().globalScvfIndices()[1]),
- LocalFaceData(interactionRegion().contiFaceLocalIdx, /*dummy*/0, true));
- }
- // if order was swapped, change bools indicating which face is the "outside" version of the local face
- else if (globalLocalScvfPairedData_[1].first->index() == interactionRegion().globalScvfIndices[0])
- {
- globalLocalScvfPairedData_[0].second.localScvfIndex = interactionRegion().contiFaceLocalIdx;
- globalLocalScvfPairedData_[1].second.localScvfIndex = interactionRegion().contiFaceLocalIdx;
- globalLocalScvfPairedData_[0].second.isOutside = true;
- globalLocalScvfPairedData_[1].second.isOutside = false;
- }
- }
-
- Scalar calculateOmega_(const GlobalPosition& normal,
- const GlobalPosition& nu,
- const Scalar detX,
- const Tensor& T) const
- {
- GlobalPosition tmp;
- T.mv(nu, tmp);
- return (tmp*normal)/detX;
- }
-
- // calculates the omega factors entering the local matrix
- Scalar calculateOmega_(const GlobalPosition& normal,
- const GlobalPosition& nu,
- const Scalar detX,
- const Scalar t) const
- {
- // make sure we have positive diffusion coefficients
- assert(t > 0.0 && "non-positive diffusion coefficients cannot be handled by mpfa methods");
- return (normal*nu)*t/detX;
- }
-
- //! Specialization for dim = 2
- template<int d = dim>
- typename std::enable_if<d == 2, Scalar>::type
- calculateXi_(const GlobalPosition& nu1,
- const GlobalPosition& nu2,
- const Scalar detX) const
- {
- LocalBasis basis({nu1, nu2});
- return MpfaHelper::calculateDetX(basis)/detX;
- }
-
- const Seed& seed_() const
- { return *seedPtr_; }
-
- const Problem& problem_() const
- { return *problemPtr_; }
-
- const FVElementGeometry& fvGeometry_() const
- { return *fvGeometryPtr_; }
-
- const ElementVolumeVariables& elemVolVars_() const
- { return *elemVolVarsPtr_; }
-
- const Seed* seedPtr_;
- const Problem* problemPtr_;
- const FVElementGeometry* fvGeometryPtr_;
- const ElementVolumeVariables* elemVolVarsPtr_;
-
- bool regionUnique_;
- bool systemSolved_;
-
- LocalIndexType interactionRegionId_;
- std::vector<InteractionRegion> interactionRegions_;
- std::vector<GlobalLocalFaceDataPair> globalLocalScvfPairedData_;
-
- Matrix T_;
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/lmethod/interactionvolumeseed.hh b/dumux/discretization/cellcentered/mpfa/lmethod/interactionvolumeseed.hh
deleted file mode 100644
index 6579142df86878b1aa28f938bc19a2682067a9f4..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/lmethod/interactionvolumeseed.hh
+++ /dev/null
@@ -1,101 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for interaction volume seeds of mpfa methods.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_L_INTERACTIONVOLUMESEED_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_L_INTERACTIONVOLUMESEED_HH
-
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include "localsubcontrolentityseeds.hh"
-
-namespace Dumux
-{
-
-/*!
- * \ingroup Mpfa
- * \brief Base class for the interaction volume seed of mpfa methods
- */
-template<typename G, typename L>
-class CCMpfaLInteractionVolumeSeed
-{
- using GlobalIndexSet = G;
- using GlobalIndexType = typename G::value_type;
- using LocalIndexSet = L;
- using LocalIndexType = typename L::value_type;
-
-public:
- using LocalScvSeed = CCMpfaLCentralLocalScvSeed<G, L>;
- using LocalOuterScvSeed = CCMpfaLOuterLocalScvSeed<G>;
-
- CCMpfaLInteractionVolumeSeed(std::vector<LocalScvSeed>&& scvSeeds,
- std::vector<LocalOuterScvSeed>&& outerScvSeeds,
- std::vector<GlobalIndexType>&& globalScvfIndices)
- : scvSeeds_(std::move(scvSeeds)),
- outerScvSeeds_(std::move(outerScvSeeds)),
- globalScvfIndices_(std::move(globalScvfIndices)) {}
-
- const std::vector<LocalScvSeed>& scvSeeds() const
- { return scvSeeds_; }
-
- const LocalScvSeed& scvSeed(const LocalIndexType idx) const
- { return scvSeeds_[idx]; }
-
- const std::vector<LocalOuterScvSeed>& outerScvSeeds() const
- { return outerScvSeeds_; }
-
- const LocalOuterScvSeed& outerScvSeed(const LocalIndexType idx) const
- { return outerScvSeeds_[idx]; }
-
- std::vector<GlobalIndexType> globalScvIndices() const
- {
- std::vector<GlobalIndexType> globalIndices;
- globalIndices.reserve(scvSeeds().size() + outerScvSeeds().size());
-
- for (auto&& localScvSeed : scvSeeds())
- globalIndices.push_back(localScvSeed.globalIndex());
-
- for (auto&& localScvSeed : outerScvSeeds())
- globalIndices.push_back(localScvSeed.globalIndex());
-
- // make the entries unique if interaction region is not uniquely defined
- if (!isUnique())
- {
- std::sort(globalIndices.begin(), globalIndices.end());
- globalIndices.erase(std::unique(globalIndices.begin(), globalIndices.end()), globalIndices.end());
- }
-
- return globalIndices;
- }
-
- const std::vector<GlobalIndexType>& globalScvfIndices() const
- { return globalScvfIndices_; }
-
- bool isUnique() const
- { return scvSeeds_.size() == 1; }
-
-private:
- std::vector<LocalScvSeed> scvSeeds_;
- std::vector<LocalOuterScvSeed> outerScvSeeds_;
- std::vector<GlobalIndexType> globalScvfIndices_;
-};
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/lmethod/localsubcontrolentityseeds.hh b/dumux/discretization/cellcentered/mpfa/lmethod/localsubcontrolentityseeds.hh
deleted file mode 100644
index 054323f6df8f5b00c75b2ed94b153fbe7eb55e6d..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/lmethod/localsubcontrolentityseeds.hh
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for sub control entity seeds of the mpfa-o method.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_L_LOCALSUBCONTROLENTITYSEEDS_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_L_LOCALSUBCONTROLENTITYSEEDS_HH
-
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
-
-namespace Dumux
-{
-//! The scv seed class for scvs which could be the central scv in the actual interaction region
-template<typename G, typename L>
-class CCMpfaLCentralLocalScvSeed
-{
- using GlobalIndexSet = G;
- using LocalIndexSet = L;
-public:
- using GlobalIndexType = typename GlobalIndexSet::value_type;
- using LocalIndexType = typename LocalIndexSet::value_type;
-
- //! constructor fully defining the scv seed
- CCMpfaLCentralLocalScvSeed(GlobalIndexSet&& globalScvfIndices,
- GlobalIndexType globalScvIndex,
- LocalIndexType contiFaceLocalIdx)
- : contiFaceLocalIdx_(contiFaceLocalIdx),
- globalScvIndex_(globalScvIndex),
- globalScvfIndices_(std::move(globalScvfIndices)) {}
-
- LocalIndexType contiFaceLocalIdx() const
- { return contiFaceLocalIdx_; }
-
- GlobalIndexType globalIndex() const
- { return globalScvIndex_; }
-
- const GlobalIndexSet& globalScvfIndices() const
- { return globalScvfIndices_; }
-
-private:
- LocalIndexType contiFaceLocalIdx_;
- GlobalIndexType globalScvIndex_;
- GlobalIndexSet globalScvfIndices_;
-};
-
-//! The scv seed class for scvs which could be the central scv in the actual interaction region
-template<typename G>
-class CCMpfaLOuterLocalScvSeed
-{
- using GlobalIndexSet = G;
-public:
- using GlobalIndexType = typename G::value_type;
-
- //! Constructor fully initializing the members
- CCMpfaLOuterLocalScvSeed(GlobalIndexType globalScvIndex,
- GlobalIndexType globalScvfIndex)
- : scvIndexGlobal_(globalScvIndex),
- scvfIndexGlobal_(globalScvfIndex) {}
-
- //! Construct from central scv seed
- template<typename GI, typename LI>
- CCMpfaLOuterLocalScvSeed(const CCMpfaLCentralLocalScvSeed<GI, LI>& scvSeed)
- : scvIndexGlobal_(scvSeed.globalIndex()),
- scvfIndexGlobal_(scvSeed.globalScvfIndices()[scvSeed.contiFaceLocalIdx()]) {}
-
-
- GlobalIndexType globalIndex() const
- { return scvIndexGlobal_; }
-
- GlobalIndexType globalScvfIndex() const
- { return scvfIndexGlobal_; }
-
-private:
- GlobalIndexType scvIndexGlobal_;
- GlobalIndexType scvfIndexGlobal_;
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/lmethod/subcontrolvolumeface.hh b/dumux/discretization/cellcentered/mpfa/lmethod/subcontrolvolumeface.hh
deleted file mode 100644
index 9468f8c2fb2b12d043f76ee6cbbf20de45f2b95e..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/lmethod/subcontrolvolumeface.hh
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Class for an mpfa-o sub control volume face
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_L_SUBCONTROLVOLUMEFACE_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_L_SUBCONTROLVOLUMEFACE_HH
-
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-#include <dumux/discretization/cellcentered/mpfa/subcontrolvolumefacebase.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup Discretization
- * \brief Class for a sub control volume face in the mpfa-l method. We simply inherit from the base class here.
- */
-template<class G, typename I>
-class CCMpfaSubControlVolumeFace<MpfaMethods::lMethod, G, I> : public CCMpfaSubControlVolumeFaceBase<G, I>
-{
- using ParentType = CCMpfaSubControlVolumeFaceBase<G, I>;
- using Geometry = G;
- using IndexType = I;
-
- using Scalar = typename Geometry::ctype;
- static const int dim = Geometry::mydimension;
- static const int dimworld = Geometry::coorddimension;
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
-
-public:
- //! We do not use the localIndex variable.
- //! It is here to satisfy the general mpfa scvf interface.
- template<class MpfaHelper>
- CCMpfaSubControlVolumeFace(const MpfaHelper& helper,
- std::vector<GlobalPosition>&& corners,
- GlobalPosition&& unitOuterNormal,
- IndexType vertexIndex,
- unsigned int localIndex,
- IndexType scvfIndex,
- IndexType insideScvIdx,
- const std::vector<IndexType>& outsideScvIndices,
- Scalar q,
- bool boundary)
- : ParentType(helper,
- std::forward<std::vector<GlobalPosition>>(corners),
- std::forward<GlobalPosition>(unitOuterNormal),
- vertexIndex,
- localIndex,
- scvfIndex,
- insideScvIdx,
- outsideScvIndices,
- 0.0, // q should be always zero for the mpfa-l method,
- boundary) {}
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/globalinteractionvolumeseeds.hh b/dumux/discretization/cellcentered/mpfa/omethod/globalinteractionvolumeseeds.hh
deleted file mode 100644
index cdf6e22f0bd79a84b4e7cf72f860b1204432e842..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/omethod/globalinteractionvolumeseeds.hh
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for the global interaction volumes of the mpfa-o method.
- */
-#ifndef DUMUX_DISCRETIZATION_MPFA_O_GLOBALINTERACTIONVOLUMESEEDS_HH
-#define DUMUX_DISCRETIZATION_MPFA_O_GLOBALINTERACTIONVOLUMESEEDS_HH
-
-#include <dumux/discretization/cellcentered/mpfa/globalinteractionvolumeseedsbase.hh>
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup Mpfa
- * \brief Specialization of the class for the mpfa-o method.
- */
-template<class TypeTag>
-class CCMpfaGlobalInteractionVolumeSeedsImplementation<TypeTag, MpfaMethods::oMethod>
- : public CCMpfaGlobalInteractionVolumeSeedsBase<TypeTag>
-{
- using ParentType = CCMpfaGlobalInteractionVolumeSeedsBase<TypeTag>;
-
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Helper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
- using InteractionVolumeSeed = typename InteractionVolume::Seed;
- using BoundaryInteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using BoundaryInteractionVolumeSeed = typename BoundaryInteractionVolume::Seed;
-
- using IndexType = typename GridView::IndexSet::IndexType;
-
- static const int dim = GridView::dimension;
-
-public:
- CCMpfaGlobalInteractionVolumeSeedsImplementation(const GridView& gridView) : ParentType(gridView) {}
-
- template<typename SeedVector, typename BoundarySeedVector>
- void initializeSeeds(const std::vector<bool>& interiorOrDomainBoundaryVertices,
- std::vector<IndexType>& scvfIndexMap,
- SeedVector& seeds,
- BoundarySeedVector& boundarySeeds)
- {
- seeds.clear();
- boundarySeeds.clear();
- scvfIndexMap.clear();
-
- // reserve memory
- const auto numScvf = this->problem().model().fvGridGeometry().numScvf();
- const auto numInteriorOrDomainBoundaryVertices = this->problem().model().fvGridGeometry().numInteriorOrDomainBoundaryVertices();
- const int numInteriorVertices = this->gridView().size(dim) - numInteriorOrDomainBoundaryVertices;
-
- if (numInteriorVertices > 0)
- seeds.reserve(numInteriorVertices);
- boundarySeeds.reserve(numInteriorOrDomainBoundaryVertices);
- scvfIndexMap.resize(numScvf);
-
- // Keep track of which faces have been handled already
- std::vector<bool> isFaceHandled(numScvf, false);
-
- IndexType boundarySeedIndex = 0;
- IndexType seedIndex = 0;
- for (const auto& element : elements(this->gridView()))
- {
- auto fvGeometry = localView(this->problem().model().fvGridGeometry());
- fvGeometry.bindElement(element);
-
- for (auto&& scvf : scvfs(fvGeometry))
- {
- // skip the rest if we already handled this face
- if (isFaceHandled[scvf.index()])
- continue;
-
- // on interior or domain boundaries and on branching points we have to set
- // a boundary interaction volume (for compatibility with other mpfa methods)
- if (interiorOrDomainBoundaryVertices[scvf.vertexIndex()]
- || this->problem().model().fvGridGeometry().touchesBranchingPoint(scvf))
- {
- // make the boundary interaction volume seed
- boundarySeeds.emplace_back(Helper::makeBoundaryInteractionVolumeSeed(this->problem(),
- element,
- fvGeometry,
- scvf));
-
- // update the index map entries for the global scv faces in the interaction volume
- for (auto scvfIdxGlobal : boundarySeeds.back().globalScvfIndices())
- {
- scvfIndexMap[scvfIdxGlobal] = boundarySeedIndex;
- isFaceHandled[scvfIdxGlobal] = true;
- }
-
- // increment counter
- boundarySeedIndex++;
- }
- else
- {
- // make the inner interaction volume seed
- seeds.emplace_back(Helper::makeInnerInteractionVolumeSeed(this->problem(),
- element,
- fvGeometry,
- scvf));
-
- // update the index map entries for the global scv faces in the interaction volume
- for (auto scvfIdxGlobal : seeds.back().globalScvfIndices())
- {
- scvfIndexMap[scvfIdxGlobal] = seedIndex;
- isFaceHandled[scvfIdxGlobal] = true;
- }
-
- // increment counter
- seedIndex++;
- }
- }
- }
- }
-};
-} // end namespace
-
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/helper.hh b/dumux/discretization/cellcentered/mpfa/omethod/helper.hh
index b648f5c115cdd64a8ac23e66a56c19db1209f48e..f21e0bd7aaf3d4ea72f0b25ec67ce8fb02df50ba 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/helper.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/helper.hh
@@ -16,812 +16,45 @@
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
+
/*!
* \file
- * \brief Helper class to get the required information on an interaction volume.
+ * \brief Helper class for interaction volumes using the mpfa-o scheme.
*/
-#ifndef DUMUX_DISCRETIZATION_CC_MPFAO_HELPER_HH
-#define DUMUX_DISCRETIZATION_CC_MPFAO_HELPER_HH
+#ifndef DUMUX_DISCRETIZATION_CC_MPFA_O_HELPER_HH
+#define DUMUX_DISCRETIZATION_CC_MPFA_O_HELPER_HH
#include <dumux/common/math.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-#include "localsubcontrolentities.hh"
-#include "localsubcontrolentityseeds.hh"
-
namespace Dumux
{
/*!
* \ingroup Mpfa
* \brief Helper class to get the required information on an interaction volume.
- * Specialization for the Mpfa-O method in two dimensions embedded in a 2d world.
+ * Specialization for the Mpfa-O method in two dimensions. This scheme does
+ * not require any additional functionality to be implemented.
*/
template<class TypeTag>
-class MpfaMethodHelper<TypeTag, MpfaMethods::oMethod, /*dim*/2, /*dimWorld*/2>
-{
- using Implementation = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
-
- static constexpr int dim = 2;
- static constexpr int dimWorld = 2;
-
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
-
- // The o method is used on the boundaries also for other methods. These will use this helper
- // class to set up the seeds on the boundary. Therefore we extract all seed information from
- // the boundary interaction volume here to be compatible with other mpfa methods where seed types
- // most probably differ. We use the fact here, that for the o-method, boundary and interior
- // interaction volumes are identical, which is always given.
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using InteractionVolumeSeed = typename InteractionVolume::Seed;
- using ScvSeed = typename InteractionVolumeSeed::LocalScvSeed;
- using ScvfSeed = typename InteractionVolumeSeed::LocalScvfSeed;
-
- using Element = typename GridView::template Codim<0>::Entity;
- using GlobalIndexType = typename InteractionVolume::GlobalIndexType;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
-
- using GlobalIndexSet = typename InteractionVolume::GlobalIndexSet;
- using LocalIndexSet = typename InteractionVolume::LocalIndexSet;
-
- static constexpr bool enableInteriorBoundaries = GET_PROP_VALUE(TypeTag, EnableInteriorBoundaries);
-
-public:
- static InteractionVolumeSeed makeInnerInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- {
- std::vector<ScvSeed> scvSeeds;
- std::vector<ScvfSeed> scvfSeeds;
-
- // reserve sufficient memory
- scvSeeds.reserve(20);
- scvfSeeds.reserve(20);
-
- fillEntitySeeds_(scvSeeds, scvfSeeds, problem, element, fvGeometry, scvf);
-
- // shrink containers to necessary size
- scvSeeds.shrink_to_fit();
- scvfSeeds.shrink_to_fit();
-
- return InteractionVolumeSeed(std::move(scvSeeds), std::move(scvfSeeds), false);
- }
-
- static InteractionVolumeSeed makeBoundaryInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- {
- std::vector<ScvSeed> scvSeeds;
- std::vector<ScvfSeed> scvfSeeds;
-
- // reserve sufficient memory
- scvSeeds.reserve(20);
- scvfSeeds.reserve(20);
-
- fillEntitySeeds_(scvSeeds, scvfSeeds, problem, element, fvGeometry, scvf);
-
- // shrink containers to necessary size
- scvSeeds.shrink_to_fit();
- scvfSeeds.shrink_to_fit();
-
- // check if touches domain boundary (not only interior boundary)
- const bool boundary = problem.model().fvGridGeometry().touchesDomainBoundary(scvf);
- return InteractionVolumeSeed(std::move(scvSeeds), std::move(scvfSeeds), boundary);
- }
-
-private:
- template<typename ScvSeedType, typename ScvfSeedType>
- static void fillEntitySeeds_(std::vector<ScvSeedType>& scvSeeds,
- std::vector<ScvfSeedType>& scvfSeeds,
- const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- {
- // Check whether or not we are touching the boundary here
- const bool onBoundary = problem.model().fvGridGeometry().touchesDomainBoundary(scvf);
-
- // Get the two scv faces in the first scv
- const auto scvfVector = Implementation::getScvFacesAtVertex(scvf.vertexIndex(), element, fvGeometry);
-
- // The global index of the first scv of the interaction region
- const auto scvIdx0 = scvf.insideScvIdx();
-
- // rotate counter clockwise and create the entities
- performRotation_(problem, scvfVector, scvSeeds, scvfSeeds, scvIdx0);
-
- if (onBoundary)
- {
- // the local scvf index of the second local face of the first local scv
- const LocalIndexType storeIdx = scvfSeeds.size();
-
- // clockwise rotation until hitting the boundary again
- performRotation_(problem, scvfVector, scvSeeds, scvfSeeds, scvIdx0, /*clockwise*/true);
-
- // Finish by creating the first scv
- scvSeeds.emplace(scvSeeds.begin(), GlobalIndexSet({scvfVector[0]->index(), scvfVector[1]->index()}),
- LocalIndexSet({0, storeIdx}),
- scvIdx0);
- }
- else
- // Finish by creating the first scv
- scvSeeds.emplace(scvSeeds.begin(), GlobalIndexSet({scvfVector[0]->index(), scvfVector[1]->index()}),
- LocalIndexSet({0, static_cast<LocalIndexType>(scvfSeeds.size()-1)}),
- scvIdx0);
- }
-
- // in 2d we can make use of knowing the basis orientation (right hand system)
- // that way we can find the interaction regions more rapidly by clockwise and
- // counter clockwise rotation and construction of local scv & scv face entities
- template<typename ScvSeedType, typename ScvfSeedType, typename ScvfPointerVector>
- static void performRotation_(const Problem& problem,
- const ScvfPointerVector& scvfVector,
- std::vector<ScvSeedType>& scvSeeds,
- std::vector<ScvfSeedType>& scvfSeeds,
- GlobalIndexType scvIdx0,
- bool clockWise = false)
- {
- // extract the actual local indices from the containers
- LocalIndexType localScvIdx = scvSeeds.size();
- LocalIndexType localScvfIdx = scvfSeeds.size();
-
- // fvGeometry object to bind the neighbouring element during rotation
- auto outsideFvGeometry = localView(problem.model().fvGridGeometry());
-
- // Start/continue interaction region construction from the given scv face
- const LocalIndexType startScvfIdx = clockWise ? 1 : 0;
- auto curScvf = *scvfVector[startScvfIdx];
- bool firstIteration = true;
- bool finished = false;
-
- while (!finished)
- {
- // Get some indices beforehand
- const GlobalIndexType outsideGlobalScvIdx = curScvf.outsideScvIdx();
- const LocalIndexType insideLocalScvIdx = firstIteration ? 0 : localScvIdx;
-
- // the current element inside of the scv face
- const auto insideElement = problem.model().fvGridGeometry().element(curScvf.insideScvIdx());
- const auto faceType = Implementation::getMpfaFaceType(problem, insideElement, curScvf);
-
- // if the face touches the boundary, create a boundary scvf entity
- if (curScvf.boundary())
- {
- scvfSeeds.emplace_back( curScvf,
- insideLocalScvIdx,
- LocalIndexSet(),
- GlobalIndexSet(),
- faceType );
- // rotation loop is finished
- finished = true; return;
- }
-
- // if outside scv is the first one again, finish loop
- if (outsideGlobalScvIdx == scvIdx0)
- {
- // create scv face entity for the last face of the loop
- scvfSeeds.emplace_back( curScvf,
- insideLocalScvIdx,
- LocalIndexSet({0}),
- GlobalIndexSet({scvfVector[1]->index()}),
- faceType );
-
- // create duplicate face if it is an interior boundary,
- if (faceType != MpfaFaceTypes::interior)
- scvfSeeds.emplace_back( *scvfVector[1],
- 0,
- LocalIndexSet({insideLocalScvIdx}),
- GlobalIndexSet({curScvf.index()}),
- faceType );
-
- // rotation loop is finished
- finished = true; return;
- }
-
- // If we get here, there are outside entities
- const auto outsideElement = problem.model().fvGridGeometry().element(outsideGlobalScvIdx);
- outsideFvGeometry.bindElement(outsideElement);
-
- // get the two scv faces in the outside element that share the vertex
- const auto outsideScvfVector = Implementation::getCommonAndNextScvFace(curScvf, outsideFvGeometry, clockWise);
- const GlobalIndexType commonFaceCoordIdx = clockWise ? 0 : 1;
- const GlobalIndexType nextFaceCoordIdx = clockWise ? 1 : 0;
- const auto& commonScvf = *outsideScvfVector[commonFaceCoordIdx];
- const auto& nextScvf = *outsideScvfVector[nextFaceCoordIdx];
-
- // create local scv face entity of the current scvf
- const LocalIndexType outsideLocalScvIdx = localScvIdx+1;
- scvfSeeds.emplace_back( curScvf,
- insideLocalScvIdx,
- LocalIndexSet({outsideLocalScvIdx}),
- GlobalIndexSet({commonScvf.index()}),
- faceType );
- localScvfIdx++;
-
- // create duplicate face if it is an interior boundary,
- if (faceType != MpfaFaceTypes::interior)
- {
- // face from "outside" to "inside", index sets change
- scvfSeeds.emplace_back( commonScvf,
- outsideLocalScvIdx,
- LocalIndexSet({insideLocalScvIdx}),
- GlobalIndexSet({curScvf.index()}),
- faceType );
- localScvfIdx++;
- }
-
- // create index set storing the two local scvf indices
- LocalIndexSet localScvfs(2);
- localScvfs[commonFaceCoordIdx] = localScvfIdx-1;
- localScvfs[nextFaceCoordIdx] = localScvfIdx;
-
- // create "outside" scv
- GlobalIndexSet globalScvfIndices({outsideScvfVector[0]->index(), outsideScvfVector[1]->index()});
- scvSeeds.emplace_back(std::move(globalScvfIndices),
- std::move(localScvfs),
- outsideGlobalScvIdx);
- localScvIdx++;
-
- // create the next scvf in the following iteration
- curScvf = nextScvf;
- firstIteration = false;
- }
- }
-};
+class MpfaMethodHelper<TypeTag, MpfaMethods::oMethod, /*dim*/2, /*dimWorld*/2> {};
/*!
* \ingroup Mpfa
* \brief Helper class to get the required information on an interaction volume.
* Specialization for the Mpfa-O method in two dimensions embedded in a 3d world.
+ * This scheme does not require any additional functionality to be implemented.
*/
template<class TypeTag>
-class MpfaMethodHelper<TypeTag, MpfaMethods::oMethod, /*dim*/2, /*dimWorld*/3>
-{
- using Implementation = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
-
- static const int dim = 2;
- static const int dimWorld = 3;
-
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
-
- // The o method is used on the boundaries also for other methods. These will use this helper
- // class to set up the seeds on the boundary. Therefore we extract all seed information from
- // the boundary interaction volume here to be compatible with other mpfa methods where seed types
- // most probably differ. We use the fact here, that for the o-method, boundary and interior
- // interaction volumes are identical, which is always given.
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using InteractionVolumeSeed = typename InteractionVolume::Seed;
- using ScvSeed = typename InteractionVolumeSeed::LocalScvSeed;
- using ScvfSeed = typename InteractionVolumeSeed::LocalScvfSeed;
-
- using Element = typename GridView::template Codim<0>::Entity;
- using GlobalIndexType = typename InteractionVolume::GlobalIndexType;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
-
- using GlobalIndexSet = typename InteractionVolume::GlobalIndexSet;
- using LocalIndexSet = typename InteractionVolume::LocalIndexSet;
-public:
- static InteractionVolumeSeed makeInnerInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- {
- // if the scvf does not touch a branching point, use simplified algorithm to create interaction volume seed
- if (!problem.model().fvGridGeometry().touchesBranchingPoint(scvf))
- return MpfaMethodHelper<TypeTag, MpfaMethods::oMethod, 2, 2>::makeInnerInteractionVolumeSeed(problem,
- element,
- fvGeometry,
- scvf);
-
- std::vector<ScvSeed> scvSeeds;
- std::vector<ScvfSeed> scvfSeeds;
-
- // reserve sufficient memory
- scvSeeds.reserve(50);
- scvfSeeds.reserve(50);
-
- // The vertex index around which we construct the interaction volume
- const auto vIdxGlobal = scvf.vertexIndex();
-
- // Get the two scv faces in the scv
- const auto scvfVector = Implementation::getScvFacesAtVertex(vIdxGlobal, element, fvGeometry);
-
- // fill the entity seed data
- fillEntitySeeds_(scvSeeds, scvfSeeds, problem, element, fvGeometry, scvfVector, vIdxGlobal);
-
- // shrink containers to necessary size
- scvSeeds.shrink_to_fit();
- scvfSeeds.shrink_to_fit();
-
- for (auto& scvfSeed : scvfSeeds)
- scvfSeed.makeOutsideDataUnique();
-
- return InteractionVolumeSeed(std::move(scvSeeds), std::move(scvfSeeds), false);
- }
-
- static InteractionVolumeSeed makeBoundaryInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- {
- // if the scvf does not touch a branching point, use simplified algorithm to create interaction volume seed
- if (!problem.model().fvGridGeometry().touchesBranchingPoint(scvf))
- return MpfaMethodHelper<TypeTag, MpfaMethods::oMethod, 2, 2>::makeBoundaryInteractionVolumeSeed(problem,
- element,
- fvGeometry,
- scvf);
-
- std::vector<ScvSeed> scvSeeds;
- std::vector<ScvfSeed> scvfSeeds;
-
- // reserve sufficient memory
- scvSeeds.reserve(50);
- scvfSeeds.reserve(50);
-
- // The vertex index around which we construct the interaction volume
- const auto vIdxGlobal = scvf.vertexIndex();
-
- // Get the two scv faces in the scv
- const auto scvfVector = Implementation::getScvFacesAtVertex(vIdxGlobal, element, fvGeometry);
-
- // fill the entity seed data
- fillEntitySeeds_(scvSeeds, scvfSeeds, problem, element, fvGeometry, scvfVector, vIdxGlobal);
-
- // shrink containers to necessary size
- scvSeeds.shrink_to_fit();
- scvfSeeds.shrink_to_fit();
-
- for (auto& scvfSeed : scvfSeeds)
- scvfSeed.makeOutsideDataUnique();
-
- return InteractionVolumeSeed(std::move(scvSeeds), std::move(scvfSeeds), true);
- }
-
-private:
- template<class ScvSeedType, class ScvfSeedType, class ScvfVector>
- static void fillEntitySeeds_(std::vector<ScvSeedType>& scvSeeds,
- std::vector<ScvfSeedType>& scvfSeeds,
- const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const ScvfVector& scvfVector,
- const GlobalIndexType vIdxGlobal)
- {
- // make the scv without knowing the local scvf indices yet
- // take the inside scv index from the first scvf (is the same for all)
- scvSeeds.emplace_back( GlobalIndexSet({scvfVector[0]->index(),
- scvfVector[1]->index()}),
- scvfVector[0]->insideScvIdx());
-
- // make the scvf seeds for the two scvfs connected to the scv
- auto& actualScvSeed = scvSeeds.back();
- const LocalIndexType actualLocalScvIdx = scvSeeds.size()-1;
-
- for (int coordDir = 0; coordDir < dim; ++coordDir)
- {
- const auto& actualScvf = *scvfVector[coordDir];
-
- // if scvf is on a boundary, we create the scvfSeed and make no neighbor
- if (actualScvf.boundary())
- {
- // set the local scvfIndex of the face that is about to created
- actualScvSeed.setLocalScvfIndex(coordDir, scvfSeeds.size());
-
- // create the scvf seed
- scvfSeeds.emplace_back( actualScvf,
- actualLocalScvIdx,
- LocalIndexSet(),
- GlobalIndexSet(),
- Implementation::getMpfaFaceType(problem, element, actualScvf) );
- }
- else
- {
- // we loop over all neighbors of this face
- for (auto outsideGlobalScvIdx : actualScvf.outsideScvIndices())
- {
- // get outside element, fvgeometry etc.
- const auto outsideElement = problem.model().fvGridGeometry().element(outsideGlobalScvIdx);
- auto outsideFvGeometry = localView(problem.model().fvGridGeometry());
- outsideFvGeometry.bindElement(outsideElement);
-
- // find scvf in outside corresponding to the actual scvf
- const auto outsideScvfVector = Implementation::getScvFacesAtVertex(vIdxGlobal, outsideElement, outsideFvGeometry);
- const auto commonFaceLocalIdx = Implementation::getCommonFaceLocalIndex(actualScvf, outsideScvfVector);
- const auto& outsideScvf = *outsideScvfVector[commonFaceLocalIdx];
- const auto outsideScvfIdx = outsideScvf.index();
-
- // check if the outside scv already exists and get its local index
- bool outsideScvExists = false;
- LocalIndexType outsideLocalScvIdx = 0;
- for (auto&& scvSeed : scvSeeds)
- {
- if (scvSeed.globalIndex() == outsideGlobalScvIdx)
- {
- outsideScvExists = true;
- break;
- }
- // keep track of local index
- outsideLocalScvIdx++;
- }
-
- // check if face already exists inside or in any neighbor
- bool outsideScvfExists = false;
- bool insideScvfExists = false;
- LocalIndexType outsideLocalScvfIdx = 0;
- LocalIndexType insideLocalScvfIdx = 0;
-
- // If the outside scvf exists, we need to find out its face type
- // We initialize it here to please the compiler
- MpfaFaceTypes outsideScvfFaceType = MpfaFaceTypes::interior;
-
- for (auto&& scvfSeed : scvfSeeds)
- {
- if (Implementation::contains(actualScvf.outsideScvIndices(), scvfSeed.insideGlobalScvIndex()) &&
- Implementation::contains(scvfSeed.outsideGlobalScvIndices(), actualScvf.insideScvIdx()))
- {
- outsideScvfFaceType = scvfSeed.faceType();
- outsideScvfExists = true;
- }
- else if (!outsideScvfExists)
- outsideLocalScvfIdx++;
-
- if (scvfSeed.insideGlobalScvIndex() == actualScvf.insideScvIdx() &&
- scvfSeed.outsideGlobalScvIndices().size() == actualScvf.outsideScvIndices().size() &&
- std::equal(scvfSeed.outsideGlobalScvIndices().begin(), scvfSeed.outsideGlobalScvIndices().end(), actualScvf.outsideScvIndices().begin()))
- {
- insideScvfExists = true;
- }
- else if (!insideScvfExists)
- insideLocalScvfIdx++;
- }
-
- // outside scv has to be created
- if (!outsideScvExists)
- {
- // No face exists yet
- if (!insideScvfExists && !outsideScvfExists)
- {
- // set the local scvfIndex of the face that is about to created
- actualScvSeed.setLocalScvfIndex(coordDir, scvfSeeds.size());
-
- // create scvf seed
- scvfSeeds.emplace_back(actualScvf,
- actualLocalScvIdx,
- Implementation::getMpfaFaceType(problem, element, actualScvf));
-
- // pass the outside index that is about to be created to the new scvf seed
- scvfSeeds.back().addOutsideData(outsideScvfIdx, static_cast<LocalIndexType>(scvSeeds.size()));
- }
- else if (insideScvfExists && !outsideScvfExists)
- {
- // pass info on outside to the inside scvf seed
- scvfSeeds[insideLocalScvfIdx].addOutsideData(outsideScvfIdx, static_cast<LocalIndexType>(scvSeeds.size()));
- }
- else if (!insideScvfExists && outsideScvfExists)
- {
- // if outside is an interior boundary, we create a duplicate local scvf here for inside
- if (outsideScvfFaceType == MpfaFaceTypes::interiorDirichlet ||
- outsideScvfFaceType == MpfaFaceTypes::interiorNeumann)
- {
- // set the local scvfIndex of the face that is about to created
- actualScvSeed.setLocalScvfIndex(coordDir, scvfSeeds.size());
-
- // create scvf seed
- scvfSeeds.emplace_back(actualScvf,
- actualLocalScvIdx,
- Implementation::getMpfaFaceType(problem, element, actualScvf));
-
- // pass the outside index that is about to be created to the new scvf seed
- scvfSeeds.back().addOutsideData(outsideScvfIdx, static_cast<LocalIndexType>(scvSeeds.size()));
- }
- else
- // set the local scvfIndex of the outside face
- actualScvSeed.setLocalScvfIndex(coordDir, outsideLocalScvfIdx);
-
- // pass info on inside to the outside scvf seed
- scvfSeeds[outsideLocalScvfIdx].addOutsideData(actualScvf.index(), actualLocalScvIdx);
- }
-
- // make outside scv by recursion
- fillEntitySeeds_(scvSeeds, scvfSeeds, problem, outsideElement, outsideFvGeometry, outsideScvfVector, vIdxGlobal);
- }
- else
- {
- // outside scv exists, but no corresponding local scv face yet. Make it from inside.
- if (!outsideScvfExists && !insideScvfExists)
- {
- // set the local scvfIndex of the face that is about to created
- actualScvSeed.setLocalScvfIndex(coordDir, scvfSeeds.size());
-
- // create scvf seed
- scvfSeeds.emplace_back(actualScvf,
- actualLocalScvIdx,
- Implementation::getMpfaFaceType(problem, element, actualScvf));
-
- // pass the actual outside indices to the new scvf seed
- scvfSeeds.back().addOutsideData(outsideScvfIdx, outsideLocalScvIdx);
- }
- else if (!insideScvfExists && outsideScvfExists)
- {
- // if outside is an interior boundary, we create a duplicate local scvf here for inside
- if (outsideScvfFaceType == MpfaFaceTypes::interiorDirichlet ||
- outsideScvfFaceType == MpfaFaceTypes::interiorNeumann)
- {
- // set the local scvfIndex of the face that is about to created
- actualScvSeed.setLocalScvfIndex(coordDir, scvfSeeds.size());
-
- // create scvf seed
- scvfSeeds.emplace_back(actualScvf,
- actualLocalScvIdx,
- Implementation::getMpfaFaceType(problem, element, actualScvf));
-
- // pass the actual outside indices to the new scvf seed
- scvfSeeds.back().addOutsideData(outsideScvfIdx, outsideLocalScvIdx);
- }
- else
- // set the local scvfIndex of the found outside local scv face seed
- actualScvSeed.setLocalScvfIndex(coordDir, outsideLocalScvfIdx);
-
- // pass info on inside to the outside found local scvf seed
- scvfSeeds[outsideLocalScvfIdx].addOutsideData(actualScvf.index(), actualLocalScvIdx);
- }
- }
- }
- }
- }
- }
-};
+class MpfaMethodHelper<TypeTag, MpfaMethods::oMethod, /*dim*/2, /*dimWorld*/3> {};
/*!
* \ingroup Mpfa
* \brief Helper class to get the required information on an interaction volume.
* Specialization for the Mpfa-O method in three dimensions.
+ * This scheme does not require any additional functionality to be implemented.
*/
template<class TypeTag>
-class MpfaMethodHelper<TypeTag, MpfaMethods::oMethod, /*dim*/3, /*dimWorld*/3>
-{
- using Implementation = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
-
- static const int dim = 3;
- static const int dimWorld = 3;
-
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
-
- // The o method is used on the boundaries also for other methods. These will use this helper
- // class to set up the seeds on the boundary. Therefore we extract all seed information from
- // the boundary interaction volume here to be compatible with other mpfa methods where seed types
- // most probably differ. We use the fact here, that for the o-method, boundary and interior
- // interaction volumes are identical, which is always given.
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using InteractionVolumeSeed = typename InteractionVolume::Seed;
- using ScvSeed = typename InteractionVolumeSeed::LocalScvSeed;
- using ScvfSeed = typename InteractionVolumeSeed::LocalScvfSeed;
-
- using Element = typename GridView::template Codim<0>::Entity;
- using GlobalIndexType = typename InteractionVolume::GlobalIndexType;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
-
- using GlobalIndexSet = typename InteractionVolume::GlobalIndexSet;
- using LocalIndexSet = typename InteractionVolume::LocalIndexSet;
-
-public:
- static InteractionVolumeSeed makeInnerInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- {
- std::vector<ScvSeed> scvSeeds;
- std::vector<ScvfSeed> scvfSeeds;
-
- // reserve sufficient memory
- scvSeeds.reserve(50);
- scvfSeeds.reserve(50);
-
- // The vertex index around which we construct the interaction volume
- const auto vIdxGlobal = scvf.vertexIndex();
-
- // Get the three scv faces in the scv
- const auto scvfVector = Implementation::getScvFacesAtVertex(vIdxGlobal, element, fvGeometry);
-
- // create the scv entity seeds
- fillEntitySeeds_(scvSeeds, scvfSeeds, problem, element, fvGeometry, scvfVector, vIdxGlobal);
-
- // shrink containers to necessary size
- scvSeeds.shrink_to_fit();
- scvfSeeds.shrink_to_fit();
-
- return InteractionVolumeSeed(std::move(scvSeeds), std::move(scvfSeeds), false);
- }
-
- static InteractionVolumeSeed makeBoundaryInteractionVolumeSeed(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf)
- {
- std::vector<ScvSeed> scvSeeds;
- std::vector<ScvfSeed> scvfSeeds;
-
- // reserve sufficient memory
- scvSeeds.reserve(50);
- scvfSeeds.reserve(50);
-
- // The vertex index around which we construct the interaction volume
- const auto vIdxGlobal = scvf.vertexIndex();
-
- // Get the three scv faces in the scv
- const auto scvfVector = Implementation::getScvFacesAtVertex(vIdxGlobal, element, fvGeometry);
-
- // create the scv entity seeds
- fillEntitySeeds_(scvSeeds, scvfSeeds, problem, element, fvGeometry, scvfVector, vIdxGlobal);
-
- // shrink containers to necessary size
- scvSeeds.shrink_to_fit();
- scvfSeeds.shrink_to_fit();
-
- return InteractionVolumeSeed(std::move(scvSeeds), std::move(scvfSeeds), true);
- }
-
-private:
- template<class ScvSeedType, class ScvfSeedType, class ScvfVector>
- static void fillEntitySeeds_(std::vector<ScvSeedType>& scvSeeds,
- std::vector<ScvfSeedType>& scvfSeeds,
- const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const ScvfVector& scvfVector,
- const GlobalIndexType vIdxGlobal)
- {
- // make the scv without knowing the local scvf indices yet
- // take the inside scv index from the first scvf (is the same for all)
- scvSeeds.emplace_back( GlobalIndexSet({scvfVector[0]->index(),
- scvfVector[1]->index(),
- scvfVector[2]->index()}),
- scvfVector[0]->insideScvIdx());
-
- // make the scvf seeds for the three scvfs connected to the scv
- auto& actualScvSeed = scvSeeds.back();
- const LocalIndexType actualLocalScvIdx = scvSeeds.size()-1;
-
- for (int coordDir = 0; coordDir < dim; ++coordDir)
- {
- const auto& actualScvf = *scvfVector[coordDir];
-
- // if scvf is on a boundary, we create the scvfSeed and make no neighbor
- if (actualScvf.boundary())
- {
- // set the local scvfIndex of the face that is about to created
- actualScvSeed.setLocalScvfIndex(coordDir, scvfSeeds.size());
-
- // create the scvf seed
- scvfSeeds.emplace_back( actualScvf,
- actualLocalScvIdx,
- LocalIndexSet(),
- GlobalIndexSet(),
- Implementation::getMpfaFaceType(problem, element, actualScvf) );
- }
- else
- {
- const auto outsideGlobalScvIdx = actualScvf.outsideScvIdx();
- const auto globalScvfIndex = actualScvf.index();
-
- // check if the outside scv already exists and get its local index
- bool outsideExists = false;
- LocalIndexType outsideLocalScvIdx = 0;
- for (auto&& scvSeed : scvSeeds)
- {
- if (scvSeed.globalIndex() == outsideGlobalScvIdx)
- {
- outsideExists = true;
- break;
- }
- // keep track of local index
- outsideLocalScvIdx++;
- }
-
- // if outside scv does not exist we have to make the scvf and the outside scv
- if (!outsideExists)
- {
- // set the local scvfIndex of the face that is about to created
- actualScvSeed.setLocalScvfIndex(coordDir, scvfSeeds.size());
-
- // get outside element, fvgeometry etc.
- const auto outsideElement = problem.model().fvGridGeometry().element(outsideGlobalScvIdx);
- auto outsideFvGeometry = localView(problem.model().fvGridGeometry());
- outsideFvGeometry.bindElement(outsideElement);
-
- // find scvf in outside corresponding to the actual scvf
- const auto outsideScvfVector = Implementation::getScvFacesAtVertex(vIdxGlobal, outsideElement, outsideFvGeometry);
- const auto commonFaceLocalIdx = Implementation::getCommonFaceLocalIndex(actualScvf, outsideScvfVector);
- const auto& outsideScvf = *outsideScvfVector[commonFaceLocalIdx];
-
- // create scvf seed
- scvfSeeds.emplace_back(actualScvf,
- actualLocalScvIdx,
- LocalIndexSet( {static_cast<LocalIndexType>(scvSeeds.size())} ),
- GlobalIndexSet( {outsideScvf.index()} ),
- Implementation::getMpfaFaceType(problem, element, actualScvf));
-
- // make outside scv by recursion
- fillEntitySeeds_(scvSeeds, scvfSeeds, problem, outsideElement, outsideFvGeometry, outsideScvfVector, vIdxGlobal);
- }
- // we have to find out if it is necessary to create a new scvf
- else
- {
- // find the scvf seed with the actual scvf as outside scvf
- bool found = false;
- LocalIndexType localScvfIdx = 0;
- for (auto&& scvfSeed : scvfSeeds)
- {
- // boundary scvf seeds have no outside scvf
- if (!scvfSeed.boundary() && scvfSeed.outsideGlobalScvfIndex() == globalScvfIndex)
- {
- const auto faceType = scvfSeed.faceType();
- // on interior boundaries we have to create a new face
- if (faceType != MpfaFaceTypes::interior)
- {
- // set the local scvfIndex of the face that is about to created
- actualScvSeed.setLocalScvfIndex(coordDir, scvfSeeds.size());
-
- // create local scvf
- scvfSeeds.emplace_back(actualScvf,
- actualLocalScvIdx,
- LocalIndexSet({scvfSeed.insideLocalScvIndex()}),
- GlobalIndexSet({scvfSeed.insideGlobalScvfIndex()}),
- faceType);
- }
- // pass local scvf index to local scv
- else
- actualScvSeed.setLocalScvfIndex(coordDir, localScvfIdx);
-
- // we found the corresponding face
- found = true; break;
- }
- // keep track of local index
- localScvfIdx++;
- }
-
- // if no corresponding scvf has been found, create it
- if (!found)
- {
- // set the local scvfIndex of the face that is about to created
- actualScvSeed.setLocalScvfIndex(coordDir, scvfSeeds.size());
-
- // get outside element, fvgeometry etc.
- const auto outsideElement = problem.model().fvGridGeometry().element(outsideGlobalScvIdx);
- auto outsideFvGeometry = localView(problem.model().fvGridGeometry());
- outsideFvGeometry.bindElement(outsideElement);
-
- // find scvf in outside corresponding to the actual scvf
- const auto outsideScvfVector = Implementation::getScvFacesAtVertex(vIdxGlobal, outsideElement, outsideFvGeometry);
- const auto commonFaceLocalIdx = Implementation::getCommonFaceLocalIndex(actualScvf, outsideScvfVector);
- const auto& outsideScvf = *outsideScvfVector[commonFaceLocalIdx];
-
- // make scv face seed
- scvfSeeds.emplace_back(actualScvf,
- actualLocalScvIdx,
- LocalIndexSet({outsideLocalScvIdx}),
- GlobalIndexSet({outsideScvf.index()}),
- Implementation::getMpfaFaceType(problem, element, actualScvf));
- }
- }
- }
- }
- }
-};
+class MpfaMethodHelper<TypeTag, MpfaMethods::oMethod, /*dim*/3, /*dimWorld*/3> {};
} // end namespace
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh b/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh
index 48df93750ac950e2437e2562bfb36b8a6bd37f5b..b9ae5c9390494d65db9c7f58c27057273f0061e2 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/interactionvolume.hh
@@ -24,13 +24,13 @@
#define DUMUX_DISCRETIZATION_CC_MPFA_O_INTERACTIONVOLUME_HH
#include <dumux/common/math.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
+
#include <dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
#include <dumux/discretization/cellcentered/mpfa/methods.hh>
+#include <dumux/discretization/cellcentered/mpfa/dualgridindexset.hh>
-#include "interactionvolumeseed.hh"
#include "localsubcontrolentities.hh"
+#include "interactionvolumeindexset.hh"
namespace Dumux
{
@@ -39,29 +39,27 @@ template<class TypeTag>
class CCMpfaOInteractionVolumeTraits : public CCMpfaInteractionVolumeTraitsBase<TypeTag>
{
using BaseTraits = CCMpfaInteractionVolumeTraitsBase<TypeTag>;
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
-
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+ using NodalIndexSet = typename CCMpfaDualGridIndexSet<TypeTag>::NodalIndexSet;
public:
- using BoundaryInteractionVolume = CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethod>;
+ using SecondaryInteractionVolume = CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethod>;
+
+ using typename BaseTraits::DynamicLocalIndexContainer;
+ using typename BaseTraits::DynamicGlobalIndexContainer;
+ using IndexSet = CCMpfaOInteractionVolumeIndexSet<NodalIndexSet, DynamicGlobalIndexContainer, DynamicLocalIndexContainer>;
- using PositionVector = std::vector<GlobalPosition>;
- using Matrix = Dune::DynamicMatrix<Scalar>;
- using Vector = typename Matrix::row_type;
+ // In the o-scheme, matrix & vector types are dynamic types
+ using typename BaseTraits::DynamicVector;
+ using typename BaseTraits::DynamicMatrix;
+ using Vector = DynamicVector;
+ using Matrix = DynamicMatrix;
- using LocalScvType = CCMpfaOLocalScv<TypeTag>;
- using LocalScvfType = CCMpfaOLocalScvf<TypeTag>;
- using typename BaseTraits::LocalIndexSet;
- using typename BaseTraits::GlobalIndexSet;
- using Seed = CCMpfaOInteractionVolumeSeed<GlobalIndexSet, LocalIndexSet, dim, dimWorld>;
+ using LocalScvType = CCMpfaOInteractionVolumeLocalScv<TypeTag, IndexSet>;
+ using LocalScvfType = CCMpfaOInteractionVolumeLocalScvf<TypeTag>;
};
//! Forward declaration of the mpfa-o interaction volume
-template<class TypeTag, class Traits, class Implementation>
+template<class TypeTag, class Traits>
class CCMpfaOInteractionVolume;
/*!
@@ -72,52 +70,26 @@ class CCMpfaOInteractionVolume;
* traits class.
*/
template<class TypeTag>
-class CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethod>
- : public CCMpfaOInteractionVolume<TypeTag,
- CCMpfaOInteractionVolumeTraits<TypeTag>,
- CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethod>>
+class CCMpfaInteractionVolumeImplementation< TypeTag, MpfaMethods::oMethod>
+ : public CCMpfaOInteractionVolume< TypeTag, CCMpfaOInteractionVolumeTraits<TypeTag> >
{
- using ThisType = CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethod>;
using TraitsType = CCMpfaOInteractionVolumeTraits<TypeTag>;
- using ParentType = CCMpfaOInteractionVolume<TypeTag, TraitsType, ThisType>;
-
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
-
- using IVSeed = typename TraitsType::Seed;
public:
// state the traits class type
using Traits = TraitsType;
-
- CCMpfaInteractionVolumeImplementation(const IVSeed& seed,
- const Problem& problem,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars)
- : ParentType(seed, problem, fvGeometry, elemVolVars)
- {}
-
};
-template<class TypeTag, class Traits, class Implementation>
+template<class TypeTag, class Traits>
class CCMpfaOInteractionVolume : public CCMpfaInteractionVolumeBase<TypeTag, Traits>
{
- // The actual implementation has to be friend
- friend Implementation;
-
using ParentType = CCMpfaInteractionVolumeBase<TypeTag, Traits>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using MpfaHelper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using InteriorBoundaryData = typename GET_PROP_TYPE(TypeTag, InteriorBoundaryData);
-
- static constexpr bool useTpfaBoundary = GET_PROP_VALUE(TypeTag, UseTpfaBoundary);
- static constexpr bool enableInteriorBoundaries = GET_PROP_VALUE(TypeTag, EnableInteriorBoundaries);
+ using DualGridNodalIndexSet = typename CCMpfaDualGridIndexSet<TypeTag>::NodalIndexSet;
static const int dim = GridView::dimension;
static const int dimWorld = GridView::dimensionworld;
@@ -125,468 +97,332 @@ class CCMpfaOInteractionVolume : public CCMpfaInteractionVolumeBase<TypeTag, Tra
using DimVector = Dune::FieldVector<Scalar, dim>;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using DynamicVector = typename Traits::Vector;
- using DynamicMatrix = typename Traits::Matrix;
+ using Vector = typename Traits::DynamicVector;
+ using Matrix = typename Traits::DynamicMatrix;
using Tensor = typename Traits::Tensor;
using LocalScvType = typename Traits::LocalScvType;
using LocalScvfType = typename Traits::LocalScvfType;
+ using IndexSet = typename Traits::IndexSet;
+ using LocalIndexContainer = typename Traits::DynamicLocalIndexContainer;
+ using LocalIndexType = typename LocalIndexContainer::value_type;
+ using GlobalIndexContainer = typename Traits::DynamicGlobalIndexContainer;
+ using DataHandle = typename Traits::DataHandle;
public:
- using typename ParentType::GlobalLocalFaceDataPair;
- using typename ParentType::LocalIndexType;
- using typename ParentType::LocalIndexSet;
+
+ //! publicly state the mpfa-scheme this interaction volume is associated with
+ static constexpr MpfaMethods MpfaMethod = MpfaMethods::oMethod;
+
using typename ParentType::LocalFaceData;
- using typename ParentType::GlobalIndexSet;
- using typename ParentType::PositionVector;
- using typename ParentType::Seed;
-
- CCMpfaOInteractionVolume(const Seed& seed,
- const Problem& problem,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars)
- : problemPtr_(&problem),
- fvGeometryPtr_(&fvGeometry),
- elemVolVarsPtr_(&elemVolVars),
- onDomainOrInteriorBoundary_(seed.onDomainOrInteriorBoundary())
+ using typename ParentType::DirichletDataContainer;
+ using typename ParentType::LocalFaceDataContainer;
+
+ //! Sets up the local scope for a given iv index set!
+ void setUpLocalScope(const IndexSet& indexSet,
+ const Problem& problem,
+ const FVElementGeometry& fvGeometry)
{
- // set up the local scope of this interaction volume
- bind(seed);
+ //! store a pointer to the index set
+ indexSetPtr_ = &indexSet;
- // initialize the vector containing the neumann fluxes
- asImp_().assembleNeumannFluxVector();
- }
+ //! clear previous data
+ clear_();
- template<typename GetTensorFunction>
- void solveLocalSystem(const GetTensorFunction& getTensor)
- {
- const auto numFluxFaces = fluxScvfIndexSet_().size();
+ //! number of interaction-volume-local faces
+ numFaces_ = indexSet.numFaces();
- // if only dirichlet faces are present, assemble T_ directly
- if (numFluxFaces == 0)
- return assemblePureDirichletSystem_(getTensor);
-
- const auto numFaces = localScvfs_.size();
- const auto numPotentials = volVarsStencil().size() + interiorDirichletScvfIndexSet_().size();
-
- // the local matrices
- DynamicMatrix A(numFluxFaces, numFluxFaces, 0.0);
- DynamicMatrix B(numFluxFaces, numPotentials, 0.0);
- DynamicMatrix C(numFaces, numFluxFaces, 0.0);
- DynamicMatrix D(numFaces, numPotentials, 0.0);
-
- assembleLocalMatrices_(getTensor, A, B, C, D);
-
- // solve local system and store matrices
- DynamicMatrix copy(B);
- A.invert();
- AinvB_ = B.leftmultiply(A);
- CAinv_ = C.rightmultiply(A);
- T_ = multiplyMatrices(CAinv_, copy);
- T_ += D;
- }
+ //! number of interaction-volume-local (and node-local) scvs
+ const auto& scvIndices = indexSet.globalScvIndices();
+ const auto numLocalScvs = indexSet.numScvs();
- //! Gets the transmissibilities for a sub-control volume face within the interaction volume.
- //! specialization for dim == dimWorld
- template<int d = dim, int dw = dimWorld>
- typename std::enable_if< (d == dw), DynamicVector >::type
- getTransmissibilities(const LocalFaceData& localFaceData) const
- {
- if (localFaceData.isOutside)
+ //! number of global scvfs appearing in this interaction volume
+ const auto numGlobalScvfs = indexSet.nodalIndexSet().numScvfs();
+
+ //! reserve memory for local entities
+ elements_.reserve(numLocalScvs);
+ scvs_.reserve(numLocalScvs);
+ scvfs_.reserve(numFaces_);
+ dirichletData_.reserve(numFaces_);
+ localFaceData_.reserve(numGlobalScvfs);
+
+ // set up quantities related to sub-control volumes
+ for (LocalIndexType scvIdxLocal = 0; scvIdxLocal < numLocalScvs; scvIdxLocal++)
{
- auto tij = T_[localFaceData.localScvfIndex];
- tij *= -1.0;
- return tij;
+ const auto scvIdxGlobal = scvIndices[scvIdxLocal];
+ scvs_.emplace_back(fvGeometry, fvGeometry.scv(scvIdxGlobal), scvIdxLocal, indexSet);
+ elements_.emplace_back(fvGeometry.fvGridGeometry().element(scvIdxGlobal));
}
- else
- return T_[localFaceData.localScvfIndex];
- }
- //! Gets the transmissibilities for a sub-control volume face within the interaction volume.
- //! specialization for dim < dimWorld.
- template<int d = dim, int dw = dimWorld>
- typename std::enable_if< (d < dw), DynamicVector >::type
- getTransmissibilities(const LocalFaceData& localFaceData) const
- {
- // If we come from the inside, simply return tij
- if (!localFaceData.isOutside)
- return T_[localFaceData.localScvfIndex];
-
- // compute the outside transmissibilities
- DynamicVector tij(volVarsStencil().size() + interiorDirichletScvfIndexSet_().size(), 0.0);
-
- // get the local scv and iterate over local coordinates
- const auto numLocalScvs = localScvs_.size();
- const auto numDirichletScvfs = dirichletScvfIndexSet_().size();
- const auto& localScv = localScv_(localFaceData.localScvIndex);
- const auto& localScvf = localScvf_(localFaceData.localScvfIndex);
-
- const auto idxInOutside = this->findIndexInVector(localScvf.outsideLocalScvIndices(), localFaceData.localScvIndex);
- const auto& wijk = wijk_[localFaceData.localScvfIndex][idxInOutside+1];
- for (int localDir = 0; localDir < dim; localDir++)
+ // keep track of the number of unknowns etc
+ numUnknowns_ = 0;
+ numOutsideFaces_ = 0;
+ numPotentials_ = numLocalScvs;
+
+ // set up quantitites related to sub-control volume faces
+ for (LocalIndexType faceIdxLocal = 0; faceIdxLocal < numFaces_; ++faceIdxLocal)
{
- const auto localScvfIdx = localScv.localScvfIndex(localDir);
- const auto& localScvf = localScvf_(localScvfIdx);
+ const auto scvfIdxGlobal = indexSet.scvfIdxGlobal(faceIdxLocal);
+ const auto& neighborScvIndicesLocal = indexSet.neighboringLocalScvIndices(faceIdxLocal);
+ const auto insideLocalScvIdx = neighborScvIndicesLocal[0];
- const auto faceType = localScvf.faceType();
- if (faceType != MpfaFaceTypes::dirichlet && faceType != MpfaFaceTypes::interiorDirichlet)
- {
- const auto fluxFaceIndex = this->findIndexInVector(fluxScvfIndexSet_(), localScvfIdx);
- auto tmp = AinvB_[fluxFaceIndex];
- tmp *= wijk[localDir];
+ // we have to use the "inside" scv face here
+ const auto& scvf = fvGeometry.scvf(scvfIdxGlobal);
- tij += tmp;
- }
- else if (faceType == MpfaFaceTypes::dirichlet)
+ // create local face data object for this face
+ localFaceData_.emplace_back(faceIdxLocal, insideLocalScvIdx, scvf.index());
+
+ // create iv-local scvf object
+ if (scvf.boundary())
{
- const auto idxInDiriFaces = this->findIndexInVector(dirichletScvfIndexSet_(), localScvfIdx);
- tij[numLocalScvs + idxInDiriFaces] += wijk[localDir];
+ const auto insideElement = elements_[insideLocalScvIdx];
+ const auto bcTypes = problem.boundaryTypes(insideElement, scvf);
+
+ if (bcTypes.hasOnlyDirichlet())
+ {
+ scvfs_.emplace_back(scvf, neighborScvIndicesLocal, /*isDirichlet*/true, numPotentials_++);
+ dirichletData_.emplace_back(scvf.outsideScvIdx(), scvf.ipGlobal());
+ }
+ else
+ scvfs_.emplace_back(scvf, neighborScvIndicesLocal, /*isDirichlet*/false, numUnknowns_++);
}
- else if (faceType == MpfaFaceTypes::interiorDirichlet)
+ else
{
- const auto idxInInteriorDiriFaces = this->findIndexInVector(interiorDirichletScvfIndexSet_(), localScvfIdx);
- tij[numLocalScvs + numDirichletScvfs + idxInInteriorDiriFaces] += wijk[localDir];
- }
+ scvfs_.emplace_back(scvf, neighborScvIndicesLocal, /*isDirichlet*/false, numUnknowns_++);
- // add entry from the scv unknown
- tij[localFaceData.localScvIndex] -= wijk[localDir];
- }
+ // add local face data object for the outside faces
+ for (LocalIndexType i = 1; i < neighborScvIndicesLocal.size(); ++i)
+ {
+ const auto outsideLocalScvIdx = neighborScvIndicesLocal[i];
- return tij;
- }
+ // loop over scvfs in outside scv until we find the one coinciding with current scvf
+ for (int coord = 0; coord < dim; ++coord)
+ {
+ if (indexSet.scvfIdxLocal(outsideLocalScvIdx, coord) == faceIdxLocal)
+ {
+ const auto globalScvfIdx = indexSet.nodalIndexSet().scvfIdxGlobal(outsideLocalScvIdx, coord);
+ const auto& flipScvf = fvGeometry.scvf(globalScvfIdx);
+ localFaceData_.emplace_back(faceIdxLocal, //! iv-local scvf idx
+ outsideLocalScvIdx, //! iv-local scv index
+ numOutsideFaces_++, //! iv-local index in outside faces
+ i-1, //! scvf-local index in outside faces
+ flipScvf.index()); //! global scvf index
+ }
+ }
+ }
+ }
+ }
- //! Returns the vector of coefficients with which the vector of neumann boundary conditions
- //! has to be multiplied in order to transform them on the scvf this cache belongs to
- DynamicVector getNeumannFluxTransformationCoefficients(const LocalFaceData& localFaceData) const
- {
- auto cij = CAinv_[localFaceData.localScvfIndex];
- if (localFaceData.isOutside)
- cij *= -1.0;
- return cij;
+ // resize the local matrices
+ A_.resize(numUnknowns_, numUnknowns_);
+ B_.resize(numUnknowns_, numPotentials_);
+ C_.resize(numFaces_, numUnknowns_);
+ D_.resize(numFaces_, numPotentials_);
}
- Scalar getNeumannFlux(const LocalFaceData& localFaceData, unsigned int eqIdx) const
+ //! sets the sizes of the corresponding matrices in the data handle
+ void prepareDataHandle(DataHandle& dataHandle)
{
- if (!onDomainOrInteriorBoundary() || useTpfaBoundary || fluxScvfIndexSet_().size() == 0 )
- return 0.0;
-
- // Do the scalar product CAinv_*neumannFluxes[eqIdx]
- assert(CAinv_[localFaceData.localScvfIndex].size() == neumannFluxes_.size() &&
- "Number of columns of matrix does not correspond to number entries in vector!");
-
- Scalar flux(0.0);
- for (unsigned int i = 0; i < neumannFluxes_.size(); ++i)
- flux += CAinv_[localFaceData.localScvfIndex][i] * neumannFluxes_[i][eqIdx];
-
- // flip sign if we are coming from the outside
- if (localFaceData.isOutside)
- return -1.0*flux;
-
- return flux;
+ // resize the transmissibility matrix in the data handle
+ dataHandle.resizeT(numFaces_, numPotentials_);
+
+ // resize possible additional containers in the data handle
+ if (requireABMatrix_())
+ dataHandle.resizeAB(numUnknowns_, numPotentials_);
+ if (dim < dimWorld)
+ dataHandle.resizeOutsideTij(numOutsideFaces_, numPotentials_);
}
- // Per default we do not add additional terms for interior Neumann boundaries
- // Overload this function to realize interior membranes etc...
+ //! solves for the transmissibilities subject to a given tensor
template<typename GetTensorFunction>
- Scalar interiorNeumannTerm(const GetTensorFunction& getTensor,
- const Element& element,
- const LocalScvfType& localScvf,
- const InteriorBoundaryData& data) const
- { return 0.0; }
-
- void assembleNeumannFluxVector()
+ void solveLocalSystem(const GetTensorFunction& getTensor,
+ const Problem& problem,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ DataHandle& dataHandle)
{
- // initialize the neumann fluxes vector to zero
- neumannFluxes_.resize(fluxFaceIndexSet_.size(), PrimaryVariables(0.0));
-
- if (!onDomainOrInteriorBoundary() || useTpfaBoundary)
- return;
-
- LocalIndexType fluxFaceIdx = 0;
- for (auto localFluxFaceIdx : fluxFaceIndexSet_)
+ // if only dirichlet faces are present, assemble T_ directly
+ if (numUnknowns_ == 0)
+ assemblePureDirichletT_(getTensor, problem, fvGeometry, elemVolVars, dataHandle.T());
+ else
{
- const auto& localScvf = localScvf_(localFluxFaceIdx);
- const auto faceType = localScvf.faceType();
-
- if (faceType == MpfaFaceTypes::neumann || faceType == MpfaFaceTypes::interiorNeumann)
- {
- const auto& element = localElement_(localScvf.insideLocalScvIndex());
- const auto& globalScvf = fvGeometry_().scvf(localScvf.insideGlobalScvfIndex());
- auto neumannFlux = problem_().neumann(element, this->fvGeometry_(), this->elemVolVars_(), globalScvf);
- neumannFlux *= globalScvf.area();
- neumannFlux *= elemVolVars_()[globalScvf.insideScvIdx()].extrusionFactor();
-
- // The flux is assumed to be prescribed in the form of -D*gradU
- neumannFluxes_[fluxFaceIdx] = neumannFlux;
- }
-
- fluxFaceIdx++;
- }
- }
-
- const LocalFaceData& getLocalFaceData(const SubControlVolumeFace& scvf) const
- { return globalLocalScvfPairedData_[this->findIndexInVector(globalScvfIndices_, scvf.index())].second; }
+ // assemble
+ assembleLocalMatrices_(getTensor, problem, fvGeometry, elemVolVars);
- bool onDomainOrInteriorBoundary() const
- { return onDomainOrInteriorBoundary_; }
+ // solve
+ A_.invert();
- const GlobalIndexSet& volVarsStencil() const
- { return volVarsStencil_; }
+ // T = C*A^-1*B + D
+ dataHandle.T() = multiplyMatrices(C_.rightmultiply(A_), B_);
+ dataHandle.T() += D_;
- const PositionVector& volVarsPositions() const
- { return volVarsPositions_; }
+ // store A-1B only when gradient reconstruction is necessary
+ if (requireABMatrix_())
+ dataHandle.AB() = B_.leftmultiply(A_);
+ }
- const std::vector<GlobalLocalFaceDataPair>& globalLocalScvfPairedData() const
- { return globalLocalScvfPairedData_; }
+ // // set vol vars stencil & positions pointer in handle
+ dataHandle.setVolVarsStencilPointer(indexSet().globalScvIndices());
+ dataHandle.setDirichletDataPointer(dirichletData_);
- const std::vector<InteriorBoundaryData>& interiorBoundaryData() const
- { return interiorBoundaryData_; }
+ // on surface grids, additionally prepare the outside transmissibilities
+ if (dim < dimWorld)
+ computeOutsideTransmissibilities_(dataHandle);
+ }
-private:
+ //! obtain the local data object for a given global scvf
+ const LocalFaceData& getLocalFaceData(const SubControlVolumeFace& scvf) const
+ {
+ //! find corresponding entry in the local face data container
+ const auto scvfIdxGlobal = scvf.index();
+ auto it = std::find_if(localFaceData_.begin(),
+ localFaceData_.end(),
+ [scvfIdxGlobal] (const LocalFaceData& d) { return d.globalScvfIndex() == scvfIdxGlobal; });
+ assert(it != localFaceData_.end() && "Could not find the local face data corresponding to the given scvf");
+ return localFaceData_[std::distance(localFaceData_.begin(), it)];
+ }
- const LocalScvfType& localScvf_(const LocalIndexType localScvfIdx) const
- { return localScvfs_[localScvfIdx]; }
+ //! returns the grid element corresponding to a given iv-local scv idx
+ const Element& element(const LocalIndexType ivLocalScvIdx) const { return elements_[ivLocalScvIdx]; }
- const LocalScvType& localScv_(const LocalIndexType localScvIdx) const
- { return localScvs_[localScvIdx]; }
+ //! returns the local scvf entity corresponding to a given iv-local scvf idx
+ const LocalScvfType& localScvf(const LocalIndexType ivLocalScvfIdx) const { return scvfs_[ivLocalScvfIdx]; }
- const LocalIndexSet& fluxScvfIndexSet_() const
- { return fluxFaceIndexSet_; }
+ //! returns the local scv entity corresponding to a given iv-local scv idx
+ const LocalScvType& localScv(const LocalIndexType ivLocalScvfIdx) const { return scvs_[ivLocalScvfIdx]; }
- const LocalIndexSet& dirichletScvfIndexSet_() const
- { return dirichletFaceIndexSet_; }
+ //! returns a reference to the container with the data on Dirichlet boundaries
+ const DirichletDataContainer& dirichletData() const { return dirichletData_; }
- const LocalIndexSet& interiorDirichletScvfIndexSet_() const
- { return interiorDirichletFaceIndexSet_; }
+ //! returns a reference to the container with the local face data
+ const std::vector<LocalFaceData>& localFaceData() const { return localFaceData_; }
- const LocalIndexSet& interiorBoundaryScvfIndexSet_() const
- { return interiorBoundaryFaceIndexSet_; }
+ //! returns a reference to the index set of this iv
+ const IndexSet& indexSet() const { return *indexSetPtr_; }
- const Element& localElement_(const LocalIndexType localScvIdx) const
- { return localElements_[localScvIdx]; }
+ //! returns the number of interaction volumes living around a vertex
+ //! the mpfa-o scheme always constructs one iv per vertex
+ static std::size_t numInteractionVolumesAtVertex(const DualGridNodalIndexSet& nodalIndexSet) { return 1; }
- void bind(const Seed& seed)
+ //! adds the iv index sets living around a vertex to a given container
+ //! and stores the the corresponding index in a map for each scvf
+ template<class IvIndexSetContainer, class ScvfIndexMap>
+ static void addInteractionVolumeIndexSets(IvIndexSetContainer& ivIndexSetContainer,
+ ScvfIndexMap& scvfIndexMap,
+ const DualGridNodalIndexSet& nodalIndexSet)
{
- const auto numLocalScvs = seed.scvSeeds().size();
- const auto numLocalScvfs = seed.scvfSeeds().size();
- const auto numGlobalScvfs = seed.globalScvfIndices().size();
- const auto maxNumVolVars = numLocalScvs + numLocalScvfs;
-
- //! reserve memory for local entities
- localElements_.reserve(numLocalScvs);
- localScvs_.reserve(numLocalScvs);
- localScvfs_.reserve(numLocalScvfs);
- globalLocalScvfPairedData_.reserve(numGlobalScvfs);
- globalScvfIndices_.reserve(numGlobalScvfs);
-
- //! reserve memory for the index sets
- volVarsStencil_ = seed.globalScvIndices(); // boundary vol vars are placed at the end
- volVarsStencil_.reserve(maxNumVolVars);
- volVarsPositions_.reserve(maxNumVolVars);
- dirichletFaceIndexSet_.reserve(numLocalScvfs);
- interiorDirichletFaceIndexSet_.reserve(numLocalScvfs);
- interiorBoundaryFaceIndexSet_.reserve(numLocalScvfs);
- interiorBoundaryData_.reserve(numLocalScvfs);
- fluxFaceIndexSet_.reserve(numLocalScvfs);
-
- // set up quantities related to sub-control volumes
- for (auto&& scvSeed : seed.scvSeeds())
- {
- const auto element = problem_().model().fvGridGeometry().element(scvSeed.globalIndex());
- localScvs_.emplace_back(problem_(), element, fvGeometry_(), scvSeed);
- localElements_.emplace_back(std::move(element));
- volVarsPositions_.push_back(localScvs_.back().center());
- }
+ // the global index of the iv index set that is about to be created
+ const auto curGlobalIndex = ivIndexSetContainer.size();
- // set up quantitites related to sub-control volume faces
- LocalIndexType localFaceIdx = 0;
- for (auto&& scvfSeed : seed.scvfSeeds())
- {
- const auto faceType = scvfSeed.faceType();
+ // make the one index set for this node
+ ivIndexSetContainer.emplace_back(nodalIndexSet);
- // we have to use the "inside" scv face here
- const auto& scvf = fvGeometry_().scvf(scvfSeed.insideGlobalScvfIndex());
- localScvfs_.emplace_back(scvfSeed, scvf);
-
- // create global/local face data for this face
- // we simultaneously store the corresponding global scvf indices (allows global to local mapping later)
- globalLocalScvfPairedData_.emplace_back(&scvf, LocalFaceData(localFaceIdx, scvfSeed.insideLocalScvIndex(), false));
- globalScvfIndices_.push_back(scvf.index());
+ // store the index mapping
+ for (const auto scvfIdx : nodalIndexSet.globalScvfIndices())
+ scvfIndexMap[scvfIdx] = curGlobalIndex;
+ }
- // set data depending on the face type
- // obtain the local scvf entity just inserted
- const auto& localScvf = localScvfs_.back();
+private:
+ //! returns a boolean whether or not the AB matrix has to be passed to the handles
+ static bool requireABMatrix_()
+ {
+ static const bool requireAB = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Vtk.AddVelocity") || dim < dimWorld;
+ return requireAB;
+ }
- // interior faces are flux faces
- // also, set up outside global/local data for all the neighbors
- if (faceType == MpfaFaceTypes::interior)
- {
- for (unsigned int i = 0; i < localScvf.outsideGlobalScvfIndices().size(); ++i)
- {
- const auto& outsideScvf = fvGeometry_().scvf(localScvf.outsideGlobalScvfIndex(i));
- globalLocalScvfPairedData_.emplace_back( &outsideScvf,
- LocalFaceData(localFaceIdx, scvfSeed.outsideLocalScvIndex(i), true) );
- globalScvfIndices_.push_back(outsideScvf.index());
- }
- fluxFaceIndexSet_.push_back(localFaceIdx++);
- }
- // dirichlet faces are in the "stencil"
- else if (faceType == MpfaFaceTypes::dirichlet)
- {
- volVarsStencil_.push_back(localScvf.outsideGlobalScvIndex());
- volVarsPositions_.push_back(localScvf.ip());
- dirichletFaceIndexSet_.push_back(localFaceIdx++);
- }
- // neumann faces have an unknown associated with them
- else if (faceType == MpfaFaceTypes::neumann)
- {
- fluxFaceIndexSet_.push_back(localFaceIdx++);
- }
- // interior neumann faces additionally produce interior boundary data
- else if (faceType == MpfaFaceTypes::interiorNeumann)
- {
- interiorBoundaryData_.push_back(InteriorBoundaryData(problem_(),
- localScvf.insideGlobalScvIndex(),
- localScvf.insideGlobalScvfIndex(),
- fluxFaceIndexSet_.size(),
- faceType));
- fluxFaceIndexSet_.push_back(localFaceIdx);
- interiorBoundaryFaceIndexSet_.push_back(localFaceIdx++);
- }
- // as well as interior Dirichlet boundaries
- else if (faceType == MpfaFaceTypes::interiorDirichlet)
- {
- interiorBoundaryData_.push_back(InteriorBoundaryData(problem_(),
- localScvf.insideGlobalScvIndex(),
- localScvf.insideGlobalScvfIndex(),
- interiorDirichletFaceIndexSet_.size(),
- faceType));
- interiorDirichletFaceIndexSet_.push_back(localFaceIdx);
- interiorBoundaryFaceIndexSet_.push_back(localFaceIdx++);
- }
- else
- DUNE_THROW(Dune::InvalidStateException, "Face type can not be handled by the mpfa o-method.");
- }
+ //! clears all the containers
+ void clear_()
+ {
+ elements_.clear();
+ scvs_.clear();
+ scvfs_.clear();
+ localFaceData_.clear();
+ dirichletData_.clear();
}
+ //! Assembles the local matrices that define the local system of equations and flux expressions
template<typename GetTensorFunction>
void assembleLocalMatrices_(const GetTensorFunction& getTensor,
- DynamicMatrix& A,
- DynamicMatrix& B,
- DynamicMatrix& C,
- DynamicMatrix& D)
+ const Problem& problem,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars)
{
- static const auto xi = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Mpfa, Xi);
- const auto numLocalScvs = localScvs_.size();
- const auto numDirichletScvfs = dirichletScvfIndexSet_().size();
+ // reset matrices
+ A_ = 0.0;
+ B_ = 0.0;
+ C_ = 0.0;
+ D_ = 0.0;
// reserve space for the omegas
- wijk_.resize(localScvfs_.size());
+ wijk_.resize(scvfs_.size());
// loop over the local faces
- unsigned int rowIdx = 0;
- for (auto&& localScvf : localScvfs_)
+ for (LocalIndexType faceIdx = 0; faceIdx < numFaces_; ++faceIdx)
{
- const auto faceType = localScvf.faceType();
- const bool hasUnknown = faceType != MpfaFaceTypes::dirichlet && faceType != MpfaFaceTypes::interiorDirichlet;
- const LocalIndexType idxInFluxFaces = hasUnknown ? this->findIndexInVector(fluxScvfIndexSet_(), rowIdx) : -1;
+ const auto& curLocalScvf = localScvf(faceIdx);
+ const auto& curGlobalScvf = fvGeometry.scvf(curLocalScvf.globalScvfIndex());
+ const auto curIsDirichlet = curLocalScvf.isDirichlet();
+ const auto curLocalDofIdx = curLocalScvf.localDofIndex();
// get diffusion tensor in "positive" sub volume
- const auto posLocalScvIdx = localScvf.insideLocalScvIndex();
- const auto& posLocalScv = localScv_(posLocalScvIdx);
- const auto& posGlobalScv = fvGeometry_().scv(posLocalScv.globalIndex());
- const auto& posVolVars = elemVolVars_()[posGlobalScv];
- const auto& element = localElement_(posLocalScvIdx);
- const auto tensor = getTensor(problem_(), element, posVolVars, fvGeometry_(), posGlobalScv);
+ const auto& neighborScvIndices = curLocalScvf.neighboringLocalScvIndices();
+ const auto posLocalScvIdx = neighborScvIndices[0];
+ const auto& posLocalScv = localScv(posLocalScvIdx);
+ const auto& posGlobalScv = fvGeometry.scv(posLocalScv.globalScvIndex());
+ const auto& posVolVars = elemVolVars[posGlobalScv];
+ const auto& posElement = element(posLocalScvIdx);
+ const auto tensor = getTensor(problem, posElement, posVolVars, fvGeometry, posGlobalScv);
// the omega factors of the "positive" sub volume
- auto posWijk = calculateOmegas_(posLocalScv, localScvf.unitOuterNormal(), localScvf.area(), tensor);
+ auto posWijk = calculateOmegas_(posLocalScv, curGlobalScvf.unitOuterNormal(), curGlobalScvf.area(), tensor);
posWijk *= posVolVars.extrusionFactor();
- // Check the local directions of the positive sub volume
- for (int localDir = 0; localDir < dim; localDir++)
+ // go over the coordinate directions in the positive sub volume
+ for (unsigned int localDir = 0; localDir < dim; localDir++)
{
- const auto curLocalScvfIdx = posLocalScv.localScvfIndex(localDir);
- const auto& curLocalScvf = localScvf_(curLocalScvfIdx);
- const auto curFaceType = curLocalScvf.faceType();
-
- // First, add the entries associated with unknown face pressures
- if (curFaceType != MpfaFaceTypes::dirichlet && curFaceType != MpfaFaceTypes::interiorDirichlet)
- {
- // we need the index of the current local scvf in the flux face indices
- auto curIdxInFluxFaces = this->findIndexInVector(fluxScvfIndexSet_(), curLocalScvfIdx);
+ const auto otherLocalScvfIdx = posLocalScv.scvfIdxLocal(localDir);
+ const auto& otherLocalScvf = localScvf(otherLocalScvfIdx);
+ const auto otherLocalDofIdx = otherLocalScvf.localDofIndex();
- // this creates an entry in matrix C
- C[rowIdx][curIdxInFluxFaces] += posWijk[localDir];
-
- // proceed depending on if the current face has an unknown
- if (hasUnknown)
- {
- if (faceType == MpfaFaceTypes::interiorNeumann)
- {
- // on interior neumann faces, apply xi factor
- // However, if this is a boundary face at the same time, don't!
- A[idxInFluxFaces][curIdxInFluxFaces] += localScvf.globalScvf().boundary() ? posWijk[localDir] : xi*posWijk[localDir];
-
- // maybe add terms stemming from the interior boundary (in case of facet coupling or membrane modelling)
- if (curIdxInFluxFaces == idxInFluxFaces)
- {
- const auto& data = interiorBoundaryData_[this->findIndexInVector(interiorBoundaryScvfIndexSet_(), curLocalScvfIdx)];
- A[idxInFluxFaces][curIdxInFluxFaces] += asImp_().interiorNeumannTerm(getTensor, element, curLocalScvf, data);
- }
- }
- // this means we are on an interior face
- else
- A[idxInFluxFaces][curIdxInFluxFaces] += posWijk[localDir];
- }
- }
- else if (curFaceType == MpfaFaceTypes::dirichlet)
+ // if we are not on a Dirichlet face, add entries associated with unknown face pressures
+ // i.e. in matrix C and maybe A (if current face is not a Dirichlet face)
+ if (!otherLocalScvf.isDirichlet())
{
- // the current face is a Dirichlet face and creates entries in D & eventually B
- auto curIdxInDiriFaces = this->findIndexInVector(dirichletScvfIndexSet_(), curLocalScvfIdx);
-
- D[rowIdx][numLocalScvs + curIdxInDiriFaces] += posWijk[localDir];
- if (hasUnknown)
- B[idxInFluxFaces][numLocalScvs + curIdxInDiriFaces] -= posWijk[localDir];
+ C_[faceIdx][otherLocalDofIdx] -= posWijk[localDir];
+ if (!curIsDirichlet)
+ A_[curLocalDofIdx][otherLocalDofIdx] -= posWijk[localDir];
}
- else if (curFaceType == MpfaFaceTypes::interiorDirichlet)
+ // the current face is a Dirichlet face and creates entries in D & maybe B
+ else
{
- // the current face is an interior Dirichlet face and creates entries in D & eventually B
- auto curIdxInInteriorDiriFaces = this->findIndexInVector(interiorDirichletScvfIndexSet_(), curLocalScvfIdx);
-
- D[rowIdx][numLocalScvs + numDirichletScvfs + curIdxInInteriorDiriFaces] += posWijk[localDir];
- if (hasUnknown)
- B[idxInFluxFaces][numLocalScvs + numDirichletScvfs + curIdxInInteriorDiriFaces] -= posWijk[localDir];
+ D_[faceIdx][otherLocalDofIdx] -= posWijk[localDir];
+ if (!curIsDirichlet)
+ B_[curLocalDofIdx][otherLocalDofIdx] += posWijk[localDir];
}
// add entries related to pressures at the scv centers (dofs)
- D[rowIdx][posLocalScvIdx] -= posWijk[localDir];
+ const auto posScvLocalDofIdx = posLocalScv.localDofIndex();
+ D_[faceIdx][posScvLocalDofIdx] += posWijk[localDir];
- if (hasUnknown)
- {
- if (faceType == MpfaFaceTypes::interiorNeumann && !localScvf.globalScvf().boundary())
- B[idxInFluxFaces][posLocalScvIdx] += xi*posWijk[localDir];
- else
- B[idxInFluxFaces][posLocalScvIdx] += posWijk[localDir];
- }
+ if (!curIsDirichlet)
+ B_[curLocalDofIdx][posScvLocalDofIdx] -= posWijk[localDir];
}
// store the omegas
- wijk_[rowIdx].emplace_back(std::move(posWijk));
+ wijk_[faceIdx].emplace_back(std::move(posWijk));
- // If we are on an interior or interior neumann face, add values from negative sub volume
- if (!localScvf.globalScvf().boundary() &&
- (faceType == MpfaFaceTypes::interior || faceType == MpfaFaceTypes::interiorNeumann))
+ // If we are on an interior face, add values from negative sub volume
+ if (!curGlobalScvf.boundary())
{
// loop over all the outside neighbors of this face and add entries
- unsigned int indexInOutsideData = 0;
- for (auto negLocalScvIdx : localScvf.outsideLocalScvIndices())
+ for (unsigned int idxInOutside = 0; idxInOutside < curGlobalScvf.numOutsideScvs(); ++idxInOutside)
{
- const auto& negLocalScv = localScv_(negLocalScvIdx);
- const auto& negGlobalScv = fvGeometry_().scv(negLocalScv.globalIndex());
- const auto& negVolVars = elemVolVars_()[negGlobalScv];
- const auto& negElement = localElement_(negLocalScvIdx);
- const auto negTensor = getTensor(problem_(), negElement, negVolVars, fvGeometry_(), negGlobalScv);
+ const auto negLocalScvIdx = neighborScvIndices[idxInOutside+1];
+ const auto& negLocalScv = localScv(negLocalScvIdx);
+ const auto& negGlobalScv = fvGeometry.scv(negLocalScv.globalScvIndex());
+ const auto& negVolVars = elemVolVars[negGlobalScv];
+ const auto& negElement = element(negLocalScvIdx);
+ const auto negTensor = getTensor(problem, negElement, negVolVars, fvGeometry, negGlobalScv);
// the omega factors of the "negative" sub volume
DimVector negWijk;
@@ -594,148 +430,151 @@ private:
// if dim < dimWorld, use outside normal vector
if (dim < dimWorld)
{
- // outside scvf
- const auto& outsideScvf = fvGeometry_().scvf(localScvf.outsideGlobalScvfIndex(indexInOutsideData));
- auto negNormal = outsideScvf.unitOuterNormal();
+ const auto& flipScvf = fvGeometry.flipScvf(curGlobalScvf.index(), idxInOutside);
+ auto negNormal = flipScvf.unitOuterNormal();
negNormal *= -1.0;
- negWijk = calculateOmegas_(negLocalScv, negNormal, localScvf.area(), negTensor);
+ negWijk = calculateOmegas_(negLocalScv, negNormal, curGlobalScvf.area(), negTensor);
}
else
- negWijk = calculateOmegas_(negLocalScv, localScvf.unitOuterNormal(), localScvf.area(), negTensor);
+ negWijk = calculateOmegas_(negLocalScv, curGlobalScvf.unitOuterNormal(), curGlobalScvf.area(), negTensor);
// scale by extrusion factpr
negWijk *= negVolVars.extrusionFactor();
- // Check local directions of negative sub volume
+ // go over the coordinate directions in the positive sub volume
for (int localDir = 0; localDir < dim; localDir++)
{
- const auto curLocalScvfIdx = negLocalScv.localScvfIndex(localDir);
- const auto& curLocalScvf = localScvf_(curLocalScvfIdx);
- const auto curFaceType = curLocalScvf.faceType();
+ const auto otherLocalScvfIdx = negLocalScv.scvfIdxLocal(localDir);
+ const auto& otherLocalScvf = localScvf(otherLocalScvfIdx);
+ const auto otherLocalDofIdx = otherLocalScvf.localDofIndex();
- if (curFaceType != MpfaFaceTypes::dirichlet && curFaceType != MpfaFaceTypes::interiorDirichlet)
- {
- if (faceType == MpfaFaceTypes::interiorNeumann)
- A[idxInFluxFaces][this->findIndexInVector(fluxScvfIndexSet_(), curLocalScvfIdx)] -= (1-xi)*negWijk[localDir];
- else
- A[idxInFluxFaces][this->findIndexInVector(fluxScvfIndexSet_(), curLocalScvfIdx)] -= negWijk[localDir];
- }
- else if (curFaceType == MpfaFaceTypes::interiorDirichlet)
- {
- const auto idxInInteriorDiriFaces = this->findIndexInVector(interiorDirichletScvfIndexSet_(), curLocalScvfIdx);
- B[idxInFluxFaces][numLocalScvs + numDirichletScvfs + idxInInteriorDiriFaces] += negWijk[localDir];
- }
- else // Dirichlet face
- B[idxInFluxFaces][numLocalScvs + this->findIndexInVector(dirichletScvfIndexSet_(), curLocalScvfIdx)] += negWijk[localDir];
+ if (!otherLocalScvf.isDirichlet())
+ A_[curLocalDofIdx][otherLocalDofIdx] += negWijk[localDir];
+ else
+ B_[curLocalDofIdx][otherLocalDofIdx] -= negWijk[localDir];
// add entries to matrix B
- if (faceType == MpfaFaceTypes::interiorNeumann)
- B[idxInFluxFaces][negLocalScvIdx] -= (1-xi)*negWijk[localDir];
- else
- B[idxInFluxFaces][negLocalScvIdx] -= negWijk[localDir];
+ B_[curLocalDofIdx][negLocalScv.localDofIndex()] += negWijk[localDir];
}
- // store the omegas (negative, because of normal vector sign switch)
- negWijk *= -1.0;
- wijk_[rowIdx].emplace_back(std::move(negWijk));
-
- // increment counter in outside data
- indexInOutsideData++;
+ // store the omegas
+ wijk_[faceIdx].emplace_back(std::move(negWijk));
}
}
- // go to the next face
- rowIdx++;
}
}
+ //! for interaction volumes that have only dirichlet scvfs,
+ //! the transmissibility matrix can be assembled directly
template<typename GetTensorFunction>
- void assemblePureDirichletSystem_(const GetTensorFunction& getTensor)
+ void assemblePureDirichletT_(const GetTensorFunction& getTensor,
+ const Problem& problem,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ Matrix& T)
{
- const auto numLocalScvs = localScvs_.size();
- const auto numFaces = localScvfs_.size();
- const auto numInteriorDirichletFaces = interiorDirichletScvfIndexSet_().size();
- const auto numPotentials = volVarsStencil().size() + numInteriorDirichletFaces;
-
- // resize matrices, only T_ will have entries
- T_.resize(numFaces, numPotentials, 0.0);
- AinvB_.resize(0, 0);
- CAinv_.resize(0, 0);
-
- // resize the omegas
- wijk_.resize(numFaces);
+ // reset the transmissibility matrix beforehand
+ T = 0.0;
// Loop over all the faces, in this case these are all dirichlet boundaries
- LocalIndexType rowIdx = 0;
- for (auto&& localScvf : localScvfs_)
+ for (unsigned int faceIdx = 0; faceIdx < numFaces_; ++faceIdx)
{
+ const auto& curLocalScvf = localScvf(faceIdx);
+ const auto& curGlobalScvf = fvGeometry.scvf(curLocalScvf.globalScvfIndex());
+
// get diffusion tensor in "positive" sub volume
- const auto posLocalScvIdx = localScvf.insideLocalScvIndex();
- const auto& posLocalScv = localScv_(posLocalScvIdx);
- const auto& posGlobalScv = fvGeometry_().scv(posLocalScv.globalIndex());
- const auto& posVolVars = elemVolVars_()[posGlobalScv];
- const auto element = localElement_(posLocalScvIdx);
- const auto tensor = getTensor(problem_(), element, posVolVars, fvGeometry_(), posGlobalScv);
+ const auto& neighborScvIndices = curLocalScvf.neighboringLocalScvIndices();
+ const auto posLocalScvIdx = neighborScvIndices[0];
+ const auto& posLocalScv = localScv(posLocalScvIdx);
+ const auto& posGlobalScv = fvGeometry.scv(posLocalScv.globalScvIndex());
+ const auto& posVolVars = elemVolVars[posGlobalScv];
+ const auto& posElement = element(posLocalScvIdx);
+ const auto tensor = getTensor(problem, posElement, posVolVars, fvGeometry, posGlobalScv);
// the omega factors of the "positive" sub volume
- auto posWijk = calculateOmegas_(posLocalScv, localScvf.unitOuterNormal(), localScvf.area(), tensor);
+ auto posWijk = calculateOmegas_(posLocalScv, curGlobalScvf.unitOuterNormal(), curGlobalScvf.area(), tensor);
posWijk *= posVolVars.extrusionFactor();
- for (int localDir = 0; localDir < dim; localDir++)
+ const auto posScvLocalDofIdx = posLocalScv.localDofIndex();
+ for (LocalIndexType localDir = 0; localDir < dim; localDir++)
+ {
+ const auto otherLocalScvfIdx = posLocalScv.scvfIdxLocal(localDir);
+ const auto& otherLocalScvf = localScvf(otherLocalScvfIdx);
+ const auto otherLocalDofIdx = otherLocalScvf.localDofIndex();
+ T[faceIdx][otherLocalDofIdx] -= posWijk[localDir];
+ T[faceIdx][posScvLocalDofIdx] += posWijk[localDir];
+ }
+ }
+ }
+
+ //! computes the transmissibilities associated with "outside" faces on surface grids
+ void computeOutsideTransmissibilities_(DataHandle& dataHandle) const
+ {
+ assert(dim < dimWorld && "only for dim < dimWorld the outside transmissiblity container has the right size");
+
+ for (const auto& localFaceData : localFaceData_)
+ {
+ //! continue only for "outside" faces
+ if (!localFaceData.isOutside()) continue;
+
+ const auto localScvIdx = localFaceData.ivLocalInsideScvIndex();
+ const auto localScvfIdx = localFaceData.ivLocalScvfIndex();
+ const auto& posLocalScv = localScv(localScvIdx);
+ const auto& wijk = wijk_[localScvfIdx][localFaceData.scvfLocalOutsideScvfIndex() + 1];
+
+ //! store the calculated transmissibilities in the data handle
+ auto& tij = dataHandle.outsideTij()[localFaceData.ivLocalOutsideScvfIndex()];
+
+ //! reset transmissibility vector
+ tij = 0.0;
+
+ //! add contributions from all local directions
+ for (LocalIndexType localDir = 0; localDir < dim; localDir++)
{
- // When interior boundaries are disabled, all faces will be of dirichlet type
- if (!enableInteriorBoundaries)
+ //! the scvf corresponding to this local direction in the scv
+ const auto& curLocalScvf = localScvf(posLocalScv.scvfIdxLocal(localDir));
+
+ //! on interior faces the coefficients of the AB matrix come into play
+ if (!curLocalScvf.isDirichlet())
{
- const auto curLocalScvfIdx = posLocalScv.localScvfIndex(localDir);
- const auto curIdxInDiriFaces = this->findIndexInVector(dirichletScvfIndexSet_(), curLocalScvfIdx);
- T_[rowIdx][numLocalScvs + curIdxInDiriFaces] += posWijk[localDir];
- T_[rowIdx][posLocalScvIdx] -= posWijk[localDir];
+ auto tmp = dataHandle.AB()[curLocalScvf.localDofIndex()];
+ tmp *= wijk[localDir];
+ tij -= tmp;
}
else
- {
- const auto curLocalScvfIdx = posLocalScv.localScvfIndex(localDir);
- const auto& curLocalScvf = localScvf_(curLocalScvfIdx);
- const auto curFaceType = curLocalScvf.faceType();
-
- const auto curIdxInDiriFaces = curFaceType == MpfaFaceTypes::dirichlet ?
- this->findIndexInVector(dirichletScvfIndexSet_(), curLocalScvfIdx) :
- numInteriorDirichletFaces + this->findIndexInVector(interiorDirichletScvfIndexSet_(), curLocalScvfIdx);
+ tij[curLocalScvf.localDofIndex()] -= wijk[localDir];
- T_[rowIdx][numLocalScvs + curIdxInDiriFaces] += posWijk[localDir];
- T_[rowIdx][posLocalScvIdx] -= posWijk[localDir];
- }
+ // add entry from the scv unknown
+ tij[localScvIdx] += wijk[localDir];
}
-
- // store the omegas
- wijk_[rowIdx].emplace_back(std::move(posWijk));
-
- // go to the next face
- rowIdx++;
}
}
- // TODO: how to do the assertion of positive coefficients for tensors?
+ // calculates n_i^T*K_j*nu_k
DimVector calculateOmegas_(const LocalScvType& localScv,
- const GlobalPosition normal,
+ const GlobalPosition& normal,
const Scalar area,
const Tensor& T) const
{
+ // make sure we have positive definite diffsion tensors
+ assert(this->tensorIsPositiveDefinite(T) && "only positive definite tensors can be handled by mpfa methods");
+
DimVector wijk;
GlobalPosition tmp;
- for (int dir = 0; dir < dim; ++dir)
+ for (LocalIndexType dir = 0; dir < dim; ++dir)
{
T.mv(localScv.innerNormal(dir), tmp);
wijk[dir] = tmp*normal;
}
wijk *= area;
wijk /= localScv.detX();
- wijk *= -1.0;
return wijk;
}
// calculates n_i^T*K_j*nu_k
DimVector calculateOmegas_(const LocalScvType& localScv,
- const GlobalPosition normal,
+ const GlobalPosition& normal,
const Scalar area,
const Scalar t) const
{
@@ -746,60 +585,39 @@ private:
GlobalPosition tmp(normal);
tmp *= t;
- for (int dir = 0; dir < dim; ++dir)
+ for (LocalIndexType dir = 0; dir < dim; ++dir)
wijk[dir] = tmp*localScv.innerNormal(dir);
wijk *= area;
wijk /= localScv.detX();
- wijk *= -1.0;
return wijk;
}
- Implementation& asImp_()
- { return static_cast<Implementation&> (*this); }
-
- const Implementation& asImp_() const
- { return static_cast<const Implementation&> (*this); }
-
- const Problem& problem_() const
- { return *problemPtr_; }
-
- const FVElementGeometry& fvGeometry_() const
- { return *fvGeometryPtr_; }
-
- const ElementVolumeVariables& elemVolVars_() const
- { return *elemVolVarsPtr_; }
-
- const Problem* problemPtr_;
- const FVElementGeometry* fvGeometryPtr_;
- const ElementVolumeVariables* elemVolVarsPtr_;
-
- bool onDomainOrInteriorBoundary_;
+ const IndexSet* indexSetPtr_;
// Variables defining the local scope
- std::vector<Element> localElements_;
- std::vector<LocalScvType> localScvs_;
- std::vector<LocalScvfType> localScvfs_;
- std::vector<GlobalLocalFaceDataPair> globalLocalScvfPairedData_;
- GlobalIndexSet globalScvfIndices_;
-
- GlobalIndexSet volVarsStencil_;
- PositionVector volVarsPositions_;
-
- LocalIndexSet fluxFaceIndexSet_;
- LocalIndexSet dirichletFaceIndexSet_;
- LocalIndexSet interiorDirichletFaceIndexSet_;
- LocalIndexSet interiorBoundaryFaceIndexSet_;
- std::vector<InteriorBoundaryData> interiorBoundaryData_;
-
- // Quantities depending on the tensor the system is solved for
+ std::vector<Element> elements_;
+ std::vector<LocalScvType> scvs_;
+ std::vector<LocalScvfType> scvfs_;
+ std::vector<LocalFaceData> localFaceData_;
+ DirichletDataContainer dirichletData_;
+
+ // sizes involved in the local matrices
+ unsigned int numFaces_;
+ unsigned int numUnknowns_;
+ unsigned int numPotentials_;
+ unsigned int numOutsideFaces_;
+
+ // The omega factors and the matrix Aâ»1*B are stored
+ // in order to recover the transmissibilities of outside faces on network grids
std::vector< std::vector< DimVector > > wijk_;
- DynamicMatrix T_;
- DynamicMatrix AinvB_;
- DynamicMatrix CAinv_;
+ Matrix CAinv_;
- // stores all the neumann fluxes appearing in this interaction volume
- std::vector<PrimaryVariables> neumannFluxes_;
+ // Matrices involved in transmissibility calculations
+ Matrix A_;
+ Matrix B_;
+ Matrix C_;
+ Matrix D_;
};
} // end namespace
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/interactionvolumeindexset.hh b/dumux/discretization/cellcentered/mpfa/omethod/interactionvolumeindexset.hh
new file mode 100644
index 0000000000000000000000000000000000000000..2645b214ad35139af3c0ec4cbf17a164edfb311a
--- /dev/null
+++ b/dumux/discretization/cellcentered/mpfa/omethod/interactionvolumeindexset.hh
@@ -0,0 +1,192 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Class for the index set within an interaction volume of the mpfa-o scheme.
+ */
+#ifndef DUMUX_DISCRETIZATION_MPFA_O_INTERACTIONVOLUME_INDEXSET_HH
+#define DUMUX_DISCRETIZATION_MPFA_O_INTERACTIONVOLUME_INDEXSET_HH
+
+#include <dumux/discretization/cellcentered/mpfa/dualgridindexset.hh>
+
+namespace Dumux
+{
+/*!
+ * \ingroup Mpfa
+ * \brief The interaction volume index set class for the mpfa-o scheme.
+ */
+template<class DualGridNodalIndexSet, class GlobalIndexContainer, class LocalIndexContainer>
+class CCMpfaOInteractionVolumeIndexSet
+{
+ using LocalIndexType = typename LocalIndexContainer::value_type;
+ using GlobalIndexType = typename GlobalIndexContainer::value_type;
+
+public:
+ explicit CCMpfaOInteractionVolumeIndexSet(const DualGridNodalIndexSet& nodalIndexSet) : nodalIndexSet_(nodalIndexSet)
+ {
+ //! determine the number of iv-local faces for memory reservation
+ //! note that this might be a vast overestimation on surface grids!
+ const auto numNodalScvfs = nodalIndexSet.numScvfs();
+ const auto numBoundaryScvfs = nodalIndexSet.numBoundaryScvfs();
+ const std::size_t numFaceEstimate = numBoundaryScvfs + (numNodalScvfs-numBoundaryScvfs)/2;
+
+ // make sure we found a reasonable number of faces
+ assert((numNodalScvfs-numBoundaryScvfs)%2 == 0);
+
+ //! index transformation from interaction-volume-local to node-local
+ ivToNodeScvf_.reserve(numFaceEstimate);
+ nodeToIvScvf_.resize(numNodalScvfs);
+
+ //! the local neighboring scv indices of the faces
+ scvfNeighborScvLocalIndices_.reserve(numFaceEstimate);
+
+ //! keeps track of which nodal scvfs have been handled already
+ std::vector<bool> isHandled(numNodalScvfs, false);
+
+ //! go over faces in nodal index set, check if iv-local face has been
+ //! inserted already for this scvf and if not, insert index mapping
+ numFaces_ = 0;
+ for (LocalIndexType i = 0; i < numNodalScvfs; ++i)
+ {
+ //! check if the nodal scvf still has to be handled
+ if (isHandled[i])
+ continue;
+
+ //! for scvfs touching the boundary there are no "outside" scvfs
+ if (nodalIndexSet.scvfIsOnBoundary(i))
+ {
+ nodeToIvScvf_[i] = ivToNodeScvf_.size();
+ isHandled[i] = true;
+ ivToNodeScvf_.push_back(i);
+ numFaces_++;
+ continue;
+ }
+
+ //! We insert a new iv-local face and find all "outside" scvfs that map
+ //! to this face as well by comparing the set of neighboring scv indices.
+ const auto scvIndices = [&nodalIndexSet, i] ()
+ {
+ auto tmp = nodalIndexSet.neighboringScvIndices(i);
+ std::sort(tmp.begin(), tmp.end());
+ return tmp;
+ } ();
+ const auto numNeighborsI = scvIndices.size();
+
+ std::vector<LocalIndexType> outsideScvfs;
+ for (LocalIndexType j = i+1; j < numNodalScvfs; ++j)
+ {
+ //! a face that has been handled already cannot be an "outside" face here
+ if (!isHandled[j])
+ {
+ const auto scvIndices2 = [&nodalIndexSet, j] ()
+ {
+ auto tmp = nodalIndexSet.neighboringScvIndices(j);
+ std::sort(tmp.begin(), tmp.end());
+ return tmp;
+ } ();
+
+ // if the sizes aren't equal, this can't be an "outside" face
+ if (scvIndices2.size() != numNeighborsI)
+ continue;
+
+ // if the neighboring scv indices are the same, this is an "outside" face
+ if (std::equal(scvIndices.begin(), scvIndices.end(), scvIndices2.begin()))
+ outsideScvfs.push_back(j);
+ }
+ }
+
+ // insert mappings
+ const auto curIvLocalScvfIdx = ivToNodeScvf_.size();
+ nodeToIvScvf_[i] = curIvLocalScvfIdx;
+ isHandled[i] = true;
+ for (const auto nodeLocalScvfIdx : outsideScvfs)
+ {
+ nodeToIvScvf_[nodeLocalScvfIdx] = curIvLocalScvfIdx;
+ isHandled[nodeLocalScvfIdx] = true;
+ }
+ ivToNodeScvf_.push_back(i);
+ numFaces_++;
+ }
+
+ // compute local neighboring scv indices for the iv-local scvfs
+ scvfNeighborScvLocalIndices_.resize(numFaces());
+ for (unsigned int i = 0; i < numFaces(); ++i)
+ {
+ const auto& neighborsGlobal = nodalIndexSet_.neighboringScvIndices(ivToNodeScvf_[i]);
+ const auto numNeighbors = nodalIndexSet_.scvfIsOnBoundary(ivToNodeScvf_[i]) ? 1 : neighborsGlobal.size();
+
+ scvfNeighborScvLocalIndices_[i].resize(numNeighbors);
+ for (unsigned int j = 0; j < numNeighbors; ++j)
+ scvfNeighborScvLocalIndices_[i][j] = findLocalScvIdx_(neighborsGlobal[j]);
+ }
+ }
+
+ //! returns the corresponding nodal index set
+ const DualGridNodalIndexSet& nodalIndexSet() const { return nodalIndexSet_; }
+
+ //! returns a global scvf idx for a given iv_local scvf index
+ GlobalIndexType scvfIdxGlobal(LocalIndexType ivLocalScvfIdx) const
+ { return nodalIndexSet_.scvfIdxGlobal(ivToNodeScvf_[ivLocalScvfIdx]); }
+
+ //! returns the iv-local scvf idx of the i-th scvfs embedded in a local scv
+ LocalIndexType scvfIdxLocal(LocalIndexType scvIdxLocal, unsigned int i) const
+ { return nodeToIvScvf_[nodalIndexSet_.scvfIdxLocal(scvIdxLocal, i)]; }
+
+ //! returns whether or not an scvf touches the boundary
+ bool scvfTouchesBoundary(LocalIndexType ivLocalScvfIdx) const
+ { return nodalIndexSet_.scvfTouchesBoundary(ivToNodeScvf_[ivLocalScvfIdx]); }
+
+ //! returns the local indices of the neighboring scvs of an scvf
+ const LocalIndexContainer& neighboringLocalScvIndices(LocalIndexType ivLocalScvfIdx) const
+ { return scvfNeighborScvLocalIndices_[ivLocalScvfIdx]; }
+
+ //! returns the number of faces in the interaction volume
+ std::size_t numFaces() const { return numFaces_; }
+
+ //! returns the number of scvs in the interaction volume
+ std::size_t numScvs() const { return nodalIndexSet_.numScvs(); }
+
+ //! returns the global scv indices connected to this dual grid node
+ const GlobalIndexContainer& globalScvIndices() const { return nodalIndexSet_.globalScvIndices(); }
+
+ //! returns the global scvf indices connected to this dual grid node
+ const GlobalIndexContainer& globalScvfIndices() const { return nodalIndexSet_.globalScvfIndices(); }
+
+private:
+ //! returns the local scv index to a given global scv index
+ unsigned int findLocalScvIdx_(GlobalIndexType globalScvIdx) const
+ {
+ auto it = std::find( nodalIndexSet_.globalScvIndices().begin(), nodalIndexSet_.globalScvIndices().end(), globalScvIdx );
+ assert(it != nodalIndexSet_.globalScvIndices().end() && "Global scv index not found in local container!");
+ return std::distance(nodalIndexSet_.globalScvIndices().begin(), it);
+ }
+
+ const DualGridNodalIndexSet& nodalIndexSet_;
+
+ std::size_t numFaces_;
+ LocalIndexContainer ivToNodeScvf_;
+ LocalIndexContainer nodeToIvScvf_;
+ //! maps to each scvf a list of neighbouring scv indices
+ //! ordering: 0 - inside scv idx; 1..n - outside scv indices
+ std::vector<LocalIndexContainer> scvfNeighborScvLocalIndices_;
+};
+} // end namespace
+
+
+#endif
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/interactionvolumeseed.hh b/dumux/discretization/cellcentered/mpfa/omethod/interactionvolumeseed.hh
deleted file mode 100644
index a3b11e1add00ca1e89888715af4f59428ce9c8a5..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/omethod/interactionvolumeseed.hh
+++ /dev/null
@@ -1,99 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for interaction volume seeds of mpfa methods.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_O_INTERACTIONVOLUMESEED_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_O_INTERACTIONVOLUMESEED_HH
-
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
-#include "localsubcontrolentityseeds.hh"
-
-namespace Dumux
-{
-
-/*!
- * \ingroup Mpfa
- * \brief Class for the interaction volume seed of the mpfa-o method
- */
-template<typename G, typename L, int dim, int dimWorld>
-class CCMpfaOInteractionVolumeSeed
-{
- using GlobalIndexSet = G;
- using GlobalIndexType = typename GlobalIndexSet::value_type;
-
-public:
- using LocalScvSeed = CCMpfaOLocalScvSeed<G, L>;
- using LocalScvfSeed = CCMpfaOLocalScvfSeed<G, L>;
-
- CCMpfaOInteractionVolumeSeed(std::vector<LocalScvSeed>&& scvSeeds,
- std::vector<LocalScvfSeed>&& scvfSeeds,
- bool onDomainOrInteriorBoundary)
- : onDomainOrInteriorBoundary_(onDomainOrInteriorBoundary),
- scvSeeds_(std::move(scvSeeds)),
- scvfSeeds_(std::move(scvfSeeds)) {}
-
- bool onDomainOrInteriorBoundary() const
- { return onDomainOrInteriorBoundary_; }
-
- const std::vector<LocalScvSeed>& scvSeeds() const
- { return scvSeeds_; }
-
- const std::vector<LocalScvfSeed>& scvfSeeds() const
- { return scvfSeeds_; }
-
- std::vector<GlobalIndexType> globalScvIndices() const
- {
- std::vector<GlobalIndexType> globalIndices;
- globalIndices.reserve(scvSeeds().size());
-
- for (auto&& localScvSeed : scvSeeds())
- globalIndices.push_back(localScvSeed.globalIndex());
-
- return globalIndices;
- }
-
- std::vector<GlobalIndexType> globalScvfIndices() const
- {
- std::vector<GlobalIndexType> globalIndices;
- globalIndices.reserve(scvfSeeds().size() * 2);
-
- for (auto&& localScvfSeed : scvfSeeds())
- {
- globalIndices.push_back(localScvfSeed.insideGlobalScvfIndex());
-
- // add outside indices for interior faces
- if (localScvfSeed.faceType() == MpfaFaceTypes::interior)
- for (auto scvfIdxGlobal : localScvfSeed.outsideGlobalScvfIndices())
- globalIndices.push_back(scvfIdxGlobal);
- }
-
- return globalIndices;
- }
-
-private:
- bool onDomainOrInteriorBoundary_;
- std::vector<LocalScvSeed> scvSeeds_;
- std::vector<LocalScvfSeed> scvfSeeds_;
-};
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/localsubcontrolentities.hh b/dumux/discretization/cellcentered/mpfa/omethod/localsubcontrolentities.hh
index 959706e166409d6e5fffd1a9fb9beac26f299fb5..01ab1b92e86f9afc0cdd62c609e4dc58fe11f849 100644
--- a/dumux/discretization/cellcentered/mpfa/omethod/localsubcontrolentities.hh
+++ b/dumux/discretization/cellcentered/mpfa/omethod/localsubcontrolentities.hh
@@ -23,173 +23,127 @@
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_O_LOCALSUBCONTROLENTITIES_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_O_LOCALSUBCONTROLENTITIES_HH
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
-
namespace Dumux
{
-template<class TypeTag>
-class CCMpfaOLocalScv
+template<class TypeTag, class IvIndexSet>
+class CCMpfaOInteractionVolumeLocalScv
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using GlobalIndexType = typename GridView::IndexSet::IndexType;
using Helper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using Element = typename GridView::template Codim<0>::Entity;
-
- // we use the seed types of the boundary interaction volume to be compatible with other mpfa
- // methods that use o-type interaction volumes on the boundary but differing ones inside the domain.
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using LocalScvSeed = typename InteractionVolume::Seed::LocalScvSeed;
- using GlobalIndexType = typename InteractionVolume::GlobalIndexType;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
+ //! The mpfa-o method always uses the dynamic types
+ using InteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using LocalIndexType = typename InteractionVolume::Traits::LocalIndexType;
+ using LocalBasis = typename InteractionVolume::Traits::ScvBasis;
static const int dim = GridView::dimension;
static const int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using LocalBasis = std::array<GlobalPosition, dim>;
public:
- // constructor has the same signature as the LocalScv entity
- CCMpfaOLocalScv(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const LocalScvSeed& scvSeed)
- : seed_(scvSeed)
+ explicit CCMpfaOInteractionVolumeLocalScv(const FVElementGeometry& fvGeometry,
+ const SubControlVolume& scv,
+ const LocalIndexType localIndex,
+ const IvIndexSet& indexSet)
+ : indexSet_(indexSet)
+ , globalScvIndex_(scv.dofIndex())
+ , localDofIndex_(localIndex)
{
+ // center of the global scv
+ const auto center = scv.center();
+
// set up local basis
- center_ = element.geometry().center();
LocalBasis localBasis;
-
- LocalIndexType coordIdx = 0;
- for (auto globalScvfIdx : scvSeed.globalScvfIndices())
+ for (unsigned int coordIdx = 0; coordIdx < dim; ++coordIdx)
{
- const auto& scvf = fvGeometry.scvf(globalScvfIdx);
+ const auto scvfIdx = indexSet.nodalIndexSet().scvfIdxGlobal(localDofIndex_, coordIdx);
+ const auto& scvf = fvGeometry.scvf(scvfIdx);
localBasis[coordIdx] = scvf.ipGlobal();
- localBasis[coordIdx] -= center_;
- coordIdx++;
+ localBasis[coordIdx] -= center;
}
innerNormals_ = Helper::calculateInnerNormals(localBasis);
detX_ = Helper::calculateDetX(localBasis);
}
- GlobalIndexType globalIndex() const
- { return scvSeed_().globalIndex(); }
+ //! detX is needed for setting up the omegas in the interaction volumes
+ Scalar detX() const { return detX_; }
- GlobalIndexType localScvfIndex(const LocalIndexType coordDir) const
+ //! the inner normals are needed for setting up the omegas in the interaction volumes
+ const GlobalPosition& innerNormal(const LocalIndexType coordDir) const
{
assert(coordDir < dim);
- return scvSeed_().localScvfIndices()[coordDir];
+ return innerNormals_[coordDir];
}
- GlobalPosition center() const
- { return center_; }
+ //! grid view-global index related to this scv
+ GlobalIndexType globalScvIndex() const { return globalScvIndex_; }
- GlobalPosition innerNormal(const LocalIndexType coordDir) const
+ //! returns the index in the set of cell unknowns of the iv
+ LocalIndexType localDofIndex() const { return localDofIndex_; }
+
+ //! iv-local index of the coordir's scvf in this scv
+ LocalIndexType scvfIdxLocal(const unsigned int coordDir) const
{
assert(coordDir < dim);
- return innerNormals_[coordDir];
+ return indexSet_.scvfIdxLocal(localDofIndex_, coordDir);
}
- Scalar detX() const
- { return detX_; }
-
private:
- const LocalScvSeed& scvSeed_() const
- { return seed_; }
-
- const LocalScvSeed& seed_;
- GlobalPosition center_;
+ const IvIndexSet& indexSet_;
+ GlobalIndexType globalScvIndex_;
+ LocalIndexType localDofIndex_;
LocalBasis innerNormals_;
Scalar detX_;
};
template<class TypeTag>
-struct CCMpfaOLocalScvf
+struct CCMpfaOInteractionVolumeLocalScvf
{
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Helper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using Element = typename GridView::template Codim<0>::Entity;
-
- // we use the seed types of the boundary interaction volume to be compatible with other mpfa
- // methods that use o-type interaction volumes on the boundary but differing ones inside the domain.
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, BoundaryInteractionVolume);
- using LocalScvfSeed = typename InteractionVolume::Seed::LocalScvfSeed;
- using GlobalIndexType = typename InteractionVolume::GlobalIndexType;
- using GlobalIndexSet = typename InteractionVolume::GlobalIndexSet;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
- using LocalIndexSet = typename InteractionVolume::LocalIndexSet;
-
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+ //! The mpfa-o method always uses the dynamic types
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using GlobalIndexType = typename GridView::IndexSet::IndexType;
+ using InteractionVolume = typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume);
+ using LocalIndexContainer = typename InteractionVolume::Traits::DynamicLocalIndexContainer;
+ using LocalIndexType = typename LocalIndexContainer::value_type;
public:
- CCMpfaOLocalScvf(const LocalScvfSeed& scvfSeed,
- const SubControlVolumeFace& scvf)
- : seedPtr_(&scvfSeed),
- scvfPtr_(&scvf)
+ CCMpfaOInteractionVolumeLocalScvf(const SubControlVolumeFace& scvf,
+ const LocalIndexContainer& localScvIndices,
+ const bool isDirichlet,
+ const LocalIndexType localDofIdx)
+ : scvfIdxGlobal_(scvf.index())
+ , neighborScvIndicesLocal_(localScvIndices)
+ , isDirichlet_(isDirichlet)
+ , localDofIndex_(localDofIdx)
{}
- GlobalIndexType insideGlobalScvfIndex() const
- { return scvfSeed_().insideGlobalScvfIndex(); }
-
- GlobalIndexType insideGlobalScvIndex() const
- { return scvfSeed_().insideGlobalScvIndex(); }
-
- LocalIndexType insideLocalScvIndex() const
- { return scvfSeed_().insideLocalScvIndex(); }
-
- const GlobalIndexSet& outsideGlobalScvfIndices() const
- { return scvfSeed_().outsideGlobalScvfIndices(); }
-
- const GlobalIndexSet& outsideGlobalScvIndices() const
- { return scvfSeed_().outsideGlobalScvIndices(); }
-
- const LocalIndexSet& outsideLocalScvIndices() const
- { return scvfSeed_().outsideLocalScvIndices(); }
-
- GlobalIndexType outsideGlobalScvfIndex(unsigned int outsideIdx = 0) const
- { return scvfSeed_().outsideGlobalScvfIndex(outsideIdx); }
-
- GlobalIndexType outsideGlobalScvIndex(unsigned int outsideIdx = 0) const
- { return scvfSeed_().outsideGlobalScvIndex(outsideIdx); }
-
- LocalIndexType outsideLocalScvIndex(unsigned int outsideIdx = 0) const
- { return scvfSeed_().outsideLocalScvIndex(outsideIdx); }
-
- MpfaFaceTypes faceType() const
- { return scvfSeed_().faceType(); }
-
- GlobalPosition ip() const
- { return globalScvf().ipGlobal(); }
-
- GlobalPosition unitOuterNormal() const
- { return globalScvf().unitOuterNormal(); }
+ //! returns the grid view-global index of this scvf
+ GlobalIndexType globalScvfIndex() const { return scvfIdxGlobal_; }
- Scalar area() const
- { return globalScvf().area(); }
+ //! Returns the local indices of the scvs neighboring this scvf
+ const LocalIndexContainer& neighboringLocalScvIndices() const { return neighborScvIndicesLocal_; }
- bool boundary() const
- { return scvfSeed_().boundary(); }
+ //! states if this is scvf is on a Dirichlet boundary
+ bool isDirichlet() const { return isDirichlet_; }
- const SubControlVolumeFace& globalScvf() const
- { return *scvfPtr_; }
+ //! This is either the iv-local index of the intermediate unknown (interior/Neumann face)
+ //! or the index of the Dirichlet boundary within the vol vars (Dirichlet faces)
+ LocalIndexType localDofIndex() const { return localDofIndex_; }
private:
- const LocalScvfSeed& scvfSeed_() const
- { return *seedPtr_; }
+ GlobalIndexType scvfIdxGlobal_;
+ const LocalIndexContainer& neighborScvIndicesLocal_;
- const LocalScvfSeed* seedPtr_;
- const SubControlVolumeFace* scvfPtr_;
+ bool isDirichlet_;
+ LocalIndexType localDofIndex_;
};
} // end namespace
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/localsubcontrolentityseeds.hh b/dumux/discretization/cellcentered/mpfa/omethod/localsubcontrolentityseeds.hh
deleted file mode 100644
index 730017018c7a344f78bc0332192a18bba40707a0..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/omethod/localsubcontrolentityseeds.hh
+++ /dev/null
@@ -1,215 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for sub control entity seeds of the mpfa-o method.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_O_LOCALSUBCONTROLENTITYSEEDS_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_O_LOCALSUBCONTROLENTITYSEEDS_HH
-
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
-
-namespace Dumux
-{
-template<typename G, typename L>
-class CCMpfaOLocalScvSeed
-{
-public:
- using GlobalIndexSet = G;
- using LocalIndexSet = L;
- using GlobalIndexType = typename GlobalIndexSet::value_type;
- using LocalIndexType = typename LocalIndexSet::value_type;
-
- //! constructor fully defining the scv seed
- CCMpfaOLocalScvSeed(GlobalIndexSet&& globalScvfIndices,
- LocalIndexSet&& localScvfIndices,
- GlobalIndexType globalScvIndex)
- : globalScvIndex_(globalScvIndex),
- localScvfIndices_(std::move(localScvfIndices)),
- globalScvfIndices_(std::move(globalScvfIndices)) {}
-
- //! Constructor when the local scvf indices are not known at this point
- CCMpfaOLocalScvSeed(GlobalIndexSet&& globalScvfIndices,
- GlobalIndexType globalScvIndex)
- : globalScvIndex_(globalScvIndex),
- globalScvfIndices_(std::move(globalScvfIndices))
- {
- localScvfIndices_.resize(globalScvfIndices_.size(), -1);
- }
-
- GlobalIndexType globalIndex() const
- { return globalScvIndex_; }
-
- const LocalIndexSet& localScvfIndices() const
- { return localScvfIndices_; }
-
- const GlobalIndexSet& globalScvfIndices() const
- { return globalScvfIndices_; }
-
- void setLocalScvfIndex(int coordDir, LocalIndexType localScvfIdx)
- {
- localScvfIndices_[coordDir] = localScvfIdx;
- }
-
-private:
- GlobalIndexType globalScvIndex_;
- LocalIndexSet localScvfIndices_;
- GlobalIndexSet globalScvfIndices_;
-};
-
-/*!
- * \ingroup Mpfa
- * \brief Class for a sub-control volume face seed of the mpfa-o method.
- *
- * \param G the global index set type
- * \param L the local index set type
- */
-template<typename G, typename L>
-class CCMpfaOLocalScvfSeed
-{
-public:
- using GlobalIndexSet = G;
- using LocalIndexSet = L;
- using GlobalIndexType = typename GlobalIndexSet::value_type;
- using LocalIndexType = typename LocalIndexSet::value_type;
-
- //! constructor fully defining the scv face seed
- template<class SubControlVolumeFace>
- CCMpfaOLocalScvfSeed(const SubControlVolumeFace& scvf,
- LocalIndexType insideLocalScvIndex,
- LocalIndexSet&& outsideLocalScvIndices,
- GlobalIndexSet&& outsideGlobalScvfIndices,
- const MpfaFaceTypes faceType)
- : boundary_(scvf.boundary()),
- insideScvLocalIdx_(insideLocalScvIndex),
- outsideLocalScvIndices_(std::move(outsideLocalScvIndices)),
- insideScvGlobalIdx_(scvf.insideScvIdx()),
- outsideGlobalScvIndices_(scvf.outsideScvIndices()),
- insideScvfGlobalIdx_(scvf.index()),
- outsideGlobalScvfIndices_(std::move(outsideGlobalScvfIndices)),
- faceType_(faceType) {}
-
- //! Constructor when the outside indices are not known at this point
- template<class SubControlVolumeFace>
- CCMpfaOLocalScvfSeed(const SubControlVolumeFace& scvf,
- LocalIndexType insideLocalScvIndex,
- const MpfaFaceTypes faceType)
- : boundary_(scvf.boundary()),
- insideScvLocalIdx_(insideLocalScvIndex),
- insideScvGlobalIdx_(scvf.insideScvIdx()),
- outsideGlobalScvIndices_(scvf.outsideScvIndices()),
- insideScvfGlobalIdx_(scvf.index()),
- faceType_(faceType)
- {
- auto size = outsideGlobalScvIndices_.size();
- outsideLocalScvIndices_.reserve(size);
- outsideGlobalScvfIndices_.reserve(size);
- }
-
- GlobalIndexType insideGlobalScvfIndex() const
- { return insideScvfGlobalIdx_; }
-
- GlobalIndexType insideGlobalScvIndex() const
- { return insideScvGlobalIdx_; }
-
- LocalIndexType insideLocalScvIndex() const
- { return insideScvLocalIdx_; }
-
- GlobalIndexType outsideGlobalScvfIndex(unsigned int outsideIdx = 0) const
- { return outsideGlobalScvfIndices_[outsideIdx]; }
-
- GlobalIndexType outsideGlobalScvIndex(unsigned int outsideIdx = 0) const
- { return outsideGlobalScvIndices_[outsideIdx]; }
-
- LocalIndexType outsideLocalScvIndex(unsigned int outsideIdx = 0) const
- { return outsideLocalScvIndices_[outsideIdx]; }
-
- const GlobalIndexSet& outsideGlobalScvfIndices() const
- { return outsideGlobalScvfIndices_; }
-
- const GlobalIndexSet& outsideGlobalScvIndices() const
- { return outsideGlobalScvIndices_; }
-
- const LocalIndexSet& outsideLocalScvIndices() const
- { return outsideLocalScvIndices_; }
-
- MpfaFaceTypes faceType() const
- { return faceType_; }
-
- bool boundary() const
- { return boundary_; }
-
- void addOutsideData(const GlobalIndexType outsideGlobalScvfIndex,
- const LocalIndexType outsideLocalScvIndex)
- {
- outsideLocalScvIndices_.push_back(outsideLocalScvIndex);
- outsideGlobalScvfIndices_.push_back(outsideGlobalScvfIndex);
- }
-
- // for grids with dim < dimWorld, some outside indices might be doubled
- // we want to make the outside indices unique, but, the i-th outside global scvf face
- // should correspond to the i-th outside local scv.Therefore we apply the same operations on both containers
- void makeOutsideDataUnique()
- {
- auto scvIt = outsideLocalScvIndices_.begin();
-
- while(scvIt != outsideLocalScvIndices_.end())
- {
- auto distance = std::distance(outsideLocalScvIndices_.begin(), scvIt);
- auto scvfIt = outsideGlobalScvfIndices_.begin()+distance;
-
- bool proceed = true;
- for (auto scvIt2 = scvIt+1; scvIt2 != outsideLocalScvIndices_.end(); ++scvIt2)
- {
- // increment face iterator to be at the same position as the scvIt2 iterator
- ++scvfIt;
-
- // if an identical index is found, delete it
- if (*scvIt2 == *scvIt)
- {
- outsideLocalScvIndices_.erase(scvIt2);
- outsideGlobalScvfIndices_.erase(scvfIt);
- proceed = false;
- break;
- }
- }
-
- if (proceed)
- ++scvIt;
- }
- }
-
-private:
- bool boundary_;
-
- LocalIndexType insideScvLocalIdx_;
- LocalIndexSet outsideLocalScvIndices_;
-
- GlobalIndexType insideScvGlobalIdx_;
- GlobalIndexSet outsideGlobalScvIndices_;
-
- GlobalIndexType insideScvfGlobalIdx_;
- GlobalIndexSet outsideGlobalScvfIndices_;
-
- MpfaFaceTypes faceType_;
-};
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/omethod/subcontrolvolumeface.hh b/dumux/discretization/cellcentered/mpfa/omethod/subcontrolvolumeface.hh
deleted file mode 100644
index 992f3364269731a39cea040e4fd27df62d4a7bc4..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/omethod/subcontrolvolumeface.hh
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Class for an mpfa-o sub control volume face
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_O_SUBCONTROLVOLUMEFACE_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_O_SUBCONTROLVOLUMEFACE_HH
-
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-#include <dumux/discretization/cellcentered/mpfa/subcontrolvolumefacebase.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup Discretization
- * \brief Class for a sub control volume face in the mpfa-o method. We simply inherit from the base class here.
- */
-template<class G, typename I>
-class CCMpfaSubControlVolumeFace<MpfaMethods::oMethod, G, I> : public CCMpfaSubControlVolumeFaceBase<G, I>
-{
- using ParentType = CCMpfaSubControlVolumeFaceBase<G, I>;
- using Geometry = G;
- using IndexType = I;
-
- using Scalar = typename Geometry::ctype;
- static const int dim = Geometry::mydimension;
- static const int dimworld = Geometry::coorddimension;
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
-
-public:
- //! We do not use the localIndex variable.
- //! It is here to satisfy the general mpfa scvf interface.
- template<class MpfaGeometryHelper>
- CCMpfaSubControlVolumeFace(const MpfaGeometryHelper& geomHelper,
- std::vector<GlobalPosition>&& corners,
- GlobalPosition&& unitOuterNormal,
- IndexType vertexIndex,
- unsigned int localIndex,
- IndexType scvfIndex,
- IndexType insideScvIdx,
- const std::vector<IndexType>& outsideScvIndices,
- Scalar q,
- bool boundary)
- : ParentType(geomHelper,
- std::forward<std::vector<GlobalPosition>>(corners),
- std::forward<GlobalPosition>(unitOuterNormal),
- vertexIndex,
- localIndex,
- scvfIndex,
- insideScvIdx,
- outsideScvIndices,
- q,
- boundary) {}
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/omethodfps/globalinteractionvolumeseeds.hh b/dumux/discretization/cellcentered/mpfa/omethodfps/globalinteractionvolumeseeds.hh
deleted file mode 100644
index 120c7acc355c5d0a3b322d27d55ac1b71a013d0d..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/omethodfps/globalinteractionvolumeseeds.hh
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for the global interaction volumes of the mpfa-o-fps method.
- */
-#ifndef DUMUX_DISCRETIZATION_MPFA_O_FPS_GLOBALINTERACTIONVOLUMESEEDS_HH
-#define DUMUX_DISCRETIZATION_MPFA_O_FPS_GLOBALINTERACTIONVOLUMESEEDS_HH
-
-#include <dumux/discretization/cellcentered/mpfa/globalinteractionvolumeseedsbase.hh>
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup Mpfa
- * \brief Specialization of the class for the mpfa-o-fps method.
- */
-template<class TypeTag>
-class CCMpfaGlobalInteractionVolumeSeedsImplementation<TypeTag, MpfaMethods::oMethodFps>
- : public CCMpfaGlobalInteractionVolumeSeedsImplementation<TypeTag, MpfaMethods::oMethod>
-{
- using ParentType = CCMpfaGlobalInteractionVolumeSeedsImplementation<TypeTag, MpfaMethods::oMethod>;
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
-public:
- CCMpfaGlobalInteractionVolumeSeedsImplementation(const GridView& gridView) : ParentType(gridView) {}
-};
-} // end namespace
-
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/omethodfps/interactionvolume.hh b/dumux/discretization/cellcentered/mpfa/omethodfps/interactionvolume.hh
deleted file mode 100644
index 8ff3f3186a8b186ab5ddf423c180a15c1c63f303..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/omethodfps/interactionvolume.hh
+++ /dev/null
@@ -1,417 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base classes for interaction volume of mpfa methods.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_O_FPS_INTERACTIONVOLUME_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_O_FPS_INTERACTIONVOLUME_HH
-
-#include <dumux/common/math.hh>
-
-#include <dune/localfunctions/lagrange/pqkfactory.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-
-#include <dumux/discretization/cellcentered/mpfa/interactionvolumebase.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-
-#include "localsubcontrolentities.hh"
-
-namespace Dumux
-{
-//! Specialization of the interaction volume traits class
-template<class TypeTag>
-class CCMpfaOFpsInteractionVolumeTraits : public CCMpfaOInteractionVolumeTraits<TypeTag>
-{
-public:
- // Interior boundaries can not yet be handled by the currend o-method fps implementation
- // In that case we use the o-interactionvolume, otherwise we use its own interaction volumes at the boundary
- using BoundaryInteractionVolume = typename std::conditional<GET_PROP_VALUE(TypeTag, EnableInteriorBoundaries),
- CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethod>,
- CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethodFps>>::type;
-
- // The local sub-control volume type differs from the standard mpfa-o method
- using LocalScvType = CCMpfaOFpsLocalScv<TypeTag>;
-};
-/*!
- * \ingroup Mpfa
- * \brief Base class for the interaction volumes of the mpfa-o method with full pressure support.
- */
-template<class TypeTag>
-class CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethodFps>
- : public CCMpfaOInteractionVolume<TypeTag,
- CCMpfaOFpsInteractionVolumeTraits<TypeTag>,
- CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethodFps>>
-{
- using Traits = CCMpfaOFpsInteractionVolumeTraits<TypeTag>;
- using ThisType = CCMpfaInteractionVolumeImplementation<TypeTag, MpfaMethods::oMethodFps>;
- using ParentType = CCMpfaOInteractionVolume<TypeTag, Traits, ThisType>;
-
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
-
- using LocalScvType = typename Traits::LocalScvType;
- using LocalScvfType = typename Traits::LocalScvfType;
-
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
- using CoordScalar = typename GridView::ctype;
- using FeCache = Dune::PQkLocalFiniteElementCache<CoordScalar, Scalar, dim, 1>;
- using FeLocalBasis = typename FeCache::FiniteElementType::Traits::LocalBasisType;
- using ShapeJacobian = typename FeLocalBasis::Traits::JacobianType;
- using ShapeValue = typename Dune::FieldVector<Scalar, 1>;
- using JacobianInverseTransposed = typename LocalScvType::Geometry::JacobianInverseTransposed;
-
- using LocalPosition = typename LocalScvType::Geometry::LocalCoordinate;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using DynamicVector = typename Traits::Vector;
- using DynamicMatrix = typename Traits::Matrix;
- using Tensor = typename Traits::Tensor;
-
- enum
- {
- jacRows = JacobianInverseTransposed::rows,
- jacCols = JacobianInverseTransposed::cols
- };
-
- // stores the matrices required to calculate Tij
- struct LocalMatrixContainer
- {
- DynamicMatrix AL; //! coefficients of unknown face pressures (LHS)
- DynamicMatrix AR; //! coefficients of unknown face pressures (RHS)
- DynamicMatrix BL; //! coefficients of cell/Dirichlet pressures (LHS)
- DynamicMatrix BR; //! coefficients of cell/Dirichlet pressures (RHS)
-
- // the matrices for the expression of the fluxes
- DynamicMatrix AF; //! coefficients for the unknown face pressures
- DynamicMatrix BF; //! coefficients for the cell/Dirichlet pressures
- };
-
-public:
- using typename ParentType::LocalIndexType;
- using typename ParentType::LocalFaceData;
- using typename ParentType::Seed;
-
- CCMpfaInteractionVolumeImplementation(const Seed& seed,
- const Problem& problem,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars)
- : ParentType(seed, problem, fvGeometry, elemVolVars),
- c_(GET_PARAM_FROM_GROUP(TypeTag, Scalar, Mpfa, C)),
- p_(GET_PARAM_FROM_GROUP(TypeTag, Scalar, Mpfa, P)),
- divEqIdx_(this->fluxScvfIndexSet_().size())
- {
- if (dim == 3)
- DUNE_THROW(Dune::NotImplemented, "Fps scheme in 3d");
-
- //! add entry to the vector of neumann fluxes
- addAuxiliaryCellNeumannFlux_();
- }
-
- template<typename GetTensorFunction>
- void solveLocalSystem(const GetTensorFunction& getTensor)
- {
- const std::size_t numFluxFaces = this->fluxScvfIndexSet_().size();
- const std::size_t numUnknowns = numFluxFaces + 1;
- const std::size_t numFaces = this->localScvfs_.size();
- const std::size_t numPotentials = this->volVarsStencil().size();
-
- // instantiate and resize the local matrices
- LocalMatrixContainer mc;
- mc.AL.resize(numUnknowns, numUnknowns, 0.0);
- mc.AR.resize(numUnknowns, numUnknowns, 0.0);
- mc.BL.resize(numUnknowns, numPotentials, 0.0);
- mc.BR.resize(numUnknowns, numPotentials, 0.0);
- mc.AF.resize(numFaces, numUnknowns, 0.0);
- mc.BF.resize(numFaces, numPotentials, 0.0);
-
- // assemble the local eq system and matrices
- assembleLocalMatrices_(getTensor, mc);
-
- // solve local system and store transmissibility matrix
- mc.AL -= mc.AR;
- mc.BR -= mc.BL;
- mc.AL.invert();
- this->CAinv_ = Dumux::multiplyMatrices(mc.AF, mc.AL);
- this->T_ = Dumux::multiplyMatrices(mc.AF, Dumux::multiplyMatrices(mc.AL, mc.BR));
- this->T_ += mc.BF;
- }
-
-private:
-
- void addAuxiliaryCellNeumannFlux_()
- {
- if (!this->onDomainOrInteriorBoundary() || GET_PROP_VALUE(TypeTag, UseTpfaBoundary))
- return;
-
- // add one entry to the vector of neumann fluxes
- auto& neumannFluxes = this->neumannFluxes_;
- neumannFluxes.resize(this->fluxScvfIndexSet_().size() + 1);
- neumannFluxes[neumannFluxes.size()-1] = std::accumulate(neumannFluxes.begin(), neumannFluxes.end()-1, PrimaryVariables(0.0));
- }
-
- template<typename GetTensorFunction>
- void assembleLocalMatrices_(const GetTensorFunction& getTensor, LocalMatrixContainer& mc)
- {
- // loop over the local faces
- LocalIndexType localFaceIdx = 0;
- for (const auto& localScvf : this->localScvfs_)
- {
- if (localScvf.boundary())
- assemblePositiveScv(getTensor, localScvf, localFaceIdx, mc, true);
- else
- {
- assemblePositiveScv(getTensor, localScvf, localFaceIdx, mc);
- assembleNegativeScv(getTensor, localScvf, localFaceIdx, mc);
- }
-
- // go to the next face
- localFaceIdx++;
- }
- }
-
- template<typename GetTensorFunction>
- void assemblePositiveScv(const GetTensorFunction& getTensor,
- const LocalScvfType& localScvf,
- LocalIndexType localScvfIdx,
- LocalMatrixContainer& mc,
- bool boundary = false)
- {
- // get diffusion tensor in "positive" sub volume
- auto localScvIdx = localScvf.insideLocalScvIndex();
- auto&& localScv = this->localScv_(localScvIdx);
- auto&& globalScv = this->fvGeometry_().scv(localScv.globalIndex());
- auto&& element = this->localElement_(localScvIdx);
- auto D = makeTensor_(getTensor(this->problem_(), element, this->elemVolVars_()[globalScv], this->fvGeometry_(), globalScv));
- // the local finite element basis
- const auto& localBasis = feCache_.get(localScv.geometry().type()).localBasis();
-
- // the normal and local integration point
- // On the ref element, normal vector points in the direction of local coordinate
- auto normalDir = localScv.getScvfIdxInScv(localScvfIdx);
- auto ipLocal = localScv.geometry().local(localScvf.ip());
-
- // find normal coordinate direction and integration point for divergence condition
- LocalIndexType divEqNormalDir = 1 - normalDir;
- LocalPosition divEqIpLocal(0.0);
- divEqIpLocal[divEqNormalDir] = divEqNormalDir == 1 ? c_ : 1.0 - (1.0-c_)*p_;
- divEqIpLocal[normalDir] = divEqNormalDir == 1 ? c_ + (1.0-c_)*p_ : c_;
-
- // does the face has an unknown associated with it?
- bool isFluxFace = localScvf.faceType() != MpfaFaceTypes::dirichlet;
-
- // assemble coefficients for the face fluxes
- addFaceFluxCoefficients_(localScv, localBasis, D, localScvfIdx, ipLocal, normalDir, mc, isFluxFace);
- // assemble matrix entries for the condition of zero divergence
- addDivEquationCoefficients_(localScv, localBasis, D, divEqIpLocal, divEqNormalDir, mc);
-
- // on dirichlet boundary faces, add coefficients for the boundary fluxes
- if (boundary && !isFluxFace)
- {
- LocalPosition bcIpLocal(0.0);
- bcIpLocal[normalDir] = 1.0;
- bcIpLocal[divEqNormalDir] = normalDir == 1 ? 1.0 - (1.0-c_)*p_ : c_ + (1.0-c_)*p_;
- addDivEquationCoefficients_(localScv, localBasis, D, bcIpLocal, normalDir, mc, boundary);
- }
- }
-
- template<typename GetTensorFunction>
- void assembleNegativeScv(const GetTensorFunction& getTensor,
- const LocalScvfType& localScvf,
- LocalIndexType localScvfIdx,
- LocalMatrixContainer& mc)
- {
- // get diffusion tensor in "negative" sub volume
- for (auto localScvIdx : localScvf.outsideLocalScvIndices())
- {
- auto&& localScv = this->localScv_(localScvIdx);
- auto&& globalScv = this->fvGeometry_().scv(localScv.globalIndex());
- auto&& element = this->localElement_(localScvIdx);;
- auto D = makeTensor_(getTensor(this->problem_(), element, this->elemVolVars_()[globalScv], this->fvGeometry_(), globalScv));
-
- // the local finite element bases of the scvs
- const auto& localBasis = feCache_.get(localScv.geometry().type()).localBasis();
-
- // the normal and local integration point
- // On the ref element, normal vector points in the direction of local coordinate
- auto normalDir = localScv.getScvfIdxInScv(localScvfIdx);
- auto ipLocal = localScv.geometry().local(localScvf.ip());
-
- // find normals and integration points in the two scvs for condition of zero divergence
- LocalIndexType divEqNormalDir = 1 - normalDir;
- LocalPosition divEqIpLocal(0.0);
- divEqIpLocal[divEqNormalDir] = divEqNormalDir == 1 ? c_ : 1.0 - (1.0-c_)*p_;
- divEqIpLocal[normalDir] = divEqNormalDir == 1 ? c_ + (1.0-c_)*p_ : c_;
-
- // does the face has an unknown associated with it?
- bool isFluxFace = localScvf.faceType() != MpfaFaceTypes::dirichlet;
-
- // assemble coefficients for the face fluxes
- addFaceFluxCoefficients_(localScv, localBasis, D, localScvfIdx, ipLocal, normalDir, mc, isFluxFace, true);
-
- // assemble matrix entries for the condition of zero divergence
- addDivEquationCoefficients_(localScv, localBasis, D, divEqIpLocal, divEqNormalDir, mc);
- }
- }
-
- void addFaceFluxCoefficients_(const LocalScvType& localScv,
- const FeLocalBasis& localBasis,
- const Tensor& D,
- LocalIndexType rowIdx,
- const LocalPosition& ipLocal,
- LocalIndexType normalDir,
- LocalMatrixContainer& mc,
- bool isFluxEq,
- bool isRHS = false)
- {
- // In case we're on a flux continuity face, get local index
- LocalIndexType eqSystemIdx = isFluxEq ? this->findIndexInVector(this->fluxScvfIndexSet_(), rowIdx) : -1;
-
- // Fluxes stemming from the RHS have to have the opposite sign
- Scalar factor = isRHS ? 1.0 : -1.0;
- DynamicMatrix& A = isRHS ? mc.AR : mc.AL;
- DynamicMatrix& B = isRHS ? mc.BR : mc.BL;
-
- // evaluate shape functions gradients at the ip
- std::vector<ShapeJacobian> shapeJacobian;
- localBasis.evaluateJacobian(ipLocal, shapeJacobian);
-
- // get the inverse jacobian and its transposed
- const auto jacInvT = localScv.geometry().jacobianInverseTransposed(ipLocal);
- const auto jacInv = Dumux::getTransposed(jacInvT);
-
- // transform the diffusion tensor into local coordinates
- auto DJinvT = jacInvT.leftmultiplyany(D);
- auto localD = DJinvT.leftmultiplyany(jacInv);
- localD *= localScv.geometry().integrationElement(ipLocal);
-
- // add matrix entries for the pressure in the cell center
- auto cellPressureIdx = this->findIndexInVector(this->volVarsStencil(), localScv.globalIndex());
- Scalar bi0 = factor*(localD[normalDir]*shapeJacobian[0][0]);
- if (!isRHS) mc.BF[rowIdx][cellPressureIdx] += bi0;
- if (isFluxEq) B[eqSystemIdx][cellPressureIdx] += bi0;
-
- // Add entries from the local scv faces
- for (int localDir = 0; localDir < dim; localDir++)
- {
- auto localScvfIdx = localScv.localScvfIndex(localDir);
- if (this->localScvf_(localScvfIdx).faceType() != MpfaFaceTypes::dirichlet)
- {
- Scalar aij = factor*(localD[normalDir]*shapeJacobian[localDir+1][0]);
- auto colIdx = this->findIndexInVector(this->fluxScvfIndexSet_(), localScvfIdx);
- if (!isRHS) mc.AF[rowIdx][colIdx] += aij;
- if (isFluxEq) A[eqSystemIdx][colIdx] += aij;
- }
- else
- {
- Scalar bij = factor*(localD[normalDir]*shapeJacobian[localDir+1][0]);
- auto colIdx = this->localScvs_.size() + this->findIndexInVector(this->dirichletScvfIndexSet_(), localScvfIdx);
- if (!isRHS) mc.BF[rowIdx][colIdx] += bij;
- if (isFluxEq) B[eqSystemIdx][colIdx] += bij;
- }
- }
-
- // add entry from the vertex pressure
- Scalar ain = factor*(localD[normalDir]*shapeJacobian[3][0]);
- if (!isRHS) mc.AF[rowIdx][divEqIdx_] += ain;
- if (isFluxEq) A[eqSystemIdx][divEqIdx_] += ain;
- }
-
- void addDivEquationCoefficients_(const LocalScvType& localScv,
- const FeLocalBasis& localBasis,
- const Tensor& D,
- const LocalPosition& ipLocal,
- LocalIndexType normalDir,
- LocalMatrixContainer& mc,
- bool isBoundary = false)
- {
- // fluxes on the auxiliary volume have to be scaled
- static const Scalar auxArea = 1.0 - c_;
- Scalar factor = isBoundary ? -1.0*auxArea : auxArea;
-
- // evaluate shape functions gradients at the ip
- std::vector<ShapeJacobian> shapeJacobian;
- localBasis.evaluateJacobian(ipLocal, shapeJacobian);
-
- // get the inverse jacobian and its transposed
- const auto jacInvT = localScv.geometry().jacobianInverseTransposed(ipLocal);
- const auto jacInv = Dumux::getTransposed(jacInvT);
-
- // transform the diffusion tensor into local coordinates
- auto DJinvT = jacInvT.leftmultiplyany(D);
- auto localD = DJinvT.leftmultiplyany(jacInv);
- localD *= localScv.geometry().integrationElement(ipLocal);
-
- // add matrix entries for the pressure in the cell center
- auto cellPressureIdx = this->findIndexInVector(this->volVarsStencil(), localScv.globalIndex());
- mc.BL[divEqIdx_][cellPressureIdx] += factor*(localD[normalDir]*shapeJacobian[0][0]);
-
- // Add entries from the local scv faces
- for (int localDir = 0; localDir < dim; localDir++)
- {
- auto localScvfIdx = localScv.localScvfIndex(localDir);
-
- if (this->localScvf_(localScvfIdx).faceType() != MpfaFaceTypes::dirichlet)
- {
- auto colIdx = this->findIndexInVector(this->fluxScvfIndexSet_(), localScvfIdx);
- mc.AL[divEqIdx_][colIdx] += factor*(localD[normalDir]*shapeJacobian[localDir+1][0]);
- }
- else
- {
- auto colIdx = this->localScvs_.size() + this->findIndexInVector(this->dirichletScvfIndexSet_(), localScvfIdx);
- mc.BL[divEqIdx_][colIdx] += factor*(localD[normalDir]*shapeJacobian[localDir+1][0]);
- }
- }
-
- // add entry from the vertex pressure
- mc.AL[divEqIdx_][divEqIdx_] += factor*(localD[normalDir]*shapeJacobian[3][0]);
- }
-
- // TODO: how to do the assertion of positive coefficients for tensors?
- Tensor makeTensor_(Tensor&& tensor) const
- { return std::move(tensor); }
-
- // turns a scalar into a tensor
- Tensor makeTensor_(Scalar&& t) const
- {
- // make sure we have positive diffusion coefficients
- assert(t > 0.0 && "non-positive diffusion coefficients cannot be handled by mpfa methods");
-
- Tensor T(0.0);
- for (int i = 0; i < dimWorld; ++i)
- T[i][i] = t;
-
- return T;
- }
-
- const FeCache feCache_;
-
- const Scalar c_;
- const Scalar p_;
- const LocalIndexType divEqIdx_;
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/omethodfps/localsubcontrolentities.hh b/dumux/discretization/cellcentered/mpfa/omethodfps/localsubcontrolentities.hh
deleted file mode 100644
index 616d9466cbcc6f97fd4e85600ca1e6fe02c61361..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/omethodfps/localsubcontrolentities.hh
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for sub control entities of the mpfa-o method.
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_O_FPS_LOCALSUBCONTROLENTITIES_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_O_FPS_LOCALSUBCONTROLENTITIES_HH
-
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include "mpfafpsgeometryhelper.hh"
-
-namespace Dumux
-{
-template<class TypeTag>
-class CCMpfaOFpsLocalScv
-{
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Helper = typename GET_PROP_TYPE(TypeTag, MpfaHelper);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using InteractionVolume = typename GET_PROP_TYPE(TypeTag, InteractionVolume);
-
- using Element = typename GridView::template Codim<0>::Entity;
- using LocalScvSeed = typename InteractionVolume::Seed::LocalScvSeed;
-
- using GlobalIndexType = typename GridView::IndexSet::IndexType;
- using LocalIndexType = typename InteractionVolume::LocalIndexType;
-
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
-
- using GeometryHelper = Dumux::MpfaFpsGeometryHelper<GridView, dim>;
-
-public:
- using Geometry = Dune::MultiLinearGeometry<Scalar, dim, dimWorld>;
-
- //! The constructor
- //! Initialization in the initializer list is desired to not have to use the optional (see scv).
- //! Here, we use the first scvf in the seed to extract an scvf and the local vertex index it is connected to.
- //! We know that in the fps scheme all the scvfs are connected to the same vertex. The MpfaFpsGeometry Helper
- //! is then used to extract the corners of the given scv (in the geometry constructor).
- CCMpfaOFpsLocalScv(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const LocalScvSeed& scvSeed)
- : seedPtr_(&scvSeed),
- geometry_(Dune::GeometryType(Dune::GeometryType::cube, dim),
- GeometryHelper(element.geometry()).getScvCorners(fvGeometry.scvf(scvSeed.globalScvfIndices()[0]).vertexIndexInElement()))
- {}
-
- GlobalIndexType globalIndex() const
- { return scvSeed_().globalIndex(); }
-
- GlobalIndexType localScvfIndex(LocalIndexType coordDir) const
- {
- assert(coordDir < dim);
- return scvSeed_().localScvfIndices()[coordDir];
- }
-
- LocalIndexType getScvfIdxInScv(LocalIndexType localScvfIndex) const
- {
- auto it = std::find(scvSeed_().localScvfIndices().begin(), scvSeed_().localScvfIndices().end(), localScvfIndex);
- assert(it != scvSeed_().localScvfIndices().end() && "Could not find the local coordinate of the local scvf");
- return std::distance(scvSeed_().localScvfIndices().begin(), it);
- }
-
- //! Returns the center of the element the scv is embedded in
- GlobalPosition center() const
- { return geometry().corner(0); }
-
- const Geometry& geometry() const
- { return geometry_; }
-
-private:
- const LocalScvSeed& scvSeed_() const
- { return *seedPtr_; }
-
- const LocalScvSeed* seedPtr_;
- Geometry geometry_;
-};
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/omethodfps/mpfafpsgeometryhelper.hh b/dumux/discretization/cellcentered/mpfa/omethodfps/mpfafpsgeometryhelper.hh
deleted file mode 100644
index ba427928048b4a7ad2a7d3bad68111971d9e9055..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/omethodfps/mpfafpsgeometryhelper.hh
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Helper class constructing the dual grid finite volume geometries
- * for the box discretizazion method
- */
-#ifndef DUMUX_DISCRETIZATION_MPFA_FPS_GEOMETRY_HELPER_HH
-#define DUMUX_DISCRETIZATION_MPFA_FPS_GEOMETRY_HELPER_HH
-
-#include <dune/geometry/multilineargeometry.hh>
-#include <dune/geometry/referenceelements.hh>
-
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/common/math.hh>
-#include <dumux/common/optional.hh>
-
-namespace Dumux
-{
-
-//! A class to mainly extract the scv corners of the scvs inside an element
-template<class GridView, int dim>
-class MpfaFpsGeometryHelper;
-
-//! Specialization for dim = 2
-template <class GridView>
-class MpfaFpsGeometryHelper<GridView, 2>
-{
- using Scalar = typename GridView::ctype;
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
-
- using ScvGeometry = Dune::CachedMultiLinearGeometry<Scalar, dim, dimWorld>;
- using ScvfGeometry = Dune::CachedMultiLinearGeometry<Scalar, dim-1, dimWorld>;
-
- using GlobalPosition = typename ScvGeometry::GlobalCoordinate;
- using PointVector = std::vector<GlobalPosition>;
-
- using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
-
- using ReferenceElements = typename Dune::ReferenceElements<Scalar, dim>;
-
- //! the maximum number of helper points used to construct the geometries
- //! Using a statically sized point array is much faster than dynamic allocation
- static constexpr int maxPoints = 9;
-
-public:
-
- MpfaFpsGeometryHelper(const typename Element::Geometry& geometry)
- : corners_(geometry.corners())
- {
- // extract the corners of the sub control volumes
- const auto& referenceElement = ReferenceElements::general(geometry.type());
-
- // the element center
- p[0] = geometry.center();
-
- // vertices
- for (int i = 0; i < corners_; ++i)
- p[i+1] = geometry.corner(i);
-
- // face midpoints
- for (int i = 0; i < referenceElement.size(1); ++i)
- p[i+corners_+1] = geometry.global(referenceElement.position(i, 1));
- }
-
- //! Create a vector with the scv corners
- PointVector getScvCorners(unsigned int localScvIdx) const
- {
- // proceed according to number of corners of the element
- switch (corners_)
- {
- case 3: // triangle
- {
- //! Only build the maps the first time we encounter a triangle
- static const std::uint8_t vo = 1; //! vertex offset in point vector p
- static const std::uint8_t fo = 4; //! face offset in point vector p
- static const std::uint8_t map[3][4] =
- {
- {0, fo+1, fo+0, vo+0},
- {0, fo+0, fo+2, vo+1},
- {0, fo+2, fo+1, vo+2}
- };
-
- return PointVector( {p[map[localScvIdx][0]],
- p[map[localScvIdx][1]],
- p[map[localScvIdx][2]],
- p[map[localScvIdx][3]]} );
- }
- case 4: // quadrilateral
- {
- //! Only build the maps the first time we encounter a quadrilateral
- static const std::uint8_t vo = 1; //! vertex offset in point vector p
- static const std::uint8_t fo = 5; //! face offset in point vector p
- static const std::uint8_t map[4][4] =
- {
- {0, fo+0, fo+2, vo+0},
- {0, fo+2, fo+1, vo+1},
- {0, fo+3, fo+0, vo+2},
- {0, fo+1, fo+3, vo+3}
- };
-
- return PointVector( {p[map[localScvIdx][0]],
- p[map[localScvIdx][1]],
- p[map[localScvIdx][2]],
- p[map[localScvIdx][3]]} );
- }
- default:
- DUNE_THROW(Dune::NotImplemented, "Mpfa-Fps scv corners for dim=" << dim
- << " dimWorld=" << dimWorld
- << " corners=" << corners_);
- }
- }
-
-private:
- GlobalPosition p[maxPoints]; // the points needed for construction of the geometries
- std::size_t corners_; // number of element corners
-};
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/omethodfps/subcontrolvolumeface.hh b/dumux/discretization/cellcentered/mpfa/omethodfps/subcontrolvolumeface.hh
deleted file mode 100644
index cffb6a13cca3bd57db01622c84c4de7125b55a64..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/omethodfps/subcontrolvolumeface.hh
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Class for an mpfao-fps sub control volume face
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_O_FPS_SUBCONTROLVOLUMEFACE_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_O_FPS_SUBCONTROLVOLUMEFACE_HH
-
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-#include <dumux/discretization/cellcentered/mpfa/subcontrolvolumefacebase.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup Discretization
- * \brief Class for a sub control volume face in the mpfao-fps method.
- */
-template<class G, typename I>
-class CCMpfaSubControlVolumeFace<MpfaMethods::oMethodFps, G, I> : public CCMpfaSubControlVolumeFaceBase<G, I>
-{
- using ParentType = CCMpfaSubControlVolumeFaceBase<G, I>;
- using Geometry = G;
- using IndexType = I;
-
- using Scalar = typename Geometry::ctype;
- static const int dim = Geometry::mydimension;
- static const int dimworld = Geometry::coorddimension;
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
-
-public:
- template<class MpfaHelper>
- CCMpfaSubControlVolumeFace(const MpfaHelper& helper,
- std::vector<GlobalPosition>&& corners,
- GlobalPosition&& unitOuterNormal,
- IndexType vIdxGlobal,
- unsigned int vIdxLocal,
- IndexType scvfIndex,
- IndexType insideScvIdx,
- const std::vector<IndexType>& outsideScvIndices,
- Scalar q,
- bool boundary)
- : ParentType(helper,
- std::move(corners),
- std::move(unitOuterNormal),
- vIdxGlobal,
- vIdxLocal,
- scvfIndex,
- insideScvIdx,
- outsideScvIndices,
- q,
- boundary),
- vIdxInElement_(vIdxLocal)
- {}
-
- //! Returns the local index inside the element of the vertex the scvf is connected to
- IndexType vertexIndexInElement() const
- { return vIdxInElement_; }
-
-private:
- unsigned int vIdxInElement_;
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/properties.hh b/dumux/discretization/cellcentered/mpfa/properties.hh
new file mode 100644
index 0000000000000000000000000000000000000000..2feae139873e7b5377f86dd22dc2b5b8c774a4f9
--- /dev/null
+++ b/dumux/discretization/cellcentered/mpfa/properties.hh
@@ -0,0 +1,189 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \ingroup Properties
+ * \file
+ *
+ * \brief Defines a type tag and some properties for models using
+ * a cell-centered scheme with multi-point flux approximation.
+ */
+
+#ifndef DUMUX_CC_MPFA_PROPERTIES_HH
+#define DUMUX_CC_MPFA_PROPERTIES_HH
+
+#include <dune/common/fvector.hh>
+#include <dune/geometry/multilineargeometry.hh>
+
+#include <dumux/discretization/methods.hh>
+#include <dumux/discretization/fvproperties.hh>
+
+#include <dumux/implicit/cellcentered/elementboundarytypes.hh>
+#include <dumux/implicit/cellcentered/localresidual.hh>
+
+#include <dumux/discretization/cellcentered/globalvolumevariables.hh>
+#include <dumux/discretization/cellcentered/subcontrolvolume.hh>
+#include <dumux/discretization/cellcentered/elementsolution.hh>
+
+#include <dumux/discretization/cellcentered/mpfa/methods.hh>
+#include <dumux/discretization/cellcentered/mpfa/connectivitymap.hh>
+#include <dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh>
+#include <dumux/discretization/cellcentered/mpfa/globalfluxvariablescache.hh>
+#include <dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh>
+#include <dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh>
+#include <dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh>
+#include <dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh>
+#include <dumux/discretization/cellcentered/mpfa/helper.hh>
+#include <dumux/discretization/cellcentered/mpfa/interactionvolume.hh>
+
+namespace Dumux
+{
+namespace Properties
+{
+//! Type tag for the cell-centered mpfa scheme.
+NEW_TYPE_TAG(CCMpfaModel, INHERITS_FROM(FiniteVolumeModel));
+
+//! Set the corresponding discretization method property
+SET_PROP(CCMpfaModel, DiscretizationMethod)
+{
+ static const DiscretizationMethods value = DiscretizationMethods::CCMpfa;
+};
+
+//! By default we set the o-method as the Mpfa method of choice
+SET_PROP(CCMpfaModel, MpfaMethod)
+{
+ static const MpfaMethods value = MpfaMethods::oMethod;
+};
+
+//! The mpfa helper class
+SET_TYPE_PROP(CCMpfaModel, MpfaHelper, CCMpfaHelper<TypeTag>);
+
+//! The interaction volume class
+SET_TYPE_PROP(CCMpfaModel, PrimaryInteractionVolume, CCMpfaInteractionVolume<TypeTag>);
+
+//! The secondary interaction volume class (exported from the traits)
+SET_TYPE_PROP(CCMpfaModel,
+ SecondaryInteractionVolume,
+ typename GET_PROP_TYPE(TypeTag, PrimaryInteractionVolume)::Traits::SecondaryInteractionVolume);
+
+//! Set the default for the global finite volume geometry
+SET_TYPE_PROP(CCMpfaModel,
+ FVGridGeometry,
+ CCMpfaFVGridGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
+
+//! Set the default for the local finite volume geometry
+SET_TYPE_PROP(CCMpfaModel,
+ FVElementGeometry,
+ CCMpfaFVElementGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
+
+//! The global flux variables cache vector class
+SET_TYPE_PROP(CCMpfaModel,
+ GlobalFluxVariablesCache,
+ CCMpfaGlobalFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+
+//! The local flux variables cache vector class
+SET_TYPE_PROP(CCMpfaModel,
+ ElementFluxVariablesCache,
+ CCMpfaElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+
+
+//! The global previous volume variables vector class
+SET_TYPE_PROP(CCMpfaModel,
+ ElementVolumeVariables,
+ CCMpfaElementVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
+
+//! The global current volume variables vector class
+SET_TYPE_PROP(CCMpfaModel, GlobalVolumeVariables, CCGlobalVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
+
+//! The sub control volume
+SET_PROP(CCMpfaModel, SubControlVolume)
+{
+private:
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
+ struct ScvGeometryTraits
+ {
+ using Geometry = typename Grid::template Codim<0>::Geometry;
+ using GridIndexType = typename Grid::LeafGridView::IndexSet::IndexType;
+ using LocalIndexType = unsigned int;
+ using Scalar = typename Geometry::ctype;
+ using GlobalPosition = Dune::FieldVector<Scalar, Geometry::coorddimension>;
+ };
+public:
+ using type = CCSubControlVolume<ScvGeometryTraits>;
+};
+
+//! The sub-control volume face class
+SET_PROP(CCMpfaModel, SubControlVolumeFace)
+{
+private:
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
+ static const int dim = Grid::dimension;
+ static const int dimWorld = Grid::dimensionworld;
+ static const MpfaMethods method = GET_PROP_VALUE(TypeTag, MpfaMethod);
+
+ // we use geometry traits that use static corner vectors to and a fixed geometry type
+ template <class ct>
+ struct ScvfMLGTraits : public Dune::MultiLinearGeometryTraits<ct>
+ {
+ // we use static vectors to store the corners as we know
+ // the number of corners in advance (2^(dim-1) corners (1<<(dim-1))
+ template< int mydim, int cdim >
+ struct CornerStorage
+ {
+ using Type = std::array< Dune::FieldVector< ct, cdim >, (1<<(dim-1)) >;
+ };
+
+ // we know all scvfs will have the same geometry type
+ template< int dim >
+ struct hasSingleGeometryType
+ {
+ static const bool v = true;
+ static const unsigned int topologyId = Dune::Impl::CubeTopology< dim >::type::id;
+ };
+ };
+
+ struct ScvfGeometryTraits
+ {
+ using GridIndexType = typename Grid::LeafGridView::IndexSet::IndexType;
+ using LocalIndexType = unsigned int;
+ using Scalar = typename Grid::ctype;
+ using Geometry = Dune::MultiLinearGeometry<Scalar, dim-1, dimWorld, ScvfMLGTraits<Scalar> >;
+ using CornerStorage = typename ScvfMLGTraits<Scalar>::template CornerStorage<dim-1, dimWorld>::Type;
+ using GlobalPosition = typename CornerStorage::value_type;
+ };
+
+public:
+ using type = Dumux::CCMpfaSubControlVolumeFace<method, ScvfGeometryTraits>;
+};
+
+//! Set the solution vector type for an element
+SET_TYPE_PROP(CCMpfaModel, ElementSolutionVector, CCElementSolution<TypeTag>);
+
+//! Set the default for the ElementBoundaryTypes
+SET_TYPE_PROP(CCMpfaModel, ElementBoundaryTypes, CCElementBoundaryTypes<TypeTag>);
+
+//! Set the BaseLocalResidual to CCLocalResidual
+SET_TYPE_PROP(CCMpfaModel, BaseLocalResidual, CCLocalResidual<TypeTag>);
+
+//! Set the AssemblyMap property
+SET_TYPE_PROP(CCMpfaModel, AssemblyMap, Dumux::CCMpfaConnectivityMap<TypeTag>);
+
+} // namespace Properties
+} // namespace Dumux
+
+#endif
diff --git a/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh b/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
index 5d1f96917818b2e6cf6d2182e143b350158e367c..03bbd2356a77daa11bb7f4c55e2e1f2f7eeabbe2 100644
--- a/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
+++ b/dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh
@@ -18,7 +18,7 @@
*****************************************************************************/
/*!
* \file
- * \brief Class for an MPFA-O sub control volume face
+ * \brief Class for the sub-control volume face in mpfa schemes
*/
#ifndef DUMUX_DISCRETIZATION_CC_MPFA_SUBCONTROLVOLUMEFACE_HH
#define DUMUX_DISCRETIZATION_CC_MPFA_SUBCONTROLVOLUMEFACE_HH
@@ -27,42 +27,32 @@
namespace Dumux
{
-//! Forward declaration of the method specific implementations
-//! Available implementations have to be included at the end of this file.
-template<MpfaMethods M, class G, typename I>
-class CCMpfaSubControlVolumeFaceImplementation;
/*!
- * \ingroup Discretization
- * \brief Class for a sub control volume face in mpfa methods, i.e a part of the boundary
- * of a control volume we compute fluxes on. This class inherits from the actual implementations
- * and defines the constructor interface.
+ * \ingroup Mpfa
+ * \brief Default implementation of the class for a sub-control volume face in mpfa methods.
*/
-template<MpfaMethods M, class G, typename I>
-class CCMpfaSubControlVolumeFace : public CCMpfaSubControlVolumeFaceImplementation<M, G, I>
+template<class ScvfGeometryTraits>
+class CCMpfaDefaultSubControlVolumeFace
{
- using ParentType = CCMpfaSubControlVolumeFaceImplementation<M, G, I>;
- using Geometry = G;
- using IndexType = I;
-
- using Scalar = typename Geometry::ctype;
- static const int dim = Geometry::mydimension;
- static const int dimworld = Geometry::coorddimension;
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
+ using GridIndexType = typename ScvfGeometryTraits::GridIndexType;
+ using Scalar = typename ScvfGeometryTraits::Scalar;
+ using GlobalPosition = typename ScvfGeometryTraits::GlobalPosition;
+ using CornerStorage = typename ScvfGeometryTraits::CornerStorage;
+ using Geometry = typename ScvfGeometryTraits::Geometry;
public:
+ //! state the traits public and thus export all types
+ using Traits = ScvfGeometryTraits;
+
/*!
* \brief Constructor
*
- * We do not use the localIndex here. Its meaning can vary depending on the
- * implementation (i.e. mpfa method) and is handled by the implementation itself.
- *
* \param geomHelper The mpfa geometry helper
* \param corners The corners of the scv face
* \param unitOuterNormal The unit outer normal vector of the scvf
* \param vIdxGlobal The global vertex index the scvf is connected to
- * \param localIndex Some element local index (the local vertex index in mpfao-fps)
+ * \param vIdxLocal The element-local vertex index the scvf is connected to
* \param scvfIndex The global index of this scv face
* \param insideScvIdx The inside scv index connected to this face
* \param outsideScvIndices The outside scv indices connected to this face
@@ -70,33 +60,120 @@ public:
* \param boundary Boolean to specify whether or not the scvf is on a boundary
*/
template<class MpfaHelper>
- CCMpfaSubControlVolumeFace(const MpfaHelper& helper,
- std::vector<GlobalPosition>&& corners,
- GlobalPosition&& unitOuterNormal,
- IndexType vIdxGlobal,
- unsigned int localIndex,
- IndexType scvfIndex,
- IndexType insideScvIdx,
- const std::vector<IndexType>& outsideScvIndices,
- Scalar q,
- bool boundary)
- : ParentType(helper,
- std::forward<std::vector<GlobalPosition>>(corners),
- std::forward<GlobalPosition>(unitOuterNormal),
- vIdxGlobal,
- localIndex,
- scvfIndex,
- insideScvIdx,
- outsideScvIndices,
- q,
- boundary)
- {}
+ explicit CCMpfaDefaultSubControlVolumeFace(const MpfaHelper& helper,
+ CornerStorage&& corners,
+ GlobalPosition&& unitOuterNormal,
+ GridIndexType vIdxGlobal,
+ unsigned int vIdxLocal,
+ GridIndexType scvfIndex,
+ GridIndexType insideScvIdx,
+ const std::vector<GridIndexType>& outsideScvIndices,
+ Scalar q,
+ bool boundary)
+ : boundary_(boundary),
+ vertexIndex_(vIdxGlobal),
+ scvfIndex_(scvfIndex),
+ insideScvIdx_(insideScvIdx),
+ outsideScvIndices_(outsideScvIndices),
+ vIdxInElement_(vIdxLocal),
+ corners_(std::move(corners)),
+ center_(0.0),
+ unitOuterNormal_(std::move(unitOuterNormal))
+ {
+ // compute the center of the scvf
+ for (const auto& corner : corners_)
+ center_ += corner;
+ center_ /= corners_.size();
+
+ // use helper class to obtain area & integration point
+ ipGlobal_ = helper.getScvfIntegrationPoint(corners_, q);
+ area_ = helper.getScvfArea(corners_);
+ }
+
+ //! The area of the sub control volume face
+ Scalar area() const { return area_; }
+
+ //! returns bolean if the sub control volume face is on the domain boundary
+ bool boundary() const { return boundary_; }
+
+ //! The global index of this sub control volume face
+ GridIndexType index() const { return scvfIndex_; }
+
+ //! Returns the index of the vertex the scvf is connected to
+ GridIndexType vertexIndex() const { return vertexIndex_; }
+
+ //! Returns the element-local vertex index the scvf is connected to
+ unsigned int vertexIndexInElement() const { return vIdxInElement_; }
+
+ //! index of the inside sub control volume
+ GridIndexType insideScvIdx() const { return insideScvIdx_; }
+
+ //! The number of outside scvs connection via this scv face
+ std::size_t numOutsideScvs() const { return outsideScvIndices_.size(); }
+
+ //! index of the outside sub control volume or boundary scv index
+ //! returns undefined behaviour if index exceeds numOutsideScvs
+ GridIndexType outsideScvIdx(int i = 0) const { return outsideScvIndices_[i]; }
+
+ //! returns the outside scv indices (can be more than one index for dim < dimWorld)
+ const std::vector<GridIndexType>& outsideScvIndices() const { return outsideScvIndices_; }
+
+ //! Returns the number of corners
+ std::size_t corners() const { return corners_.size(); }
+
+ //! Returns the corner for a given local index
+ const GlobalPosition& corner(unsigned int localIdx) const
+ {
+ assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
+ return corners_[localIdx];
+ }
+
+ //! Returns the global position of the vertex the scvf is connected to
+ const GlobalPosition& vertexCorner() const { return corners_.back(); }
+
+ //! Returns the global position of the center of the element facet this scvf is embedded in
+ const GlobalPosition& facetCorner() const { return corner(0); }
+
+ //! The center of the sub control volume face
+ const GlobalPosition& center() const { return center_; }
+
+ //! The integration point for flux evaluations in global coordinates
+ const GlobalPosition& ipGlobal() const { return ipGlobal_; }
+
+ //! returns the unit outer normal vector (assumes non-curved geometries)
+ const GlobalPosition& unitOuterNormal() const { return unitOuterNormal_; }
+
+ //! The geometry of the sub control volume face
+ Geometry geometry() const { return Geometry(Dune::GeometryTypes::cube(Geometry::mydimension), corners_); }
+
+private:
+ bool boundary_;
+ GridIndexType vertexIndex_;
+ GridIndexType scvfIndex_;
+ GridIndexType insideScvIdx_;
+ std::vector<GridIndexType> outsideScvIndices_;
+ unsigned int vIdxInElement_;
+
+ CornerStorage corners_;
+ GlobalPosition center_;
+ GlobalPosition ipGlobal_;
+ GlobalPosition unitOuterNormal_;
+ Scalar area_;
};
-} // end namespace
-//! The available implementations should be included here
-#include <dumux/discretization/cellcentered/mpfa/lmethod/subcontrolvolumeface.hh>
-#include <dumux/discretization/cellcentered/mpfa/omethod/subcontrolvolumeface.hh>
-#include <dumux/discretization/cellcentered/mpfa/omethodfps/subcontrolvolumeface.hh>
+/*!
+ * \ingroup Mpfa
+ * \brief Class for a sub control volume face in mpfa methods, i.e a part of the boundary
+ * of a control volume we compute fluxes on. Per default, we use the default
+ * implementation of the mpfa scvf class. If a scheme requires a different implementation,
+ * provide a specialization for it.
+ *
+ * \param M the mpfa method used
+ * \param GT the traits class for the geometry type
+ */
+template<MpfaMethods M, class GT>
+using CCMpfaSubControlVolumeFace = CCMpfaDefaultSubControlVolumeFace< GT >;
+
+} // end namespace Dumux
#endif
diff --git a/dumux/discretization/cellcentered/mpfa/subcontrolvolumefacebase.hh b/dumux/discretization/cellcentered/mpfa/subcontrolvolumefacebase.hh
deleted file mode 100644
index 32566a32559041cbaf5260f23dc514da3b69957c..0000000000000000000000000000000000000000
--- a/dumux/discretization/cellcentered/mpfa/subcontrolvolumefacebase.hh
+++ /dev/null
@@ -1,183 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Class for an mpfa-o sub control volume face
- */
-#ifndef DUMUX_DISCRETIZATION_CC_MPFA_SUBCONTROLVOLUMEFACEBASE_HH
-#define DUMUX_DISCRETIZATION_CC_MPFA_SUBCONTROLVOLUMEFACEBASE_HH
-
-#include <utility>
-#include <dune/common/fvector.hh>
-#include <dumux/discretization/subcontrolvolumefacebase.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup Discretization
- * \brief Base class for a sub-control volume face in mpfa methods. All mpfa method-specific implementations should inherit from this class
- */
-template<class G, typename I>
-class CCMpfaSubControlVolumeFaceBase : public SubControlVolumeFaceBase<CCMpfaSubControlVolumeFaceBase<G, I>, G, I>
-{
- using ParentType = SubControlVolumeFaceBase<CCMpfaSubControlVolumeFaceBase<G, I>, G, I>;
- using Geometry = G;
- using IndexType = I;
-
- using Scalar = typename Geometry::ctype;
- static const int dim = Geometry::mydimension;
- static const int dimworld = Geometry::coorddimension;
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
-
-public:
- /*!
- * \brief Constructor
- *
- * We do not use the localIndex here. Its meaning can vary depending on the
- * implementation (i.e. mpfa method) and is handled by the implementation itself.
- *
- * \param geomHelper The mpfa geometry helper
- * \param corners The corners of the scv face
- * \param unitOuterNormal The unit outer normal vector of the scvf
- * \param vIdxGlobal The global vertex index the scvf is connected to
- * \param localIndex Some element local index (the local vertex index in mpfao-fps)
- * \param scvfIndex The global index of this scv face
- * \param insideScvIdx The inside scv index connected to this face
- * \param outsideScvIndices The outside scv indices connected to this face
- * \param q The parameterization of the quadrature point on the scvf for flux calculation
- * \param boundary Boolean to specify whether or not the scvf is on a boundary
- */
- template<class MpfaHelper>
- CCMpfaSubControlVolumeFaceBase(const MpfaHelper& helper,
- std::vector<GlobalPosition>&& corners,
- GlobalPosition&& unitOuterNormal,
- IndexType vertexIndex,
- unsigned int localIndex,
- IndexType scvfIndex,
- IndexType insideScvIdx,
- const std::vector<IndexType>& outsideScvIndices,
- Scalar q,
- bool boundary)
- : ParentType(),
- boundary_(boundary),
- vertexIndex_(vertexIndex),
- scvfIndex_(scvfIndex),
- insideScvIdx_(insideScvIdx),
- outsideScvIndices_(outsideScvIndices),
- corners_(std::move(corners)),
- center_(0.0),
- unitOuterNormal_(std::move(unitOuterNormal))
- {
- for (const auto& corner : corners_)
- center_ += corner;
- center_ /= corners_.size();
- ipGlobal_ = helper.getScvfIntegrationPoint(corners_, q);
- area_ = helper.getScvfArea(corners_);
- }
-
- //! The center of the sub control volume face
- GlobalPosition center() const
- { return center_; }
-
- //! The integration point for flux evaluations in global coordinates
- GlobalPosition ipGlobal() const
- { return ipGlobal_; }
-
- //! The area of the sub control volume face
- Scalar area() const
- { return area_; }
-
- //! returns bolean if the sub control volume face is on the domain boundary
- bool boundary() const
- { return boundary_; }
-
- GlobalPosition unitOuterNormal() const
- { return unitOuterNormal_; }
-
- //! index of the inside sub control volume for spatial param evaluation
- IndexType insideScvIdx() const
- { return insideScvIdx_; }
-
- //! index of the outside sub control volume for spatial param evaluation
- //! returns in undefined behaviour if boundary is true or index exceeds numOutsideScvs
- IndexType outsideScvIdx(int i = 0) const
- {
- return outsideScvIndices_[i];
- }
-
- //! The number of outside scvs connection via this scv face
- std::size_t numOutsideScvs() const
- {
- return outsideScvIndices_.size();
- }
-
- //! returns the outside scv indices (can be more than one index for dim < dimWorld)
- std::vector<IndexType> outsideScvIndices() const
- { return outsideScvIndices_; }
-
- //! The global index of this sub control volume face
- IndexType index() const
- { return scvfIndex_; }
-
- //! Returns the number of corners
- std::size_t corners() const
- { return corners_.size(); }
-
- //! Returns the corner for a given local index
- GlobalPosition corner(unsigned int localIdx) const
- {
- assert(localIdx < corners_.size() && "provided index exceeds the number of corners");
- return corners_[localIdx];
- }
-
- //! The geometry of the sub control volume face
- const Geometry geometry() const
- { return Geometry(Dune::GeometryType(Dune::GeometryType::cube, dim), corners_); }
-
- //! Returns the global position of the vertex the scvf is connected to
- GlobalPosition vertexCorner() const
- { return corners_.back(); }
-
- //! Returns the global position of the center of the element facet this scvf is embedded in
- GlobalPosition facetCorner() const
- { return corner(0); }
-
- //! Returns the index of the vertex the scvf is connected to
- IndexType vertexIndex() const
- { return vertexIndex_; }
-
-private:
- bool boundary_;
- IndexType vertexIndex_;
- IndexType scvfIndex_;
- IndexType insideScvIdx_;
- std::vector<IndexType> outsideScvIndices_;
-
- std::vector<GlobalPosition> corners_;
- GlobalPosition center_;
- GlobalPosition ipGlobal_;
- GlobalPosition unitOuterNormal_;
- Scalar area_;
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/discretization/cellcentered/mpfa/tensorlambdafactory.hh b/dumux/discretization/cellcentered/mpfa/tensorlambdafactory.hh
index 548cd6598e072cd06ba515c80b4d60f6bff6d95a..89a7a2aa52905200289f37b3b09a92099190ddb2 100644
--- a/dumux/discretization/cellcentered/mpfa/tensorlambdafactory.hh
+++ b/dumux/discretization/cellcentered/mpfa/tensorlambdafactory.hh
@@ -29,7 +29,6 @@
#ifndef DUMUX_DISCRETIZATION_MPFA_TENSOR_LAMBDA_FACTORY_HH
#define DUMUX_DISCRETIZATION_MPFA_TENSOR_LAMBDA_FACTORY_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
#include <dumux/discretization/cellcentered/mpfa/tensorlambdafactory.hh>
diff --git a/dumux/discretization/cellcentered/subcontrolvolume.hh b/dumux/discretization/cellcentered/subcontrolvolume.hh
index 5e54ddb5af401524b4daa26dd66511054581756b..a9d1dc4db8e2d4b269b7a45acb732de9fa098889 100644
--- a/dumux/discretization/cellcentered/subcontrolvolume.hh
+++ b/dumux/discretization/cellcentered/subcontrolvolume.hh
@@ -23,30 +23,31 @@
#ifndef DUMUX_DISCRETIZATION_CC_SUBCONTROLVOLUME_HH
#define DUMUX_DISCRETIZATION_CC_SUBCONTROLVOLUME_HH
-#include <dune/common/fvector.hh>
#include <dumux/discretization/subcontrolvolumebase.hh>
#include <dumux/common/optional.hh>
namespace Dumux
{
-template<class G, typename I>
-class CCSubControlVolume : public SubControlVolumeBase<CCSubControlVolume<G, I>, G, I>
+template<class ScvGeometryTraits>
+class CCSubControlVolume : public SubControlVolumeBase<CCSubControlVolume<ScvGeometryTraits>, ScvGeometryTraits>
{
- using ParentType = SubControlVolumeBase<CCSubControlVolume<G, I>, G, I>;
- using Geometry = G;
- using IndexType = I;
-
- using Scalar = typename Geometry::ctype;
- enum { dimworld = Geometry::coorddimension };
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
+ using ParentType = SubControlVolumeBase<CCSubControlVolume<ScvGeometryTraits>, ScvGeometryTraits>;
+ using Geometry = typename ScvGeometryTraits::Geometry;
+ using GridIndexType = typename ScvGeometryTraits::GridIndexType;
+ using LocalIndexType = typename ScvGeometryTraits::LocalIndexType;
+ using Scalar = typename ScvGeometryTraits::Scalar;
+ using GlobalPosition = typename ScvGeometryTraits::GlobalPosition;
public:
+ //! state the traits public and thus export all types
+ using Traits = ScvGeometryTraits;
+
// the default constructor
CCSubControlVolume() = default;
// the contructor in the cc case
CCSubControlVolume(Geometry&& geometry,
- IndexType elementIndex)
+ GridIndexType elementIndex)
: ParentType(), geometry_(std::forward<Geometry>(geometry)), elementIndex_(elementIndex) {}
//! The copy constrcutor
@@ -100,13 +101,13 @@ public:
}
//! The index of the dof this scv is embedded in (the global index of this scv)
- IndexType dofIndex() const
+ GridIndexType dofIndex() const
{
return elementIndex();
}
//! The global index of this scv
- IndexType indexInElement() const
+ LocalIndexType indexInElement() const
{
return 0;
}
@@ -118,13 +119,13 @@ public:
}
//! The global index of the element this scv is embedded in
- IndexType elementIndex() const
+ GridIndexType elementIndex() const
{
return elementIndex_;
}
//! Return the corner for the given local index
- GlobalPosition corner(unsigned int localIdx) const
+ GlobalPosition corner(LocalIndexType localIdx) const
{
assert(localIdx < geometry().corners() && "provided index exceeds the number of corners");
return geometry().corner(localIdx);
@@ -133,8 +134,9 @@ public:
private:
// Work around the fact that geometry is not default constructible
Optional<Geometry> geometry_;
- IndexType elementIndex_;
+ GridIndexType elementIndex_;
};
-} // end namespace
+
+} // end namespace Dumux
#endif
diff --git a/dumux/discretization/cellcentered/tpfa/darcyslaw.hh b/dumux/discretization/cellcentered/tpfa/darcyslaw.hh
index 73e086080c224ac7cd550dbd4d3d52a979f89c90..3a00ac3028abdf840c8b3122bada60e09028ccbc 100644
--- a/dumux/discretization/cellcentered/tpfa/darcyslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/darcyslaw.hh
@@ -32,18 +32,11 @@
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
namespace Dumux
{
-namespace Properties
-{
-// forward declaration of properties
-NEW_PROP_TAG(ProblemEnableGravity);
-}
-
/*!
* \ingroup DarcysLaw
* \brief Specialization of Darcy's Law for the CCTpfa method.
@@ -72,25 +65,6 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>
using DimWorldMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- class TpfaDarcysLawCache
- {
- public:
- void updateAdvection(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace &scvf)
- {
- tij_ = Implementation::calculateTransmissibilities(problem, element, fvGeometry, elemVolVars, scvf);
- }
-
- const Scalar& tij() const
- { return tij_; }
-
- private:
- Scalar tij_;
- };
-
//! Class that fills the cache corresponding to tpfa Darcy's Law
class TpfaDarcysLawCacheFiller
{
@@ -110,13 +84,33 @@ class DarcysLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>
}
};
+ class TpfaDarcysLawCache
+ {
+ public:
+ using Filler = TpfaDarcysLawCacheFiller;
+
+ void updateAdvection(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace &scvf)
+ {
+ tij_ = Implementation::calculateTransmissibilities(problem, element, fvGeometry, elemVolVars, scvf);
+ }
+
+ const Scalar& advectionTij() const
+ { return tij_; }
+
+ private:
+ Scalar tij_;
+ };
+
public:
// state the discretization method this implementation belongs to
static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCTpfa;
- // state the type for the corresponding cache and its filler
+ // state the type for the corresponding cache
using Cache = TpfaDarcysLawCache;
- using CacheFiller = TpfaDarcysLawCacheFiller;
static Scalar flux(const Problem& problem,
const Element& element,
@@ -126,6 +120,8 @@ public:
int phaseIdx,
const ElementFluxVarsCache& elemFluxVarsCache)
{
+ static const bool gravity = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Problem.EnableGravity");
+
const auto& fluxVarsCache = elemFluxVarsCache[scvf];
// Get the inside and outside volume variables
@@ -133,7 +129,7 @@ public:
const auto& insideVolVars = elemVolVars[insideScv];
const auto& outsideVolVars = elemVolVars[scvf.outsideScvIdx()];
- if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
+ if (gravity)
{
// do averaging for the density over all neighboring elements
const auto rho = [&]()
@@ -187,8 +183,8 @@ public:
{
const auto& insideFluxVarsCache = elemFluxVarsCache[scvf];
- Scalar sumTi(insideFluxVarsCache.tij());
- Scalar sumPTi(insideFluxVarsCache.tij()*hInside);
+ Scalar sumTi(insideFluxVarsCache.advectionTij());
+ Scalar sumPTi(insideFluxVarsCache.advectionTij()*hInside);
for (unsigned int i = 0; i < scvf.numOutsideScvs(); ++i)
{
const auto outsideScvIdx = scvf.outsideScvIdx(i);
@@ -198,14 +194,14 @@ public:
const auto xOutside = scvf.boundary() ? scvf.ipGlobal() : fvGeometry.scv(outsideScvIdx).center();
const auto gOutside = problem.gravityAtPos(xOutside);
- sumTi += outsideFluxVarsCache.tij();
- sumPTi += outsideFluxVarsCache.tij()*(outsideVolVars.pressure(phaseIdx) - rho*(gOutside*xOutside));
+ sumTi += outsideFluxVarsCache.advectionTij();
+ sumPTi += outsideFluxVarsCache.advectionTij()*(outsideVolVars.pressure(phaseIdx) - rho*(gOutside*xOutside));
}
return sumPTi/sumTi;
}
}();
- return fluxVarsCache.tij()*(hInside - hOutside);
+ return fluxVarsCache.advectionTij()*(hInside - hOutside);
}
else // no gravity
{
@@ -221,8 +217,8 @@ public:
{
const auto& insideFluxVarsCache = elemFluxVarsCache[scvf];
- Scalar sumTi(insideFluxVarsCache.tij());
- Scalar sumPTi(insideFluxVarsCache.tij()*pInside);
+ Scalar sumTi(insideFluxVarsCache.advectionTij());
+ Scalar sumPTi(insideFluxVarsCache.advectionTij()*pInside);
for (unsigned int i = 0; i < scvf.numOutsideScvs(); ++i)
{
@@ -230,14 +226,14 @@ public:
const auto& flippedScvf = fvGeometry.flipScvf(scvf.index(), i);
const auto& outsideVolVars = elemVolVars[outsideScvIdx];
const auto& outsideFluxVarsCache = elemFluxVarsCache[flippedScvf];
- sumTi += outsideFluxVarsCache.tij();
- sumPTi += outsideFluxVarsCache.tij()*outsideVolVars.pressure(phaseIdx);
+ sumTi += outsideFluxVarsCache.advectionTij();
+ sumPTi += outsideFluxVarsCache.advectionTij()*outsideVolVars.pressure(phaseIdx);
}
return sumPTi/sumTi;
}
}();
- return fluxVarsCache.tij()*(pInside - pOutside);
+ return fluxVarsCache.advectionTij()*(pInside - pOutside);
}
}
diff --git a/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh b/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
index 0e4f1fe90b9c3b76b888eeb57a0a374b83090d31..b4aec06df2bf824db724fe7241f72da22f970768 100644
--- a/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh
@@ -23,7 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_CCTPFA_ELEMENT_FLUXVARSCACHE_HH
#define DUMUX_DISCRETIZATION_CCTPFA_ELEMENT_FLUXVARSCACHE_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/cellcentered/tpfa/fluxvariablescachefiller.hh>
namespace Dumux
@@ -76,11 +75,14 @@ public:
// Specialization for the global caching being enabled - do nothing here
void update(const Element& element,
const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars) {}
+ const ElementVolumeVariables& elemVolVars)
+ {
+ DUNE_THROW(Dune::InvalidStateException, "In case of enabled caching, the grid flux variables cache has to be updated");
+ }
// access operators in the case of caching
const FluxVariablesCache& operator [](const SubControlVolumeFace& scvf) const
- { return (*globalFluxVarsCachePtr_)[scvf.index()]; }
+ { return globalFluxVarsCache()[scvf]; }
//! The global object we are a restriction of
const GlobalFluxVariablesCache& globalFluxVarsCache() const
@@ -124,13 +126,13 @@ public:
globalScvfIndices_.resize(numScvf);
// instantiate helper class to fill the caches
- FluxVariablesCacheFiller filler(globalFluxVarsCache().problem_());
+ FluxVariablesCacheFiller filler(globalFluxVarsCache().problem());
IndexType localScvfIdx = 0;
// fill the containers
for (auto&& scvf : scvfs(fvGeometry))
{
- filler.fill(*this, fluxVarsCache_[localScvfIdx], element, fvGeometry, elemVolVars, scvf);
+ filler.fill(*this, fluxVarsCache_[localScvfIdx], element, fvGeometry, elemVolVars, scvf, true);
globalScvfIndices_[localScvfIdx] = scvf.index();
localScvfIdx++;
}
@@ -142,10 +144,11 @@ public:
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
- const auto& problem = globalFluxVarsCache().problem_();
- const auto globalI = problem.elementMapper().index(element);
- const auto& assemblyMapI = problem.model().localJacobian().assemblyMap()[globalI];
- const auto numNeighbors = assemblyMapI.size();
+ const auto& problem = globalFluxVarsCache().problem();
+ const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
+ const auto globalI = fvGridGeometry.elementMapper().index(element);
+ const auto& connectivityMapI = fvGridGeometry.connectivityMap()[globalI];
+ const auto numNeighbors = connectivityMapI.size();
// instantiate helper class to fill the caches
FluxVariablesCacheFiller filler(problem);
@@ -153,7 +156,7 @@ public:
// find the number of scv faces that need to be prepared
auto numScvf = fvGeometry.numScvf();
for (unsigned int localIdxJ = 0; localIdxJ < numNeighbors; ++localIdxJ)
- numScvf += assemblyMapI[localIdxJ].scvfsJ.size();
+ numScvf += connectivityMapI[localIdxJ].scvfsJ.size();
// fill the containers with the data on the scv faces inside the actual element
fluxVarsCache_.resize(numScvf);
@@ -161,7 +164,7 @@ public:
unsigned int localScvfIdx = 0;
for (auto&& scvf : scvfs(fvGeometry))
{
- filler.fill(*this, fluxVarsCache_[localScvfIdx], element, fvGeometry, elemVolVars, scvf);
+ filler.fill(*this, fluxVarsCache_[localScvfIdx], element, fvGeometry, elemVolVars, scvf, true);
globalScvfIndices_[localScvfIdx] = scvf.index();
localScvfIdx++;
}
@@ -169,11 +172,11 @@ public:
// add required data on the scv faces in the neighboring elements
for (unsigned int localIdxJ = 0; localIdxJ < numNeighbors; ++localIdxJ)
{
- const auto elementJ = fvGeometry.fvGridGeometry().element(assemblyMapI[localIdxJ].globalJ);
- for (auto scvfIdx : assemblyMapI[localIdxJ].scvfsJ)
+ const auto elementJ = fvGridGeometry.element(connectivityMapI[localIdxJ].globalJ);
+ for (auto scvfIdx : connectivityMapI[localIdxJ].scvfsJ)
{
auto&& scvfJ = fvGeometry.scvf(scvfIdx);
- filler.fill(*this, fluxVarsCache_[localScvfIdx], elementJ, fvGeometry, elemVolVars, scvfJ);
+ filler.fill(*this, fluxVarsCache_[localScvfIdx], elementJ, fvGeometry, elemVolVars, scvfJ, true);
globalScvfIndices_[localScvfIdx] = scvfJ.index();
localScvfIdx++;
}
@@ -189,23 +192,22 @@ public:
globalScvfIndices_.resize(1);
// instantiate helper class to fill the caches
- FluxVariablesCacheFiller filler(globalFluxVarsCache().problem_());
+ FluxVariablesCacheFiller filler(globalFluxVarsCache().problem());
- filler.fill(*this, fluxVarsCache_[0], element, fvGeometry, elemVolVars, scvf);
+ filler.fill(*this, fluxVarsCache_[0], element, fvGeometry, elemVolVars, scvf, true);
globalScvfIndices_[0] = scvf.index();
}
- // This function updates the transmissibilities after the solution has been deflected during jacobian assembly
+ // This function is used to update the transmissibilities if the volume variables have changed
+ // Results in undefined behaviour if called before bind() or with a different element
void update(const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars)
{
- static const bool isSolIndependent = FluxVariablesCacheFiller::isSolutionIndependent();
-
- if (!isSolIndependent)
+ if (FluxVariablesCacheFiller::isSolDependent)
{
- const auto& problem = globalFluxVarsCache().problem_();
- const auto globalI = problem.elementMapper().index(element);
+ const auto& problem = globalFluxVarsCache().problem();
+ const auto globalI = fvGeometry.fvGridGeometry().elementMapper().index(element);
// instantiate filler class
FluxVariablesCacheFiller filler(problem);
@@ -218,7 +220,7 @@ public:
const auto scvfInsideScvIdx = scvf.insideScvIdx();
const auto& insideElement = scvfInsideScvIdx == globalI ?
element :
- problem.model().fvGridGeometry().element(scvfInsideScvIdx);
+ fvGeometry.fvGridGeometry().element(scvfInsideScvIdx);
filler.fill(*this, fluxVarsCache_[localScvfIdx], insideElement, fvGeometry, elemVolVars, scvf);
}
diff --git a/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh b/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
index 372a82b7afd7689cac24aa5981395ad62385dd0c..1dbcf075e53429d13aac64244f54d24f7e2c2e73 100644
--- a/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
+++ b/dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh
@@ -23,8 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_CCTPFA_ELEMENT_VOLUMEVARIABLES_HH
#define DUMUX_DISCRETIZATION_CCTPFA_ELEMENT_VOLUMEVARIABLES_HH
-#include <dumux/implicit/properties.hh>
-
namespace Dumux
{
@@ -119,10 +117,11 @@ public:
{
clear();
- const auto& problem = globalVolVars().problem_();
- const auto globalI = problem.elementMapper().index(element);
- const auto& assemblyMapI = problem.model().localJacobian().assemblyMap()[globalI];
- const auto numDofs = assemblyMapI.size() + 1;
+ const auto& problem = globalVolVars().problem();
+ const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
+ const auto globalI = fvGridGeometry.elementMapper().index(element);
+ const auto& connectivityMapI = fvGridGeometry.connectivityMap()[globalI];
+ const auto numDofs = connectivityMapI.size() + 1;
// resize local containers to the required size (for internal elements)
volumeVariables_.resize(numDofs);
@@ -131,7 +130,7 @@ public:
// update the volume variables of the element at hand
auto&& scvI = fvGeometry.scv(globalI);
- volumeVariables_[localIdx].update(problem.model().elementSolution(element, sol),
+ volumeVariables_[localIdx].update(ElementSolution(sol[globalI]),
problem,
element,
scvI);
@@ -139,11 +138,11 @@ public:
++localIdx;
// Update the volume variables of the neighboring elements
- for (const auto& dataJ : assemblyMapI)
+ for (const auto& dataJ : connectivityMapI)
{
- const auto& elementJ = fvGeometry.fvGridGeometry().element(dataJ.globalJ);
+ const auto& elementJ = fvGridGeometry.element(dataJ.globalJ);
auto&& scvJ = fvGeometry.scv(dataJ.globalJ);
- volumeVariables_[localIdx].update(problem.model().elementSolution(elementJ, sol),
+ volumeVariables_[localIdx].update(ElementSolution(sol[dataJ.globalJ]),
problem,
elementJ,
scvJ);
@@ -177,24 +176,24 @@ public:
//! Check if user added additional DOF dependencies, i.e. the residual of DOF globalI depends
//! on additional DOFs not included in the discretization schemes' occupation pattern
- const auto& additionalDofDependencies = problem.getAdditionalDofDependencies(globalI);
- if (!additionalDofDependencies.empty())
- {
- volumeVariables_.resize(volumeVariables_.size() + additionalDofDependencies.size());
- volVarIndices_.resize(volVarIndices_.size() + additionalDofDependencies.size());
- for (auto globalJ : additionalDofDependencies)
- {
- const auto& elementJ = fvGeometry.fvGridGeometry().element(globalJ);
- auto&& scvJ = fvGeometry.scv(globalJ);
-
- volumeVariables_[localIdx].update(problem.model().elementSolution(elementJ, sol),
- problem,
- elementJ,
- scvJ);
- volVarIndices_[localIdx] = scvJ.dofIndex();
- ++localIdx;
- }
- }
+ // const auto& additionalDofDependencies = problem.getAdditionalDofDependencies(globalI);
+ // if (!additionalDofDependencies.empty())
+ // {
+ // volumeVariables_.resize(volumeVariables_.size() + additionalDofDependencies.size());
+ // volVarIndices_.resize(volVarIndices_.size() + additionalDofDependencies.size());
+ // for (auto globalJ : additionalDofDependencies)
+ // {
+ // const auto& elementJ = fvGridGeometry.element(globalJ);
+ // auto&& scvJ = fvGeometry.scv(globalJ);
+
+ // volumeVariables_[localIdx].update(ElementSolution(sol[globalJ]),
+ // problem,
+ // elementJ,
+ // scvJ);
+ // volVarIndices_[localIdx] = scvJ.dofIndex();
+ // ++localIdx;
+ // }
+ // }
}
// Binding of an element, prepares only the volume variables of the element
@@ -205,14 +204,14 @@ public:
{
clear();
- auto eIdx = globalVolVars().problem_().elementMapper().index(element);
+ const auto eIdx = fvGeometry.fvGridGeometry().elementMapper().index(element);
volumeVariables_.resize(1);
volVarIndices_.resize(1);
// update the volume variables of the element
auto&& scv = fvGeometry.scv(eIdx);
- volumeVariables_[0].update(globalVolVars().problem_().model().elementSolution(element, sol),
- globalVolVars().problem_(),
+ volumeVariables_[0].update(ElementSolution(sol[eIdx]),
+ globalVolVars().problem(),
element,
scv);
volVarIndices_[0] = scv.dofIndex();
diff --git a/dumux/discretization/cellcentered/tpfa/fickslaw.hh b/dumux/discretization/cellcentered/tpfa/fickslaw.hh
index 94e53ea0ee884a2a996880984d64a5292512cf71..8f8696714773f4e5b18d7f0ec81e733812c9e229 100644
--- a/dumux/discretization/cellcentered/tpfa/fickslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/fickslaw.hh
@@ -29,7 +29,6 @@
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
#include <dumux/discretization/fluxvariablescaching.hh>
@@ -52,7 +51,6 @@ class FicksLawImplementation<TypeTag, DiscretizationMethods::CCTpfa >
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Model = typename GET_PROP_TYPE(TypeTag, Model);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
@@ -64,6 +62,7 @@ class FicksLawImplementation<TypeTag, DiscretizationMethods::CCTpfa >
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+ using BalanceEqOpts = typename GET_PROP_TYPE(TypeTag, BalanceEqOpts);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
static const int dim = GridView::dimension;
@@ -75,9 +74,32 @@ class FicksLawImplementation<TypeTag, DiscretizationMethods::CCTpfa >
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using ComponentFluxVector = Dune::FieldVector<Scalar, numComponents>;
+ //! Class that fills the cache corresponding to tpfa Fick's Law
+ class TpfaFicksLawCacheFiller
+ {
+ public:
+ //! Function to fill a TpfaFicksLawCache of a given scvf
+ //! This interface has to be met by any diffusion-related cache filler class
+ template<class FluxVariablesCacheFiller>
+ static void fill(FluxVariablesCache& scvfFluxVarsCache,
+ unsigned int phaseIdx, unsigned int compIdx,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf,
+ const FluxVariablesCacheFiller& fluxVarsCacheFiller)
+ {
+ scvfFluxVarsCache.updateDiffusion(problem, element, fvGeometry, elemVolVars, scvf, phaseIdx, compIdx);
+ }
+ };
+
+ //! Class that caches the transmissibility
class TpfaFicksLawCache
{
public:
+ using Filler = TpfaFicksLawCacheFiller;
+
void updateDiffusion(const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
@@ -96,33 +118,12 @@ class FicksLawImplementation<TypeTag, DiscretizationMethods::CCTpfa >
std::array< std::array<Scalar, numComponents>, numPhases> tij_;
};
- //! Class that fills the cache corresponding to tpfa Fick's Law
- class TpfaFicksLawCacheFiller
- {
- public:
- //! Function to fill a TpfaFicksLawCache of a given scvf
- //! This interface has to be met by any diffusion-related cache filler class
- template<class FluxVariablesCacheFiller>
- static void fill(FluxVariablesCache& scvfFluxVarsCache,
- unsigned int phaseIdx, unsigned int compIdx,
- const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf,
- const FluxVariablesCacheFiller& fluxVarsCacheFiller)
- {
- scvfFluxVarsCache.updateDiffusion(problem, element, fvGeometry, elemVolVars, scvf, phaseIdx, compIdx);
- }
- };
-
public:
// state the discretization method this implementation belongs to
static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCTpfa;
//! state the type for the corresponding cache and its filler
using Cache = TpfaFicksLawCache;
- using CacheFiller = TpfaFicksLawCacheFiller;
static ComponentFluxVector flux(const Problem& problem,
const Element& element,
@@ -156,7 +157,7 @@ public:
: branchingFacetDensity(elemVolVars, scvf, phaseIdx, rhoInside);
componentFlux[compIdx] = rho*tij*(xInside - xOutside);
- if (Model::mainComponentIsBalanced(phaseIdx) && !FluidSystem::isTracerFluidSystem())
+ if (BalanceEqOpts::mainComponentIsBalanced(phaseIdx) && !FluidSystem::isTracerFluidSystem())
componentFlux[FluidSystem::getMainComponent(phaseIdx)] -= componentFlux[compIdx];
}
diff --git a/dumux/discretization/cellcentered/tpfa/fluxvariablescachefiller.hh b/dumux/discretization/cellcentered/tpfa/fluxvariablescachefiller.hh
index 189ad383018cdb61b543cf8b10c821306150d873..068eac44bf8e17335e19807003aa319c55f373a9 100644
--- a/dumux/discretization/cellcentered/tpfa/fluxvariablescachefiller.hh
+++ b/dumux/discretization/cellcentered/tpfa/fluxvariablescachefiller.hh
@@ -23,7 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_CCTPFA_FLUXVARSCACHE_FILLER_HH
#define DUMUX_DISCRETIZATION_CCTPFA_FLUXVARSCACHE_FILLER_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
namespace Dumux
@@ -55,6 +54,10 @@ class CCTpfaFluxVariablesCacheFiller
static constexpr bool soldependentHeatConduction = GET_PROP_VALUE(TypeTag, SolutionDependentHeatConduction);
public:
+ static constexpr bool isSolDependent = (doAdvection && soldependentAdvection) ||
+ (doDiffusion && soldependentDiffusion) ||
+ (doHeatConduction && soldependentHeatConduction);
+
//! The constructor. Sets the problem pointer
CCTpfaFluxVariablesCacheFiller(const Problem& problem) : problemPtr_(&problem) {}
@@ -67,7 +70,7 @@ public:
* \param fvGeometry The finite volume geometry
* \param elemVolVars The element volume variables
* \param scvf The corresponding sub-control volume face
- * \param doSubCaches Array of bools indicating which sub caches have to be updated
+ * \param forceUpdateAll if true, forces all caches to be updated (even the solution-independent ones)
*/
template<class FluxVariablesCacheContainer>
void fill(FluxVariablesCacheContainer& fluxVarsCacheContainer,
@@ -76,10 +79,10 @@ public:
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf,
- bool isUpdate = false)
+ bool forceUpdateAll = false)
{
// fill the physics-related quantities of the caches
- if (!isUpdate)
+ if (forceUpdateAll)
{
fillAdvection(scvfFluxVarsCache, element, fvGeometry, elemVolVars, scvf);
fillDiffusion(scvfFluxVarsCache, element, fvGeometry, elemVolVars, scvf);
@@ -96,31 +99,6 @@ public:
}
}
- /*!
- * \brief function to update the flux variables caches during derivative calculation
- *
- * \copydoc fill
- */
- template<class FluxVariablesCacheContainer>
- void update(FluxVariablesCacheContainer& fluxVarsCacheContainer,
- FluxVariablesCache& scvfFluxVarsCache,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf)
- {
- // forward to fill routine
- fill(fluxVarsCacheContainer, scvfFluxVarsCache, element, fvGeometry, elemVolVars, scvf, true);
- }
-
- static bool isSolutionIndependent()
- {
- static const bool isSolDependent = (doAdvection && soldependentAdvection) ||
- (doDiffusion && soldependentDiffusion) ||
- (doHeatConduction && soldependentHeatConduction);
- return !isSolDependent;
- }
-
private:
const Problem& problem() const
@@ -136,7 +114,7 @@ private:
const SubControlVolumeFace& scvf)
{
using AdvectionType = typename GET_PROP_TYPE(TypeTag, AdvectionType);
- using AdvectionFiller = typename AdvectionType::CacheFiller;
+ using AdvectionFiller = typename AdvectionType::Cache::Filler;
// forward to the filler for the advective quantities
AdvectionFiller::fill(scvfFluxVarsCache, problem(), element, fvGeometry, elemVolVars, scvf, *this);
@@ -162,7 +140,7 @@ private:
const SubControlVolumeFace& scvf)
{
using DiffusionType = typename GET_PROP_TYPE(TypeTag, MolecularDiffusionType);
- using DiffusionFiller = typename DiffusionType::CacheFiller;
+ using DiffusionFiller = typename DiffusionType::Cache::Filler;
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
@@ -195,7 +173,7 @@ private:
const SubControlVolumeFace& scvf)
{
using HeatConductionType = typename GET_PROP_TYPE(TypeTag, HeatConductionType);
- using HeatConductionFiller = typename HeatConductionType::CacheFiller;
+ using HeatConductionFiller = typename HeatConductionType::Cache::Filler;
// forward to the filler of the diffusive quantities
HeatConductionFiller::fill(scvfFluxVarsCache, problem(), element, fvGeometry, elemVolVars, scvf, *this);
diff --git a/dumux/discretization/cellcentered/tpfa/fourierslaw.hh b/dumux/discretization/cellcentered/tpfa/fourierslaw.hh
index 8bede29975d56d9b71cfda3e7cc7ac7baa72cd71..a7a0e3f8af26fd3315a1ad3dc0176370ffb4dee8 100644
--- a/dumux/discretization/cellcentered/tpfa/fourierslaw.hh
+++ b/dumux/discretization/cellcentered/tpfa/fourierslaw.hh
@@ -28,7 +28,6 @@
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
#include <dumux/discretization/fluxvariablescaching.hh>
@@ -68,14 +67,53 @@ class FouriersLawImplementation<TypeTag, DiscretizationMethods::CCTpfa>
using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
+ //! Class that fills the cache corresponding to tpfa Fick's Law
+ class TpfaFouriersLawCacheFiller
+ {
+ public:
+ //! Function to fill a TpfaFicksLawCache of a given scvf
+ //! This interface has to be met by any diffusion-related cache filler class
+ template<class FluxVariablesCacheFiller>
+ static void fill(FluxVariablesCache& scvfFluxVarsCache,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf,
+ const FluxVariablesCacheFiller& fluxVarsCacheFiller)
+ {
+ scvfFluxVarsCache.updateHeatConduction(problem, element, fvGeometry, elemVolVars, scvf);
+ }
+ };
+
+ //! Class that caches the transmissibility
+ class TpfaFouriersLawCache
+ {
+ public:
+ using Filler = TpfaFouriersLawCacheFiller;
+
+ void updateHeatConduction(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace &scvf)
+ {
+ tij_ = calculateTransmissibility(problem, element, fvGeometry, elemVolVars, scvf);
+ }
+
+ const Scalar& heatConductionTij() const
+ { return tij_; }
+
+ private:
+ Scalar tij_;
+ };
+
public:
// state the discretization method this implementation belongs to
static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::CCTpfa;
- //! state the type for the corresponding cache and its filler
- //! We don't cache anything for this law
- using Cache = FluxVariablesCaching::EmptyHeatConductionCache;
- using CacheFiller = FluxVariablesCaching::EmptyCacheFiller<TypeTag>;
+ //! export the type for the corresponding cache
+ using Cache = TpfaFouriersLawCache;
static Scalar flux(const Problem& problem,
const Element& element,
@@ -85,49 +123,21 @@ public:
const ElementFluxVarsCache& elemFluxVarsCache)
{
// heat conductivities are always solution dependent (?)
- Scalar tij = calculateTransmissibility_(problem, element, fvGeometry, elemVolVars, scvf);
+ Scalar tij = elemFluxVarsCache[scvf].heatConductionTij();
// get the inside/outside temperatures
const auto tInside = elemVolVars[scvf.insideScvIdx()].temperature();
const auto tOutside = scvf.numOutsideScvs() == 1 ? elemVolVars[scvf.outsideScvIdx()].temperature()
- : branchingFacetTemperature_(problem, element, fvGeometry, elemVolVars, scvf, tInside, tij);
+ : branchingFacetTemperature_(problem, element, fvGeometry, elemVolVars, elemFluxVarsCache, scvf, tInside, tij);
return tij*(tInside - tOutside);
}
-private:
-
- //! compute the temperature at branching facets for network grids
- static Scalar branchingFacetTemperature_(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf,
- Scalar insideTemperature,
- Scalar insideTi)
- {
- Scalar sumTi(insideTi);
- Scalar sumTempTi(insideTi*insideTemperature);
-
- for (unsigned int i = 0; i < scvf.numOutsideScvs(); ++i)
- {
- const auto outsideScvIdx = scvf.outsideScvIdx(i);
- const auto& outsideVolVars = elemVolVars[outsideScvIdx];
- const auto outsideElement = fvGeometry.fvGridGeometry().element(outsideScvIdx);
- const auto& flippedScvf = fvGeometry.flipScvf(scvf.index(), i);
-
- auto outsideTi = calculateTransmissibility_(problem, outsideElement, fvGeometry, elemVolVars, flippedScvf);
- sumTi += outsideTi;
- sumTempTi += outsideTi*outsideVolVars.temperature();
- }
- return sumTempTi/sumTi;
- }
-
- static Scalar calculateTransmissibility_(const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf)
+ static Scalar calculateTransmissibility(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf)
{
Scalar tij;
@@ -173,6 +183,35 @@ private:
return tij;
}
+private:
+
+ //! compute the temperature at branching facets for network grids
+ static Scalar branchingFacetTemperature_(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const ElementFluxVarsCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf,
+ Scalar insideTemperature,
+ Scalar insideTi)
+ {
+ Scalar sumTi(insideTi);
+ Scalar sumTempTi(insideTi*insideTemperature);
+
+ for (unsigned int i = 0; i < scvf.numOutsideScvs(); ++i)
+ {
+ const auto outsideScvIdx = scvf.outsideScvIdx(i);
+ const auto& outsideVolVars = elemVolVars[outsideScvIdx];
+ const auto& flippedScvf = fvGeometry.flipScvf(scvf.index(), i);
+ const auto& outsideFluxVarsCache = elemFluxVarsCache[flippedScvf];
+
+ auto outsideTi = outsideFluxVarsCache.heatConductionTij();
+ sumTi += outsideTi;
+ sumTempTi += outsideTi*outsideVolVars.temperature();
+ }
+ return sumTempTi/sumTi;
+ }
+
static Scalar calculateOmega_(const SubControlVolumeFace& scvf,
const DimWorldMatrix& lambda,
const SubControlVolume& scv,
diff --git a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
index 47bb3ddedb8364a1eb41fc426fce6257b923a0da..679ddc663a4f4376e1739361aa59d39776a24482 100644
--- a/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
+++ b/dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh
@@ -28,7 +28,6 @@
#include <dune/common/iteratorrange.hh>
#include <dumux/discretization/scvandscvfiterators.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
namespace Dumux
{
@@ -137,7 +136,7 @@ public:
void bindElement(const Element& element)
{
elementPtr_ = &element;
- scvIndices_ = std::vector<IndexType>({fvGridGeometry().problem_().elementMapper().index(*elementPtr_)});
+ scvIndices_ = std::vector<IndexType>({fvGridGeometry().elementMapper().index(*elementPtr_)});
}
//! The global finite volume geometry we are a restriction of
@@ -156,7 +155,6 @@ template<class TypeTag>
class CCTpfaFVElementGeometry<TypeTag, false>
{
using ThisType = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using IndexType = typename GridView::IndexSet::IndexType;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
@@ -299,21 +297,20 @@ public:
}
}
- //! Check if user added additional DOF dependencies, i.e. the residual of DOF globalI depends
+ //! TODO Check if user added additional DOF dependencies, i.e. the residual of DOF globalI depends
//! on additional DOFs not included in the discretization schemes' occupation pattern
- const auto& problem = fvGridGeometry().problem_();
- const auto globalI = problem.elementMapper().index(element);
- const auto& additionalDofDependencies = problem.getAdditionalDofDependencies(globalI);
- if (!additionalDofDependencies.empty())
- {
- neighborScvs_.reserve(neighborScvs_.size() + additionalDofDependencies.size());
- neighborScvIndices_.reserve(neighborScvIndices_.size() + additionalDofDependencies.size());
- for (auto globalJ : additionalDofDependencies)
- {
- neighborScvs_.emplace_back(fvGridGeometry().element(globalJ).geometry(), globalJ);
- neighborScvIndices_.emplace_back(globalJ);
- }
- }
+ // const auto globalI = fvGridGeometry().elementMapper().index(element);
+ // const auto& additionalDofDependencies = problem.getAdditionalDofDependencies(globalI);
+ // if (!additionalDofDependencies.empty())
+ // {
+ // neighborScvs_.reserve(neighborScvs_.size() + additionalDofDependencies.size());
+ // neighborScvIndices_.reserve(neighborScvIndices_.size() + additionalDofDependencies.size());
+ // for (auto globalJ : additionalDofDependencies)
+ // {
+ // neighborScvs_.emplace_back(fvGridGeometry().element(globalJ).geometry(), globalJ);
+ // neighborScvIndices_.emplace_back(globalJ);
+ // }
+ // }
}
//! Binding of an element preparing the geometries only inside the element
@@ -361,7 +358,7 @@ private:
//! create scvs and scvfs of the bound element
void makeElementGeometries(const Element& element)
{
- auto eIdx = fvGridGeometry().problem_().elementMapper().index(element);
+ const auto eIdx = fvGridGeometry().elementMapper().index(element);
scvs_.emplace_back(element.geometry(), eIdx);
scvIndices_.emplace_back(eIdx);
@@ -378,8 +375,8 @@ private:
int scvfCounter = 0;
for (const auto& intersection : intersections(fvGridGeometry().gridView(), element))
{
- // check if intersection is on interior boundary
- const auto isInteriorBoundary = fvGridGeometry().problem_().isInteriorBoundary(element, intersection);
+ // TODO check if intersection is on interior boundary
+ const auto isInteriorBoundary = false;
if (dim < dimWorld)
if (handledScvf[intersection.indexInInside()])
@@ -408,7 +405,7 @@ private:
void makeNeighborGeometries(const Element& element)
{
// create the neighbor scv
- auto eIdx = fvGridGeometry().problem_().elementMapper().index(element);
+ const auto eIdx = fvGridGeometry().elementMapper().index(element);
neighborScvs_.emplace_back(element.geometry(), eIdx);
neighborScvIndices_.push_back(eIdx);
@@ -425,8 +422,8 @@ private:
int scvfCounter = 0;
for (const auto& intersection : intersections(fvGridGeometry().gridView(), element))
{
- // check if intersection is on interior boundary
- const auto isInteriorBoundary = fvGridGeometry().problem_().isInteriorBoundary(element, intersection);
+ // TODO check if intersection is on interior boundary
+ const auto isInteriorBoundary = false;
if (dim < dimWorld)
if (handledScvf[intersection.indexInInside()])
@@ -458,7 +455,7 @@ private:
{
for (unsigned outsideScvIdx = 0; outsideScvIdx < neighborVolVarIndices[scvfCounter].size(); ++outsideScvIdx)
{
- if (neighborVolVarIndices[scvfCounter][outsideScvIdx] == fvGridGeometry().problem_().elementMapper().index(*elementPtr_))
+ if (neighborVolVarIndices[scvfCounter][outsideScvIdx] == fvGridGeometry().elementMapper().index(*elementPtr_))
{
std::vector<IndexType> scvIndices({eIdx});
scvIndices.insert(scvIndices.end(), neighborVolVarIndices[scvfCounter].begin(), neighborVolVarIndices[scvfCounter].end());
diff --git a/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh b/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
index d4fc52cc19369cfa1945e02533b5823a50ee6db9..d049e4c8210bf5bf47c995ac69dcbddb2af196aa 100644
--- a/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
+++ b/dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh
@@ -25,9 +25,14 @@
#ifndef DUMUX_DISCRETIZATION_CCTPFA_FV_GRID_GEOMETRY_HH
#define DUMUX_DISCRETIZATION_CCTPFA_FV_GRID_GEOMETRY_HH
+#include <dune/common/version.hh>
+
#include <dumux/common/elementmap.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/common/boundingboxtree.hh>
+
+#include <dumux/discretization/basefvgridgeometry.hh>
#include <dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh>
+#include <dumux/discretization/cellcentered/connectivitymap.hh>
namespace Dumux
{
@@ -44,20 +49,23 @@ class CCTpfaFVGridGeometry
// specialization in case the FVElementGeometries are stored globally
template<class TypeTag>
-class CCTpfaFVGridGeometry<TypeTag, true>
+class CCTpfaFVGridGeometry<TypeTag, true> : public BaseFVGridGeometry<TypeTag>
{
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using ParentType = BaseFVGridGeometry<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using IndexType = typename GridView::IndexSet::IndexType;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using ElementMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
using Element = typename GridView::template Codim<0>::Entity;
+ using ConnectivityMap = CCSimpleConnectivityMap<TypeTag>;
static const int dim = GridView::dimension;
static const int dimWorld = GridView::dimensionworld;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+ using CoordScalar = typename GridView::ctype;
+ using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
//! The local class needs access to the scv, scvfs and the fv element geometry
//! as they are globally cached
@@ -66,7 +74,14 @@ class CCTpfaFVGridGeometry<TypeTag, true>
public:
//! Constructor
CCTpfaFVGridGeometry(const GridView& gridView)
- : gridView_(gridView), elementMap_(gridView) {}
+ : ParentType(gridView)
+ , elementMap_(gridView)
+ {}
+
+ //! the element mapper is the dofMapper
+ //! this is convenience to have better chance to have the same main files for box/tpfa/mpfa...
+ const ElementMapper& dofMapper() const
+ { return this->elementMapper(); }
//! The total number of sub control volumes
std::size_t numScv() const
@@ -86,6 +101,10 @@ public:
return numBoundaryScvf_;
}
+ //! The total number of degrees of freedom
+ std::size_t numDofs() const
+ { return this->gridView().size(0); }
+
// Get an element from a sub control volume contained in it
Element element(const SubControlVolume& scv) const
{ return elementMap_.element(scv.elementIndex()); }
@@ -94,14 +113,10 @@ public:
Element element(IndexType eIdx) const
{ return elementMap_.element(eIdx); }
- //! Return the gridView this global object lives on
- const GridView& gridView() const
- { return gridView_; }
-
//! update all fvElementGeometries (do this again after grid adaption)
- void update(const Problem& problem)
+ void update()
{
- problemPtr_ = &problem;
+ ParentType::update();
// clear containers (necessary after grid refinement)
scvs_.clear();
@@ -111,9 +126,9 @@ public:
elementMap_.clear();
// determine size of containers
- IndexType numScvs = gridView_.size(0);
+ IndexType numScvs = numDofs();
IndexType numScvf = 0;
- for (const auto& element : elements(gridView_))
+ for (const auto& element : elements(this->gridView()))
numScvf += element.subEntities(1);
// reserve memory
@@ -125,9 +140,9 @@ public:
// Build the scvs and scv faces
IndexType scvfIdx = 0;
numBoundaryScvf_ = 0;
- for (const auto& element : elements(gridView_))
+ for (const auto& element : elements(this->gridView()))
{
- auto eIdx = problem.elementMapper().index(element);
+ const auto eIdx = this->elementMapper().index(element);
scvs_[eIdx] = SubControlVolume(element.geometry(), eIdx);
// fill the element map with seeds
@@ -143,29 +158,29 @@ public:
if (dim < dimWorld)
{
outsideIndices.resize(element.subEntities(1));
- for (const auto& intersection : intersections(gridView_, element))
+ for (const auto& intersection : intersections(this->gridView(), element))
{
if (intersection.neighbor())
{
const auto& outside = intersection.outside();
- auto nIdx = problem.elementMapper().index(outside);
+ const auto nIdx = this->elementMapper().index(outside);
outsideIndices[intersection.indexInInside()].push_back(nIdx);
}
}
}
- for (const auto& intersection : intersections(gridView_, element))
+ for (const auto& intersection : intersections(this->gridView(), element))
{
- // check if intersection is on interior boundary
- const auto isInteriorBoundary = problem.isInteriorBoundary(element, intersection);
+ // TODO check if intersection is on interior boundary
+ const auto isInteriorBoundary = false;
// inner sub control volume faces
if (intersection.neighbor() && !isInteriorBoundary)
{
if (dim == dimWorld)
{
- auto nIdx = problem.elementMapper().index(intersection.outside());
+ const auto nIdx = this->elementMapper().index(intersection.outside());
scvfs_.emplace_back(intersection,
intersection.geometry(),
scvfIdx,
@@ -201,7 +216,7 @@ public:
scvfs_.emplace_back(intersection,
intersection.geometry(),
scvfIdx,
- std::vector<IndexType>({eIdx, gridView_.size(0) + numBoundaryScvf_++}),
+ std::vector<IndexType>({eIdx, this->gridView().size(0) + numBoundaryScvf_++}),
true);
scvfsIndexSet.push_back(scvfIdx++);
}
@@ -227,17 +242,10 @@ public:
flipScvfIndices_[scvf.index()][i] = findFlippedScvfIndex_(insideScvIdx, scvf.outsideScvIdx(i));
}
}
- }
-
- /*!
- * \brief Return a local restriction of this global object
- * The local object is only functional after calling its bind/bindElement method
- * This is a free function that will be found by means of ADL
- */
- friend inline FVElementGeometry localView(const CCTpfaFVGridGeometry& fvGridGeometry)
- { return FVElementGeometry(fvGridGeometry); }
-//private:
+ // build the connectivity map for an effecient assembly
+ connectivityMap_.update(*this);
+ }
//! Get a sub control volume with a global scv index
const SubControlVolume& scv(IndexType scvIdx) const
@@ -264,6 +272,13 @@ public:
return scvfIndicesOfScv_[scvIdx];
}
+ /*!
+ * \brief Returns the connectivity map of which dofs have derivatives with respect
+ * to a given dof.
+ */
+ const ConnectivityMap &connectivityMap() const
+ { return connectivityMap_; }
+
private:
// find the scvf that has insideScvIdx in its outsideScvIdx list and outsideScvIdx as its insideScvIdx
IndexType findFlippedScvfIndex_(IndexType insideScvIdx, IndexType outsideScvIdx)
@@ -280,43 +295,51 @@ private:
DUNE_THROW(Dune::InvalidStateException, "No flipped version of this scvf found!");
}
- const Problem& problem_() const
- { return *problemPtr_; }
-
- const Problem* problemPtr_;
-
- const GridView gridView_;
+ // mappers
+ ConnectivityMap connectivityMap_;
Dumux::ElementMap<GridView> elementMap_;
+
+ // containers storing the global data
std::vector<SubControlVolume> scvs_;
std::vector<SubControlVolumeFace> scvfs_;
std::vector<std::vector<IndexType>> scvfIndicesOfScv_;
IndexType numBoundaryScvf_;
+
// needed for embedded surface and network grids (dim < dimWorld)
std::vector<std::vector<IndexType>> flipScvfIndices_;
};
// specialization in case the FVElementGeometries are not stored
template<class TypeTag>
-class CCTpfaFVGridGeometry<TypeTag, false>
+class CCTpfaFVGridGeometry<TypeTag, false> : public BaseFVGridGeometry<TypeTag>
{
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using ParentType = BaseFVGridGeometry<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using IndexType = typename GridView::IndexSet::IndexType;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using ElementMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
using Element = typename GridView::template Codim<0>::Entity;
+ using ConnectivityMap = CCSimpleConnectivityMap<TypeTag>;
static const int dim = GridView::dimension;
static const int dimWorld = GridView::dimensionworld;
- //! The local fvGeometry needs access to the problem
- friend typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using CoordScalar = typename GridView::ctype;
+ using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
public:
//! Constructor
CCTpfaFVGridGeometry(const GridView& gridView)
- : gridView_(gridView), elementMap_(gridView) {}
+ : ParentType(gridView)
+ , elementMap_(gridView)
+ {}
+
+ //! the element mapper is the dofMapper
+ //! this is convenience to have better chance to have the same main files for box/tpfa/mpfa...
+ const ElementMapper& dofMapper() const
+ { return this->elementMapper(); }
//! The total number of sub control volumes
std::size_t numScv() const
@@ -336,6 +359,10 @@ public:
return numBoundaryScvf_;
}
+ //! The total number of degrees of freedom
+ std::size_t numDofs() const
+ { return this->gridView().size(0); }
+
// Get an element from a sub control volume contained in it
Element element(const SubControlVolume& scv) const
{ return elementMap_.element(scv.elementIndex()); }
@@ -344,14 +371,10 @@ public:
Element element(IndexType eIdx) const
{ return elementMap_.element(eIdx); }
- //! Return the gridView this global object lives on
- const GridView& gridView() const
- { return gridView_; }
-
//! update all fvElementGeometries (do this again after grid adaption)
- void update(const Problem& problem)
+ void update()
{
- problemPtr_ = &problem;
+ ParentType::update();
// clear local data
elementMap_.clear();
@@ -359,7 +382,7 @@ public:
neighborVolVarIndices_.clear();
// reserve memory or resize the containers
- numScvs_ = gridView_.size(0);
+ numScvs_ = numDofs();
numScvf_ = 0;
numBoundaryScvf_ = 0;
elementMap_.resize(numScvs_);
@@ -367,9 +390,9 @@ public:
neighborVolVarIndices_.resize(numScvs_);
// Build the SCV and SCV face
- for (const auto& element : elements(gridView_))
+ for (const auto& element : elements(this->gridView()))
{
- auto eIdx = problem.elementMapper().index(element);
+ const auto eIdx = this->elementMapper().index(element);
// fill the element map with seeds
elementMap_[eIdx] = element.seed();
@@ -387,22 +410,22 @@ public:
if (dim < dimWorld)
{
outsideIndices.resize(numLocalFaces);
- for (const auto& intersection : intersections(gridView_, element))
+ for (const auto& intersection : intersections(this->gridView(), element))
{
if (intersection.neighbor())
{
const auto& outside = intersection.outside();
- auto nIdx = problem.elementMapper().index(outside);
+ const auto nIdx = this->elementMapper().index(outside);
outsideIndices[intersection.indexInInside()].push_back(nIdx);
}
}
}
- for (const auto& intersection : intersections(gridView_, element))
+ for (const auto& intersection : intersections(this->gridView(), element))
{
- // check if intersection is on interior boundary
- const auto isInteriorBoundary = problem.isInteriorBoundary(element, intersection);
+ // TODO check if intersection is on interior boundary
+ const auto isInteriorBoundary = false;
// inner sub control volume faces
if (intersection.neighbor() && !isInteriorBoundary)
@@ -410,7 +433,7 @@ public:
if (dim == dimWorld)
{
scvfsIndexSet.push_back(numScvf_++);
- auto nIdx = problem.elementMapper().index(intersection.outside());
+ const auto nIdx = this->elementMapper().index(intersection.outside());
neighborVolVarIndexSet.push_back({nIdx});
}
// this is for network grids
@@ -441,6 +464,9 @@ public:
scvfIndicesOfScv_[eIdx] = scvfsIndexSet;
neighborVolVarIndices_[eIdx] = neighborVolVarIndexSet;
}
+
+ // build the connectivity map for an effecient assembly
+ connectivityMap_.update(*this);
}
const std::vector<IndexType>& scvfIndicesOfScv(IndexType scvIdx) const
@@ -451,33 +477,28 @@ public:
{ return neighborVolVarIndices_[scvIdx]; }
/*!
- * \brief Return a local restriction of this global object
- * The local object is only functional after calling its bind/bindElement method
- * This is a free function that will be found by means of ADL
+ * \brief Returns the connectivity map of which dofs have derivatives with respect
+ * to a given dof.
*/
- friend inline FVElementGeometry localView(const CCTpfaFVGridGeometry& global)
- { return FVElementGeometry(global); }
+ const ConnectivityMap &connectivityMap() const
+ { return connectivityMap_; }
private:
- const Problem& problem_() const
- { return *problemPtr_; }
-
- const Problem* problemPtr_;
-
- const GridView gridView_;
-
// Information on the global number of geometries
IndexType numScvs_;
IndexType numScvf_;
IndexType numBoundaryScvf_;
- // vectors that store the global data
+ // mappers
Dumux::ElementMap<GridView> elementMap_;
+ ConnectivityMap connectivityMap_;
+
+ // vectors that store the global data
std::vector<std::vector<IndexType>> scvfIndicesOfScv_;
std::vector<std::vector<std::vector<IndexType>>> neighborVolVarIndices_;
};
-} // end namespace
+} // end namespace Dumux
#endif
diff --git a/dumux/discretization/cellcentered/tpfa/globalfluxvariablescache.hh b/dumux/discretization/cellcentered/tpfa/globalfluxvariablescache.hh
index fd4e23fc9345a21ee67fa9cdf0bc740742539da6..d8f8f20d71e23264c831fb011d5003dbb60da73c 100644
--- a/dumux/discretization/cellcentered/tpfa/globalfluxvariablescache.hh
+++ b/dumux/discretization/cellcentered/tpfa/globalfluxvariablescache.hh
@@ -23,7 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_CCTPFA_GLOBAL_FLUXVARSCACHE_HH
#define DUMUX_DISCRETIZATION_CCTPFA_GLOBAL_FLUXVARSCACHE_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/cellcentered/tpfa/fluxvariablescachefiller.hh>
namespace Dumux
@@ -43,46 +42,92 @@ class CCTpfaGlobalFluxVariablesCache;
template<class TypeTag>
class CCTpfaGlobalFluxVariablesCache<TypeTag, true>
{
- // the local class needs access to the problem
- friend typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
- // the filler class needs access to the access operators
- friend CCTpfaFluxVariablesCacheFiller<TypeTag>;
-
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using IndexType = typename GridView::IndexSet::IndexType;
+ using Element = typename GridView::template Codim<0>::Entity;
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FluxVariablesCacheFiller = CCTpfaFluxVariablesCacheFiller<TypeTag>;
public:
+ // The constructor
+ CCTpfaGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+
// When global caching is enabled, precompute transmissibilities and stencils for all the scv faces
- void update(Problem& problem)
+ void update(const FVGridGeometry& fvGridGeometry,
+ const GridVolumeVariables& gridVolVars,
+ const SolutionVector& sol,
+ bool forceUpdate = false)
{
- problemPtr_ = &problem;
+ // only do the update if fluxes are solution dependent or if update is forced
+ if (FluxVariablesCacheFiller::isSolDependent || forceUpdate)
+ {
+ // instantiate helper class to fill the caches
+ FluxVariablesCacheFiller filler(problem());
+
+ fluxVarsCache_.resize(fvGridGeometry.numScvf());
+ for (const auto& element : elements(fvGridGeometry.gridView()))
+ {
+ // Prepare the geometries within the elements of the stencil
+ auto fvGeometry = localView(fvGridGeometry);
+ fvGeometry.bind(element);
+
+ auto elemVolVars = localView(gridVolVars);
+ elemVolVars.bind(element, fvGeometry, sol);
- // instantiate helper class to fill the caches
- FluxVariablesCacheFiller filler(problem);
+ for (auto&& scvf : scvfs(fvGeometry))
+ {
+ filler.fill(*this, fluxVarsCache_[scvf.index()], element, fvGeometry, elemVolVars, scvf, forceUpdate);
+ }
+ }
+ }
+ }
- const auto& fvGridGeometry = problem.model().fvGridGeometry();
- fluxVarsCache_.resize(fvGridGeometry.numScvf());
- for (const auto& element : elements(problem.gridView()))
+ void updateElement(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars)
+ {
+ if (FluxVariablesCacheFiller::isSolDependent)
{
- // Prepare the geometries within the elements of the stencil
- auto fvGeometry = localView(fvGridGeometry);
- fvGeometry.bind(element);
+ const auto globalI = fvGeometry.fvGridGeometry().elementMapper().index(element);
- auto elemVolVars = localView(problem.model().curGlobalVolVars());
- elemVolVars.bind(element, fvGeometry, problem.model().curSol());
+ // instantiate filler class
+ FluxVariablesCacheFiller filler(problem());
- for (auto&& scvf : scvfs(fvGeometry))
- {
+ // update the caches inside this element
+ for (const auto& scvf : scvfs(fvGeometry))
filler.fill(*this, fluxVarsCache_[scvf.index()], element, fvGeometry, elemVolVars, scvf);
+
+ // update the caches in the neighbors
+ for (const auto& dataJ : fvGeometry.fvGridGeometry().connectivityMap()[globalI])
+ {
+ const auto elementJ = fvGeometry.fvGridGeometry().element(dataJ.globalJ);
+ for (const auto scvfIdxJ : dataJ.scvfsJ)
+ {
+ const auto& scvfJ = fvGeometry.scvf(scvfIdxJ);
+ filler.fill(*this, fluxVarsCache_[scvfJ.index()], elementJ, fvGeometry, elemVolVars, scvfJ);
+ }
}
}
}
+ // access operators in the case of caching
+ const FluxVariablesCache& operator [](const SubControlVolumeFace& scvf) const
+ { return fluxVarsCache_[scvf.index()]; }
+
+ FluxVariablesCache& operator [](const SubControlVolumeFace& scvf)
+ { return fluxVarsCache_[scvf.index()]; }
+
+ const Problem& problem() const
+ { return *problemPtr_; }
+
/*!
* \brief Return a local restriction of this global object
* The local object is only functional after calling its bind/bindElement method
@@ -92,22 +137,6 @@ public:
{ return ElementFluxVariablesCache(global); }
private:
- // // access operators in the case of caching
- // const FluxVariablesCache& operator [](const SubControlVolumeFace& scvf) const
- // { return fluxVarsCache_[scvf.index()]; }
-
- // FluxVariablesCache& operator [](const SubControlVolumeFace& scvf)
- // { return fluxVarsCache_[scvf.index()]; }
-
- const FluxVariablesCache& operator [](IndexType scvfIdx) const
- { return fluxVarsCache_[scvfIdx]; }
-
- FluxVariablesCache& operator [](IndexType scvfIdx)
- { return fluxVarsCache_[scvfIdx]; }
-
- const Problem& problem_() const
- { return *problemPtr_; }
-
const Problem* problemPtr_;
std::vector<FluxVariablesCache> fluxVarsCache_;
@@ -121,15 +150,32 @@ private:
template<class TypeTag>
class CCTpfaGlobalFluxVariablesCache<TypeTag, false>
{
- // the local class needs access to the problem
- friend typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
public:
+ // The constructor
+ CCTpfaGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+
// When global flux variables caching is disabled, we don't need to update the cache
- void update(Problem& problem)
- { problemPtr_ = &problem; }
+ void update(const FVGridGeometry& fvGridGeometry,
+ const GridVolumeVariables& gridVolVars,
+ const SolutionVector& sol,
+ bool forceUpdate = false) {}
+
+ void updateElement(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars) {}
+
+ const Problem& problem() const
+ { return *problemPtr_; }
/*!
* \brief Return a local restriction of this global object
@@ -140,10 +186,6 @@ public:
{ return ElementFluxVariablesCache(global); }
private:
-
- const Problem& problem_() const
- { return *problemPtr_; }
-
const Problem* problemPtr_;
};
diff --git a/dumux/discretization/cellcentered/tpfa/properties.hh b/dumux/discretization/cellcentered/tpfa/properties.hh
new file mode 100644
index 0000000000000000000000000000000000000000..4233d4546069e5373689c13372e72537a38a0837
--- /dev/null
+++ b/dumux/discretization/cellcentered/tpfa/properties.hh
@@ -0,0 +1,149 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \ingroup Properties
+ * \file
+ *
+ * \brief Defines a type tag and some properties for models using
+ * a cell-centered scheme with two-point flux approximation.
+ */
+
+#ifndef DUMUX_CC_TPFA_PROPERTIES_HH
+#define DUMUX_CC_TPFA_PROPERTIES_HH
+
+#include <dune/common/fvector.hh>
+#include <dune/common/reservedvector.hh>
+#include <dune/geometry/multilineargeometry.hh>
+
+#include <dumux/discretization/methods.hh>
+#include <dumux/discretization/fvproperties.hh>
+
+#include <dumux/discretization/cellcentered/globalvolumevariables.hh>
+#include <dumux/discretization/cellcentered/subcontrolvolume.hh>
+
+#include <dumux/implicit/cellcentered/elementboundarytypes.hh>
+#include <dumux/implicit/cellcentered/localresidual.hh>
+
+#include <dumux/discretization/cellcentered/connectivitymap.hh>
+#include <dumux/discretization/cellcentered/elementsolution.hh>
+#include <dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh>
+#include <dumux/discretization/cellcentered/tpfa/globalfluxvariablescache.hh>
+#include <dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh>
+#include <dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh>
+#include <dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh>
+#include <dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh>
+
+namespace Dumux
+{
+namespace Properties
+{
+//! Type tag for the cell-centered tpfa scheme.
+NEW_TYPE_TAG(CCTpfaModel, INHERITS_FROM(FiniteVolumeModel));
+
+//! Set the corresponding discretization method property
+SET_PROP(CCTpfaModel, DiscretizationMethod)
+{
+ static const DiscretizationMethods value = DiscretizationMethods::CCTpfa;
+};
+
+//! Set the default for the global finite volume geometry
+SET_TYPE_PROP(CCTpfaModel, FVGridGeometry, CCTpfaFVGridGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
+
+//! The global flux variables cache vector class
+SET_TYPE_PROP(CCTpfaModel, GlobalFluxVariablesCache, CCTpfaGlobalFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+
+//! Set the default for the local finite volume geometry
+SET_TYPE_PROP(CCTpfaModel, FVElementGeometry, CCTpfaFVElementGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
+
+//! The global previous volume variables vector class
+SET_TYPE_PROP(CCTpfaModel, ElementVolumeVariables, CCTpfaElementVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
+
+//! The local flux variables cache vector class
+SET_TYPE_PROP(CCTpfaModel, ElementFluxVariablesCache, CCTpfaElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
+
+//! The global current volume variables vector class
+SET_TYPE_PROP(CCTpfaModel, GlobalVolumeVariables, CCGlobalVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
+
+//! The sub control volume
+SET_PROP(CCTpfaModel, SubControlVolume)
+{
+private:
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
+ struct ScvGeometryTraits
+ {
+ using Geometry = typename Grid::template Codim<0>::Geometry;
+ using GridIndexType = typename Grid::LeafGridView::IndexSet::IndexType;
+ using LocalIndexType = unsigned int;
+ using Scalar = typename Grid::ctype;
+ using GlobalPosition = Dune::FieldVector<Scalar, Grid::dimensionworld>;
+ };
+public:
+ using type = CCSubControlVolume<ScvGeometryTraits>;
+};
+
+//! The sub control volume face
+SET_PROP(CCTpfaModel, SubControlVolumeFace)
+{
+private:
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
+ static constexpr int dim = Grid::dimension;
+ static constexpr int dimWorld = Grid::dimensionworld;
+
+ // we use geometry traits that use static corner vectors to and a fixed geometry type
+ template <class ct>
+ struct ScvfMLGTraits : public Dune::MultiLinearGeometryTraits<ct>
+ {
+ // we use static vectors to store the corners as we know
+ // the number of corners in advance (2^(dim-1) corners (1<<(dim-1))
+ template< int mydim, int cdim >
+ struct CornerStorage
+ {
+ using Type = Dune::ReservedVector< Dune::FieldVector< ct, cdim >, (1<<(dim-1)) >;
+ };
+ };
+
+ struct ScvfGeometryTraits
+ {
+ using GridIndexType = typename Grid::LeafGridView::IndexSet::IndexType;
+ using LocalIndexType = unsigned int;
+ using Scalar = typename Grid::ctype;
+ using Geometry = Dune::MultiLinearGeometry<Scalar, dim-1, dimWorld, ScvfMLGTraits<Scalar> >;
+ using CornerStorage = typename ScvfMLGTraits<Scalar>::template CornerStorage<dim-1, dimWorld>::Type;
+ using GlobalPosition = typename CornerStorage::value_type;
+ };
+public:
+ typedef Dumux::CCTpfaSubControlVolumeFace<ScvfGeometryTraits> type;
+};
+
+//! Set the solution vector type for an element
+SET_TYPE_PROP(CCTpfaModel, ElementSolutionVector, CCElementSolution<TypeTag>);
+
+//! Set the default for the ElementBoundaryTypes
+SET_TYPE_PROP(CCTpfaModel, ElementBoundaryTypes, CCElementBoundaryTypes<TypeTag>);
+
+//! Set the BaseLocalResidual to CCLocalResidual
+SET_TYPE_PROP(CCTpfaModel, BaseLocalResidual, CCLocalResidual<TypeTag>);
+
+//! Set the AssemblyMap to the SimpleAssemblyMap per default
+SET_TYPE_PROP(CCTpfaModel, AssemblyMap, CCSimpleConnectivityMap<TypeTag>);
+
+} // namespace Properties
+} // namespace Dumux
+
+#endif
diff --git a/dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh b/dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh
index de382033abeddd31833aa3575435cd13ad2020f1..e71d5b43151ba8b3cec7528d94df7de0b9cc24ea 100644
--- a/dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh
+++ b/dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh
@@ -24,9 +24,7 @@
#define DUMUX_DISCRETIZATION_CC_TPFA_SUBCONTROLVOLUMEFACE_HH
#include <utility>
-#include <dune/common/fvector.hh>
#include <dumux/discretization/subcontrolvolumefacebase.hh>
-#include <dumux/common/optional.hh>
namespace Dumux
{
@@ -36,21 +34,20 @@ namespace Dumux
* \brief Class for a sub control volume face in the box method, i.e a part of the boundary
* of a sub control volume we compute fluxes on. We simply use the base class here.
*/
-template<class G, typename I>
-class CCTpfaSubControlVolumeFace : public SubControlVolumeFaceBase<CCTpfaSubControlVolumeFace<G, I>, G, I>
+template<class ScvfGeometryTraits>
+class CCTpfaSubControlVolumeFace : public SubControlVolumeFaceBase<CCTpfaSubControlVolumeFace<ScvfGeometryTraits>,ScvfGeometryTraits>
{
- using ParentType = SubControlVolumeFaceBase<CCTpfaSubControlVolumeFace<G, I>, G, I>;
- using Geometry = G;
- using IndexType = I;
-
- using Scalar = typename Geometry::ctype;
- static const int dim = Geometry::mydimension;
- static const int dimworld = Geometry::coorddimension;
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
- using LocalPosition = Dune::FieldVector<Scalar, dim>;
+ using ParentType = SubControlVolumeFaceBase<CCTpfaSubControlVolumeFace<ScvfGeometryTraits>, ScvfGeometryTraits>;
+ using GridIndexType = typename ScvfGeometryTraits::GridIndexType;
+ using Scalar = typename ScvfGeometryTraits::Scalar;
+ using GlobalPosition = typename ScvfGeometryTraits::GlobalPosition;
+ using CornerStorage = typename ScvfGeometryTraits::CornerStorage;
+ using Geometry = typename ScvfGeometryTraits::Geometry;
public:
+ //! state the traits public and thus export all types
+ using Traits = ScvfGeometryTraits;
+
// the default constructor
CCTpfaSubControlVolumeFace() = default;
@@ -66,46 +63,22 @@ public:
template <class Intersection>
CCTpfaSubControlVolumeFace(const Intersection& is,
const typename Intersection::Geometry& isGeometry,
- IndexType scvfIndex,
- const std::vector<IndexType>& scvIndices,
+ GridIndexType scvfIndex,
+ const std::vector<GridIndexType>& scvIndices,
bool isBoundary)
- : ParentType(),
- geomType_(isGeometry.type()),
- area_(isGeometry.volume()),
- center_(isGeometry.center()),
- unitOuterNormal_(is.centerUnitOuterNormal()),
- scvfIndex_(scvfIndex),
- scvIndices_(scvIndices),
- boundary_(isBoundary)
- {
- corners_.resize(isGeometry.corners());
- for (int i = 0; i < isGeometry.corners(); ++i)
- corners_[i] = isGeometry.corner(i);
- }
-
- /*//! The copy constrcutor
- CCTpfaSubControlVolumeFace(const CCTpfaSubControlVolumeFace& other) = delete;
-
- //! The move constrcutor
- CCTpfaSubControlVolumeFace(CCTpfaSubControlVolumeFace&& other) = default;
-
- //! The copy assignment operator
- CCTpfaSubControlVolumeFace& operator=(const CCTpfaSubControlVolumeFace& other) = delete;
-
- //! The move assignment operator
- // CCTpfaSubControlVolumeFace& operator=(CCTpfaSubControlVolumeFace&& other)
- // {
- // // We want to use the default copy/move assignment.
- // // But since geometry is not copy assignable :( we
- // // have to construct it again
- // geometry_.release();
- // geometry_.emplace(other.geometry_.value());
- // unitOuterNormal_ = std::move(other.unitOuterNormal_);
- // scvfIndex_ = std::move(other.scvfIndex_);
- // scvIndices_ = std::move(other.scvIndices_);
- // boundary_ = std::move(other.boundary_);
- // return *this;
- // }*/
+ : ParentType()
+ , geomType_(isGeometry.type())
+ , area_(isGeometry.volume())
+ , center_(isGeometry.center())
+ , unitOuterNormal_(is.centerUnitOuterNormal())
+ , scvfIndex_(scvfIndex)
+ , scvIndices_(scvIndices)
+ , boundary_(isBoundary)
+ {
+ corners_.resize(isGeometry.corners());
+ for (int i = 0; i < isGeometry.corners(); ++i)
+ corners_[i] = isGeometry.corner(i);
+ }
//! The center of the sub control volume face
GlobalPosition center() const
@@ -139,14 +112,14 @@ public:
}
//! index of the inside sub control volume for spatial param evaluation
- IndexType insideScvIdx() const
+ GridIndexType insideScvIdx() const
{
return scvIndices_[0];
}
//! index of the outside sub control volume for spatial param evaluation
// This results in undefined behaviour if boundary is true
- IndexType outsideScvIdx(int i = 0) const
+ GridIndexType outsideScvIdx(int i = 0) const
{
return scvIndices_[i+1];
}
@@ -158,7 +131,7 @@ public:
}
//! The global index of this sub control volume face
- IndexType index() const
+ GridIndexType index() const
{
return scvfIndex_;
}
@@ -177,12 +150,12 @@ public:
private:
Dune::GeometryType geomType_;
- std::vector<GlobalPosition> corners_;
+ CornerStorage corners_;
Scalar area_;
GlobalPosition center_;
GlobalPosition unitOuterNormal_;
- IndexType scvfIndex_;
- std::vector<IndexType> scvIndices_;
+ GridIndexType scvfIndex_;
+ std::vector<GridIndexType> scvIndices_;
bool boundary_;
};
diff --git a/dumux/discretization/fluxstencil.hh b/dumux/discretization/fluxstencil.hh
index 1a9131d75ccfb47e59bed0923dcabf37932d7ef1..71aeb8e7d5661bfa1228e6031901c7dccce58376 100644
--- a/dumux/discretization/fluxstencil.hh
+++ b/dumux/discretization/fluxstencil.hh
@@ -23,7 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_FLUXSTENCIL_HH
#define DUMUX_DISCRETIZATION_FLUXSTENCIL_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
namespace Dumux
@@ -59,8 +58,7 @@ class FluxStencilImplementation<TypeTag, DiscretizationMethods::Box>
public:
// This is for compatibility with the cc methods. The flux stencil info is obsolete for the box method.
- static Stencil stencil(const Problem& problem,
- const Element& element,
+ static Stencil stencil(const Element& element,
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf)
{
@@ -81,8 +79,7 @@ class FluxStencilImplementation<TypeTag, DiscretizationMethods::CCTpfa>
using Stencil = std::vector<IndexType>;
public:
- static Stencil stencil(const Problem& problem,
- const Element& element,
+ static Stencil stencil(const Element& element,
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf)
{
@@ -113,18 +110,17 @@ class FluxStencilImplementation<TypeTag, DiscretizationMethods::CCMpfa>
using Stencil = std::vector<IndexType>;
public:
- static Stencil stencil(const Problem& problem,
- const Element& element,
+ static Stencil stencil(const Element& element,
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf)
{
- const auto& fvGridGeometry = problem.model().fvGridGeometry();
+ const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
// return the scv (element) indices in the interaction region
- if (fvGridGeometry.isInBoundaryInteractionVolume(scvf))
- return fvGridGeometry.boundaryInteractionVolumeSeed(scvf).globalScvIndices();
+ if (fvGridGeometry.vertexUsesSecondaryInteractionVolume(scvf.vertexIndex()))
+ return fvGridGeometry.gridInteractionVolumeIndexSets().secondaryIndexSet(scvf).globalScvIndices();
else
- return fvGridGeometry.interactionVolumeSeed(scvf).globalScvIndices();
+ return fvGridGeometry.gridInteractionVolumeIndexSets().primaryIndexSet(scvf).globalScvIndices();
}
};
diff --git a/dumux/discretization/fluxvariablesbase.hh b/dumux/discretization/fluxvariablesbase.hh
index 29a46c64de505bb022e7ae1e06e995f77679031d..c2cbfcfd2d7e68de3f7b157eb5230f2cbf65e342 100644
--- a/dumux/discretization/fluxvariablesbase.hh
+++ b/dumux/discretization/fluxvariablesbase.hh
@@ -23,9 +23,7 @@
#ifndef DUMUX_DISCRETIZATION_FLUXVARIABLESBASE_HH
#define DUMUX_DISCRETIZATION_FLUXVARIABLESBASE_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
#include <dumux/discretization/fluxstencil.hh>
#include <dumux/discretization/upwindscheme.hh>
@@ -107,14 +105,13 @@ public:
return UpwindScheme::apply(*this, upwindTerm, flux, phaseIdx);
}
- static Stencil computeStencil(const Problem& problem,
- const Element& element,
+ static Stencil computeStencil(const Element& element,
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf)
{
//! Give the upwind scheme access to the cached variables
//! Forward to the discretization specific implementation
- return FluxStencil::stencil(problem, element, fvGeometry, scvf);
+ return FluxStencil::stencil(element, fvGeometry, scvf);
}
private:
diff --git a/dumux/discretization/fluxvariablescaching.hh b/dumux/discretization/fluxvariablescaching.hh
index 07e762fac061c7da115c774ba81e0f47bd200cd7..c554a5aac761e3620398ed7d7deb0fe93c13d14d 100644
--- a/dumux/discretization/fluxvariablescaching.hh
+++ b/dumux/discretization/fluxvariablescaching.hh
@@ -26,19 +26,7 @@
namespace Dumux
{
-namespace FluxVariablesCaching
-{
-
-class _EmptyCache {};
-
-/*!
- * \ingroup ImplicitModel
- * \brief Empty caches to use in a law/process, e.g. Darcy's law
- * \note Never use the _EmptyCache directly as it lead to ambiguous definitions
- */
-class EmptyAdvectionCache : public _EmptyCache {};
-class EmptyDiffusionCache : public _EmptyCache {};
-class EmptyHeatConductionCache : public _EmptyCache {};
+namespace FluxVariablesCaching {
//! The empty filler class corresponding to EmptyCache
template<class TypeTag>
@@ -76,6 +64,19 @@ public:
{}
};
+// an empty cache filler
+template<class TypeTag> struct _EmptyCache
+{ using Filler = EmptyCacheFiller<TypeTag>; };
+
+/*!
+ * \ingroup ImplicitModel
+ * \brief Empty caches to use in a law/process, e.g. Darcy's law
+ * \note Never use the _EmptyCache directly as it lead to ambiguous definitions
+ */
+template<class TypeTag> class EmptyAdvectionCache : public _EmptyCache<TypeTag> {};
+template<class TypeTag> class EmptyDiffusionCache : public _EmptyCache<TypeTag> {};
+template<class TypeTag> class EmptyHeatConductionCache : public _EmptyCache<TypeTag> {};
+
} // end namespace FluxVariablesCaching
} // end namespace Dumux
diff --git a/dumux/multidomain/subdomainproperties.hh b/dumux/discretization/fvproperties.hh
similarity index 58%
rename from dumux/multidomain/subdomainproperties.hh
rename to dumux/discretization/fvproperties.hh
index 4af5c2a8faca706ee4c54595288f702b843a6ff1..7246f5549038643482e48a6eb9fc5c1d1c3485b0 100644
--- a/dumux/multidomain/subdomainproperties.hh
+++ b/dumux/discretization/fvproperties.hh
@@ -17,50 +17,45 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/*!
- * \file
* \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup MultidomainModel
- * \brief Specify properties required for the subdomains of the coupled model
+ * \file
+ *
+ * \brief Declares properties required for finite-volume models models.
*/
-#ifndef DUMUX_SUBDOMAIN_PROPERTIES_HH
-#define DUMUX_SUBDOMAIN_PROPERTIES_HH
+
+#ifndef DUMUX_FV_PROPERTIES_HH
+#define DUMUX_FV_PROPERTIES_HH
+
+#include <dune/istl/bvector.hh>
#include <dumux/common/propertysystem.hh>
+#include <dumux/common/properties.hh>
+
+#include <dumux/implicit/gridvariables.hh>
namespace Dumux
{
namespace Properties
{
+//! Type tag for finite-volume schemes.
+NEW_TYPE_TAG(FiniteVolumeModel);
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
+//! The grid variables
+SET_TYPE_PROP(FiniteVolumeModel, GridVariables, GridVariables<TypeTag>);
-//! The type tag from which sub-problems of coupling models inherit
-NEW_TYPE_TAG(SubDomain);
+//! The type of a solution for a whole element
+SET_TYPE_PROP(FiniteVolumeModel, ElementSolutionVector, Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, PrimaryVariables)>);
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-//! Specifies the host grid
-NEW_PROP_TAG(Grid);
+//! We do not store the FVGeometry by default
+SET_BOOL_PROP(FiniteVolumeModel, EnableFVGridGeometryCache, false);
-//! Specifies the scalar grid function space used for sub-problems
-NEW_PROP_TAG(ScalarGridFunctionSpace);
+//! We do not store the volume variables by default
+SET_BOOL_PROP(FiniteVolumeModel, EnableGlobalVolumeVariablesCache, false);
-//! Specifies the grid function space used for sub-problems
-NEW_PROP_TAG(GridFunctionSpace);
-
-//! Specifies the type of the constraints
-NEW_PROP_TAG(Constraints);
-
-//! Specifies the local finite element space
-NEW_PROP_TAG(LocalFEMSpace);
-
-//! Specifies the local operator
-NEW_PROP_TAG(LocalOperator);
+//! disable flux variables data caching by default
+SET_BOOL_PROP(FiniteVolumeModel, EnableGlobalFluxVariablesCache, false);
} // namespace Properties
} // namespace Dumux
-#endif // DUMUX_SUBDOMAIN_PROPERTIES_HH
+
+ #endif
diff --git a/dumux/discretization/scvandscvfiterators.hh b/dumux/discretization/scvandscvfiterators.hh
index 81c01a1ab86a613a978a8e83fff03b821a322b00..fc947d9e41a8d91b203c1e9c5e950bafdf070cb3 100644
--- a/dumux/discretization/scvandscvfiterators.hh
+++ b/dumux/discretization/scvandscvfiterators.hh
@@ -24,6 +24,7 @@
#ifndef DUMUX_SCV_AND_SCVF_ITERATORS_HH
#define DUMUX_SCV_AND_SCVF_ITERATORS_HH
+#include <dune/common/iteratorrange.hh>
#include <dune/common/iteratorfacades.hh>
namespace Dumux
diff --git a/dumux/implicit/staggered/assemblymap.hh b/dumux/discretization/staggered/connectivitymap.hh
similarity index 83%
rename from dumux/implicit/staggered/assemblymap.hh
rename to dumux/discretization/staggered/connectivitymap.hh
index 45331e432b4a90986a1eb1e197e625b90f069f33..c71587679a5aa483b30114db32352ed029a7cb98 100644
--- a/dumux/implicit/staggered/assemblymap.hh
+++ b/dumux/discretization/staggered/connectivitymap.hh
@@ -22,22 +22,22 @@
* that contribute to the derivative calculation. This is used for
* finite-volume schemes with symmetric sparsity pattern in the global matrix.
*/
-#ifndef DUMUX_STAGGERED_ASSEMBLY_MAP_HH
-#define DUMUX_STAGGERED_ASSEMBLY_MAP_HH
+#ifndef DUMUX_STAGGERED_CONNECTIVITY_MAP_HH
+#define DUMUX_STAGGERED_CONNECTIVITY_MAP_HH
-#include <dune/istl/bcrsmatrix.hh>
-
-#include <dumux/implicit/properties.hh>
+#include <vector>
+#include <dumux/common/basicproperties.hh>
namespace Dumux
{
template<class TypeTag>
-class StaggeredAssemblyMap
+class StaggeredConnectivityMap
{
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using IndexType = typename GridView::IndexSet::IndexType;
@@ -62,11 +62,11 @@ public:
*
* \param problem The problem which we want to simulate.
*/
- void init(const Problem& problem)
+ void update(const FVGridGeometry& fvGridGeometry)
{
- const auto numDofsCC = problem.model().numCellCenterDofs();
- const auto numDofsFace = problem.model().numFaceDofs();
- const auto numBoundaryFacets = problem.model().fvGridGeometry().numBoundaryScvf();
+ const auto numDofsCC = fvGridGeometry.gridView().size(0);
+ const auto numDofsFace = fvGridGeometry.gridView().size(1);
+ const auto numBoundaryFacets = fvGridGeometry.numBoundaryScvf();
cellCenterToCellCenterMap_.resize(numDofsCC);
cellCenterToFaceMap_.resize(numDofsCC);
faceToCellCenterMap_.resize(2*numDofsFace - numBoundaryFacets);
@@ -78,22 +78,22 @@ public:
fullfaceToFaceStencils.resize(numDofsFace);
FluxVariables fluxVars;
- for(auto&& element: elements(problem.gridView()))
+ for(auto&& element: elements(fvGridGeometry.gridView()))
{
// restrict the FvGeometry locally and bind to the element
- auto fvGeometry = localView(problem.model().fvGridGeometry());
+ auto fvGeometry = localView(fvGridGeometry);
fvGeometry.bindElement(element);
// loop over sub control faces
for (auto&& scvf : scvfs(fvGeometry))
{
- const auto dofIdxCellCenter = problem.elementMapper().index(element);
- fluxVars.computeCellCenterToCellCenterStencil(cellCenterToCellCenterMap_[dofIdxCellCenter], problem, element, fvGeometry, scvf);
- fluxVars.computeCellCenterToFaceStencil(cellCenterToFaceMap_[dofIdxCellCenter], problem, element, fvGeometry, scvf);
+ const auto dofIdxCellCenter = fvGridGeometry.elementMapper().index(element);
+ fluxVars.computeCellCenterToCellCenterStencil(cellCenterToCellCenterMap_[dofIdxCellCenter], element, fvGeometry, scvf);
+ fluxVars.computeCellCenterToFaceStencil(cellCenterToFaceMap_[dofIdxCellCenter], element, fvGeometry, scvf);
const auto scvfIdx = scvf.index();
- fluxVars.computeFaceToCellCenterStencil(faceToCellCenterMap_[scvfIdx],problem, fvGeometry, scvf);
- fluxVars.computeFaceToFaceStencil(faceToFaceMap_[scvfIdx],problem, fvGeometry, scvf);
+ fluxVars.computeFaceToCellCenterStencil(faceToCellCenterMap_[scvfIdx], fvGeometry, scvf);
+ fluxVars.computeFaceToFaceStencil(faceToFaceMap_[scvfIdx], fvGeometry, scvf);
}
}
}
diff --git a/dumux/discretization/staggered/elementfacevariables.hh b/dumux/discretization/staggered/elementfacevariables.hh
new file mode 100644
index 0000000000000000000000000000000000000000..b9ab9e87f191d906fdb7a6a6063c4d335c54a1c9
--- /dev/null
+++ b/dumux/discretization/staggered/elementfacevariables.hh
@@ -0,0 +1,175 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief The face variables class for free flow staggered grid models
+ */
+#ifndef DUMUX_DISCRETIZATION_STAGGERED_ELEMENTFACEVARIABLES_HH
+#define DUMUX_DISCRETIZATION_STAGGERED_ELEMENTFACEVARIABLES_HH
+
+#include <dumux/common/basicproperties.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup ImplicitModel
+ * \brief Base class for the face variables vector
+ */
+template<class TypeTag, bool enableGlobalFaceVarsCache>
+class StaggeredElementFaceVariables
+{};
+
+
+template<class TypeTag>
+class StaggeredElementFaceVariables<TypeTag, /*enableGlobalFaceVarsCache*/true>
+{
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
+ using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using IndexType = typename GridView::IndexSet::IndexType;
+
+public:
+
+ StaggeredElementFaceVariables(const GlobalFaceVars& globalFacesVars) : globalFaceVarsPtr_(&globalFacesVars) {}
+
+ const FaceVariables& operator [](const SubControlVolumeFace& scvf) const
+ { return globalFaceVars().faceVars(scvf.index()); }
+
+ // operator for the access with an index
+ // needed for cc methods for the access to the boundary volume variables
+ const FaceVariables& operator [](const IndexType scvfIdx) const
+ { return globalFaceVars().faceVars(scvfIdx); }
+
+
+ //! For compatibility reasons with the case of not storing the face vars.
+ //! function to be called before assembling an element, preparing the vol vars within the stencil
+ void bind(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const SolutionVector& sol)
+ {}
+
+ // Binding of an element, prepares only the face variables of the element
+ // specialization for Staggered models
+ void bindElement(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const SolutionVector& sol)
+ {}
+
+
+ //! The global volume variables object we are a restriction of
+ const GlobalFaceVars& globalFaceVars() const
+ { return *globalFaceVarsPtr_; }
+
+
+private:
+ const GlobalFaceVars* globalFaceVarsPtr_;
+};
+
+template<class TypeTag>
+class StaggeredElementFaceVariables<TypeTag, /*enableGlobalFaceVarsCache*/false>
+{
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
+ using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using IndexType = typename GridView::IndexSet::IndexType;
+
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
+public:
+
+ StaggeredElementFaceVariables(const GlobalFaceVars& globalFacesVars) : globalFaceVarsPtr_(&globalFacesVars) {}
+
+ const FaceVariables& operator [](const SubControlVolumeFace& scvf) const
+ { return faceVariables_[scvf.localFaceIdx()]; }
+
+ // operator for the access with an index
+ const FaceVariables& operator [](const IndexType scvfIdx) const
+ { return faceVariables_[getLocalIdx_(scvfIdx)]; }
+
+ FaceVariables& operator [](const SubControlVolumeFace& scvf)
+ { return faceVariables_[scvf.localFaceIdx()]; }
+
+ // operator for the access with an index
+ FaceVariables& operator [](const IndexType scvfIdx)
+ { return faceVariables_[getLocalIdx_(scvfIdx)]; }
+
+ //! For compatibility reasons with the case of not storing the vol vars.
+ //! function to be called before assembling an element, preparing the vol vars within the stencil
+ void bind(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const SolutionVector& sol)
+ {
+ faceVariables_.resize(fvGeometry.numScvf());
+ faceVarIndices_.resize(fvGeometry.numScvf());
+
+ for(auto&& scvf : scvfs(fvGeometry))
+ {
+ faceVariables_[scvf.localFaceIdx()].update(sol[faceIdx], globalFaceVars().problem(), element, fvGeometry, scvf);
+ faceVarIndices_[scvf.localFaceIdx()] = scvf.index();
+ }
+ }
+
+ // Binding of an element, prepares only the face variables of the element
+ // specialization for Staggered models
+ void bindElement(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const SolutionVector& sol)
+ {
+ faceVariables_.resize(fvGeometry.numScvf());
+ faceVarIndices_.resize(fvGeometry.numScvf());
+
+ for(auto&& scvf : scvfs(fvGeometry))
+ {
+ faceVariables_[scvf.localFaceIdx()].updateOwnFaceOnly(sol[faceIdx][scvf.dofIndex()]);
+ faceVarIndices_[scvf.localFaceIdx()] = scvf.index();
+ }
+ }
+
+ //! The global volume variables object we are a restriction of
+ const GlobalFaceVars& globalFaceVars() const
+ { return *globalFaceVarsPtr_; }
+
+private:
+
+ const int getLocalIdx_(const int scvfIdx) const
+ {
+ auto it = std::find(faceVarIndices_.begin(), faceVarIndices_.end(), scvfIdx);
+ assert(it != faceVarIndices_.end() && "Could not find the current face variables for scvfIdx!");
+ return std::distance(faceVarIndices_.begin(), it);
+ }
+
+ const GlobalFaceVars* globalFaceVarsPtr_;
+ std::vector<IndexType> faceVarIndices_;
+ std::vector<FaceVariables> faceVariables_;
+};
+
+} // end namespace
+
+#endif
diff --git a/dumux/discretization/staggered/elementfluxvariablescache.hh b/dumux/discretization/staggered/elementfluxvariablescache.hh
index 5feb420cea47a244087e541603edce95dcf22c73..adf2e895cefcf40fee06d28c5d556ee3f1ca30c3 100644
--- a/dumux/discretization/staggered/elementfluxvariablescache.hh
+++ b/dumux/discretization/staggered/elementfluxvariablescache.hh
@@ -23,7 +23,7 @@
#ifndef DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_FLUXVARSCACHE_HH
#define DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_FLUXVARSCACHE_HH
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/basicproperties.hh>
namespace Dumux
{
diff --git a/dumux/discretization/staggered/elementvolumevariables.hh b/dumux/discretization/staggered/elementvolumevariables.hh
index 0ada499689039043105ab4dbc8ba6542af3f6e9b..9e2cc021ceed2da95fcc04fa9cc5385fa7c8c1ea 100644
--- a/dumux/discretization/staggered/elementvolumevariables.hh
+++ b/dumux/discretization/staggered/elementvolumevariables.hh
@@ -23,7 +23,7 @@
#ifndef DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_VOLUMEVARIABLES_HH
#define DUMUX_DISCRETIZATION_STAGGERED_ELEMENT_VOLUMEVARIABLES_HH
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/basicproperties.hh>
namespace Dumux
{
@@ -93,8 +93,11 @@ class StaggeredElementVolumeVariables<TypeTag, /*enableGlobalVolVarsCache*/false
{
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using GlobalVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
@@ -103,6 +106,12 @@ class StaggeredElementVolumeVariables<TypeTag, /*enableGlobalVolVarsCache*/false
static const int dim = GridView::dimension;
using Element = typename GridView::template Codim<0>::Entity;
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
+ static constexpr auto numEqCellCenter = GET_PROP_VALUE(TypeTag, NumEqCellCenter);
+
public:
//! Constructor
@@ -115,30 +124,35 @@ public:
const FVElementGeometry& fvGeometry,
const SolutionVector& sol)
{
- auto eIdx = globalVolVars().problem_().elementMapper().index(element);
+ clear();
- // stencil information
- const auto& neighborStencil = globalVolVars().problem_().model().stencils(element).neighborStencil();
- const auto numDofs = neighborStencil.size() + 1;
+ const auto& problem = globalVolVars().problem();
+ const auto& fvGridGeometry = fvGeometry.fvGridGeometry();
+ const auto globalI = fvGridGeometry.elementMapper().index(element);
+ const auto map = fvGridGeometry.connectivityMap();
+ const auto& connectivityMapI = map(cellCenterIdx, cellCenterIdx, globalI);
+ const auto numDofs = connectivityMapI.size();
+
+ auto&& scvI = fvGeometry.scv(globalI);
// resize local containers to the required size (for internal elements)
volumeVariables_.resize(numDofs);
volVarIndices_.resize(numDofs);
int localIdx = 0;
- // update the volume variables of the element at hand
- auto&& scvI = fvGeometry.scv(eIdx);
- volumeVariables_[localIdx].update(sol[eIdx], globalVolVars().problem_(), element, scvI);
- volVarIndices_[localIdx] = scvI.index();
- ++localIdx;
-
- // Update the volume variables of the neighboring elements
- for (auto globalJ : neighborStencil)
+ // Update the volume variables of the element at hand and the neighboring elements
+ for (auto globalJ : connectivityMapI)
{
- const auto& elementJ = fvGeometry.fvGridGeometry().element(globalJ);
+ const auto& elementJ = fvGridGeometry.element(globalJ);
auto&& scvJ = fvGeometry.scv(globalJ);
- volumeVariables_[localIdx].update(sol[globalJ], globalVolVars().problem_(), elementJ, scvJ);
- volVarIndices_[localIdx] = scvJ.index();
+ PrimaryVariables priVars(0.0);
+ priVars[cellCenterIdx] = sol[cellCenterIdx][globalJ];
+ ElementSolution elemSol{std::move(priVars)};
+ volumeVariables_[localIdx].update(elemSol,
+ problem,
+ elementJ,
+ scvJ);
+ volVarIndices_[localIdx] = scvJ.dofIndex();
++localIdx;
}
@@ -149,18 +163,33 @@ public:
if (!scvf.boundary())
continue;
- // check if boundary is a pure dirichlet boundary
- const auto bcTypes = globalVolVars().problem_().boundaryTypes(element, scvf);
- if (bcTypes.hasOnlyDirichlet())
- {
- const auto dirichletPriVars = globalVolVars().problem_().dirichlet(element, scvf);
+ const auto bcTypes = problem.boundaryTypes(element, scvf);
+
+ PrimaryVariables boundaryPriVars(0.0);
- volumeVariables_.resize(localIdx+1);
- volVarIndices_.resize(localIdx+1);
- volumeVariables_[localIdx].update(dirichletPriVars, globalVolVars().problem_(), element, scvI);
- volVarIndices_[localIdx] = scvf.outsideScvIdx();
- ++localIdx;
+ for(int eqIdx = 0; eqIdx < numEqCellCenter; ++eqIdx)
+ {
+ if(bcTypes.isDirichlet(eqIdx) || bcTypes.isDirichletCell(eqIdx))
+ boundaryPriVars[cellCenterIdx][eqIdx] = problem.dirichlet(element, scvf)[cellCenterIdx][eqIdx];
+ else if(bcTypes.isNeumann(eqIdx) || bcTypes.isOutflow(eqIdx) || bcTypes.isSymmetry())
+ boundaryPriVars[cellCenterIdx][eqIdx] = sol[cellCenterIdx][scvf.insideScvIdx()][eqIdx];
+ //TODO: this assumes a zero-gradient for e.g. the pressure on the boundary
+ // could be made more general by allowing a non-zero-gradient, provided in problem file
+ else
+ if(eqIdx == Indices::pressureIdx)
+ DUNE_THROW(Dune::InvalidStateException, "Face at: " << scvf.center() << " has neither Dirichlet nor Neumann BC.");
}
+
+ volumeVariables_.resize(localIdx+1);
+ volVarIndices_.resize(localIdx+1);
+
+ ElementSolution elemSol{std::move(boundaryPriVars)};
+ volumeVariables_[localIdx].update(elemSol,
+ problem,
+ element,
+ scvI);
+ volVarIndices_[localIdx] = scvf.outsideScvIdx();
+ ++localIdx;
}
}
@@ -170,13 +199,21 @@ public:
const FVElementGeometry& fvGeometry,
const SolutionVector& sol)
{
- auto eIdx = globalVolVars().problem_().elementMapper().index(element);
+ clear();
+
+ const auto eIdx = fvGeometry.fvGridGeometry().elementMapper().index(element);
volumeVariables_.resize(1);
volVarIndices_.resize(1);
// update the volume variables of the element
auto&& scv = fvGeometry.scv(eIdx);
- volumeVariables_[0].update(sol[eIdx], globalVolVars().problem_(), element, scv);
+ PrimaryVariables priVars(0.0);
+ priVars[cellCenterIdx] = sol[cellCenterIdx][eIdx];
+ ElementSolution elemSol{std::move(priVars)};
+ volumeVariables_[0].update(elemSol,
+ globalVolVars().problem(),
+ element,
+ scv);
volVarIndices_[0] = scv.dofIndex();
}
@@ -196,6 +233,13 @@ public:
const GlobalVolumeVariables& globalVolVars() const
{ return *globalVolVarsPtr_; }
+ //! Clear all local storage
+ void clear()
+ {
+ volVarIndices_.clear();
+ volumeVariables_.clear();
+ }
+
private:
const GlobalVolumeVariables* globalVolVarsPtr_;
diff --git a/dumux/discretization/staggered/facesolution.hh b/dumux/discretization/staggered/facesolution.hh
new file mode 100644
index 0000000000000000000000000000000000000000..d36ea605aa5dd38704e9f01a6c16e3e82e6f8ccd
--- /dev/null
+++ b/dumux/discretization/staggered/facesolution.hh
@@ -0,0 +1,92 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief The global volume variables class for cell centered models
+ */
+#ifndef DUMUX_DISCRETIZATION_STAGGERED_FACE_SOLUTION_HH
+#define DUMUX_DISCRETIZATION_STAGGERED_FACE_SOLUTION_HH
+
+#include <dumux/common/basicproperties.hh>
+#include <dumux/discretization/staggered/elementvolumevariables.hh>
+
+namespace Dumux
+{
+
+template<class TypeTag>
+class StaggeredFaceSolution
+{
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using FaceSolutionVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
+ using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
+public:
+
+ StaggeredFaceSolution(const SubControlVolumeFace& scvf, const FaceSolutionVector& sol,
+ const FVGridGeometry& fvGridGeometry)
+ {
+ const auto& connectivityMap = fvGridGeometry.connectivityMap();
+ const auto& stencil = connectivityMap(faceIdx, faceIdx, scvf.index());
+
+ facePriVars_.reserve(stencil.size());
+ map_.reserve(stencil.size());
+
+ for(const auto dofJ : stencil)
+ {
+ map_.push_back(dofJ);
+ facePriVars_.push_back(sol[dofJ]);
+ }
+ }
+
+ //! bracket operator const access
+ template<typename IndexType>
+ const FacePrimaryVariables& operator [](IndexType globalFaceDofIdx) const
+ {
+ const auto pos = std::find(map_.begin(), map_.end(), globalFaceDofIdx);
+ assert (pos != map_.end());
+ return facePriVars_[pos - map_.begin()];
+ }
+
+ //! bracket operator
+ template<typename IndexType>
+ FacePrimaryVariables& operator [](IndexType globalFaceDofIdx)
+ {
+ const auto pos = std::find(map_.begin(), map_.end(), globalFaceDofIdx);
+ assert (pos != map_.end());
+ return facePriVars_[pos - map_.begin()];
+ }
+
+
+private:
+
+ std::vector<FacePrimaryVariables> facePriVars_;
+ std::vector<unsigned int> map_;
+};
+
+} // end namespace
+
+#endif
diff --git a/dumux/discretization/staggered/freeflow/facevariables.hh b/dumux/discretization/staggered/freeflow/facevariables.hh
index f9591f5101453f9afe0099efc4b7e13a72187293..337b6e419d801d6615d80ff09232be05117b7f4b 100644
--- a/dumux/discretization/staggered/freeflow/facevariables.hh
+++ b/dumux/discretization/staggered/freeflow/facevariables.hh
@@ -18,34 +18,171 @@
*****************************************************************************/
/*!
* \file
- * \brief The face variables class for free flow staggered grid models
+ * \brief The face variables class for free flow staggered grid models.
+ * Contains all relevant velocities for the assembly of the momentum balance.
*/
#ifndef DUMUX_DISCRETIZATION_STAGGERED_FREEFLOW_FACEVARIABLES_HH
#define DUMUX_DISCRETIZATION_STAGGERED_FREEFLOW_FACEVARIABLES_HH
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/basicproperties.hh>
namespace Dumux
{
+
+namespace Properties
+{
+ NEW_PROP_TAG(StaggeredFaceSolution);
+}
+
template<class TypeTag>
class StaggeredFaceVariables
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+
+ static constexpr int dimWorld = GridView::dimensionworld;
+ static constexpr int numPairs = (dimWorld == 2) ? 2 : 4;
+
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+ using Element = typename GridView::template Codim<0>::Entity;
+
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
public:
- void update(const FacePrimaryVariables &facePrivars)
+
+ /*!
+ * \brief Partial update of the face variables. Only the face itself is considered.
+ *
+ * \param priVars The face-specific primary variales
+ */
+ void updateOwnFaceOnly(const FacePrimaryVariables& priVars)
+ {
+ velocitySelf_ = priVars[0];
+ }
+
+ /*!
+ * \brief Complete update of the face variables (i.e. velocities for free flow)
+ * for a given face
+ *
+ * \param faceSol The face-specific solution vector
+ * \param problem The problem
+ * \param element The element
+ * \param fvGeometry The finite-volume geometry
+ * \param scvf The sub-control volume face of interest
+ */
+ template<class SolVector>
+ void update(const SolVector& faceSol,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const SubControlVolumeFace& scvf)
+ {
+ velocitySelf_ = faceSol[scvf.dofIndex()];
+ velocityOpposite_ = faceSol[scvf.dofIndexOpposingFace()];
+
+ // lambda to conveniently create a ghost face which is outside the domain, parallel to the scvf of interest
+ auto makeGhostFace = [](const auto& pos)
+ {
+ return SubControlVolumeFace(pos, std::vector<unsigned int>{0,0});
+ };
+
+ // lambda to check whether there is a parallel face neighbor
+ auto hasParallelNeighbor = [](const auto& subFaceData)
+ {
+ return subFaceData.outerParallelFaceDofIdx >= 0;
+ };
+
+ // lambda to check whether there is a normal face neighbor
+ auto hasNormalNeighbor = [](const auto& subFaceData)
+ {
+ return subFaceData.normalPair.second >= 0;
+ };
+
+ // handle all sub faces
+ for(int i = 0; i < scvf.pairData().size(); ++i)
+ {
+ const auto& subFaceData = scvf.pairData(i);
+
+ // treat the velocities normal to the face
+ velocityNormalInside_[i] = faceSol[subFaceData.normalPair.first];
+
+ if(hasNormalNeighbor(subFaceData))
+ {
+ velocityNormalOutside_[i] = faceSol[subFaceData.normalPair.second];
+ }
+ else
+ {
+ const auto& normalFace = fvGeometry.scvf(scvf.insideScvIdx(), subFaceData.localNormalFaceIdx);
+ const auto normalDirIdx = normalFace.directionIndex();
+ velocityNormalOutside_[i] = problem.dirichlet(element, makeGhostFace(subFaceData.virtualOuterNormalFaceDofPos))[faceIdx][normalDirIdx];
+ }
+
+ // treat the velocity parallel to the face
+ velocityParallel_[i] = hasParallelNeighbor(subFaceData) ?
+ velocityParallel_[i] = faceSol[subFaceData.outerParallelFaceDofIdx] :
+ problem.dirichlet(element, makeGhostFace(subFaceData.virtualOuterParallelFaceDofPos))[faceIdx][scvf.directionIndex()];
+ }
+ }
+
+ /*!
+ * \brief Returns the velocity at the face itself
+ */
+ Scalar velocitySelf() const
{
- velocity_ = facePrivars[0];
+ return velocitySelf_;
}
- Scalar velocity() const
+ /*!
+ * \brief Returns the velocity at the opposing face
+ */
+ Scalar velocityOpposite() const
{
- return velocity_;
+ return velocityOpposite_;
}
+ /*!
+ * \brief Returns the velocity at the parallel face
+ *
+ * \param localSubFaceIdx The local index of the subface
+ */
+ Scalar velocityParallel(const int localSubFaceIdx) const
+ {
+ return velocityParallel_[localSubFaceIdx];
+ }
+
+ /*!
+ * \brief Returns the velocity at the inner normal face
+ *
+ * \param localSubFaceIdx The local index of the subface
+ */
+ Scalar velocityNormalInside(const int localSubFaceIdx) const
+ {
+ return velocityNormalInside_[localSubFaceIdx];
+ }
+
+ /*!
+ * \brief Returns the velocity at the outer normal face
+ *
+ * \param localSubFaceIdx The local index of the subface
+ */
+ Scalar velocityNormalOutside(const int localSubFaceIdx) const
+ {
+ return velocityNormalOutside_[localSubFaceIdx];
+ }
private:
- Scalar velocity_;
+
+ Scalar velocitySelf_;
+ Scalar velocityOpposite_;
+ std::array<Scalar, numPairs> velocityParallel_;
+ std::array<Scalar, numPairs> velocityNormalInside_;
+ std::array<Scalar, numPairs> velocityNormalOutside_;
};
} // end namespace
diff --git a/dumux/discretization/staggered/freeflow/fickslaw.hh b/dumux/discretization/staggered/freeflow/fickslaw.hh
index 968d17938ef8fb9a0dc2440a76268e7dc0889d25..f82f3a600e152ab4c9c8b3a7e5a2b4beaaf3194d 100644
--- a/dumux/discretization/staggered/freeflow/fickslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fickslaw.hh
@@ -29,7 +29,6 @@
#include <dumux/common/math.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
#include <dumux/discretization/fluxvariablescaching.hh>
@@ -87,10 +86,9 @@ public:
// state the discretization method this implementation belongs to
static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::Staggered;
- //! state the type for the corresponding cache and its filler
+ //! state the type for the corresponding cache
//! We don't cache anything for this law
- using Cache = FluxVariablesCaching::EmptyDiffusionCache;
- using CacheFiller = FluxVariablesCaching::EmptyCacheFiller<TypeTag>;
+ using Cache = FluxVariablesCaching::EmptyDiffusionCache<TypeTag>;
static CellCenterPrimaryVariables diffusiveFluxForCellCenter(const Problem& problem,
const FVElementGeometry& fvGeometry,
diff --git a/dumux/discretization/staggered/freeflow/fourierslaw.hh b/dumux/discretization/staggered/freeflow/fourierslaw.hh
index 3d7b646fcd597de2da5bcf720bf4e7dcbfaf25f3..cb4f1588ff6f7c03a9b8c09308d3942227f91739 100644
--- a/dumux/discretization/staggered/freeflow/fourierslaw.hh
+++ b/dumux/discretization/staggered/freeflow/fourierslaw.hh
@@ -26,7 +26,6 @@
#include <dumux/common/math.hh>
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
#include <dumux/discretization/fluxvariablescaching.hh>
@@ -56,10 +55,9 @@ public:
// state the discretization method this implementation belongs to
static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::Staggered;
- //! state the type for the corresponding cache and its filler
+ //! state the type for the corresponding cache
//! We don't cache anything for this law
- using Cache = FluxVariablesCaching::EmptyDiffusionCache;
- using CacheFiller = FluxVariablesCaching::EmptyCacheFiller<TypeTag>;
+ using Cache = FluxVariablesCaching::EmptyDiffusionCache<TypeTag>;
static Scalar diffusiveFluxForCellCenter(const Problem& problem,
const Element& element,
diff --git a/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh b/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
index 36510d99cf9cac3bd1696ab243fab6f888535870..6dd9cc52b9c5e29d8782ebac484eb4ad7fec5bc5 100644
--- a/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
+++ b/dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh
@@ -34,46 +34,30 @@
namespace Dumux
{
-template<class G, typename I>
-class StaggeredSubFace
-{
- using Geometry = G;
- using IndexType = I;
- using Scalar = typename Geometry::ctype;
-
-private:
- std::vector<std::pair<int,int>> velocityDofIdxPair_;
- std::vector<Scalar> distance_;
- std::pair<int,int> elementPair_;
- int commonVertexIdx_;
-};
-
-
/*!
* \ingroup Discretization
* \brief Class for a sub control volume face in the box method, i.e a part of the boundary
* of a sub control volume we compute fluxes on. We simply use the base class here.
*/
-template<class G, typename I>
-class StaggeredSubControlVolumeFace : public SubControlVolumeFaceBase<StaggeredSubControlVolumeFace<G, I>, G, I>
+template<class ScvfGeometryTraits>
+class StaggeredSubControlVolumeFace : public SubControlVolumeFaceBase<StaggeredSubControlVolumeFace<ScvfGeometryTraits>, ScvfGeometryTraits>
{
- using ParentType = SubControlVolumeFaceBase<StaggeredSubControlVolumeFace<G, I>, G, I>;
- using Geometry = G;
- using IndexType = I;
+ using ParentType = SubControlVolumeFaceBase<StaggeredSubControlVolumeFace<ScvfGeometryTraits>,ScvfGeometryTraits>;
+ using Geometry = typename ScvfGeometryTraits::Geometry;
+ using GridIndexType = typename ScvfGeometryTraits::GridIndexType;
- using Scalar = typename Geometry::ctype;
+ using Scalar = typename ScvfGeometryTraits::Scalar;
static const int dim = Geometry::mydimension;
static const int dimworld = Geometry::coorddimension;
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
- using LocalPosition = Dune::FieldVector<Scalar, dim>;
-
- using StaggeredSubFace = Dumux::StaggeredSubFace<G,I>;
+ using GlobalPosition = typename ScvfGeometryTraits::GlobalPosition;
static constexpr int numPairs = (dimworld == 2) ? 2 : 4;
-
public:
+ //! state the traits public and thus export all types
+ using Traits = ScvfGeometryTraits;
+
// the default constructor
StaggeredSubControlVolumeFace() = default;
@@ -81,8 +65,8 @@ public:
template <class Intersection, class GeometryHelper>
StaggeredSubControlVolumeFace(const Intersection& is,
const typename Intersection::Geometry& isGeometry,
- IndexType scvfIndex,
- const std::vector<IndexType>& scvIndices,
+ GridIndexType scvfIndex,
+ const std::vector<GridIndexType>& scvIndices,
const GeometryHelper& geometryHelper
)
: ParentType(),
@@ -112,7 +96,7 @@ public:
//! Constructor for a ghost face outside of the domain. Only needed to retrieve the center and scvIndices
StaggeredSubControlVolumeFace(const GlobalPosition& dofPosition,
- const std::vector<IndexType>& scvIndices)
+ const std::vector<GridIndexType>& scvIndices)
{
isGhostFace_ = true;
center_ = dofPosition;
@@ -181,20 +165,20 @@ public:
}
//! index of the inside sub control volume for spatial param evaluation
- IndexType insideScvIdx() const
+ GridIndexType insideScvIdx() const
{
return scvIndices_[0];
}
//! index of the outside sub control volume for spatial param evaluation
// This results in undefined behaviour if boundary is true
- IndexType outsideScvIdx() const
+ GridIndexType outsideScvIdx() const
{
return scvIndices_[1];
}
//! The global index of this sub control volume face
- IndexType index() const
+ GridIndexType index() const
{
return scvfIndex_;
}
@@ -212,19 +196,19 @@ public:
}
//! The global index of the dof living on this face
- IndexType dofIndex() const
+ GridIndexType dofIndex() const
{
return dofIdx_;
}
//! The global index of the dof living on the opposing face
- IndexType dofIndexOpposingFace() const
+ GridIndexType dofIndexOpposingFace() const
{
return oppositeIdx_;
}
//! The local index of this sub control volume face
- IndexType localFaceIdx() const
+ GridIndexType localFaceIdx() const
{
return localFaceIdx_;
}
@@ -269,14 +253,13 @@ private:
Scalar area_;
GlobalPosition center_;
GlobalPosition unitOuterNormal_;
- IndexType scvfIndex_;
- std::vector<IndexType> scvIndices_;
+ GridIndexType scvfIndex_;
+ std::vector<GridIndexType> scvIndices_;
bool boundary_;
int dofIdx_;
int oppositeIdx_;
Scalar selfToOppositeDistance_;
- std::vector<StaggeredSubFace> subfaces_;
std::array<PairData<Scalar, GlobalPosition>, numPairs> pairData_;
int localFaceIdx_;
int dirIdx_;
diff --git a/dumux/discretization/staggered/fvelementgeometry.hh b/dumux/discretization/staggered/fvelementgeometry.hh
index 1806d66e596e7dbd4a06c773229daf0cebf70624..ef34bf41c2da24b92ad7bb0891fc67ad7db5afb5 100644
--- a/dumux/discretization/staggered/fvelementgeometry.hh
+++ b/dumux/discretization/staggered/fvelementgeometry.hh
@@ -28,7 +28,6 @@
#include <dune/common/iteratorrange.hh>
#include <dumux/discretization/scvandscvfiterators.hh>
-#include <dumux/implicit/staggered/properties.hh>
namespace Dumux
{
@@ -135,7 +134,7 @@ public:
void bindElement(const Element& element)
{
elementPtr_ = &element;
- scvIndices_ = std::vector<IndexType>({fvGridGeometry().problem_().elementMapper().index(*elementPtr_)});
+ scvIndices_ = std::vector<IndexType>({fvGridGeometry().elementMapper().index(*elementPtr_)});
}
//! The global finite volume geometry we are a restriction of
diff --git a/dumux/discretization/staggered/fvgridgeometry.hh b/dumux/discretization/staggered/fvgridgeometry.hh
index 8fd8b53b95d5c96c2d172ca38b4420143fa82da5..5dce791e7350f3791322887ed8071b0b15658762 100644
--- a/dumux/discretization/staggered/fvgridgeometry.hh
+++ b/dumux/discretization/staggered/fvgridgeometry.hh
@@ -26,7 +26,9 @@
#define DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_FVGEOMETRY_HH
#include <dumux/common/elementmap.hh>
-#include <dumux/implicit/staggered/properties.hh>
+#include <dumux/discretization/basefvgridgeometry.hh>
+#include <dumux/common/boundingboxtree.hh>
+#include <dumux/discretization/staggered/connectivitymap.hh>
namespace Dumux
{
@@ -43,9 +45,9 @@ class StaggeredFVGridGeometry
// specialization in case the FVElementGeometries are stored globally
template<class TypeTag>
-class StaggeredFVGridGeometry<TypeTag, true>
+class StaggeredFVGridGeometry<TypeTag, true> : public BaseFVGridGeometry<TypeTag>
{
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using ParentType = BaseFVGridGeometry<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using IndexType = typename GridView::IndexSet::IndexType;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
@@ -64,11 +66,12 @@ class StaggeredFVGridGeometry<TypeTag, true>
};
using GeometryHelper = typename GET_PROP_TYPE(TypeTag, StaggeredGeometryHelper);
+ using ConnectivityMap = StaggeredConnectivityMap<TypeTag>;
public:
//! Constructor
StaggeredFVGridGeometry(const GridView& gridView)
- : gridView_(gridView), elementMap_(gridView), intersectionMapper_(gridView) {}
+ : ParentType(gridView), elementMap_(gridView), intersectionMapper_(gridView) {}
//! The total number of sub control volumes
std::size_t numScv() const
@@ -94,6 +97,16 @@ public:
return intersectionMapper_.numIntersections();
}
+ //! the total number of dofs
+ std::size_t numDofs() const
+ { return numCellCenterDofs() + numFaceDofs(); }
+
+ std::size_t numCellCenterDofs() const
+ { return this->gridView().size(0); }
+
+ std::size_t numFaceDofs() const
+ { return this->gridView().size(1); }
+
// Get an element from a sub control volume contained in it
Element element(const SubControlVolume& scv) const
{ return elementMap_.element(scv.elementIndex()); }
@@ -102,15 +115,9 @@ public:
Element element(IndexType eIdx) const
{ return elementMap_.element(eIdx); }
- //! Return the gridView this global object lives on
- const GridView& gridView() const
- { return gridView_; }
-
//! update all fvElementGeometries (do this again after grid adaption)
- void update(const Problem& problem)
+ void update()
{
- problemPtr_ = &problem;
-
// clear containers (necessary after grid refinement)
scvs_.clear();
scvfs_.clear();
@@ -119,9 +126,9 @@ public:
intersectionMapper_.update();
// determine size of containers
- IndexType numScvs = gridView_.size(0);
+ IndexType numScvs = this->gridView().size(0);
IndexType numScvf = 0;
- for (const auto& element : elements(gridView_))
+ for (const auto& element : elements(this->gridView()))
numScvf += element.subEntities(1);
// reserve memory
@@ -134,9 +141,9 @@ public:
// Build the scvs and scv faces
IndexType scvfIdx = 0;
numBoundaryScvf_ = 0;
- for (const auto& element : elements(gridView_))
+ for (const auto& element : elements(this->gridView()))
{
- auto eIdx = problem.elementMapper().index(element);
+ auto eIdx = this->elementMapper().index(element);
// reserve memory for the localToGlobalScvfIdx map
auto numLocalFaces = intersectionMapper_.numFaces(element);
@@ -151,9 +158,9 @@ public:
std::vector<IndexType> scvfsIndexSet;
scvfsIndexSet.reserve(numLocalFaces);
- GeometryHelper geometryHelper(element, gridView_);
+ GeometryHelper geometryHelper(element, this->gridView());
- for (const auto& intersection : intersections(gridView_, element))
+ for (const auto& intersection : intersections(this->gridView(), element))
{
geometryHelper.updateLocalFace(intersectionMapper_, intersection);
const int localFaceIndex = geometryHelper.localFaceIndex();
@@ -161,7 +168,7 @@ public:
// inner sub control volume faces
if (intersection.neighbor())
{
- auto nIdx = problem.elementMapper().index(intersection.outside());
+ auto nIdx = this->elementMapper().index(intersection.outside());
scvfs_.emplace_back(intersection,
intersection.geometry(),
scvfIdx,
@@ -177,7 +184,7 @@ public:
scvfs_.emplace_back(intersection,
intersection.geometry(),
scvfIdx,
- std::vector<IndexType>({eIdx, gridView_.size(0) + numBoundaryScvf_++}),
+ std::vector<IndexType>({eIdx, this->gridView().size(0) + numBoundaryScvf_++}),
geometryHelper
);
localToGlobalScvfIndices_[eIdx][localFaceIndex] = scvfIdx;
@@ -188,15 +195,10 @@ public:
// Save the scvf indices belonging to this scv to build up fv element geometries fast
scvfIndicesOfScv_[eIdx] = scvfsIndexSet;
}
- }
- /*!
- * \brief Return a local restriction of this global object
- * The local object is only functional after calling its bind/bindElement method
- * This is a free function that will be found by means of ADL
- */
- friend inline FVElementGeometry localView(const StaggeredFVGridGeometry& global)
- { return FVElementGeometry(global); }
+ // build the connectivity map for an effecient assembly
+ connectivityMap_.update(*this);
+ }
//private:
@@ -228,16 +230,21 @@ public:
return scvf(localToGlobalScvfIndex(eIdx, localScvfIdx));
}
+ /*!
+ * \brief Returns the connectivity map of which dofs have derivatives with respect
+ * to a given dof.
+ */
+ const ConnectivityMap &connectivityMap() const
+ { return connectivityMap_; }
-private:
- const Problem& problem_() const
- { return *problemPtr_; }
- const Problem* problemPtr_;
+private:
- const GridView gridView_;
+ // mappers
+ ConnectivityMap connectivityMap_;
Dumux::ElementMap<GridView> elementMap_;
IntersectionMapper intersectionMapper_;
+
std::vector<SubControlVolume> scvs_;
std::vector<SubControlVolumeFace> scvfs_;
std::vector<std::vector<IndexType>> scvfIndicesOfScv_;
@@ -249,132 +256,7 @@ private:
template<class TypeTag>
class StaggeredFVGridGeometry<TypeTag, false>
{
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using IndexType = typename GridView::IndexSet::IndexType;
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using Element = typename GridView::template Codim<0>::Entity;
- //! The local fvGeometry needs access to the problem
- friend typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
-
-public:
- //! Constructor
- StaggeredFVGridGeometry(const GridView& gridView)
- : gridView_(gridView), elementMap_(gridView) {}
-
- //! The total number of sub control volumes
- std::size_t numScv() const
- {
- return numScvs_;
- }
-
- //! The total number of sub control volume faces
- std::size_t numScvf() const
- {
- return numScvf_;
- }
-
- //! The total number of boundary sub control volume faces
- std::size_t numBoundaryScvf() const
- {
- return numBoundaryScvf_;
- }
-
- // Get an element from a sub control volume contained in it
- Element element(const SubControlVolume& scv) const
- { return elementMap_.element(scv.elementIndex()); }
-
- // Get an element from a global element index
- Element element(IndexType eIdx) const
- { return elementMap_.element(eIdx); }
-
- //! Return the gridView this global object lives on
- const GridView& gridView() const
- { return gridView_; }
-
- //! update all fvElementGeometries (do this again after grid adaption)
- void update(const Problem& problem)
- {
- problemPtr_ = &problem;
- elementMap_.clear();
-
- // reserve memory or resize the containers
- numScvs_ = gridView_.size(0);
- numScvf_ = 0;
- numBoundaryScvf_ = 0;
- elementMap_.resize(numScvs_);
- scvfIndicesOfScv_.resize(numScvs_);
- neighborVolVarIndices_.resize(numScvs_);
-
- // Build the SCV and SCV face
- for (const auto& element : elements(gridView_))
- {
- auto eIdx = problem.elementMapper().index(element);
-
- // fill the element map with seeds
- elementMap_[eIdx] = element.seed();
-
- // the element-wise index sets for finite volume geometry
- auto numLocalFaces = element.subEntities(1);
- std::vector<IndexType> scvfsIndexSet;
- std::vector<IndexType> neighborVolVarIndexSet;
- scvfsIndexSet.reserve(numLocalFaces);
- neighborVolVarIndexSet.reserve(numLocalFaces);
- for (const auto& intersection : intersections(gridView_, element))
- {
- // inner sub control volume faces
- if (intersection.neighbor())
- {
- scvfsIndexSet.push_back(numScvf_++);
- neighborVolVarIndexSet.push_back(problem.elementMapper().index(intersection.outside()));
- }
- // boundary sub control volume faces
- else if (intersection.boundary())
- {
- scvfsIndexSet.push_back(numScvf_++);
- neighborVolVarIndexSet.push_back(numScvs_ + numBoundaryScvf_++);
- }
- }
-
- // store the sets of indices in the data container
- scvfIndicesOfScv_[eIdx] = scvfsIndexSet;
- neighborVolVarIndices_[eIdx] = neighborVolVarIndexSet;
- }
- }
-
- const std::vector<IndexType>& scvfIndicesOfScv(IndexType scvIdx) const
- { return scvfIndicesOfScv_[scvIdx]; }
-
- const std::vector<IndexType>& neighborVolVarIndices(IndexType scvIdx) const
- { return neighborVolVarIndices_[scvIdx]; }
-
- /*!
- * \brief Return a local restriction of this global object
- * The local object is only functional after calling its bind/bindElement method
- * This is a free function that will be found by means of ADL
- */
- friend inline FVElementGeometry localView(const StaggeredFVGridGeometry& global)
- { return FVElementGeometry(global); }
-
-private:
- const Problem& problem_() const
- { return *problemPtr_; }
-
- const Problem* problemPtr_;
-
- const GridView gridView_;
-
- // Information on the global number of geometries
- IndexType numScvs_;
- IndexType numScvf_;
- IndexType numBoundaryScvf_;
-
- // vectors that store the global data
- Dumux::ElementMap<GridView> elementMap_;
- std::vector<std::vector<IndexType>> scvfIndicesOfScv_;
- std::vector<std::vector<IndexType>> neighborVolVarIndices_;
+ // TODO: implement without caching
};
} // end namespace
diff --git a/dumux/discretization/staggered/globalfacevariables.hh b/dumux/discretization/staggered/globalfacevariables.hh
index 1e63de429179b8050d417206313404084c7870ed..f368f250da120fc90bad067e4be0eea2fba402e6 100644
--- a/dumux/discretization/staggered/globalfacevariables.hh
+++ b/dumux/discretization/staggered/globalfacevariables.hh
@@ -23,32 +23,54 @@
#ifndef DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_FACEVARIABLES_HH
#define DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_FACEVARIABLES_HH
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/basicproperties.hh>
+#include <dumux/discretization/staggered/facesolution.hh>
namespace Dumux
{
-template<class TypeTag>
+namespace Properties
+{
+ NEW_PROP_TAG(ElementFaceVariables);
+}
+
+template<class TypeTag, bool enableGlobalFaceVarsCache>
class StaggeredGlobalFaceVariables
+{};
+
+template<class TypeTag>
+class StaggeredGlobalFaceVariables<TypeTag, /*enableGlobalFaceVarsCache*/true>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FaceSolutionVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
+ using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using IndexType = typename GridView::IndexSet::IndexType;
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
public:
- void update(Problem& problem, const FaceSolutionVector& sol)
- {
- problemPtr_ = &problem;
+ StaggeredGlobalFaceVariables(const Problem& problem) : problemPtr_(&problem) {}
- faceVariables_.resize(problem.model().numFaceDofs());
- assert(faceVariables_.size() == sol.size());
+ void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol)
+ {
+ const auto& faceSol = sol[faceIdx];
+ faceVariables_.resize(fvGridGeometry.numScvf());
- for(int i = 0; i < problem.model().numFaceDofs(); ++i)
+ for(auto&& element : elements(fvGridGeometry.gridView()))
{
- faceVariables_[i].update(sol[i]);
+ auto fvGeometry = localView(fvGridGeometry);
+ fvGeometry.bindElement(element);
+
+ for(auto&& scvf : scvfs(fvGeometry))
+ {
+ faceVariables_[scvf.index()].update(faceSol, problem(), element, fvGeometry, scvf);
+ }
}
}
@@ -57,15 +79,65 @@ public:
FaceVariables& faceVars(const IndexType facetIdx)
{ return faceVariables_[facetIdx]; }
-private:
- const Problem& problem_() const
+
+
+ /*!
+ * \brief Return a local restriction of this global object
+ * The local object is only functional after calling its bind/bindElement method
+ * This is a free function that will be found by means of ADL
+ */
+ friend inline ElementFaceVariables localView(const StaggeredGlobalFaceVariables& global)
+ { return ElementFaceVariables(global); }
+
+ const Problem& problem() const
{ return *problemPtr_; }
+private:
+
const Problem* problemPtr_;
std::vector<FaceVariables> faceVariables_;
};
+template<class TypeTag>
+class StaggeredGlobalFaceVariables<TypeTag, /*enableGlobalFaceVarsCache*/false>
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
+ using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using IndexType = typename GridView::IndexSet::IndexType;
+
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+
+public:
+ StaggeredGlobalFaceVariables(const Problem& problem) : problemPtr_(&problem) {}
+
+ void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol)
+ { }
+
+ /*!
+ * \brief Return a local restriction of this global object
+ * The local object is only functional after calling its bind/bindElement method
+ * This is a free function that will be found by means of ADL
+ */
+ friend inline ElementFaceVariables localView(const StaggeredGlobalFaceVariables& global)
+ { return ElementFaceVariables(global); }
+
+ const Problem& problem() const
+ { return *problemPtr_; }
+
+
+private:
+
+ const Problem* problemPtr_;
+};
+
} // end namespace
diff --git a/dumux/discretization/staggered/globalfluxvariablescache.hh b/dumux/discretization/staggered/globalfluxvariablescache.hh
index 5e4dfd38cf687086c75fab3990c21e668ffdd51f..432b148255209f516fe418e4dc5eca446a5dbffb 100644
--- a/dumux/discretization/staggered/globalfluxvariablescache.hh
+++ b/dumux/discretization/staggered/globalfluxvariablescache.hh
@@ -23,7 +23,7 @@
#ifndef DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_FLUXVARSCACHE_HH
#define DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_FLUXVARSCACHE_HH
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/basicproperties.hh>
#include <dumux/discretization/staggered/elementfluxvariablescache.hh>
namespace Dumux
@@ -47,32 +47,38 @@ class StaggeredGlobalFluxVariablesCache<TypeTag, true>
friend StaggeredElementFluxVariablesCache<TypeTag, true>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
using IndexType = typename GridView::IndexSet::IndexType;
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
public:
+ StaggeredGlobalFluxVariablesCache(const Problem& problem) : problemPtr_(&problem) {}
+
// When global caching is enabled, precompute transmissibilities and stencils for all the scv faces
- void update(Problem& problem)
+ void update(const FVGridGeometry& fvGridGeometry,
+ const GridVolumeVariables& gridVolVars,
+ const SolutionVector& sol,
+ bool forceUpdate = false)
{
- problemPtr_ = &problem;
- const auto& fvGridGeometry = problem.model().fvGridGeometry();
- fluxVarsCache_.resize(fvGridGeometry.numScvf());
- for (const auto& element : elements(problem.gridView()))
- {
- // Prepare the geometries within the elements of the stencil
- auto fvGeometry = localView(fvGridGeometry);
- fvGeometry.bind(element);
-
- auto elemVolVars = localView(problem.model().curGlobalVolVars());
- elemVolVars.bind(element, fvGeometry, problem.model().curSol());
-
- for (auto&& scvf : scvfs(fvGeometry))
- {
- fluxVarsCache_[scvf.index()].update(problem, element, fvGeometry, elemVolVars, scvf);
- }
- }
+ // fluxVarsCache_.resize(fvGridGeometry.numScvf());
+ // for (const auto& element : elements(fvGridGeometry.gridView()))
+ // {
+ // // Prepare the geometries within the elements of the stencil
+ // auto fvGeometry = localView(fvGridGeometry);
+ // fvGeometry.bind(element);
+ //
+ // auto elemVolVars = localView(gridVolVars);
+ // elemVolVars.bind(element, fvGeometry, sol);
+ //
+ // for (auto&& scvf : scvfs(fvGeometry))
+ // {
+ // fluxVarsCache_[scvf.index()].update(problem, element, fvGeometry, elemVolVars, scvf);
+ // }
+ // }
}
/*!
@@ -83,6 +89,9 @@ public:
friend inline ElementFluxVariablesCache localView(const StaggeredGlobalFluxVariablesCache& global)
{ return ElementFluxVariablesCache(global); }
+ const Problem& problem() const
+ { return *problemPtr_; }
+
private:
// access operators in the case of caching
const FluxVariablesCache& operator [](IndexType scvfIdx) const
@@ -91,9 +100,6 @@ private:
FluxVariablesCache& operator [](IndexType scvfIdx)
{ return fluxVarsCache_[scvfIdx]; }
- const Problem& problem_() const
- { return *problemPtr_; }
-
const Problem* problemPtr_;
std::vector<FluxVariablesCache> fluxVarsCache_;
diff --git a/dumux/discretization/staggered/globalvolumevariables.hh b/dumux/discretization/staggered/globalvolumevariables.hh
index 04477eb7bd04e9b3da4cd60026d604e2f077634e..3514b8c35e38dbb0566edc8c1a6dc38fbf56358b 100644
--- a/dumux/discretization/staggered/globalvolumevariables.hh
+++ b/dumux/discretization/staggered/globalvolumevariables.hh
@@ -23,9 +23,6 @@
#ifndef DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_VOLUMEVARIABLES_HH
#define DUMUX_DISCRETIZATION_STAGGERED_GLOBAL_VOLUMEVARIABLES_HH
-#include <dumux/implicit/properties.hh>
-#include <dumux/discretization/staggered/elementvolumevariables.hh>
-
namespace Dumux
{
@@ -41,17 +38,10 @@ class StaggeredGlobalVolumeVariables
template<class TypeTag>
class StaggeredGlobalVolumeVariables<TypeTag, /*enableGlobalVolVarsCache*/true>
{
- // The local class needs to access and change volVars
- friend StaggeredElementVolumeVariables<TypeTag, true>;
- // The local jacobian needs to access and change volVars for derivative calculation
- friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
- // as does the primary variable switch
- friend class PrimaryVariableSwitch<TypeTag>;
- friend typename GET_PROP_TYPE(TypeTag, PrimaryVariableSwitch);
-
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
@@ -71,17 +61,17 @@ class StaggeredGlobalVolumeVariables<TypeTag, /*enableGlobalVolVarsCache*/true>
enum { numEqCellCenter = GET_PROP_VALUE(TypeTag, NumEqCellCenter) };
public:
- void update(Problem& problem, const SolutionVector& sol)
- {
- problemPtr_ = &problem;
+ StaggeredGlobalVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
- auto numScv = problem.model().fvGridGeometry().numScv();
- auto numBoundaryScvf = problem.model().fvGridGeometry().numBoundaryScvf();
+ void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol)
+ {
+ auto numScv = fvGridGeometry.numScv();
+ auto numBoundaryScvf = fvGridGeometry.numBoundaryScvf();
volumeVariables_.resize(numScv + numBoundaryScvf);
- for (const auto& element : elements(problem.gridView()))
+ for (const auto& element : elements(fvGridGeometry.gridView()))
{
- auto fvGeometry = localView(problem.model().fvGridGeometry());
+ auto fvGeometry = localView(fvGridGeometry);
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
@@ -89,7 +79,7 @@ public:
PrimaryVariables priVars(0.0);
priVars[cellCenterIdx] = sol[cellCenterIdx][scv.dofIndex()];
ElementSolutionVector elemSol{std::move(priVars)};
- volumeVariables_[scv.dofIndex()].update(elemSol, problem, element, scv);
+ volumeVariables_[scv.dofIndex()].update(elemSol, problem(), element, scv);
}
// handle the boundary volume variables
@@ -99,7 +89,7 @@ public:
if (!scvf.boundary())
continue;
- const auto bcTypes = problem.boundaryTypes(element, scvf);
+ const auto bcTypes = problem().boundaryTypes(element, scvf);
const auto insideScvIdx = scvf.insideScvIdx();
const auto& insideScv = fvGeometry.scv(insideScvIdx);
@@ -108,7 +98,7 @@ public:
for(int eqIdx = 0; eqIdx < numEqCellCenter; ++eqIdx)
{
if(bcTypes.isDirichlet(eqIdx) || bcTypes.isDirichletCell(eqIdx))
- boundaryPriVars[cellCenterIdx][eqIdx] = problem.dirichlet(element, scvf)[cellCenterIdx][eqIdx];
+ boundaryPriVars[cellCenterIdx][eqIdx] = problem().dirichlet(element, scvf)[cellCenterIdx][eqIdx];
else if(bcTypes.isNeumann(eqIdx) || bcTypes.isOutflow(eqIdx) || bcTypes.isSymmetry())
boundaryPriVars[cellCenterIdx][eqIdx] = sol[cellCenterIdx][scvf.insideScvIdx()][eqIdx];
//TODO: this assumes a zero-gradient for e.g. the pressure on the boundary
@@ -118,7 +108,7 @@ public:
DUNE_THROW(Dune::InvalidStateException, "Face at: " << scvf.center() << " has neither Dirichlet nor Neumann BC.");
}
ElementSolutionVector elemSol{std::move(boundaryPriVars)};
- volumeVariables_[scvf.outsideScvIdx()].update(elemSol, problem, element, insideScv);
+ volumeVariables_[scvf.outsideScvIdx()].update(elemSol, problem(), element, insideScv);
}
}
}
@@ -143,10 +133,11 @@ public:
VolumeVariables& volVars(const SubControlVolume scv)
{ return volumeVariables_[scv.dofIndex()]; }
-private:
- const Problem& problem_() const
+ const Problem& problem() const
{ return *problemPtr_; }
+private:
+
const Problem* problemPtr_;
std::vector<VolumeVariables> volumeVariables_;
@@ -157,15 +148,15 @@ private:
template<class TypeTag>
class StaggeredGlobalVolumeVariables<TypeTag, /*enableGlobalVolVarsCache*/false>
{
- // local class needs access to the problem
- friend StaggeredElementVolumeVariables<TypeTag, false>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
public:
- void update(Problem& problem, const SolutionVector& sol)
- { problemPtr_ = &problem; }
+ StaggeredGlobalVolumeVariables(const Problem& problem) : problemPtr_(&problem) {}
+
+ void update(const FVGridGeometry& fvGridGeometry, const SolutionVector& sol) {}
/*!
* \brief Return a local restriction of this global object
@@ -175,11 +166,12 @@ public:
friend inline ElementVolumeVariables localView(const StaggeredGlobalVolumeVariables& global)
{ return ElementVolumeVariables(global); }
-private:
- Problem& problem_() const
+ const Problem& problem() const
{ return *problemPtr_;}
- Problem* problemPtr_;
+private:
+
+ const Problem* problemPtr_;
};
} // end namespace
diff --git a/dumux/implicit/staggered/propertydefaults.hh b/dumux/discretization/staggered/properties.hh
similarity index 68%
rename from dumux/implicit/staggered/propertydefaults.hh
rename to dumux/discretization/staggered/properties.hh
index b1dc5044a9c3fc1800217f696484d76b2e3b794e..85dd6280ad1187f31ebe34e81129da9ba085a4df 100644
--- a/dumux/implicit/staggered/propertydefaults.hh
+++ b/dumux/discretization/staggered/properties.hh
@@ -18,69 +18,69 @@
*****************************************************************************/
/*!
* \ingroup Properties
- * \ingroup CCTpfaProperties
- * \ingroup StaggeredModel
* \file
*
- * \brief Default properties for cell centered models
+ * \brief Defines a type tag and some properties for models using the staggered scheme.
*/
-#ifndef DUMUX_STAGGERED_PROPERTY_DEFAULTS_HH
-#define DUMUX_STAGGERED_PROPERTY_DEFAULTS_HH
-#include <dumux/implicit/propertydefaults.hh>
-#include <dumux/discretization/staggered/fvgridgeometry.hh>
-#include <dumux/discretization/staggered/fvelementgeometry.hh>
-#include <dumux/implicit/staggered/properties.hh>
+#ifndef DUMUX_STAGGERDs_PROPERTIES_HH
+#define DUMUX_STAGGERDs_PROPERTIES_HH
+
+#include <dumux/common/properties.hh>
+
#include <dumux/discretization/methods.hh>
+#include <dumux/discretization/fvproperties.hh>
+#include <dumux/implicit/cellcentered/elementboundarytypes.hh>
+#include <dumux/implicit/staggered/localresidual.hh>
+#include <dumux/implicit/staggered/primaryvariables.hh>
+#include <dumux/implicit/staggered/gridvariables.hh>
+
+#include <dumux/discretization/cellcentered/subcontrolvolume.hh>
#include <dumux/discretization/staggered/globalfluxvariablescache.hh>
#include <dumux/discretization/staggered/elementfluxvariablescache.hh>
-
-#include <dumux/discretization/staggered/elementvolumevariables.hh>
#include <dumux/discretization/staggered/globalvolumevariables.hh>
+#include <dumux/discretization/staggered/elementvolumevariables.hh>
+#include <dumux/discretization/staggered/fvgridgeometry.hh>
+#include <dumux/discretization/staggered/fvelementgeometry.hh>
#include <dumux/discretization/staggered/globalfacevariables.hh>
+#include <dumux/discretization/staggered/facesolution.hh>
+#include <dumux/discretization/staggered/elementfacevariables.hh>
-#include <dune/common/fvector.hh>
-#include <dune/common/fmatrix.hh>
-#include <dune/common/indices.hh>
-#include <dune/istl/bcrsmatrix.hh>
+#include <dumux/common/intersectionmapper.hh>
#include <dune/istl/multitypeblockvector.hh>
#include <dune/istl/multitypeblockmatrix.hh>
-#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/linear/linearsolverproperties.hh>
-#include <dumux/io/staggeredvtkoutputmodule.hh>
-#include <dumux/common/intersectionmapper.hh>
-
-#include "assembler.hh"
-#include "localresidual.hh"
-#include "localjacobian.hh"
-#include "properties.hh"
-#include "newtoncontroller.hh"
-#include "newtonconvergencewriter.hh"
-#include "model.hh"
-#include "primaryvariables.hh"
-
-namespace Dumux {
+namespace Dumux
+{
// forward declarations
template<class TypeTag> class CCElementBoundaryTypes;
-namespace Properties {
+namespace Properties
+{
+
+NEW_PROP_TAG(CellCenterSolutionVector);
+NEW_PROP_TAG(FaceSolutionVector);
+NEW_PROP_TAG(StaggeredFaceSolution);
+NEW_PROP_TAG(ElementFaceVariables);
+NEW_PROP_TAG(EnableGlobalFaceVariablesCache);
+
+//! Type tag for the box scheme.
+NEW_TYPE_TAG(StaggeredModel, INHERITS_FROM(FiniteVolumeModel, NumericModel, LinearSolverTypeTag));
+
//! Set the corresponding discretization method property
SET_PROP(StaggeredModel, DiscretizationMethod)
{
static const DiscretizationMethods value = DiscretizationMethods::Staggered;
};
-
-SET_TYPE_PROP(StaggeredModel, BaseModel, StaggeredBaseModel<TypeTag>);
-
-
-//! Set the default for the global finite volume geometry
+//! Set the default for the FVElementGeometry vector
SET_TYPE_PROP(StaggeredModel, FVGridGeometry, StaggeredFVGridGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
-//! Set the default for the local finite volume geometry
+//! Set the default for the FVElementGeometry vector
SET_TYPE_PROP(StaggeredModel, FVElementGeometry, StaggeredFVElementGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
//! The sub control volume
@@ -88,59 +88,51 @@ SET_PROP(StaggeredModel, SubControlVolume)
{
private:
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
- using ScvGeometry = typename Grid::template Codim<0>::Geometry;
- using IndexType = typename Grid::LeafGridView::IndexSet::IndexType;
+ struct ScvGeometryTraits
+ {
+ using Geometry = typename Grid::template Codim<0>::Geometry;
+ using GridIndexType = typename Grid::LeafGridView::IndexSet::IndexType;
+ using LocalIndexType = unsigned int;
+ using Scalar = typename Grid::ctype;
+ using GlobalPosition = Dune::FieldVector<Scalar, Grid::dimensionworld>;
+ };
public:
- typedef Dumux::CCSubControlVolume<ScvGeometry, IndexType> type;
+ using type = CCSubControlVolume<ScvGeometryTraits>;
};
-SET_TYPE_PROP(StaggeredModel, GlobalFaceVars, Dumux::StaggeredGlobalFaceVariables<TypeTag>);
+SET_TYPE_PROP(StaggeredModel, GlobalFaceVars, Dumux::StaggeredGlobalFaceVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFaceVariablesCache)>);
//! Set the default for the ElementBoundaryTypes
SET_TYPE_PROP(StaggeredModel, ElementBoundaryTypes, Dumux::CCElementBoundaryTypes<TypeTag>);
-//! Mapper for the degrees of freedoms.
-SET_TYPE_PROP(StaggeredModel, DofMapper, typename GET_PROP_TYPE(TypeTag, ElementMapper));
+//! The global volume variables vector class
+SET_TYPE_PROP(StaggeredModel, GlobalVolumeVariables, StaggeredGlobalVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
-//! The global current volume variables vector class
-SET_TYPE_PROP(StaggeredModel, GlobalVolumeVariables, Dumux::StaggeredGlobalVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
+//! The element volume variables vector class
+SET_TYPE_PROP(StaggeredModel, ElementVolumeVariables, StaggeredElementVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
//! The global flux variables cache vector class
-SET_TYPE_PROP(StaggeredModel, GlobalFluxVariablesCache, Dumux::StaggeredGlobalFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
-
-//! The local jacobian operator
-SET_TYPE_PROP(StaggeredModel, LocalJacobian, Dumux::StaggeredLocalJacobian<TypeTag>);
-
-//! Assembler for the global jacobian matrix
-SET_TYPE_PROP(StaggeredModel, JacobianAssembler, Dumux::StaggeredAssembler<TypeTag>);
+SET_TYPE_PROP(StaggeredModel, GlobalFluxVariablesCache, StaggeredGlobalFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
//! The local flux variables cache vector class
-SET_TYPE_PROP(StaggeredModel, ElementFluxVariablesCache, Dumux::StaggeredElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
-
-//! The global previous volume variables vector class
-SET_TYPE_PROP(StaggeredModel, ElementVolumeVariables, Dumux::StaggeredElementVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
+SET_TYPE_PROP(StaggeredModel, ElementFluxVariablesCache, StaggeredElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
//! Set the BaseLocalResidual to StaggeredLocalResidual
-SET_TYPE_PROP(StaggeredModel, BaseLocalResidual, Dumux::StaggeredLocalResidual<TypeTag>);
+SET_TYPE_PROP(StaggeredModel, BaseLocalResidual, StaggeredLocalResidual<TypeTag>);
-//! Set the BaseLocalResidual to StaggeredLocalResidual
SET_TYPE_PROP(StaggeredModel, IntersectionMapper, Dumux::ConformingGridIntersectionMapper<TypeTag>);
-//! indicate that this is no box discretization
-SET_BOOL_PROP(StaggeredModel, ImplicitIsBox, false);
+SET_TYPE_PROP(StaggeredModel, StaggeredFaceSolution, StaggeredFaceSolution<TypeTag>);
-SET_TYPE_PROP(StaggeredModel, NewtonController, StaggeredNewtonController<TypeTag>);
+SET_TYPE_PROP(StaggeredModel, ElementFaceVariables, StaggeredElementFaceVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFaceVariablesCache)>);
-SET_INT_PROP(StaggeredModel, NumEqCellCenter, 1);
-SET_INT_PROP(StaggeredModel, NumEqFace, 1);
+SET_BOOL_PROP(StaggeredModel, EnableGlobalFaceVariablesCache, true);
-SET_PROP(StaggeredModel, NumEq)
+//! Definition of the indices for cell center and face dofs in the global solution vector
+SET_PROP(StaggeredModel, DofTypeIndices)
{
-private:
- static constexpr auto numEqCellCenter = GET_PROP_VALUE(TypeTag, NumEqCellCenter);
- static constexpr auto numEqFace = GET_PROP_VALUE(TypeTag, NumEqFace);
-public:
- static constexpr auto value = numEqCellCenter + numEqFace;
+ using CellCenterIdx = Dune::index_constant<0>;
+ using FaceIdx = Dune::index_constant<1>;
};
//! A vector of primary variables
@@ -208,19 +200,23 @@ public:
using type = typename Dune::MultiTypeBlockMatrix<RowCellCenter, RowFace>;
};
-//! Definition of the indices for cell center and face dofs in the global solution vector
-SET_PROP(StaggeredModel, DofTypeIndices)
+SET_PROP(StaggeredModel, NumEq)
{
- using CellCenterIdx = Dune::index_constant<0>;
- using FaceIdx = Dune::index_constant<1>;
+private:
+ static constexpr auto numEqCellCenter = GET_PROP_VALUE(TypeTag, NumEqCellCenter);
+ static constexpr auto numEqFace = GET_PROP_VALUE(TypeTag, NumEqFace);
+public:
+ static constexpr auto value = numEqCellCenter + numEqFace;
};
-//! set default solver
-// SET_TYPE_PROP(StaggeredModel, LinearSolver, Dumux::GSBiCGSTABBackend<TypeTag>);
-SET_TYPE_PROP(StaggeredModel, LinearSolver, Dumux::UMFPackBackend<TypeTag>);
+SET_PROP(StaggeredModel, LinearSolverBlockSize)
+{
+ // LinearSolverAcceptsMultiTypeMatrix<T>::value
+ // TODO: make somehow dependend? or only relevant for direct solvers?
+public:
+ static constexpr auto value = 1;
+};
-//! set the block level to 2, suitable for e.g. the Dune::MultiTypeBlockMatrix
-SET_INT_PROP(StaggeredModel, LinearSolverPreconditionerBlockLevel, 2);
//! Boundary types at a single degree of freedom
SET_PROP(StaggeredModel, BoundaryTypes)
@@ -243,17 +239,7 @@ public:
using type = StaggeredPrimaryVariables<TypeTag, CellCenterPrimaryVariables, FacePrimaryVariables>;
};
-//! use the plain newton convergence writer by default
-SET_TYPE_PROP(StaggeredModel, NewtonConvergenceWriter, StaggeredNewtonConvergenceWriter<TypeTag>);
-
-//! Write separate vtp files for face variables by default
-SET_BOOL_PROP(StaggeredModel, VtkWriteFaceData, true);
-
-//! For compatibility
-SET_BOOL_PROP(StaggeredModel, EnableInteriorBoundaries, false);
-
-//! Set staggered vtk output module
-SET_TYPE_PROP(StaggeredModel, VtkOutputModule, StaggeredVtkOutputModule<TypeTag>);
+SET_TYPE_PROP(StaggeredModel, GridVariables, StaggeredGridVariables<TypeTag>);
//! Set one or different base epsilons for the calculations of the localJacobian's derivatives
SET_PROP(StaggeredModel, BaseEpsilon)
@@ -273,8 +259,9 @@ public:
}
};
-} // namespace Properties
+
+} // namespace Properties
} // namespace Dumux
#endif
diff --git a/dumux/discretization/stationaryvelocityfield.hh b/dumux/discretization/stationaryvelocityfield.hh
index 4b65581dba989325724710a8da36fda2268e5d57..a38a4a4cef142626fa53bb40afa55a432a7e69d9 100644
--- a/dumux/discretization/stationaryvelocityfield.hh
+++ b/dumux/discretization/stationaryvelocityfield.hh
@@ -49,10 +49,9 @@ public:
// state the discretization method this implementation belongs to
static const DiscretizationMethods myDiscretizationMethod = DiscretizationMethods::None;
- //! state the type for the corresponding cache and its filler
+ //! state the type for the corresponding cache
//! We don't cache anything for this law
- using Cache = FluxVariablesCaching::EmptyAdvectionCache;
- using CacheFiller = FluxVariablesCaching::EmptyCacheFiller<TypeTag>;
+ using Cache = FluxVariablesCaching::EmptyAdvectionCache<TypeTag>;
static Scalar flux(const Problem& problem,
const Element& element,
@@ -62,11 +61,8 @@ public:
int phaseIdx,
const ElementFluxVarsCache& elemFluxVarsCache)
{
- //! Obtain the velocity field from the user, specified in the spatial params
- return problem.spatialParams().velocity(element, scvf)
- * scvf.unitOuterNormal()
- * scvf.area()
- * elemVolVars[fvGeometry.scv(scvf.insideScvIdx())].extrusionFactor();
+ //! Obtain the volume flux from the user, specified in the spatial params in m^3/s
+ return problem.spatialParams().volumeFlux(element, fvGeometry, elemVolVars, scvf);
}
};
diff --git a/dumux/discretization/subcontrolvolumebase.hh b/dumux/discretization/subcontrolvolumebase.hh
index be94f6fbed40193f3734d81d11a3d794270c80fd..810fcee75948743594a6274100251b74fa2292a7 100644
--- a/dumux/discretization/subcontrolvolumebase.hh
+++ b/dumux/discretization/subcontrolvolumebase.hh
@@ -23,8 +23,6 @@
#ifndef DUMUX_SUBCONTROLVOLUME_HH
#define DUMUX_SUBCONTROLVOLUME_HH
-#include <dune/common/fvector.hh>
-
namespace Dumux
{
/*!
@@ -32,18 +30,18 @@ namespace Dumux
* \brief Base class for a sub control volume, i.e a part of the control
* volume we are making the balance for. Defines the general interface.
*/
-template<class Imp, class G, typename I>
+template<class Imp, class ScvGeometryTraits>
class SubControlVolumeBase
{
using Implementation = Imp;
- using IndexType = I;
- using Geometry = typename std::decay<G>::type;
-
- using Scalar = typename Geometry::ctype;
- enum { dimworld = Geometry::coorddimension };
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
+ using GridIndexType = typename ScvGeometryTraits::GridIndexType;
+ using LocalIndexType = typename ScvGeometryTraits::LocalIndexType;
+ using Scalar = typename ScvGeometryTraits::Scalar;
+ using GlobalPosition = typename ScvGeometryTraits::GlobalPosition;
public:
+ //! state the traits public and thus export all types
+ using Traits = ScvGeometryTraits;
//! The center of the sub control volume
GlobalPosition center() const
@@ -58,13 +56,13 @@ public:
}
//! The index of the dof this scv is embedded in (ccfv)
- IndexType dofIndex() const
+ GridIndexType dofIndex() const
{
return asImp_().dofIndex();
}
//! The index of the dof this scv is embedded in (box)
- IndexType indexInElement() const
+ LocalIndexType indexInElement() const
{
return asImp_().indexInElement();
}
@@ -76,7 +74,7 @@ public:
}
//! The global index of the element this scv is embedded in
- IndexType elementIndex() const
+ GridIndexType elementIndex() const
{
return asImp_().elementIndex();
}
diff --git a/dumux/discretization/subcontrolvolumefacebase.hh b/dumux/discretization/subcontrolvolumefacebase.hh
index c3ae309511dbc4653ddec4b4a263eebddbaa0d53..20bea52cbd63565764e1b0afad7901cbf5dd3332 100644
--- a/dumux/discretization/subcontrolvolumefacebase.hh
+++ b/dumux/discretization/subcontrolvolumefacebase.hh
@@ -34,20 +34,18 @@ namespace Dumux
* \brief Base class for a sub control volume face, i.e a part of the boundary
* of a sub control volume we computing a flux on.
*/
-template<class Imp, class G, typename I>
+template<class Imp, class ScvfGeometryTraits>
class SubControlVolumeFaceBase
{
using Implementation = Imp;
- using Geometry = G;
- using IndexType = I;
-
- using Scalar = typename G::ctype;
- static const int dim = G::mydimension;
- static const int dimworld = G::coorddimension;
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimworld>;
+ using GridIndexType = typename ScvfGeometryTraits::GridIndexType;
+ using Scalar = typename ScvfGeometryTraits::Scalar;
+ using GlobalPosition = typename ScvfGeometryTraits::GlobalPosition;
public:
+ //! state the traits public and thus export all types
+ using Traits = ScvfGeometryTraits;
+
//! The center of the sub control volume face
GlobalPosition center() const
{
@@ -79,7 +77,7 @@ public:
}
//! index of the inside sub control volume for spatial param evaluation
- IndexType insideScvIdx() const
+ GridIndexType insideScvIdx() const
{
return asImp_().insideScvIdx();
}
@@ -87,13 +85,13 @@ public:
//! index of the outside sub control volume for spatial param evaluation
//! This results in undefined behaviour if boundary is true
//! In case of multiple outside scv indices (network grids) an index can be supplied
- IndexType outsideScvIdx(int i = 0) const
+ GridIndexType outsideScvIdx(int i = 0) const
{
return asImp_().outsideScvIdx(i);
}
//! The global index of this sub control volume face
- IndexType index() const
+ GridIndexType index() const
{
return asImp_().index();
}
diff --git a/dumux/discretization/upwindscheme.hh b/dumux/discretization/upwindscheme.hh
index c00acef074983daafa6f6bcb61639e31e3b5e03e..df388b2e16b81de87a54b4d158ad536d1dc5ae63 100644
--- a/dumux/discretization/upwindscheme.hh
+++ b/dumux/discretization/upwindscheme.hh
@@ -23,22 +23,11 @@
#ifndef DUMUX_DISCRETIZATION_UPWINDSCHEME_HH
#define DUMUX_DISCRETIZATION_UPWINDSCHEME_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
-#include <dumux/discretization/cellcentered/mpfa/facetypes.hh>
namespace Dumux
{
-namespace Properties
-{
-// forward declaration
-NEW_PROP_TAG(ImplicitUpwindWeight);
-NEW_PROP_TAG(EnableInteriorBoundaries);
-NEW_PROP_TAG(MpfaFacetCoupling);
-NEW_PROP_TAG(UseTpfaBoundary);
-}
-
//! Forward declaration of the upwind scheme implementation
template<class TypeTag, DiscretizationMethods Method>
class UpwindSchemeImplementation;
@@ -60,7 +49,7 @@ public:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- static const Scalar upwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
+ static const Scalar upwindWeight = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Implicit.UpwindWeight");
const auto& insideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().insideScvIdx()];
const auto& outsideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().outsideScvIdx()];
@@ -95,7 +84,8 @@ public:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- static const Scalar upwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
+ static const std::string modelParamGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ static const Scalar upwindWeight = getParamFromGroup<Scalar>(modelParamGroup, "Implicit.UpwindWeight");
// the volume variables of the inside sub-control volume
const auto& insideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().insideScvIdx()];
@@ -173,7 +163,7 @@ public:
// retrieve the upwind weight for the mass conservation equations. Use the value
// specified via the property system as default, and overwrite
// it by the run-time parameter from the Dune::ParameterTree
- static const Scalar upwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
+ static const Scalar upwindWeight = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Implicit.UpwindWeight");
const auto& insideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().insideScvIdx()];
const auto& outsideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().outsideScvIdx()];
@@ -189,203 +179,7 @@ public:
//! Specialization for cell-centered MPFA schemes
template<class TypeTag>
class UpwindSchemeImplementation<TypeTag, DiscretizationMethods::CCMpfa>
-{
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using AdvectionType = typename GET_PROP_TYPE(TypeTag, AdvectionType);
-
- static constexpr int dim = GridView::dimension;
- static constexpr int dimWorld = GridView::dimensionworld;
-
- static constexpr bool useTpfaBoundary = GET_PROP_VALUE(TypeTag, UseTpfaBoundary);
- static constexpr bool facetCoupling = GET_PROP_VALUE(TypeTag, MpfaFacetCoupling);
- static constexpr bool enableInteriorBoundaries = GET_PROP_VALUE(TypeTag, EnableInteriorBoundaries);
-
-public:
-
- // For surface and network grids (dim < dimWorld) we have to do a special upwind scheme
- template<class FluxVariables, class UpwindTermFunction, int d = dim, int dw = dimWorld>
- static typename std::enable_if<(d < dw), Scalar>::type
- apply(const FluxVariables& fluxVars,
- const UpwindTermFunction& upwindTerm,
- Scalar flux, int phaseIdx)
- {
- // retrieve the upwind weight for the mass conservation equations. Use the value
- // specified via the property system as default, and overwrite
- // it by the run-time parameter from the Dune::ParameterTree
- static const Scalar upwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
-
- // check if we have to handle a branching point
- const auto isInteriorBoundary = enableInteriorBoundaries ?
- fluxVars.elemFluxVarsCache()[fluxVars.scvFace()].isInteriorBoundary() :
- false;
-
- // on branching points (which are not interior boundaries) we use a more complicated upwind scheme
- if (fluxVars.scvFace().numOutsideScvs() > 1 && !isInteriorBoundary)
- {
- // the volume variables of the inside sub-control volume
- const auto& insideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().insideScvIdx()];
-
- // we compute a flux-weighted average of all inflowing branches
- Scalar branchingPointUpwindTerm = 0.0;
- Scalar sumUpwindFluxes = 0.0;
-
- // if the inside flux is positive (outflow) do fully upwind and return flux
- if (!std::signbit(flux))
- return upwindTerm(insideVolVars)*flux;
- else
- sumUpwindFluxes += flux;
-
- for (unsigned int i = 0; i < fluxVars.scvFace().numOutsideScvs(); ++i)
- {
- // compute the outside flux
- const auto outsideScvIdx = fluxVars.scvFace().outsideScvIdx(i);
- const auto outsideElement = fluxVars.fvGeometry().fvGridGeometry().element(outsideScvIdx);
- const auto& flippedScvf = fluxVars.fvGeometry().flipScvf(fluxVars.scvFace().index(), i);
-
- const auto outsideFlux = AdvectionType::flux(fluxVars.problem(),
- outsideElement,
- fluxVars.fvGeometry(),
- fluxVars.elemVolVars(),
- flippedScvf,
- phaseIdx,
- fluxVars.elemFluxVarsCache());
-
- if (!std::signbit(outsideFlux))
- branchingPointUpwindTerm += upwindTerm(fluxVars.elemVolVars()[outsideScvIdx])*outsideFlux;
- else
- sumUpwindFluxes += outsideFlux;
- }
-
- // the flux might be zero
- if (sumUpwindFluxes != 0.0)
- branchingPointUpwindTerm /= -sumUpwindFluxes;
- else
- branchingPointUpwindTerm = 0.0;
-
- // upwind scheme (always do fully upwind at branching points)
- // a weighting here would lead to an error since the derivation is based on a fully upwind scheme
- // TODO How to implement a weight of e.g. 0.5
- if (std::signbit(flux))
- return flux*branchingPointUpwindTerm;
- else
- return flux*upwindTerm(insideVolVars);
- }
- // non-branching points and domain boundaries
- else if (!isInteriorBoundary)
- {
- const auto& insideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().insideScvIdx()];
- const auto& outsideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().outsideScvIdx()];
- if (std::signbit(flux))
- return flux*(upwindWeight*upwindTerm(outsideVolVars)
- + (1.0 - upwindWeight)*upwindTerm(insideVolVars));
- else
- return flux*(upwindWeight*upwindTerm(insideVolVars)
- + (1.0 - upwindWeight)*upwindTerm(outsideVolVars));
- }
- // interior boundaries
- else
- {
- const auto& scvfFluxVarsCache = fluxVars.elemFluxVarsCache()[fluxVars.scvFace()];
-
- // on interior Dirichlet Boundaries or for active facetCoupling we use the facet vol vars
- if (facetCoupling || scvfFluxVarsCache.interiorBoundaryDataSelf().faceType() == MpfaFaceTypes::interiorDirichlet)
- {
- const auto& insideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().insideScvIdx()];
- const auto& outsideVolVars = scvfFluxVarsCache.interiorBoundaryDataSelf().facetVolVars(fluxVars.fvGeometry());
- if (std::signbit(flux))
- return flux*(upwindWeight*upwindTerm(outsideVolVars)
- + (1.0 - upwindWeight)*upwindTerm(insideVolVars));
- else
- return flux*(upwindWeight*upwindTerm(insideVolVars)
- + (1.0 - upwindWeight)*upwindTerm(outsideVolVars));
- }
-
- // This is an interior neumann boundary. Thus, the flux at hand carries the user specified
- // boundary conditions and we do not have to do any upwinding here.
- // Note:
- // Mpfa on the boundary can essentially only be used for flux terms of the form F = -DgradU,
- // without an appearing upwind term. Thus, only for rather mathematical than realistic problems.
- // Assuming that -DgradU has been specified by the user, we simply return the precalculated flux,
- // as it has the boundary fluxes incorporated. Note that for Neumann boundaries above we did do
- // the upwinding, thus, when using Mpfa on Neumann boundaries an upwind term of 1.0 has to be set
- // for it to work. We usually achieve this by using the Unit fluid Component. Here, we can't apply
- // the upwinding though because the outside vol vars are not defined.
- // TODO: Implement Neumann BCs using additional Dofs for !useTpfaBoundary property
- return flux;
- }
- }
-
- // For grids with dim == dimWorld we use a simple upwinding scheme
- template<class FluxVariables, class UpwindTermFunction, int d = dim, int dw = dimWorld>
- static typename std::enable_if<(d == dw), Scalar>::type
- apply(const FluxVariables& fluxVars,
- const UpwindTermFunction& upwindTerm,
- Scalar flux, int phaseIdx)
- {
- // retrieve the upwind weight for the mass conservation equations. Use the value
- // specified via the property system as default, and overwrite
- // it by the run-time parameter from the Dune::ParameterTree
- static const Scalar upwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
-
- if (!enableInteriorBoundaries)
- {
- const auto& insideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().insideScvIdx()];
- const auto& outsideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().outsideScvIdx()];
- if (std::signbit(flux))
- return flux*(upwindWeight*upwindTerm(outsideVolVars)
- + (1.0 - upwindWeight)*upwindTerm(insideVolVars));
- else
- return flux*(upwindWeight*upwindTerm(insideVolVars)
- + (1.0 - upwindWeight)*upwindTerm(outsideVolVars));
- }
- else
- {
- const auto& scvfFluxVarsCache = fluxVars.elemFluxVarsCache()[fluxVars.scvFace()];
-
- if (!scvfFluxVarsCache.isInteriorBoundary())
- {
- const auto& insideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().insideScvIdx()];
- const auto& outsideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().outsideScvIdx()];
- if (std::signbit(flux))
- return flux*(upwindWeight*upwindTerm(outsideVolVars)
- + (1.0 - upwindWeight)*upwindTerm(insideVolVars));
- else
- return flux*(upwindWeight*upwindTerm(insideVolVars)
- + (1.0 - upwindWeight)*upwindTerm(outsideVolVars));
- }
- // on interior boundaries, the outside volume variables might be facet volume variables
- else
- {
- // on interior Dirichlet Boundaries or for active facetCoupling we use the facet vol vars
- if (facetCoupling || scvfFluxVarsCache.interiorBoundaryDataSelf().faceType() == MpfaFaceTypes::interiorDirichlet)
- {
- const auto& insideVolVars = fluxVars.elemVolVars()[fluxVars.scvFace().insideScvIdx()];
- const auto& outsideVolVars = scvfFluxVarsCache.interiorBoundaryDataSelf().facetVolVars(fluxVars.fvGeometry());
- if (std::signbit(flux))
- return flux*(upwindWeight*upwindTerm(outsideVolVars)
- + (1.0 - upwindWeight)*upwindTerm(insideVolVars));
- else
- return flux*(upwindWeight*upwindTerm(insideVolVars)
- + (1.0 - upwindWeight)*upwindTerm(outsideVolVars));
- }
-
- // This is an interior neumann boundary. Thus, the flux at hand carries the user specified
- // boundary conditions and we do not have to do any upwinding here.
- // Note:
- // Mpfa on the boundary can essentially only be used for flux terms of the form F = -DgradU,
- // without an appearing upwind term. Thus, only for rather mathematical than realistic problems.
- // Assuming that -DgradU has been specified by the user, we simply return the precalculated flux,
- // as it has the boundary fluxes incorporated. Note that for Neumann boundaries above we did do
- // the upwinding, thus, when using Mpfa on Neumann boundaries an upwind term of 1.0 has to be set
- // for it to work. We usually achieve this by using the Unit fluid Component. Here, we can't apply
- // the upwinding though because the outside vol vars are not defined.
- // TODO: Implement Neumann BCs using additional Dofs for !useTpfaBoundary property
- return flux;
- }
- }
- }
-};
+: public UpwindSchemeImplementation<TypeTag, DiscretizationMethods::CCTpfa> {};
/*!
* \ingroup Discretization
diff --git a/dumux/discretization/volumevariables.hh b/dumux/discretization/volumevariables.hh
index 146c223094322c64fa56c5b13b45fdac6481f66a..e969ebc6b9653c2fb361a9e8ae4ab7fc0979d2e3 100644
--- a/dumux/discretization/volumevariables.hh
+++ b/dumux/discretization/volumevariables.hh
@@ -24,7 +24,6 @@
#ifndef DUMUX_DISCRETIZATION_VOLUME_VARIABLES_HH
#define DUMUX_DISCRETIZATION_VOLUME_VARIABLES_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/common/valgrind.hh>
namespace Dumux
diff --git a/dumux/freeflow/properties.hh b/dumux/freeflow/properties.hh
new file mode 100644
index 0000000000000000000000000000000000000000..3a3860c69aaf897eb03950ff291c8428f8e5dd98
--- /dev/null
+++ b/dumux/freeflow/properties.hh
@@ -0,0 +1,98 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \ingroup Properties
+ * \file
+ *
+ * \brief Defines a type tag and some properties for free flow models.
+ */
+
+#ifndef DUMUX_FREE_FLOW_PROPERTIES_HH
+#define DUMUX_FREE_FLOW_PROPERTIES_HH
+
+#include <dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh>
+#include <dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh>
+#include <dumux/discretization/staggered/freeflow/facevariables.hh>
+#include <dumux/implicit/staggered/primaryvariables.hh>
+
+#include "./staggered/boundarytypes.hh"
+
+namespace Dumux
+{
+namespace Properties
+{
+//! Type tag for models involving flow in porous media
+NEW_TYPE_TAG(FreeFlow);
+
+SET_INT_PROP(FreeFlow, NumEqFace, 1); //!< set the number of equations to 1
+
+//! The sub-controlvolume face
+SET_PROP(FreeFlow, SubControlVolumeFace)
+{
+private:
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
+ static constexpr int dim = Grid::dimension;
+ static constexpr int dimWorld = Grid::dimensionworld;
+
+ struct ScvfGeometryTraits
+ {
+ using GridIndexType = typename Grid::LeafGridView::IndexSet::IndexType;
+ using LocalIndexType = unsigned int;
+ using Scalar = typename Grid::ctype;
+ using Geometry = typename Grid::template Codim<1>::Geometry;
+ using GlobalPosition = Dune::FieldVector<Scalar, dim>;
+ };
+
+public:
+ using type = Dumux::StaggeredSubControlVolumeFace<ScvfGeometryTraits>;
+};
+
+//! The geometry helper required for the stencils, etc.
+SET_PROP(FreeFlow, StaggeredGeometryHelper)
+{
+private:
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+public:
+ using type = StaggeredGeometryHelper<GridView>;
+};
+
+//! The variables living on the faces
+SET_TYPE_PROP(FreeFlow, FaceVariables, StaggeredFaceVariables<TypeTag>);
+
+//! A container class used to specify values for boundary conditions
+SET_PROP(FreeFlow, BoundaryValues)
+{
+private:
+ using CellCenterBoundaryValues = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using FaceBoundaryValues = Dune::FieldVector<typename GET_PROP_TYPE(TypeTag, Scalar),
+ GridView::dimension>;
+public:
+ using type = StaggeredPrimaryVariables<TypeTag, CellCenterBoundaryValues, FaceBoundaryValues>;
+};
+
+//! Boundary types at a single degree of freedom
+SET_TYPE_PROP(FreeFlow,
+ BoundaryTypes,
+ StaggeredFreeFlowBoundaryTypes<GET_PROP_VALUE(TypeTag, NumEq)>);
+
+} // namespace Properties
+} // namespace Dumux
+
+ #endif
diff --git a/dumux/freeflow/staggered/fluxvariables.hh b/dumux/freeflow/staggered/fluxvariables.hh
index 0d941b9df6fbdebd7bcee224c9b121bca47ed2ac..a85555cdc4279fbe4201b78ae96dbff8f178247b 100644
--- a/dumux/freeflow/staggered/fluxvariables.hh
+++ b/dumux/freeflow/staggered/fluxvariables.hh
@@ -23,7 +23,7 @@
#ifndef DUMUX_FREELOW_IMPLICIT_FLUXVARIABLES_HH
#define DUMUX_FREELOW_IMPLICIT_FLUXVARIABLES_HH
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/basicproperties.hh>
#include <dumux/discretization/fluxvariablesbase.hh>
namespace Dumux
@@ -66,7 +66,6 @@ class FreeFlowFluxVariablesImpl<TypeTag, false>
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
@@ -74,6 +73,9 @@ class FreeFlowFluxVariablesImpl<TypeTag, false>
using IndexType = typename GridView::IndexSet::IndexType;
using Stencil = std::vector<IndexType>;
+ using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
+ using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
+
static constexpr bool navierStokes = GET_PROP_VALUE(TypeTag, EnableInertiaTerms);
enum {
@@ -100,7 +102,7 @@ public:
const Element &element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars,
+ const ElementFaceVariables& elemFaceVars,
const SubControlVolumeFace &scvf,
const FluxVariablesCache& fluxVarsCache)
{
@@ -111,13 +113,13 @@ public:
const auto& outsideVolVars = scvf.boundary() ? insideVolVars : elemVolVars[scvf.outsideScvIdx()];
CellCenterPrimaryVariables flux(0.0);
- const Scalar velocity = globalFaceVars.faceVars(scvf.dofIndex()).velocity();
+ const Scalar velocity = elemFaceVars[scvf].velocitySelf();
const bool insideIsUpstream = sign(scvf.outerNormalScalar()) == sign(velocity) ? true : false;
const auto& upstreamVolVars = insideIsUpstream ? insideVolVars : outsideVolVars;
const auto& downstreamVolVars = insideIsUpstream ? insideVolVars : outsideVolVars;
- const Scalar upWindWeight = GET_PROP_VALUE(TypeTag, ImplicitUpwindWeight);
+ static const Scalar upWindWeight = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Implicit.UpwindWeight");
flux = (upWindWeight * upstreamVolVars.density() +
(1.0 - upWindWeight) * downstreamVolVars.density()) * velocity;
@@ -128,7 +130,6 @@ public:
}
void computeCellCenterToCellCenterStencil(Stencil& stencil,
- const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf)
@@ -141,7 +142,6 @@ public:
}
void computeCellCenterToFaceStencil(Stencil& stencil,
- const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf)
@@ -150,7 +150,6 @@ public:
}
void computeFaceToCellCenterStencil(Stencil& stencil,
- const Problem& problem,
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf)
{
@@ -167,7 +166,6 @@ public:
}
void computeFaceToFaceStencil(Stencil& stencil,
- const Problem& problem,
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf)
{
@@ -194,19 +192,19 @@ public:
* \param scvf The sub control volume face
* \param fvGeometry The finite-volume geometry
* \param elemVolVars All volume variables for the element
- * \param globalFaceVars The face variables
+ * \param elementFaceVars The face variables
*/
FacePrimaryVariables computeNormalMomentumFlux(const Problem& problem,
const Element& element,
const SubControlVolumeFace& scvf,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars)
+ const ElementFaceVariables& elementFaceVars)
{
const auto insideScvIdx = scvf.insideScvIdx();
const auto& insideVolVars = elemVolVars[insideScvIdx];
- const Scalar velocitySelf = globalFaceVars.faceVars(scvf.dofIndex()).velocity() ;
- const Scalar velocityOpposite = globalFaceVars.faceVars(scvf.dofIndexOpposingFace()).velocity();
+ const Scalar velocitySelf = elementFaceVars[scvf].velocitySelf() ;
+ const Scalar velocityOpposite = elementFaceVars[scvf].velocityOpposite();
FacePrimaryVariables normalFlux(0.0);
if(navierStokes)
@@ -246,31 +244,27 @@ public:
* \param scvf The sub control volume face
* \param fvGeometry The finite-volume geometry
* \param elemVolVars All volume variables for the element
- * \param globalFaceVars The face variables
+ * \param elementFaceVars The face variables
*/
FacePrimaryVariables computeTangetialMomentumFlux(const Problem& problem,
const Element& element,
const SubControlVolumeFace& scvf,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars)
+ const ElementFaceVariables& elementFaceVars)
{
FacePrimaryVariables tangentialFlux(0.0);
-
- // convenience function to get the velocity on a face
- auto velocity = [&globalFaceVars](const int dofIdx)
- {
- return globalFaceVars.faceVars(dofIdx).velocity();
- };
+ auto& faceVars = elementFaceVars[scvf];
+ const int numSubFaces = scvf.pairData().size();
// account for all sub-faces
- for(const auto& subFaceData : scvf.pairData())
+ for(int localSubFaceIdx = 0; localSubFaceIdx < numSubFaces; ++localSubFaceIdx)
{
const auto eIdx = scvf.insideScvIdx();
- const auto& normalFace = fvGeometry.scvf(eIdx, subFaceData.localNormalFaceIdx);
+ const auto& normalFace = fvGeometry.scvf(eIdx, scvf.pairData()[localSubFaceIdx].localNormalFaceIdx);
// Check if we have a symmetry boundary condition. If yes, the tangental part of the momentum flux can be neglected.
- if(subFaceData.outerParallelFaceDofIdx < 0)
+ if(scvf.pairData()[localSubFaceIdx].outerParallelFaceDofIdx < 0)
{
// lambda to conveniently create a ghost face which is outside the domain, parallel to the scvf of interest
auto makeGhostFace = [eIdx] (const GlobalPosition& pos)
@@ -279,58 +273,41 @@ public:
};
// use the ghost face to check if there is a symmetry boundary condition and skip any further steps if yes
- const auto bcTypes = problem.boundaryTypes(element, makeGhostFace(subFaceData.virtualOuterParallelFaceDofPos));
+ const auto bcTypes = problem.boundaryTypes(element, makeGhostFace(scvf.pairData()[localSubFaceIdx].virtualOuterParallelFaceDofPos));
if(bcTypes.isSymmetry())
continue;
}
// if there is no symmetry boundary condition, proceed to calculate the tangential momentum flux
if(navierStokes)
- tangentialFlux += computeAdvectivePartOfTangentialMomentumFlux_(problem, element, scvf, normalFace, subFaceData, elemVolVars, velocity);
+ tangentialFlux += computeAdvectivePartOfTangentialMomentumFlux_(problem, element, scvf, normalFace, elemVolVars, faceVars, localSubFaceIdx);
- tangentialFlux += computeDiffusivePartOfTangentialMomentumFlux_(problem, element, scvf, normalFace, subFaceData, elemVolVars, velocity);
+ tangentialFlux += computeDiffusivePartOfTangentialMomentumFlux_(problem, element, scvf, normalFace, elemVolVars, faceVars, localSubFaceIdx);
}
return tangentialFlux;
}
private:
- template<class SubFaceData, class VelocityHelper>
FacePrimaryVariables computeAdvectivePartOfTangentialMomentumFlux_(const Problem& problem,
const Element& element,
const SubControlVolumeFace& scvf,
const SubControlVolumeFace& normalFace,
- const SubFaceData& subFaceData,
const ElementVolumeVariables& elemVolVars,
- VelocityHelper velocity)
+ const FaceVariables& faceVars,
+ const int localSubFaceIdx)
{
- const Scalar transportingVelocity = velocity(subFaceData.normalPair.first);
+ const Scalar transportingVelocity = faceVars.velocityNormalInside(localSubFaceIdx);
const auto insideScvIdx = normalFace.insideScvIdx();
const auto outsideScvIdx = normalFace.outsideScvIdx();
- // lambda to conveniently create a ghost face which is outside the domain, parallel to the scvf of interest
- // auto makeGhostFace = [insideScvIdx] (const GlobalPosition& pos)
- // {
- // return SubControlVolumeFace(pos, std::vector<unsigned int>{insideScvIdx,insideScvIdx});
- // };
-
const bool innerElementIsUpstream = ( sign(normalFace.outerNormalScalar()) == sign(transportingVelocity) );
const auto& upVolVars = innerElementIsUpstream ? elemVolVars[insideScvIdx] : elemVolVars[outsideScvIdx];
- Scalar transportedVelocity(0.0);
-
- if(innerElementIsUpstream)
- transportedVelocity = velocity(scvf.dofIndex());
- else
- {
- const int outerDofIdx = subFaceData.outerParallelFaceDofIdx;
- if(outerDofIdx >= 0)
- transportedVelocity = velocity(outerDofIdx);
- else // this is the case when the outer parallal dof would lie outside the domain TODO: discuss which one is better
- // transportedVelocity = problem.dirichlet(makeGhostFace(subFaceData.virtualOuterParallelFaceDofPos))[faceIdx][scvf.directionIndex()];
- transportedVelocity = problem.dirichlet(element, scvf)[faceIdx][scvf.directionIndex()];
- }
+ const Scalar transportedVelocity = innerElementIsUpstream ?
+ faceVars.velocitySelf() :
+ faceVars.velocityParallel(localSubFaceIdx);
const Scalar momentum = upVolVars.density() * transportedVelocity;
const int sgn = sign(normalFace.outerNormalScalar());
@@ -338,63 +315,46 @@ private:
return transportingVelocity * momentum * sgn * normalFace.area() * 0.5;
}
- template<class SubFaceData, class VelocityHelper>
FacePrimaryVariables computeDiffusivePartOfTangentialMomentumFlux_(const Problem& problem,
const Element& element,
const SubControlVolumeFace& scvf,
const SubControlVolumeFace& normalFace,
- const SubFaceData& subFaceData,
const ElementVolumeVariables& elemVolVars,
- VelocityHelper velocity)
+ const FaceVariables& faceVars,
+ const int localSubFaceIdx)
{
FacePrimaryVariables tangentialDiffusiveFlux(0.0);
- const auto normalDirIdx = normalFace.directionIndex();
const auto insideScvIdx = normalFace.insideScvIdx();
const auto outsideScvIdx = normalFace.outsideScvIdx();
const auto& insideVolVars = elemVolVars[insideScvIdx];
const auto& outsideVolVars = elemVolVars[outsideScvIdx];
- // lambda to conveniently create a ghost face which is outside the domain, parallel to the scvf of interest
- auto makeGhostFace = [insideScvIdx] (const GlobalPosition& pos)
- {
- return SubControlVolumeFace(pos, std::vector<unsigned int>{insideScvIdx,insideScvIdx});
- };
-
// the averaged viscosity at the face normal to our face of interest (where we assemble the face residual)
const Scalar muAvg = (insideVolVars.viscosity() + outsideVolVars.viscosity()) * 0.5;
// the normal derivative
- const int innerNormalVelocityIdx = subFaceData.normalPair.first;
- const int outerNormalVelocityIdx = subFaceData.normalPair.second;
-
- const Scalar innerNormalVelocity = velocity(innerNormalVelocityIdx);
-
- const Scalar outerNormalVelocity = outerNormalVelocityIdx >= 0 ?
- velocity(outerNormalVelocityIdx) :
- problem.dirichlet(element, makeGhostFace(subFaceData.virtualOuterNormalFaceDofPos))[faceIdx][normalDirIdx];
+ const Scalar innerNormalVelocity = faceVars.velocityNormalInside(localSubFaceIdx);
+ const Scalar outerNormalVelocity = faceVars.velocityNormalOutside(localSubFaceIdx);
const Scalar normalDeltaV = scvf.normalInPosCoordDir() ?
(outerNormalVelocity - innerNormalVelocity) :
(innerNormalVelocity - outerNormalVelocity);
- const Scalar normalDerivative = normalDeltaV / subFaceData.normalDistance;
+ const Scalar normalDerivative = normalDeltaV / scvf.pairData(localSubFaceIdx).normalDistance;
tangentialDiffusiveFlux -= muAvg * normalDerivative;
// the parallel derivative
- const Scalar innerParallelVelocity = velocity(scvf.dofIndex());
+ const Scalar innerParallelVelocity = faceVars.velocitySelf();
- const int outerParallelFaceDofIdx = subFaceData.outerParallelFaceDofIdx;
- const Scalar outerParallelVelocity = outerParallelFaceDofIdx >= 0 ?
- velocity(outerParallelFaceDofIdx) :
- problem.dirichlet(element, makeGhostFace(subFaceData.virtualOuterParallelFaceDofPos))[faceIdx][scvf.directionIndex()];
+ const Scalar outerParallelVelocity = faceVars.velocityParallel(localSubFaceIdx);
const Scalar parallelDeltaV = normalFace.normalInPosCoordDir() ?
(outerParallelVelocity - innerParallelVelocity) :
(innerParallelVelocity - outerParallelVelocity);
- const Scalar parallelDerivative = parallelDeltaV / subFaceData.parallelDistance;
+ const Scalar parallelDerivative = parallelDeltaV / scvf.pairData(localSubFaceIdx).parallelDistance;
tangentialDiffusiveFlux -= muAvg * parallelDerivative;
const Scalar sgn = sign(normalFace.outerNormalScalar());
diff --git a/dumux/freeflow/staggered/fluxvariablescache.hh b/dumux/freeflow/staggered/fluxvariablescache.hh
index e84095a7f12495816c0d8cef5de0836362b87b4c..10a568425b87c1889ae6b5617eca65425824af3c 100644
--- a/dumux/freeflow/staggered/fluxvariablescache.hh
+++ b/dumux/freeflow/staggered/fluxvariablescache.hh
@@ -23,7 +23,7 @@
#ifndef DUMUX_FREEFLOW_IMPLICIT_FLUXVARIABLESCACHE_HH
#define DUMUX_FREEFLOW_IMPLICIT_FLUXVARIABLESCACHE_HH
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/basicproperties.hh>
#include <dune/localfunctions/lagrange/pqkfactory.hh>
#include <dumux/discretization/methods.hh>
diff --git a/dumux/freeflow/staggered/localresidual.hh b/dumux/freeflow/staggered/localresidual.hh
index 4d9ab7b95c43f4bd1e4c523cd39bed66229ff142..62933ed306af9a0d00eeea2bf23e136575eeae82 100644
--- a/dumux/freeflow/staggered/localresidual.hh
+++ b/dumux/freeflow/staggered/localresidual.hh
@@ -23,12 +23,6 @@
#ifndef DUMUX_STAGGERED_NAVIERSTOKES_LOCAL_RESIDUAL_HH
#define DUMUX_STAGGERED_NAVIERSTOKES_LOCAL_RESIDUAL_HH
-#include <dune/istl/matrix.hh>
-
-#include <dumux/common/valgrind.hh>
-#include <dumux/implicit/staggered/localresidual.hh>
-
-#include "properties.hh"
namespace Dumux
{
@@ -39,6 +33,9 @@ namespace Properties
NEW_PROP_TAG(EnableComponentTransport);
NEW_PROP_TAG(EnableInertiaTerms);
NEW_PROP_TAG(ReplaceCompEqIdx);
+NEW_PROP_TAG(EnergyFluxVariables);
+NEW_PROP_TAG(NormalizePressure);
+NEW_PROP_TAG(ElementFaceVariables);
}
/*!
@@ -90,12 +87,17 @@ class StaggeredNavierStokesResidualImpl<TypeTag, false> : public Dumux::Staggere
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using EnergyLocalResidual = typename GET_PROP_TYPE(TypeTag, EnergyLocalResidual);
using EnergyFluxVariables = typename GET_PROP_TYPE(TypeTag, EnergyFluxVariables);
+ using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
typename DofTypeIndices::CellCenterIdx cellCenterIdx;
typename DofTypeIndices::FaceIdx faceIdx;
+ using CellCenterResidual = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
+ using FaceResidual = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
+ using FaceResidualVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
+
enum {
// grid and world dimension
dim = GridView::dimension,
@@ -109,41 +111,41 @@ class StaggeredNavierStokesResidualImpl<TypeTag, false> : public Dumux::Staggere
};
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
static constexpr bool navierStokes = GET_PROP_VALUE(TypeTag, EnableInertiaTerms);
static constexpr bool normalizePressure = GET_PROP_VALUE(TypeTag, NormalizePressure);
public:
- // copying the local residual class is not a good idea
- StaggeredNavierStokesResidualImpl(const StaggeredNavierStokesResidualImpl &) = delete;
- StaggeredNavierStokesResidualImpl() = default;
+ using ParentType::ParentType;
- CellCenterPrimaryVariables computeFluxForCellCenter(const Element &element,
+ CellCenterPrimaryVariables computeFluxForCellCenter(const Problem& problem,
+ const Element &element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars,
+ const ElementFaceVariables& elemFaceVars,
const SubControlVolumeFace &scvf,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
FluxVariables fluxVars;
- CellCenterPrimaryVariables flux = fluxVars.computeFluxForCellCenter(this->problem(), element, fvGeometry, elemVolVars,
- globalFaceVars, scvf, elemFluxVarsCache[scvf]);
+ CellCenterPrimaryVariables flux = fluxVars.computeFluxForCellCenter(problem, element, fvGeometry, elemVolVars,
+ elemFaceVars, scvf, elemFluxVarsCache[scvf]);
- EnergyFluxVariables::energyFlux(flux, this->problem(), element, fvGeometry, elemVolVars, globalFaceVars, scvf, elemFluxVarsCache[scvf]);
+ EnergyFluxVariables::energyFlux(flux, problem, element, fvGeometry, elemVolVars, elemFaceVars, scvf, elemFluxVarsCache[scvf]);
return flux;
}
- CellCenterPrimaryVariables computeSourceForCellCenter(const Element &element,
+ CellCenterPrimaryVariables computeSourceForCellCenter(const Problem& problem,
+ const Element &element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars,
- const SubControlVolume &scv)
+ const ElementFaceVariables& elemFaceVars,
+ const SubControlVolume &scv) const
{
return CellCenterPrimaryVariables(0.0);
+ // TODO sources
}
@@ -157,8 +159,9 @@ public:
* \note The volVars can be different to allow computing
* the implicit euler time derivative here
*/
- CellCenterPrimaryVariables computeStorageForCellCenter(const SubControlVolume& scv,
- const VolumeVariables& volVars)
+ CellCenterPrimaryVariables computeStorageForCellCenter(const Problem& problem,
+ const SubControlVolume& scv,
+ const VolumeVariables& volVars) const
{
CellCenterPrimaryVariables storage;
storage[0] = volVars.density();
@@ -176,26 +179,28 @@ public:
* \note The volVars can be different to allow computing
* the implicit euler time derivative here
*/
- FacePrimaryVariables computeStorageForFace(const SubControlVolumeFace& scvf,
+ FacePrimaryVariables computeStorageForFace(const Problem& problem,
+ const SubControlVolumeFace& scvf,
const VolumeVariables& volVars,
- const GlobalFaceVars& globalFaceVars)
+ const ElementFaceVariables& elementFaceVars) const
{
FacePrimaryVariables storage(0.0);
- const Scalar velocity = globalFaceVars.faceVars(scvf.dofIndex()).velocity();
+ const Scalar velocity = elementFaceVars[scvf].velocitySelf();
storage[0] = volVars.density() * velocity;
return storage;
}
- FacePrimaryVariables computeSourceForFace(const SubControlVolumeFace& scvf,
+ FacePrimaryVariables computeSourceForFace(const Problem& problem,
+ const SubControlVolumeFace& scvf,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars)
+ const ElementFaceVariables& elementFaceVars) const
{
FacePrimaryVariables source(0.0);
const auto insideScvIdx = scvf.insideScvIdx();
const auto& insideVolVars = elemVolVars[insideScvIdx];
- source += this->problem().gravity()[scvf.directionIndex()] * insideVolVars.density();
+ source += problem.gravity()[scvf.directionIndex()] * insideVolVars.density();
- source += this->problem().sourceAtPos(scvf.center())[faceIdx][scvf.directionIndex()];
+ source += problem.sourceAtPos(scvf.center())[faceIdx][scvf.directionIndex()];
return source;
}
@@ -205,20 +210,21 @@ public:
* \param scvf The sub control volume face
* \param fvGeometry The finite-volume geometry
* \param elemVolVars All volume variables for the element
- * \param globalFaceVars The face variables
+ * \param elementFaceVars The face variables
*/
- FacePrimaryVariables computeFluxForFace(const Element& element,
+ FacePrimaryVariables computeFluxForFace(const Problem& problem,
+ const Element& element,
const SubControlVolumeFace& scvf,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ const ElementFaceVariables& elementFaceVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
FacePrimaryVariables flux(0.0);
FluxVariables fluxVars;
- flux += fluxVars.computeNormalMomentumFlux(this->problem(), element, scvf, fvGeometry, elemVolVars, globalFaceVars);
- flux += fluxVars.computeTangetialMomentumFlux(this->problem(), element, scvf, fvGeometry, elemVolVars, globalFaceVars);
- flux += computePressureTerm_(element, scvf, fvGeometry, elemVolVars, globalFaceVars);
+ flux += fluxVars.computeNormalMomentumFlux(problem, element, scvf, fvGeometry, elemVolVars, elementFaceVars);
+ flux += fluxVars.computeTangetialMomentumFlux(problem, element, scvf, fvGeometry, elemVolVars, elementFaceVars);
+ flux += computePressureTerm_(problem, element, scvf, fvGeometry, elemVolVars, elementFaceVars);
return flux;
}
@@ -230,35 +236,37 @@ protected:
void evalBoundary_(const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& faceVars,
+ const ElementFaceVariables& elemFaceVars,
const ElementBoundaryTypes& elemBcTypes,
const ElementFluxVariablesCache& elemFluxVarsCache)
{
- evalBoundaryForCellCenter_(element, fvGeometry, elemVolVars, faceVars, elemBcTypes, elemFluxVarsCache);
+ evalBoundaryForCellCenter_(element, fvGeometry, elemVolVars, elemFaceVars, elemBcTypes, elemFluxVarsCache);
for (auto&& scvf : scvfs(fvGeometry))
{
- evalBoundaryForFace_(element, fvGeometry, scvf, elemVolVars, faceVars, elemBcTypes, elemFluxVarsCache);
+ evalBoundaryForFace_(element, fvGeometry, scvf, elemVolVars, elemFaceVars, elemBcTypes, elemFluxVarsCache);
}
}
/*!
* \brief Evaluate boundary conditions for a cell center dof
*/
- void evalBoundaryForCellCenter_(const Element& element,
+ void evalBoundaryForCellCenter_(CellCenterResidual& residual,
+ const Problem& problem,
+ const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& faceVars,
+ const ElementFaceVariables& elemFaceVars,
const ElementBoundaryTypes& elemBcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
for (auto&& scvf : scvfs(fvGeometry))
{
if (scvf.boundary())
{
- auto boundaryFlux = computeFluxForCellCenter(element, fvGeometry, elemVolVars, faceVars, scvf, elemFluxVarsCache);
+ auto boundaryFlux = computeFluxForCellCenter(problem, element, fvGeometry, elemVolVars, elemFaceVars, scvf, elemFluxVarsCache);
// handle the actual boundary conditions:
- const auto bcTypes = this->problem().boundaryTypes(element, scvf);
+ const auto bcTypes = problem.boundaryTypes(element, scvf);
if(bcTypes.hasNeumann())
{
@@ -267,14 +275,14 @@ protected:
if(bcTypes.isNeumann(eqIdx))
{
const auto extrusionFactor = 1.0; //TODO: get correct extrusion factor
- boundaryFlux[eqIdx] = this->problem().neumannAtPos(scvf.center())[cellCenterIdx][eqIdx]
+ boundaryFlux[eqIdx] = problem.neumann(element, scvf)[cellCenterIdx][eqIdx]
* extrusionFactor * scvf.area();
}
}
- this->ccResidual_ += boundaryFlux;
+ residual += boundaryFlux;
- asImp_().setFixedCell_(fvGeometry.scv(scvf.insideScvIdx()), elemVolVars, bcTypes);
+ asImp_().setFixedCell_(residual, problem, fvGeometry.scv(scvf.insideScvIdx()), elemVolVars, bcTypes);
}
}
}
@@ -287,56 +295,62 @@ protected:
* \param elemVolVars The current or previous element volVars
* \param bcTypes The boundary types
*/
- void setFixedCell_(const SubControlVolume& insideScv,
+ void setFixedCell_(CellCenterResidual& residual,
+ const Problem& problem,
+ const SubControlVolume& insideScv,
const ElementVolumeVariables& elemVolVars,
- const BoundaryTypes& bcTypes)
+ const BoundaryTypes& bcTypes) const
{
// set a fixed pressure for cells adjacent to a wall
if(bcTypes.isDirichletCell(massBalanceIdx))
{
const auto& insideVolVars = elemVolVars[insideScv];
- this->ccResidual_[pressureIdx] = insideVolVars.pressure() - this->problem().dirichletAtPos(insideScv.center())[cellCenterIdx][pressureIdx];
+ residual[pressureIdx] = insideVolVars.pressure() - problem.dirichletAtPos(insideScv.center())[cellCenterIdx][pressureIdx];
}
}
/*!
* \brief Evaluate boundary conditions for a face dof
*/
- void evalBoundaryForFace_(const Element& element,
+ void evalBoundaryForFace_(FaceResidual& residual,
+ const Problem& problem,
+ const Element& element,
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& faceVars,
+ const ElementFaceVariables& elementFaceVars,
const ElementBoundaryTypes& elemBcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
if (scvf.boundary())
{
// handle the actual boundary conditions:
- const auto bcTypes = this->problem().boundaryTypes(element, scvf);
+ const auto bcTypes = problem.boundaryTypes(element, scvf);
// set a fixed value for the velocity for Dirichlet boundary conditions
if(bcTypes.isDirichlet(momentumBalanceIdx))
{
- const Scalar velocity = faceVars.faceVars(scvf.dofIndex()).velocity();
- const Scalar dirichletValue = this->problem().dirichlet(element, scvf)[faceIdx][scvf.directionIndex()];
- this->faceResiduals_[scvf.localFaceIdx()] = velocity - dirichletValue;
+ // const Scalar velocity = faceVars.faceVars(scvf.dofIndex()).velocity();
+ const Scalar velocity = elementFaceVars[scvf].velocitySelf();
+ const Scalar dirichletValue = problem.dirichlet(element, scvf)[faceIdx][scvf.directionIndex()];
+ residual = velocity - dirichletValue;
}
// For symmetry boundary conditions, there is no flow accross the boundary and
// we therefore treat it like a Dirichlet boundary conditions with zero velocity
if(bcTypes.isSymmetry())
{
- const Scalar velocity = faceVars.faceVars(scvf.dofIndex()).velocity();
+ // const Scalar velocity = faceVars.faceVars(scvf.dofIndex()).velocity();
+ const Scalar velocity = elementFaceVars[scvf].velocitySelf();
const Scalar fixedValue = 0.0;
- this->faceResiduals_[scvf.localFaceIdx()] = velocity - fixedValue;
+ residual = velocity - fixedValue;
}
// outflow condition for the momentum balance equation
if(bcTypes.isOutflow(momentumBalanceIdx))
{
if(bcTypes.isDirichlet(massBalanceIdx))
- this->faceResiduals_[scvf.localFaceIdx()] += computeFluxForFace(element, scvf, fvGeometry, elemVolVars, faceVars, elemFluxVarsCache);
+ residual += computeFluxForFace(problem, element, scvf, fvGeometry, elemVolVars, elementFaceVars, elemFluxVarsCache);
else
DUNE_THROW(Dune::InvalidStateException, "Face at " << scvf.center() << " has an outflow BC for the momentum balance but no Dirichlet BC for the pressure!");
}
@@ -353,25 +367,26 @@ private:
* \param scvf The sub control volume face
* \param fvGeometry The finite-volume geometry
* \param elemVolVars All volume variables for the element
- * \param globalFaceVars The face variables
+ * \param elementFaceVars The face variables
*/
- FacePrimaryVariables computePressureTerm_(const Element& element,
+ FacePrimaryVariables computePressureTerm_(const Problem& problem,
+ const Element& element,
const SubControlVolumeFace& scvf,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars)
+ const ElementFaceVariables& elementFaceVars) const
{
const auto insideScvIdx = scvf.insideScvIdx();
const auto& insideVolVars = elemVolVars[insideScvIdx];
- const Scalar deltaP = normalizePressure ? this->problem().initialAtPos(scvf.center())[cellCenterIdx][pressureIdx] : 0.0;
+ const Scalar deltaP = normalizePressure ? problem.initialAtPos(scvf.center())[cellCenterIdx][pressureIdx] : 0.0;
Scalar result = (insideVolVars.pressure() - deltaP) * scvf.area() * -1.0 * sign(scvf.outerNormalScalar());
// treat outflow BCs
if(scvf.boundary())
{
- const Scalar pressure = this->problem().dirichlet(element, scvf)[cellCenterIdx][pressureIdx] - deltaP;
+ const Scalar pressure = problem.dirichlet(element, scvf)[cellCenterIdx][pressureIdx] - deltaP;
result += pressure * scvf.area() * sign(scvf.outerNormalScalar());
}
return result;
diff --git a/dumux/freeflow/staggered/model.hh b/dumux/freeflow/staggered/model.hh
index 4e781c517d5e588985d16a4b710acdffa4fe440e..7a1bc622195dc5d2c4c021c8aeb6d25d78fed2c9 100644
--- a/dumux/freeflow/staggered/model.hh
+++ b/dumux/freeflow/staggered/model.hh
@@ -27,12 +27,7 @@
#ifndef DUMUX_NAVIERSTOKES_MODEL_HH
#define DUMUX_NAVIERSTOKES_MODEL_HH
-// #include <dumux/porousmediumflow/implicit/velocityoutput.hh>
-#include "../staggeredni/model.hh"
-#include "properties.hh"
-namespace Dumux
-{
/*!
* \ingroup NavierStokesModel
* \brief A single-phase, isothermal flow model using the fully implicit scheme.
@@ -54,49 +49,5 @@ namespace Dumux
* and the implicit Euler method as time discretization.
* The model supports compressible as well as incompressible fluids.
*/
-template<class TypeTag >
-class NavierStokesModel : public GET_PROP_TYPE(TypeTag, BaseModel)
-{
- using ParentType = typename GET_PROP_TYPE(TypeTag, BaseModel);
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FVGridGeometry) FVGridGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum { dim = GridView::dimension };
- enum { dimWorld = GridView::dimensionworld };
-
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dim : 0 };
- using Element = typename GridView::template Codim<0>::Entity;
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
-
- using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
- typename DofTypeIndices::CellCenterIdx cellCenterIdx;
- typename DofTypeIndices::FaceIdx faceIdx;
-
-public:
-
- void init(Problem& problem)
- {
- ParentType::init(problem);
-
- // register standardized vtk output fields
- auto& vtkOutputModule = problem.vtkOutputModule();
- vtkOutputModule.addPrimaryVariable("pressure", Indices::pressureIdx);
- vtkOutputModule.addFacePrimaryVariable("scalarFaceVelocity", 0);
- vtkOutputModule.addFacePrimaryVariable("faceVelocity", std::vector<unsigned int>{0,1, 2});
-
-// NonIsothermalModel::maybeAddTemperature(vtkOutputModule);
- }
-};
-}
-
-#include "propertydefaults.hh"
#endif
diff --git a/dumux/freeflow/staggered/problem.hh b/dumux/freeflow/staggered/problem.hh
index d9d5b54486f26bcbc6d388cd4f4d6ef055c3433a..75bcc68644c37482b592d938ce9139bcfb0fa74c 100644
--- a/dumux/freeflow/staggered/problem.hh
+++ b/dumux/freeflow/staggered/problem.hh
@@ -23,9 +23,9 @@
#ifndef DUMUX_NAVIERSTOKES_PROBLEM_HH
#define DUMUX_NAVIERSTOKES_PROBLEM_HH
-#include <dumux/implicit/problem.hh>
-
+#include <dumux/common/basicproperties.hh>
#include "properties.hh"
+#include <dumux/common/staggeredfvproblem.hh>
namespace Dumux
{
@@ -37,26 +37,24 @@ namespace Dumux
* This implements gravity (if desired) and a function returning the temperature.
*/
template<class TypeTag>
-class NavierStokesProblem : public ImplicitProblem<TypeTag>
+class NavierStokesProblem : public StaggeredFVProblem<TypeTag>
{
- typedef ImplicitProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GridView::Grid Grid;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ using ParentType = StaggeredFVProblem<TypeTag>;
+ using Implementation = typename GET_PROP_TYPE(TypeTag, Problem);
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Grid = typename GridView::Grid;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ using Element = typename GridView::template Codim<0>::Entity;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using BoundaryValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
enum {
dim = Grid::dimension,
@@ -68,18 +66,18 @@ class NavierStokesProblem : public ImplicitProblem<TypeTag>
velocityYIdx = Indices::velocityYIdx
};
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
typename DofTypeIndices::CellCenterIdx cellCenterIdx;
typename DofTypeIndices::FaceIdx faceIdx;
public:
- NavierStokesProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView),
+ NavierStokesProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry),
gravity_(0)
{
- if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
+ if (getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Problem.EnableGravity"))
gravity_[dim-1] = -9.81;
}
@@ -94,11 +92,32 @@ public:
*
* \param scvf The sub control volume face
*/
- auto dirichlet(const Element &element, const SubControlVolumeFace &scvf) const
+ BoundaryValues dirichlet(const Element &element, const SubControlVolumeFace &scvf) const
{
return asImp_().dirichletAtPos(scvf.center());
}
+ /*!
+ * \brief Returns neumann values at a given scv face.
+ This method can be overloaded in the actual problem, e.g. for coupling strategies
+ *
+ * \param scvf The sub control volume face
+ */
+ BoundaryValues neumann(const Element &element, const SubControlVolumeFace &scvf) const
+ {
+ return asImp_().neumannAtPos(scvf.center());
+ }
+
+ /*!
+ * \brief Returns neumann values at a position.
+ *
+ * \param scvf The sub control volume face
+ */
+ BoundaryValues neumannAtPos(const GlobalPosition& globalPos) const
+ {
+ return BoundaryValues(0.0);
+ }
+
/*!
* \brief Returns the temperature \f$\mathrm{[K]}\f$ at a given global position.
*
diff --git a/dumux/freeflow/staggered/properties.hh b/dumux/freeflow/staggered/properties.hh
index 246bcc04d70650ea5e3aa111a6e78f5b7e49e1d8..3a97aee983611ed1bd3366d898227c335f860369 100644
--- a/dumux/freeflow/staggered/properties.hh
+++ b/dumux/freeflow/staggered/properties.hh
@@ -27,8 +27,26 @@
#ifndef DUMUX_NAVIERSTOKES_PROPERTIES_HH
#define DUMUX_NAVIERSTOKES_PROPERTIES_HH
+#include <dumux/common/basicproperties.hh>
+#include <dumux/freeflow/properties.hh>
+
+#include <dumux/implicit/staggered/localresidual.hh>
#include <dumux/freeflow/staggeredni/properties.hh>
+#include "localresidual.hh"
+#include "volumevariables.hh"
+#include "fluxvariables.hh"
+#include "fluxvariablescache.hh"
+#include "indices.hh"
+#include "velocityoutput.hh"
+#include "vtkoutputfields.hh"
+#include "boundarytypes.hh"
+
+#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/liquidphase.hh>
+#include <dumux/material/components/nullcomponent.hh>
+#include <dumux/material/fluidsystems/1p.hh>
+
namespace Dumux
{
@@ -43,7 +61,7 @@ namespace Properties {
//////////////////////////////////////////////////////////////////
//! The type tags for the implicit single-phase problems
-NEW_TYPE_TAG(NavierStokes);
+NEW_TYPE_TAG(NavierStokes, INHERITS_FROM(FreeFlow));
//! The type tags for the corresponding non-isothermal problems
NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes, NavierStokesNonIsothermal));
@@ -52,23 +70,96 @@ NEW_TYPE_TAG(NavierStokesNI, INHERITS_FROM(NavierStokes, NavierStokesNonIsotherm
// Property tags
//////////////////////////////////////////////////////////////////
-NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system
-NEW_PROP_TAG(Indices); //!< Enumerations for the model
-NEW_PROP_TAG(FluidSystem); //!< The type of the fluid system to use
-NEW_PROP_TAG(Fluid); //!< The fluid used for the default fluid system
-NEW_PROP_TAG(FluidState); //!< The type of the fluid state to use
-NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< Returns weight of the upwind cell when calculating fluxes
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
-NEW_PROP_TAG(VtkAddVelocity); //!< Returns whether velocity vectors are written into the vtk output
NEW_PROP_TAG(EnableInertiaTerms); //!< Returns whether to include inertia terms in the momentum balance eq or not (Stokes / Navier-Stokes)
-NEW_PROP_TAG(BoundaryValues); //!< Type to set values on the boundary
NEW_PROP_TAG(EnableComponentTransport); //!< Returns whether to consider component transport or not
NEW_PROP_TAG(EnableEnergyTransport); //!< Returns whether to consider energy transport or not
-NEW_PROP_TAG(FaceVariables); //!< Returns whether to consider energy transport or not
NEW_PROP_TAG(NormalizePressure); //!< Returns whether to normalize the pressure term in the momentum balance or not
NEW_PROP_TAG(EnergyLocalResidual); //!< The energy local residual
NEW_PROP_TAG(EnergyFluxVariables); //!< The energy flux variables
+
+///////////////////////////////////////////////////////////////////////////
+// default property values for the isothermal single phase model
+///////////////////////////////////////////////////////////////////////////
+SET_INT_PROP(NavierStokes, NumEqCellCenter, 1); //!< set the number of equations to 1
+SET_INT_PROP(NavierStokes, NumPhases, 1); //!< The number of phases in the 1p model is 1
+
+//! The fluid system to use by default
+SET_TYPE_PROP(NavierStokes, FluidSystem, Dumux::FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Fluid)>);
+
+SET_PROP(NavierStokes, Fluid)
+{ private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+public:
+ typedef FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
+};
+
+/*!
+ * \brief The fluid state which is used by the volume variables to
+ * store the thermodynamic state. This should be chosen
+ * appropriately for the model ((non-)isothermal, equilibrium, ...).
+ * This can be done in the problem.
+ */
+SET_PROP(NavierStokes, FluidState){
+ private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ public:
+ typedef Dumux::ImmiscibleFluidState<Scalar, FluidSystem> type;
+};
+
+//! The local residual function
+SET_TYPE_PROP(NavierStokes, LocalResidual, StaggeredNavierStokesResidual<TypeTag>);
+
+//! the VolumeVariables property
+SET_TYPE_PROP(NavierStokes, VolumeVariables, NavierStokesVolumeVariables<TypeTag>);
+
+//! The class that contains the different flux variables (i.e. darcy, diffusion, energy)
+//! by default, we set the flux variables to ones for porous media
+SET_TYPE_PROP(NavierStokes, FluxVariables, FreeFlowFluxVariables<TypeTag>);
+
+//! The flux variables cache class, by default the one for porous media
+SET_TYPE_PROP(NavierStokes, FluxVariablesCache, FreeFlowFluxVariablesCache<TypeTag>);
+
+//! Enable advection
+SET_BOOL_PROP(NavierStokes, EnableAdvection, true);
+
+//! The one-phase model has no molecular diffusion
+SET_BOOL_PROP(NavierStokes, EnableMolecularDiffusion, false);
+
+//! The indices required by the isothermal single-phase model
+SET_TYPE_PROP(NavierStokes, Indices, NavierStokesCommonIndices<TypeTag>);
+
+SET_TYPE_PROP(NavierStokes, EnergyLocalResidual, FreeFlowEnergyLocalResidual<TypeTag>);
+
+SET_TYPE_PROP(NavierStokes, EnergyFluxVariables, FreeFlowEnergyFluxVariables<TypeTag>);
+
+SET_BOOL_PROP(NavierStokes, EnableEnergyBalance, false);
+
+SET_TYPE_PROP(NavierStokes, VelocityOutput, StaggeredFreeFlowVelocityOutput<TypeTag>);
+
+SET_TYPE_PROP(NavierStokes, VtkOutputFields, NavierStokesVtkOutputFields<TypeTag>);
+
+SET_BOOL_PROP(NavierStokes, EnableInertiaTerms, true);
+
+SET_BOOL_PROP(NavierStokes, EnableEnergyTransport, false);
+
+SET_BOOL_PROP(NavierStokes, EnableComponentTransport, false);
+
+//! Normalize the pressure term in the momentum balance or not
+SET_BOOL_PROP(NavierStokes, NormalizePressure, true);
+
+//////////////////////////////////////////////////////////////////
+// Property values for isothermal model required for the general non-isothermal model
+//////////////////////////////////////////////////////////////////
+
+//set isothermal Indices
+SET_TYPE_PROP(NavierStokesNI, IsothermalIndices, NavierStokesCommonIndices<TypeTag>);
+SET_TYPE_PROP(NavierStokesNI, IsothermalVtkOutputFields, NavierStokesVtkOutputFields<TypeTag>);
+
+//set isothermal NumEq
+SET_INT_PROP(NavierStokesNI, IsothermalNumEqCellCenter, 1); //!< set the number of equations to 1
+SET_INT_PROP(NavierStokesNI, IsothermalNumEqFace, 1); //!< set the number of equations to 1
+
// \}
}
diff --git a/dumux/freeflow/staggered/propertydefaults.hh b/dumux/freeflow/staggered/propertydefaults.hh
deleted file mode 100644
index 4206e1fa9c452c73ec9885f7797ad60a409877be..0000000000000000000000000000000000000000
--- a/dumux/freeflow/staggered/propertydefaults.hh
+++ /dev/null
@@ -1,224 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup NavierStokesModel
- * \file
- *
- * \brief Defines the properties required for the one-phase fully implicit model.
- */
-#ifndef DUMUX_NAVIERSTOKES_PROPERTY_DEFAULTS_HH
-#define DUMUX_NAVIERSTOKES_PROPERTY_DEFAULTS_HH
-
-#include "properties.hh"
-
-#include "model.hh"
-#include "volumevariables.hh"
-#include "indices.hh"
-#include "problem.hh"
-#include "localresidual.hh"
-#include "fluxvariables.hh"
-#include "fluxvariablescache.hh"
-#include "velocityoutput.hh"
-#include "vtkoutputmodule.hh"
-#include "boundarytypes.hh"
-
-#include <dumux/implicit/staggered/localresidual.hh>
-#include <dumux/freeflow/staggeredni/localresidual.hh>
-#include <dumux/freeflow/staggeredni/fluxvariables.hh>
-
-#include <dumux/material/fluidsystems/gasphase.hh>
-#include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/material/components/nullcomponent.hh>
-#include <dumux/material/fluidsystems/1p.hh>
-
-#include <dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh>
-#include <dumux/discretization/staggered/freeflow/subcontrolvolumeface.hh>
-#include <dumux/discretization/staggered/freeflow/facevariables.hh>
-
-
-
-namespace Dumux
-{
-
-namespace Properties
-{
-// forward declaration
-NEW_PROP_TAG(FluxVariables);
-NEW_PROP_TAG(FluxVariablesCache);
-NEW_PROP_TAG(StaggeredGeometryHelper);
-}
-// \{
-
-///////////////////////////////////////////////////////////////////////////
-// default property values for the isothermal single phase model
-///////////////////////////////////////////////////////////////////////////
-namespace Properties {
-SET_INT_PROP(NavierStokes, NumEqCellCenter, 1); //!< set the number of equations to 1
-SET_INT_PROP(NavierStokes, NumEqFace, 1); //!< set the number of equations to 1
-SET_INT_PROP(NavierStokes, NumPhases, 1); //!< The number of phases in the 1p model is 1
-
-//! The sub-controlvolume face
-SET_PROP(NavierStokes, SubControlVolumeFace)
-{
-private:
- using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
- using ScvfGeometry = typename Grid::template Codim<1>::Geometry;
- using IndexType = typename Grid::LeafGridView::IndexSet::IndexType;
-public:
- typedef Dumux::StaggeredSubControlVolumeFace<ScvfGeometry, IndexType> type;
-};
-
-//! The geometry helper required for the stencils, etc.
-SET_PROP(NavierStokes, StaggeredGeometryHelper)
-{
-private:
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
-public:
- using type = StaggeredGeometryHelper<GridView>;
-};
-
-//! The variables living on the faces
-SET_TYPE_PROP(NavierStokes, FaceVariables, StaggeredFaceVariables<TypeTag>);
-
-//! The local residual function
-SET_TYPE_PROP(NavierStokes, LocalResidual, StaggeredNavierStokesResidual<TypeTag>);
-
-//! the Model property
-SET_TYPE_PROP(NavierStokes, Model, NavierStokesModel<TypeTag>);
-
-//! the VolumeVariables property
-SET_TYPE_PROP(NavierStokes, VolumeVariables, NavierStokesVolumeVariables<TypeTag>);
-
-//! The class that contains the different flux variables (i.e. darcy, diffusion, energy)
-//! by default, we set the flux variables to ones for porous media
-SET_TYPE_PROP(NavierStokes, FluxVariables, FreeFlowFluxVariables<TypeTag>);
-
-//! The flux variables cache class, by default the one for porous media
-SET_TYPE_PROP(NavierStokes, FluxVariablesCache, FreeFlowFluxVariablesCache<TypeTag>);
-
-//! Enable advection
-SET_BOOL_PROP(NavierStokes, EnableAdvection, true);
-
-//! The one-phase model has no molecular diffusion
-SET_BOOL_PROP(NavierStokes, EnableMolecularDiffusion, false);
-
-//! The indices required by the isothermal single-phase model
-SET_TYPE_PROP(NavierStokes, Indices, NavierStokesCommonIndices<TypeTag>);
-
-//! The weight of the upwind control volume when calculating
-//! fluxes. Use central differences by default.
-SET_SCALAR_PROP(NavierStokes, ImplicitMassUpwindWeight, 0.5);
-
-//! weight for the upwind mobility in the velocity calculation
-//! fluxes. Use central differences by default.
-SET_SCALAR_PROP(NavierStokes, ImplicitMobilityUpwindWeight, 0.5);
-
-//! The fluid system to use by default
-SET_TYPE_PROP(NavierStokes, FluidSystem, Dumux::FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Fluid)>);
-
-SET_PROP(NavierStokes, Fluid)
-{ private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public:
- typedef FluidSystems::LiquidPhase<Scalar, Dumux::NullComponent<Scalar> > type;
-};
-
-/*!
- * \brief The fluid state which is used by the volume variables to
- * store the thermodynamic state. This should be chosen
- * appropriately for the model ((non-)isothermal, equilibrium, ...).
- * This can be done in the problem.
- */
-SET_PROP(NavierStokes, FluidState){
- private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- public:
- typedef Dumux::ImmiscibleFluidState<Scalar, FluidSystem> type;
-};
-
-// disable velocity output by default
-SET_BOOL_PROP(NavierStokes, VtkAddVelocity, true);
-
-// enable gravity by default
-SET_BOOL_PROP(NavierStokes, ProblemEnableGravity, true);
-
-SET_BOOL_PROP(NavierStokes, EnableInertiaTerms, true);
-
-SET_BOOL_PROP(NavierStokes, EnableEnergyTransport, false);
-
-SET_BOOL_PROP(NavierStokes, EnableComponentTransport, false);
-
-//! Normalize the pressure term in the momentum balance or not
-SET_BOOL_PROP(NavierStokes, NormalizePressure, true);
-
-SET_PROP(NavierStokes, BoundaryValues)
-{
-private:
- using CellCenterBoundaryValues = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FaceBoundaryValues = Dune::FieldVector<typename GET_PROP_TYPE(TypeTag, Scalar),
- GridView::dimension>;
-public:
- using type = StaggeredPrimaryVariables<TypeTag, CellCenterBoundaryValues, FaceBoundaryValues>;
-};
-
-//! Boundary types at a single degree of freedom
-SET_TYPE_PROP(NavierStokes,
- BoundaryTypes,
- StaggeredFreeFlowBoundaryTypes<GET_PROP_VALUE(TypeTag, NumEq)>);
-
-SET_TYPE_PROP(NavierStokes, VtkOutputModule, FreeFlowStaggeredVtkOutputModule<TypeTag>);
-
-SET_TYPE_PROP(NavierStokes, VelocityOutput, StaggeredFreeFlowVelocityOutput<TypeTag>);
-
-SET_TYPE_PROP(NavierStokes, EnergyLocalResidual, FreeFlowEnergyLocalResidual<TypeTag>);
-
-SET_TYPE_PROP(NavierStokes, EnergyFluxVariables, FreeFlowEnergyFluxVariables<TypeTag>);
-
-//! average is used as default model to compute the effective thermal heat conductivity
-// SET_PROP(NavierStokesNI, ThermalConductivityModel)
-// { private :
-// typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-// public:
-// typedef ThermalConductivityAverage<Scalar> type;
-// };
-
-//////////////////////////////////////////////////////////////////
-// Property values for isothermal model required for the general non-isothermal model
-//////////////////////////////////////////////////////////////////
-
-// set isothermal Model
-SET_TYPE_PROP(NavierStokesNI, IsothermalModel, NavierStokesModel<TypeTag>);
-
-//set isothermal Indices
-SET_TYPE_PROP(NavierStokesNI, IsothermalIndices, NavierStokesCommonIndices<TypeTag>);
-
-//set isothermal NumEq
-SET_INT_PROP(NavierStokesNI, IsothermalNumEqCellCenter, 1); //!< set the number of equations to 1
-SET_INT_PROP(NavierStokesNI, IsothermalNumEqFace, 1); //!< set the number of equations to 1
-
-// \}
-} // end namespace Properties
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/freeflow/staggered/velocityoutput.hh b/dumux/freeflow/staggered/velocityoutput.hh
index 2fa4415f305691400664c58e65fa732f1e2656ae..5270d2753b73127bec47105d748ed835ba4a7748 100644
--- a/dumux/freeflow/staggered/velocityoutput.hh
+++ b/dumux/freeflow/staggered/velocityoutput.hh
@@ -28,7 +28,7 @@
#include <dune/istl/bvector.hh>
#include <dune/geometry/referenceelements.hh>
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/basicproperties.hh>
#include <dumux/discretization/methods.hh>
namespace Dumux
@@ -57,7 +57,10 @@ class StaggeredFreeFlowVelocityOutput
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- static const bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+
static const int dim = GridView::dimension;
static const int dimWorld = GridView::dimensionworld;
@@ -75,11 +78,17 @@ public:
*
* \param problem The problem to be solved
*/
- StaggeredFreeFlowVelocityOutput(const Problem& problem)
+ StaggeredFreeFlowVelocityOutput(const Problem& problem,
+ const FVGridGeometry& fvGridGeometry,
+ const GridVariables& gridVariables,
+ const SolutionVector& sol)
: problem_(problem)
+ , fvGridGeometry_(fvGridGeometry)
+ , gridVariables_(gridVariables)
+ , sol_(sol)
{
// check, if velocity output can be used (works only for cubes so far)
- velocityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddVelocity);
+ velocityOutput_ = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Vtk.AddVelocity");
}
bool enableOutput()
@@ -97,15 +106,16 @@ public:
const Element& element,
int phaseIdx)
{
+ auto elemFaceVars = localView(gridVariables_.curGridFaceVars());
+ elemFaceVars.bindElement(element, fvGeometry, sol_);
for (auto&& scv : scvs(fvGeometry))
{
auto dofIdxGlobal = scv.dofIndex();
for (auto&& scvf : scvfs(fvGeometry))
{
- auto& origFaceVars = problem_.model().curGlobalFaceVars().faceVars(scvf.dofIndex());
auto dirIdx = scvf.directionIndex();
- velocity[dofIdxGlobal][dirIdx] += 0.5*origFaceVars.velocity();
+ velocity[dofIdxGlobal][dirIdx] += 0.5*elemFaceVars[scvf].velocitySelf();
}
}
}
@@ -113,6 +123,9 @@ public:
private:
const Problem& problem_;
+ const FVGridGeometry& fvGridGeometry_;
+ const GridVariables& gridVariables_;
+ const SolutionVector& sol_;
bool velocityOutput_;
};
diff --git a/dumux/freeflow/staggered/volumevariables.hh b/dumux/freeflow/staggered/volumevariables.hh
index 50649298eead2845eb2bf0796d446ed9c80dfd03..77c2264aedd73f012a9d60d40a2102d157083d71 100644
--- a/dumux/freeflow/staggered/volumevariables.hh
+++ b/dumux/freeflow/staggered/volumevariables.hh
@@ -65,7 +65,6 @@ class NavierStokesVolumeVariablesImplementation<TypeTag, false>
using Element = typename GridView::template Codim<0>::Entity;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
static const int phaseIdx = Indices::phaseIdx;
public:
diff --git a/dumux/freeflow/staggered/vtkoutputfields.hh b/dumux/freeflow/staggered/vtkoutputfields.hh
new file mode 100644
index 0000000000000000000000000000000000000000..53fee98bfe6fbff20a29b6e8e3e32e0319c6131e
--- /dev/null
+++ b/dumux/freeflow/staggered/vtkoutputfields.hh
@@ -0,0 +1,71 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Adds vtk output fields specific to the twop model
+ */
+#ifndef DUMUX_NAVIER_STOKES_VTK_OUTPUT_FIELDS_HH
+#define DUMUX_NAVIER_STOKES_VTK_OUTPUT_FIELDS_HH
+
+#include <dumux/common/properties.hh>
+#include <dune/common/fvector.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup TwoP, InputOutput
+ * \brief Adds vtk output fields specific to the twop model
+ */
+template<class TypeTag>
+class NavierStokesVtkOutputFields
+{
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
+
+ using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimensionworld>;
+
+public:
+ template <class VtkOutputModule>
+ static void init(VtkOutputModule& vtk)
+ {
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(); }, "p");
+
+ const bool writeFaceVars_ = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Vtk.WriteFaceData", false);
+ if(writeFaceVars_)
+ {
+ auto faceVelocityVector = [](const SubControlVolumeFace& scvf, const FaceVariables& f)
+ {
+ GlobalPosition velocity(0.0);
+ velocity[scvf.directionIndex()] = f.velocitySelf();
+ return velocity;
+ };
+
+ vtk.addFaceVariable(faceVelocityVector, "faceVelocity");
+ }
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/freeflow/staggered/vtkoutputmodule.hh b/dumux/freeflow/staggered/vtkoutputmodule.hh
deleted file mode 100644
index 3a55f7c8281ebed939b0c0e6e933131c7fdddf43..0000000000000000000000000000000000000000
--- a/dumux/freeflow/staggered/vtkoutputmodule.hh
+++ /dev/null
@@ -1,86 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief A VTK output module to simplify writing dumux simulation data to VTK format.
- * This is a specialization for a staggered free-flow implementation on a regular grid.
- */
-#ifndef FREEFLOW_STAGGERED_VTK_OUTPUT_MODULE_HH
-#define FREEFLOW_STAGGERED_VTK_OUTPUT_MODULE_HH
-
-#include <dune/common/fvector.hh>
-
-#include <dumux/io/staggeredvtkoutputmodule.hh>
-#include <dumux/discretization/staggered/freeflow/staggeredgeometryhelper.hh>
-
-namespace Properties
-{
-NEW_PROP_TAG(VtkAddVelocity);
-NEW_PROP_TAG(VtkAddProcessRank);
-}
-
-namespace Dumux
-{
-
-/*!
- * \ingroup InputOutput
- * \brief A VTK output module to simplify writing dumux simulation data to VTK format
- * This is a specialization for a staggered free-flow implementation on a regular grid.
- */
-template<typename TypeTag>
-class FreeFlowStaggeredVtkOutputModule : public StaggeredVtkOutputModule<TypeTag>
-{
- friend class StaggeredVtkOutputModule<TypeTag>;
- using ParentType = StaggeredVtkOutputModule<TypeTag>;
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
-
- using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
- typename DofTypeIndices::FaceIdx faceIdx;
-
- using Data = std::vector<std::vector<Scalar>>;
-
-public:
- FreeFlowStaggeredVtkOutputModule(const Problem& problem,
- Dune::VTK::DataMode dm = Dune::VTK::conforming) : ParentType(problem, dm)
-
- {}
-
-private:
-
- /*!
- * \brief Retrives vector-valued data from the face. This is a specialization for a free-flow implementation on a regular grid.
- *
- * \param priVarVectorData Container to store the data
- * \param face The face
- */
- template<class Face>
- void getPrivarVectorData_(Data& priVarVectorData, const Face& face)
- {
- const int dofIdxGlobal = face.dofIndex();
- const int dirIdx = directionIndex(face.unitOuterNormal());
- const Scalar velocity = this->problem().model().curSol()[faceIdx][dofIdxGlobal][0];
- for (int i = 0; i < this->priVarVectorDataInfo_.size(); ++i)
- priVarVectorData[i][dofIdxGlobal * this->priVarVectorDataInfo_[i].pvIdx.size() + dirIdx] = velocity;
- }
-};
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/freeflow/staggerednc/fluxvariables.hh b/dumux/freeflow/staggerednc/fluxvariables.hh
index ae4a1c6574fc62824519dc7137bf5c5fd55f838c..8639c26ebfbac28cd785f22749cd9c9f1658bdd1 100644
--- a/dumux/freeflow/staggerednc/fluxvariables.hh
+++ b/dumux/freeflow/staggerednc/fluxvariables.hh
@@ -23,7 +23,7 @@
#ifndef DUMUX_FREELOW_IMPLICIT_NC_FLUXVARIABLES_HH
#define DUMUX_FREELOW_IMPLICIT_NC_FLUXVARIABLES_HH
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/properties.hh>
#include <dumux/discretization/fluxvariablesbase.hh>
#include "../staggered/fluxvariables.hh"
@@ -36,6 +36,7 @@ namespace Properties
NEW_PROP_TAG(EnableComponentTransport);
NEW_PROP_TAG(EnableEnergyBalance);
NEW_PROP_TAG(EnableInertiaTerms);
+NEW_PROP_TAG(ElementFaceVariables);
}
// // forward declaration
@@ -60,7 +61,7 @@ class FreeFlowFluxVariablesImpl<TypeTag, true> : public FreeFlowFluxVariablesImp
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
+ using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
@@ -95,17 +96,18 @@ class FreeFlowFluxVariablesImpl<TypeTag, true> : public FreeFlowFluxVariablesImp
};
public:
+
CellCenterPrimaryVariables computeFluxForCellCenter(const Problem& problem,
const Element &element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars,
+ const ElementFaceVariables& elemFaceVars,
const SubControlVolumeFace &scvf,
const FluxVariablesCache& fluxVarsCache)
{
CellCenterPrimaryVariables flux(0.0);
- flux += advectiveFluxForCellCenter_(problem, fvGeometry, elemVolVars, globalFaceVars, scvf);
+ flux += advectiveFluxForCellCenter_(problem, fvGeometry, elemVolVars, elemFaceVars, scvf);
flux += MolecularDiffusionType::diffusiveFluxForCellCenter(problem, fvGeometry, elemVolVars, scvf);
return flux;
}
@@ -115,7 +117,7 @@ private:
CellCenterPrimaryVariables advectiveFluxForCellCenter_(const Problem& problem,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars,
+ const ElementFaceVariables& elemFaceVars,
const SubControlVolumeFace &scvf)
{
CellCenterPrimaryVariables flux(0.0);
@@ -123,10 +125,10 @@ private:
const auto& insideScv = fvGeometry.scv(scvf.insideScvIdx());
const auto& insideVolVars = elemVolVars[insideScv];
- const Scalar velocity = globalFaceVars.faceVars(scvf.dofIndex()).velocity();
+ const Scalar velocity = elemFaceVars[scvf].velocitySelf();
const bool insideIsUpstream = sign(scvf.outerNormalScalar()) == sign(velocity);
- const Scalar upWindWeight = GET_PROP_VALUE(TypeTag, ImplicitUpwindWeight);
+ const Scalar upWindWeight = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Implicit.UpwindWeight");
for (int compIdx = 0; compIdx < numComponents; ++compIdx)
{
diff --git a/dumux/freeflow/staggerednc/indices.hh b/dumux/freeflow/staggerednc/indices.hh
index b68c4d4ea0c6b0c992d1f8acb13854b6c178ee0d..d6a83c1eff5913d812d4a944b84a62309cac3bf3 100644
--- a/dumux/freeflow/staggerednc/indices.hh
+++ b/dumux/freeflow/staggerednc/indices.hh
@@ -24,6 +24,7 @@
#define DUMUX_STAGGERED_NAVIERSTOKES_NC_INDICES_HH
#include <dumux/freeflow/staggered/indices.hh>
+#include <dumux/common/properties.hh>
namespace Dumux
{
diff --git a/dumux/freeflow/staggerednc/localresidual.hh b/dumux/freeflow/staggerednc/localresidual.hh
index 0fb4538ede8936bb1c70cdedda1fc4d08b8e96ca..6edb9805f33ba6d24492498964491645db94cf30 100644
--- a/dumux/freeflow/staggerednc/localresidual.hh
+++ b/dumux/freeflow/staggerednc/localresidual.hh
@@ -23,7 +23,6 @@
#ifndef DUMUX_STAGGERED_NAVIERSTOKES_NC_LOCAL_RESIDUAL_HH
#define DUMUX_STAGGERED_NAVIERSTOKES_NC_LOCAL_RESIDUAL_HH
-#include <dune/istl/matrix.hh>
#include <dumux/common/valgrind.hh>
#include <dumux/implicit/staggered/localresidual.hh>
@@ -65,17 +64,17 @@ class StaggeredNavierStokesResidualImpl<TypeTag, true> : public StaggeredNavierS
friend ParentType;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using CellCenterResidual = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
typename DofTypeIndices::CellCenterIdx cellCenterIdx;
- typename DofTypeIndices::FaceIdx faceIdx;
enum {
conti0EqIdx = Indices::conti0EqIdx,
@@ -87,12 +86,13 @@ class StaggeredNavierStokesResidualImpl<TypeTag, true> : public StaggeredNavierS
};
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
using EnergyLocalResidual = typename GET_PROP_TYPE(TypeTag, EnergyLocalResidual);
static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents);
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
+public:
+ using ParentType::ParentType;
/*!
* \brief Evaluate the rate of change of all conservation
@@ -104,7 +104,8 @@ class StaggeredNavierStokesResidualImpl<TypeTag, true> : public StaggeredNavierS
* \note The volVars can be different to allow computing
* the implicit euler time derivative here
*/
- CellCenterPrimaryVariables computeStorageForCellCenter(const SubControlVolume& scv,
+ CellCenterPrimaryVariables computeStorageForCellCenter(const Problem& problem,
+ const SubControlVolume& scv,
const VolumeVariables& volVars) const
{
CellCenterPrimaryVariables storage(0.0);
@@ -141,11 +142,13 @@ protected:
* \param elemVolVars The current or previous element volVars
* \param bcTypes The boundary types
*/
- void setFixedCell_(const SubControlVolume& insideScv,
+ void setFixedCell_(CellCenterResidual& residual,
+ const Problem& problem,
+ const SubControlVolume& insideScv,
const ElementVolumeVariables& elemVolVars,
- const BoundaryTypes& bcTypes)
+ const BoundaryTypes& bcTypes) const
{
- ParentType::setFixedCell_(insideScv, elemVolVars, bcTypes);
+ ParentType::setFixedCell_(residual, problem, insideScv, elemVolVars, bcTypes);
for (int compIdx = 0; compIdx < numComponents; ++compIdx)
{
@@ -157,7 +160,7 @@ protected:
{
const auto& insideVolVars = elemVolVars[insideScv];
const Scalar massOrMoleFraction = useMoles ? insideVolVars.moleFraction(phaseIdx, compIdx) : insideVolVars.massFraction(phaseIdx, compIdx);
- this->ccResidual_[eqIdx] = massOrMoleFraction - this->problem().dirichletAtPos(insideScv.center())[cellCenterIdx][eqIdx];
+ residual[eqIdx] = massOrMoleFraction - problem.dirichletAtPos(insideScv.center())[cellCenterIdx][eqIdx];
}
}
diff --git a/dumux/freeflow/staggerednc/model.hh b/dumux/freeflow/staggerednc/model.hh
index f65194ab28971e01cc8140bc36b3dd00e16a5a5f..1c6c25cb78db68c0b86e3549500b168626eed0c9 100644
--- a/dumux/freeflow/staggerednc/model.hh
+++ b/dumux/freeflow/staggerednc/model.hh
@@ -27,15 +27,9 @@
#ifndef DUMUX_NAVIERSTOKES_NC_MODEL_HH
#define DUMUX_NAVIERSTOKES_NC_MODEL_HH
-// #include <dumux/porousmediumflow/implicit/velocityoutput.hh>
-#include "properties.hh"
-#include "../staggered/model.hh"
-#include "../staggeredni/model.hh"
-namespace Dumux
-{
/*!
- * \ingroup NavierStokesModel
+ * \ingroup NavierStokesModel TODO: doc me properly!
* \brief A single-phase, isothermal flow model using the fully implicit scheme.
*
* Single-phase, isothermal flow model, which uses a standard Darcy approach as the
@@ -55,63 +49,6 @@ namespace Dumux
* and the implicit Euler method as time discretization.
* The model supports compressible as well as incompressible fluids.
*/
-template<class TypeTag >
-class NavierStokesNCModel : public NavierStokesModel<TypeTag>
-{
- using ParentType = NavierStokesModel<TypeTag>;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FVGridGeometry) FVGridGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum { dim = GridView::dimension };
- enum { dimWorld = GridView::dimensionworld };
-
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dim : 0 };
- using Element = typename GridView::template Codim<0>::Entity;
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
-
- static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents);
-
- using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
- typename DofTypeIndices::CellCenterIdx cellCenterIdx;
- typename DofTypeIndices::FaceIdx faceIdx;
-
- enum { phaseIdx = Indices::phaseIdx };
-
-public:
-
- void init(Problem& problem)
- {
- ParentType::init(problem);
-
- // register standardized vtk output fields
- auto& vtkOutputModule = problem.vtkOutputModule();
- vtkOutputModule.addSecondaryVariable("rhoMolar",[](const VolumeVariables& v){ return v.molarDensity(); });
- vtkOutputModule.addSecondaryVariable("rho",[](const VolumeVariables& v){ return v.density(); });
- for (int j = 0; j < numComponents; ++j)
- {
- vtkOutputModule.addSecondaryVariable("X^" + FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(phaseIdx),
- [j](const VolumeVariables& v){ return v.massFraction(phaseIdx,j); });
-
- vtkOutputModule.addSecondaryVariable("x^" + FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(phaseIdx),
- [j](const VolumeVariables& v){ return v.moleFraction(phaseIdx,j); });
- }
-
-// NonIsothermalModel::maybeAddTemperature(vtkOutputModule);
- }
-};
-}
-
-#include "propertydefaults.hh"
#endif
diff --git a/dumux/freeflow/staggerednc/properties.hh b/dumux/freeflow/staggerednc/properties.hh
index 4fdcc281361f1e882df54be7320fbfc3c67ead3b..e3cf94efcb7243d0bbfa3fba594f84f97a9f1f2c 100644
--- a/dumux/freeflow/staggerednc/properties.hh
+++ b/dumux/freeflow/staggerednc/properties.hh
@@ -29,6 +29,19 @@
#include <dumux/freeflow/staggered/properties.hh>
#include <dumux/freeflow/staggeredni/properties.hh>
+#include <dumux/discretization/fickslaw.hh>
+
+#include "volumevariables.hh"
+#include "indices.hh"
+#include "localresidual.hh"
+#include "fluxvariables.hh"
+#include "vtkoutputfields.hh"
+
+#include <dumux/implicit/staggered/localresidual.hh>
+#include <dumux/material/fluidsystems/gasphase.hh>
+#include <dumux/material/fluidsystems/liquidphase.hh>
+
+#include <dumux/material/fluidstates/compositional.hh>
namespace Dumux
{
@@ -46,27 +59,74 @@ namespace Properties {
NEW_TYPE_TAG(NavierStokesNC, INHERITS_FROM(NavierStokes));
NEW_TYPE_TAG(NavierStokesNCNI, INHERITS_FROM(NavierStokesNC, NavierStokesNonIsothermal));
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
+// default property values for the isothermal single phase model
+///////////////////////////////////////////////////////////////////////////
+SET_PROP(NavierStokesNC, NumEqCellCenter)
+{
+private:
+ static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents);
+public:
+ static constexpr int value = numComponents;
+};
+
+SET_INT_PROP(NavierStokesNC, ReplaceCompEqIdx, 0);
+
+/*!
+* \brief Set the property for the number of components.
+*
+* We just forward the number from the fluid system
+*
+*/
+SET_PROP(NavierStokesNC, NumComponents)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+
+public:
+ static constexpr int value = FluidSystem::numComponents;
+
+};
+
+//! the VolumeVariables property
+SET_TYPE_PROP(NavierStokesNC, VolumeVariables, NavierStokesNCVolumeVariables<TypeTag>);
+SET_TYPE_PROP(NavierStokesNC, Indices, NavierStokesNCIndices<TypeTag>);
+
+/*!
+ * \brief The fluid state which is used by the volume variables to
+ * store the thermodynamic state. This should be chosen
+ * appropriately for the model ((non-)isothermal, equilibrium, ...).
+ * This can be done in the problem.
+ */
+SET_PROP(NavierStokesNC, FluidState)
+{
+ private:
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+ public:
+ using type = CompositionalFluidState<Scalar, FluidSystem>;
+};
+
+SET_BOOL_PROP(NavierStokesNC, EnableComponentTransport, true);
+
+//! The one-phase model has no molecular diffusion
+SET_BOOL_PROP(NavierStokesNC, EnableMolecularDiffusion, true);
+
+SET_TYPE_PROP(NavierStokesNC, MolecularDiffusionType, FicksLaw<TypeTag>);
+
+SET_BOOL_PROP(NavierStokesNC, UseMoles, false); //!< Defines whether molar (true) or mass (false) density is used
+
+SET_INT_PROP(NavierStokesNC, PhaseIdx, 0); //!< Defines the phaseIdx
+
+SET_TYPE_PROP(NavierStokesNC, VtkOutputFields, NavierStokesNCVtkOutputFields<TypeTag>); //! the vtk output fields
+
+// non-isothermal properties
+SET_INT_PROP(NavierStokesNCNI, IsothermalNumEqCellCenter, GET_PROP_VALUE(TypeTag, NumComponents)); //!< set the number of equations on the cell centers
+SET_INT_PROP(NavierStokesNCNI, IsothermalNumEqFace, 1); //!< set the number of equations on the faces
+SET_TYPE_PROP(NavierStokesNCNI, IsothermalIndices, NavierStokesNCIndices<TypeTag>); //! the isothermal indices
+SET_TYPE_PROP(NavierStokesNCNI, IsothermalVtkOutputFields, NavierStokesNCVtkOutputFields<TypeTag>); //! the isothermal vtk output fields
+
-NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system
-NEW_PROP_TAG(Indices); //!< Enumerations for the model
-NEW_PROP_TAG(FluidSystem); //!< The type of the fluid system to use
-NEW_PROP_TAG(Fluid); //!< The fluid used for the default fluid system
-NEW_PROP_TAG(FluidState); //!< The type of the fluid state to use
-NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(ImplicitMassUpwindWeight); //!< Returns weight of the upwind cell when calculating fluxes
-NEW_PROP_TAG(ImplicitMobilityUpwindWeight); //!< Weight for the upwind mobility in the velocity calculation
-NEW_PROP_TAG(VtkAddVelocity); //!< Returns whether velocity vectors are written into the vtk output
-NEW_PROP_TAG(EnableInertiaTerms); //!< Returns whether to include inertia terms in the momentum balance eq or not (Stokes / Navier-Stokes)
-NEW_PROP_TAG(BoundaryValues); //!< Type to set values on the boundary
-NEW_PROP_TAG(EnableComponentTransport); //!< Returns whether to consider component transport or not
-NEW_PROP_TAG(EnableEnergyTransport); //!< Returns whether to consider energy transport or not
-NEW_PROP_TAG(FaceVariables); //!< Returns whether to consider energy transport or not
-NEW_PROP_TAG(ReplaceCompEqIdx); //!< Returns whether to consider energy transport or not
-NEW_PROP_TAG(UseMoles); //!< Defines whether molar (true) or mass (false) density is used
-NEW_PROP_TAG(PhaseIdx); //!< Defines the phaseIdx
// \}
}
diff --git a/dumux/freeflow/staggerednc/propertydefaults.hh b/dumux/freeflow/staggerednc/propertydefaults.hh
deleted file mode 100644
index 56a901194a666338d0c58312c4173fbcb589470c..0000000000000000000000000000000000000000
--- a/dumux/freeflow/staggerednc/propertydefaults.hh
+++ /dev/null
@@ -1,143 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup OnePModel
- * \file
- *
- * \brief Defines the properties required for the one-phase fully implicit model.
- */
-#ifndef DUMUX_NAVIER_STOKES_NC_PROPERTY_DEFAULTS_HH
-#define DUMUX_NAVIER_STOKES_NC_PROPERTY_DEFAULTS_HH
-
-#include "properties.hh"
-
-#include "model.hh"
-#include "volumevariables.hh"
-#include "indices.hh"
-#include "localresidual.hh"
-#include "fluxvariables.hh"
-#include "../staggered/problem.hh"
-#include "../staggered/propertydefaults.hh"
-
-
-#include <dumux/implicit/staggered/localresidual.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
-#include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/material/components/nullcomponent.hh>
-#include <dumux/material/fluidsystems/1p.hh>
-
-#include <dumux/material/fluidstates/compositional.hh>
-
-
-namespace Dumux
-{
-
-namespace Properties
-{
-// forward declaration
-NEW_PROP_TAG(FluxVariables);
-NEW_PROP_TAG(FluxVariablesCache);
-}
-// \{
-
-///////////////////////////////////////////////////////////////////////////
-// default property values for the isothermal single phase model
-///////////////////////////////////////////////////////////////////////////
-namespace Properties {
-
-SET_PROP(NavierStokesNC, NumEqCellCenter)
-{
-private:
- static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents);
-public:
- static constexpr int value = numComponents;
-};
-
-
-SET_INT_PROP(NavierStokesNC, ReplaceCompEqIdx, 0);
-
-
- /*!
- * \brief Set the property for the number of components.
- *
- * We just forward the number from the fluid system
- *
- */
-SET_PROP(NavierStokesNC, NumComponents)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-
-public:
- static constexpr int value = FluidSystem::numComponents;
-
-};
-
-
-//! the VolumeVariables property
-SET_TYPE_PROP(NavierStokesNC, VolumeVariables, NavierStokesNCVolumeVariables<TypeTag>);
-SET_TYPE_PROP(NavierStokesNC, Model, NavierStokesNCModel<TypeTag>);
-SET_TYPE_PROP(NavierStokesNC, Indices, NavierStokesNCIndices<TypeTag>);
-
-
-/*!
- * \brief The fluid state which is used by the volume variables to
- * store the thermodynamic state. This should be chosen
- * appropriately for the model ((non-)isothermal, equilibrium, ...).
- * This can be done in the problem.
- */
-SET_PROP(NavierStokesNC, FluidState)
-{
- private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- public:
- typedef CompositionalFluidState<Scalar, FluidSystem> type;
-};
-
-//
-SET_BOOL_PROP(NavierStokesNC, EnableComponentTransport, true);
-
-SET_BOOL_PROP(NavierStokesNC, UseMoles, false); //!< Defines whether molar (true) or mass (false) density is used
-
-SET_INT_PROP(NavierStokesNC, PhaseIdx, 0); //!< Defines the phaseIdx
-
-
-//////////////////////////////////////////////////////////////////
-// Property values for isothermal model required for the general non-isothermal model
-//////////////////////////////////////////////////////////////////
-
-// set isothermal Model
-SET_TYPE_PROP(NavierStokesNCNI, IsothermalModel, NavierStokesNCModel<TypeTag>);
-
-//set isothermal Indices
-SET_TYPE_PROP(NavierStokesNCNI, IsothermalIndices, NavierStokesNCIndices<TypeTag>);
-
-//set isothermal NumEq
-SET_INT_PROP(NavierStokesNCNI, IsothermalNumEqCellCenter, 2); //!< set the number of equations to 1
-SET_INT_PROP(NavierStokesNCNI, IsothermalNumEqFace, 1); //!< set the number of equations
-
-// \}
-} // end namespace Properties
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/freeflow/staggerednc/vtkoutputfields.hh b/dumux/freeflow/staggerednc/vtkoutputfields.hh
new file mode 100644
index 0000000000000000000000000000000000000000..00babf1aa48d6bf631419226171f279e47810780
--- /dev/null
+++ b/dumux/freeflow/staggerednc/vtkoutputfields.hh
@@ -0,0 +1,66 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Adds vtk output fields specific to the NavierStokesNC model
+ */
+#ifndef DUMUX_NAVIER_STOKES_NC_VTK_OUTPUT_FIELDS_HH
+#define DUMUX_NAVIER_STOKES_NC_VTK_OUTPUT_FIELDS_HH
+
+#include <dumux/common/properties.hh>
+#include <dumux/freeflow/staggered/vtkoutputfields.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup TwoP, InputOutput
+ * \brief Adds vtk output fields specific to the NavierStokesNC model
+ */
+template<class TypeTag>
+class NavierStokesNCVtkOutputFields : NavierStokesVtkOutputFields<TypeTag>
+{
+ using ParentType = NavierStokesVtkOutputFields<TypeTag>;
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+
+ static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents);
+ static constexpr int phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx);
+
+public:
+ template <class VtkOutputModule>
+ static void init(VtkOutputModule& vtk)
+ {
+ ParentType::init(vtk);
+
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.molarDensity(); }, "rhoMolar");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.density(); }, "rho");
+
+ for (int j = 0; j < numComponents; ++j)
+ {
+ vtk.addVolumeVariable([j](const VolumeVariables& v){ return v.massFraction(phaseIdx,j); }, "X^" + FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(phaseIdx));
+ vtk.addVolumeVariable([j](const VolumeVariables& v){ return v.moleFraction(phaseIdx,j); }, "x^" + FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(phaseIdx));
+ }
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/freeflow/staggeredni/fluxvariables.hh b/dumux/freeflow/staggeredni/fluxvariables.hh
index 34d8b7f6b49de94ec130adbb7d76310073871297..028f37129637114fd6186e50f69c2c60c4f32350 100644
--- a/dumux/freeflow/staggeredni/fluxvariables.hh
+++ b/dumux/freeflow/staggeredni/fluxvariables.hh
@@ -23,11 +23,16 @@
#ifndef DUMUX_FREELOW_IMPLICIT_NI_FLUXVARIABLES_HH
#define DUMUX_FREELOW_IMPLICIT_NI_FLUXVARIABLES_HH
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/basicproperties.hh>
namespace Dumux
{
+namespace Properties
+{
+ NEW_PROP_TAG(ElementFaceVariables);
+}
+
/*!
* \ingroup ImplicitModel
* \brief The flux variables class
@@ -52,7 +57,7 @@ class FreeFlowEnergyFluxVariablesImplementation<TypeTag, false>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
+ using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
@@ -64,7 +69,7 @@ public:
const Element &element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars,
+ const ElementFaceVariables& elemFaceVars,
const SubControlVolumeFace &scvf,
const FluxVariablesCache& fluxVarsCache)
{ }
@@ -82,7 +87,7 @@ class FreeFlowEnergyFluxVariablesImplementation<TypeTag, true>
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
+ using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
@@ -98,11 +103,11 @@ public:
const Element &element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars,
+ const ElementFaceVariables& elemFaceVars,
const SubControlVolumeFace &scvf,
const FluxVariablesCache& fluxVarsCache)
{
- flux[energyBalanceIdx] += advectiveFluxForCellCenter_(problem, fvGeometry, elemVolVars, globalFaceVars, scvf);
+ flux[energyBalanceIdx] += advectiveFluxForCellCenter_(problem, fvGeometry, elemVolVars, elemFaceVars, scvf);
flux[energyBalanceIdx] += HeatConductionType::diffusiveFluxForCellCenter(problem, element, fvGeometry, elemVolVars, scvf);
}
@@ -112,13 +117,13 @@ private:
* \param problem The problem
* \param fvGeometry The finite-volume geometry
* \param elemVolVars All volume variables for the element
- * \param globalFaceVars The face variables
+ * \param elemFaceVars The face variables
* \param scvf The sub control volume face
*/
static Scalar advectiveFluxForCellCenter_(const Problem& problem,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars,
+ const ElementFaceVariables& elemFaceVars,
const SubControlVolumeFace &scvf)
{
Scalar flux(0.0);
@@ -138,13 +143,13 @@ private:
const auto& outsideVolVars = isOutflow ? insideVolVars : elemVolVars[scvf.outsideScvIdx()];
- const Scalar velocity = globalFaceVars.faceVars(scvf.dofIndex()).velocity();
+ const Scalar velocity = elemFaceVars[scvf].velocitySelf();
const bool insideIsUpstream = sign(scvf.outerNormalScalar()) == sign(velocity);
const auto& upstreamVolVars = insideIsUpstream ? insideVolVars : outsideVolVars;
const auto& downstreamVolVars = insideIsUpstream ? outsideVolVars : insideVolVars;
- const Scalar upWindWeight = GET_PROP_VALUE(TypeTag, ImplicitUpwindWeight);
+ static const Scalar upWindWeight = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Implicit.UpwindWeight");
const Scalar upstreamDensity = upstreamVolVars.density();
const Scalar downstreamDensity = downstreamVolVars.density();
const Scalar upstreamEnthalpy = upstreamVolVars.enthalpy();
diff --git a/dumux/freeflow/staggeredni/properties.hh b/dumux/freeflow/staggeredni/properties.hh
index b3bbc8f45fa067d509dcae2154ec2e22bcef22b3..f8635e9972f48d404e4bd2025155c9efde639b4d 100644
--- a/dumux/freeflow/staggeredni/properties.hh
+++ b/dumux/freeflow/staggeredni/properties.hh
@@ -19,47 +19,55 @@
/*!
* \ingroup Properties
* \ingroup ImplicitProperties
- * \ingroup NavierStokesModel
+ * \ingroup OnePModel
* \file
*
* \brief Defines the properties required for the one-phase fully implicit model.
*/
-#ifndef DUMUX_NAVIERSTOKES_NI_PROPERTIES_HH
-#define DUMUX_NAVIERSTOKES_NI_PROPERTIES_HH
+#ifndef DUMUX_NAVIER_STOKES_NI_PROPERTIES_HH
+#define DUMUX_NAVIER_STOKES_NI_PROPERTIES_HH
-#include <dumux/implicit/properties.hh>
+#include "fluxvariables.hh"
+#include "indices.hh"
+#include "localresidual.hh"
+#include "vtkoutputfields.hh"
+#include <dumux/discretization/fourierslaw.hh>
namespace Dumux
{
+
// \{
-///////////////////////////////////////////////////////////////////////////
-// properties for the isothermal Navier-Stokes model
-///////////////////////////////////////////////////////////////////////////
-namespace Properties {
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
+namespace Properties {
//! The type tags for the non-isothermal Navier Stokes problems
NEW_TYPE_TAG(NavierStokesNonIsothermal);
-//////////////////////////////////////////////////////////////////
-// Property tags required for the non-isothermal models
-//////////////////////////////////////////////////////////////////
-
-NEW_PROP_TAG(IsothermalModel);
-NEW_PROP_TAG(IsothermalFluxVariables);
-NEW_PROP_TAG(IsothermalIndices);
NEW_PROP_TAG(IsothermalNumEqCellCenter);
NEW_PROP_TAG(IsothermalNumEqFace);
-NEW_PROP_TAG(HaveVariableFormulation);
-NEW_PROP_TAG(ThermalConductivityModel);
-NEW_PROP_TAG(NiOutputLevel);
-// \}
-}
+///////////////////////////////////////////////////////////////////////////
+// default property values for the non-isothermal single phase model
+///////////////////////////////////////////////////////////////////////////
+
+SET_PROP(NavierStokesNonIsothermal, NumEqCellCenter)
+{
+private:
+ static constexpr auto isothermalNumEqCellCenter = GET_PROP_VALUE(TypeTag, IsothermalNumEqCellCenter);
+public:
+ static constexpr auto value = isothermalNumEqCellCenter + 1;
+};
+
+SET_TYPE_PROP(NavierStokesNonIsothermal, Indices, NavierStokesNonIsothermalIndices<TypeTag>);
+
+SET_TYPE_PROP(NavierStokesNonIsothermal, VtkOutputFields, FreeFlowEnergyVtkOutputFields<TypeTag>);
+
+SET_BOOL_PROP(NavierStokesNonIsothermal, EnableEnergyBalance, true);
+
+SET_TYPE_PROP(NavierStokesNonIsothermal, HeatConductionType, FouriersLaw<TypeTag>);
+
+} // end namespace Properties
-} // end namespace
+} // end namespace Dumux
#endif
diff --git a/dumux/freeflow/staggeredni/vtkoutputfields.hh b/dumux/freeflow/staggeredni/vtkoutputfields.hh
new file mode 100644
index 0000000000000000000000000000000000000000..d90b6da57608f9e4d12df2fa7f6f6442847fa0df
--- /dev/null
+++ b/dumux/freeflow/staggeredni/vtkoutputfields.hh
@@ -0,0 +1,51 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Adds vtk output fields specific to non-isothermal models
+ */
+#ifndef DUMUX_FF_ENERGY_OUTPUT_FIELDS_HH
+#define DUMUX_FF_ENERGY_OUTPUT_FIELDS_HH
+
+#include <dumux/common/properties.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup NonIsothermal, InputOutput
+ * \brief Adds vtk output fields specific to non-isothermal models
+ */
+template<class TypeTag>
+class FreeFlowEnergyVtkOutputFields
+{
+ using IsothermalVtkOutputFields = typename GET_PROP_TYPE(TypeTag, IsothermalVtkOutputFields);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+public:
+ template <class VtkOutputModule>
+ static void init(VtkOutputModule& vtk)
+ {
+ IsothermalVtkOutputFields::init(vtk);
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.temperature(); }, "temperature");
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/geomechanics/CMakeLists.txt b/dumux/geomechanics/CMakeLists.txt
deleted file mode 100644
index 317ac1cf3564d3219e6211b0faf40a852dce5665..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-add_subdirectory("el1p2c")
-add_subdirectory("el2p")
-add_subdirectory("elastic")
-add_subdirectory("implicit")
-add_subdirectory("constitutivelaws")
\ No newline at end of file
diff --git a/dumux/geomechanics/constitutivelaws/CMakeLists.txt b/dumux/geomechanics/constitutivelaws/CMakeLists.txt
deleted file mode 100644
index 513c666aeefecd41e73de8899ee9b040504d7a13..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/constitutivelaws/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#install headers
-install(FILES
-hokeslaw.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/geomechanics/constitutivelaws)
diff --git a/dumux/geomechanics/constitutivelaws/hookeslaw.hh b/dumux/geomechanics/constitutivelaws/hookeslaw.hh
deleted file mode 100644
index 8e425a76f5ed0e5861295a9ea75087b088911ee7..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/constitutivelaws/hookeslaw.hh
+++ /dev/null
@@ -1,313 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief This file contains the data which is required to calculate
- * the mechanic stresses according to Hooke's law.
- */
-#ifndef DUMUX_GEOMECHANICS_HOOKES_LAW_HH
-#define DUMUX_GEOMECHANICS_HOOKES_LAW_HH
-
-#include <dune/common/float_cmp.hh>
-
-#include <dumux/common/math.hh>
-#include <dumux/common/parameters.hh>
-
-#include <dumux/implicit/properties.hh>
-
-
-namespace Dumux
-{
-
-namespace Properties
-{
-// forward declaration of properties
-}
-
-/*!
- * \ingroup CCTpfaHookesLaw
- * \brief Evaluates the stresses, tractions and compressions on a face according to Hooke's law.
- * Specializations are given for the different discretization methods.
- */
-template <class TypeTag, typename DiscretizationMethod = void>
-class HookesLaw
-{};
-
-template <class TypeTag>
-class HookesLaw<TypeTag, typename std::enable_if<GET_PROP_VALUE(TypeTag, DiscretizationMethod) == GET_PROP(TypeTag, DiscretizationMethods)::CCTpfa>::type >
-{
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace) SubControlVolumeFace;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::IndexSet::IndexType IndexType;
- typedef typename std::vector<IndexType> Stencil;
- typedef typename GridView::template Codim<0>::Entity Element;
-
- enum { dim = GridView::dimension} ;
- static constexpr int voigtDim = 0.5*(dim*dim+dim);
-
- typedef Dune::FieldMatrix<Scalar, voigtDim, voigtDim> StiffnessMatrix;
- typedef Dune::FieldVector<Scalar, voigtDim> VoigtVector;
- typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
- typedef Dune::FieldVector<Scalar, dim> DimVector;
-
- struct FaceData
- {
- Scalar insideLambda, insideMu;
- DimVector insideAlpha, insideN, insideU;
-
- Scalar outsideLambda, outsideMu;
- DimVector outsideAlpha, outsideN, outsideU;
-
- bool valueSet;
-
- FaceData()
- {
- valueSet = false;
- }
- };
-
-public:
-
- static DimVector stressVector(const Problem& problem, const SubControlVolumeFace& scvFace)
- {
- DimMatrix sigma = calculateSigma_(problem, scvFace);
-
- // calculate Sigma*n
- DimVector stressVec(0.0);
- sigma.mv(scvFace.unitOuterNormal(), stressVec);
- stressVec *= scvFace.area();
-
- return stressVec;
- }
-
- static DimMatrix stressTensor(const Problem& problem, const SubControlVolumeFace& scvFace)
- {
- return calculateSigma_(problem, scvFace);
- }
-
- static Stencil stencil(const Problem& problem, const SubControlVolumeFace& scvFace)
- {
- std::vector<IndexType> stencil;
- if (!scvFace.boundary())
- {
- stencil.push_back(scvFace.insideScvIdx());
- stencil.push_back(scvFace.outsideScvIdx());
- }
- else
- stencil.push_back(scvFace.insideScvIdx());
-
- return stencil;
- }
-
- static DimMatrix calculateInversA(const Problem& problem, const SubControlVolumeFace& scvFace)
- {
- FaceData faceData = obtainFaceData_(problem, scvFace);
-
- DimMatrix inversA(0.0);
- addEntriesToMatrix_(faceData.insideLambda, faceData.insideMu, faceData.insideAlpha, faceData.insideN, inversA);
- addEntriesToMatrix_(faceData.outsideLambda, faceData.outsideMu, faceData.outsideAlpha, faceData.outsideN, inversA);
- inversA.invert();
-
- return inversA;
- }
-
- static DimVector interpolateFaceDisplacement(const Problem& problem, const SubControlVolumeFace& scvFace)
- {
- FaceData faceData = obtainFaceData_(problem, scvFace);
- return interpolateFaceDisplacement_(problem, scvFace, faceData);
- }
-
-private:
-
- static FaceData obtainFaceData_(const Problem& problem, const SubControlVolumeFace& scvFace)
- {
- FaceData container;
-
- const auto insideScvIdx = scvFace.insideScvIdx();
- const auto& insideScv = problem.model().fvGeometries().subControlVolume(insideScvIdx);
- const auto& insideVolVars = problem.model().curVolVars(insideScvIdx);
- container.insideU = insideVolVars.displacement();
- container.insideLambda = insideVolVars.lambda();
- container.insideMu = insideVolVars.mu();
- container.insideN = scvFace.unitOuterNormal();
- container.insideAlpha = scvFace.center();
- container.insideAlpha -= insideScv.center();
- container.insideAlpha /= container.insideAlpha.two_norm2();
-
- const auto outsideScvIdx = scvFace.outsideScvIdx();
- const auto& outsideVolVars = problem.model().curVolVars(outsideScvIdx);
- container.outsideU = outsideVolVars.displacement();
- container.outsideLambda = outsideVolVars.lambda();
- container.outsideMu = outsideVolVars.mu();
- container.outsideN = scvFace.unitOuterNormal();
- container.outsideN *= -1;
- if (scvFace.boundary())
- container.outsideAlpha = 0.0;
- else
- {
- const auto& outsideScv = problem.model().fvGeometries().subControlVolume(outsideScvIdx);
- container.outsideAlpha = scvFace.center();
- container.outsideAlpha -= outsideScv.center();
- container.outsideAlpha /= container.outsideAlpha.two_norm2();
- }
-
- container.valueSet = true;
-
- return container;
- }
-
- static DimMatrix calculateSigma_(const Problem& problem, const SubControlVolumeFace& scvFace)
- {
- DimMatrix sigma(0.0);
- StiffnessMatrix C(0.0);
- VoigtVector voigtStrain(0.0);
- VoigtVector voigtSigma(0.0);
-
- FaceData faceData = obtainFaceData_(problem, scvFace);
- DimVector faceU = interpolateFaceDisplacement_(problem, scvFace, faceData);
-
- fillStiffnessMatrix_(C, faceData.insideLambda, faceData.insideMu);
- fillStrainVector_(voigtStrain, faceData.insideAlpha, faceData.insideU, faceU);
-
- C.mv(voigtStrain, voigtSigma);
-
- if (dim == 2)
- {
- sigma[0][0] = voigtSigma[0];
- sigma[0][1] = voigtSigma[2];
- sigma[1][0] = voigtSigma[2];
- sigma[1][1] = voigtSigma[1];
- }
- else
- DUNE_THROW(Dune::NotImplemented, "dim = " << dim << " is not implemented yet");
-
- return sigma;
- }
-
- static DimVector interpolateFaceDisplacement_(const Problem& problem, const SubControlVolumeFace& scvFace, const FaceData& faceData, const bool oldSol = false)
- {
- DimVector faceU(0.0);
-
- if (!scvFace.boundary())
- {
- DimMatrix inversA(0.0);
- DimMatrix insideB(0.0);
- DimMatrix outsideB(0.0);
-
- getInversA_(problem, scvFace, faceData, inversA);
- addEntriesToMatrix_(faceData.insideLambda, faceData.insideMu, faceData.insideAlpha, faceData.insideN, insideB);
- addEntriesToMatrix_(faceData.outsideLambda, faceData.outsideMu, faceData.outsideAlpha, faceData.outsideN, outsideB);
-
- DimVector insideTmp(0.0);
- DimVector outsideTmp(0.0);
- insideB.mv(faceData.insideU, insideTmp);
- outsideB.mv(faceData.outsideU, outsideTmp);
-
- insideTmp += outsideTmp;
-
- inversA.mv(insideTmp, faceU);
- }
- else
- {
- if (!oldSol)
- {
- try { return problem.model().curVolVars(scvFace.outsideScvIdx()).displacement(); }
- catch (Dune::Exception& e)
- {
- DUNE_THROW(Dune::InvalidStateException, "Error ocurred during the displacement interpolation on a boundary scv face. Only call this method on inner scv faces or pure Dirichlet boundaries with the volvars bound to the element");
- }
- }
- else
- {
- // TODO
- DUNE_THROW(Dune::NotImplemented, "Reconstruction of the previous boundary vol vars not yet implemented");
- }
- }
-
- return faceU;
- }
-
- template<typename T = TypeTag>
- static typename std::enable_if<GET_PROP_VALUE(T, EnableFluxVariablesCache)>::type getInversA_(const Problem& problem,
- const SubControlVolumeFace& scvFace,
- const FaceData& faceData,
- DimMatrix& inversA)
- { inversA = problem.model().fluxVarsCache(scvFace).inversA(); }
-
- template<typename T = TypeTag>
- static typename std::enable_if<!GET_PROP_VALUE(T, EnableFluxVariablesCache)>::type getInversA_(const Problem& problem,
- const SubControlVolumeFace& scvFace,
- const FaceData& faceData,
- DimMatrix& inversA)
- {
- addEntriesToMatrix_(faceData.insideLambda, faceData.insideMu, faceData.insideAlpha, faceData.insideN, inversA);
- addEntriesToMatrix_(faceData.outsideLambda, faceData.outsideMu, faceData.outsideAlpha, faceData.outsideN, inversA);
- inversA.invert();
- }
-
- static void addEntriesToMatrix_(const Scalar lambda, const Scalar mu, const DimVector& alpha, const DimVector& normal, DimMatrix& matrix)
- {
- if (dim == 2)
- {
- matrix[0][0] += (lambda + 2*mu)*alpha[0]*normal[0] + mu*alpha[1]*normal[1];
- matrix[0][1] += lambda*alpha[1]*normal[0] + mu*alpha[0]*normal[1];
- matrix[1][0] += mu*alpha[1]*normal[0] + lambda*alpha[0]*normal[1];
- matrix[1][1] += mu*alpha[0]*normal[0] + (lambda + 2*mu)*alpha[1]*normal[1];
- }
- else
- DUNE_THROW(Dune::NotImplemented, "dim = " << dim << " is not implemented yet");
- }
-
- static void fillStiffnessMatrix_(StiffnessMatrix& C, const Scalar lambda, const Scalar mu)
- {
- if (dim == 2)
- {
- C[0][0] = lambda + 2*mu;
- C[0][1] = lambda;
- C[0][2] = 0.0;
-
- C[1][0] = lambda;
- C[1][1] = lambda + 2*mu;
- C[1][2] = 0.0;
-
- C[2][0] = 0.0;
- C[2][1] = 0.0;
- C[2][2] = mu;
- }
- }
-
- static void fillStrainVector_(VoigtVector& strain, const DimVector& alpha, const DimVector& insideU, const DimVector& faceU)
- {
- if (dim == 2)
- {
- strain[0] = alpha[0]*(faceU[0] - insideU[0]);
- strain[1] = alpha[1]*(faceU[1] - insideU[1]);
- strain[2] = alpha[1]*(faceU[0] - insideU[0]) + alpha[0]*(faceU[1] - insideU[1]);
- }
- }
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/CMakeLists.txt b/dumux/geomechanics/el1p2c/CMakeLists.txt
deleted file mode 100644
index b1d385c69a89719def138462fc0a42ce5cc3c9ff..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#install headers
-install(FILES
-elementvolumevariables.hh
-fluxvariables.hh
-indices.hh
-localjacobian.hh
-localresidual.hh
-model.hh
-properties.hh
-propertydefaults.hh
-volumevariables.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/geomechanics/el1p2c)
diff --git a/dumux/geomechanics/el1p2c/elementvolumevariables.hh b/dumux/geomechanics/el1p2c/elementvolumevariables.hh
deleted file mode 100644
index 4e422d0ad11682b99f52ef274b002078eed44e60..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/elementvolumevariables.hh
+++ /dev/null
@@ -1,146 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Volume variables gathered on an element
- */
-#ifndef DUMUX_BOX_EL1P2C_ELEMENT_VOLUME_VARIABLES_HH
-#define DUMUX_BOX_EL1P2C_ELEMENT_VOLUME_VARIABLES_HH
-
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/box/elementvolumevariables.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup ElOnePTwoCBoxModel
- *
- * \brief This class stores an array of VolumeVariables objects, one
- * volume variables object for each of the element's vertices
- */
-template<class TypeTag>
-class ElOnePTwoCElementVolumeVariables : public BoxElementVolumeVariables<TypeTag>
-{
- typedef BoxElementVolumeVariables<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity Element;
- enum { dim = GridView::dimension };
-
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
-
-public:
- /*!
- * \brief The constructor.
- */
- ElOnePTwoCElementVolumeVariables()
- { }
-
- /*!
- * \brief Construct the volume variables for all vertices of an element.
- *
- * \param problem The problem which needs to be simulated.
- * \param element The DUNE Codim<0> entity for which the volume variables ought to be calculated
- * \param fvGeometry The finite volume geometry of the element
- * \param oldSol Tells whether the model's previous or current solution should be used.
- *
- * This class is required for the update of the effective porosity values at the
- * vertices since it is a function of the divergence of the solid displacement
- * at the integration points
- */
- void update(const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- bool oldSol)
- {
- ParentType::update(problem, element, fvGeometry, oldSol);
- this->updateEffPorosity(problem, element, fvGeometry);
-
- };
-
- /*!
- * \brief Update the effective porosities and the volumetric strain divU for all vertices of an element.
- *
- * \param problem The problem which needs to be simulated.
- * \param element The DUNE Codim<0> entity for which the volume variables ought to be calculated
- * \param fvGeometry The finite volume geometry of the element
- *
- * This function is required for the update of the effective porosity / divU values at the
- * vertices.
- *
- * During the partial derivative calculation, changes of the solid displacement
- * at vertex i can affect effective porosities / divU of all element vertices.
- * To correctly update the effective porosities / divU of all element vertices
- * an iteration over all scv faces is required.
- * The remaining volvars are only updated for the vertex whose primary variable
- * is changed for the derivative calculation.
- */
- void updateEffPorosity(const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry)
- {
- // we assert that the i-th shape function is
- // associated to the i-th vert of the element.
- int numScv = element.subEntities(dim);
-
- // number of faces which contribute to the porosity value in the sub-control volume
- std::vector<double> numContributingFaces;
- numContributingFaces.resize(numScv);
-
- for (int scvIdx = 0; scvIdx < numScv; scvIdx++) {
- (*this)[scvIdx].effPorosity = 0.0;
- (*this)[scvIdx].divU = 0.0;
- numContributingFaces[scvIdx] = 0.0;
- }
- for (int fIdx = 0; fIdx < fvGeometry.numScvf; fIdx++)
- {
- // evaluate the gradients at the IPs for each subcontrol volume face
- FluxVariables fluxVars;
- fluxVars.update(problem,
- element,
- fvGeometry,
- fIdx,
- *this);
-
- numContributingFaces[fluxVars.face().i] += 1;
- numContributingFaces[fluxVars.face().j] += 1;
-
- // average value for the effective porosity
- (*this)[fluxVars.face().i].effPorosity += fluxVars.effPorosity();
- (*this)[fluxVars.face().j].effPorosity += fluxVars.effPorosity();
- // average value for the volumetric strain
- (*this)[fluxVars.face().i].divU += fluxVars.divU();
- (*this)[fluxVars.face().j].divU += fluxVars.divU();
-
- }
- for (int scvIdx = 0; scvIdx < numScv; scvIdx++) {
- (*this)[scvIdx].effPorosity /= numContributingFaces[scvIdx];
- (*this)[scvIdx].divU /= numContributingFaces[scvIdx];
- }
- };
-
-
-};
-
-} // namespace Dumux
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/fluxvariables.hh b/dumux/geomechanics/el1p2c/fluxvariables.hh
deleted file mode 100644
index 40c5bf0b5316d79acd94dc5d69ecc7cb75460827..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/fluxvariables.hh
+++ /dev/null
@@ -1,327 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief This file contains the calculation of all the fluxes over the surface of the
- * finite volume that make up the volume, the mass and the momentum balance
- * for the one-phase two-component linear-elastic model.
- *
- * This means pressure, concentration and solid-displacement gradients, phase densities at
- * the integration point, etc.
- *
- * This class inherits from the one-phase two-component model FluxVariables and from the
- * linear elasticity model FluxVariables
- */
-#ifndef DUMUX_ELASTIC1P2C_FLUX_VARIABLES_HH
-#define DUMUX_ELASTIC1P2C_FLUX_VARIABLES_HH
-
-#include <dumux/geomechanics/elastic/fluxvariables.hh>
-#include <dumux/porousmediumflow/1p2c/implicit/fluxvariables.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup ElOnePTwoCBoxModel
- * \ingroup ImplicitFluxVariables
- * \brief This template class contains the data which is required to
- * calculate the fluxes over the surface of the
- * finite volume that make up the volume, the mass and the momentum balance
- * for the one-phase two-component linear-elastic model.
- *
- * This means pressure, concentration and solid-displacement gradients, phase densities at
- * the integration point, etc.
- *
- */
-template<class TypeTag>
-class ElOnePTwoCFluxVariables: public ElasticFluxVariablesBase<TypeTag> ,
- public OnePTwoCFluxVariables<TypeTag>
-{
- friend class ElasticFluxVariablesBase<TypeTag>; // be friends with parents
- friend class OnePTwoCFluxVariables<TypeTag>; // be friends with parents
-
- typedef ElasticFluxVariablesBase<TypeTag> ElasticBase;
- typedef OnePTwoCFluxVariables<TypeTag> OnePTwoCBase;
-
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, EffectiveDiffusivityModel) EffectiveDiffusivityModel;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity Element;
- enum
- {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
- typedef typename GridView::ctype CoordScalar;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
- typedef Dune::FieldVector<CoordScalar, dim> DimVector;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
-
-public:
- /*!
- * \brief Compute / update the flux variables
- *
- * \param problem The problem
- * \param element The finite element
- * \param fvGeometry The finite-volume geometry
- * \param fIdx The local index of the SCV (sub-control-volume) face
- * \param elemVolVars The volume variables of the current element
- * \param onBoundary A boolean variable to specify whether the flux variables
- * are calculated for interior SCV faces or boundary faces, default=false
- */
- void update(const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- const int fIdx,
- const ElementVolumeVariables &elemVolVars,
- const bool onBoundary = false)
- {
- ElasticBase::update(problem, element, fvGeometry, fIdx, elemVolVars);
- OnePTwoCBase::update(problem, element, fvGeometry, fIdx, elemVolVars);
-
- dU_ = 0.0;
- dGradP_ = 0.0;
- porosity_ = 0.0;
- effPorosity_ = 0.0;
- pressure_ = 0.0;
- timeDerivUNormal_ = 0.0;
-
- elOnePTwoCGradients_(problem, element, elemVolVars);
- calculateEffectiveValues_(problem, element, elemVolVars);
- calculateDiffCoeffPM_(problem, element, elemVolVars);
- calculateDDt_(problem, element, elemVolVars);
- }
-
-public:
- /*!
- * \brief Return porosity [-] at the integration point.
- */
- Scalar porosity() const
- {
- return porosity_;
- }
-
- /*!
- * \brief Return effective porosity [-] at the integration point.
- */
- Scalar effPorosity() const
- {
- return effPorosity_;
- }
-
- /*!
- * \brief Return pressure [Pa] at the integration
- * point.
- */
- Scalar pressure() const
- {
- return pressure_;
- }
-
- /*!
- * \brief Return change of pressure gradient with time [Pa/m] at
- * integration point.
- */
- Scalar dGradP(int dimIdx) const
- {
- return dGradP_[dimIdx];
- }
-
- /*!
- * \brief Return gradient of time derivative of pressure [Pa].
- */
- Scalar timeDerivGradPNormal() const
- {
- return timeDerivGradPNormal_;
- }
-
- /*!
- * \brief Return change of u [m] with time at integration point
- * point.
- */
- Scalar dU(int dimIdx) const
- {
- return dU_[dimIdx];
- }
-
- /*!
- * \brief Return time derivative of u [m/s] in normal direction at integration point
- */
- Scalar timeDerivUNormal() const
- {
- return timeDerivUNormal_;
- }
-
- /*!
- * \brief Return porous medium diffusion coefficient [m^2]
- */
- Scalar diffCoeffPM() const
- {
- return diffCoeffPM_;
- }
-
- const SCVFace &face() const
- {
- return ElasticBase::face();
- }
-
-protected:
- // Overload the parent's methods to avoid ambiguous overloads due to multiple inheritance
- // The elastic gradients are already computed in the elastic base class update
- void calculateGradients_(const Problem &problem,
- const Element &element,
- const ElementVolumeVariables &elemVolVars)
- {
- OnePTwoCBase::calculateGradients_(problem, element, elemVolVars);
- }
-
- /*!
- * \brief Calculation of the solid displacement and pressure gradients.
- *
- * \param problem The considered problem file
- * \param element The considered element of the grid
- * \param elemVolVars The parameters stored in the considered element
- */
- void elOnePTwoCGradients_(const Problem &problem,
- const Element &element,
- const ElementVolumeVariables &elemVolVars)
- {
- // calculate gradients
- GlobalPosition tmp(0.0);
- for (int idx = 0; idx < ElasticBase::fvGeometry_().numScv; idx++) // loop over adjacent vertices
- {
- // FE gradient at vertex idx
- const DimVector &feGrad = face().grad[idx];
-
- // the gradient of the temporal pressure change (needed for stabilization term)
- tmp = feGrad;
- tmp *= elemVolVars[idx].dPressure();
- dGradP_ += tmp;
-
- // average the pressure at integration point
- pressure_ += elemVolVars[idx].pressure()
- * face().shapeValue[idx];
- // average temporal displacement change at integration point (for calculation of solid displacement velocity)
- for (int i = 0; i < dim; ++i)
- dU_[i] += elemVolVars[idx].dU(i)
- * face().shapeValue[idx];
- // average porosity at integration point
- porosity_ += elemVolVars[idx].porosity()
- * face().shapeValue[idx];
- }
- }
-
- /*!
- * \brief Calculation of the effective porosity.
- *
- * \param problem The considered problem file
- * \param element The considered element of the grid
- * \param elemVolVars The parameters stored in the considered element
- */
- void calculateEffectiveValues_(const Problem &problem,
- const Element &element,
- const ElementVolumeVariables &elemVolVars)
- {
-
- // the effective porosity is calculated as a function of solid displacement and initial porosity
- // according to Han & Dusseault (2003)
-
- // calculate effective porosity as a function of solid displacement and initial porosity
- effPorosity_ = (porosity_ + this->divU())
- / (1 + this->divU());
- }
-
- /*!
- * \brief Calculation of the effective porous media diffusion coefficient.
- *
- * \param problem The considered problem file
- * \param element The considered element of the grid
- * \param elemVolVars The parameters stored in the considered element
- */
- void calculateDiffCoeffPM_(const Problem &problem,
- const Element &element,
- const ElementVolumeVariables &elemVolVars)
- {
- const VolumeVariables &volVarsI = elemVolVars[face().i];
- const VolumeVariables &volVarsJ = elemVolVars[face().j];
-
- const Scalar diffCoeffI =
- EffectiveDiffusivityModel::effectiveDiffusivity(volVarsI.porosity(),
- /*sat=*/1.0,
- volVarsI.diffCoeff());
-
- const Scalar diffCoeffJ =
- EffectiveDiffusivityModel::effectiveDiffusivity(volVarsJ.porosity(),
- /*sat=*/1.0,
- volVarsJ.diffCoeff());
-
- diffCoeffPM_ = harmonicMean(diffCoeffI, diffCoeffJ);
- }
-
- /*!
- * \brief Calculation of the time derivative of solid displacement and pressure gradient
- * \param problem The considered problem file
- * \param element The considered element of the grid
- * \param elemVolVars The parameters stored in the considered element
- */
- void calculateDDt_(const Problem &problem,
- const Element &element,
- const ElementVolumeVariables &elemVolVars)
- {
- Scalar dt= problem.timeManager().timeStepSize();
- DimVector tmp(0.0);
-
- //time derivative of solid displacement times normal vector
- for (int i = 0; i < dim; ++i)
- tmp[i] = dU_[i] / dt;
- timeDerivUNormal_ = tmp * face().normal;
- //time derivative of pressure gradient times normal vector
- for (int i = 0; i < dim; ++i)
- tmp[i] = dGradP_[i] / dt;
- timeDerivGradPNormal_ = tmp * face().normal;
- }
-
- //! change of solid displacement with time at integration point
- GlobalPosition dU_;
- //! change of pressure gradient with time at integration point
- GlobalPosition dGradP_;
- //! porosity at integration point
- Scalar porosity_;
- //! effective porosity at integration point
- Scalar effPorosity_;
- //! pressure at integration point
- Scalar pressure_;
- //! time derivative of solid displacement times normal vector at integration point
- Scalar timeDerivUNormal_;
- //! time derivative of pressure gradient times normal vector at integration point
- Scalar timeDerivGradPNormal_;
- //! Parameters
- Scalar diffCoeffPM_;
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/indices.hh b/dumux/geomechanics/el1p2c/indices.hh
deleted file mode 100644
index 6b5c446286b96ef07e679c79a0720d6ec39ef04e..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/indices.hh
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Defines the primary variable and equation indices used by
- * the one-phase two-component linear elasticity model.
- */
-
-#ifndef DUMUX_ELASTIC1P2C_INDICES_HH
-#define DUMUX_ELASTIC1P2C_INDICES_HH
-
-#include <dumux/geomechanics/elastic/indices.hh>
-#include <dumux/porousmediumflow/1p2c/implicit/indices.hh>
-
-namespace Dumux
-{
-// \{
-
-/*!
- * \ingroup ElOnePTwoCBoxModel
- * \ingroup ImplicitIndices
- * \brief The indices for the one-phase two-component linear elasticity model.
- *
- * This class inherits from the OnePTwoCIndices and from the ElasticIndices
- */
-template <class TypeTag>
-// PVOffset is set to 0 for the OnePTwoCIndices and to 2 for the ElasticIndices since
-// the first two primary variables are the primary variables of the one-phase two-component
-// model followed by the primary variables of the elastic model
-class ElOnePTwoCIndices : public OnePTwoCIndices<TypeTag, 0>, public ElasticIndices<2>
-{
-};
-
-} // namespace Dumux
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/localjacobian.hh b/dumux/geomechanics/el1p2c/localjacobian.hh
deleted file mode 100644
index 4184d8cd4aa2dc93c0fb74f75241a7952d40e224..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/localjacobian.hh
+++ /dev/null
@@ -1,258 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Calculates the partial derivatives of the local residual for the Jacobian of the
- * one-phase two-component linear elasticity model.
- */
-#ifndef DUMUX_EL1P2C_LOCAL_JACOBIAN_HH
-#define DUMUX_EL1P2C_LOCAL_JACOBIAN_HH
-
-#include <dumux/implicit/localjacobian.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup ElOnePTwoCBoxModel
- * \brief Calculates the partial derivatives of the local residual for the Jacobian
- *
- * Except for the evalPartialDerivatives function all functions are taken from the
- * base class ImplicitLocalJacobian
- */
-template<class TypeTag>
-class ElOnePTwoCLocalJacobian : public ImplicitLocalJacobian<TypeTag>
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum {
- dim = GridView::dimension,
- };
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, ElementSolutionVector) ElementSolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
-
- // copying a local jacobian is not a good idea
- ElOnePTwoCLocalJacobian(const ElOnePTwoCLocalJacobian &);
-
-public:
- ElOnePTwoCLocalJacobian()
- {}
-
- /*!
- * \brief Compute the partial derivatives to a primary variable at
- * an degree of freedom.
- *
- * This method is overwritten here since this model requires a call of the model specific
- * elementvolumevariables which updates the effective porosities correctly.
- *
- * The default implementation of this method uses numeric
- * differentiation, i.e. forward or backward differences (2nd
- * order), or central differences (3rd order). The method used is
- * determined by the "NumericDifferenceMethod" property:
- *
- * - if the value of this property is smaller than 0, backward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x) - f(x - \epsilon)}{\epsilon}
- * \f]
- *
- * - if the value of this property is 0, central
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x - \epsilon)}{2 \epsilon}
- * \f]
- *
- * - if the value of this property is larger than 0, forward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x)}{\epsilon}
- * \f]
- *
- * Here, \f$ f \f$ is the residual function for all equations, \f$x\f$
- * is the value of a sub-control volume's primary variable at the
- * evaluation point and \f$\epsilon\f$ is a small value larger than 0.
- *
- * \param partialDeriv The vector storing the partial derivatives of all
- * equations
- * \param storageDeriv the mass matrix contributions
- * \param col The block column index of the degree of freedom
- * for which the partial derivative is calculated.
- * Box: a sub-control volume index.
- * Cell centered: a neighbor index.
- * \param pvIdx The index of the primary variable
- * for which the partial derivative is calculated
- */
- void evalPartialDerivative_(ElementSolutionVector &partialDeriv,
- PrimaryVariables &storageDeriv,
- const int col,
- const int pvIdx)
- {
- int dofIdxGlobal;
- FVElementGeometry neighborFVGeom;
- auto neighbor = this->element_();
- if (isBox)
- {
- dofIdxGlobal = this->vertexMapper_().subIndex(this->element_(), col, dim);
-
- }
- else
- {
- neighbor = this->fvElemGeom_.neighbors[col];
- neighborFVGeom.updateInner(neighbor);
- dofIdxGlobal = this->problemPtr_->elementMapper().index(neighbor);
-
- }
-
- PrimaryVariables priVars(this->model_().curSol()[dofIdxGlobal]);
- VolumeVariables origVolVars(this->curVolVars_[col]);
-
- this->curVolVars_[col].setEvalPoint(&origVolVars);
- Scalar eps = this->numericEpsilon(col, pvIdx);
- Scalar delta = 0;
-
- if (this->numericDifferenceMethod_ >= 0) {
- // we are not using backward differences, i.e. we need to
- // calculate f(x + \epsilon)
-
- // deflect primary variables
- priVars[pvIdx] += eps;
- delta += eps;
-
- // calculate the residual
- if (isBox){
- this->curVolVars_[col].update(priVars,
- this->problem_(),
- this->element_(),
- this->fvElemGeom_,
- col,
- false);
- // update the effective porosities
- this->curVolVars_.updateEffPorosity(this->problem_(),
- this->element_(),
- this->fvElemGeom_);
- }
- else{
- this->curVolVars_[col].update(priVars,
- this->problem_(),
- neighbor,
- neighborFVGeom,
- /*scvIdx=*/0,
- false);
- // update the effective porosities
- this->curVolVars_.updateEffPorosity(this->problem_(),
- this->element_(),
- this->fvElemGeom_);
- }
-
- this->localResidual().eval(this->element_(),
- this->fvElemGeom_,
- this->prevVolVars_,
- this->curVolVars_,
- this->bcTypes_);
-
- // store the residual and the storage term
- partialDeriv = this->localResidual().residual();
- if (isBox || col == 0)
- storageDeriv = this->localResidual().storageTerm()[col];
- }
- else {
- // we are using backward differences, i.e. we don't need
- // to calculate f(x + \epsilon) and we can recycle the
- // (already calculated) residual f(x)
- partialDeriv = this->residual_;
- storageDeriv = this->storageTerm_[col];
- }
-
-
- if (this->numericDifferenceMethod_ <= 0) {
- // we are not using forward differences, i.e. we don't
- // need to calculate f(x - \epsilon)
-
- // deflect the primary variables
- priVars[pvIdx] -= delta + eps;
- delta += eps;
-
- // calculate residual again
- if (isBox){
- this->curVolVars_[col].update(priVars,
- this->problem_(),
- this->element_(),
- this->fvElemGeom_,
- col,
- false);
- // update the effective porosities
- this->curVolVars_.updateEffPorosity(this->problem_(),
- this->element_(),
- this->fvElemGeom_);
- }
- else{
- this->curVolVars_[col].update(priVars,
- this->problem_(),
- neighbor,
- neighborFVGeom,
- /*scvIdx=*/0,
- false);
- // update the effective porosities
- this->curVolVars_.updateEffPorosity(this->problem_(),
- this->element_(),
- this->fvElemGeom_);
- }
-
- this->localResidual().eval(this->element_(),
- this->fvElemGeom_,
- this->prevVolVars_,
- this->curVolVars_,
- this->bcTypes_);
- partialDeriv -= this->localResidual().residual();
- if (isBox || col == 0)
- storageDeriv -= this->localResidual().storageTerm()[col];
- }
- else {
- // we are using forward differences, i.e. we don't need to
- // calculate f(x - \epsilon) and we can recycle the
- // (already calculated) residual f(x)
- partialDeriv -= this->residual_;
- if (isBox || col == 0)
- storageDeriv -= this->storageTerm_[col];
- }
-
- // divide difference in residuals by the magnitude of the
- // deflections between the two function evaluation
- partialDeriv /= delta;
- storageDeriv /= delta;
-
- // restore the original state of the element's volume variables
- this->curVolVars_[col] = origVolVars;
- // update the effective porosities
- this->curVolVars_.updateEffPorosity(this->problem_(),
- this->element_(),
- this->fvElemGeom_);
-
-#if HAVE_VALGRIND
- for (unsigned i = 0; i < partialDeriv.size(); ++i)
- Valgrind::CheckDefined(partialDeriv[i]);
-#endif
- }
-};
-}
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/localresidual.hh b/dumux/geomechanics/el1p2c/localresidual.hh
deleted file mode 100644
index 2e2e7628784362e952c95e618be6c15dc33bdaff..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/localresidual.hh
+++ /dev/null
@@ -1,388 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Element-wise calculation the local Jacobian for the linear elastic,
- * single-phase, two-component model in the fully implicit scheme.
- */
-#ifndef DUMUX_ELASTIC1P2C_LOCAL_RESIDUAL_HH
-#define DUMUX_ELASTIC1P2C_LOCAL_RESIDUAL_HH
-
-#include "properties.hh"
-
-namespace Dumux
-{
- /*!
- * \ingroup ElOnePTwoCModel
- * \ingroup ImplicitLocalResidual
- * \brief Calculate the local Jacobian for a one-phase two-component
- * flow in a linear-elastic porous medium.
- *
- * This class is used to fill the gaps in BoxLocalResidual for the
- * one-phase two-component linear elasticity model.
- */
- template<class TypeTag>
- class ElOnePTwoCLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
- {
- protected:
- typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
- enum { dim = GridView::dimension };
- typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
- typedef Dune::FieldVector<Scalar, dim> DimVector;
-
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum {
- //phase index
- phaseIdx = Indices::phaseIdx,
- transportCompIdx = Indices::transportCompIdx
- };
- // indices of the equations
- enum {
- conti0EqIdx = Indices::conti0EqIdx,
- transportEqIdx = Indices::transportEqIdx
- };
-
- //! property that defines whether mole or mass fractions are used
- static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
-
-
- public:
- /*!
- * \brief Constructor. Sets the upwind weight.
- */
- ElOnePTwoCLocalResidual()
- {
- // retrieve the upwind weight for the mass conservation equations. Use the value
- // specified via the property system as default, and overwrite
- // it by the run-time parameter from the Dune::ParameterTree
- upwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, MassUpwindWeight);
- // retrieve the property which defines if the stabilization terms in the mass balance
- // equations are switched on. Use the value specified via the property system as default,
- // and overwrite it by the run-time parameter from the Dune::ParameterTree
- withStabilization_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Implicit, WithStabilization);
- };
-
- /*!
- * \brief Evaluate the amount of all conservation quantities
- * (e.g. phase mass) within a finite volume.
- *
- * \param storage The mass of the component within the sub-control volume
- * \param scvIdx The index of the considered face of the sub-control volume
- * \param usePrevSol Evaluate function with solution of current or previous time step
- */
- void computeStorage(PrimaryVariables &storage, int scvIdx,
- bool usePrevSol) const
- {
- // if flag usePrevSol is set, the solution from the previous
- // time step is used, otherwise the current solution is
- // used. The secondary variables are used accordingly. This
- // is required to compute the derivative of the storage term
- // using the implicit euler method.
- const ElementVolumeVariables &elemVolVars = usePrevSol ? this->prevVolVars_() : this->curVolVars_();
- const VolumeVariables &volVars = elemVolVars[scvIdx];
-
- storage = 0;
- // this model assumes incompressible fluids and solids only the bulk
- // density i.e. the ratio of solid phase and pore fluid can vary
- // storage term of continuity equation
- storage[conti0EqIdx] += volVars.divU;
-
- if(useMoles)
- {
- // storage term of the transport equation - mole fractions
- storage[transportEqIdx] += volVars.moleFraction(transportCompIdx)
- * volVars.effPorosity;
- }
- else
- {
- //storage term of the transport equation - mass fractions
- storage[transportEqIdx] += volVars.massFraction(transportCompIdx)
- * volVars.effPorosity;
- }
- }
-
- /*!
- * \brief Evaluate the mass flux over a face of a sub-control
- * volume.
- *
- * \param flux The flux over the SCV (sub-control-volume) face for each component
- * \param fIdx The index of the considered face of the sub control volume
- * \param onBoundary A boolean variable to specify whether the flux variables
- * are calculated for interior SCV faces or boundary faces, default=false
- */
- void computeFlux(PrimaryVariables &flux, int fIdx, const bool onBoundary=false) const
- {
- flux = 0;
- FluxVariables fluxVars;
- fluxVars.update(this->problem_(),
- this->element_(),
- this->fvGeometry_(),
- fIdx,
- this->curVolVars_());
-
- this->computeAdvectiveFlux(flux, fluxVars);
- this->computeDiffusiveFlux(flux, fluxVars);
- this->computeStresses(flux, fluxVars, fIdx);
- }
-
- /*!
- * \brief Evaluates the advective mass flux of all phases over
- * a face of a subcontrol volume.
- *
- * \param flux The advective flux over the sub-control-volume face for each component
- * \param fluxVars The flux variables at the current SCV
- */
- void computeAdvectiveFlux(PrimaryVariables &flux,
- const FluxVariables &fluxVars) const
- {
- ////////
- // advective fluxes of all components in all phases
- ////////
-
- // data attached to upstream and the downstream vertices
- // of the current phase
- const VolumeVariables &up =
- this->curVolVars_(fluxVars.upstreamIdx());
- const VolumeVariables &dn =
- this->curVolVars_(fluxVars.downstreamIdx());
-
- // calculate the stabilization term which helps in case of stability problems
- // e.g. observed for small time steps (according to G.Aguilar, F.Gaspar, F.Lisbona
- // and C.Rodrigo (2008))
- Scalar stabilizationTerm(0.0);
- if(withStabilization_){
- // calculate distance h between nodes i and j
- const auto geometry = this->element_().geometry();
- DimVector hVec = geometry.corner(fluxVars.face().j)
- - geometry.corner(fluxVars.face().i);
- Scalar h = hVec.two_norm();
- stabilizationTerm = (h * h) /
- (4 * (fluxVars.lambda()
- + 2 * fluxVars.mu()));
-
- stabilizationTerm *= fluxVars.timeDerivGradPNormal();
- }
-
-
- // flux for mass balance of the solid-fluid mixture
- // KmvpNormal is the Darcy velocity multiplied with the normal vector,
- // calculated in 1p2cfluxvariables.hh
- flux[conti0EqIdx] +=
- fluxVars.KmvpNormal() *
- (( upwindWeight_)/up.viscosity()
- +
- ((1 - upwindWeight_)/dn.viscosity()));
-
-
- // stabilization term
- if(withStabilization_)
- flux[conti0EqIdx] -= stabilizationTerm;
-
- if(useMoles)
- {
- // mass flux of the dissolved second component - massfraction
- // advective flux of the component
- flux[transportEqIdx] +=
- fluxVars.KmvpNormal() *
- (( upwindWeight_)* up.moleFraction(transportCompIdx)/up.viscosity()
- +
- (1 - upwindWeight_)* dn.moleFraction(transportCompIdx)/dn.viscosity());
-
- // flux of the dissolved second component due to solid displacement
- flux[transportEqIdx] +=
- fluxVars.timeDerivUNormal() *
- (( upwindWeight_)* up.moleFraction(transportCompIdx)
- * up.effPorosity
- +
- (1 - upwindWeight_)*dn.moleFraction(transportCompIdx)
- * up.effPorosity);
-
- // stabilization term
- if(withStabilization_)
- flux[transportEqIdx] -=
- stabilizationTerm *
- (( upwindWeight_)* up.moleFraction(transportCompIdx)
- +
- (1 - upwindWeight_)*dn.moleFraction(transportCompIdx));
- }
- else
- {
- // mass flux of the dissolved second component - massfraction
- // advective flux of the component
- flux[transportEqIdx] +=
- fluxVars.KmvpNormal() *
- (( upwindWeight_)* up.massFraction(transportCompIdx)/up.viscosity()
- +
- (1 - upwindWeight_)* dn.massFraction(transportCompIdx)/dn.viscosity());
-
- // flux of the dissolved second component due to solid displacement
- flux[transportEqIdx] +=
- fluxVars.timeDerivUNormal() *
- (( upwindWeight_)* up.massFraction(transportCompIdx)
- * up.effPorosity
- +
- (1 - upwindWeight_)*dn.massFraction(transportCompIdx)
- * up.effPorosity);
-
- // stabilization term
- if(withStabilization_)
- flux[transportEqIdx] -=
- stabilizationTerm *
- (( upwindWeight_)* up.massFraction(transportCompIdx)
- +
- (1 - upwindWeight_)*dn.massFraction(transportCompIdx));
- }
- }
-
- /*!
- * \brief Adds the diffusive mass flux of all components over
- * a face of a sub-control volume.
- *
- * \param flux The diffusive flux over the sub-control-volume face for each component
- * \param fluxVars The flux variables at the current sub-control-volume face
- */
- void computeDiffusiveFlux(PrimaryVariables &flux,
- const FluxVariables &fluxVars) const
- {
- Scalar tmp(0);
-
- // diffusive flux of second component
- if(useMoles)
- {
- // diffusive flux of the second component - mole fraction
- tmp = -(fluxVars.moleFractionGrad(transportCompIdx)*fluxVars.face().normal);
- tmp *= fluxVars.diffCoeffPM();
-
- // dispersive flux of second component - mole fraction
- DimVector normalDisp;
- fluxVars.dispersionTensor().mv(fluxVars.face().normal, normalDisp);
- tmp -= (normalDisp * fluxVars.moleFractionGrad(transportCompIdx));
-
- flux[transportEqIdx] += tmp;
- }
- else
- {
- // diffusive flux of the second component - mass fraction
- tmp = -(fluxVars.moleFractionGrad(transportCompIdx)*fluxVars.face().normal);
- tmp *= fluxVars.diffCoeffPM();
-
- // dispersive flux of second component - mass fraction
- DimVector normalDisp;
- fluxVars.dispersionTensor().mv(fluxVars.face().normal, normalDisp);
- tmp -= (normalDisp * fluxVars.moleFractionGrad(transportCompIdx));
-
- // convert it to a mass flux and add it
- flux[transportEqIdx] += tmp * FluidSystem::molarMass(transportCompIdx);
- }
- }
-
- /*!
- * \brief Evaluates the total stress induced by effective stresses and fluid
- * pressure in the solid fluid mixture.
- * \param stress The stress over the sub-control-volume face for each component
- * \param fluxVars The variables at the current sub-control-volume face
- * \param fIdx The index of the current sub-control-volume face
- */
- void computeStresses(PrimaryVariables &stress,
- const FluxVariables &fluxVars, const int fIdx) const
- {
- DimMatrix pressure(0.0), sigma(0.0);
- // the normal vector corresponding to the current sub-control-volume face
- const DimVector &normal(this->fvGeometry_().subContVolFace[fIdx].normal);
-
- // the pressure term of the momentum balance
- for (int i = 0; i < dim; ++i)
- pressure[i][i] += 1.0;
-
- pressure *= fluxVars.pressure();
- // effective stresses
- sigma = fluxVars.sigma();
- // calculate total stresses by subtracting the pressure
- sigma -= pressure;
-
- DimVector tmp(0.0);
- // multiply total stress tensor with normal vector of current face
- sigma.mv(normal, tmp);
-
- // set the stress term equal to the calculated vector
- for (int i = 0; i < dim; ++i)
- stress[Indices::momentum(i)] = tmp[i];
- }
-
- /*!
- * \brief Calculate the source term of the equation
- * \param source The source/sink in the SCV for each component
- * \param scvIdx The index of the vertex of the sub control volume
- *
- */
- void computeSource(PrimaryVariables &source, const int scvIdx)
- {
- source = 0;
-
- const ElementVolumeVariables &elemVolVars = this->curVolVars_();
- const VolumeVariables &volVars = elemVolVars[scvIdx];
-
- DimVector tmp1(0.0), tmp2(0.0);
-
- this->problem_().solDependentSource(source,
- this->element_(),
- this->fvGeometry_(),
- scvIdx,
- this->curVolVars_());
-
- // the gravity term of the momentum balance equation is treated as a source term
- // gravity contribution of solid matrix
- tmp1 = this->problem_().gravity();
- tmp1 *= volVars.rockDensity();
- tmp1 *= (1. - volVars.effPorosity);
-
- // gravity contribution of the fluids
- tmp2 = this->problem_().gravity();
- tmp2 *= volVars.density();
- tmp2 *= volVars.effPorosity;
-
- tmp1 += tmp2;
-
- for (int i = 0; i < dim; ++i)
- source[Indices::momentum(i)] += tmp1[i];
- }
-
- Implementation *asImp_()
- { return static_cast<Implementation *> (this); }
- const Implementation *asImp_() const
- { return static_cast<const Implementation *> (this); }
-
- private:
- Scalar upwindWeight_;
- bool withStabilization_;
- };
-
-}
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/model.hh b/dumux/geomechanics/el1p2c/model.hh
deleted file mode 100644
index a04dbe03a79f5dcb57671af90d24a64239c39d2d..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/model.hh
+++ /dev/null
@@ -1,517 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Base class for all models which use the one-phase two-component linear elasticity model.
- * Adaption of the fully implicit scheme to the one-phase two-component linear elasticity model.
- */
-#ifndef DUMUX_ELASTIC1P2C_MODEL_HH
-#define DUMUX_ELASTIC1P2C_MODEL_HH
-
-#include "properties.hh"
-#include <dumux/common/eigenvalues.hh>
-
-namespace Dumux {
-/*!
- * \ingroup ElOnePTwoCBoxModel
- * \brief Adaption of the fully implicit scheme to the one-phase two-component linear elasticity model.
- *
- * This model implements a one-phase flow of an incompressible fluid, that consists of two components.
- * The deformation of the solid matrix is described with a quasi-stationary momentum balance equation.
- * The influence of the pore fluid is accounted for through the effective stress concept (Biot 1941).
- * The total stress acting on a rock is partially supported by the rock matrix and partially supported
- * by the pore fluid. The effective stress represents the share of the total stress which is supported
- * by the solid rock matrix and can be determined as a function of the strain according to Hooke's law.
- *
- * As an equation for the conservation of momentum within the fluid phase Darcy's approach is used:
- \f[
- v = - \frac{\textbf K}{\mu}
- \left(\textbf{grad}\, p - \varrho_w {\textbf g} \right)
- \f]
- *
- * Gravity can be enabled or disabled via the property system.
- * By inserting this into the volume balance of the solid-fluid mixture, one gets
- \f[
- \frac{\partial \text{div} \textbf{u}}{\partial t} - \text{div} \left\{
- \frac{\textbf K}{\mu} \left(\textbf{grad}\, p - \varrho_w {\textbf g} \right)\right\} = q \;,
- \f]
- *
- * The transport of the components \f$\kappa \in \{ w, a \}\f$ is described by the following equation:
- \f[
- \frac{ \partial \phi_{eff} X^\kappa}{\partial t}
- - \text{div} \left\lbrace
- X^\kappa \frac{{\textbf K}}{\mu} \left( \textbf{grad}\, p - \varrho_w {\textbf g} \right)
- + D^\kappa_\text{pm} \frac{M^\kappa}{M_\alpha} \textbf{grad} x^\kappa
- - \phi_{eff} X^\kappa \frac{\partial \boldsymbol{u}}{\partial t}
- \right\rbrace = q.
- \f]
- *
- * If the model encounters stability problems, a stabilization term can be switched on. The stabilization
- * term is defined in Aguilar et al (2008):
- \f[
- \beta \text{div} \textbf{grad} \frac{\partial p}{\partial t}
- \f]
- with \f$\beta\f$:
- \f[
- \beta = h^2 / 4(\lambda + 2 \mu)
- \f]
- * where \f$h\f$ is the discretization length.
- *
- * The balance equations
- * with the stabilization term are given below:
- \f[
- \frac{\partial \text{div} \textbf{u}}{\partial t} - \text{div} \left\{
- \frac{\textbf K}{\mu} \left(\textbf{grad}\, p - \varrho_w {\textbf g} \right)
- + \varrho_w \beta \textbf{grad} \frac{\partial p}{\partial t}
- \right\} = q \;,
- \f]
- *
- * The transport of the components \f$\kappa \in \{ w, a \}\f$ is described by the following equation:
- *
- \f[
- \frac{ \partial \phi_{eff} X^\kappa}{\partial t}
- - \text{div} \left\lbrace
- X^\kappa \frac{{\textbf K}}{\mu} \left( \textbf{grad}\, p - \varrho_w {\textbf g} \right)
- + \varrho_w X^\kappa \beta \textbf{grad} \frac{\partial p}{\partial t}
- + D^\kappa_\text{pm} \frac{M^\kappa}{M_\alpha} \textbf{grad} x^\kappa
- - \phi_{eff} X^\kappa \frac{\partial \boldsymbol{u}}{\partial t}
- \right\rbrace = q.
- \f]
- *
- *
- * The quasi-stationary momentum balance equation is:
- \f[
- \text{div}\left( \boldsymbol{\sigma'}- p \boldsymbol{I} \right) + \left( \phi_{eff} \varrho_w + (1 - \phi_{eff}) * \varrho_s \right)
- {\textbf g} = 0 \;,
- \f]
- * with the effective stress:
- \f[
- \boldsymbol{\sigma'} = 2\,G\,\boldsymbol{\epsilon} + \lambda \,\text{tr} (\boldsymbol{\epsilon}) \, \boldsymbol{I}.
- \f]
- *
- * and the strain tensor \f$\boldsymbol{\epsilon}\f$ as a function of the solid displacement gradient \f$\textbf{grad} \boldsymbol{u}\f$:
- \f[
- \boldsymbol{\epsilon} = \frac{1}{2} \, (\textbf{grad} \boldsymbol{u} + \textbf{grad}^T \boldsymbol{u}).
- \f]
- *
- * Here, the rock mechanics sign convention is switch off which means compressive stresses are < 0 and tensile stresses are > 0.
- * The rock mechanics sign convention can be switched on for the vtk output via the property system.
- *
- * The effective porosity is calculated as a function of the solid displacement:
- \f[
- \phi_{eff} = \frac{\phi_{init} + \text{div} \boldsymbol{u}}{1 + \text{div}}
- \f]
- * All equations are discretized using a vertex-centered finite volume (box)
- * or cell-centered finite volume scheme as spatial
- * and the implicit Euler method as time discretization.
- *
- * The primary variables are the pressure \f$p\f$ and the mole or mass fraction of dissolved component \f$x\f$ and the solid
- * displacement vector \f$\boldsymbol{u}\f$.
- */
-
-
-template<class TypeTag>
-class ElOnePTwoCModel: public GET_PROP_TYPE(TypeTag, BaseModel)
-{
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
- enum {
- dim = GridView::dimension
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<Scalar, dim> DimVector;
- typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
-
-public:
- /*!
- * \brief \copybrief ImplicitModel::addOutputVtkFields
- *
- * Specialization for the ElOnePTwoCBoxModel, add one-phase two-component
- * properties, solid displacement, stresses, effective properties and the
- * process rank to the VTK writer.
- */
- template<class MultiWriter>
- void addOutputVtkFields(const SolutionVector &sol, MultiWriter &writer) {
-
- // check whether compressive stresses are defined to be positive
- // (rockMechanicsSignConvention_ == true) or negative
- rockMechanicsSignConvention_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, RockMechanicsSignConvention);
-
- typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField;
- typedef Dune::BlockVector<Dune::FieldVector<Scalar, dim> > VectorField;
-
- // create the required scalar and vector fields
- unsigned numVertices = this->gridView_().size(dim);
- unsigned numElements = this->gridView_().size(0);
-
- // create the required fields for vertex data
- ScalarField &pressure = *writer.allocateManagedBuffer(numVertices);
- ScalarField &moleFraction0 = *writer.allocateManagedBuffer(numVertices);
- ScalarField &moleFraction1 = *writer.allocateManagedBuffer(numVertices);
- ScalarField &massFraction0 = *writer.allocateManagedBuffer(numVertices);
- ScalarField &massFraction1 = *writer.allocateManagedBuffer(numVertices);
- VectorField &displacement = *writer.template allocateManagedBuffer<Scalar, dim>(numVertices);
- ScalarField &density = *writer.allocateManagedBuffer(numVertices);
- ScalarField &viscosity = *writer.allocateManagedBuffer(numVertices);
- ScalarField &porosity = *writer.allocateManagedBuffer(numVertices);
- ScalarField &Kx = *writer.allocateManagedBuffer(numVertices);
-
- // create the required fields for element data
- // effective stresses
- VectorField &effStressX = *writer.template allocateManagedBuffer<Scalar,
- dim>(numElements);
- VectorField &effStressY = *writer.template allocateManagedBuffer<Scalar,
- dim>(numElements);
- VectorField &effStressZ = *writer.template allocateManagedBuffer<Scalar,
- dim>(numElements);
- // total stresses
- VectorField &totalStressX = *writer.template allocateManagedBuffer<
- Scalar, dim>(numElements);
- VectorField &totalStressY = *writer.template allocateManagedBuffer<
- Scalar, dim>(numElements);
- VectorField &totalStressZ = *writer.template allocateManagedBuffer<
- Scalar, dim>(numElements);
-
- // principal stresses
- ScalarField &principalStress1 = *writer.allocateManagedBuffer(
- numElements);
- ScalarField &principalStress2 = *writer.allocateManagedBuffer(
- numElements);
- ScalarField &principalStress3 = *writer.allocateManagedBuffer(
- numElements);
-
- ScalarField &effPorosity = *writer.allocateManagedBuffer(numElements);
- ScalarField &cellPorosity = *writer.allocateManagedBuffer(numElements);
- ScalarField &cellKx = *writer.allocateManagedBuffer(numElements);
- ScalarField &cellPressure = *writer.allocateManagedBuffer(numElements);
-
- // initialize cell stresses, cell-wise hydraulic parameters and cell pressure with zero
- for (unsigned int eIdx = 0; eIdx < numElements; ++eIdx) {
- effStressX[eIdx] = Scalar(0.0);
- if (dim >= 2)
- effStressY[eIdx] = Scalar(0.0);
- if (dim >= 3)
- effStressZ[eIdx] = Scalar(0.0);
-
- totalStressX[eIdx] = Scalar(0.0);
- if (dim >= 2)
- totalStressY[eIdx] = Scalar(0.0);
- if (dim >= 3)
- totalStressZ[eIdx] = Scalar(0.0);
-
- principalStress1[eIdx] = Scalar(0.0);
- if (dim >= 2)
- principalStress2[eIdx] = Scalar(0.0);
- if (dim >= 3)
- principalStress3[eIdx] = Scalar(0.0);
-
- effPorosity[eIdx] = Scalar(0.0);
- cellPorosity[eIdx] = Scalar(0.0);
- cellKx[eIdx] = Scalar(0.0);
- cellPressure[eIdx] = Scalar(0.0);
- }
- ScalarField &rank = *writer.allocateManagedBuffer(numElements);
-
-
- FVElementGeometry fvGeometry;
- ElementVolumeVariables elemVolVars;
- ElementBoundaryTypes elemBcTypes;
-
- // initialize start and end of element iterator
- // loop over all elements (cells)
- for (const auto& element : elements(this->gridView_(), Dune::Partitions::interior))
- {
- unsigned int eIdx = this->problem_().model().elementMapper().index(element);
- rank[eIdx] = this->gridView_().comm().rank();
-
- fvGeometry.update(this->gridView_(), element);
- elemBcTypes.update(this->problem_(), element, fvGeometry);
- elemVolVars.update(this->problem_(), element, fvGeometry, false);
-
- // loop over all local vertices of the cell
- int numScv = element.subEntities(dim);
-
- for (int scvIdx = 0; scvIdx < numScv; ++scvIdx)
- {
- unsigned int vIdxGlobal = this->dofMapper().subIndex(element, scvIdx, dim);
-
- pressure[vIdxGlobal] = elemVolVars[scvIdx].pressure();
- moleFraction0[vIdxGlobal] = elemVolVars[scvIdx].moleFraction(0);
- moleFraction1[vIdxGlobal] = elemVolVars[scvIdx].moleFraction(1);
- massFraction0[vIdxGlobal] = elemVolVars[scvIdx].massFraction(0);
- massFraction1[vIdxGlobal] = elemVolVars[scvIdx].massFraction(1);
- // in case of rock mechanics sign convention solid displacement is
- // defined to be negative if it points in positive coordinate direction
- if(rockMechanicsSignConvention_){
- DimVector tmpDispl;
- tmpDispl = Scalar(0);
- tmpDispl -= elemVolVars[scvIdx].displacement();
- displacement[vIdxGlobal] = tmpDispl;
- }
-
- else
- displacement[vIdxGlobal] = elemVolVars[scvIdx].displacement();
-
- density[vIdxGlobal] = elemVolVars[scvIdx].density();
- viscosity[vIdxGlobal] = elemVolVars[scvIdx].viscosity();
- porosity[vIdxGlobal] = elemVolVars[scvIdx].porosity();
- Kx[vIdxGlobal] = this->problem_().spatialParams().intrinsicPermeability(
- element, fvGeometry, scvIdx)[0][0];
- // calculate cell quantities by adding up scv quantities and dividing through numScv
- cellPorosity[eIdx] += elemVolVars[scvIdx].porosity() / numScv;
- cellKx[eIdx] += this->problem_().spatialParams().intrinsicPermeability(
- element, fvGeometry, scvIdx)[0][0] / numScv;
- cellPressure[eIdx] += elemVolVars[scvIdx].pressure() / numScv;
- };
-
- // calculate cell quantities for variables which are defined at the integration point
- Scalar tmpEffPoro;
- DimMatrix tmpEffStress;
- tmpEffStress = Scalar(0);
- tmpEffPoro = Scalar(0);
-
- // loop over all scv-faces of the cell
- for (int fIdx = 0; fIdx < fvGeometry.numScvf; fIdx++) {
-
- //prepare the flux calculations (set up and prepare geometry, FE gradients)
- FluxVariables fluxVars;
- fluxVars.update(this->problem_(),
- element, fvGeometry,
- fIdx,
- elemVolVars);
-
- // divide by number of scv-faces and sum up edge values
- tmpEffPoro = fluxVars.effPorosity() / fvGeometry.numScvf;
- tmpEffStress = fluxVars.sigma();
- tmpEffStress /= fvGeometry.numScvf;
-
- effPorosity[eIdx] += tmpEffPoro;
-
- // in case of rock mechanics sign convention compressive stresses
- // are defined to be positive
- if(rockMechanicsSignConvention_){
- effStressX[eIdx] -= tmpEffStress[0];
- if (dim >= 2) {
- effStressY[eIdx] -= tmpEffStress[1];
- }
- if (dim >= 3) {
- effStressZ[eIdx] -= tmpEffStress[2];
- }
- }
- else{
- effStressX[eIdx] += tmpEffStress[0];
- if (dim >= 2) {
- effStressY[eIdx] += tmpEffStress[1];
- }
- if (dim >= 3) {
- effStressZ[eIdx] += tmpEffStress[2];
- }
- }
- }
-
- // calculate total stresses
- // in case of rock mechanics sign convention compressive stresses
- // are defined to be positive and total stress is calculated by adding the pore pressure
- if(rockMechanicsSignConvention_){
- totalStressX[eIdx][0] = effStressX[eIdx][0] + cellPressure[eIdx];
- totalStressX[eIdx][1] = effStressX[eIdx][1];
- totalStressX[eIdx][2] = effStressX[eIdx][2];
- if (dim >= 2) {
- totalStressY[eIdx][0] = effStressY[eIdx][0];
- totalStressY[eIdx][1] = effStressY[eIdx][1] + cellPressure[eIdx];
- totalStressY[eIdx][2] = effStressY[eIdx][2];
- }
- if (dim >= 3) {
- totalStressZ[eIdx][0] = effStressZ[eIdx][0];
- totalStressZ[eIdx][1] = effStressZ[eIdx][1];
- totalStressZ[eIdx][2] = effStressZ[eIdx][2] + cellPressure[eIdx];
- }
- }
- else{
- totalStressX[eIdx][0] = effStressX[eIdx][0] - cellPressure[eIdx];
- totalStressX[eIdx][1] = effStressX[eIdx][1];
- totalStressX[eIdx][2] = effStressX[eIdx][2];
- if (dim >= 2) {
- totalStressY[eIdx][0] = effStressY[eIdx][0];
- totalStressY[eIdx][1] = effStressY[eIdx][1] - cellPressure[eIdx];
- totalStressY[eIdx][2] = effStressY[eIdx][2];
- }
- if (dim >= 3) {
- totalStressZ[eIdx][0] = effStressZ[eIdx][0];
- totalStressZ[eIdx][1] = effStressZ[eIdx][1];
- totalStressZ[eIdx][2] = effStressZ[eIdx][2] - cellPressure[eIdx];
- }
- }
- }
-
- // calculate principal stresses i.e. the eigenvalues of the total stress tensor
- Scalar a1, a2, a3;
- DimMatrix totalStress;
- DimVector eigenValues;
- a1=Scalar(0);
- a2=Scalar(0);
- a3=Scalar(0);
-
- for (unsigned int eIdx = 0; eIdx < numElements; eIdx++)
- {
- eigenValues = Scalar(0);
- totalStress = Scalar(0);
-
- totalStress[0] = totalStressX[eIdx];
- if (dim >= 2)
- totalStress[1] = totalStressY[eIdx];
- if (dim >= 3)
- totalStress[2] = totalStressZ[eIdx];
-
- calculateEigenValues<dim>(eigenValues, totalStress);
-
-
- for (int i = 0; i < dim; i++)
- {
- if (std::isnan(eigenValues[i]))
- eigenValues[i] = 0.0;
- }
-
- // sort principal stresses: principalStress1 >= principalStress2 >= principalStress3
- if (dim == 2) {
- a1 = eigenValues[0];
- a2 = eigenValues[1];
-
- if (a1 >= a2) {
- principalStress1[eIdx] = a1;
- principalStress2[eIdx] = a2;
- } else {
- principalStress1[eIdx] = a2;
- principalStress2[eIdx] = a1;
- }
- }
-
- if (dim == 3) {
- a1 = eigenValues[0];
- a2 = eigenValues[1];
- a3 = eigenValues[2];
-
- if (a1 >= a2) {
- if (a1 >= a3) {
- principalStress1[eIdx] = a1;
- if (a2 >= a3) {
- principalStress2[eIdx] = a2;
- principalStress3[eIdx] = a3;
- }
- else //a3 > a2
- {
- principalStress2[eIdx] = a3;
- principalStress3[eIdx] = a2;
- }
- }
- else // a3 > a1
- {
- principalStress1[eIdx] = a3;
- principalStress2[eIdx] = a1;
- principalStress3[eIdx] = a2;
- }
- } else // a2>a1
- {
- if (a2 >= a3) {
- principalStress1[eIdx] = a2;
- if (a1 >= a3) {
- principalStress2[eIdx] = a1;
- principalStress3[eIdx] = a3;
- }
- else //a3>a1
- {
- principalStress2[eIdx] = a3;
- principalStress3[eIdx] = a1;
- }
- }
- else //a3>a2
- {
- principalStress1[eIdx] = a3;
- principalStress2[eIdx] = a2;
- principalStress3[eIdx] = a1;
- }
- }
- }
-
- }
-
- writer.attachVertexData(pressure, "P");
-
- char nameMoleFraction0[42], nameMoleFraction1[42];
- snprintf(nameMoleFraction0, 42, "x_%s", FluidSystem::componentName(0));
- snprintf(nameMoleFraction1, 42, "x_%s", FluidSystem::componentName(1));
- writer.attachVertexData(moleFraction0, nameMoleFraction0);
- writer.attachVertexData(moleFraction1, nameMoleFraction1);
-
- char nameMassFraction0[42], nameMassFraction1[42];
- snprintf(nameMassFraction0, 42, "X_%s", FluidSystem::componentName(0));
- snprintf(nameMassFraction1, 42, "X_%s", FluidSystem::componentName(1));
- writer.attachVertexData(massFraction0, nameMassFraction0);
- writer.attachVertexData(massFraction1, nameMassFraction1);
-
- writer.attachVertexData(displacement, "u", dim);
- writer.attachVertexData(density, "rho");
- writer.attachVertexData(viscosity, "mu");
- writer.attachVertexData(porosity, "porosity");
- writer.attachVertexData(Kx, "Kx");
- writer.attachCellData(cellPorosity, "porosity");
- writer.attachCellData(cellKx, "Kx");
- writer.attachCellData(effPorosity, "effective porosity");
-
- writer.attachCellData(totalStressX, "total stresses X", dim);
- if (dim >= 2)
- writer.attachCellData(totalStressY, "total stresses Y", dim);
- if (dim >= 3)
- writer.attachCellData(totalStressZ, "total stresses Z", dim);
-
- writer.attachCellData(effStressX, "effective stress changes X", dim);
- if (dim >= 2)
- writer.attachCellData(effStressY, "effective stress changes Y", dim);
- if (dim >= 3)
- writer.attachCellData(effStressZ, "effective stress changes Z", dim);
-
- writer.attachCellData(principalStress1, "principal stress 1");
- if (dim >= 2)
- writer.attachCellData(principalStress2, "principal stress 2");
- if (dim >= 3)
- writer.attachCellData(principalStress3, "principal stress 3");
-
- writer.attachCellData(cellPressure, "P");
-
- writer.attachCellData(rank, "rank");
-
- }
-private:
- bool rockMechanicsSignConvention_;
-
-};
-}
-#include "propertydefaults.hh"
-#endif
diff --git a/dumux/geomechanics/el1p2c/properties.hh b/dumux/geomechanics/el1p2c/properties.hh
deleted file mode 100644
index 66970504124e9932b7cca2a646b6cde3e98de288..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/properties.hh
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup ElOnePTwoCBoxModel
- * \file
- *
- * \brief Defines the properties required for the one-phase two-component
- * linear elasticity model.
- *
- * This class inherits from the properties of the one-phase two-component model and
- * from the properties of the linear elasticity model
- */
-
-#ifndef DUMUX_ELASTIC1P2C_PROPERTIES_HH
-#define DUMUX_ELASTIC1P2C_PROPERTIES_HH
-
-#include <dumux/porousmediumflow/1p2c/implicit/properties.hh>
-#include <dumux/geomechanics/elastic/properties.hh>
-
-
-namespace Dumux
-{
-// \{
-namespace Properties
-{
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tag for the single-phase, two-component linear elasticity problems
-NEW_TYPE_TAG(BoxElasticOnePTwoC, INHERITS_FROM(BoxModel));
-
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-//! Returns whether the stabilization terms are included in the balance equations
-NEW_PROP_TAG(ImplicitWithStabilization);
-//! Returns whether the output should be written according to rock mechanics sign convention (compressive stresses > 0)
-NEW_PROP_TAG(VtkRockMechanicsSignConvention);
-}
-// \}
-}
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/propertydefaults.hh b/dumux/geomechanics/el1p2c/propertydefaults.hh
deleted file mode 100644
index 373a2fe316b3bfa33d6c36ffccb6d2d80f5f5de8..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/propertydefaults.hh
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup ElOnePTwoCBoxModel
- * \file
- *
- * \brief Defines the properties required for the one-phase two-component
- * linear-elastic model.
- *
- * This class inherits from the properties of the one-phase two-component model and
- * from the properties of the simple linear-elastic model
- */
-
-#ifndef DUMUX_ELASTIC1P2C_PROPERTY_DEFAULTS_HH
-#define DUMUX_ELASTIC1P2C_PROPERTY_DEFAULTS_HH
-
-#include "properties.hh"
-
-#include "model.hh"
-#include "localresidual.hh"
-#include "localjacobian.hh"
-#include "fluxvariables.hh"
-#include "elementvolumevariables.hh"
-#include "volumevariables.hh"
-#include "indices.hh"
-#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
-#include <dumux/material/fluidstates/compositional.hh>
-
-
-namespace Dumux
-{
-// \{
-namespace Properties
-{
-//////////////////////////////////////////////////////////////////
-// Property defaults
-//////////////////////////////////////////////////////////////////
-//!< set the number of equations to the space dimension of the problem
-SET_PROP(BoxElasticOnePTwoC, NumEq)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum{dim = GridView::dimension};
-public:
- static const int value = dim + 2;
-};
-
-SET_INT_PROP(BoxElasticOnePTwoC, NumPhases, 1); //!< The number of phases in the 1p2c model is 1
-SET_INT_PROP(BoxElasticOnePTwoC, NumComponents, 2); //!< The number of components in the 1p2c model is 2
-
-//! Use the linear elasticity local residual function for the elasticity model
-SET_TYPE_PROP(BoxElasticOnePTwoC,
- LocalResidual,
- ElOnePTwoCLocalResidual<TypeTag>);
-
-//! Use the linear elasticity local residual function for the elasticity model
-SET_TYPE_PROP(BoxElasticOnePTwoC,
- LocalJacobian,
- ElOnePTwoCLocalJacobian<TypeTag>);
-
-//! define the model
-SET_TYPE_PROP(BoxElasticOnePTwoC, Model, ElOnePTwoCModel<TypeTag>);
-
-//! define the ElementVolumeVariables
-SET_TYPE_PROP(BoxElasticOnePTwoC, ElementVolumeVariables, ElOnePTwoCElementVolumeVariables<TypeTag>);
-
-//! define the VolumeVariables
-SET_TYPE_PROP(BoxElasticOnePTwoC, VolumeVariables, ElOnePTwoCVolumeVariables<TypeTag>);
-
-//! define the FluxVariables
-SET_TYPE_PROP(BoxElasticOnePTwoC, FluxVariables, ElOnePTwoCFluxVariables<TypeTag>);
-
-//! Set the indices used by the linear elasticity model
-SET_TYPE_PROP(BoxElasticOnePTwoC, Indices, ElOnePTwoCIndices<TypeTag>);
-
-//! Set the phaseIndex per default to zero (important for two-phase fluidsystems).
-SET_INT_PROP(BoxElasticOnePTwoC, PhaseIdx, 0);
-
-SET_PROP(BoxElasticOnePTwoC, FluidState){
- private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- public:
- typedef CompositionalFluidState<Scalar, FluidSystem> type;
-};
-
-//! set default upwind weights to 1.0, i.e. fully upwind
-SET_SCALAR_PROP(BoxElasticOnePTwoC, ImplicitMassUpwindWeight, 1.0);
-SET_SCALAR_PROP(BoxElasticOnePTwoC, ImplicitMobilityUpwindWeight, 1.0);
-
-// enable gravity by default
-SET_BOOL_PROP(BoxElasticOnePTwoC, ProblemEnableGravity, true);
-
-// enable gravity by default
-SET_BOOL_PROP(BoxElasticOnePTwoC, ImplicitWithStabilization, true);
-
-//! The model after Millington (1961) is used for the effective diffusivity
-SET_PROP(BoxElasticOnePTwoC, EffectiveDiffusivityModel)
-{ private :
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- public:
- typedef DiffusivityMillingtonQuirk<Scalar> type;
-};
-
-// write the stress and displacement output according to rock mechanics sign convention (compressive stresses > 0)
-SET_BOOL_PROP(BoxElasticOnePTwoC, VtkRockMechanicsSignConvention, false);
-}
-}
-
-#endif
diff --git a/dumux/geomechanics/el1p2c/volumevariables.hh b/dumux/geomechanics/el1p2c/volumevariables.hh
deleted file mode 100644
index f3773ece1077e80e287c82abb0b639c712e7a36c..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el1p2c/volumevariables.hh
+++ /dev/null
@@ -1,205 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Quantities required by the single-phase, two-component
- * linear elasticity model which are defined on a vertex.
- */
-#ifndef DUMUX_ELASTIC1P2C_VOLUME_VARIABLES_HH
-#define DUMUX_ELASTIC1P2C_VOLUME_VARIABLES_HH
-
-
-#include <dumux/porousmediumflow/1p2c/implicit/volumevariables.hh>
-#include <dumux/implicit/volumevariables.hh>
-
-#include "properties.hh"
-
-namespace Dumux {
-/*!
- * \ingroup ElOnePTwoCBoxModel
- * \ingroup ImplicitVolumeVariables
- * \brief Contains the quantities which are constant within a
- * finite volume in the single-phase, two-component, linear elasticity model.
- *
- * This class inherits from the volumevariables of the one-phase
- * two-component model
- */
-template<class TypeTag>
-class ElOnePTwoCVolumeVariables : public OnePTwoCVolumeVariables<TypeTag>{
-
- typedef OnePTwoCVolumeVariables<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity Element;
-
- enum { dim = GridView::dimension };
-
- enum { phaseIdx = GET_PROP_VALUE(TypeTag, PhaseIdx) };
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<Scalar,dim> DimVector;
-
-public:
- /*!
- * \copydoc ImplicitVolumeVariables::update
- */
- void update(const PrimaryVariables &priVars,
- const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx,
- bool isOldSol)
- {
-
- ParentType::update(priVars, problem, element, fvGeometry, scvIdx, isOldSol);
- int vIdxGlobal = problem.vertexMapper().subIndex(element, scvIdx, dim);
-
- primaryVars_ = priVars;
- prevPrimaryVars_ = problem.model().prevSol()[vIdxGlobal];
-
- ParentType prev1p2cVolVars;
- prev1p2cVolVars.update(problem.model().prevSol()[vIdxGlobal],
- problem,
- element,
- fvGeometry,
- scvIdx,
- true);
-
- dPressure_ = this->pressure() - prev1p2cVolVars.pressure();
-
- for (int i = 0; i < dim; ++i){
- displacement_[i] = primaryVars_[Indices::u(i)];
- prevDisplacement_[i] = prevPrimaryVars_[Indices::u(i)];
- }
-
- dU_ = displacement_ - prevDisplacement_;
-
- const Dune::FieldVector<Scalar, 2> &lameParams =
- problem.spatialParams().lameParams(element, fvGeometry, scvIdx);
-
- lambda_ = lameParams[0];
- mu_ = lameParams[1];
-
- rockDensity_ = problem.spatialParams().rockDensity(element, scvIdx);
- }
-
- /*!
- * \brief Return the vector of primary variables
- */
- const PrimaryVariables &primaryVars() const
- { return primaryVars_; }
-
- /*!
- * \brief Sets the evaluation point used in the by the local jacobian.
- */
- void setEvalPoint(const Implementation *ep)
- { }
-
- /*!
- * \brief Return the Lame parameter lambda \f$\mathrm{[Pa]}\f$ within the control volume.
- */
- Scalar lambda() const
- { return lambda_; }
-
- /*!
- * \brief Return the Lame parameter mu \f$\mathrm{[Pa]}\f$ within the control volume.
- */
- Scalar mu() const
- { return mu_; }
-
- /*!
- * \brief Returns the rock density \f$\mathrm{[kg / m^3]}\f$ within the control volume .
- */
- Scalar rockDensity() const
- { return rockDensity_; }
-
- /*!
- * \brief Returns the change in solid displacement \f$\mathrm{[m]}\f$ between
- * the last and the current timestep for the space direction dimIdx within the control volume.
- */
- Scalar dU(int dimIdx) const
- { return dU_[dimIdx]; }
-
- /*!
- * \brief Returns the change in pressure \f$\mathrm{[Pa]}\f$ between the last and the
- * current timestep within the control volume.
- */
- Scalar dPressure() const
- { return dPressure_; }
-
- /*!
- * \brief Returns the solid displacement \f$\mathrm{[m]}\f$ in space
- * directions dimIdx within the control volume.
- */
- Scalar displacement(int dimIdx) const
- { return displacement_[dimIdx]; }
-
- /*!
- * \brief Returns the solid displacement vector \f$\mathrm{[m]}\f$
- * within the control volume.
- */
- const DimVector &displacement() const
- { return displacement_; }
-
-
- /*!
- * \brief the effective porosity and volumetric strain divU is defined as mutable variable here since it
- * is updated within the elementVolumeVariables.
- */
- mutable Scalar effPorosity;
- mutable Scalar divU;
-
- /*!
- * \brief Returns the mass fraction of a given component in the
- * given fluid phase within the control volume.
- *
- * \param compIdx The component index
- */
- Scalar massFraction(const int compIdx) const
- { return this->fluidState_.massFraction(phaseIdx, compIdx); }
-
- /*!
- * \brief Returns the mole fraction of a given component in the
- * given fluid phase within the control volume.
- *
- * \param compIdx The component index
- */
- Scalar moleFraction(const int compIdx) const
- { return this->fluidState_.moleFraction(phaseIdx, compIdx); }
-
-protected:
- PrimaryVariables primaryVars_, prevPrimaryVars_;
- DimVector displacement_, prevDisplacement_;
- DimVector dU_;
- Scalar dPressure_;
- Scalar lambda_;
- Scalar mu_;
- Scalar rockDensity_;
-};
-
-}
-
-#endif
diff --git a/dumux/geomechanics/el2p/CMakeLists.txt b/dumux/geomechanics/el2p/CMakeLists.txt
deleted file mode 100644
index ab8c45b2f6cef4a4c01bb847084eb43e93e82bd9..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#install headers
-install(FILES
-amgbackend.hh
-assembler.hh
-basemodel.hh
-elementvolumevariables.hh
-fluxvariables.hh
-indices.hh
-localjacobian.hh
-localoperator.hh
-localresidual.hh
-model.hh
-newtoncontroller.hh
-properties.hh
-propertydefaults.hh
-volumevariables.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/geomechanics/el2p)
diff --git a/dumux/geomechanics/el2p/amgbackend.hh b/dumux/geomechanics/el2p/amgbackend.hh
deleted file mode 100644
index bef3c01da03396c5aef81cf7d576ac389b96666b..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/amgbackend.hh
+++ /dev/null
@@ -1,235 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \ingroup Linear
- *
- * \brief Wraps the AMG backend such that it can be used for the el2p model.
- */
-#ifndef DUMUX_EL2P_AMGBACKEND_HH
-#define DUMUX_EL2P_AMGBACKEND_HH
-
-#include <dumux/linear/amgbackend.hh>
-
-namespace Dumux {
-
-/*!
- * \brief Base class for the ElTwoP AMGBackend.
- */
-template <class TypeTag, bool isParallel>
-class El2PAMGBackendBase : public AMGBackend<TypeTag>
-{
- typedef AMGBackend<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
-public:
- /*!
- * \copydoc AMGBackend::AMGBackend()
- */
- El2PAMGBackendBase(const Problem& problem)
- : ParentType(problem)
- {}
-};
-
-/*!
- * \brief Specialization for the parallel setting.
- */
-template <class TypeTag>
-class El2PAMGBackendBase<TypeTag, true> : public AMGBackend<TypeTag>
-{
- typedef AMGBackend<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
- typedef typename Dune::FieldMatrix<Scalar, numEq, numEq> MatrixBlock;
- typedef typename Dune::BCRSMatrix<MatrixBlock> BlockMatrix;
- typedef typename Dune::FieldVector<Scalar, numEq> VectorBlock;
- typedef typename Dune::BlockVector<VectorBlock> BlockVector;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum { dim = GridView::dimension };
-
-public:
- /*!
- * \copydoc AMGBackend::AMGBackend()
- */
- El2PAMGBackendBase(const Problem& problem)
- : ParentType(problem)
- {
- createBlockMatrixAndVectors_();
- }
-
- /*!
- * \copydoc AMGBackend::solve()
- */
- template<class Matrix, class Vector>
- bool solve(Matrix& A, Vector& x, Vector& b)
- {
- flatToBlocked_(A, x, b);
- int converged = ParentType::solve(*aBlocked_, *xBlocked_, *bBlocked_);
- blockedToFlat_(x, b);
- return converged;
- }
-
-private:
- void createBlockMatrixAndVectors_()
- {
- int numVertices = this->problem().gridView().size(dim);
-
- aBlocked_ = std::make_shared<BlockMatrix>(numVertices, numVertices, BlockMatrix::random);
- xBlocked_ = std::make_shared<BlockVector>(numVertices);
- bBlocked_ = std::make_shared<BlockVector>(numVertices);
-
- // find out the global indices of the neighboring vertices of
- // each vertex
- typedef std::set<int> NeighborSet;
- std::vector<NeighborSet> neighbors(numVertices);
- for (const auto& element : elements(this->problem().gridView())) {
-
- // loop over all element vertices
- int n = element.subEntities(dim);
- for (int i = 0; i < n - 1; ++i) {
- int globalI = this->problem().vertexMapper().subIndex(element, i, dim);
- for (int j = i + 1; j < n; ++j) {
- int globalJ = this->problem().vertexMapper().subIndex(element, j, dim);
- // make sure that vertex j is in the neighbor set
- // of vertex i and vice-versa
- neighbors[globalI].insert(globalJ);
- neighbors[globalJ].insert(globalI);
- }
- }
- }
-
- // make vertices neighbors to themselfs
- for (int i = 0; i < numVertices; ++i)
- neighbors[i].insert(i);
-
- // allocate space for the rows of the matrix
- for (int i = 0; i < numVertices; ++i) {
- aBlocked_->setrowsize(i, neighbors[i].size());
- }
- aBlocked_->endrowsizes();
-
- // fill the rows with indices. each vertex talks to all of its
- // neighbors. (it also talks to itself since vertices are
- // sometimes quite egocentric.)
- for (int i = 0; i < numVertices; ++i) {
- auto nIt = neighbors[i].begin();
- const auto& nEndIt = neighbors[i].end();
- for (; nIt != nEndIt; ++nIt) {
- aBlocked_->addindex(i, *nIt);
- }
- }
- aBlocked_->endindices();
- }
-
- template <class FlatMatrix, class FlatVector>
- void flatToBlocked_(const FlatMatrix& aFlat,
- const FlatVector& xFlat,
- const FlatVector& bFlat)
- {
- unsigned numBlocks = xBlocked_->size();
- static const unsigned numMassEq = numEq - dim;
- for (unsigned rowBlockIdx = 0; rowBlockIdx < numBlocks; ++rowBlockIdx)
- {
- for (unsigned rowEqIdx = 0; rowEqIdx < numEq; ++rowEqIdx)
- {
- unsigned rowFlatIdx;
- if (rowEqIdx < numMassEq)
- rowFlatIdx = rowBlockIdx*numMassEq + rowEqIdx;
- else
- rowFlatIdx = numBlocks*numMassEq + rowBlockIdx*dim + rowEqIdx - numMassEq;
-
- (*xBlocked_)[rowBlockIdx][rowEqIdx] = xFlat[rowFlatIdx];
- (*bBlocked_)[rowBlockIdx][rowEqIdx] = bFlat[rowFlatIdx];
-
- for (auto colBlockIt = (*aBlocked_)[rowBlockIdx].begin();
- colBlockIt != (*aBlocked_)[rowBlockIdx].end(); ++colBlockIt)
- {
- unsigned colBlockIdx = colBlockIt.index();
- auto& aBlock = (*aBlocked_)[rowBlockIdx][colBlockIdx];
-
- for (unsigned colEqIdx = 0; colEqIdx < numEq; ++colEqIdx)
- {
- unsigned colFlatIdx;
- if (colEqIdx < numMassEq)
- colFlatIdx = colBlockIdx*numMassEq + colEqIdx;
- else
- colFlatIdx = numBlocks*numMassEq + colBlockIdx*dim + colEqIdx - numMassEq;
-
- aBlock[rowEqIdx][colEqIdx] = aFlat[rowFlatIdx][colFlatIdx];
- }
- }
- }
- }
- }
-
- template <class FlatVector>
- void blockedToFlat_(FlatVector& xFlat,
- FlatVector& bFlat)
- {
- unsigned numBlocks = xBlocked_->size();
- static const unsigned numMassEq = numEq - dim;
- for (unsigned rowBlockIdx = 0; rowBlockIdx < numBlocks; ++rowBlockIdx)
- {
- for (unsigned rowEqIdx = 0; rowEqIdx < numEq; ++rowEqIdx)
- {
- unsigned rowFlatIdx;
- if (rowEqIdx < numMassEq)
- rowFlatIdx = rowBlockIdx*numMassEq + rowEqIdx;
- else
- rowFlatIdx = numBlocks*numMassEq + rowBlockIdx*dim + rowEqIdx - numMassEq;
-
- xFlat[rowFlatIdx] = (*xBlocked_)[rowBlockIdx][rowEqIdx];
- bFlat[rowFlatIdx] = (*bBlocked_)[rowBlockIdx][rowEqIdx];
- }
- }
- }
-
- std::shared_ptr<BlockMatrix> aBlocked_;
- std::shared_ptr<BlockVector> xBlocked_;
- std::shared_ptr<BlockVector> bBlocked_;
-};
-
-/*!
- * \brief Wraps the AMG backend such that it can be used for the el2p model.
- */
-template <class TypeTag>
-class El2PAMGBackend : public El2PAMGBackendBase<
- TypeTag,
- Dune::Capabilities::canCommunicate<typename GET_PROP_TYPE(TypeTag, Grid),
- GET_PROP_TYPE(TypeTag, Grid)::dimension>::v>
-{
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- enum { dofCodim = Grid::dimension };
- enum { isParallel = Dune::Capabilities::canCommunicate<Grid, dofCodim>::v };
- typedef El2PAMGBackendBase<TypeTag, isParallel> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
-public:
- /*!
- * \copydoc AMGBackend::AMGBackend()
- */
- El2PAMGBackend(const Problem& problem)
- : ParentType(problem)
- {}
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_EL2P_AMGBACKEND_HH
diff --git a/dumux/geomechanics/el2p/assembler.hh b/dumux/geomechanics/el2p/assembler.hh
deleted file mode 100644
index f995b84864d778cc6c742468dc2e5d07ec6d2b8c..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/assembler.hh
+++ /dev/null
@@ -1,605 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief This file contains an assembler for the Jacobian matrix
- * of the two-phase linear-elastic model based on PDELab.
- */
-#ifndef DUMUX_EL2P_ASSEMBLER_HH
-#define DUMUX_EL2P_ASSEMBLER_HH
-
-#include "properties.hh"
-#include "localoperator.hh"
-
-namespace Dumux {
-
-namespace Properties
-{
-NEW_PROP_TAG(PressureFEM); //!< Finite element space used for pressure, saturation, ...
-NEW_PROP_TAG(DisplacementFEM); //!< Finite element space used for displacement
-NEW_PROP_TAG(PressureGridFunctionSpace); //!< Grid function space used for pressure, saturation, ...
-NEW_PROP_TAG(DisplacementGridFunctionSpace); //!< Grid function space used for displacement
-}
-
-namespace PDELab {
-
-/*!
- * \brief An assembler for the Jacobian matrix
- * of the two-phase linear-elastic model based on PDELab.
- */
-template<class TypeTag>
-class El2PAssembler
-{
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
- typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
-
- typedef typename GET_PROP_TYPE(TypeTag, PressureFEM) PressureFEM;
- typedef typename GET_PROP_TYPE(TypeTag, PressureGridFunctionSpace) PressureGFS;
- typedef typename PressureGFS::template Child<0>::Type PressureScalarGFS;
-
- typedef typename GET_PROP_TYPE(TypeTag, DisplacementFEM) DisplacementFEM;
- typedef typename GET_PROP_TYPE(TypeTag, DisplacementGridFunctionSpace) DisplacementGFS;
- typedef typename DisplacementGFS::template Child<0>::Type DisplacementScalarGFS;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
- typedef typename GET_PROP_TYPE(TypeTag, Constraints) Constraints;
- typedef typename GET_PROP_TYPE(TypeTag, ConstraintsTrafo) ConstraintsTrafo;
- typedef typename GET_PROP_TYPE(TypeTag, LocalOperator) LocalOperator;
- typedef typename GET_PROP_TYPE(TypeTag, GridOperator) GridOperator;
-
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
-
- enum{dim = GridView::dimension};
- typedef typename GridView::template Codim<0>::Entity Element;
-
- typedef typename GridView::template Codim<dim>::Entity Vertex;
-
- enum {
- enablePartialReassemble = GET_PROP_VALUE(TypeTag, ImplicitEnablePartialReassemble),
- enableJacobianRecycling = GET_PROP_VALUE(TypeTag, ImplicitEnableJacobianRecycling),
- };
-
- // copying the jacobian assembler is not a good idea
- El2PAssembler(const El2PAssembler &);
-
-public:
- /*!
- * \brief The colors of elements and vertices required for partial
- * Jacobian reassembly.
- */
- enum EntityColor {
- /*!
- * Vertex/element that needs to be reassembled because some
- * relative error is above the tolerance
- */
- Red,
-
- /*!
- * Vertex/element that needs to be reassembled because a
- * neighboring element/vertex is red
- */
- Yellow,
-
- /*!
- * Yellow vertex has only non-green neighbor elements.
- *
- * This means that its relative error is below the tolerance,
- * but its defect can be linearized without any additional
- * cost. This is just an "internal" color which is not used
- * ouside of the jacobian assembler.
- */
- Orange,
-
- /*!
- * Vertex/element that does not need to be reassembled
- */
- Green
- };
-
- El2PAssembler()
- {
- // set reassemble tolerance to 0, so that if partial
- // reassembly of the jacobian matrix is disabled, the
- // reassemble tolerance is always smaller than the current
- // relative tolerance
- reassembleTolerance_ = 0.0;
- }
-
- /*!
- * \brief Initialize the jacobian assembler.
- *
- * At this point we can assume that all objects in the problem and
- * the model have been allocated. We can not assume that they are
- * fully initialized, though.
- *
- * \param problem The problem object
- */
- void init(Problem& problem)
- {
- problemPtr_ = &problem;
-
- constraints_ = std::make_shared<Constraints>();
-
- pressureFEM_ = std::make_shared<PressureFEM>(problemPtr_->gridView());
- pressureScalarGFS_ = std::make_shared<PressureScalarGFS>(problemPtr_->gridView(), *pressureFEM_, *constraints_);
- pressureGFS_ = std::make_shared<PressureGFS>(*pressureScalarGFS_);
-
- displacementFEM_ = std::make_shared<DisplacementFEM>(problemPtr_->gridView());
- displacementScalarGFS_ = std::make_shared<DisplacementScalarGFS>(problemPtr_->gridView(), *displacementFEM_, *constraints_);
- displacementGFS_ = std::make_shared<DisplacementGFS>(*displacementScalarGFS_);
-
- gridFunctionSpace_ = std::make_shared<GridFunctionSpace>(*pressureGFS_, *displacementGFS_);
-
- constraintsTrafo_ = std::make_shared<ConstraintsTrafo>();
-
- // initialize the grid operator spaces
- localOperator_ = std::make_shared<LocalOperator>(problemPtr_->model());
- gridOperator_ =
- std::make_shared<GridOperator>(*gridFunctionSpace_, *constraintsTrafo_,
- *gridFunctionSpace_, *constraintsTrafo_, *localOperator_);
-
- // allocate raw matrix
- matrix_ = std::make_shared<JacobianMatrix>(*gridOperator_);
-
- // initialize the jacobian matrix and the right hand side
- // vector
- *matrix_ = 0;
- reuseMatrix_ = false;
-
- residual_ = std::make_shared<SolutionVector>(*gridFunctionSpace_);
-
- int numVertices = gridView_().size(dim);
- int numElements = gridView_().size(0);
-
- totalElems_ = gridView_().comm().sum(numElements);
-
- // initialize data needed for partial reassembly
- if (enablePartialReassemble) {
- vertexColor_.resize(numVertices);
- vertexDelta_.resize(numVertices);
- elementColor_.resize(numElements);
- }
- reassembleAll();
- }
-
- /*!
- * \brief Assemble the local jacobian of the problem.
- *
- * The current state of affairs (esp. the previous and the current
- * solutions) is represented by the model object.
- */
- void assemble()
- {
- *matrix_ = 0;
- gridOperator_->jacobian(problemPtr_->model().curSol(), *matrix_);
-
- *residual_ = 0;
- gridOperator_->residual(problemPtr_->model().curSol(), *residual_);
-
- return;
- }
-
- /*!
- * \brief If Jacobian matrix recycling is enabled, this method
- * specifies whether the next call to assemble() just
- * rescales the storage term or does a full reassembly
- *
- * \param yesno If true, only rescale; else do full Jacobian assembly.
- */
- void setMatrixReuseable(bool yesno = true)
- {
- if (enableJacobianRecycling)
- reuseMatrix_ = yesno;
- }
-
- /*!
- * \brief If partial Jacobian matrix reassembly is enabled, this
- * method causes all elements to be reassembled in the next
- * assemble() call.
- */
- void reassembleAll()
- {
- nextReassembleTolerance_ = 0.0;
-
- if (enablePartialReassemble) {
- std::fill(vertexColor_.begin(),
- vertexColor_.end(),
- Red);
- std::fill(elementColor_.begin(),
- elementColor_.end(),
- Red);
- std::fill(vertexDelta_.begin(),
- vertexDelta_.end(),
- 0.0);
- }
- }
-
- /*!
- * \brief Returns the relative error below which a vertex is
- * considered to be "green" if partial Jacobian reassembly
- * is enabled.
- *
- * This returns the _actual_ relative computed seen by
- * computeColors(), not the tolerance which it was given.
- */
- Scalar reassembleTolerance() const
- { return reassembleTolerance_; }
-
- /*!
- * \brief Update the distance where the non-linear system was
- * originally insistently linearized and the point where it
- * will be linerized the next time.
- *
- * This only has an effect if partial reassemble is enabled.
- */
- void updateDiscrepancy(const SolutionVector &u,
- const SolutionVector &uDelta)
- {
- if (!enablePartialReassemble)
- return;
-
- // update the vector with the distances of the current
- // evaluation point used for linearization from the original
- // evaluation point
- using std::abs;
- for (int i = 0; i < vertexDelta_.size(); ++i) {
- PrimaryVariables uCurrent(u[i]);
- PrimaryVariables uNext(uCurrent);
- uNext -= uDelta[i];
-
- // we need to add the distance the solution was moved for
- // this vertex
- Scalar dist = model_().relativeErrorVertex(i,
- uCurrent,
- uNext);
- vertexDelta_[i] += abs(dist);
- }
-
- }
-
- /*!
- * \brief Determine the colors of vertices and elements for partial
- * reassembly given a relative tolerance.
- *
- * The following approach is used:
- *
- * - Set all vertices and elements to 'green'
- * - Mark all vertices as 'red' which exhibit an relative error above
- * the tolerance
- * - Mark all elements which feature a 'red' vetex as 'red'
- * - Mark all vertices which are not 'red' and are part of a
- * 'red' element as 'yellow'
- * - Mark all elements which are not 'red' and contain a
- * 'yellow' vertex as 'yellow'
- *
- * \param relTol The relative error below which a vertex won't be
- * reassembled. Note that this specifies the
- * worst-case relative error between the last
- * linearization point and the current solution and
- * _not_ the delta vector of the Newton iteration!
- */
- void computeColors(Scalar relTol)
- {
- if (!enablePartialReassemble)
- return;
-
- // mark the red vertices and update the tolerance of the
- // linearization which actually will get achieved
- nextReassembleTolerance_ = 0;
- for (int i = 0; i < vertexColor_.size(); ++i) {
- vertexColor_[i] = Green;
- if (vertexDelta_[i] > relTol) {
- // mark vertex as red if discrepancy is larger than
- // the relative tolerance
- vertexColor_[i] = Red;
- }
- using std::max;
- nextReassembleTolerance_ =
- max(nextReassembleTolerance_, vertexDelta_[i]);
- };
-
- // Mark all red elements
- for (const auto& element : elements(gridView_())) {
- // find out whether the current element features a red
- // vertex
- bool isRed = false;
- int numVertices = element.subEntities(dim);
- for (int i=0; i < numVertices; ++i) {
- int globalI = vertexMapper_().subIndex(element, i, dim);
- if (vertexColor_[globalI] == Red) {
- isRed = true;
- break;
- }
- };
-
- // if yes, the element color is also red, else it is not
- // red, i.e. green for the mean time
- int eIdxGlobal = elementMapper_().index(element);
- if (isRed)
- elementColor_[eIdxGlobal] = Red;
- else
- elementColor_[eIdxGlobal] = Green;
- }
-
- // Mark yellow vertices (as orange for the mean time)
- for (const auto& element : elements(gridView_())) {
- int eIdx = this->elementMapper_().index(element);
- if (elementColor_[eIdx] != Red)
- continue; // non-red elements do not tint vertices
- // yellow!
-
- int numVertices = element.subEntities(dim);
- for (int i=0; i < numVertices; ++i) {
- int globalI = vertexMapper_().subIndex(element, i, dim);
- // if a vertex is already red, don't recolor it to
- // yellow!
- if (vertexColor_[globalI] != Red)
- vertexColor_[globalI] = Orange;
- };
- }
-
- // Mark yellow elements
- for (const auto& element : elements(gridView_())) {
- int eIdx = this->elementMapper_().index(element);
- if (elementColor_[eIdx] == Red) {
- continue; // element is red already!
- }
-
- // check whether the element features a yellow
- // (resp. orange at this point) vertex
- bool isYellow = false;
- int numVertices = element.subEntities(dim);
- for (int i=0; i < numVertices; ++i) {
- int globalI = vertexMapper_().subIndex(element, i, dim);
- if (vertexColor_[globalI] == Orange) {
- isYellow = true;
- break;
- }
- };
-
- if (isYellow)
- elementColor_[eIdx] = Yellow;
- }
-
- // Demote orange vertices to yellow ones if it has at least
- // one green element as a neighbor.
- for (const auto& element : elements(gridView_())) {
- int eIdx = this->elementMapper_().index(element);
- if (elementColor_[eIdx] != Green)
- continue; // yellow and red elements do not make
- // orange vertices yellow!
-
- int numVertices = element.subEntities(dim);
- for (int i=0; i < numVertices; ++i) {
- int globalI = vertexMapper_().subIndex(element, i, dim);
- // if a vertex is orange, recolor it to yellow!
- if (vertexColor_[globalI] == Orange)
- vertexColor_[globalI] = Yellow;
- };
- }
-
- // promote the remaining orange vertices to red
- for (int i=0; i < vertexColor_.size(); ++i) {
- // if a vertex is green or yellow don't do anything!
- if (vertexColor_[i] == Green || vertexColor_[i] == Yellow)
- continue;
-
- // make sure the vertex is red (this is a no-op vertices
- // which are already red!)
- vertexColor_[i] = Red;
-
- // set the error of this vertex to 0 because the system
- // will be consistently linearized at this vertex
- vertexDelta_[i] = 0.0;
- };
- };
-
- /*!
- * \brief Returns the reassemble color of a vertex
- *
- * \param element An element which contains the vertex
- * \param vIdx The local index of the vertex in the element.
- */
- int vertexColor(const Element &element, int vIdx) const
- {
- if (!enablePartialReassemble)
- return Red; // reassemble unconditionally!
-
- int vIdxGlobal = vertexMapper_().subIndex(element, vIdx, dim);
-
- return vertexColor_[vIdxGlobal];
- }
-
- /*!
- * \brief Returns the reassemble color of a vertex
- *
- * \param vIdxGlobal The global index of the vertex.
- */
- int vertexColor(int vIdxGlobal) const
- {
- if (!enablePartialReassemble)
- return Red; // reassemble unconditionally!
- return vertexColor_[vIdxGlobal];
- }
-
- /*!
- * \brief Returns the Jacobian reassemble color of an element
- *
- * \param element The Codim-0 DUNE entity
- */
- int elementColor(const Element &element) const
- {
- if (!enablePartialReassemble)
- return Red; // reassemble unconditionally!
-
- int eIdxGlobal = elementMapper_().index(element);
- return elementColor_[eIdxGlobal];
- }
-
- /*!
- * \brief Returns the Jacobian reassemble color of an element
- *
- * \param globalElementIdx The global index of the element.
- */
- int elementColor(int globalElementIdx) const
- {
- if (!enablePartialReassemble)
- return Red; // reassemble unconditionally!
- return elementColor_[globalElementIdx];
- }
-
- /*!
- * \brief Returns a pointer to the PDELab's grid function space.
- */
- const GridFunctionSpace& gridFunctionSpace() const
- {
- return *gridFunctionSpace_;
- }
-
- /*!
- * \brief Returns a pointer to the PDELab's constraints
- * transformation.
- */
- const ConstraintsTrafo& constraintsTrafo() const
- {
- return *constraintsTrafo_;
- }
-
- /*!
- * \brief Return constant reference to global Jacobian matrix.
- */
- const JacobianMatrix& matrix() const
- { return *matrix_; }
-
- /*!
- * \brief Return reference to global Jacobian matrix.
- */
- JacobianMatrix& matrix()
- { return *matrix_; }
-
- /*!
- * \brief Return constant reference to global residual vector.
- */
- const SolutionVector& residual() const
- { return *residual_; }
-
-
- /*!
- * \brief Return reference to global residual vector.
- */
- SolutionVector& residual()
- { return *residual_; }
-
- const GridOperator &gridOperator() const
- { return *gridOperator_;}
-
-private:
- // reset the global linear system of equations. if partial
- // reassemble is enabled, this means that the jacobian matrix must
- // only be erased partially!
- void resetSystem_()
- {
- // always reset the right hand side.
- *residual_ = 0.0;
-
- if (!enablePartialReassemble) {
- // If partial reassembly of the jacobian is not enabled,
- // we can just reset everything!
- (*matrix_) = 0;
- return;
- }
-
- // reset all entries corrosponding to a red vertex
- for (int rowIdx = 0; rowIdx < matrix_->N(); ++rowIdx) {
- if (vertexColor_[rowIdx] == Green)
- continue; // the equations for this control volume are
- // already below the treshold
-
- // set all entries in the row to 0
- typedef typename JacobianMatrix::ColIterator ColIterator;
- ColIterator colIt = (*matrix_)[rowIdx].begin();
- const ColIterator &colEndIt = (*matrix_)[rowIdx].end();
- for (; colIt != colEndIt; ++colIt) {
- (*colIt) = 0.0;
- }
- };
- }
-
- Problem &problem_()
- { return *problemPtr_; }
- const Problem &problem_() const
- { return *problemPtr_; }
- const Model &model_() const
- { return problem_().model(); }
- Model &model_()
- { return problem_().model(); }
- const GridView &gridView_() const
- { return problem_().gridView(); }
- const VertexMapper &vertexMapper_() const
- { return problem_().vertexMapper(); }
- const ElementMapper &elementMapper_() const
- { return problem_().elementMapper(); }
-
- Problem *problemPtr_;
-
- // the jacobian matrix
- std::shared_ptr<JacobianMatrix> matrix_;
- // the right-hand side
- std::shared_ptr<SolutionVector> residual_;
-
- // attributes required for jacobian matrix recycling
- bool reuseMatrix_;
-
- // attributes required for partial jacobian reassembly
- std::vector<EntityColor> vertexColor_;
- std::vector<EntityColor> elementColor_;
- std::vector<Scalar> vertexDelta_;
-
- int totalElems_;
- int greenElems_;
-
- Scalar nextReassembleTolerance_;
- Scalar reassembleTolerance_;
-
-
- std::shared_ptr<Constraints> constraints_;
- std::shared_ptr<PressureFEM> pressureFEM_;
- std::shared_ptr<DisplacementFEM> displacementFEM_;
- std::shared_ptr<PressureScalarGFS> pressureScalarGFS_;
- std::shared_ptr<DisplacementScalarGFS> displacementScalarGFS_;
- std::shared_ptr<PressureGFS> pressureGFS_;
- std::shared_ptr<DisplacementGFS> displacementGFS_;
- std::shared_ptr<GridFunctionSpace> gridFunctionSpace_;
- std::shared_ptr<ConstraintsTrafo> constraintsTrafo_;
- std::shared_ptr<LocalOperator> localOperator_;
- std::shared_ptr<GridOperator> gridOperator_;
-};
-
-} // namespace PDELab
-
-} // namespace Dumux
-
-#endif
diff --git a/dumux/geomechanics/el2p/basemodel.hh b/dumux/geomechanics/el2p/basemodel.hh
deleted file mode 100644
index 35f1a67ff36eb1bdf4d829d4463eea4b5926a9be..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/basemodel.hh
+++ /dev/null
@@ -1,984 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for fully-implicit models
- */
-#ifndef DUMUX_ELASTIC2P_BASE_MODEL_HH
-#define DUMUX_ELASTIC2P_BASE_MODEL_HH
-
-#include <dune/geometry/type.hh>
-#include <dune/istl/bvector.hh>
-
-#include <dumux/implicit/model.hh>
-#include <dumux/common/valgrind.hh>
-#include <dumux/parallel/vertexhandles.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup ElTwoPBoxModel
- * \brief base class for the two-phase geomechanics model
- */
-template<class TypeTag>
-class ElTwoPBaseModel
-{
- typedef typename GET_PROP_TYPE(TypeTag, Model) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
- typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
-
- enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
- dim = GridView::dimension
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, LocalJacobian) LocalJacobian;
- typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) LocalResidual;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonController) NewtonController;
-
- typedef typename GridView::ctype CoordScalar;
- typedef typename GridView::template Codim<0>::Entity Element;
-
- typedef typename Dune::ReferenceElements<CoordScalar, dim> ReferenceElements;
- typedef typename Dune::ReferenceElement<CoordScalar, dim> ReferenceElement;
-
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dim : 0 };
-
- // copying a model is not a good idea
- ElTwoPBaseModel(const ElTwoPBaseModel &);
-
-public:
- /*!
- * \brief The constructor.
- */
- ElTwoPBaseModel()
- : problemPtr_(0)
- {
- enableHints_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Implicit, EnableHints);
- }
-
- /*!
- * \brief Apply the initial conditions to the model.
- *
- * \param problem The object representing the problem which needs to
- * be simulated.
- */
- void init(Problem &problem)
- {
- problemPtr_ = &problem;
-
- updateBoundaryIndices_();
-
- int numDofs = asImp_().numDofs();
- if (isBox)
- boxVolume_.resize(numDofs);
-
- localJacobian_.init(problem_());
- jacAsm_ = std::make_shared<JacobianAssembler>();
- jacAsm_->init(problem_());
-
- uCur_ = std::make_shared<SolutionVector>(jacAsm_->gridFunctionSpace());
- uPrev_ = std::make_shared<SolutionVector>(jacAsm_->gridFunctionSpace());
-
- asImp_().applyInitialSolution_();
-
- // resize the hint vectors
- if (isBox && enableHints_) {
- int numVertices = gridView_().size(dim);
- curHints_.resize(numVertices);
- prevHints_.resize(numVertices);
- hintsUsable_.resize(numVertices);
- std::fill(hintsUsable_.begin(),
- hintsUsable_.end(),
- false);
- }
-
- // also set the solution of the "previous" time step to the
- // initial solution.
- *uPrev_ = *uCur_;
- }
-
- void setHints(const Element &element,
- ElementVolumeVariables &prevVolVars,
- ElementVolumeVariables &curVolVars) const
- {
- if (!isBox || !enableHints_)
- return;
-
- int n = element.subEntities(dim);
- prevVolVars.resize(n);
- curVolVars.resize(n);
- for (int i = 0; i < n; ++i) {
- int vIdxGlobal = vertexMapper().subIndex(element, i, dim);
-
- if (!hintsUsable_[vIdxGlobal]) {
- curVolVars[i].setHint(NULL);
- prevVolVars[i].setHint(NULL);
- }
- else {
- curVolVars[i].setHint(&curHints_[vIdxGlobal]);
- prevVolVars[i].setHint(&prevHints_[vIdxGlobal]);
- }
- }
- }
-
- void setHints(const Element &element,
- ElementVolumeVariables &curVolVars) const
- {
- if (!isBox || !enableHints_)
- return;
-
- int n = element.subEntities(dim);
- curVolVars.resize(n);
- for (int i = 0; i < n; ++i) {
- int vIdxGlobal = vertexMapper().subIndex(element, i, dim);
-
- if (!hintsUsable_[vIdxGlobal])
- curVolVars[i].setHint(NULL);
- else
- curVolVars[i].setHint(&curHints_[vIdxGlobal]);
- }
- }
-
- void updatePrevHints()
- {
- if (!isBox || !enableHints_)
- return;
-
- prevHints_ = curHints_;
- }
-
- void updateCurHints(const Element &element,
- const ElementVolumeVariables &elemVolVars) const
- {
- if (!isBox || !enableHints_)
- return;
-
- for (unsigned int i = 0; i < elemVolVars.size(); ++i) {
- int vIdxGlobal = vertexMapper().subIndex(element, i, dim);
- curHints_[vIdxGlobal] = elemVolVars[i];
- if (!hintsUsable_[vIdxGlobal])
- prevHints_[vIdxGlobal] = elemVolVars[i];
- hintsUsable_[vIdxGlobal] = true;
- }
- }
-
-
- /*!
- * \brief Compute the global residual for an arbitrary solution
- * vector.
- *
- * \param residual Stores the result
- * \param u The solution for which the residual ought to be calculated
- */
- Scalar globalResidual(SolutionVector &residual,
- const SolutionVector &u)
- {
- jacAsm_->gridOperator().residual(u, residual);
-
- // calculate the square norm of the residual
- Scalar result2 = residual.base().two_norm2();
- if (gridView_().comm().size() > 1)
- result2 = gridView_().comm().sum(result2);
-
- // add up the residuals on the process borders
- if (isBox && gridView_().comm().size() > 1) {
- VertexHandleSum<PrimaryVariables, SolutionVector, VertexMapper>
- sumHandle(residual, vertexMapper());
- gridView_().communicate(sumHandle,
- Dune::InteriorBorder_InteriorBorder_Interface,
- Dune::ForwardCommunication);
- }
-
- using std::sqrt;
- return sqrt(result2);
- }
-
- /*!
- * \brief Compute the global residual for the current solution
- * vector.
- *
- * \param residual Stores the result
- */
- Scalar globalResidual(SolutionVector &residual)
- {
- return globalResidual(residual, curSol());
- }
-
- /*!
- * \brief Compute the integral over the domain of the storage
- * terms of all conservation quantities.
- *
- * \param storage Stores the result
- */
- void globalStorage(PrimaryVariables &storage)
- {
- storage = 0;
-
- for (const auto& element : elements(gridView_(), Dune::Partitions::interior))
- {
- localResidual().evalStorage(element);
-
- if (isBox)
- {
- for (int i = 0; i < element.subEntities(dim); ++i)
- storage += localResidual().storageTerm()[i];
- }
- else
- {
- storage += localResidual().storageTerm()[0];
- }
- }
-
- if (gridView_().comm().size() > 1)
- storage = gridView_().comm().sum(storage);
- }
-
- /*!
- * \brief Returns the volume \f$\mathrm{[m^3]}\f$ of a given control volume.
- *
- * \param vIdxGlobal The global index of the control volume's
- * associated vertex
- */
- Scalar boxVolume(const int vIdxGlobal) const
- {
- if (isBox)
- {
- return boxVolume_[vIdxGlobal][0];
- }
- else
- {
- DUNE_THROW(Dune::InvalidStateException,
- "requested box volume for cell-centered model");
- }
- }
-
- /*!
- * \brief Reference to the current solution as a block vector.
- */
- const SolutionVector &curSol() const
- { return *uCur_; }
-
- /*!
- * \brief Reference to the current solution as a block vector.
- */
- SolutionVector &curSol()
- { return *uCur_; }
-
- /*!
- * \brief Reference to the previous solution as a block vector.
- */
- const SolutionVector &prevSol() const
- { return *uPrev_; }
-
- /*!
- * \brief Reference to the previous solution as a block vector.
- */
- SolutionVector &prevSol()
- { return *uPrev_; }
-
- /*!
- * \brief Returns the operator assembler for the global jacobian of
- * the problem.
- */
- JacobianAssembler &jacobianAssembler()
- { return *jacAsm_; }
-
- /*!
- * \copydoc jacobianAssembler()
- */
- const JacobianAssembler &jacobianAssembler() const
- { return *jacAsm_; }
-
- /*!
- * \brief Returns the local jacobian which calculates the local
- * stiffness matrix for an arbitrary element.
- *
- * The local stiffness matrices of the element are used by
- * the jacobian assembler to produce a global linerization of the
- * problem.
- */
- LocalJacobian &localJacobian()
- { return localJacobian_; }
- /*!
- * \copydoc localJacobian()
- */
- const LocalJacobian &localJacobian() const
- { return localJacobian_; }
-
- /*!
- * \brief Returns the local residual function.
- */
- LocalResidual &localResidual()
- { return localJacobian().localResidual(); }
- /*!
- * \copydoc localResidual()
- */
- const LocalResidual &localResidual() const
- { return localJacobian().localResidual(); }
-
- /*!
- * \brief Returns the maximum relative shift between two vectors of
- * primary variables.
- *
- * \param priVars1 The first vector of primary variables
- * \param priVars2 The second vector of primary variables
- */
- Scalar relativeShiftAtDof(const PrimaryVariables &priVars1,
- const PrimaryVariables &priVars2)
- {
- Scalar result = 0.0;
- using std::abs;
- using std::max;
- for (int j = 0; j < numEq; ++j) {
- Scalar eqErr = abs(priVars1[j] - priVars2[j]);
- eqErr /= max<Scalar>(1.0, abs(priVars1[j] + priVars2[j])/2);
-
- result = max(result, eqErr);
- }
- return result;
- }
-
- /*!
- * \brief Try to progress the model to the next timestep.
- *
- * \param solver The non-linear solver
- * \param controller The controller which specifies the behaviour
- * of the non-linear solver
- */
- bool update(NewtonMethod &solver,
- NewtonController &controller)
- {
-#if HAVE_VALGRIND
- for (size_t i = 0; i < curSol().base().size(); ++i)
- Valgrind::CheckDefined(curSol().base()[i]);
-#endif // HAVE_VALGRIND
-
- asImp_().updateBegin();
-
- bool converged = solver.execute(controller);
- if (converged) {
- asImp_().updateSuccessful();
- }
- else
- asImp_().updateFailed();
-
-#if HAVE_VALGRIND
- for (size_t i = 0; i < curSol().base().size(); ++i) {
- Valgrind::CheckDefined(curSol().base()[i]);
- }
-#endif // HAVE_VALGRIND
-
- return converged;
- }
-
- /*!
- * \brief Check the plausibility of the current solution
- *
- * This has to be done by the actual model, it knows
- * best, what (ranges of) variables to check.
- * This is primarily a hook
- * which the actual model can overload.
- */
- void checkPlausibility() const
- { }
-
- /*!
- * \brief Called by the update() method before it tries to
- * apply the newton method. This is primarily a hook
- * which the actual model can overload.
- */
- void updateBegin()
- { }
-
-
- /*!
- * \brief Called by the update() method if it was
- * successful. This is primarily a hook which the actual
- * model can overload.
- */
- void updateSuccessful()
- { }
-
- /*!
- * \brief Called by the update() method if it was
- * unsuccessful. This is primarily a hook which the actual
- * model can overload.
- */
- void updateFailed()
- {
- // Reset the current solution to the one of the
- // previous time step so that we can start the next
- // update at a physically meaningful solution.
- *uCur_ = *uPrev_;
- if (isBox)
- curHints_ = prevHints_;
-
- jacAsm_->reassembleAll();
- }
-
- /*!
- * \brief Called by the problem if a time integration was
- * successful, post processing of the solution is done and
- * the result has been written to disk.
- *
- * This should prepare the model for the next time integration.
- */
- void advanceTimeLevel()
- {
- // make the current solution the previous one.
- *uPrev_ = *uCur_;
- if (isBox)
- prevHints_ = curHints_;
-
- updatePrevHints();
- }
-
- /*!
- * \brief Serializes the current state of the model.
- *
- * \tparam Restarter The type of the serializer class
- *
- * \param res The serializer object
- */
- template <class Restarter>
- void serialize(Restarter &res)
- {
- if (isBox)
- res.template serializeEntities<dim>(asImp_(), gridView_());
- else
- res.template serializeEntities<0>(asImp_(), gridView_());
- }
-
- /*!
- * \brief Deserializes the state of the model.
- *
- * \tparam Restarter The type of the serializer class
- *
- * \param res The serializer object
- */
- template <class Restarter>
- void deserialize(Restarter &res)
- {
- if (isBox)
- res.template deserializeEntities<dim>(asImp_(), gridView_());
- else
- res.template deserializeEntities<0>(asImp_(), gridView_());
-
- prevSol() = curSol();
- }
-
- /*!
- * \brief Write the current solution for a vertex to a restart
- * file.
- *
- * \param outstream The stream into which the vertex data should
- * be serialized to
- * \param entity The entity which's data should be
- * serialized, i.e. a vertex for the box method
- * and an element for the cell-centered method
- */
- template <class Entity>
- void serializeEntity(std::ostream &outstream,
- const Entity &entity)
- {
- int dofIdxGlobal = dofMapper().index(entity);
-
- // write phase state
- if (!outstream.good()) {
- DUNE_THROW(Dune::IOError,
- "Could not serialize vertex "
- << dofIdxGlobal);
- }
-
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
- outstream << curSol()[dofIdxGlobal][eqIdx] << " ";
- }
- }
-
- /*!
- * \brief Reads the current solution variables for a vertex from a
- * restart file.
- *
- * \param instream The stream from which the vertex data should
- * be deserialized from
- * \param entity The entity which's data should be
- * serialized, i.e. a vertex for the box method
- * and an element for the cell-centered method
- */
- template <class Entity>
- void deserializeEntity(std::istream &instream,
- const Entity &entity)
- {
- int dofIdxGlobal = dofMapper().index(entity);
-
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
- if (!instream.good())
- DUNE_THROW(Dune::IOError,
- "Could not deserialize vertex "
- << dofIdxGlobal);
- instream >> curSol()[dofIdxGlobal][eqIdx];
- }
- }
-
- /*!
- * \brief Returns the number of global degrees of freedoms (DOFs)
- */
- size_t numDofs() const
- {
- if (isBox)
- return gridView_().size(dim);
- else
- return gridView_().size(0);
- }
-
- /*!
- * \brief Mapper for the entities where degrees of freedoms are
- * defined to indices.
- *
- * Is the box method is used, this means a mapper
- * for vertices, if the cell centered method is used,
- * this means a mapper for elements.
- */
- template <class T = TypeTag>
- const typename std::enable_if<GET_PROP_VALUE(T, ImplicitIsBox), VertexMapper>::type &dofMapper() const
- {
- return problem_().vertexMapper();
- }
- template <class T = TypeTag>
- const typename std::enable_if<!GET_PROP_VALUE(T, ImplicitIsBox), ElementMapper>::type &dofMapper() const
- {
- return problem_().elementMapper();
- }
-
- /*!
- * \brief Mapper for vertices to indices.
- */
- const VertexMapper &vertexMapper() const
- { return problem_().vertexMapper(); }
-
- /*!
- * \brief Mapper for elements to indices.
- */
- const ElementMapper &elementMapper() const
- { return problem_().elementMapper(); }
-
- /*!
- * \brief Resets the Jacobian matrix assembler, so that the
- * boundary types can be altered.
- */
- void resetJacobianAssembler ()
- {
- jacAsm_.template reset<JacobianAssembler>(0);
- jacAsm_ = std::make_shared<JacobianAssembler>();
- jacAsm_->init(problem_());
- }
-
- /*!
- * \brief Update the weights of all primary variables within an
- * element given the complete set of volume variables
- *
- * \param element The DUNE codim 0 entity
- * \param volVars All volume variables for the element
- */
- void updatePVWeights(const Element &element,
- const ElementVolumeVariables &volVars) const
- { }
-
- /*!
- * \brief Add the vector fields for analysing the convergence of
- * the newton method to the a VTK multi writer.
- *
- * \tparam MultiWriter The type of the VTK multi writer
- *
- * \param writer The VTK multi writer object on which the fields should be added.
- * \param u The solution function
- * \param deltaU The delta of the solution function before and after the Newton update
- */
- template <class MultiWriter>
- void addConvergenceVtkFields(MultiWriter &writer,
- const SolutionVector &u,
- const SolutionVector &deltaU)
- {
- typedef Dune::BlockVector<Dune::FieldVector<double, 1> > ScalarField;
-
- SolutionVector residual(u);
- asImp_().globalResidual(residual, u);
-
- // create the required scalar fields
- unsigned numDofs = asImp_().numDofs();
-
- // global defect of the two auxiliary equations
- ScalarField* def[numEq];
- ScalarField* delta[numEq];
- ScalarField* x[numEq];
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
- x[eqIdx] = writer.allocateManagedBuffer(numDofs);
- delta[eqIdx] = writer.allocateManagedBuffer(numDofs);
- def[eqIdx] = writer.allocateManagedBuffer(numDofs);
- }
-
- for (unsigned int vIdxGlobal = 0; vIdxGlobal < u.base().size(); vIdxGlobal++)
- {
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
- {
- (*x[eqIdx])[vIdxGlobal] = u.base()[vIdxGlobal][eqIdx];
- (*delta[eqIdx])[vIdxGlobal] = - deltaU.base()[vIdxGlobal][eqIdx];
- (*def[eqIdx])[vIdxGlobal] = residual.base()[vIdxGlobal][eqIdx];
- }
- }
-
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
- std::ostringstream oss;
- oss.str(""); oss << "x_" << eqIdx;
- if (isBox)
- writer.attachVertexData(*x[eqIdx], oss.str());
- else
- writer.attachCellData(*x[eqIdx], oss.str());
- oss.str(""); oss << "delta_" << eqIdx;
- if (isBox)
- writer.attachVertexData(*delta[eqIdx], oss.str());
- else
- writer.attachCellData(*delta[eqIdx], oss.str());
- oss.str(""); oss << "defect_" << eqIdx;
- if (isBox)
- writer.attachVertexData(*def[eqIdx], oss.str());
- else
- writer.attachCellData(*def[eqIdx], oss.str());
- }
-
- asImp_().addOutputVtkFields(u, writer);
- }
-
- /*!
- * \brief Add the quantities of a time step which ought to be written to disk.
- *
- * This should be overwritten by the actual model if any secondary
- * variables should be written out. Read: This should _always_ be
- * overwritten by well behaved models!
- *
- * \tparam MultiWriter The type of the VTK multi writer
- *
- * \param sol The global vector of primary variable values.
- * \param writer The VTK multi writer where the fields should be added.
- */
- template <class MultiWriter>
- void addOutputVtkFields(const SolutionVector &sol,
- MultiWriter &writer)
- {
- typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField;
-
- // create the required scalar fields
- unsigned numDofs = asImp_().numDofs();
-
- // global defect of the two auxiliary equations
- ScalarField* x[numEq];
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
- x[eqIdx] = writer.allocateManagedBuffer(numDofs);
- }
-
- for (int vIdxGlobal = 0; vIdxGlobal < sol.size(); vIdxGlobal++)
- {
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
- (*x[eqIdx])[vIdxGlobal] = sol[vIdxGlobal][eqIdx];
- }
- }
-
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
- std::ostringstream oss;
- oss << "primaryVar_" << eqIdx;
- if (isBox)
- writer.attachVertexData(*x[eqIdx], oss.str());
- else
- writer.attachCellData(*x[eqIdx], oss.str());
- }
- }
-
- /*!
- * \brief Reference to the grid view of the spatial domain.
- */
- const GridView &gridView() const
- { return problem_().gridView(); }
-
- /*!
- * \brief Returns true if the entity indicated by 'dofIdxGlobal'
- * is located on / touches the grid's boundary.
- *
- * \param dofIdxGlobal The global index of the entity
- */
- bool onBoundary(const int dofIdxGlobal) const
- { return boundaryIndices_[dofIdxGlobal]; }
-
- /*!
- * \brief Returns true if a vertex is located on the grid's
- * boundary.
- *
- * \param element A DUNE Codim<0> entity which contains the control
- * volume's associated vertex.
- * \param vIdx The local vertex index inside element
- */
- bool onBoundary(const Element &element, const int vIdx) const
- {
- if (isBox)
- return onBoundary(vertexMapper().subIndex(element, vIdx, dim));
- else
- DUNE_THROW(Dune::InvalidStateException,
- "requested for cell-centered model");
- }
-
-
- /*!
- * \brief Returns true if the control volume touches
- * the grid's boundary.
- *
- * \param element A DUNE Codim<0> entity coinciding with the control
- * volume.
- */
- bool onBoundary(const Element &element) const
- {
- if (!isBox)
- return onBoundary(elementMapper().index(element));
- else
- DUNE_THROW(Dune::InvalidStateException,
- "requested for box model");
- }
-
- /*!
- * \brief Fill the fluid state according to the primary variables.
- *
- * Taking the information from the primary variables,
- * the fluid state is filled with every information that is
- * necessary to evaluate the model's local residual.
- *
- * \param priVars The primary variables of the model.
- * \param problem The problem at hand.
- * \param element The current element.
- * \param fvGeometry The finite volume element geometry.
- * \param scvIdx The index of the subcontrol volume.
- * \param fluidState The fluid state to fill.
- */
- template <class FluidState>
- static void completeFluidState(const PrimaryVariables& priVars,
- const Problem& problem,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const int scvIdx,
- FluidState& fluidState)
- {
- VolumeVariables::completeFluidState(priVars, problem, element,
- fvGeometry, scvIdx, fluidState);
- }
-protected:
- /*!
- * \brief A reference to the problem on which the model is applied.
- */
- Problem &problem_()
- { return *problemPtr_; }
- /*!
- * \copydoc problem_()
- */
- const Problem &problem_() const
- { return *problemPtr_; }
-
- /*!
- * \brief Reference to the grid view of the spatial domain.
- */
- const GridView &gridView_() const
- { return problem_().gridView(); }
-
- /*!
- * \brief Reference to the local residal object
- */
- LocalResidual &localResidual_()
- { return localJacobian_.localResidual(); }
-
- /*!
- * \brief Applies the initial solution for all vertices of the grid.
- */
- void applyInitialSolution_()
- {
- // first set the whole domain to zero
- *uCur_ = Scalar(0.0);
- boxVolume_ = Scalar(0.0);
-
- FVElementGeometry fvGeometry;
-
- // iterate through leaf grid and evaluate initial
- // condition at the center of each sub control volume
- //
- // the initial condition needs to be unique for
- // each vertex. we should think about the API...
- for (const auto& element : elements(gridView_())) {
- // deal with the current element
- fvGeometry.update(gridView_(), element);
-
- // loop over all element vertices, i.e. sub control volumes
- for (int scvIdx = 0; scvIdx < fvGeometry.numScv; scvIdx++)
- {
- // get the global index of the degree of freedom
- int dofIdxGlobal = dofMapper().subIndex(element, scvIdx, dofCodim);
-
- // let the problem do the dirty work of nailing down
- // the initial solution.
- PrimaryVariables initPriVars;
- Valgrind::SetUndefined(initPriVars);
- problem_().initial(initPriVars,
- element,
- fvGeometry,
- scvIdx);
- Valgrind::CheckDefined(initPriVars);
-
- if (isBox)
- {
- // add up the initial values of all sub-control
- // volumes. If the initial values disagree for
- // different sub control volumes, the initial value
- // will be the arithmetic mean.
- initPriVars *= fvGeometry.subContVol[scvIdx].volume;
- boxVolume_[dofIdxGlobal] += fvGeometry.subContVol[scvIdx].volume;
- }
-
- uCur_->base()[dofIdxGlobal] += initPriVars;
- Valgrind::CheckDefined(uCur_->base()[dofIdxGlobal]);
- }
- }
-
- // add up the primary variables and the volumes of the boxes
- // which cross process borders
- if (isBox && gridView_().comm().size() > 1) {
- VertexHandleSum<Dune::FieldVector<Scalar, 1>,
- Dune::BlockVector<Dune::FieldVector<Scalar, 1> >,
- VertexMapper> sumVolumeHandle(boxVolume_, vertexMapper());
- gridView_().communicate(sumVolumeHandle,
- Dune::InteriorBorder_InteriorBorder_Interface,
- Dune::ForwardCommunication);
-
- VertexHandleSum<PrimaryVariables, SolutionVector, VertexMapper>
- sumPVHandle(uCur_->base(), vertexMapper());
- gridView_().communicate(sumPVHandle,
- Dune::InteriorBorder_InteriorBorder_Interface,
- Dune::ForwardCommunication);
- }
-
- if (isBox)
- {
- // divide all primary variables by the volume of their boxes
- for (unsigned int i = 0; i < uCur_->base().size(); ++i) {
- uCur_->base()[i] /= boxVolume(i);
- }
- }
- }
-
- /*!
- * \brief Find all indices of boundary vertices (box) / elements (cell centered).
- */
- void updateBoundaryIndices_()
- {
- boundaryIndices_.resize(numDofs());
- std::fill(boundaryIndices_.begin(), boundaryIndices_.end(), false);
-
- for (const auto& element : elements(gridView_())) {
- Dune::GeometryType geomType = element.geometry().type();
- const ReferenceElement &refElement = ReferenceElements::general(geomType);
-
- for (const auto& intersection : intersections(gridView_(), element)) {
- if (intersection.boundary()) {
- if (isBox)
- {
- // add all vertices on the intersection to the set of
- // boundary vertices
- int fIdx = intersection.indexInInside();
- int numFaceVerts = refElement.size(fIdx, 1, dim);
- for (int faceVertexIdx = 0;
- faceVertexIdx < numFaceVerts;
- ++faceVertexIdx)
- {
- int vIdx = refElement.subEntity(fIdx,
- 1,
- faceVertexIdx,
- dim);
- int vIdxGlobal = vertexMapper().subIndex(element, vIdx, dim);
- boundaryIndices_[vIdxGlobal] = true;
- }
- }
- else
- {
- int eIdxGlobal = elementMapper().index(element);
- boundaryIndices_[eIdxGlobal] = true;
- }
- }
- }
- }
- }
-
- // the hint cache for the previous and the current volume
- // variables
- mutable std::vector<bool> hintsUsable_;
- mutable std::vector<VolumeVariables> curHints_;
- mutable std::vector<VolumeVariables> prevHints_;
-
- // the problem we want to solve. defines the constitutive
- // relations, matxerial laws, etc.
- Problem *problemPtr_;
-
- // calculates the local jacobian matrix for a given element
- LocalJacobian localJacobian_;
- // Linearizes the problem at the current time step using the
- // local jacobian
- std::shared_ptr<JacobianAssembler> jacAsm_;
-
- // the set of all indices of vertices on the boundary
- std::vector<bool> boundaryIndices_;
-
- // cur is the current iterative solution, prev the converged
- // solution of the previous time step
- std::shared_ptr<SolutionVector> uCur_;
- std::shared_ptr<SolutionVector> uPrev_;
-
- Dune::BlockVector<Dune::FieldVector<Scalar, 1> > boxVolume_;
-
-private:
- /*!
- * \brief Returns whether messages should be printed
- */
- bool verbose_() const
- { return gridView_().comm().rank() == 0; }
-
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
-
- bool enableHints_;
-};
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/geomechanics/el2p/elementvolumevariables.hh b/dumux/geomechanics/el2p/elementvolumevariables.hh
deleted file mode 100644
index 0b2f3690023a15b469358f594e55dbc32aeae797..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/elementvolumevariables.hh
+++ /dev/null
@@ -1,303 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Volume variables gathered on an element
- */
-#ifndef DUMUX_BOX_EL2P_ELEMENT_VOLUME_VARIABLES_HH
-#define DUMUX_BOX_EL2P_ELEMENT_VOLUME_VARIABLES_HH
-
-#include <dune/pdelab/gridfunctionspace/localfunctionspace.hh>
-
-#include <dumux/implicit/box/elementvolumevariables.hh>
-#include "properties.hh"
-
-namespace Dumux
-{
-
-/*!
- * \ingroup ElTwoPBoxModel
- *
- * \brief This class stores an array of VolumeVariables objects, one
- * volume variables object for each of the element's vertices
- */
-template<class TypeTag>
-class ElTwoPElementVolumeVariables : public std::vector<typename GET_PROP_TYPE(TypeTag, VolumeVariables) >
-{
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename Element::Geometry::JacobianInverseTransposed JacobianInverseTransposed;
-
- enum { dim = GridView::dimension };
- enum { dimWorld = GridView::dimensionworld };
- typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
-
- typedef Dune::PDELab::LocalFunctionSpace<GridFunctionSpace> LocalFunctionSpace;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum {
- pressureIdx = Indices::pressureIdx,
- saturationIdx = Indices::saturationIdx
- };
-
-public:
- /*!
- * \brief The constructor.
- */
- ElTwoPElementVolumeVariables()
- { }
-
- /*!
- * \brief Construct the volume variables for all vertices of an element.
- *
- * \param problem The problem which needs to be simulated.
- * \param element The DUNE Codim<0> entity for which the volume variables ought to be calculated
- * \param fvGeometry The finite volume geometry of the element
- * \param isOldSol Tells whether the model's previous or current solution should be used.
- *
- * This class is required for the update of the effective porosity values at the
- * vertices since it is a function of the divergence of the solid displacement
- * at the integration points
- */
- void update(const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- bool isOldSol)
- {
- // retrieve the current or the previous solution vector and write the values into globalSol
- const SolutionVector &globalSol =
- isOldSol?
- problem.model().prevSol():
- problem.model().curSol();
-
- const GridFunctionSpace& gridFunctionSpace = problem.model().jacobianAssembler().gridFunctionSpace();
- const typename GridFunctionSpace::Ordering& ordering = gridFunctionSpace.ordering();
- // copy the values of the globalSol vector to the localFunctionSpace values of the current element
- LocalFunctionSpace localFunctionSpace(gridFunctionSpace);
- localFunctionSpace.bind(element);
- std::vector<Scalar> values(localFunctionSpace.size());
- for (typename LocalFunctionSpace::Traits::IndexContainer::size_type k=0; k<localFunctionSpace.size(); ++k)
- {
- const typename GridFunctionSpace::Ordering::Traits::DOFIndex& di = localFunctionSpace.dofIndex(k);
- typename GridFunctionSpace::Ordering::Traits::ContainerIndex ci;
- ordering.mapIndex(di.view(),ci);
- values[k] = globalSol[ci];
- }
-
- // pressure and saturation local function space (mass balance equations)
- typedef typename LocalFunctionSpace::template Child<0>::Type PressSatLFS;
- const PressSatLFS& pressSatLFS = localFunctionSpace.template child<0>();
- // local function space for pressure
- typedef typename PressSatLFS::template Child<0>::Type PressLFS;
- const PressLFS& pressLFS = pressSatLFS.template child<0>();
- // local function space for saturation
- typedef typename PressSatLFS::template Child<1>::Type SatLFS;
- const SatLFS& satLFS = pressSatLFS.template child<1>();
- // local function space for solid displacement
- typedef typename LocalFunctionSpace::template Child<1>::Type DisplacementLFS;
- const DisplacementLFS& displacementLFS = localFunctionSpace.template child<1>();
- typedef typename DisplacementLFS::template Child<0>::Type ScalarDispLFS;
-
- int numScv = element.subEntities(dim);
- this->resize(numScv);
-
- for (int scvIdx = 0; scvIdx < numScv; scvIdx++)
- {
- // solution vector solI for each vertex
- PrimaryVariables solI;
- // pressure and saturation values
- solI[pressureIdx] = values[pressLFS.localIndex(scvIdx)];
- solI[saturationIdx] = values[satLFS.localIndex(scvIdx)];
- // solid displacement values for each coordinate direction
- for (int coordDir = 0; coordDir < dim; coordDir++)
- {
- const ScalarDispLFS& scalarDispLFS = displacementLFS.child(coordDir);
- solI[Indices::u(coordDir)] = values[scalarDispLFS.localIndex(scvIdx)];
- }
- // reset evaluation point to zero
- (*this)[scvIdx].setEvalPoint(0);
-
- (*this)[scvIdx].update(solI,
- problem,
- element,
- fvGeometry,
- scvIdx,
- isOldSol);
-
- Valgrind::CheckDefined((*this)[scvIdx]);
- }
- this->updateEffPorosity(problem, element, fvGeometry, isOldSol);
-
- if (isOldSol)
- prevValues_ = values;
- else
- dofValues_ = values;
- }
-
- /*!
- * \brief Update the effective porosities for all vertices of an element.
- *
- * \param problem The problem which needs to be simulated.
- * \param element The DUNE Codim<0> entity for which the volume variables ought to be calculated
- * \param fvGeometry The finite volume geometry of the element
- * \param isOldSol Specifies whether this is the previous solution or the current one
- *
- * This function is required for the update of the effective porosity values at the
- * vertices.
- *
- * During the partial derivative calculation, changes of the solid displacement
- * at vertex i can affect effective porosities of all element vertices.
- * To correctly update the effective porosities of all element vertices
- * an iteration over all scv faces is required.
- * The remaining volvars are only updated for the vertex whose primary variable
- * is changed for the derivative calculation.
- */
- void updateEffPorosity(const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- bool isOldSol)
- {
- int numScv = element.subEntities(dim);
-
- // retrieve the current or the previous solution vector and write the values into globalSol
- const SolutionVector &globalSol =
- isOldSol?
- problem.model().prevSol():
- problem.model().curSol();
-
- // copy the values of the globalSol vector to the localFunctionSpace values of the current element
- const GridFunctionSpace& gridFunctionSpace = problem.model().jacobianAssembler().gridFunctionSpace();
- const typename GridFunctionSpace::Ordering& ordering = gridFunctionSpace.ordering();
- LocalFunctionSpace localFunctionSpace(gridFunctionSpace);
- localFunctionSpace.bind(element);
- std::vector<Scalar> values(localFunctionSpace.size());
- for (typename LocalFunctionSpace::Traits::IndexContainer::size_type k=0; k<localFunctionSpace.size(); ++k)
- {
- const typename GridFunctionSpace::Ordering::Traits::DOFIndex& di = localFunctionSpace.dofIndex(k);
- typename GridFunctionSpace::Ordering::Traits::ContainerIndex ci;
- ordering.mapIndex(di.view(),ci);
- values[k] = globalSol[ci];
- }
-
- // local function space for solid displacement
- typedef typename LocalFunctionSpace::template Child<1>::Type DisplacementLFS;
- const DisplacementLFS& displacementLFS = localFunctionSpace.template child<1>();
- const unsigned int dispSize = displacementLFS.child(0).size();
- typedef typename DisplacementLFS::template Child<0>::Type ScalarDispLFS;
- // further types required for gradient calculations
- typedef typename ScalarDispLFS::Traits::FiniteElementType::
- Traits::LocalBasisType::Traits::JacobianType JacobianType_V;
- typedef typename ScalarDispLFS::Traits::FiniteElementType::
- Traits::LocalBasisType::Traits::RangeFieldType RF;
- typedef Dune::FieldMatrix<RF, dim, dim> Tensor;
-
- for (int scvIdx = 0; scvIdx < numScv; scvIdx++)
- (*this)[scvIdx].effPorosity = 0.0;
-
- for (int scvIdx = 0; scvIdx < numScv; scvIdx++)
- {
- GlobalPosition scvCenter = fvGeometry.subContVol[scvIdx].localCenter;
-
- // evaluate gradient of displacement shape functions at the center of
- // the sub control volume in the reference element
- std::vector<JacobianType_V> vRefShapeGradient(dispSize);
- displacementLFS.child(0).finiteElement().localBasis().evaluateJacobian(scvCenter, vRefShapeGradient);
-
- // transform gradient to element in global coordinates
- const JacobianInverseTransposed jacInvT = element.geometry().jacobianInverseTransposed(scvCenter);
- std::vector<Dune::FieldVector<RF,dim> > vShapeGradient(dispSize);
-
- // loop over element vertices
- for (size_t i = 0; i < dispSize; i++)
- {
- vShapeGradient[i] = 0.0;
- jacInvT.umv(vRefShapeGradient[i][0],vShapeGradient[i]);
- }
-
- // calculate gradient of current displacement
- // (gradient of a vector is a tensor)
- Tensor uGradient(0.0);
- // loop over coordinate directions
- for(int coordDir = 0; coordDir < dim; ++coordDir)
- {
- const ScalarDispLFS & scalarDispLFS = displacementLFS.child(coordDir);
- // loop over element vertices
- for (size_t i = 0; i < scalarDispLFS.size(); i++)
- uGradient[coordDir].axpy((*this)[i].displacement(coordDir), vShapeGradient[i]);
- }
-
- // calculate the divergence of u
- (*this)[scvIdx].divU = 0.0;
-
- for (int coordDir = 0; coordDir < dim; coordDir++)
- (*this)[scvIdx].divU += uGradient[coordDir][coordDir];
-
- // calculate the effective porosity
- if(problem.coupled() == true)
- {
- if ((*this)[scvIdx].divU < -(*this)[scvIdx].porosity())
- {
- (*this)[scvIdx].effPorosity = (*this)[scvIdx].porosity();
- std::cout<<"volume change too large"<<std::endl;
- }
- else
- // this equation would be correct if the bulk volume could change (Vol_new = Vol_init *(1+div u)), however, we
- // have a constant bulk volume therefore we should apply phi_eff = phi_init + div u
- // but this causes convergence problems. Since div u is very small here the chosen relation is
- // assumed to be a good approximation
- (*this)[scvIdx].effPorosity = ((*this)[scvIdx].porosity() + (*this)[scvIdx].divU)/(1.0 + (*this)[scvIdx].divU);
- }
- else
- (*this)[scvIdx].effPorosity = (*this)[scvIdx].porosity();
- }
- }
-
-
- const std::vector<Scalar>& dofValues() const
- {
- return dofValues_;
- }
-
- Scalar& dofValues(int k)
- {
- return dofValues_[k];
- }
-
- const std::vector<Scalar>& prevValues() const
- {
- return prevValues_;
- }
-
-private:
- std::vector<Scalar> dofValues_;
- std::vector<Scalar> prevValues_;
-};
-
-} // namespace Dumux
-
-#endif
diff --git a/dumux/geomechanics/el2p/fluxvariables.hh b/dumux/geomechanics/el2p/fluxvariables.hh
deleted file mode 100644
index 157e010c6f244b15a345599d8799fbe57c227b80..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/fluxvariables.hh
+++ /dev/null
@@ -1,245 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief This file contains the calculation of all the fluxes over the surface of the
- * finite volume that make up the volume, the mass and the momentum balance
- * for the two-phase linear-elastic model.
- *
- * This means pressure, concentration and solid-displacement gradients, phase densities at
- * the integration point, etc.
- *
- * This class inherits from the two-phase model FluxVariables
- */
-#ifndef DUMUX_EL2P_FLUX_VARIABLES_HH
-#define DUMUX_EL2P_FLUX_VARIABLES_HH
-
-#include <dune/pdelab/gridfunctionspace/localfunctionspace.hh>
-#include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
-#include "properties.hh"
-
-namespace Dumux
-{
-
-namespace Properties
-{
-// forward declaration of properties
-NEW_PROP_TAG(SpatialParams);
-}
-/*!
- * \ingroup ElTwoPBoxModel
- * \ingroup ImplicitFluxVariables
- * \brief This template class contains the data which is required to
- * calculate the fluxes over the surface of the
- * finite volume that make up the volume, the mass and the momentum balance
- * for the two-phase linear-elastic model.
- *
- * This means pressure, concentration and solid-displacement gradients, phase densities at
- * the integration point, etc.
- *
- */
-template<class TypeTag>
-class ElTwoPFluxVariables: public ImplicitDarcyFluxVariables<TypeTag>
-{
- friend class ImplicitDarcyFluxVariables<TypeTag>; // be friends with parent
- typedef ImplicitDarcyFluxVariables<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, SpatialParams) SpatialParams;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity Element;
- enum
- {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
- typedef typename GridView::ctype CoordScalar;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
- typedef Dune::FieldVector<CoordScalar, dim> DimVector;
- typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimMatrix;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
-
- enum {numEq = GET_PROP_VALUE(TypeTag, NumEq)};
-
-public:
- /*!
- * \brief Compute / update the flux variables
- *
- * \param problem The problem
- * \param element The finite element
- * \param fvGeometry The finite-volume geometry
- * \param fIdx The local index of the SCV (sub-control-volume) face
- * \param elemVolVars The volume variables of the current element
- * \param onBoundary A boolean variable to specify whether the flux variables
- * are calculated for interior SCV faces or boundary faces, default=false
- */
- void update(const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- const int fIdx,
- const ElementVolumeVariables &elemVolVars,
- const bool onBoundary = false)
- {
- ParentType::update(problem, element, fvGeometry, fIdx, elemVolVars);
-
- dU_ = 0.0;
- timeDerivUNormal_ = 0.0;
-
- elTwoPGradients_(problem, element, elemVolVars);
- calculateDDt_(problem, element, elemVolVars);
- }
-
-public:
- /*!
- * \brief Return change of u [m] with time at integration point
- * point.
- */
- Scalar dU(int dimIdx) const
- {
- return dU_[dimIdx];
- }
-
- /*!
- * \brief Return time derivative of u [m/s] in normal
- * direction at integration point
- */
- Scalar timeDerivUNormal() const
- {
- return timeDerivUNormal_;
- }
-
- /*
- * \brief Return the intrinsic permeability.
- */
- const DimMatrix &intrinsicPermeability() const
- {
- return K_;
- }
-
- /*
- * \brief Return the gradient of the potential for each phase.
- */
- DimVector potentialGrad(int phaseIdx) const
- {
- return this->potentialGrad_[phaseIdx];
- }
-
- const SCVFace &face() const
- {
- return this->fvGeometry_().subContVolFace[this->faceIdx_];
- }
-
-protected:
- /*!
- * \brief Calculation of the solid displacement gradients.
- *
- * \param problem The considered problem file
- * \param element The considered element of the grid
- * \param elemVolVars The parameters stored in the considered element
- */
- void elTwoPGradients_(const Problem &problem,
- const Element &element,
- const ElementVolumeVariables &elemVolVars)
- {
- typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
- typedef Dune::PDELab::LocalFunctionSpace<GridFunctionSpace> LocalFunctionSpace;
- const GridFunctionSpace& gridFunctionSpace = problem.model().jacobianAssembler().gridFunctionSpace();
- const typename GridFunctionSpace::Ordering& ordering = gridFunctionSpace.ordering();
- LocalFunctionSpace localFunctionSpace(gridFunctionSpace);
- localFunctionSpace.bind(element);
- // copy values of previous solution into prevSolutionValues Vector
- std::vector<Scalar> prevSolutionValues(localFunctionSpace.size());
- // copy values of current solution into curSolutionValues Vector
- std::vector<Scalar> curSolutionValues(localFunctionSpace.size());
- for (typename LocalFunctionSpace::Traits::IndexContainer::size_type k=0; k<localFunctionSpace.size(); ++k)
- {
- const typename GridFunctionSpace::Ordering::Traits::DOFIndex& di = localFunctionSpace.dofIndex(k);
- typename GridFunctionSpace::Ordering::Traits::ContainerIndex ci;
- ordering.mapIndex(di.view(),ci);
- prevSolutionValues[k] = problem.model().prevSol()[ci];
- curSolutionValues[k] = problem.model().curSol()[ci];
- }
-
- // type of function space for solid displacement vector
- typedef typename LocalFunctionSpace::template Child<1>::Type DisplacementLFS;
- const DisplacementLFS& displacementLFS = localFunctionSpace.template child<1>();
- // number of degrees of freedom for each displacement value (here number of element vertices)
- const unsigned int dispSize = displacementLFS.child(0).size();
- // type of function space of solid displacement value (one for each coordinate direction)
- typedef typename DisplacementLFS::template Child<0>::Type ScalarDispLFS;
- typedef typename ScalarDispLFS::Traits::FiniteElementType::Traits::LocalBasisType::Traits::RangeType RT_V;
-
- for(int coordDir = 0; coordDir < dim; ++coordDir) {
- // get displacement function space for coordinate direction coordDir
- const ScalarDispLFS & scalarDispLFS = displacementLFS.child(coordDir);
- std::vector<RT_V> vShape(dispSize);
- // evaluate shape functions of all element vertices for current integration point and write it into vector vShape
- scalarDispLFS.finiteElement().localBasis().evaluateFunction(face().ipLocal, vShape);
-
- dU_[coordDir] = 0;
- // subtract previous displacement value from current displacement value for each coordinate direction
- // coordDir and for each node i and interpolate values at integration point via the shape function vShape.
- // TODO: Check if evaluation of prevVolVars is possible
- for (size_t i = 0; i < dispSize; i++){
- dU_[coordDir] += (elemVolVars[i].primaryVars()[(numEq - dim)+coordDir]
- - prevSolutionValues[scalarDispLFS.localIndex(i)])*vShape[i];
- }
- }
- }
-
- /*!
- * \brief Calculation of the time derivative of solid displacement
- * \param problem The considered problem file
- * \param element The considered element of the grid
- * \param elemVolVars The parameters stored in the considered element
- */
- void calculateDDt_(const Problem &problem,
- const Element &element,
- const ElementVolumeVariables &elemVolVars)
- {
- Scalar dt = problem.timeManager().timeStepSize();
-
- DimVector tmp(0.0);
- // calculate time derivative of solid displacement vector
- for (int coordDir = 0; coordDir < dim; ++coordDir)
- tmp[coordDir] = dU(coordDir) / dt;
-
- // multiply time derivative of solid displacement vector with
- // normal vector of current scv-face
- timeDerivUNormal_ = tmp * face().normal;
- }
-
- //! time derivative of solid displacement times normal vector at integration point
- Scalar timeDerivUNormal_;
- //! change of solid displacement with time at integration point
- GlobalPosition dU_;
- // intrinsic permeability
- DimMatrix K_;
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/geomechanics/el2p/indices.hh b/dumux/geomechanics/el2p/indices.hh
deleted file mode 100644
index c0675daf9bf5070c13c576310187c8fe54a57984..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/indices.hh
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Defines the primary variable and equation indices used by
- * the two-phase linear elasticity model.
- */
-#ifndef DUMUX_ELASTIC2P_INDICES_HH
-#define DUMUX_ELASTIC2P_INDICES_HH
-
-#include <dumux/geomechanics/elastic/indices.hh>
-#include <dumux/porousmediumflow/2p/implicit/indices.hh>
-
-namespace Dumux
-{
-// \{
-
-namespace Properties
-{
-
-/*!
- * \ingroup ElTwoPBoxModel
- * \ingroup ImplicitIndices
- * \brief The indices for the two-phase linear elasticity model.
- *
- * This class inherits from the TwoPIndices and from the ElasticIndices
- */
-
-// PVOffset is set to 0 for the TwoPIndices and to 2 for the ElasticIndices since
-// the first two primary variables are the primary variables of the two-phase
-// model followed by the primary variables of the elastic model
-template <class TypeTag,
-int formulation = 0,
-int PVOffset = 2>
-class ElTwoPIndices : public ElasticIndices<PVOffset>, public TwoPIndices<TypeTag,0>
-{};
-
-}
-}
-
-#endif
diff --git a/dumux/geomechanics/el2p/localjacobian.hh b/dumux/geomechanics/el2p/localjacobian.hh
deleted file mode 100644
index 67a960a31e5f04369f833bcd35d3956b6ba03397..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/localjacobian.hh
+++ /dev/null
@@ -1,257 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Calculates the partial derivatives of the local residual for the Jacobian of the
- * two-phase linear elasticity model.
- */
-#ifndef DUMUX_EL2P_LOCAL_JACOBIAN_HH
-#define DUMUX_EL2P_LOCAL_JACOBIAN_HH
-
-#include <dune/pdelab/gridfunctionspace/localfunctionspace.hh>
-#include <dumux/implicit/localjacobian.hh>
-#include "properties.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup ElTwoPBoxModel
- * \brief Calculates the partial derivatives of the local residual for the Jacobian
- *
- * Except for the evalPartialDerivatives function all functions are taken from the
- * base class ImplicitLocalJacobian
- */
-template<class TypeTag>
-class ElTwoPLocalJacobian : public ImplicitLocalJacobian<TypeTag>
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum {
- dim = GridView::dimension,
- };
- typedef typename GET_PROP_TYPE(TypeTag, ElementSolutionVector) ElementSolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum {
- pressureIdx = Indices::pressureIdx,
- saturationIdx = Indices::saturationIdx
- };
- // copying a local jacobian is not a good idea
- ElTwoPLocalJacobian(const ElTwoPLocalJacobian &);
-
-public:
- ElTwoPLocalJacobian() {}
-
- /*!
- * \brief Compute the partial derivatives to a primary variable at
- * an degree of freedom.
- *
- * This method is overwritten here since this model requires a call of the model specific
- * elementvolumevariables which updates the effective porosities correctly.
- *
- * The default implementation of this method uses numeric
- * differentiation, i.e. forward or backward differences (2nd
- * order), or central differences (3rd order). The method used is
- * determined by the "NumericDifferenceMethod" property:
- *
- * - if the value of this property is smaller than 0, backward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x) - f(x - \epsilon)}{\epsilon}
- * \f]
- *
- * - if the value of this property is 0, central
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x - \epsilon)}{2 \epsilon}
- * \f]
- *
- * - if the value of this property is larger than 0, forward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x)}{\epsilon}
- * \f]
- *
- * Here, \f$ f \f$ is the residual function for all equations, \f$x\f$
- * is the value of a sub-control volume's primary variable at the
- * evaluation point and \f$\epsilon\f$ is a small value larger than 0.
- *
- * \param partialDeriv The vector storing the partial derivatives of all
- * equations
- * \param storageDeriv the mass matrix contributions
- * \param col The block column index of the degree of freedom
- * for which the partial derivative is calculated.
- * Box: a sub-control volume index.
- * Cell centered: a neighbor index.
- * \param pvIdx The index of the primary variable
- * for which the partial derivative is calculated
- */
- void evalPartialDerivative_(ElementSolutionVector &partialDeriv,
- PrimaryVariables &storageDeriv,
- int col,
- int pvIdx)
- {
- typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
- typedef Dune::PDELab::LocalFunctionSpace<GridFunctionSpace> LocalFunctionSpace;
-
- // copy the values of the globalSol vector to the localFunctionSpace values of the current element
- const GridFunctionSpace& gridFunctionSpace = this->problemPtr_->model().jacobianAssembler().gridFunctionSpace();
- const typename GridFunctionSpace::Ordering& ordering = gridFunctionSpace.ordering();
- LocalFunctionSpace localFunctionSpace(gridFunctionSpace);
- localFunctionSpace.bind(this->element_());
- std::vector<Scalar> elementValues(localFunctionSpace.size());
- for (typename LocalFunctionSpace::Traits::IndexContainer::size_type k=0; k<localFunctionSpace.size(); ++k)
- {
- const typename GridFunctionSpace::Ordering::Traits::DOFIndex& di = localFunctionSpace.dofIndex(k);
- typename GridFunctionSpace::Ordering::Traits::ContainerIndex ci;
- ordering.mapIndex(di.view(),ci);
- elementValues[k] = this->problemPtr_->model().curSol()[ci];
- }
- // pressure and saturation local function space (mass balance equations)
- typedef typename LocalFunctionSpace::template Child<0>::Type PressSatLFS;
- const PressSatLFS& pressSatLFS = localFunctionSpace.template child<0>();
- // local function space for pressure
- typedef typename PressSatLFS::template Child<0>::Type PressLFS;
- const PressLFS& pressLFS = pressSatLFS.template child<0>();
- // local function space for saturation
- typedef typename PressSatLFS::template Child<1>::Type SatLFS;
- const SatLFS& satLFS = pressSatLFS.template child<1>();
- // local function space for solid displacement
- typedef typename LocalFunctionSpace::template Child<1>::Type DisplacementLFS;
- const DisplacementLFS& displacementLFS = localFunctionSpace.template child<1>();
- typedef typename DisplacementLFS::template Child<0>::Type ScalarDispLFS;
-
- //primary variable vector priVars for each vertex
- PrimaryVariables priVars;
- priVars[pressureIdx] = elementValues[pressLFS.localIndex(col)];
- priVars[saturationIdx] = elementValues[satLFS.localIndex(col)];
- for (int coordDir = 0; coordDir < dim; coordDir++)
- {
- const ScalarDispLFS& scalarDispLFS = displacementLFS.child(coordDir);
- priVars[Indices::u(coordDir)] = elementValues[scalarDispLFS.localIndex(col)];
- }
-
- VolumeVariables origVolVars(this->curVolVars_[col]);
- this->curVolVars_[col].setEvalPoint(&origVolVars);
- Scalar eps = this->numericEpsilon(col, pvIdx);
- Scalar delta = 0;
-
- if (this->numericDifferenceMethod_ >= 0) {
- // we are not using backward differences, i.e. we need to
- // calculate f(x + \epsilon)
-
- // deflect primary variables
- priVars[pvIdx] += eps;
- delta += eps;
-
- // calculate the residual
- this->curVolVars_[col].update(priVars,
- this->problem_(),
- this->element_(),
- this->fvElemGeom_,
- col,
- false);
- // update the effective porosities
- this->curVolVars_.updateEffPorosity(this->problem_(),
- this->element_(),
- this->fvElemGeom_,
- false);
-
- this->localResidual().eval(this->element_(),
- this->fvElemGeom_,
- this->prevVolVars_,
- this->curVolVars_,
- this->bcTypes_);
-
- // store the residual
- partialDeriv = this->localResidual().residual();
- storageDeriv = this->localResidual().storageTerm()[col];
- }
- else {
- // we are using backward differences, i.e. we don't need
- // to calculate f(x + \epsilon) and we can recycle the
- // (already calculated) residual f(x)
- partialDeriv = this->residual_;
- storageDeriv = this->storageTerm_[col];
- }
-
-
- if (this->numericDifferenceMethod_ <= 0) {
- // we are not using forward differences, i.e. we don't
- // need to calculate f(x - \epsilon)
-
- // deflect the primary variables
- priVars[pvIdx] -= delta + eps;
- delta += eps;
-
- // calculate residual again
- this->curVolVars_[col].update(priVars,
- this->problem_(),
- this->element_(),
- this->fvElemGeom_,
- col,
- false);
- // update the effective porosities
- this->curVolVars_.updateEffPorosity(this->problem_(),
- this->element_(),
- this->fvElemGeom_,
- false);
- this->localResidual().eval(this->element_(),
- this->fvElemGeom_,
- this->prevVolVars_,
- this->curVolVars_,
- this->bcTypes_);
- partialDeriv -= this->localResidual().residual();
- storageDeriv -= this->localResidual().storageTerm()[col];
-
- }
- else {
- // we are using forward differences, i.e. we don't need to
- // calculate f(x - \epsilon) and we can recycle the
- // (already calculated) residual f(x)
- partialDeriv -= this->residual_;
- storageDeriv -= this->storageTerm_[col];
- }
-
- // divide difference in residuals by the magnitude of the
- // deflections between the two function evaluation
-// if(partialDeriv[col][pvIdx] == -350045)
-
- partialDeriv /= delta;
- storageDeriv /= delta;
- // restore the orignal state of the element's volume variables
- this->curVolVars_[col] = origVolVars;
- // update the effective porosities
- this->curVolVars_.updateEffPorosity(this->problem_(),
- this->element_(),
- this->fvElemGeom_,
- false);
-
-#if HAVE_VALGRIND
- for (unsigned i = 0; i < partialDeriv.size(); ++i)
- Valgrind::CheckDefined(partialDeriv[i]);
-#endif
- }
-};
-}
-
-#endif
diff --git a/dumux/geomechanics/el2p/localoperator.hh b/dumux/geomechanics/el2p/localoperator.hh
deleted file mode 100644
index 3720aff1ec3f4ac880657575108b0b979556b93c..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/localoperator.hh
+++ /dev/null
@@ -1,636 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief This file contains a local operator for PDELab which
- * wraps the contributions from
- * el2plocalresidual (box discretized mass balances)
- * and alphaMomentum (FE discretized momentum balance).
- */
-#ifndef DUMUX_EL2P_LOCAL_OPERATOR_HH
-#define DUMUX_EL2P_LOCAL_OPERATOR_HH
-
-#include<dune/common/version.hh>
-#include<dune/geometry/quadraturerules.hh>
-
-#include<dune/pdelab/localoperator/pattern.hh>
-#include<dune/pdelab/localoperator/flags.hh>
-#include<dune/pdelab/localoperator/defaultimp.hh>
-#include<dune/pdelab/gridfunctionspace/localvector.hh>
-#include<dune/pdelab/common/geometrywrapper.hh>
-#include "properties.hh"
-
-namespace Dumux {
-
-namespace PDELab {
-
-/*!
- * \brief A local operator for PDELab which wraps the contributions from
- * el2plocalresidual (box discretized mass balances)
- * and alphaMomentum (FE discretized momentum balance).
- */
-template<class TypeTag>
-class El2PLocalOperator
- :
- public Dune::PDELab::FullVolumePattern,
- public Dune::PDELab::LocalOperatorDefaultFlags
-{
- // copying the local operator for PDELab is not a good idea
- El2PLocalOperator(const El2PLocalOperator &);
-
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity::Geometry::JacobianInverseTransposed JacobianInverseTransposed;
- typedef typename GridView::Intersection Intersection;
- typedef typename Dune::PDELab::IntersectionGeometry<Intersection>::ctype DT;
-
- enum{numEq = GET_PROP_VALUE(TypeTag, NumEq)};
- enum{dim = GridView::dimension};
- enum{dimWorld = GridView::dimensionworld};
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
- typedef Dune::FieldVector<Scalar, dim> DimVector;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
-
- enum {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
- };
-
-public:
- // pattern assembly flags
- enum { doPatternVolume = true };
-
- // residual assembly flags
- enum { doAlphaVolume = true };
-
- /*!
- * \param model The physical model for the box scheme.
- */
- El2PLocalOperator(Model &model)
- : model_(model)
- {}
-
- /*!
- * \brief Volume integral depending on test and ansatz functions
- *
- * \tparam EG The entity geometry type from PDELab
- * \tparam LFSU The type of the local function space of the ansatz functions
- * \tparam X The type of the container for the coefficients for the ansatz functions
- * \tparam LFSV The type of the local function space of the test functions
- * \tparam R The range type (usually FieldVector<double>)
- *
- * \param eg The entity geometry object
- * \param lfsu The local function space object of the ansatz functions
- * \param x The object of the container for the coefficients for the ansatz functions
- * \param lfsv The local function space object of the test functions
- * \param r The object storing the volume integral
- */
- template<typename EG, typename LFSU, typename X, typename LFSV, typename R>
- void alpha_volume (const EG& eg, const LFSU& lfsu, const X& x,
- const LFSV& lfsv, R& r) const
- {
- typedef typename LFSU::Traits::SizeType size_type;
-
- // evaluate the local residual of the box mass balance equation for the current element
- model_.localResidual().eval(eg.entity());
-
- // pressure and saturation local function space (mass balance equations)
- typedef typename LFSU::template Child<0>::Type PressSatLFS;
- // local function space for pressure
- typedef typename PressSatLFS::template Child<0>::Type PressLFS;
- const PressSatLFS& pressSatLFS = lfsu.template child<0>();
- const PressLFS& pressLFS = pressSatLFS.template child<0>();
- // local function space for saturation
- typedef typename PressSatLFS::template Child<1>::Type SatLFS;
- const SatLFS& satLFS = pressSatLFS.template child<1>();
-
- unsigned int numScv = eg.entity().subEntities(dim);
-
- for (size_type i = 0; i < (numEq-dim) * numScv; i++)
- {
- // retrieve the local residual value for vertex=i%Vertices and equation i/numScv (here 0 or 1)
- Scalar tmp = model_.localResidual().residual(i%numScv)[i/numScv];
- // get residual for brine phase mass balance equation
- if(i < numScv)
- r.rawAccumulate(pressLFS, i, tmp);
- // get residual for CO2 phase mass balance equation
- else
- r.rawAccumulate(satLFS,i-numScv, tmp);
- }
- // get residual for momentum balance equation
- alphaMomentum(eg, lfsu, x, lfsv, r);
- }
-
-
- /*!
- * \brief Calculate the local residual of the momentum balance equation
- * with the finite element method. This requires numerical
- * integration which is done via a quadrature rule.
- *
- * \tparam EG The entity geometry type from PDELab
- * \tparam LFSU The type of the local function space of the ansatz functions
- * \tparam X The type of the container for the coefficients for the ansatz functions
- * \tparam LFSV The type of the local function space of the test functions
- * \tparam R The range type (usually FieldVector<double>)
- *
- * \param eg The entity geometry object
- * \param lfsu The local function space object of the ansatz functions
- * \param x The object of the container for the coefficients for the ansatz functions
- * \param lfsv The local function space object of the test functions
- * \param r The object storing the volume integral
- *
- *
- */
- template<typename EG, typename LFSU, typename X, typename LFSV, typename R>
- void alphaMomentum (const EG& eg, const LFSU& lfsu, const X& x,
- const LFSV& lfsv, R& r) const
- {
- FVElementGeometry fvGeometry;
- fvGeometry.update(model_.problem().gridView(), eg.entity());
- // retrieve lame parameters for calculation of effective stresses
- const Dune::FieldVector<Scalar,2> lameParams = model_.problem().spatialParams().lameParams(eg.entity(), fvGeometry, 0);
- Scalar lambda = lameParams[0];
- Scalar mu = lameParams[1];
- // retrieve materialParams for calculate of capillary pressure
- const MaterialLawParams& materialParams =
- model_.problem().spatialParams().materialLawParams(eg.entity(), fvGeometry, 0);
- // retrieve initial porosity
- Scalar porosity = model_.problem().spatialParams().porosity(eg.entity(), fvGeometry, 0);
-
- // order of quadrature rule
- const int qorder = 3;
-
- // extract local function spaces
- // pressure and saturation local function space (mass balance equations)
- typedef typename LFSU::template Child<0>::Type PressSatLFS;
- const PressSatLFS& pressSatLFS = lfsu.template child<0>();
- // local function space for pressure
- typedef typename PressSatLFS::template Child<0>::Type PressLFS;
- const PressLFS& pressLFS = pressSatLFS.template child<0>();
- const unsigned int pressSize = pressLFS.size();
- // local function space for saturation
- typedef typename PressSatLFS::template Child<1>::Type SatLFS;
- const SatLFS& satLFS = pressSatLFS.template child<1>();
- // local function space for solid displacement
- typedef typename LFSU::template Child<1>::Type DisplacementLFS;
- typedef typename DisplacementLFS::template Child<0>::Type DisplacementScalarLFS;
- const DisplacementLFS& displacementLFS = lfsu.template child<1>();
- const DisplacementScalarLFS& uScalarLFS = displacementLFS.template child<0>();
- const unsigned int dispSize = displacementLFS.template child<0>().size();
-
- // domain and range field type
- typedef typename DisplacementScalarLFS::Traits::FiniteElementType::
- Traits::LocalBasisType::Traits::RangeFieldType RF;
- typedef typename DisplacementScalarLFS::Traits::FiniteElementType::
- Traits::LocalBasisType::Traits::RangeType RT_V;
- typedef typename DisplacementScalarLFS::Traits::FiniteElementType::
- Traits::LocalBasisType::Traits::JacobianType JacobianType_V;
- typedef typename PressLFS::Traits::FiniteElementType::
- Traits::LocalBasisType::Traits::DomainFieldType DF;
- typedef typename PressLFS::Traits::FiniteElementType::
- Traits::LocalBasisType::Traits::RangeType RT_P;
-
- // select quadrature rule for the element geometry type and with the order=qorder
- const auto geometry = eg.geometry();
- Dune::GeometryType geomType = geometry.type();
- const Dune::QuadratureRule<DF,dim>& rule = Dune::QuadratureRules<DF,dim>::rule(geomType,qorder);
-
- // loop over quadrature points
- for (typename Dune::QuadratureRule<DF,dim>::const_iterator it=rule.begin(); it!=rule.end(); ++it)
- {
- // evaluate reference element gradients of shape functions at quadrature point
- // (we assume Galerkin method lfsu=lfsv)
- std::vector<JacobianType_V> vGradRef(dispSize);
- uScalarLFS.finiteElement().localBasis().evaluateJacobian(it->position(),vGradRef);
-
-
- // get inverse transposed jacobian for quadrature point
- const JacobianInverseTransposed jacobian = geometry.jacobianInverseTransposed(it->position());
-
- // calculate shape function gradients at the quadrature point in global coordinates. This is done
- // by multiplying the reference element shape functions with the inverse transposed jacobian
- std::vector<Dune::FieldVector<RF,dim> > vGrad(dispSize);
- for (size_t i = 0; i < dispSize; i++)
- {
- vGrad[i] = 0.0;
- jacobian.umv(vGradRef[i][0],vGrad[i]);
- }
-
- // calculate the gradient of the solid displacement vector uGrad
- // x(uLFS,i) is the solid displacement entry of the solution vector
- // for element vertex i and coordinate direction coordDir
-
- Dune::FieldMatrix<RF,dim,dim> uGrad(0.0);
- for(int coordDir = 0; coordDir < dim; ++coordDir) {
- const DisplacementScalarLFS& uLFS = displacementLFS.child(coordDir);
- // compute gradient of u
- for (size_t i = 0; i < dispSize; i++)
- uGrad[coordDir].axpy(x(uLFS,i),vGrad[i]);
- }
- // calculate the strain tensor epsilon
- Dune::FieldMatrix<RF,dim,dim> epsilon;
- for(int i = 0; i < dim; ++i)
- for(int j = 0; j < dim; ++j)
- epsilon[i][j] = 0.5*(uGrad[i][j] + uGrad[j][i]);
-
- RF traceEpsilon = 0;
- for(int i = 0; i < dim; ++i)
- traceEpsilon += epsilon[i][i];
-
- // calculate the effective stress tensor effStress
- Dune::FieldMatrix<RF,dim,dim> effStress(0.0);
- for(int i = 0; i < dim; ++i)
- {
- effStress[i][i] = lambda*traceEpsilon;
- for(int j = 0; j < dim; ++j)
- effStress[i][j] += 2.0*mu*epsilon[i][j];
- }
-
- // retrieve the shape functions for interpolating the primary variables at the
- // current quadrature point
- std::vector<RT_P> q(pressSize);
- pressLFS.finiteElement().localBasis().evaluateFunction(it->position(),q);
-
- RT_P pw(0.0);
- RT_P sn(0.0);
- RT_P ux(0.0);
- RT_P uy(0.0);
- RT_P uz(0.0);
-
- // interpolate primary variables at current quadrature point
- for (size_t i = 0; i < pressLFS.size(); i++)
- {
- pw += x(pressLFS,i) * q[i];
- sn += x(satLFS,i) * q[i];
- ux += x(displacementLFS.child(0),i) * q[i];
- if (dim > 1)
- uy += x(displacementLFS.child(1),i) * q[i];
- if (dim > 2)
- uz += x(displacementLFS.child(2),i) * q[i];
- }
- RT_P sw = 1.0 - sn;
- RT_P pn = pw + MaterialLaw::pc(materialParams, sw);
- RT_P pEff;
-
- const GlobalPosition& globalPos = geometry.global(it->position());
-
- // calculate change in effective pressure with respect to initial conditions pInit (pInit is negativ)
- pEff = pw*sw + pn*sn + model_.problem().pInit(globalPos, it->position(), eg.entity());
- RF uDiv = traceEpsilon;
- RF porosityEff;
-
- // assume deformation induced porosity changes
- if(model_.problem().coupled() == true){
- if (porosity + uDiv < 1e-3*porosity){
- DUNE_THROW(NumericalProblem, "volume change too large");
- }
- else
- // this equation would be correct if the bulk volume could change (Vol_new = Vol_init * (1+div u)), however, we
- // have a constant bulk volume therefore we should apply phi_eff = phi_init + div u
- // but this causes convergence problems. Since div u is very small here the chosen relation is
- // assumed to be a good approximation
- porosityEff = (porosity + uDiv)/(1.0 + uDiv);
- }
- // neglect deformation induced porosity changes
- else
- porosityEff = porosity;
-
- // fill primary variable vector for current quadrature point
- PrimaryVariables primVars;
-
- primVars[wPhaseIdx] = pw;
- primVars[nPhaseIdx] = sn;
- primVars[Indices::uxIdx] = ux;
- if (dim > 1)
- primVars[Indices::uyIdx] = uy;
- if (dim > 2)
- primVars[Indices::uzIdx] = uz;
-
- VolumeVariables volVars;
- // evaluate volume variables for this quadrature point
- // NOTE: this overwrites the entries of the volumevariables of node 0
- // and can cause errors
- volVars.update(primVars, model_.problem(), eg.entity(), fvGeometry, 0, false);
-
- // calculate the density difference for the gravity term
- RF rhoDiff = volVars.density(nPhaseIdx) - volVars.density(wPhaseIdx);
-
- // geometric weight need for quadrature rule evaluation (numerical integration)
- RF qWeight = it->weight() * geometry.integrationElement(it->position());
-
- // evaluate basis functions
- std::vector<RT_V> vBasis(dispSize);
- displacementLFS.child(0).finiteElement().localBasis().evaluateFunction(it->position(), vBasis);
-
- for(int coordDir = 0; coordDir < dim; ++coordDir) {
- const DisplacementScalarLFS& uLFS = displacementLFS.child(coordDir);
- // assemble momentum balance equation
- for (size_t i = 0; i < dispSize; i++){
- // multiply effective stress with gradient of weighting function and geometric weight of quadrature rule
- Scalar tmp = (effStress[coordDir] * vGrad[i]) * qWeight;
- r.rawAccumulate(uLFS,i,tmp);
-
- // subtract effective pressure change contribution multiplied with gradient of weighting function
- // and geometric weight of quadrature rule (soil mechanics sign conventions, compressive stresses are negative)
- tmp = -(pEff * vGrad[i][coordDir]) * qWeight;
- r.rawAccumulate(uLFS,i,tmp);
-
- // evaluate gravity term (soil mechanics sign conventions, compressive stresses are negative)
- // multiplied with weighting function and geometric weight of quadrature rule.
- // This assumes that the solid phase density remains constant, that the changes in porosity are very small,
- // and that the density of the brine phase remains constant
- tmp = sn*porosityEff*rhoDiff*model_.problem().gravity()[coordDir]*vBasis[i]* qWeight;
- r.rawAccumulate(uLFS,i,tmp);
- }
- }
- }
- // include boundary conditions
- // iterate over element intersections of codim dim-1
- for (const auto& intersection : intersections(model_.problem().gridView(), eg.entity()))
- {
- // handle only faces on the boundary
- if (!intersection.boundary())
- continue;
-
- // select quadrature rule for intersection faces (dim-1)
- Dune::GeometryType gtface = intersection.geometryInInside().type();
- const Dune::QuadratureRule<DF,dim-1>& faceRule = Dune::QuadratureRules<DF,dim-1>::rule(gtface,qorder);
-
- // get face index of this intersection
- int fIdx = intersection.indexInInside();
- // get dimension of face
- const int dimIs = Dune::PDELab::IntersectionGeometry<Intersection>::Entity::Geometry::mydimension;
-
- // get reference element for intersection geometry (reference element for face if dim = 3)
- const Dune::ReferenceElement<DT,dimIs>& refElement = Dune::ReferenceElements<DT,dimIs>::general(geomType);
- // get reference element for edges of intersection geometry (reference element for edge if dim = 3), needed for Dirichlet BC
- const Dune::ReferenceElement<DT,dimIs-1> &face_refElement =
- Dune::ReferenceElements<DT,dimIs-1>::general(intersection.geometryInInside().type());
-
- // Treat Neumann boundary conditions
- // loop over quadrature points and integrate normal stress changes (traction changes)
- for (typename Dune::QuadratureRule<DF,dim-1>::const_iterator it=faceRule.begin(); it!=faceRule.end(); ++it)
- {
- // position of quadrature point in local coordinates of element
- DimVector local = intersection.geometryInInside().global(it->position());
-
- GlobalPosition globalPos = geometry.global(local);
-
- // evaluate boundary condition type
- BoundaryTypes boundaryTypes;
- model_.problem().boundaryTypesAtPos(boundaryTypes, globalPos);
-
- // skip rest if we are on Dirichlet boundary
- if (!boundaryTypes.hasNeumann())
- continue;
-
- // evaluate basis functions of all all element vertices for quadrature point location "local"
- std::vector<RT_V> vBasis(dispSize);
- displacementLFS.child(0).finiteElement().localBasis().evaluateFunction(local, vBasis);
-
- // evaluate stress boundary condition. The stress change is assumed to be in normal direction (i.e. traction)
- PrimaryVariables traction;
- model_.problem().neumannAtPos(traction, globalPos);
-
- // get quadrature rule weight for intersection
- const RF qWeight = it->weight() * intersection.geometry().integrationElement(it->position());
-
- for(unsigned int coordDir=0; coordDir<dim; ++coordDir){
- const DisplacementScalarLFS& uLFS = displacementLFS.child(coordDir);
- // get the traction values for the current quadrature point,
- // multiply it with the basis function and the quadrature rule weight
- // and add it to the residual
- if (boundaryTypes.isNeumann(Indices::momentum(coordDir)))
- for (size_t i = 0; i < dispSize; i++){
- Scalar tmp = -traction[Indices::momentum(coordDir)] * vBasis[i] * qWeight;
- r.rawAccumulate(uLFS,i,tmp);
- }
-
- }
- }
-
- // Treat Dirichlet boundary conditions, for Dirichlet boundaries we need to check vertices
- // first do loop over degrees of freedom for displacement vector entry, then check codim of this degree of freedom
- // then do loop over the current intersection face for the degrees of freedom with the given codim
- // compare the subentity of the element loop with the subentity of the intersection face loop
- // if the subentities are identical retrieve the coordinates of the intersection face subentity and evaluate the boundary
- // condition type and if it is a Dirichlet boundary condition then retrieve the Dirichlet value.
- // subtract the Dirichlet value from the corresponding solution vector entry (for this the outer element loop is needed)
- // and also subtract the residual value which has already been calculated for this degree of freedom
- // write the result into the residual
-
- for(unsigned int coordDir=0; coordDir<dim; ++coordDir){
- const DisplacementScalarLFS& uLFS = displacementLFS.child(coordDir);
-
- // loop over number of element vertices
- for (size_t i = 0; i < dispSize; i++)
- {
- // Get the codim to which this degree of freedom is attached to (should be a vertex)
- unsigned int codim = displacementLFS.child(0).finiteElement().localCoefficients().localKey(i).codim();
- // if we are within the element do nothing (this could happen if second order approximations are applied)
- if (codim==0) continue;
-
- // iterate over number of degrees of freedom with the given codim which are attached to the current intersection face
- for (int j = 0; j < refElement.size(fIdx,1,codim); j++)
- { // check if degree of freedom is located on a vertex of the current intersection (boundary face)
- if (displacementLFS.child(0).finiteElement().localCoefficients().localKey(i).subEntity() ==
- refElement.subEntity(fIdx,1,j,codim))
- {
- // get local coordinate for this degree of freedom
-// this doesn't work: DimVector local = intersection.geometryInInside().global(face_refElement.position(j,codim-1));
- DimVector local = refElement.template geometry<1>(fIdx).global(face_refElement.position(j, codim-1));
-
- GlobalPosition globalPos = geometry.global(local);
-
- // evaluate boundary condition type
- BoundaryTypes boundaryTypes;
- model_.problem().boundaryTypesAtPos(boundaryTypes, globalPos);
-
- if (boundaryTypes.isDirichlet(Indices::u(coordDir)))
- {
- // set value of dirichlet BC
- PrimaryVariables dirichletValues;
- model_.problem().dirichletAtPos(dirichletValues, globalPos);
- // retrieve residual value which has already been calculated for the given vertex before it
- // was clear that we are on a Dirichlet boundary
- Scalar tmpResVal = r.container().base()[(numEq-dim)*dispSize + coordDir*dispSize + i];
- // subtract the dirichletValue and the stored residual value from the solution vector entry
- // if the solution vector entry equals the dirichletValue the residual will be zero
- Scalar tmp = x(uLFS,i) - dirichletValues[Indices::u(coordDir)] - tmpResVal;
- // write result into the residual vector
- r.rawAccumulate(uLFS,i,tmp);
- }
- }
- }
- }
- }
- }
- }
-
- /*!
- * \brief Jacobian of volume term
- *
- * \tparam EG The entity geometry type from PDELab
- * \tparam LFSU The type of the local function space of the ansatz functions
- * \tparam X The type of the container for the coefficients for the ansatz functions
- * \tparam LFSV The type of the local function space of the test functions
- * \tparam M The matrix type
- *
- * \param eg The entity geometry object
- * \param lfsu The local function space object of the ansatz functions
- * \param x The object of the container for the coefficients for the ansatz functions
- * \param lfsv The local function space object of the test functions
- * \param mat The object containing the local jacobian matrix
- */
- template<typename EG, typename LFSU, typename X, typename LFSV, typename M>
- void jacobian_volume (const EG& eg,
- const LFSU& lfsu,
- const X& x,
- const LFSV& lfsv,
- M& mat) const
- {
- typedef typename LFSU::Traits::SizeType size_type;
-
- model_.localJacobian().assemble(eg.entity());
- // pressure and saturation local function space (mass balance equations)
- typedef typename LFSU::template Child<0>::Type PressSatLFS;
- typedef typename PressSatLFS::template Child<0>::Type PressLFS;
- const PressSatLFS& pressSatLFS = lfsu.template child<0>();
- const PressLFS& pressLFS = pressSatLFS.template child<0>();
- typedef typename PressSatLFS::template Child<1>::Type SatLFS;
- const SatLFS& satLFS = pressSatLFS.template child<1>();
- // local function space for solid displacement
- typedef typename LFSU::template Child<1>::Type DisplacementLFS;
- typedef typename DisplacementLFS::template Child<0>::Type DisplacementScalarLFS;
- const DisplacementLFS& displacementLFS = lfsu.template child<1>();
-
- // type of local residual vector
- typedef typename M::value_type R;
- typedef Dune::PDELab::LocalVector<R> LocalResidualVector;
- typedef Dune::PDELab::WeightedVectorAccumulationView<LocalResidualVector> ResidualView;
-
- unsigned int numScv = eg.entity().subEntities(dim);
-
- // loop over all degrees of freedom of the current element
- for (size_type j = 0; j < numScv*numEq; j++)
- {
- // assemble entries for mass balance equations
- for (size_type i = 0; i < (numEq-dim)*numScv; i++)
- {
- // local jacobian value of location idxI=i%numScv, idxJ=j%numScv for equation i/numScv and unknown j/numScv
- Scalar tmp = (model_.localJacobian().mat(i%numScv,j%numScv))[i/numScv][j/numScv];
- // mass balance entries for pressure
- if (j < numScv){
- if(i < numScv)
- mat.rawAccumulate(pressLFS,i,pressLFS,j,tmp);
- else
- mat.rawAccumulate(satLFS,i-numScv,pressLFS,j,tmp);
- }
- // mass balance entries for saturation
- else if (j < 2*numScv){
- if(i < numScv)
- mat.rawAccumulate(pressLFS,i,satLFS,j-numScv,tmp);
- else
- mat.rawAccumulate(satLFS,i-numScv,satLFS,j-numScv,tmp);
- }
- // mass balance entries for solid displacement in x-direction
- else if (j < 3*numScv)
- {
- const DisplacementScalarLFS& uScalarLFS = displacementLFS.template child<0>();
- if(i < numScv)
- mat.rawAccumulate(pressLFS,i,uScalarLFS,j-2*numScv,tmp);
- else
- mat.rawAccumulate(satLFS,i-numScv,uScalarLFS,j-2*numScv,tmp);
- }
- // mass balance entries for solid displacement in y-direction
- else if (j < 4*numScv && dim >=2)
- {
- const DisplacementScalarLFS& uScalarLFS = displacementLFS.template child<1>();
- if(i < numScv)
- mat.rawAccumulate(pressLFS,i,uScalarLFS,j-3*numScv,tmp);
- else
- mat.rawAccumulate(satLFS,i-numScv,uScalarLFS,j-3*numScv,tmp);
- }
- // mass balance entries for solid displacement in z-direction
- else if(j < 5*numScv && dim >=3)
- {
- const DisplacementScalarLFS& uScalarLFS = displacementLFS.template child<dim-1>();
- if(i < numScv)
- mat.rawAccumulate(pressLFS,i,uScalarLFS,j-(numEq-1)*numScv,tmp);
- else
- mat.rawAccumulate(satLFS,i-numScv,uScalarLFS,j-(numEq-1)*numScv,tmp);
- }
-
- }
- }
-
- // calculate local jacobian entries and assemble for momentum balance equation
- const int m=lfsv.size();
- const int n=lfsu.size();
-
- X u(x);
- LocalResidualVector down(mat.nrows(),0);
-
- // evaluate momentum residual for momentum balance equation
- ResidualView downView = down.weightedAccumulationView(1.0);
- alphaMomentum(eg, lfsu, u, lfsv, downView);
-
- // loop over all columns (number of element vertices * number of equations)
- using std::abs;
- for (int j = 0; j < n; j++)
- {
- // vary the solution vector entry (lfsu,j) by a small value delta (forward differencing)
- // this comprises presure, saturation, ux, uy and uz
- Scalar delta = 1e-4*(1.0+abs(u(lfsu,j)));
- u(lfsu,j) += delta;
-
- // evaluate momentum balance residual for the varied solution vector
- LocalResidualVector up(mat.nrows(), 0);
- ResidualView upView = up.weightedAccumulationView(1.0);
- alphaMomentum(eg, lfsu, u, lfsv, upView);
-
- // calculate partial derivative for momentum balance equations and assemble
- for (int i = (numEq-dim)*numScv; i < m; i++)
- {
- Scalar entry = (up(lfsv, i) - down(lfsv, i))/delta;
- // accumulate resulting partial derivatives into jacobian
- mat.rawAccumulate(lfsv,i, lfsu,j,entry);
- }
-
- // reset solution
- u(lfsu,j) = x(lfsu,j);
- }
- }
-
-private:
- Model& model_;
-};
-
-} // namespace PDELab
-} // namespace Dumux
-
-#endif
diff --git a/dumux/geomechanics/el2p/localresidual.hh b/dumux/geomechanics/el2p/localresidual.hh
deleted file mode 100644
index 1896555fbd3eb11e975c63bc4e1da94a12d49573..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/localresidual.hh
+++ /dev/null
@@ -1,233 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Element-wise calculation of the residual for the linear elastic,
- * two-phase model in the fully implicit scheme.
- */
-#ifndef DUMUX_ELASTIC2P_LOCAL_RESIDUAL_HH
-#define DUMUX_ELASTIC2P_LOCAL_RESIDUAL_HH
-
-#include <dumux/implicit/box/localresidual.hh>
-#include "properties.hh"
-
-namespace Dumux {
-/*!
- * \ingroup ElTwoPModel
- * \ingroup ImplicitLocalResidual
- *
- * \brief Element-wise calculation of the Jacobian matrix for problems
- * using the two-phase linear-elasticity fully implicit model.
- */
-template<class TypeTag>
-class ElTwoPLocalResidual: public BoxLocalResidual<TypeTag> {
-protected:
- typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
- enum {
- dim = GridView::dimension
- };
-
- typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
- typedef Dune::FieldVector<Scalar, dim> DimVector;
-
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, EffectivePermeabilityModel) EffectivePermeabilityModel;
-
- enum {
- numFluidPhases = GET_PROP_VALUE(TypeTag, NumPhases)
- };
- enum {
- contiWEqIdx = Indices::contiWEqIdx,
- contiNEqIdx = Indices::contiNEqIdx,
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
- };
-
-public:
- /*!
- * \brief Constructor. Sets the upwind weight.
- */
- ElTwoPLocalResidual() {
- // retrieve the upwind weight for the mass conservation equations. Use the value
- // specified via the property system as default, and overwrite
- // it by the run-time parameter from the Dune::ParameterTree
- massUpwindWeight_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit,
- MassUpwindWeight);
- }
- ;
-
- /*!
- * \brief Evaluate the amount all conservation quantities
- * (e.g. phase mass) within a finite sub-control volume.
- *
- * \param storage The phase mass within the sub-control volume
- * \param scvIdx The SCV (sub-control-volume) index
- * \param usePrevSol Evaluate function with solution of current or previous time step
- */
- void computeStorage(PrimaryVariables &storage, int scvIdx,
- bool usePrevSol) const {
- // if flag usePrevSol is set, the solution from the previous
- // time step is used, otherwise the current solution is
- // used. The secondary variables are used accordingly. This
- // is required to compute the derivative of the storage term
- // using the implicit Euler method.
- const ElementVolumeVariables &elemVolVars =
- usePrevSol ? this->prevVolVars_() : this->curVolVars_();
- const VolumeVariables &volVars = elemVolVars[scvIdx];
-
- storage = Scalar(0);
-
- // wetting phase mass
- storage[contiWEqIdx] = volVars.density(wPhaseIdx)
- * volVars.saturation(wPhaseIdx) * volVars.effPorosity;
- // non-wetting phase mass
- storage[contiNEqIdx] = volVars.density(nPhaseIdx)
- * volVars.saturation(nPhaseIdx) * volVars.effPorosity;
- }
-
- /*!
- * \brief Evaluates the mass flux over a face of a sub-control
- * volume.
- *
- * \param flux The flux over the SCV (sub-control-volume) face for each phase
- * \param fIdx The index of the SCV face
- * \param onBoundary A boolean variable to specify whether the flux variables
- * are calculated for interior SCV faces or boundary faces, default=false
- */
- void computeFlux(PrimaryVariables &flux, int fIdx, const bool onBoundary = false) const
- {
- FluxVariables fluxVars;
- fluxVars.update(this->problem_(),
- this->element_(),
- this->fvGeometry_(),
- fIdx,
- this->curVolVars_());
-
- flux = 0;
- this->computeAdvectiveFlux(flux, fluxVars);
- }
-
- /*!
- * \brief Evaluates the advective mass flux of all components over
- * a face of a sub-control volume.
- *
- * \param flux The advective flux over the sub-control-volume face for each phase
- * \param fluxVars The flux variables at the current SCV
- *
- * This method is called by compute flux and is mainly there for
- * derived models to ease adding equations selectively.
- */
- void computeAdvectiveFlux(PrimaryVariables &flux,
- const FluxVariables &fluxVars) const {
- // calculate effective permeability based on effective porosity
- // according to the relation given in Rutqvist and Tsang (2002)
- // this evaluation should be moved to another location
- DimVector tmpVec;
-
- DimMatrix Keff, Keff_i, Keff_j;
- Keff_i = EffectivePermeabilityModel::effectivePermeability(this->curVolVars_()[fluxVars.face().i],
- this->problem_().spatialParams(),
- this->element_(),
- this->fvGeometry_(),
- fluxVars.face().i);
- Keff_j = EffectivePermeabilityModel::effectivePermeability(this->curVolVars_()[fluxVars.face().j],
- this->problem_().spatialParams(),
- this->element_(),
- this->fvGeometry_(),
- fluxVars.face().j);
-
- this->problem_().spatialParams().meanK(Keff, Keff_i, Keff_j);
- // loop over all phases
- for (int phaseIdx = 0; phaseIdx < numFluidPhases; ++phaseIdx) {
- // data attached to upstream and the downstream vertices
- // of the current phase
- // calculate the flux in the normal direction of the
- // current sub control volume face
-
- // if geomechanical feedback on flow is taken into account the effective permeability is
- // applied for the flux calculations
- if (this->problem_().coupled() == true) {
- Keff.mv(fluxVars.potentialGrad(phaseIdx), tmpVec);
- } else {
- fluxVars.intrinsicPermeability().mv(
- fluxVars.potentialGrad(phaseIdx), tmpVec);
- }
- Scalar normalFlux = -(tmpVec * fluxVars.face().normal);
-
- // data attached to upstream and the downstream vertices
- // of the current phase
- const VolumeVariables &up = this->curVolVars_(
- fluxVars.upstreamIdx(phaseIdx));
- const VolumeVariables &dn = this->curVolVars_(
- fluxVars.downstreamIdx(phaseIdx));
-
- // add advective flux of current phase
- int eqIdx = (phaseIdx == wPhaseIdx) ? contiWEqIdx : contiNEqIdx;
- flux[eqIdx] += normalFlux
- * ((massUpwindWeight_) * up.density(phaseIdx)
- * up.mobility(phaseIdx)
- + (massUpwindWeight_) * dn.density(phaseIdx)
- * dn.mobility(phaseIdx));
-
- // if geomechanical feedback on flow is taken into account add the flux contribution
- // of the displacement velocity
-
- if (this->problem_().coupled() == true) {
- // use upwind displacement velocity to calculate phase transport (?)
- flux[eqIdx] += up.effPorosity * up.saturation(phaseIdx)
- * up.density(phaseIdx) * fluxVars.timeDerivUNormal();
- }
-
- }
- }
-
- /*!
- * \brief Calculate the source term of the equation
- *
- * \param q The source/sink in the SCV for each phase
- * \param scvIdx The index of the SCV
- *
- */
- void computeSource(PrimaryVariables &q, int scvIdx) {
- // retrieve the source term intrinsic to the problem
- this->problem_().source(q, this->element_(), this->fvGeometry_(),
- scvIdx);
- }
-
-protected:
- Implementation *asImp_() {
- return static_cast<Implementation *>(this);
- }
- const Implementation *asImp_() const {
- return static_cast<const Implementation *>(this);
- }
-
-private:
- Scalar massUpwindWeight_;
-};
-}
-#endif
diff --git a/dumux/geomechanics/el2p/model.hh b/dumux/geomechanics/el2p/model.hh
deleted file mode 100644
index 19a8610d6e6a1a39f09bad42325a4a18f8667cc6..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/model.hh
+++ /dev/null
@@ -1,717 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-
-/*!
-* \file
-*
-* \brief Adaption of the fully implicit scheme to the two-phase linear elasticity model.
-*/
-
-#ifndef DUMUX_ELASTIC2P_MODEL_HH
-#define DUMUX_ELASTIC2P_MODEL_HH
-
-#include <dune/pdelab/gridfunctionspace/interpolate.hh>
-#include <dumux/common/eigenvalues.hh>
-#include "properties.hh"
-
-namespace Dumux {
-
-namespace Properties {
-NEW_PROP_TAG(InitialDisplacement); //!< The initial displacement function
-NEW_PROP_TAG(InitialPressSat); //!< The initial pressure and saturation function
-}
-
-/*!
- * \ingroup ElTwoPBoxModel
- * \brief Adaption of the fully implicit scheme to the two-phase linear elasticity model.
- *
- * This model implements a two-phase flow of compressible immiscible fluids \f$\alpha \in \{ w, n \}\f$.
- * The deformation of the solid matrix is described with a quasi-stationary momentum balance equation.
- * The influence of the pore fluid is accounted for through the effective stress concept (Biot 1941).
- * The total stress acting on a rock is partially supported by the rock matrix and partially supported
- * by the pore fluid. The effective stress represents the share of the total stress which is supported
- * by the solid rock matrix and can be determined as a function of the strain according to Hooke's law.
- *
- * As an equation for the conservation of momentum within the fluid phases the standard multiphase Darcy's approach is used:
- \f[
- v_\alpha = - \frac{k_{r\alpha}}{\mu_\alpha} \textbf{K}
- \left(\textbf{grad}\, p_\alpha - \varrho_{\alpha} {\textbf g} \right)
- \f]
- *
- * Gravity can be enabled or disabled via the property system.
- * By inserting this into the continuity equation, one gets
-\f[
- \frac{\partial \phi_{eff} \varrho_\alpha S_\alpha}{\partial t}
- - \text{div} \left\{ \varrho_\alpha \frac{k_{r\alpha}}{\mu_\alpha}
- \mathbf{K}_\text{eff} \left(\textbf{grad}\, p_\alpha - \varrho_{\alpha} \mathbf{g} \right)
- - \phi_{eff} \varrho_\alpha S_\alpha \frac{\partial \mathbf{u}}{\partial t}
- \right\} - q_\alpha = 0 \;,
- \f]
- *
- *
- * A quasi-stationary momentum balance equation is solved for the changes with respect to the initial conditions (Darcis 2012), note
- * that this implementation assumes the soil mechanics sign convention (i.e. compressive stresses are negative):
- \f[
- \text{div}\left( \boldsymbol{\Delta \sigma'}- \Delta p_{eff} \boldsymbol{I} \right) + \Delta \varrho_b {\textbf g} = 0 \;,
- \f]
- * with the effective stress:
- \f[
- \boldsymbol{\sigma'} = 2\,G\,\boldsymbol{\epsilon} + \lambda \,\text{tr} (\boldsymbol{\epsilon}) \, \mathbf{I}.
- \f]
- *
- * and the strain tensor \f$\boldsymbol{\epsilon}\f$ as a function of the solid displacement gradient \f$\textbf{grad} \mathbf{u}\f$:
- \f[
- \boldsymbol{\epsilon} = \frac{1}{2} \, (\textbf{grad} \mathbf{u} + \textbf{grad}^T \mathbf{u}).
- \f]
- *
- * Here, the rock mechanics sign convention is switch off which means compressive stresses are < 0 and tensile stresses are > 0.
- * The rock mechanics sign convention can be switched on for the vtk output via the property system.
- *
- * The effective porosity and the effective permeability are calculated as a function of the solid displacement:
- \f[
- \phi_{eff} = \frac{\phi_{init} + \text{div} \mathbf{u}}{1 + \text{div} \mathbf{u}}
- \f]
- \f[
- K_{eff} = K_{init} \text{exp}\left( 22.2(\phi_{eff}/\phi_{init} -1 )\right)
- \f]
- * The mass balance equations are discretized using a vertex-centered finite volume (box)
- * or cell-centered finite volume scheme as spatial and the implicit Euler method as time discretization.
- * The momentum balance equations are discretized using a standard Galerkin Finite Element method as
- * spatial discretization scheme.
- *
- *
- * The primary variables are the wetting phase pressure \f$p_w\f$, the nonwetting phase saturation \f$S_n\f$ and the solid
- * displacement vector \f$\mathbf{u}\f$ (changes in solid displacement with respect to initial conditions).
- */
-template<class TypeTag>
-class ElTwoPModel: public GET_PROP_TYPE(TypeTag, BaseModel)
-{
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
- nPhaseIdx = Indices::nPhaseIdx,
- wPhaseIdx = Indices::wPhaseIdx
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename Element::Geometry::JacobianInverseTransposed JacobianInverseTransposed;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
- typedef Dune::FieldVector<Scalar, dim> DimVector;
- typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
-
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
- typedef Dune::PDELab::LocalFunctionSpace<GridFunctionSpace> LocalFunctionSpace;
-
-public:
-
- /*!
- * \brief Write the current solution to a restart file.
- *
- * \param outStream The output stream of one vertex for the restart file
- * \param entity The Entity
- *
- * Due to the mixed discretization schemes which are combined via pdelab for this model
- * the solution vector has a different form than in the pure box models
- * it sorts the primary variables in the following way:
- * p_vertex0 S_vertex0 p_vertex1 S_vertex1 p_vertex2 ....p_vertexN S_vertexN
- * ux_vertex0 uy_vertex0 uz_vertex0 ux_vertex1 uy_vertex1 uz_vertex1 ...
- *
- * Therefore, the serializeEntity function has to be modified.
- */
- template <class Entity>
- void serializeEntity(std::ostream &outStream,
- const Entity &entity)
- {
- // vertex index
- int dofIdxGlobal = this->dofMapper().index(entity);
-
- // write phase state
- if (!outStream.good()) {
- DUNE_THROW(Dune::IOError,
- "Could not serialize vertex "
- << dofIdxGlobal);
- }
- int numScv = this->gridView().size(dim);
- // get p and S entries for this vertex
- for (int eqIdx = 0; eqIdx < numEq-dim; ++eqIdx) {
- outStream << this->curSol().base()[dofIdxGlobal*(numEq-dim) + eqIdx][0]<<" ";
- }
- // get ux, uy, uz entries for this vertex
- for (int j = 0; j< dim; ++j)
- outStream << this->curSol().base()[numScv*(numEq-dim) + dofIdxGlobal*dim + j][0] <<" ";
-
- int vIdxGlobal = this->dofMapper().index(entity);
- if (!outStream.good())
- DUNE_THROW(Dune::IOError, "Could not serialize vertex " << vIdxGlobal);
- }
-
- /*!
- * \brief Reads the current solution for a vertex from a restart
- * file.
- *
- * \param inStream The input stream of one vertex from the restart file
- * \param entity The Entity
- *
- * Due to the mixed discretization schemes which are combined via pdelab for this model
- * the solution vector has a different form than in the pure box models
- * it sorts the primary variables in the following way:
- * p_vertex0 S_vertex0 p_vertex1 S_vertex1 p_vertex2 ....p_vertexN S_vertexN
- * ux_vertex0 uy_vertex0 uz_vertex0 ux_vertex1 uy_vertex1 uz_vertex1 ...
- *
- * Therefore, the deserializeEntity function has to be modified.
- */
- template<class Entity>
- void deserializeEntity(std::istream &inStream, const Entity &entity)
- {
- int dofIdxGlobal = this->dofMapper().index(entity);
-
- if (!inStream.good()){
- DUNE_THROW(Dune::IOError,
- "Could not deserialize vertex "
- << dofIdxGlobal);
- }
- int numScv = this->gridView().size(dim);
- for (int eqIdx = 0; eqIdx < numEq-dim; ++eqIdx) {
- // read p and S entries for this vertex
- inStream >> this->curSol().base()[dofIdxGlobal*(numEq-dim) + eqIdx][0];}
- for (int j = 0; j< dim; ++j){
- // read ux, uy, uz entries for this vertex
- inStream >> this->curSol().base()[numScv*(numEq-dim) + dofIdxGlobal*dim + j][0];}
- }
-
-
- /*!
- * \brief \copybrief ImplicitModel::addOutputVtkFields
- *
- * Specialization for the ElOnePTwoCBoxModel, add one-phase two-component
- * properties, solid displacement, stresses, effective properties and the
- * process rank to the VTK writer.
- */
- template<class MultiWriter>
- void addOutputVtkFields(const SolutionVector &sol, MultiWriter &writer) {
- // check whether compressive stresses are defined to be positive
- // (rockMechanicsSignConvention_ == true) or negative
- rockMechanicsSignConvention_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, RockMechanicsSignConvention);
-
- typedef Dune::BlockVector<Dune::FieldVector<double, 1> > ScalarField;
- typedef Dune::BlockVector<Dune::FieldVector<double, dim> > VectorField;
-
- // create the required scalar and vector fields
- unsigned numVertices = this->gridView_().size(dim);
- unsigned numElements = this->gridView_().size(0);
-
- // create the required fields for vertex data
- ScalarField &pw = *writer.allocateManagedBuffer(numVertices);
- ScalarField &pn = *writer.allocateManagedBuffer(numVertices);
- ScalarField &pc = *writer.allocateManagedBuffer(numVertices);
- ScalarField &sw = *writer.allocateManagedBuffer(numVertices);
- ScalarField &sn = *writer.allocateManagedBuffer(numVertices);
- VectorField &displacement = *writer.template allocateManagedBuffer<Scalar, dim>(numVertices);
- ScalarField &rhoW = *writer.allocateManagedBuffer(numVertices);
- ScalarField &rhoN = *writer.allocateManagedBuffer(numVertices);
- ScalarField &Te = *writer.allocateManagedBuffer(numVertices);
-
- // create the required fields for element data
- // effective stresses
- VectorField &deltaEffStressX = *writer.template allocateManagedBuffer<Scalar,
- dim>(numElements);
- VectorField &deltaEffStressY = *writer.template allocateManagedBuffer<Scalar,
- dim>(numElements);
- VectorField &deltaEffStressZ = *writer.template allocateManagedBuffer<Scalar,
- dim>(numElements);
- // total stresses
- VectorField &totalStressX = *writer.template allocateManagedBuffer<
- Scalar, dim>(numElements);
- VectorField &totalStressY = *writer.template allocateManagedBuffer<
- Scalar, dim>(numElements);
- VectorField &totalStressZ = *writer.template allocateManagedBuffer<
- Scalar, dim>(numElements);
- // initial stresses
- VectorField &initStressX = *writer.template allocateManagedBuffer<
- Scalar, dim>(numElements);
- VectorField &initStressY = *writer.template allocateManagedBuffer<
- Scalar, dim>(numElements);
- VectorField &initStressZ = *writer.template allocateManagedBuffer<
- Scalar, dim>(numElements);
- // principal stresses
- ScalarField &principalStress1 = *writer.allocateManagedBuffer(
- numElements);
- ScalarField &principalStress2 = *writer.allocateManagedBuffer(
- numElements);
- ScalarField &principalStress3 = *writer.allocateManagedBuffer(
- numElements);
-
-
- ScalarField &effKx = *writer.allocateManagedBuffer(numElements);
- ScalarField &effPorosity = *writer.allocateManagedBuffer(numElements);
- ScalarField &effectivePressure = *writer.allocateManagedBuffer(numElements);
- ScalarField &deltaEffPressure = *writer.allocateManagedBuffer(numElements);
-
-
- ScalarField &Pcrtens = *writer.allocateManagedBuffer(numElements);
- ScalarField &Pcrshe = *writer.allocateManagedBuffer(numElements);
-
- // initialize cell stresses, cell-wise hydraulic parameters and cell pressure with zero
-
-
- for (unsigned int eIdx = 0; eIdx < numElements; ++eIdx) {
- deltaEffStressX[eIdx] = Scalar(0.0);
- if (dim >= 2)
- deltaEffStressY[eIdx] = Scalar(0.0);
- if (dim >= 3)
- deltaEffStressZ[eIdx] = Scalar(0.0);
-
- totalStressX[eIdx] = Scalar(0.0);
- if (dim >= 2)
- totalStressY[eIdx] = Scalar(0.0);
- if (dim >= 3)
- totalStressZ[eIdx] = Scalar(0.0);
-
- initStressX[eIdx] = Scalar(0.0);
- if (dim >= 2)
- initStressY[eIdx] = Scalar(0.0);
- if (dim >= 3)
- initStressZ[eIdx] = Scalar(0.0);
-
- principalStress1[eIdx] = Scalar(0.0);
- if (dim >= 2)
- principalStress2[eIdx] = Scalar(0.0);
- if (dim >= 3)
- principalStress3[eIdx] = Scalar(0.0);
-
- effPorosity[eIdx] = Scalar(0.0);
- effKx[eIdx] = Scalar(0.0);
- effectivePressure[eIdx] = Scalar(0.0);
- deltaEffPressure[eIdx] = Scalar(0.0);
-
- Pcrtens[eIdx] = Scalar(0.0);
- Pcrshe[eIdx] = Scalar(0.0);
- }
-
- ScalarField &rank = *writer.allocateManagedBuffer(numElements);
-
-
- FVElementGeometry fvGeometry;
- ElementVolumeVariables elemVolVars;
-
- const GridFunctionSpace& gridFunctionSpace = this->problem_().model().jacobianAssembler().gridFunctionSpace();
- const typename GridFunctionSpace::Ordering& ordering = gridFunctionSpace.ordering();
- // initialize start and end of element iterator
- // loop over all elements (cells)
- for (const auto& element : elements(this->gridView_(), Dune::Partitions::interior))
- {
- // get FE function spaces to calculate gradients (gradient data of momentum balance
- // equation is not stored in fluxvars since it is not evaluated at box integration point)
- // copy the values of the sol vector to the localFunctionSpace values of the current element
- LocalFunctionSpace localFunctionSpace(gridFunctionSpace);
- localFunctionSpace.bind(element);
- std::vector<Scalar> values(localFunctionSpace.size());
- for (typename LocalFunctionSpace::Traits::IndexContainer::size_type k=0; k<localFunctionSpace.size(); ++k)
- {
- const typename GridFunctionSpace::Ordering::Traits::DOFIndex& di = localFunctionSpace.dofIndex(k);
- typename GridFunctionSpace::Ordering::Traits::ContainerIndex ci;
- ordering.mapIndex(di.view(),ci);
- values[k] = sol[ci];
- }
-
- // local function space for solid displacement
- typedef typename LocalFunctionSpace::template Child<1>::Type DisplacementLFS;
- const DisplacementLFS& displacementLFS =localFunctionSpace.template child<1>();
- const unsigned int dispSize = displacementLFS.child(0).size();
- typedef typename DisplacementLFS::template Child<0>::Type ScalarDispLFS;
- // further types required for gradient calculations
- typedef typename ScalarDispLFS::Traits::FiniteElementType::Traits::LocalBasisType::Traits::JacobianType JacobianType_V;
- typedef typename ScalarDispLFS::Traits::FiniteElementType::Traits::LocalBasisType::Traits::RangeFieldType RF;
-
- unsigned int eIdx = this->problem_().model().elementMapper().index(element);
- rank[eIdx] = this->gridView_().comm().rank();
-
- fvGeometry.update(this->gridView_(), element);
- elemVolVars.update(this->problem_(), element, fvGeometry, false);
-
- // loop over all local vertices of the cell
- int numScv = element.subEntities(dim);
-
- for (int scvIdx = 0; scvIdx < numScv; ++scvIdx)
- {
- unsigned int vIdxGlobal = this->dofMapper().subIndex(element, scvIdx, dim);
-
- Te[vIdxGlobal] = elemVolVars[scvIdx].temperature();
- pw[vIdxGlobal] = elemVolVars[scvIdx].pressure(wPhaseIdx);
- pn[vIdxGlobal] = elemVolVars[scvIdx].pressure(nPhaseIdx);
- pc[vIdxGlobal] = elemVolVars[scvIdx].capillaryPressure();
- sw[vIdxGlobal] = elemVolVars[scvIdx].saturation(wPhaseIdx);
- sn[vIdxGlobal] = elemVolVars[scvIdx].saturation(nPhaseIdx);
- rhoW[vIdxGlobal] = elemVolVars[scvIdx].density(wPhaseIdx);
- rhoN[vIdxGlobal] = elemVolVars[scvIdx].density(nPhaseIdx);
- // the following lines are correct for rock mechanics sign convention
- // but lead to a very counter-intuitive output therefore, they are commented.
- // in case of rock mechanics sign convention solid displacement is
- // defined to be negative if it points in positive coordinate direction
-// if(rockMechanicsSignConvention_){
-// DimVector tmpDispl;
-// tmpDispl = Scalar(0);
-// tmpDispl -= elemVolVars[scvIdx].displacement();
-// displacement[vIdxGlobal] = tmpDispl;
-// }
-//
-// else
- displacement[vIdxGlobal] = elemVolVars[scvIdx].displacement();
-
- double Keff;
- double exponent;
- exponent = 22.2 * (elemVolVars[scvIdx].effPorosity
- / elemVolVars[scvIdx].porosity() - 1);
- Keff = this->problem_().spatialParams().intrinsicPermeability( element, fvGeometry, scvIdx)[0][0];
- using std::exp;
- Keff *= exp(exponent);
- effKx[eIdx] += Keff/ numScv;
- effectivePressure[eIdx] += (pn[vIdxGlobal] * sn[vIdxGlobal]
- + pw[vIdxGlobal] * sw[vIdxGlobal])
- / numScv;
- effPorosity[eIdx] +=elemVolVars[scvIdx].effPorosity / numScv;
- };
-
- const auto geometry = element.geometry();
-
- const GlobalPosition& cellCenter = geometry.center();
- const GlobalPosition& cellCenterLocal = geometry.local(cellCenter);
-
- deltaEffPressure[eIdx] = effectivePressure[eIdx] + this->problem().pInit(cellCenter, cellCenterLocal, element);
- // determin changes in effective stress from current solution
- // evaluate gradient of displacement shape functions
- std::vector<JacobianType_V> vRefShapeGradient(dispSize);
- displacementLFS.child(0).finiteElement().localBasis().evaluateJacobian(cellCenterLocal, vRefShapeGradient);
-
- // get jacobian to transform the gradient to physical element
- const JacobianInverseTransposed jacInvT = geometry.jacobianInverseTransposed(cellCenterLocal);
- std::vector < Dune::FieldVector<RF, dim> > vShapeGradient(dispSize);
- for (size_t i = 0; i < dispSize; i++) {
- vShapeGradient[i] = 0.0;
- jacInvT.umv(vRefShapeGradient[i][0], vShapeGradient[i]);
- }
- // calculate gradient of current displacement
- typedef Dune::FieldMatrix<RF, dim, dim> DimMatrix;
- DimMatrix uGradient(0.0);
- for (int coordDir = 0; coordDir < dim; ++coordDir) {
- const ScalarDispLFS & scalarDispLFS = displacementLFS.child(coordDir);
-
- for (size_t i = 0; i < scalarDispLFS.size(); i++)
- uGradient[coordDir].axpy(values[scalarDispLFS.localIndex(i)],vShapeGradient[i]);
- }
-
- const Dune::FieldVector<Scalar, 2> lameParams = this->problem_().spatialParams().lameParams(element,fvGeometry, 0);
- const Scalar lambda = lameParams[0];
- const Scalar mu = lameParams[1];
-
- // calculate strain tensor
- Dune::FieldMatrix<RF, dim, dim> epsilon;
- for (int i = 0; i < dim; ++i)
- for (int j = 0; j < dim; ++j)
- epsilon[i][j] = 0.5 * (uGradient[i][j] + uGradient[j][i]);
-
- RF traceEpsilon = 0;
- for (int i = 0; i < dim; ++i)
- traceEpsilon += epsilon[i][i];
-
- // calculate effective stress tensor
- Dune::FieldMatrix<RF, dim, dim> sigma(0.0);
- for (int i = 0; i < dim; ++i) {
- sigma[i][i] = lambda * traceEpsilon;
- for (int j = 0; j < dim; ++j)
- sigma[i][j] += 2.0 * mu * epsilon[i][j];
- }
-
- // in case of rock mechanics sign convention compressive stresses
- // are defined to be positive
- if(rockMechanicsSignConvention_){
- deltaEffStressX[eIdx] -= sigma[0];
- if (dim >= 2) {
- deltaEffStressY[eIdx] -= sigma[1];
- }
- if (dim >= 3) {
- deltaEffStressZ[eIdx] -= sigma[2];
- }
- }
- else{
- deltaEffStressX[eIdx] = sigma[0];
- if (dim >= 2) {
- deltaEffStressY[eIdx] = sigma[1];
- }
- if (dim >= 3) {
- deltaEffStressZ[eIdx] = sigma[2];
- }
- }
-
- // retrieve prescribed initial stresses from problem file
- DimVector tmpInitStress = this->problem_().initialStress(cellCenter, 0);
- if(rockMechanicsSignConvention_){
- initStressX[eIdx][0] = tmpInitStress[0];
- if (dim >= 2) {
- initStressY[eIdx][1] = tmpInitStress[1];
- }
- if (dim >= 3) {
- initStressZ[eIdx][2] = tmpInitStress[2];
- }
- }
- else{
- initStressX[eIdx][0] -= tmpInitStress[0];
- if (dim >= 2) {
- initStressY[eIdx][1] -= tmpInitStress[1];
- }
- if (dim >= 3) {
- initStressZ[eIdx][2] -= tmpInitStress[2];
- }
- }
-
- // calculate total stresses
- // in case of rock mechanics sign convention compressive stresses
- // are defined to be positive and total stress is calculated by adding the pore pressure
- if(rockMechanicsSignConvention_){
- totalStressX[eIdx][0] = initStressX[eIdx][0] + deltaEffStressX[eIdx][0] + deltaEffPressure[eIdx];
- if (dim >= 2) {
- totalStressX[eIdx][1] = initStressX[eIdx][1] + deltaEffStressX[eIdx][1];
- totalStressY[eIdx][0] = initStressY[eIdx][0] + deltaEffStressY[eIdx][0];
- totalStressY[eIdx][1] = initStressY[eIdx][1] + deltaEffStressY[eIdx][1] + deltaEffPressure[eIdx];
- }
- if (dim >= 3) {
- totalStressX[eIdx][2] = initStressX[eIdx][2] + deltaEffStressX[eIdx][2];
- totalStressY[eIdx][2] = initStressY[eIdx][2] + deltaEffStressY[eIdx][2];
- totalStressZ[eIdx][0] = initStressZ[eIdx][0] + deltaEffStressZ[eIdx][0];
- totalStressZ[eIdx][1] = initStressZ[eIdx][1] + deltaEffStressZ[eIdx][1];
- totalStressZ[eIdx][2] = initStressZ[eIdx][2] + deltaEffStressZ[eIdx][2] + deltaEffPressure[eIdx];
- }
- }
- else{
- totalStressX[eIdx][0] = initStressX[eIdx][0] + deltaEffStressX[eIdx][0] - deltaEffPressure[eIdx];
- if (dim >= 2) {
- totalStressX[eIdx][1] = initStressX[eIdx][1] + deltaEffStressX[eIdx][1];
- totalStressY[eIdx][0] = initStressY[eIdx][0] + deltaEffStressY[eIdx][0];
- totalStressY[eIdx][1] = initStressY[eIdx][1] + deltaEffStressY[eIdx][1] - deltaEffPressure[eIdx];
- }
- if (dim >= 3) {
- totalStressX[eIdx][2] = initStressX[eIdx][2] + deltaEffStressX[eIdx][2];
- totalStressY[eIdx][2] = initStressY[eIdx][2] + deltaEffStressY[eIdx][2];
- totalStressZ[eIdx][0] = initStressZ[eIdx][0] + deltaEffStressZ[eIdx][0];
- totalStressZ[eIdx][1] = initStressZ[eIdx][1] + deltaEffStressZ[eIdx][1];
- totalStressZ[eIdx][2] = initStressZ[eIdx][2] + deltaEffStressZ[eIdx][2] - deltaEffPressure[eIdx];
- }
- }
- }
-
- // calculate principal stresses i.e. the eigenvalues of the total stress tensor
- Scalar a1, a2, a3;
- DimMatrix totalStress;
- DimVector eigenValues;
-
- for (unsigned int eIdx = 0; eIdx < numElements; eIdx++)
- {
- eigenValues = Scalar(0);
- totalStress = Scalar(0);
-
- totalStress[0] = totalStressX[eIdx];
- if (dim >= 2)
- totalStress[1] = totalStressY[eIdx];
- if (dim >= 3)
- totalStress[2] = totalStressZ[eIdx];
-
- calculateEigenValues<dim>(eigenValues, totalStress);
-
-
- for (int i = 0; i < dim; i++)
- {
- using std::isnan;
- if (isnan(eigenValues[i]))
- eigenValues[i] = 0.0;
- }
-
- // sort principal stresses: principalStress1 >= principalStress2 >= principalStress3
- if (dim == 2) {
- a1 = eigenValues[0];
- a2 = eigenValues[1];
-
- if (a1 >= a2) {
- principalStress1[eIdx] = a1;
- principalStress2[eIdx] = a2;
- } else {
- principalStress1[eIdx] = a2;
- principalStress2[eIdx] = a1;
- }
- }
-
- if (dim == 3) {
- a1 = eigenValues[0];
- a2 = eigenValues[1];
- a3 = eigenValues[2];
-
- if (a1 >= a2) {
- if (a1 >= a3) {
- principalStress1[eIdx] = a1;
- if (a2 >= a3) {
- principalStress2[eIdx] = a2;
- principalStress3[eIdx] = a3;
- }
- else //a3 > a2
- {
- principalStress2[eIdx] = a3;
- principalStress3[eIdx] = a2;
- }
- }
- else // a3 > a1
- {
- principalStress1[eIdx] = a3;
- principalStress2[eIdx] = a1;
- principalStress3[eIdx] = a2;
- }
- } else // a2>a1
- {
- if (a2 >= a3) {
- principalStress1[eIdx] = a2;
- if (a1 >= a3) {
- principalStress2[eIdx] = a1;
- principalStress3[eIdx] = a3;
- }
- else //a3>a1
- {
- principalStress2[eIdx] = a3;
- principalStress3[eIdx] = a1;
- }
- }
- else //a3>a2
- {
- principalStress1[eIdx] = a3;
- principalStress2[eIdx] = a2;
- principalStress3[eIdx] = a1;
- }
- }
- }
- Scalar taum = 0.0;
- Scalar sigmam = 0.0;
- Scalar Peff = effectivePressure[eIdx];
-
- Scalar theta = M_PI / 6;
- Scalar S0 = 0.0;
- taum = (principalStress1[eIdx] - principalStress3[eIdx]) / 2;
- sigmam = (principalStress1[eIdx] + principalStress3[eIdx]) / 2;
-
- using std::abs;
- using std::sin;
- using std::cos;
- Scalar Psc = -abs(taum) / sin(theta) + S0 * cos(theta) / sin(theta)
- + sigmam;
- // Pressure margins according to J. Rutqvist et al. / International Journal of Rock Mecahnics & Mining Sciences 45 (2008), 132-143
- Pcrtens[eIdx] = Peff - principalStress3[eIdx];
- Pcrshe[eIdx] = Peff - Psc;
-
- }
-
- writer.attachVertexData(Te, "T");
- writer.attachVertexData(pw, "pW");
- writer.attachVertexData(pn, "pN");
- writer.attachVertexData(pc, "pC");
- writer.attachVertexData(sw, "SW");
- writer.attachVertexData(sn, "SN");
- writer.attachVertexData(rhoW, "rhoW");
- writer.attachVertexData(rhoN, "rhoN");
- writer.attachVertexData(displacement, "u", dim);
-
- writer.attachCellData(deltaEffStressX, "effective stress changes X", dim);
- if (dim >= 2)
- writer.attachCellData(deltaEffStressY, "effective stress changes Y", dim);
- if (dim >= 3)
- writer.attachCellData(deltaEffStressZ, "effective stress changes Z", dim);
-
- writer.attachCellData(principalStress1, "principal stress 1");
- if (dim >= 2)
- writer.attachCellData(principalStress2, "principal stress 2");
- if (dim >= 3)
- writer.attachCellData(principalStress3, "principal stress 3");
-
- writer.attachCellData(totalStressX, "total stresses X", dim);
- if (dim >= 2)
- writer.attachCellData(totalStressY, "total stresses Y", dim);
- if (dim >= 3)
- writer.attachCellData(totalStressZ, "total stresses Z", dim);
-
- writer.attachCellData(initStressX, "initial stresses X", dim);
- if (dim >= 2)
- writer.attachCellData(initStressY, "initial stresses Y", dim);
- if (dim >= 3)
- writer.attachCellData(initStressZ, "initial stresses Z", dim);
-
- writer.attachCellData(deltaEffPressure, "delta pEff");
- writer.attachCellData(effectivePressure, "effectivePressure");
- writer.attachCellData(Pcrtens, "Pcr_tensile");
- writer.attachCellData(Pcrshe, "Pcr_shear");
- writer.attachCellData(effKx, "effective Kxx");
- writer.attachCellData(effPorosity, "effective Porosity");
-
-
- }
-
- /*!
- * \brief Applies the initial solution for all vertices of the grid.
- */
- void applyInitialSolution_() {
- typedef typename GET_PROP_TYPE(TypeTag, InitialPressSat) InitialPressSat;
- InitialPressSat initialPressSat(this->problem_().gridView());
- std::cout << "el2pmodel calls: initialPressSat" << std::endl;
- initialPressSat.setPressure(this->problem_().pInit());
-
- typedef typename GET_PROP_TYPE(TypeTag, InitialDisplacement) InitialDisplacement;
- InitialDisplacement initialDisplacement(this->problem_().gridView());
-
- typedef Dune::PDELab::CompositeGridFunction<InitialPressSat,
- InitialDisplacement> InitialSolution;
- InitialSolution initialSolution(initialPressSat, initialDisplacement);
-
- int numDofs = this->jacobianAssembler().gridFunctionSpace().size();
- //this->curSol().resize(numDofs);
- //this->prevSol().resize(numDofs);
- std::cout << "numDofs = " << numDofs << std::endl;
-
- Dune::PDELab::interpolate(initialSolution,
- this->jacobianAssembler().gridFunctionSpace(), this->curSol());
- Dune::PDELab::interpolate(initialSolution,
- this->jacobianAssembler().gridFunctionSpace(), this->prevSol());
- }
-
- const Problem& problem() const {
- return this->problem_();
- }
-
-private:
- bool rockMechanicsSignConvention_;
-
-};
-}
-#include "propertydefaults.hh"
-#endif
diff --git a/dumux/geomechanics/el2p/newtoncontroller.hh b/dumux/geomechanics/el2p/newtoncontroller.hh
deleted file mode 100644
index ddc648b5afe25d3092e26ff67f877189235af59f..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/newtoncontroller.hh
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- */
-#ifndef DUMUX_EL2P_NEWTON_CONTROLLER_HH
-#define DUMUX_EL2P_NEWTON_CONTROLLER_HH
-
-#include <dumux/nonlinear/newtoncontroller.hh>
-
-namespace Dumux {
-
-/*!
-* \brief An el2p specific controller for the newton solver.
-*
-* This controller 'knows' what a 'physically meaningful' solution is
-* which allows the newton method to abort quicker if the solution is
-* way out of bounds.
- */
-template <class TypeTag>
-class ElTwoPNewtonController : public NewtonController<TypeTag>
-{
- typedef NewtonController<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, NewtonController) Implementation;
-
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
-
- typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) LinearSolver;
-
-public:
- /*!
- * \brief Destructor
- */
- ElTwoPNewtonController(const Problem &problem)
- : ParentType(problem),linearSolver_(problem)
- {
- this->setTargetSteps(9);
- this->setMaxSteps(18);
- };
-
- void newtonUpdateRelError(const SolutionVector &uOld,
- const SolutionVector &deltaU)
- {
- // calculate the relative error as the maximum relative
- // deflection in any degree of freedom.
- this->shift_ = 0;
-
- using std::abs;
- using std::max;
- for (int i = 0; i < int(uOld.base().size()); ++i) {
- Scalar vertErr = abs(deltaU.base()[i]/(1.0 + abs((uOld.base()[i]) + uOld.base()[i] - deltaU.base()[i])/2));
- this->shift_ = max(this->shift_, vertErr);
- }
-
- this->shift_ = this->gridView_().comm().max(this->shift_);
- }
-
- void newtonUpdate(SolutionVector &uCurrentIter,
- const SolutionVector &uLastIter,
- const SolutionVector &deltaU)
- {
-// this->writeConvergence_(uLastIter, deltaU);
-
- newtonUpdateRelError(uLastIter, deltaU);
-
- uCurrentIter = uLastIter;
- uCurrentIter -= deltaU;
-
-// printvector(std::cout, deltaU, "new solution", "row", 12, 1, 3);
- }
-
- /*!
- * \brief Solve the linear system of equations \f$\mathbf{A}x - b = 0\f$.
- *
- * Throws NumericalProblem if the linear solver didn't
- * converge.
- *
- * \param A The matrix of the linear system of equations
- * \param x The vector which solves the linear system
- * \param b The right hand side of the linear system
- */
- void newtonSolveLinear(JacobianMatrix &A,
- SolutionVector &x,
- SolutionVector &b)
- {
- using std::min;
- try {
- if (this->numSteps_ == 0)
- {
- Scalar norm2 = b.base().two_norm2();
- if (this->gridView_().comm().size() > 1)
- norm2 = this->gridView_().comm().sum(norm2);
-
- using std::sqrt;
- initialAbsoluteError_ = sqrt(norm2);
- lastAbsoluteError_ = initialAbsoluteError_;
- }
-
- int converged = linearSolver_.solve(A.base(), x.base(), b.base());
-// printvector(std::cout, x.base(), "x", "row", 5, 1, 5);
-// printvector(std::cout, b.base(), "rhs", "row", 5, 1, 5);
-// Dune::writeMatrixToMatlab(A.base(), "matrix.txt");
-
- // make sure all processes converged
- int convergedRemote = converged;
- if (this->gridView_().comm().size() > 1)
- convergedRemote = this->gridView_().comm().min(converged);
-
- if (!converged) {
- DUNE_THROW(NumericalProblem,
- "Linear solver did not converge");
- }
- else if (!convergedRemote) {
- DUNE_THROW(NumericalProblem,
- "Linear solver did not converge on a remote process");
- }
- }
- catch (Dune::MatrixBlockError e) {
- // make sure all processes converged
- int converged = 0;
- if (this->gridView_().comm().size() > 1)
- converged = this->gridView_().comm().min(converged);
-
- NumericalProblem p;
- std::string msg;
- std::ostringstream ms(msg);
- ms << e.what() << "M=" << A.base()[e.r][e.c];
- p.message(ms.str());
- throw p;
- }
- catch (const Dune::Exception &e) {
- // make sure all processes converged
- int converged = 0;
- if (this->gridView_().comm().size() > 1)
- converged = this->gridView_().comm().min(converged);
-
- NumericalProblem p;
- p.message(e.what());
- throw p;
- }
- }
-
- // absolute errors and tolerance
- Scalar absoluteError_;
- Scalar lastAbsoluteError_;
- Scalar initialAbsoluteError_;
- Scalar absoluteTolerance_;
-
- // the linear solver
- LinearSolver linearSolver_;
-
-};
-}
-
-#endif
diff --git a/dumux/geomechanics/el2p/properties.hh b/dumux/geomechanics/el2p/properties.hh
deleted file mode 100644
index 3812656dcf8c59af1188a21b99aef7e88aa1cf8b..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/properties.hh
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Defines the properties required for the two phase linear-elastic model.
- *
- * This class inherits from the properties of the two-phase model and
- * from the properties of the simple linear-elastic model
- */
-
-#ifndef DUMUX_ELASTIC2P_PROPERTIES_HH
-#define DUMUX_ELASTIC2P_PROPERTIES_HH
-
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/porousmediumflow/2p/implicit/properties.hh>
-
-namespace Dumux
-{
-////////////////////////////////
-// properties
-////////////////////////////////
-namespace Properties
-{
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tag for the twophase model with a linear elastic matrix
-NEW_TYPE_TAG(BoxElasticTwoP, INHERITS_FROM(BoxModel));
-
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-NEW_PROP_TAG(DisplacementGridFunctionSpace); //!< grid function space for the displacement
-NEW_PROP_TAG(PressureGridFunctionSpace); //!< grid function space for the pressure, saturation, ...
-NEW_PROP_TAG(GridOperatorSpace); //!< The grid operator space
-NEW_PROP_TAG(GridOperator); //!< The grid operator space
-NEW_PROP_TAG(PressureFEM); //!< FE space used for pressure, saturation, ...
-NEW_PROP_TAG(DisplacementFEM); //!< FE space used for displacement
-
-//! Returns whether the output should be written according to
-//! rock mechanics sign convention (compressive stresses > 0)
-NEW_PROP_TAG(VtkRockMechanicsSignConvention);
-
-//! Specifies the grid function space used for sub-problems
-NEW_PROP_TAG(GridFunctionSpace);
-
-//! Specifies the grid operator used for sub-problems
-NEW_PROP_TAG(GridOperator);
-
-//! Specifies the grid operator space used for sub-problems
-NEW_PROP_TAG(GridOperatorSpace);
-
-//! Specifies the type of the constraints
-NEW_PROP_TAG(Constraints);
-
-//! Specifies the type of the constraints transformation
-NEW_PROP_TAG(ConstraintsTrafo);
-
-//! Specifies the local finite element space
-NEW_PROP_TAG(LocalFEMSpace);
-
-//! Specifies the local operator
-NEW_PROP_TAG(LocalOperator);
-
-//! The type traits required for using the AMG backend
-NEW_PROP_TAG(AmgTraits);
-
-NEW_PROP_TAG(EffectivePermeabilityModel);
-}
-
-}
-
-#endif
diff --git a/dumux/geomechanics/el2p/propertydefaults.hh b/dumux/geomechanics/el2p/propertydefaults.hh
deleted file mode 100644
index 251008ce06e0a98914dc4c8d4038441fee61175b..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/propertydefaults.hh
+++ /dev/null
@@ -1,443 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Defines the properties required for the two phase linear-elastic model.
- *
- * This class inherits from the properties of the two-phase model and
- * from the properties of the simple linear-elastic model
- */
-
-#ifndef DUMUX_ELASTIC2P_PROPERTY_DEFAULTS_HH
-#define DUMUX_ELASTIC2P_PROPERTY_DEFAULTS_HH
-
-#include <dune/istl/schwarz.hh>
-#include <dune/istl/novlpschwarz.hh>
-#include <dune/istl/owneroverlapcopy.hh>
-#include <dune/istl/paamg/pinfo.hh>
-#include <dune/istl/preconditioners.hh>
-
-#include <dune/pdelab/backend/istlmatrixbackend.hh>
-#include <dune/pdelab/gridfunctionspace/gridfunctionspace.hh>
-#include <dune/pdelab/backend/istlvectorbackend.hh>
-#include <dune/pdelab/common/function.hh>
-#include <dune/pdelab/gridoperator/gridoperator.hh>
-#include <dune/pdelab/finiteelementmap/qkfem.hh>
-
-#include "properties.hh"
-
-#include "model.hh"
-#include "basemodel.hh"
-#include "indices.hh"
-#include "localresidual.hh"
-#include "localjacobian.hh"
-#include "fluxvariables.hh"
-#include "elementvolumevariables.hh"
-#include "volumevariables.hh"
-#include "localoperator.hh"
-#include "assembler.hh"
-#include "newtoncontroller.hh"
-#include "indices.hh"
-#include <dumux/implicit/box/propertydefaults.hh>
-#include <dumux/porousmediumflow/2p/implicit/propertydefaults.hh>
-#include <dumux/linear/seqsolverbackend.hh>
-#include <dumux/linear/amgbackend.hh>
-
-#include <dumux/material/fluidmatrixinteractions/permeabilityrutqvisttsang.hh>
-
-namespace Dumux
-{
-
-//////////////////////////////////////////////////////////////////
-// Property defaults
-//////////////////////////////////////////////////////////////////
-
-namespace Properties
-{
-SET_PROP(BoxElasticTwoP, NumEq) //!< set the number of equations to dim + 2
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- static const int dim = Grid::dimension;
-public:
- static const int value = dim + 2;
-};
-
-SET_INT_PROP(BoxElasticTwoP, NumPhases, 2); //!< The number of fluid phases in the elastic 2p model is 2
-
-//! Use the elastic local jacobian operator for the two-phase linear-elastic model
-SET_TYPE_PROP(BoxElasticTwoP,
- LocalResidual,
- ElTwoPLocalResidual<TypeTag>);
-
-//! the Model property
-SET_TYPE_PROP(BoxElasticTwoP, Model, ElTwoPModel<TypeTag>);
-
-/*!
- * \brief An array of secondary variable containers.
- */
-SET_TYPE_PROP(BoxElasticTwoP, ElementVolumeVariables, ElTwoPElementVolumeVariables<TypeTag>);
-
-//! the VolumeVariables property
-SET_TYPE_PROP(BoxElasticTwoP, VolumeVariables, ElTwoPVolumeVariables<TypeTag>);
-
-//! Set the default formulation to pWsN
-SET_INT_PROP(BoxElasticTwoP,
- Formulation,
- 0);
-
-//! The indices required by the two-phase linear-elastic model
-
-SET_PROP(BoxElasticTwoP, Indices)
-{
- typedef ElTwoPIndices<TypeTag> type;
-};
-
-//! The FluxVariables required by the two-phase linear-elastic model
-SET_TYPE_PROP(BoxElasticTwoP, FluxVariables, ElTwoPFluxVariables<TypeTag>);
-
-//! the default upwind factor. Default 1.0, i.e. fully upwind...
-SET_SCALAR_PROP(BoxElasticTwoP, ImplicitMassUpwindWeight, 1.0);
-
-//! weight for the upwind mobility in the velocity calculation
-SET_SCALAR_PROP(BoxElasticTwoP, ImplicitMobilityUpwindWeight, 1.0);
-
-//! enable gravity by default
-SET_BOOL_PROP(BoxElasticTwoP, ProblemEnableGravity, true);
-
-
-//! Enable evaluation of shape function gradients at the sub-control volume center by default
-// Used for the computation of the pressure gradients
-SET_BOOL_PROP(BoxElasticTwoP, EvalGradientsAtSCVCenter, true);
-
-/*!
- * \brief Set the property for the material parameters by extracting
- * it from the material law.
- */
-SET_PROP(BoxElasticTwoP, MaterialLawParams)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
-
-public:
- typedef typename MaterialLaw::Params type;
-};
-
-SET_PROP(BoxElasticTwoP, EffectivePermeabilityModel)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public:
- typedef PermeabilityRutqvistTsang<Scalar> type;
-};
-
-// SET_TYPE_PROP(BoxElasticTwoP, EffectivePermeabilityModel, PermeabilityRutqvistTsang<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Gridview)::dimension>);
-
-// use the SuperLU linear solver by default
-#if HAVE_SUPERLU
-SET_TYPE_PROP(BoxElasticTwoP, LinearSolver, SuperLUBackend<TypeTag> );
-#else
-#warning no SuperLU detected, defaulting to ILU0BiCGSTAB. For many problems, the el2p model requires a direct solver.
-SET_TYPE_PROP(BoxElasticTwoP, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-#endif
-
-// set the grid operator
-SET_PROP(BoxElasticTwoP, GridOperator)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, ConstraintsTrafo) ConstraintsTrafo;
- typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
- typedef typename GET_PROP_TYPE(TypeTag, LocalOperator) LocalOperator;
- typedef typename Dune::PDELab::ISTLMatrixBackend MatrixBackend;
-
- enum{numEq = GET_PROP_VALUE(TypeTag, NumEq)};
-
-public:
-
- typedef Dune::PDELab::GridOperator<GridFunctionSpace,
- GridFunctionSpace,
- LocalOperator,
- MatrixBackend,
- Scalar, Scalar, Scalar,
- ConstraintsTrafo,
- ConstraintsTrafo,
- true
- > type;
-};
-
-SET_PROP(BoxElasticTwoP, JacobianMatrix)
-{
-private:
- //typedef typename GET_PROP_TYPE(TypeTag, GridOperator) GridOperator;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GFSU;
- typedef typename GFSU::template ConstraintsContainer<Scalar>::Type CU;
- //! The global assembler type
- typedef Dune::PDELab::DefaultAssembler<GFSU,GFSU,CU,CU,true> Assembler;
-
- //! The type of the domain (solution).
- typedef typename Dune::PDELab::BackendVectorSelector<GFSU,Scalar>::Type Domain;
- //! The type of the range (residual).
- typedef typename Dune::PDELab::BackendVectorSelector<GFSU,Scalar>::Type Range;
- //! The type of the jacobian.
- typedef typename Dune::PDELab::ISTLMatrixBackend MB;
- typedef typename Dune::PDELab::BackendMatrixSelector<MB,Domain,Range,Scalar>::Type Jacobian;
-
- //! The local assembler type
- typedef typename GET_PROP_TYPE(TypeTag, LocalOperator) LOP;
- typedef typename GET_PROP_TYPE(TypeTag, GridOperator) GridOperator;
- typedef Dune::PDELab::DefaultLocalAssembler<GridOperator,LOP,true>
- LocalAssembler;
- //! The grid operator traits
- typedef Dune::PDELab::GridOperatorTraits
- <GFSU,GFSU,MB,Scalar,Scalar,Scalar,CU,CU,Assembler,LocalAssembler> Traits;
-public:
- typedef typename Traits::Jacobian type;
-};
-
-SET_PROP(BoxElasticTwoP, SolutionVector)
-{
-private:
- //typedef typename GET_PROP_TYPE(TypeTag, GridOperator) GridOperator;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GFSU;
- typedef typename GFSU::template ConstraintsContainer<Scalar>::Type CU;
- //! The global assembler type
- typedef Dune::PDELab::DefaultAssembler<GFSU,GFSU,CU,CU,true> Assembler;
-
- //! The type of the domain (solution).
- typedef typename Dune::PDELab::BackendVectorSelector<GFSU,Scalar>::Type Domain;
- //! The type of the range (residual).
- typedef typename Dune::PDELab::BackendVectorSelector<GFSU,Scalar>::Type Range;
- //! The type of the jacobian.
- typedef typename Dune::PDELab::ISTLMatrixBackend MB;
- typedef typename Dune::PDELab::BackendMatrixSelector<MB,Domain,Range,Scalar>::Type Jacobian;
-
- //! The local assembler type
- typedef typename GET_PROP_TYPE(TypeTag, LocalOperator) LOP;
- typedef typename GET_PROP_TYPE(TypeTag, GridOperator) GridOperator;
- typedef Dune::PDELab::DefaultLocalAssembler<GridOperator,LOP,true>
- LocalAssembler;
- //! The grid operator traits
- typedef Dune::PDELab::GridOperatorTraits
- <GFSU,GFSU,MB,Scalar,Scalar,Scalar,CU,CU,Assembler,LocalAssembler> Traits;
-public:
- typedef typename Traits::Domain type;
-};
-
-SET_PROP(BoxElasticTwoP, PressureGridFunctionSpace)
-{private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PressureFEM) FEM;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename Dune::PDELab::EntityBlockedOrderingTag OrderingTag;
- typedef typename Dune::PDELab::ISTLVectorBackend<> VBE;
- enum{numEq = GET_PROP_VALUE(TypeTag, NumEq),
- dim = GridView::dimension};
-public:
- typedef Dune::PDELab::NoConstraints Constraints;
-
- typedef Dune::PDELab::GridFunctionSpace<GridView, FEM, Constraints, VBE>
- ScalarGridFunctionSpace;
-
- typedef Dune::PDELab::PowerGridFunctionSpace<ScalarGridFunctionSpace, numEq-dim, VBE, OrderingTag>
- type;
-
- typedef typename type::template ConstraintsContainer<Scalar>::Type
- ConstraintsTrafo;
-};
-
-SET_PROP(BoxElasticTwoP, DisplacementGridFunctionSpace)
-{private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, DisplacementFEM) FEM;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename Dune::PDELab::EntityBlockedOrderingTag OrderingTag;
- typedef typename Dune::PDELab::ISTLVectorBackend<> VBE;
- enum{dim = GridView::dimension};
-public:
- typedef Dune::PDELab::NoConstraints Constraints;
-
- typedef Dune::PDELab::GridFunctionSpace<GridView, FEM, Constraints, VBE>
- ScalarGridFunctionSpace;
-
- typedef Dune::PDELab::PowerGridFunctionSpace<ScalarGridFunctionSpace, dim, VBE, OrderingTag>
- type;
-
- typedef typename type::template ConstraintsContainer<Scalar>::Type
- ConstraintsTrafo;
-};
-
-SET_PROP(BoxElasticTwoP, GridFunctionSpace)
-{private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, PressureGridFunctionSpace) PressureGFS;
- typedef typename GET_PROP_TYPE(TypeTag, DisplacementGridFunctionSpace) DisplacementGFS;
- typedef typename Dune::PDELab::LexicographicOrderingTag OrderingTag;
- typedef typename Dune::PDELab::ISTLVectorBackend<> VBE;
-public:
- typedef Dune::PDELab::NoConstraints Constraints;
-
- typedef void ScalarGridFunctionSpace;
-
- typedef Dune::PDELab::CompositeGridFunctionSpace<VBE, OrderingTag, PressureGFS, DisplacementGFS> type;
-
- typedef typename type::template ConstraintsContainer<Scalar>::Type
- ConstraintsTrafo;
-};
-
-SET_PROP(BoxElasticTwoP, ConstraintsTrafo)
-{private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridFunctionSpace) GridFunctionSpace;
-public:
- typedef typename GridFunctionSpace::template ConstraintsContainer<Scalar>::Type type;
-};
-
-// set the grid function space for the sub-models
-SET_TYPE_PROP(BoxElasticTwoP, Constraints, Dune::PDELab::NoConstraints);
-
-SET_TYPE_PROP(BoxElasticTwoP, JacobianAssembler, PDELab::El2PAssembler<TypeTag>);
-
-SET_PROP(BoxElasticTwoP, WettingPhase)
-{ private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public:
- typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
-};
-
-SET_PROP(BoxElasticTwoP, NonwettingPhase)
-{ private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public:
- typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
-};
-
-SET_PROP(BoxElasticTwoP, FluidSystem)
-{ private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
-
-public:
- typedef FluidSystems::TwoPImmiscible<Scalar,
- WettingPhase,
- NonwettingPhase> type;
-};
-
-SET_PROP(BoxElasticTwoP, FluidState)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-public:
- typedef ImmiscibleFluidState<Scalar, FluidSystem> type;
-};
-
-// enable jacobian matrix recycling by default
-SET_BOOL_PROP(BoxElasticTwoP, ImplicitEnableJacobianRecycling, false);
-// enable partial reassembling by default
-SET_BOOL_PROP(BoxElasticTwoP, ImplicitEnablePartialReassemble, false);
-
-SET_TYPE_PROP(BoxElasticTwoP, NewtonController, ElTwoPNewtonController<TypeTag>);
-
-SET_PROP(BoxElasticTwoP, LocalOperator)
-{
- typedef PDELab::El2PLocalOperator<TypeTag> type;
-};
-
-//! use the local FEM space associated with cubes by default
-SET_PROP(BoxElasticTwoP, LocalFEMSpace)
-{
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
-public:
- typedef Dune::PDELab::QkLocalFiniteElementMap<GridView,Scalar,Scalar,1> type;
-};
-
-/*!
- * \brief A vector of primary variables.
- */
-SET_PROP(BoxElasticTwoP, PrimaryVariables)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- enum{numEq = GET_PROP_VALUE(TypeTag, NumEq)};
-public:
- typedef Dune::FieldVector<Scalar, numEq> type;
-};
-
-template <class TypeTag, class MType, class VType, bool isParallel>
-class ElasticTwoPSolverTraits
-: public NonoverlappingSolverTraits<MType, VType, isParallel>
-{
-public:
- typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
-};
-
-template <class TypeTag, class MType, class VType>
-class ElasticTwoPSolverTraits<TypeTag, MType, VType, true>
-: public NonoverlappingSolverTraits<MType, VType, true>
-{
-public:
- typedef MType JacobianMatrix;
-};
-
-//! define the traits for the AMGBackend
-SET_PROP(BoxElasticTwoP, AmgTraits)
-{
-public:
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- enum { dofCodim = Grid::dimension,
- isNonOverlapping = true };
- enum { isParallel = Dune::Capabilities::canCommunicate<Grid, dofCodim>::v };
-
- static const int numEq = isParallel ? GET_PROP_VALUE(TypeTag, NumEq)
- : GET_PROP_TYPE(TypeTag, JacobianMatrix)::block_type::rows;
-
- typedef Dune::BCRSMatrix<Dune::FieldMatrix<Scalar,numEq,numEq> > MType;
- typedef Dune::BlockVector<Dune::FieldVector<Scalar,numEq> > VType;
- typedef ElasticTwoPSolverTraits<TypeTag, MType, VType, isParallel> SolverTraits;
- typedef typename SolverTraits::Comm Comm;
- typedef typename SolverTraits::LinearOperator LinearOperator;
- typedef typename SolverTraits::ScalarProduct ScalarProduct;
- typedef typename SolverTraits::Smoother Smoother;
- typedef typename SolverTraits::JacobianMatrix JacobianMatrix;
-};
-
-//! The local jacobian operator
-SET_TYPE_PROP(BoxElasticTwoP, LocalJacobian, ElTwoPLocalJacobian<TypeTag>);
-
-SET_TYPE_PROP(BoxElasticTwoP, BaseModel, ElTwoPBaseModel<TypeTag>);
-
-//! set number of equations of the mathematical model as default
-SET_INT_PROP(BoxElasticTwoP, LinearSolverBlockSize, 1);
-
-// write the stress and displacement output according to rock mechanics sign convention (compressive stresses > 0)
-SET_BOOL_PROP(BoxElasticTwoP, VtkRockMechanicsSignConvention, true);
-
-// \}
-}
-}
-
-#endif
diff --git a/dumux/geomechanics/el2p/volumevariables.hh b/dumux/geomechanics/el2p/volumevariables.hh
deleted file mode 100644
index 951609d6b3d831666ad5d374ca5ca2e889c880ba..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/el2p/volumevariables.hh
+++ /dev/null
@@ -1,174 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Quantities required by the two-phase linear-elastic model which
- * are defined on a vertex.
- */
-#ifndef DUMUX_ELASTIC2P_VOLUME_VARIABLES_HH
-#define DUMUX_ELASTIC2P_VOLUME_VARIABLES_HH
-
-#include <dumux/porousmediumflow/2p/implicit/volumevariables.hh>
-
-#include "properties.hh"
-
-namespace Dumux {
-/*!
- * \ingroup ElTwoPModel
- * \ingroup ImplicitVolumeVariables
- * \brief Contains the quantities which are are constant within a
- * finite volume in the two-phase linear-elastic model.
- *
- * This class inherits from the vertexdata of the two-phase
- * model and from the vertexdata of the simple
- * linear-elastic model
- */
-template<class TypeTag>
-class ElTwoPVolumeVariables: public TwoPVolumeVariables<TypeTag> {
-
- typedef TwoPVolumeVariables<TypeTag> TwoPBase;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity Element;
-
- enum { dim = GridView::dimension };
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<Scalar, dim> DimVector;
-
-public:
- /*!
- * \copydoc ImplicitVolumeVariables::update
- */
- void update(const PrimaryVariables &priVars,
- const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx,
- bool isOldSol)
- {
- TwoPBase::update(priVars, problem, element, fvGeometry, scvIdx, isOldSol);
- primaryVars_ = priVars;
-
- for (int coordDir = 0; coordDir < dim; ++coordDir)
- displacement_[coordDir] = priVars[Indices::u(coordDir)];
-
- effFluidDensity_ = this->density(wPhaseIdx) * this->saturation(wPhaseIdx)
- + this->density(nPhaseIdx) * this->saturation(nPhaseIdx);
-
- const Dune::FieldVector<Scalar, 2> &lameParams =
- problem.spatialParams().lameParams(element, fvGeometry, scvIdx);
-
- lambda_ = lameParams[0];
- mu_ = lameParams[1];
-
- rockDensity_ = problem.spatialParams().rockDensity(element, scvIdx);
- }
-
- /*!
- * \brief Return the vector of primary variables
- */
- const PrimaryVariables &primaryVars() const
- { return primaryVars_; }
-
- /*!
- * \brief Return the vector of primary variables
- */
- const Scalar &priVar(int idx) const
- { return primaryVars_[idx]; }
-
- /*!
- * \brief Sets the evaluation point used in the by the local jacobian.
- */
- void setEvalPoint(const Implementation *ep)
- { }
-
- /*!
- * \brief Returns the effective effective fluid density within
- * the control volume.
- */
- Scalar effFluidDensity() const
- { return effFluidDensity_; }
-
-
- /*!
- * \brief Returns the Lame parameter lambda within the control volume.
- */
- Scalar lambda() const
- { return lambda_; }
-
- /*!
- * \brief Returns the Lame parameter mu within the control volume.
- */
- Scalar mu() const
- { return mu_; }
-
- /*!
- * \brief Returns the rock density within the control volume.
- */
- Scalar rockDensity() const
- { return rockDensity_; }
-
- /*!
- * \brief Returns the solid displacement in all space
- * directions within the control volume.
- */
- Scalar displacement(int dimIdx) const
- { return displacement_[dimIdx]; }
-
- /*!
- * \brief Returns the solid displacement vector
- * within the control volume.
- */
- DimVector displacement() const
- { return displacement_; }
-
- mutable Scalar divU;
- mutable Scalar effPorosity;
-
-protected:
- Scalar effFluidDensity_;
- PrimaryVariables primaryVars_, prevPrimaryVars_;
- DimVector displacement_, prevDisplacement_;
- Scalar lambda_;
- Scalar mu_;
- Scalar rockDensity_;
-
-private:
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
-
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
-};
-
-}
-
-#endif
diff --git a/dumux/geomechanics/elastic/CMakeLists.txt b/dumux/geomechanics/elastic/CMakeLists.txt
deleted file mode 100644
index dc2edada4ebdd7cfe64a373f57d427b4a419fbb0..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#install headers
-install(FILES
-fluxvariables.hh
-indices.hh
-localresidual.hh
-model.hh
-properties.hh
-propertydefaults.hh
-volumevariables.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/geomechanics/elastic)
diff --git a/dumux/geomechanics/elastic/fluxvariables.hh b/dumux/geomechanics/elastic/fluxvariables.hh
deleted file mode 100644
index 52c64d9f7c874dd7f6632dd489c5f50ec913ac08..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/fluxvariables.hh
+++ /dev/null
@@ -1,267 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
- /*!
- * \file
- *
- * \brief This file contains the data which is required to calculate the gradients
- * over a face of a finite volume that are needed for the momentum balance
- * of a linear-elastic solid.
- *
- * This means gradients of solid displacement vectors, strains and stresses at
- * the integration point
- *
- * This class is also used as a base class for the one-phase and two-phase
- * linear-elastic models.
- */
-#ifndef DUMUX_ELASTIC_FLUX_VARIABLES_HH
-#define DUMUX_ELASTIC_FLUX_VARIABLES_HH
-
-#include "properties.hh"
-
-namespace Dumux
-{
-
-/*!
- * \ingroup ElasticBoxModel
- * \ingroup ImplicitFluxVariables
- * \brief This template class contains the data which is required to
- * calculate the gradients over a face of a finite volume for
- * the linear elasticity model.
- *
- * This means gradients of solid displacement vectors, strains and stresses at
- * the integration point
- */
-template<class TypeTag>
-class ElasticFluxVariablesBase
-{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity Element;
- enum {
- dim = GridView::dimension
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<Scalar, dim> DimVector;
- typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename FVElementGeometry::SubControlVolumeFace SCVFace;
-
-public:
- /*!
- * \brief Compute / update the flux variables
- *
- * \param problem The problem
- * \param element The finite element
- * \param fvGeometry The finite-volume geometry
- * \param fIdx The local index of the SCV (sub-control-volume) face
- * \param elemVolVars The volume variables of the current element
- * \param onBoundary A boolean variable to specify whether the flux variables
- * are calculated for interior SCV faces or boundary faces, default=false
- * \todo The fvGeometry should be better initialized, passed and stored as an std::shared_ptr
- */
- void update(const Problem &problem,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- const int fIdx,
- const ElementVolumeVariables &elemVolVars,
- const bool onBoundary = false)
- {
- fvGeometryPtr_ = &fvGeometry;
- onBoundary_ = onBoundary;
- faceIdx_ = fIdx;
-
- gradU_ = 0.0;
- gradUTransposed_ = 0.0;
- epsilon_ = 0.0;
- sigma_ = 0.0;
-
- lambda_ = 0.0;
- mu_ = 0.0;
- divU_ = 0.0;
-
- calculateGradients_(problem, element, elemVolVars);
- calculateStrain_(problem, element, elemVolVars);
- calculateStress_(problem, element, elemVolVars);
- }
-
- /*!
- * \brief Return a stress tensor component [Pa] at the integration point.
- */
- Scalar sigma(int row, int col) const
- { return sigma_[row][col]; }
-
- /*!
- * \brief Return the stress tensor [Pa] at the integration point.
- */
- DimMatrix sigma() const
- { return sigma_; }
-
- /*!
- * \brief Return the volumetric strain i.e. the divergence of the solid displacement
- * vector at the integration point.
- */
- Scalar divU() const
- { return divU_; }
-
- /*!
- * \brief Returns the Lame parameter lambda at integration point.
- */
- Scalar lambda() const
- { return lambda_; }
-
- /*!
- * \brief Returns the Lame parameter mu at integration point.
- */
- Scalar mu() const
- { return mu_; }
-
- /*!
- * \brief Returns the sub-control-volume face.
- */
- const SCVFace &face() const
- { return fvGeometry_().subContVolFace[faceIdx_]; }
-
-protected:
- /*!
- * \brief Calculation of the solid displacement gradients.
- *
- * \param problem The considered problem file
- * \param element The considered element of the grid
- * \param elemVolVars The parameters stored in the considered element
- */
- void calculateGradients_(const Problem &problem,
- const Element &element,
- const ElementVolumeVariables &elemVolVars)
- {
- const VolumeVariables &volVarsI = elemVolVars[face().i];
- const VolumeVariables &volVarsJ = elemVolVars[face().j];
-
- // calculate gradients
- DimVector tmp(0.0);
- for (int idx = 0;
- idx < fvGeometry_().numScv;
- idx++) // loop over adjacent vertices
- {
- // FE gradient at vertex idx
- const DimVector &feGrad = face().grad[idx];
-
- // the displacement vector gradient
- for (int coordIdx = 0; coordIdx < dim; ++coordIdx) {
- tmp = feGrad;
- tmp *= elemVolVars[idx].displacement(coordIdx);
- gradU_[coordIdx] += tmp;
- }
- }
-
- // average the Lame parameters at integration point
- // note: it still needs to be checked which mean (arithmetic, harmonic.. is appropriate
- lambda_ = (volVarsI.lambda() + volVarsJ.lambda()) / 2.;
- mu_ = (volVarsI.mu() + volVarsJ.mu()) / 2.;
-
- for(int col=0; col < dim; col++)
- {
- divU_ += gradU_[col][col];
-
- for(int row=0; row<dim; row++)
- gradUTransposed_[row][col] = gradU_[col][row];
- }
- }
-
- /*!
- * \brief Calculation of the strain tensor.
- *
- * \param problem The considered problem file
- * \param element The considered element of the grid
- * \param elemVolVars The parameters stored in the considered element
- */
- void calculateStrain_(const Problem &problem,
- const Element &element,
- const ElementVolumeVariables &elemVolVars)
- {
- // calculate the strain tensor
- epsilon_ += gradU_;
- epsilon_ += gradUTransposed_;
- epsilon_ *= 0.5;
- }
-
- /*!
- * \brief Calculation of the stress tensor.
- *
- * \param problem The considered problem file
- * \param element The considered element of the grid
- * \param elemVolVars The parameters stored in the considered element
- */
- void calculateStress_(const Problem &problem,
- const Element &element,
- const ElementVolumeVariables &elemVolVars)
- {
- DimMatrix firstTerm(0.0), secondTerm(0.0);
-
- epsilonTimesIdentity_ = divU_;
-
- firstTerm += epsilon_;
- firstTerm *= 2;
- firstTerm *= mu_;
-
- for (int i = 0; i < dim; ++i)
- secondTerm[i][i] += 1.0;
- secondTerm *= lambda_;
- secondTerm *= epsilonTimesIdentity_;
-
- // calculate the stress tensor
- sigma_ += firstTerm;
- sigma_ += secondTerm;
- }
-
- // return const reference to fvGeometry
- const FVElementGeometry& fvGeometry_() const
- { return *fvGeometryPtr_; }
-
- int faceIdx_;
- bool onBoundary_;
-
- // Lame parameter mu at the integration point
- Scalar mu_;
- // Lame parameter lambda at the integration point
- Scalar lambda_;
- // divergence of the solid displacement vector at the integration point
- Scalar divU_;
- // volumetric strain at the integration point
- Scalar epsilonTimesIdentity_;
- // gradient and transposed gradient of the solid displacement vector
- // at the integration point
- DimMatrix gradU_, gradUTransposed_;
- // strain tensor at the integration point
- DimMatrix epsilon_;
- // stress tensor at the integration point
- DimMatrix sigma_;
-
-private:
- const FVElementGeometry* fvGeometryPtr_; //!< Information about the geometry of discretization
-
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/geomechanics/elastic/indices.hh b/dumux/geomechanics/elastic/indices.hh
deleted file mode 100644
index 20c4f3ea5f62829ff5a73dfe65fa9cff674aef3b..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/indices.hh
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Defines the primary variable and equation indices used by
- * the linear elasticity model
- */
-#ifndef DUMUX_ELASTIC_INDICES_HH
-#define DUMUX_ELASTIC_INDICES_HH
-
-namespace Dumux
-{
-// \{
-
-/*!
- * \ingroup ElasticBoxModel
- * \ingroup ImplicitIndices
- * \brief The indices for the linear elasticity model.
- */
-template <int PVOffset = 0>
-struct ElasticIndices
-{
- // returns the equation index for a given space direction
- static int momentum(int dirIdx)
- {
- return PVOffset + dirIdx;
- };
-
- // returns the primary variable index for a given space direction
- static int u(int dirIdx)
- {
- return PVOffset + dirIdx;
- };
-
- // Equation indices
- static const int momentumXEqIdx = PVOffset + 0;
- static const int momentumYEqIdx = PVOffset + 1;
- static const int momentumZEqIdx = PVOffset + 2;
-
- // primary variable indices
- static const int uxIdx = PVOffset + 0;
- static const int uyIdx = PVOffset + 1;
- static const int uzIdx = PVOffset + 2;
-};
-
-}// namespace Dumux
-
-#endif
diff --git a/dumux/geomechanics/elastic/localresidual.hh b/dumux/geomechanics/elastic/localresidual.hh
deleted file mode 100644
index 9c8589d0644d3264dad65d82006b898896bb6af8..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/localresidual.hh
+++ /dev/null
@@ -1,120 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Element-wise calculation the local Jacobian for the
- * linear elastic model in the fully implicit scheme.
- */
-#ifndef DUMUX_ELASTIC_LOCAL_RESIDUAL_HH
-#define DUMUX_ELASTIC_LOCAL_RESIDUAL_HH
-
-#include "properties.hh"
-
-namespace Dumux
-{
-/*!
- *
- * \ingroup ElasticBoxModel
- * \ingroup ImplicitLocalResidual
- * \brief Calculate the local Jacobian for the linear
- * elasticity model
- *
- * This class is used to fill the gaps in BoxLocalResidual for
- * the linear elasticity model.
- */
-template<class TypeTag>
-class ElasticLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
-{
-protected:
- typedef typename GET_PROP_TYPE(TypeTag, BaseLocalResidual) ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
- enum { dim = GridView::dimension };
- typedef Dune::FieldVector<Scalar, dim> DimVector;
-
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace) SubControlVolumeFace;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
-public:
- /*!
- * \brief Evaluate the amount of all conservation quantities
- * within a finite volume.
- *
- * \param storage The storage of a quantity in the sub-control volume
- * \param scvIdx The index of the considered face of the sub-control volume
- * \param usePrevSol Evaluate function with solution of current or previous time step
- */
- PrimaryVariables computeStorage(const SubControlVolume& scv, const VolumeVariables& volVars) const
- {
- // quasistationary conditions assumed
- return PrimaryVariables(0.0);
- }
-
- /*!
- * \brief Evaluate the stress across a face of a sub-control
- * volume.
- *
- * \param flux The stress over the SCV (sub-control-volume) face
- * \param fIdx The index of the considered face of the sub control volume
- * \param onBoundary A boolean variable to specify whether the flux variables
- * are calculated for interior SCV faces or boundary faces, default=false
- */
- PrimaryVariables computeFlux(const SubControlVolumeFace& scvFace) const
- {
- FluxVariables fluxVars;
- fluxVars.initAndComputeFluxes(this->problem_(), this->element_(), scvFace);
- return fluxVars.stressVector();
- }
-
- /*!
- * \brief Calculate the source term of the equation
- * \param source The source/sink in the SCV is the gravity term in the momentum balance
- * \param scvIdx The index of the vertex of the sub control volume
- *
- */
- PrimaryVariables computeSource(const SubControlVolume& scv)
- {
- PrimaryVariables source(0.0);
-
- source += ParentType::computeSource(scv);
-
- // gravity term of the solid matrix in the momentum balance
- DimVector gravityTerm(0.0);
- gravityTerm = this->problem_().gravity();
- gravityTerm *= this->problem_().model().curVolVars(scv).rockDensity();
-
- for (int i = 0; i < dim; ++i)
- source[Indices::momentum(i)] += gravityTerm[i];
-
- return source;
- }
-
-};
-
-} // end namespace Dumux
-
-#endif // DUMUX_ELASTIC_LOCAL_RESIDUAL_HH
diff --git a/dumux/geomechanics/elastic/model.hh b/dumux/geomechanics/elastic/model.hh
deleted file mode 100644
index b2c5c13b1bbe0cccaabc0ddc28e61919dfcb6152..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/model.hh
+++ /dev/null
@@ -1,186 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Base class for all models which use the linear elasticity model.
- * Adaption of the fully implicit scheme to the linear elasticity model.
- */
-#ifndef DUMUX_ELASTIC_MODEL_HH
-#define DUMUX_ELASTIC_MODEL_HH
-
-#include "properties.hh"
-
-namespace Dumux
-{
-
-/*!
- * \ingroup ElasticBoxModel
- * \brief Adaption of the fully implicit scheme to the linear elasticity model.
- *
- * This model implements a linear elastic solid using Hooke's law as
- * stress-strain relation and a quasi-stationary momentum balance equation:
- \f[
- \boldsymbol{\sigma} = 2\,G\,\boldsymbol{\epsilon} + \lambda \,\text{tr} (\boldsymbol{\epsilon}) \, \boldsymbol{I}.
- \f]
- *
- * with the strain tensor \f$\boldsymbol{\epsilon}\f$ as a function of the solid displacement gradient \f$\textbf{grad} \boldsymbol{u}\f$:
- \f[
- \boldsymbol{\epsilon} = \frac{1}{2} \, (\textbf{grad} \boldsymbol{u} + \textbf{grad}^T \boldsymbol{u}).
- \f]
- *
- * Gravity can be enabled or disabled via the property system.
- * By inserting this into the momentum balance equation, one gets
- \f[
- \text{div} \boldsymbol{\sigma} + \varrho {\textbf g} = 0 \;,
- \f]
- *
- * The equation is discretized using a vertex-centered finite volume (box)
- * scheme as spatial discretization.
- *
- */
-
-template<class TypeTag >
-class ElasticModel : public GET_PROP_TYPE(TypeTag, BaseModel)
-{
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
-
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dim = GridView::dimension };
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
-
-public:
- /*!
- * \brief \copybrief ImplicitModel::addOutputVtkFields
- *
- * Specialization for the ElasticBoxModel, adding solid displacement,
- * stresses and the process rank to the VTK writer.
- */
- template <class MultiWriter>
- void addOutputVtkFields(const SolutionVector &sol, MultiWriter &writer)
- {
- typedef Dune::BlockVector<Dune::FieldVector<Scalar, 1> > ScalarField;
- typedef Dune::BlockVector<Dune::FieldVector<Scalar, dim> > VectorField;
-
- // create the required scalar fields
- unsigned numDofs = this->numDofs();
- unsigned numElements = this->gridView_().size(0);
-
- ScalarField &ux = *writer.allocateManagedBuffer(numDofs);
- ScalarField &uy = *writer.allocateManagedBuffer(numDofs);
- ScalarField &uz = *writer.allocateManagedBuffer(numDofs);
- VectorField &sigmax = *writer.template allocateManagedBuffer<Scalar, dim>(numElements);
- VectorField &sigmay = *writer.template allocateManagedBuffer<Scalar, dim>(numElements);
- VectorField &sigmaz = *writer.template allocateManagedBuffer<Scalar, dim>(numElements);
-
- // initialize stress fields
- for (unsigned int i = 0; i < numElements; ++i)
- {
- sigmax[i] = 0;
- if (dim > 1)
- {
- sigmay[i] = 0;
- }
- if (dim > 2)
- {
- sigmaz[i] = 0;
- }
- }
-
- ScalarField &rank = *writer.allocateManagedBuffer(numElements);
-
- for (const auto& element : elements(this->gridView_(), Dune::Partitions::interior))
- {
- int eIdx = this->problem_().model().elementMapper().index(element);
- rank[eIdx] = this->gridView_().comm().rank();
-
- // make sure FVElementGeometry and the volume variables are bound to the element
- this->fvGeometries_().bind(element);
- this->curVolVars_().bind(element);
-
- const auto& fvGeometry = this->fvGeometries(element);
- for (const auto& scv : fvGeometry.scvs())
- {
- int dofIdxGlobal = scv.dofIndex();
- const auto& volVars = this->curVolVars(scv);
-
- ux[dofIdxGlobal] = volVars.displacement(0);
- if (dim >= 2)
- uy[dofIdxGlobal] = volVars.displacement(1);
- if (dim >= 3)
- uz[dofIdxGlobal] = volVars.displacement(2);
- }
-
- // In the box method, the stress is evaluated on the FE-Grid. However, to get an
- // average apparent stress for the cell, all contributing stresses have to be interpolated.
- DimMatrix stress(0.0);
- unsigned int counter = 0;
-
- // loop over the faces
- for (const auto& scvFace : fvGeometry.scvfs())
- {
- if (scvFace.boundary())
- {
- BoundaryTypes bcTypes = this->problem_().boundaryTypes(element, scvFace);
- if (bcTypes.hasNeumann())
- continue;
- }
-
- //prepare the flux calculations (set up and prepare geometry, FE gradients)
- FluxVariables fluxVars;
- fluxVars.initAndComputeFluxes(this->problem_(), element, scvFace);
-
- // Add up stresses for each scv face.
- // Beware the sign convention applied here: compressive stresses are negative
- stress += fluxVars.stressTensor();
- counter++;
- }
-
- // divide by the number of added stress tensors and add to container
- stress /= counter;
- sigmax[eIdx] += stress[0];
- if (dim >= 2)
- sigmay[eIdx] += stress[1];
- if (dim == 3)
- sigmaz[eIdx] += stress[2];
- }
- }
-
- writer.attachDofData(ux, "ux", isBox);
- if (dim >= 2)
- writer.attachDofData(uy, "uy", isBox);
- if (dim == 3)
- writer.attachDofData(uz, "uz", isBox);
- writer.attachCellData(sigmax, "stress X", dim);
- if (dim >= 2)
- writer.attachCellData(sigmay, "stress Y", dim);
- if (dim == 3)
- writer.attachCellData(sigmaz, "stress Z", dim);
- }
-};
-}
-#include "propertydefaults.hh"
-#endif
diff --git a/dumux/geomechanics/elastic/properties.hh b/dumux/geomechanics/elastic/properties.hh
deleted file mode 100644
index 36cddaf7231ed1a1348ce19f3d58c82909a0a1da..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/properties.hh
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup ElasticBoxModel
- * \file
- *
- * \brief Defines the properties required for the linear elasticity model.
- */
-
-#ifndef DUMUX_ELASTIC_PROPERTIES_HH
-#define DUMUX_ELASTIC_PROPERTIES_HH
-
-#include <dumux/implicit/properties.hh>
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
-
-namespace Dumux
-{
-// \{
-namespace Properties
-{
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tags for the implicit model for elastic deformations of the medium
-NEW_TYPE_TAG(Elastic, INHERITS_FROM(ImplicitBase));
-
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-
-NEW_PROP_TAG(Indices); //!< Enumerations for the model
-NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
-}
-
-}
-
-#endif
diff --git a/dumux/geomechanics/elastic/propertydefaults.hh b/dumux/geomechanics/elastic/propertydefaults.hh
deleted file mode 100644
index 5377f9d1efb58ef43315e2ee47db3befa35d31c1..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/propertydefaults.hh
+++ /dev/null
@@ -1,106 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup ElasticBoxModel
- * \file
- *
- * \brief Defines some default values for the properties of the
- * linear elasticity model.
- */
-
-
-#ifndef DUMUX_ELASTIC_PROPERTIES_DEFAULTS_HH
-#define DUMUX_ELASTIC_PROPERTIES_DEFAULTS_HH
-
-#include "properties.hh"
-#include "model.hh"
-#include "localresidual.hh"
-#include "volumevariables.hh"
-#include "indices.hh"
-
-#include <dumux/geomechanics/implicit/stressvariables.hh>
-#include <dumux/geomechanics/implicit/stressvariablescache.hh>
-#include <dumux/geomechanics/constitutivelaws/hookeslaw.hh>
-
-namespace Dumux
-{
-// \{
-namespace Properties
-{
-//////////////////////////////////////////////////////////////////
-// Property values
-//////////////////////////////////////////////////////////////////
-
-//!< set the number of equations to the space dimension of the problem
-SET_PROP(Elastic, NumEq)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum{dim = GridView::dimension};
-public:
- static const int value = dim;
-};
-
-//! Use the linear elasticity local residual function for the elasticity model
-SET_TYPE_PROP(Elastic, LocalResidual, ElasticLocalResidual<TypeTag>);
-
-//! define the model
-SET_TYPE_PROP(Elastic, Model, ElasticModel<TypeTag>);
-
-//! define the VolumeVariables
-SET_TYPE_PROP(Elastic, VolumeVariables, ElasticVolumeVariablesBase<TypeTag>);
-
-//! Disable advection
-SET_BOOL_PROP(Elastic, EnableAdvection, false);
-
-//! Disable molecular diffusion
-SET_BOOL_PROP(Elastic, EnableMolecularDiffusion, false);
-
-//! Isothermal model by default
-SET_BOOL_PROP(Elastic, EnableEnergyBalance, false);
-
-//! define the FluxVariables
-SET_PROP(Elastic, FluxVariables)
-{
-private:
- static constexpr bool advection = GET_PROP_VALUE(TypeTag, EnableAdvection);
- static constexpr bool diffusion = GET_PROP_VALUE(TypeTag, EnableMolecularDiffusion);
- static constexpr bool energy = GET_PROP_VALUE(TypeTag, EnableEnergyBalance);
-public:
- typedef Dumux::StressVariables<TypeTag, advection, diffusion, energy> type;
-};
-
-//! Set the indices used by the linear elasticity model
-SET_TYPE_PROP(Elastic, Indices, ElasticIndices<>);
-
-//! enable gravity by default
-SET_BOOL_PROP(Elastic, ProblemEnableGravity, true);
-
-//! The flux variables cache class
-SET_TYPE_PROP(Elastic, FluxVariablesCache, Dumux::StressVariablesCache<TypeTag>);
-
-//! The darcy flux variables
-SET_TYPE_PROP(Elastic, MechanicalLawType, Dumux::HookesLaw<TypeTag>);
-
-}
-}
-
-#endif
diff --git a/dumux/geomechanics/elastic/volumevariables.hh b/dumux/geomechanics/elastic/volumevariables.hh
deleted file mode 100644
index c1e0ad38533da3d6fbce4a3cf0619fbdab94324a..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/elastic/volumevariables.hh
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Quantities required by the linear elasticity box
- * model defined on a vertex.
- */
-#ifndef DUMUX_ELASTIC_VOLUME_VARIABLES_HH
-#define DUMUX_ELASTIC_VOLUME_VARIABLES_HH
-
-#include <dumux/implicit/volumevariables.hh>
-
-#include "properties.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup ElasticBoxModel
- * \ingroup ImplicitVolumeVariables
- * \brief Contains the quantities which are constant within a
- * finite volume in the linear elasticity model.
- */
-template <class TypeTag>
-class ElasticVolumeVariablesBase : public ImplicitVolumeVariables<TypeTag>
-{
- typedef ImplicitVolumeVariables<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GridView::template Codim<0>::Entity Element;
- enum{
- dim = GridView::dimension,
- };
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<Scalar,dim> DimVector;
-
-public:
- /*!
- * \copydoc ImplicitVolumeVariables::update
- */
- void update(const PrimaryVariables &priVars,
- const Problem &problem,
- const Element &element,
- const SubControlVolume& scv)
- {
- ParentType::update(priVars,
- problem,
- element,
- scv);
-
- primaryVars_ = priVars;
-
- for (int i = 0; i < dim; ++i)
- displacement_[i] = priVars[Indices::u(i)];
-
- // retrieve Lame parameters and rock density from spatialParams
- const Dune::FieldVector<Scalar, 2> &lameParams = problem.spatialParams().lameParams(element, scv);
- lambda_ = lameParams[0];
- mu_ = lameParams[1];
- rockDensity_ = problem.spatialParams().rockDensity(element, scv);
- }
-
- /*!
- * \brief Return the vector of primary variables
- */
- const PrimaryVariables &primaryVars() const
- { return primaryVars_; }
-
- /*!
- * \brief Sets the evaluation point used in the by the local jacobian.
- */
- void setEvalPoint(const Implementation *ep)
- { }
-
- /*!
- * \brief Return the Lame parameter lambda \f$\mathrm{[Pa]}\f$ within the control volume.
- */
- Scalar lambda() const
- { return lambda_; }
-
- /*!
- * \brief Return the Lame parameter mu \f$\mathrm{[Pa]}\f$ within the control volume.
- */
- Scalar mu() const
- { return mu_; }
-
- /*!
- * \brief Returns the rock density \f$\mathrm{[kg / m^3]}\f$ within the control volume .
- */
- Scalar rockDensity() const
- { return rockDensity_; }
-
- /*!
- * \brief Returns the solid displacement \f$\mathrm{[m]}\f$ in space
- * directions dimIdx within the control volume.
- */
- Scalar displacement(int dimIdx) const
- { return displacement_[dimIdx]; }
-
- /*!
- * \brief Returns the solid displacement vector \f$\mathrm{[m]}\f$
- * within the control volume.
- */
- const DimVector &displacement() const
- { return displacement_; }
-
-protected:
- PrimaryVariables primaryVars_;
- DimVector displacement_;
- Scalar lambda_;
- Scalar mu_;
- Scalar rockDensity_;
-};
-
-}
-
-#endif
diff --git a/dumux/geomechanics/implicit/CMakeLists.txt b/dumux/geomechanics/implicit/CMakeLists.txt
deleted file mode 100644
index d41b715ec6c0d12eee53d925d2745a8287925838..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# install headers
-install(FILES
-stressvariables.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/geomechanics/implicit)
\ No newline at end of file
diff --git a/dumux/geomechanics/implicit/stressvariables.hh b/dumux/geomechanics/implicit/stressvariables.hh
deleted file mode 100644
index 8e942038e0cb89ff308c9cdf169ed01d6a9125b3..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/implicit/stressvariables.hh
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief The stress variables
- */
-#ifndef DUMUX_GEOMECHANICS_IMPLICIT_STRESSVARIABLES_HH
-#define DUMUX_GEOMECHANICS_IMPLICIT_STRESSVARIABLES_HH
-
-#include <dumux/implicit/properties.hh>
-#include <dumux/implicit/fluxvariablesbase.hh>
-
-namespace Dumux
-{
-
-namespace Properties
-{
-NEW_PROP_TAG(MechanicalLawType);
-}
-
-/*!
- * \ingroup ImplicitModel
- * \brief the flux variables class
- * specializations are provided for combinations of physical processes
- */
-template<class TypeTag, bool enableAdvection, bool enableMolecularDiffusion, bool enableEnergyBalance>
-class StressVariables {};
-
-/*!
- * \ingroup ImplicitModel
- * \brief Base class for the flux variables
- * Actual flux variables inherit from this class
- */
-template<class TypeTag>
-class StressVariables<TypeTag, false, false, false> : public FluxVariablesBase<TypeTag, StressVariables<TypeTag, false, false, false>>
-{
- using ParentType = FluxVariablesBase<TypeTag, StressVariables<TypeTag, false, false, false>>;
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Element = typename GridView::template Codim<0>::Entity;
- using IndexType = typename GridView::IndexSet::IndexType;
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Stencil = std::vector<IndexType>;
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using MechanicalLawType = typename GET_PROP_TYPE(TypeTag, MechanicalLawType);
-
- enum{ enableFluxVarsCache = GET_PROP_VALUE(TypeTag, EnableFluxVariablesCache) };
- enum { dim = GridView::dimension} ;
-
- typedef Dune::FieldMatrix<Scalar, dim, dim> DimMatrix;
- typedef Dune::FieldVector<Scalar, dim> DimVector;
-
-public:
-
- void initAndComputeFluxes(const Problem& problem,
- const Element& element,
- const SubControlVolumeFace &scvFace)
- {
- ParentType::init(problem, element, scvFace);
- }
-
- Stencil computeStencil(const Problem& problem, const SubControlVolumeFace& scvFace)
- { return MechanicalLawType::stencil(problem, scvFace); }
-
- DimVector stressVector()
- { return MechanicalLawType::stressVector(this->problem(), this->scvFace()); }
-
- DimMatrix stressTensor()
- { return MechanicalLawType::stressTensor(this->problem(), this->scvFace()); }
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/geomechanics/implicit/stressvariablescache.hh b/dumux/geomechanics/implicit/stressvariablescache.hh
deleted file mode 100644
index 67d978d339ca8d8f259cd6963a5046a019c3108d..0000000000000000000000000000000000000000
--- a/dumux/geomechanics/implicit/stressvariablescache.hh
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for the flux variables
- */
-#ifndef DUMUX_GEOMECHANICS_IMPLICIT_STRESSVARIABLESCACHE_HH
-#define DUMUX_GEOMECHANICS_IMPLICIT_STRESSVARIABLESCACHE_HH
-
-#include <dumux/implicit/properties.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup ImplicitModel
- * \brief The stress variables cache classes
- * stores matrices to recover the discplacement on a scv face and stencil
- */
-template<class TypeTag, typename DiscretizationMethod = void>
-class StressVariablesCache
-{};
-
-// specialization for the Box Method
-template<class TypeTag>
-class StressVariablesCache<TypeTag, typename std::enable_if<GET_PROP_VALUE(TypeTag, DiscretizationMethod) == GET_PROP(TypeTag, DiscretizationMethods)::Box>::type >
-{
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using MechanicalLawType = typename GET_PROP_TYPE(TypeTag, MechanicalLawType);
- using Element = typename GridView::template Codim<0>::Entity;
- using IndexType = typename GridView::IndexSet::IndexType;
- using Stencil = std::vector<IndexType>;
-
-public:
- void update(const Problem& problem,
- const Element& element,
- const SubControlVolumeFace &scvFace)
- {
- FluxVariables fluxVars;
- stencil_ = fluxVars.computeStencil(problem, scvFace);
- }
-
- const Stencil& stencil() const
- { return stencil_; }
-
-private:
- Stencil stencil_;
-};
-
-// specialization for the cell centered tpfa method
-template<class TypeTag>
-class StressVariablesCache<TypeTag, typename std::enable_if<GET_PROP_VALUE(TypeTag, DiscretizationMethod) == GET_PROP(TypeTag, DiscretizationMethods)::CCTpfa>::type >
-{
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using MechanicalLawType = typename GET_PROP_TYPE(TypeTag, MechanicalLawType);
- using Element = typename GridView::template Codim<0>::Entity;
- using IndexType = typename GridView::IndexSet::IndexType;
- using Stencil = std::vector<IndexType>;
-
-public:
- void update(const Problem& problem,
- const Element& element,
- const SubControlVolumeFace &scvFace)
- {
- FluxVariables fluxVars;
- stencil_ = fluxVars.computeStencil(problem, scvFace);
- }
-
- const Stencil& stencil() const
- { return stencil_; }
-
-private:
- Stencil stencil_;
-};
-
-} // end namespace
-
-#endif
diff --git a/dumux/implicit/assembler.hh b/dumux/implicit/assembler.hh
deleted file mode 100644
index 9f04175782044cf619a24f32fe22a604b569af7e..0000000000000000000000000000000000000000
--- a/dumux/implicit/assembler.hh
+++ /dev/null
@@ -1,188 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief An assembler for the global Jacobian matrix for fully implicit models.
- */
-#ifndef DUMUX_IMPLICIT_ASSEMBLER_HH
-#define DUMUX_IMPLICIT_ASSEMBLER_HH
-
-#include "properties.hh"
-
-namespace Dumux {
-
-/*!
- * \ingroup ImplicitModel
- * \brief An assembler for the global Jacobian matrix for fully implicit models.
- */
-template<class TypeTag>
-class ImplicitAssembler
-{
- using Implementation = typename GET_PROP_TYPE(TypeTag, JacobianAssembler);
-
- using Model = typename GET_PROP_TYPE(TypeTag, Model);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
- using ElementMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
-
- // copying the jacobian assembler is not a good idea
- ImplicitAssembler(const ImplicitAssembler &);
-
-public:
-
- ImplicitAssembler() : problemPtr_(nullptr)
- {}
-
- /*!
- * \brief Initialize the jacobian assembler.
- *
- * At this point we can assume that all objects in the problem and
- * the model have been allocated. We can not assume that they are
- * fully initialized, though.
- *
- * \param problem The problem object
- */
- void init(Problem& problem)
- {
- problemPtr_ = &problem;
-
- // initialize the BCRS matrix
- asImp_().createMatrix_();
-
- // initialize the jacobian matrix with zeros
- *matrix_ = 0;
-
- // allocate the residual vector
- residual_.resize(problem.model().numDofs());
- }
-
- /*!
- * \brief Assemble the global Jacobian of the residual and the residual for the current solution.
- *
- * The current state of affairs (esp. the previous and the current
- * solutions) is represented by the model object.
- */
- void assemble()
- {
- bool succeeded;
- try {
- asImp_().assemble_();
- succeeded = true;
- if (gridView_().comm().size() > 1)
- succeeded = gridView_().comm().min(succeeded);
- }
- catch (NumericalProblem &e)
- {
- std::cout << "rank " << problem_().gridView().comm().rank()
- << " caught an exception while assembling:" << e.what()
- << "\n";
- succeeded = false;
- if (gridView_().comm().size() > 1)
- succeeded = gridView_().comm().min(succeeded);
- }
-
- if (!succeeded) {
- DUNE_THROW(NumericalProblem,
- "A process did not succeed in linearizing the system");
- }
- }
-
- /*!
- * \brief Return constant reference to global Jacobian matrix.
- */
- const JacobianMatrix& matrix() const
- { return *matrix_; }
- JacobianMatrix& matrix()
- { return *matrix_; }
-
- /*!
- * \brief Return constant reference to global residual vector.
- */
- const SolutionVector& residual() const
- { return residual_; }
- SolutionVector& residual()
- { return residual_; }
-
-protected:
-
- // reset the global linear system of equations. if partial
- // reassemble is enabled, this means that the jacobian matrix must
- // only be erased partially!
- void resetSystem_()
- {
- // reset the right hand side.
- residual_ = 0.0;
-
- // reset the matrix
- (*matrix_) = 0;
- }
-
- // linearize the whole system
- void assemble_()
- {
- asImp_().resetSystem_();
-
- // assemble the elements...
- for (const auto& element : elements(gridView_()))
- this->model_().localJacobian().assemble(element, this->matrix(), this->residual());
- }
-
-protected:
- Problem &problem_()
- { return *problemPtr_; }
- const Problem &problem_() const
- { return *problemPtr_; }
- const Model &model_() const
- { return problem_().model(); }
- Model &model_()
- { return problem_().model(); }
- const GridView &gridView_() const
- { return problem_().gridView(); }
- const VertexMapper &vertexMapper_() const
- { return problem_().vertexMapper(); }
- const ElementMapper &elementMapper_() const
- { return problem_().elementMapper(); }
-
- Problem *problemPtr_;
-
- // the jacobian matrix
- std::shared_ptr<JacobianMatrix> matrix_;
- // the right-hand side
- SolutionVector residual_;
-
-private:
-
- // Construct the BCRS matrix for the global jacobian
- void createMatrix_()
- {
- DUNE_THROW(Dune::NotImplemented, "Actual implementation does not provide a createMatrix_() method!");
- }
-
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
-};
-
-} // namespace Dumux
-
-#endif
diff --git a/dumux/implicit/box/assembler.hh b/dumux/implicit/box/assembler.hh
deleted file mode 100644
index fa34084202f19163adf2d7863de507ca4b384b7e..0000000000000000000000000000000000000000
--- a/dumux/implicit/box/assembler.hh
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief An assembler for the global Jacobian matrix for fully implicit models.
- */
-#ifndef DUMUX_BOX_ASSEMBLER_HH
-#define DUMUX_BOX_ASSEMBLER_HH
-
-#include <dune/istl/matrixindexset.hh>
-
-#include <dumux/implicit/properties.hh>
-#include <dumux/implicit/assembler.hh>
-
-namespace Dumux {
-
-/*!
- * \ingroup ImplicitModel
- * \brief An assembler for the global Jacobian matrix for fully implicit models.
- */
-template<class TypeTag>
-class BoxAssembler : public ImplicitAssembler<TypeTag>
-{
- friend class ImplicitAssembler<TypeTag>;
- using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- static const int dim = GridView::dimension;
-
- void createMatrix_()
- {
- const auto numDofs = this->problem_().model().numDofs();
-
- // allocate raw matrix
- this->matrix_ = std::make_shared<JacobianMatrix>(numDofs, numDofs, JacobianMatrix::random);
-
- // get occupation pattern of the matrix
- Dune::MatrixIndexSet occupationPattern;
- occupationPattern.resize(numDofs, numDofs);
-
- for (const auto& element : elements(this->problem_().gridView()))
- {
- for (unsigned int vIdx = 0; vIdx < element.subEntities(dim); ++vIdx)
- {
- const auto globalI = this->problem_().vertexMapper().subIndex(element, vIdx, dim);
- for (unsigned int vIdx2 = vIdx; vIdx2 < element.subEntities(dim); ++vIdx2)
- {
- const auto globalJ = this->problem_().vertexMapper().subIndex(element, vIdx2, dim);
- occupationPattern.add(globalI, globalJ);
- occupationPattern.add(globalJ, globalI);
- }
- }
- }
- // export pattern to matrix
- occupationPattern.exportIdx(*this->matrix_);
- }
-};
-
-} // namespace Dumux
-
-#endif
diff --git a/dumux/implicit/box/elementboundarytypes.hh b/dumux/implicit/box/elementboundarytypes.hh
index d24c76827ba5dc933415daf5ef526a53373ad0fa..80d7ecd845483379fcb43add335f42362abda67b 100644
--- a/dumux/implicit/box/elementboundarytypes.hh
+++ b/dumux/implicit/box/elementboundarytypes.hh
@@ -23,8 +23,6 @@
#ifndef DUMUX_BOX_ELEMENT_BOUNDARY_TYPES_HH
#define DUMUX_BOX_ELEMENT_BOUNDARY_TYPES_HH
-#include "properties.hh"
-
#include <dumux/common/valgrind.hh>
namespace Dumux
@@ -94,7 +92,7 @@ public:
int scvIdxLocal = scv.indexInElement();
(*this)[scvIdxLocal].reset();
- if (problem.model().onBoundary(scv))
+ if (fvGeometry.fvGridGeometry().dofOnBoundary(scv.dofIndex()))
{
(*this)[scvIdxLocal] = problem.boundaryTypes(element, scv);
diff --git a/dumux/implicit/box/localjacobian.hh b/dumux/implicit/box/localjacobian.hh
deleted file mode 100644
index 7bc58332fd8f2139301ff9b46695df3ac3852acf..0000000000000000000000000000000000000000
--- a/dumux/implicit/box/localjacobian.hh
+++ /dev/null
@@ -1,318 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Caculates the Jacobian of the local residual for fully-implicit box models
- */
-#ifndef DUMUX_IMPLICIT_BOX_LOCAL_JACOBIAN_HH
-#define DUMUX_IMPLICIT_BOX_LOCAL_JACOBIAN_HH
-
-#include <dune/istl/io.hh>
-#include <dune/istl/matrix.hh>
-
-#include <dumux/common/math.hh>
-#include <dumux/common/valgrind.hh>
-
-#include <dumux/implicit/properties.hh>
-#include <dumux/implicit/localjacobian.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup ImplicitLocalJacobian
- * \brief Calculates the Jacobian of the local residual for fully-implicit models
- *
- * The default behavior is to use numeric differentiation, i.e.
- * forward or backward differences (2nd order), or central
- * differences (3rd order). The method used is determined by the
- * "NumericDifferenceMethod" property:
- *
- * - if the value of this property is smaller than 0, backward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x) - f(x - \epsilon)}{\epsilon}
- * \f]
- *
- * - if the value of this property is 0, central
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x - \epsilon)}{2 \epsilon}
- * \f]
- *
- * - if the value of this property is larger than 0, forward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x)}{\epsilon}
- * \f]
- *
- * Here, \f$ f \f$ is the residual function for all equations, \f$x\f$
- * is the value of a sub-control volume's primary variable at the
- * evaluation point and \f$\epsilon\f$ is a small value larger than 0.
- */
-template<class TypeTag>
-class BoxLocalJacobian : public ImplicitLocalJacobian<TypeTag>
-{
- using ParentType = ImplicitLocalJacobian<TypeTag>;
- using Implementation = typename GET_PROP_TYPE(TypeTag, LocalJacobian);
- using LocalResidual = typename GET_PROP_TYPE(TypeTag, LocalResidual);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Model = typename GET_PROP_TYPE(TypeTag, Model);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Element = typename GridView::template Codim<0>::Entity;
- using JacobianAssembler = typename GET_PROP_TYPE(TypeTag, JacobianAssembler);
-
- enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
- dim = GridView::dimension,
- };
-
- using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
- using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
-
-public:
- BoxLocalJacobian()
- {
- numericDifferenceMethod_ = GET_PARAM_FROM_GROUP(TypeTag, int, Implicit, NumericDifferenceMethod);
- }
-
- /*!
- * \brief Assemble an element's local Jacobian matrix of the
- * defect.
- *
- * \param element The DUNE Codim<0> entity which we look at.
- */
- void assemble(const Element& element,
- JacobianMatrix& matrix,
- SolutionVector& residual)
- {
- // prepare the volvars/fvGeometries for the case when caching is disabled
- auto fvGeometry = localView(this->problem_().model().fvGridGeometry());
- fvGeometry.bind(element);
-
- auto curElemVolVars = localView(this->model_().curGlobalVolVars());
- curElemVolVars.bind(element, fvGeometry, this->model_().curSol());
-
- auto prevElemVolVars = localView(this->model_().prevGlobalVolVars());
- prevElemVolVars.bindElement(element, fvGeometry, this->model_().prevSol());
-
- auto elemFluxVarsCache = localView(this->model_().globalFluxVarsCache());
- elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
-
- // the element boundary types
- ElementBoundaryTypes elemBcTypes;
- elemBcTypes.update(this->problem_(), element, fvGeometry);
-
- // the element solution
- auto curElemSol = this->model_().elementSolution(element, this->model_().curSol());
-
- // calculate the actual element residual
- this->localResidual().eval(element, fvGeometry, prevElemVolVars, curElemVolVars, elemBcTypes, elemFluxVarsCache);
- this->residual_ = this->localResidual().residual();
-
- this->model_().updatePVWeights(fvGeometry);
-
- // calculation of the derivatives
- for (auto&& scv : scvs(fvGeometry))
- {
- // dof index and corresponding actual pri vars
- const auto dofIdx = scv.dofIndex();
- auto& curVolVars = getCurVolVars(curElemVolVars, scv);
- VolumeVariables origVolVars(curVolVars);
-
- // add precalculated residual for this scv into the global container
- residual[dofIdx] += this->residual_[scv.indexInElement()];
-
- // calculate derivatives w.r.t to the privars at the dof at hand
- for (int pvIdx = 0; pvIdx < numEq; pvIdx++)
- {
- evalPartialDerivative_(matrix,
- element,
- fvGeometry,
- prevElemVolVars,
- curElemVolVars,
- curElemSol,
- scv,
- elemBcTypes,
- elemFluxVarsCache,
- pvIdx);
-
- // restore the original state of the scv's volume variables
- curVolVars = origVolVars;
-
- // restore the original element solution
- curElemSol[scv.indexInElement()][pvIdx] = this->model_().curSol()[scv.dofIndex()][pvIdx];
- }
-
- // TODO: what if we have an extended source stencil????
- }
- }
-protected:
- /*!
- * \brief Compute the partial derivatives to a primary variable at
- * an degree of freedom.
- *
- * This method can be overwritten by the implementation if a
- * better scheme than numerical differentiation is available.
- *
- * The default implementation of this method uses numeric
- * differentiation, i.e. forward or backward differences (2nd
- * order), or central differences (3rd order). The method used is
- * determined by the "NumericDifferenceMethod" property:
- *
- * - if the value of this property is smaller than 0, backward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x) - f(x - \epsilon)}{\epsilon}
- * \f]
- *
- * - if the value of this property is 0, central
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x - \epsilon)}{2 \epsilon}
- * \f]
- *
- * - if the value of this property is larger than 0, forward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x)}{\epsilon}
- * \f]
- *
- * Here, \f$ f \f$ is the residual function for all equations, \f$x\f$
- * is the value of a sub-control volume's primary variable at the
- * evaluation point and \f$\epsilon\f$ is a small value larger than 0.
- *
- * \param partialDeriv The vector storing the partial derivatives of all
- * equations
- * \param storageDeriv the mass matrix contributions
- * \param col The block column index of the degree of freedom
- * for which the partial derivative is calculated.
- * Box: a sub-control volume index.
- * Cell centered: a neighbor index.
- * \param pvIdx The index of the primary variable
- * for which the partial derivative is calculated
- */
- void evalPartialDerivative_(JacobianMatrix& matrix,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- ElementVolumeVariables& curElemVolVars,
- ElementSolutionVector& curElemSol,
- const SubControlVolume& scv,
- const ElementBoundaryTypes& elemBcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache,
- const int pvIdx)
- {
- const auto dofIdx = scv.dofIndex();
- auto& volVars = getCurVolVars(curElemVolVars, scv);
-
- ElementSolutionVector partialDeriv(element.subEntities(dim));
- Scalar eps = this->numericEpsilon(volVars.priVar(pvIdx));
- Scalar delta = 0;
-
- // calculate the residual with the forward deflected primary variables
- if (numericDifferenceMethod_ >= 0)
- {
- // we are not using backward differences, i.e. we need to
- // calculate f(x + \epsilon)
-
- // deflect primary variables
- curElemSol[scv.indexInElement()][pvIdx] += eps;
- delta += eps;
-
- // update the volume variables connected to the dof
- volVars.update(curElemSol, this->problem_(), element, scv);
-
- // calculate the deflected residual
- this->localResidual().eval(element, fvGeometry, prevElemVolVars, curElemVolVars, elemBcTypes, elemFluxVarsCache);
-
- // store the residual
- partialDeriv = this->localResidual().residual();
- }
- else
- {
- // we are using backward differences, i.e. we don't need
- // to calculate f(x + \epsilon) and we can recycle the
- // (already calculated) residual f(x)
- partialDeriv = this->residual_;
- }
-
- if (numericDifferenceMethod_ <= 0)
- {
- // we are not using forward differences, i.e. we
- // need to calculate f(x - \epsilon)
-
- // deflect the primary variables
- curElemSol[scv.indexInElement()][pvIdx] -= delta + eps;
- delta += eps;
-
- // update the volume variables connected to the dof
- volVars.update(curElemSol, this->problem_(), element, scv);
-
- // calculate the deflected residual
- this->localResidual().eval(element, fvGeometry, prevElemVolVars, curElemVolVars, elemBcTypes, elemFluxVarsCache);
-
- // subtract the residual from the derivative storage
- partialDeriv -= this->localResidual().residual();
- }
- else
- {
- // we are using forward differences, i.e. we don't need to
- // calculate f(x - \epsilon) and we can recycle the
- // (already calculated) residual f(x)
- partialDeriv -= this->residual_;
- }
-
- // divide difference in residuals by the magnitude of the
- // deflections between the two function evaluation
- partialDeriv /= delta;
-
- // update the global stiffness matrix with the current partial derivatives
- for (auto&& scvJ : scvs(fvGeometry))
- this->updateGlobalJacobian_(matrix, scvJ.dofIndex(), dofIdx, pvIdx, partialDeriv[scvJ.indexInElement()]);
- }
-
- //! If the global vol vars caching is enabled we have to modify the global volvar object
- template<class T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables>::type&
- getCurVolVars(ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
- { return this->model_().nonConstCurGlobalVolVars().volVars(scv.elementIndex(), scv.indexInElement()); }
-
- //! When global volume variables caching is disabled, return the local volvar object
- template<class T = TypeTag>
- typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables>::type&
- getCurVolVars(ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
- { return elemVolVars[scv]; }
-
-private:
- int numericDifferenceMethod_;
-};
-
-}
-
-#endif
diff --git a/dumux/implicit/box/localresidual.hh b/dumux/implicit/box/localresidual.hh
index f79a9085bb6b2c71d5a61c211908eda79c8f03f4..daaca77e4ad1129863e8d83fffa827b267d5a6ab 100644
--- a/dumux/implicit/box/localresidual.hh
+++ b/dumux/implicit/box/localresidual.hh
@@ -29,8 +29,6 @@
#include <dumux/common/valgrind.hh>
#include <dumux/implicit/localresidual.hh>
-#include "properties.hh"
-
namespace Dumux
{
/*!
@@ -47,6 +45,7 @@ class BoxLocalResidual : public ImplicitLocalResidual<TypeTag>
using ParentType = ImplicitLocalResidual<TypeTag>;
friend class ImplicitLocalResidual<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
enum {
@@ -64,176 +63,82 @@ class BoxLocalResidual : public ImplicitLocalResidual<TypeTag>
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ElementResidualVector = Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, NumEqVector)>;
public:
- // copying the local residual class is not a good idea
- BoxLocalResidual(const BoxLocalResidual &) = delete;
-
- BoxLocalResidual() : ParentType() {}
-
-protected:
-
- void evalFluxes_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const ElementBoundaryTypes& bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ using ParentType::ParentType;
+
+ void evalFlux(ElementResidualVector& residual,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const ElementBoundaryTypes& elemBcTypes,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
{
- // calculate the mass flux over the scv faces and subtract
- for (auto&& scvf : scvfs(fvGeometry))
+ const auto flux = evalFlux(problem, element, fvGeometry, elemVolVars, elemBcTypes, elemFluxVarsCache, scvf);
+ if (!scvf.boundary())
{
- if (!scvf.boundary())
- {
- const auto& insideScv = fvGeometry.scv(scvf.insideScvIdx());
- const auto& outsideScv = fvGeometry.scv(scvf.outsideScvIdx());
-
- auto flux = this->asImp_().computeFlux(element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
-
- this->residual_[insideScv.indexInElement()] += flux;
- this->residual_[outsideScv.indexInElement()] -= flux;
- }
+ const auto& insideScv = fvGeometry.scv(scvf.insideScvIdx());
+ const auto& outsideScv = fvGeometry.scv(scvf.outsideScvIdx());
+ residual[insideScv.indexInElement()] += flux;
+ residual[outsideScv.indexInElement()] -= flux;
}
- }
-
- void evalBoundary_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const ElementBoundaryTypes& bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
- {
- if (bcTypes.hasNeumann() || bcTypes.hasOutflow())
- {
- for (auto&& scvf : scvfs(fvGeometry))
- {
- if (scvf.boundary())
- {
- auto&& scv = fvGeometry.scv(scvf.insideScvIdx());
- this->asImp_().evalBoundaryFluxes_(element, fvGeometry, elemVolVars, scvf, scv, bcTypes[scv.indexInElement()], elemFluxVarsCache);
- }
- }
- }
-
- // additionally treat mixed D/N conditions in a strong sense
- if (bcTypes.hasDirichlet())
+ else
{
- for (auto&& scv : scvs(fvGeometry))
- {
- auto scvBcTypes = bcTypes[scv.indexInElement()];
- if (scvBcTypes.hasDirichlet())
- this->asImp_().evalDirichlet_(element, fvGeometry, elemVolVars, scv, scvBcTypes);
- }
+ const auto& insideScv = fvGeometry.scv(scvf.insideScvIdx());
+ residual[insideScv.indexInElement()] += flux;
}
}
- /*!
- * \brief Set the values of the Dirichlet boundary control volumes
- * of the current element.
- */
- void evalDirichlet_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolume &scv,
- const BoundaryTypes& bcTypes)
+
+ ResidualVector evalFlux(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const ElementBoundaryTypes& elemBcTypes,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
{
- PrimaryVariables dirichletValues = this->problem().dirichlet(element, scv);
+ ResidualVector flux(0.0);
- // set the dirichlet conditions
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
+ // inner faces
+ if (!scvf.boundary())
{
- if (bcTypes.isDirichlet(eqIdx))
- {
- int pvIdx = bcTypes.eqToDirichletIndex(eqIdx);
- assert(0 <= pvIdx && pvIdx < numEq);
- Valgrind::CheckDefined(dirichletValues[pvIdx]);
-
- // get the primary variables
- const auto& priVars = elemVolVars[scv].priVars();
-
- this->residual_[scv.indexInElement()][eqIdx] = priVars[pvIdx] - dirichletValues[pvIdx];
- }
+ flux += this->asImp().computeFlux(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
}
- }
-
- /*!
- * \brief Add all fluxes resulting from Neumann and outflow boundary conditions to the local residual.
- */
- void evalBoundaryFluxes_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace &scvf,
- const SubControlVolume& insideScv,
- const BoundaryTypes& bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
- {
- // evaluate the Neumann conditions at the boundary face
- if (bcTypes.hasNeumann())
- this->residual_[insideScv.indexInElement()] += this->asImp_().evalNeumannSegment_(element, fvGeometry, elemVolVars, scvf, insideScv, bcTypes);
-
- // TODO: evaluate the outflow conditions at the boundary face
- //if (bcTypes.hasOutflow())
- // flux += this->asImp_().evalOutflowSegment_(&intersection, bcTypes);
- }
+ // boundary faces
+ else
+ {
+ const auto& scv = fvGeometry.scv(scvf.insideScvIdx());
+ const auto& bcTypes = elemBcTypes[scv.indexInElement()];
- /*!
- * \brief Add Neumann boundary conditions for a single scv face
- */
- PrimaryVariables evalNeumannSegment_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace &scvf,
- const SubControlVolume& insideScv,
- const BoundaryTypes &bcTypes)
- {
- // temporary vector to store the neumann boundary fluxes
- PrimaryVariables flux(0);
+ // Neumann and Robin ("solution dependent Neumann") boundary conditions
+ if (bcTypes.hasNeumann() && !bcTypes.hasDirichlet())
+ {
+ auto neumannFluxes = problem.neumann(element, fvGeometry, elemVolVars, scvf);
- auto neumannFluxes = this->problem().neumann(element, fvGeometry, elemVolVars, scvf);
+ // multiply neumann fluxes with the area and the extrusion factor
+ neumannFluxes *= scvf.area()*elemVolVars[scv].extrusionFactor();
- // multiply neumann fluxes with the area and the extrusion factor
- neumannFluxes *= scvf.area()*elemVolVars[insideScv].extrusionFactor();
+ flux += neumannFluxes;
+ }
- // add fluxes to the temporary vector
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
- if (bcTypes.isNeumann(eqIdx))
- flux[eqIdx] += neumannFluxes[eqIdx];
+ // for Dirichlet there is no addition to the residual here but they
+ // are enforced strongly by replacing the residual entry afterwards
+ else if (bcTypes.hasDirichlet() && !bcTypes.hasNeumann())
+ return flux;
+ else
+ DUNE_THROW(Dune::NotImplemented, "Mixed boundary conditions. Use pure boundary conditions by converting Dirichlet BCs to Robin BCs");
+ }
return flux;
}
-
- /*!
- * \brief Add outflow boundary conditions for a single sub-control
- * volume face to the local residual.
- *
- * \param isIt The intersection iterator of current element
- * \param scvIdx The index of the considered face of the sub-control volume
- * \param boundaryFaceIdx The index of the considered boundary face of the sub control volume
- */
- // template <class IntersectionIterator>
- // void evalOutflowSegment_(const IntersectionIterator &isIt,
- // const int scvIdx,
- // const int boundaryFaceIdx)
- // {
- // const BoundaryTypes &bcTypes = this->bcTypes_(scvIdx);
- // // deal with outflow boundaries
- // if (bcTypes.hasOutflow())
- // {
- // //calculate outflow fluxes
- // PrimaryVariables values(0.0);
- // this->asImp_().computeFlux(values, boundaryFaceIdx, true);
- // Valgrind::CheckDefined(values);
-
- // for (int equationIdx = 0; equationIdx < numEq; ++equationIdx)
- // {
- // if (!bcTypes.isOutflow(equationIdx) )
- // continue;
- // // deduce outflow
- // this->residual_[scvIdx][equationIdx] += values[equationIdx];
- // }
- // }
- // }
};
-}
+} // end namespace Dumux
#endif
diff --git a/dumux/implicit/box/propertydefaults.hh b/dumux/implicit/box/propertydefaults.hh
deleted file mode 100644
index e680c40379564661eeb68fc9ea16dee830cce09e..0000000000000000000000000000000000000000
--- a/dumux/implicit/box/propertydefaults.hh
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup BoxModel
- * \file
- * \brief Default properties for box models
- */
-#ifndef DUMUX_BOX_PROPERTY_DEFAULTS_HH
-#define DUMUX_BOX_PROPERTY_DEFAULTS_HH
-
-#include <dumux/implicit/propertydefaults.hh>
-#include <dumux/discretization/box/subcontrolvolume.hh>
-#include <dumux/discretization/box/subcontrolvolumeface.hh>
-#include <dumux/discretization/box/globalfluxvariablescache.hh>
-#include <dumux/discretization/box/elementfluxvariablescache.hh>
-#include <dumux/discretization/box/globalvolumevariables.hh>
-#include <dumux/discretization/box/elementvolumevariables.hh>
-#include <dumux/discretization/box/fvgridgeometry.hh>
-#include <dumux/discretization/box/fvelementgeometry.hh>
-#include <dumux/porousmediumflow/implicit/fluxvariablescache.hh>
-#include <dumux/discretization/methods.hh>
-
-#include "elementboundarytypes.hh"
-#include "localresidual.hh"
-#include "localjacobian.hh"
-#include "assembler.hh"
-#include "properties.hh"
-
-namespace Dumux {
-
-/*!
- * \brief The box model combines the advantages of the finite-volume (FV) and finite-element (FE) methods on a dual grid
- */
-// forward declarations
-template<class TypeTag> class BoxLocalResidual;
-template<class TypeTag> class BoxElementBoundaryTypes;
-
-namespace Properties {
-//! Set the corresponding discretization method property
-SET_PROP(BoxModel, DiscretizationMethod)
-{
- static const DiscretizationMethods value = DiscretizationMethods::Box;
-};
-
-//! Set the default for the FVElementGeometry vector
-SET_TYPE_PROP(BoxModel, FVGridGeometry, BoxFVGridGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
-
-//! Set the default for the FVElementGeometry vector
-SET_TYPE_PROP(BoxModel, FVElementGeometry, BoxFVElementGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
-
-//! The sub control volume
-SET_PROP(BoxModel, SubControlVolume)
-{
-private:
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Scalar = typename GridView::ctype;
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
- using ScvGeometry = Dune::MultiLinearGeometry<Scalar, dim, dimWorld>;
- using IndexType = typename GridView::IndexSet::IndexType;
-public:
- using type = BoxSubControlVolume<ScvGeometry, IndexType>;
-};
-
-SET_PROP(BoxModel, SubControlVolumeFace)
-{
-private:
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Scalar = typename GridView::ctype;
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
- using ScvfGeometry = Dune::MultiLinearGeometry<Scalar, dim-1, dimWorld>;
- using IndexType = typename GridView::IndexSet::IndexType;
-public:
- using type = BoxSubControlVolumeFace<ScvfGeometry, IndexType>;
-};
-
-//! Set the default for the ElementBoundaryTypes
-SET_TYPE_PROP(BoxModel, ElementBoundaryTypes, BoxElementBoundaryTypes<TypeTag>);
-
-//! Mapper for the degrees of freedoms.
-SET_TYPE_PROP(BoxModel, DofMapper, typename GET_PROP_TYPE(TypeTag, VertexMapper));
-
-//! The global volume variables vector class
-SET_TYPE_PROP(BoxModel, GlobalVolumeVariables, BoxGlobalVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
-
-//! The element volume variables vector class
-SET_TYPE_PROP(BoxModel, ElementVolumeVariables, BoxElementVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
-
-//! The global flux variables cache vector class
-SET_TYPE_PROP(BoxModel, GlobalFluxVariablesCache, BoxGlobalFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
-
-//! The local flux variables cache vector class
-SET_TYPE_PROP(BoxModel, ElementFluxVariablesCache, BoxElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
-
-//! Set the BaseLocalResidual to BoxLocalResidual
-SET_TYPE_PROP(BoxModel, BaseLocalResidual, BoxLocalResidual<TypeTag>);
-
-//! Assembler for the global jacobian matrix
-SET_TYPE_PROP(BoxModel, JacobianAssembler, BoxAssembler<TypeTag>);
-
-//! The local jacobian operator
-SET_TYPE_PROP(BoxModel, LocalJacobian, BoxLocalJacobian<TypeTag>);
-
-//! indicate that this is a box discretization
-SET_BOOL_PROP(BoxModel, ImplicitIsBox, true);
-
-} // namespace Properties
-} // namespace Dumux
-
-#endif
diff --git a/dumux/implicit/cellcentered/assembler.hh b/dumux/implicit/cellcentered/assembler.hh
deleted file mode 100644
index 77998625eaa8ed80369c2edefe1b868caffd1f87..0000000000000000000000000000000000000000
--- a/dumux/implicit/cellcentered/assembler.hh
+++ /dev/null
@@ -1,74 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief An assembler for the global Jacobian matrix for fully implicit models.
- */
-#ifndef DUMUX_CC_ASSEMBLER_HH
-#define DUMUX_CC_ASSEMBLER_HH
-
-#include <dune/istl/matrixindexset.hh>
-
-#include <dumux/implicit/properties.hh>
-#include <dumux/implicit/assembler.hh>
-
-namespace Dumux {
-
-/*!
- * \ingroup ImplicitModel
- * \brief An assembler for the global Jacobian matrix for fully implicit models.
- */
-template<class TypeTag>
-class CCAssembler : public ImplicitAssembler<TypeTag>
-{
- friend class ImplicitAssembler<TypeTag>;
- using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
-
- void createMatrix_()
- {
- const auto numDofs = this->problem_().model().numDofs();
-
- // allocate raw matrix
- this->matrix_ = std::make_shared<JacobianMatrix>(numDofs, numDofs, JacobianMatrix::random);
-
- // get occupation pattern of the matrix
- Dune::MatrixIndexSet occupationPattern;
- occupationPattern.resize(numDofs, numDofs);
-
- const auto& assemblyMap = this->problem_().model().localJacobian().assemblyMap();
- for (unsigned int globalI = 0; globalI < numDofs; ++globalI)
- {
- occupationPattern.add(globalI, globalI);
- for (const auto& dataJ : assemblyMap[globalI])
- occupationPattern.add(dataJ.globalJ, globalI);
-
- // reserve index for additional user defined DOF dependencies
- const auto& additionalDofDependencies = this->problem_().getAdditionalDofDependencies(globalI);
- for (auto globalJ : additionalDofDependencies)
- occupationPattern.add(globalI, globalJ);
- }
-
- // export pattern to matrix
- occupationPattern.exportIdx(*this->matrix_);
- }
-};
-
-} // namespace Dumux
-
-#endif
diff --git a/dumux/implicit/cellcentered/elementboundarytypes.hh b/dumux/implicit/cellcentered/elementboundarytypes.hh
index 606a9e503d609359a6c08b35b4b5c9063a6f1ed2..5f7387e905dd9f43202be6cf00028b7e26ebbf3d 100644
--- a/dumux/implicit/cellcentered/elementboundarytypes.hh
+++ b/dumux/implicit/cellcentered/elementboundarytypes.hh
@@ -23,8 +23,6 @@
#ifndef DUMUX_CC_ELEMENT_BOUNDARY_TYPES_HH
#define DUMUX_CC_ELEMENT_BOUNDARY_TYPES_HH
-#include "properties.hh"
-
#include <dumux/common/valgrind.hh>
namespace Dumux
@@ -36,37 +34,14 @@ namespace Dumux
* \brief This class stores an array of BoundaryTypes objects
*/
template<class TypeTag>
-class CCElementBoundaryTypes : public std::vector<typename GET_PROP_TYPE(TypeTag, BoundaryTypes)>
+class CCElementBoundaryTypes
{
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef std::vector<BoundaryTypes> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-
- typedef typename GridView::template Codim<0>::Entity Element;
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using Element = typename GridView::template Codim<0>::Entity;
public:
- /*!
- * \brief Copy constructor.
- *
- * Copying a the boundary types of an element should be explicitly
- * requested
- */
- explicit CCElementBoundaryTypes(const CCElementBoundaryTypes &v)
- : ParentType(v)
- {}
-
- /*!
- * \brief Default constructor.
- */
- CCElementBoundaryTypes()
- {
- hasDirichlet_ = false;
- hasNeumann_ = false;
- hasOutflow_ = false;
- }
/*!
* \brief Update the boundary types for all vertices of an element.
@@ -78,59 +53,7 @@ public:
void update(const Problem &problem,
const Element &element,
const FVElementGeometry &fvGeometry)
- {
- this->resize(1);
-
- hasDirichlet_ = false;
- hasNeumann_ = false;
- hasOutflow_ = false;
-
- (*this)[0].reset();
-
- for (auto&& scv : scvs(fvGeometry))
- {
- if (!problem.model().onBoundary(scv))
- return;
-
- for (auto&& scvFace : scvfs(fvGeometry))
- {
- if (!scvFace.boundary())
- continue;
-
- (*this)[0] = problem.boundaryTypes(element, scvFace);
-
- hasDirichlet_ = hasDirichlet_ || (*this)[0].hasDirichlet();
- hasNeumann_ = hasNeumann_ || (*this)[0].hasNeumann();
- hasOutflow_ = hasOutflow_ || (*this)[0].hasOutflow();
- }
- }
- }
-
- /*!
- * \brief Returns whether the element has a vertex which contains
- * a Dirichlet value.
- */
- bool hasDirichlet() const
- { return hasDirichlet_; }
-
- /*!
- * \brief Returns whether the element potentially features a
- * Neumann boundary segment.
- */
- bool hasNeumann() const
- { return hasNeumann_; }
-
- /*!
- * \brief Returns whether the element potentially features an
- * outflow boundary segment.
- */
- bool hasOutflow() const
- { return hasOutflow_; }
-
-protected:
- bool hasDirichlet_;
- bool hasNeumann_;
- bool hasOutflow_;
+ {}
};
} // namespace Dumux
diff --git a/dumux/implicit/cellcentered/localjacobian.hh b/dumux/implicit/cellcentered/localjacobian.hh
deleted file mode 100644
index 11e3114eaf18dd822d52880380880c2d7573a2c9..0000000000000000000000000000000000000000
--- a/dumux/implicit/cellcentered/localjacobian.hh
+++ /dev/null
@@ -1,499 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Caculates the Jacobian of the local residual for fully-implicit models
- */
-#ifndef DUMUX_CC_LOCAL_JACOBIAN_HH
-#define DUMUX_CC_LOCAL_JACOBIAN_HH
-
-#include <dune/istl/io.hh>
-#include <dune/istl/matrix.hh>
-
-#include <dumux/common/math.hh>
-#include <dumux/common/valgrind.hh>
-
-#include <dumux/implicit/properties.hh>
-#include <dumux/implicit/localjacobian.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup ImplicitLocalJacobian
- * \brief Calculates the Jacobian of the local residual for fully-implicit models
- *
- * The default behavior is to use numeric differentiation, i.e.
- * forward or backward differences (2nd order), or central
- * differences (3rd order). The method used is determined by the
- * "NumericDifferenceMethod" property:
- *
- * - if the value of this property is smaller than 0, backward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x) - f(x - \epsilon)}{\epsilon}
- * \f]
- *
- * - if the value of this property is 0, central
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x - \epsilon)}{2 \epsilon}
- * \f]
- *
- * - if the value of this property is larger than 0, forward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x)}{\epsilon}
- * \f]
- *
- * Here, \f$ f \f$ is the residual function for all equations, \f$x\f$
- * is the value of a sub-control volume's primary variable at the
- * evaluation point and \f$\epsilon\f$ is a small value larger than 0.
- */
-template<class TypeTag>
-class CCLocalJacobian : public ImplicitLocalJacobian<TypeTag>
-{
- using ParentType = ImplicitLocalJacobian<TypeTag>;
- using Implementation = typename GET_PROP_TYPE(TypeTag, LocalJacobian);
- using LocalResidual = typename GET_PROP_TYPE(TypeTag, LocalResidual);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
-
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
- using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
- using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using AssemblyMap = typename GET_PROP_TYPE(TypeTag, AssemblyMap);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Element = typename GridView::template Codim<0>::Entity;
- using IndexType = typename GridView::IndexSet::IndexType;
-
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
-
-public:
-
- CCLocalJacobian() : ParentType()
- {
- numericDifferenceMethod_ = GET_PARAM_FROM_GROUP(TypeTag, int, Implicit, NumericDifferenceMethod);
- }
-
- /*!
- * \brief Initialize the local Jacobian object.
- *
- * At this point we can assume that everything has been allocated,
- * although some objects may not yet be completely initialized.
- *
- * \param problem The problem which we want to simulate.
- */
- void init(Problem &problem)
- {
- ParentType::init(problem);
-
- assemblyMap_.init(problem);
- }
-
- /*!
- * \brief Assemble an element's local Jacobian matrix of the
- * defect.
- *
- * \param element The DUNE Codim<0> entity which we look at.
- */
- void assemble(const Element& element, JacobianMatrix& matrix, SolutionVector& residual)
- {
- const bool isGhost = (element.partitionType() == Dune::GhostEntity);
-
- // prepare the volvars/fvGeometries in case caching is disabled
- auto fvGeometry = localView(this->model_().fvGridGeometry());
- fvGeometry.bind(element);
-
- auto curElemVolVars = localView(this->model_().curGlobalVolVars());
- curElemVolVars.bind(element, fvGeometry, this->model_().curSol());
-
- auto prevElemVolVars = localView(this->model_().prevGlobalVolVars());
- prevElemVolVars.bindElement(element, fvGeometry, this->model_().prevSol());
-
- auto elemFluxVarsCache = localView(this->model_().globalFluxVarsCache());
- elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
-
- // set the actual dof index
- globalI_ = this->problem_().elementMapper().index(element);
-
- // check for boundaries on the element
- ElementBoundaryTypes elemBcTypes;
- elemBcTypes.update(this->problem_(), element, fvGeometry);
-
- // calculate the local residual
- if (isGhost)
- {
- this->residual_ = 0.0;
- residual[globalI_] = 0.0;
- }
- else
- {
- this->localResidual().eval(element,
- fvGeometry,
- prevElemVolVars,
- curElemVolVars,
- elemBcTypes,
- elemFluxVarsCache);
- this->residual_ = this->localResidual().residual();
- // store residual in global container as well
- residual[globalI_] = this->localResidual().residual(0);
- }
-
- this->model_().updatePVWeights(fvGeometry);
-
- // calculate derivatives of all dofs in stencil with respect to the dofs in the element
- evalPartialDerivatives_(element,
- fvGeometry,
- prevElemVolVars,
- curElemVolVars,
- elemFluxVarsCache,
- elemBcTypes,
- matrix,
- residual,
- isGhost);
-
- // compute derivatives with respect to additional user defined DOF dependencies
- const auto& additionalDofDepedencies = this->problem_().getAdditionalDofDependencies(globalI_);
- if (!additionalDofDepedencies.empty() && !isGhost)
- {
- evalAdditionalDerivatives_(additionalDofDepedencies,
- element,
- fvGeometry,
- curElemVolVars,
- matrix,
- residual);
- }
- }
-
- const AssemblyMap& assemblyMap() const
- { return assemblyMap_; }
-
-protected:
- void evalPartialDerivatives_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- ElementVolumeVariables& curElemVolVars,
- ElementFluxVariablesCache& elemFluxVarsCache,
- const ElementBoundaryTypes& elemBcTypes,
- JacobianMatrix& matrix,
- SolutionVector& residual,
- const bool isGhost)
- {
- // get stencil informations
- const auto numNeighbors = assemblyMap_[globalI_].size();
-
- // container to store the neighboring elements
- std::vector<Element> neighborElements;
- neighborElements.reserve(numNeighbors);
-
- // get the elements and calculate the flux into the element in the undeflected state
- Dune::BlockVector<PrimaryVariables> origFlux(numNeighbors);
- origFlux = 0.0;
-
- unsigned int j = 0;
- for (const auto& dataJ : assemblyMap_[globalI_])
- {
- auto elementJ = fvGeometry.fvGridGeometry().element(dataJ.globalJ);
- neighborElements.push_back(elementJ);
-
- for (auto scvfIdx : dataJ.scvfsJ)
- {
- auto&& scvf = fvGeometry.scvf(scvfIdx);
- origFlux[j] += this->localResidual().evalFlux_(elementJ,
- fvGeometry,
- curElemVolVars,
- scvf,
- elemFluxVarsCache);
- }
-
- ++j;
- }
-
- auto&& scv = fvGeometry.scv(globalI_);
- auto& curSol = this->model_().curSol();
- auto& curVolVars = getCurVolVars(curElemVolVars, scv);
-
- // save a copy of the original privars and vol vars in order
- // to restore the original solution after deflection
- const auto origPriVars = curSol[globalI_];
- const auto origVolVars = curVolVars;
-
- // derivatives in the neighbors with repect to the current elements
- Dune::BlockVector<PrimaryVariables> neighborDeriv(numNeighbors);
- for (int pvIdx = 0; pvIdx < numEq; pvIdx++)
- {
- // derivatives of element dof with respect to itself
- PrimaryVariables partialDeriv(0.0);
-
- if (isGhost)
- partialDeriv[pvIdx] = 1.0;
-
- neighborDeriv = 0.0;
-
- Scalar eps = this->numericEpsilon(curVolVars.priVar(pvIdx));
- Scalar delta = 0;
-
- if (numericDifferenceMethod_ >= 0)
- {
- // we are not using backward differences, i.e. we need to
- // calculate f(x + \epsilon)
-
- // deflect primary variables
- curSol[globalI_][pvIdx] += eps;
- delta += eps;
-
- // update the volume variables and the flux var cache
- curVolVars.update(this->model_().elementSolution(element, curSol), this->problem_(), element, scv);
- elemFluxVarsCache.update(element, fvGeometry, curElemVolVars);
-
- if (!isGhost)
- {
- // calculate the residual with the deflected primary variables
- this->localResidual().eval(element,
- fvGeometry,
- prevElemVolVars,
- curElemVolVars,
- elemBcTypes,
- elemFluxVarsCache);
-
- // store the residual and the storage term
- partialDeriv = this->localResidual().residual(0);
- }
-
- // calculate the fluxes into element with the deflected primary variables
- for (std::size_t k = 0; k < numNeighbors; ++k)
- {
- for (auto scvfIdx : assemblyMap_[globalI_][k].scvfsJ)
- {
- auto&& scvf = fvGeometry.scvf(scvfIdx);
- neighborDeriv[k] += this->localResidual().evalFlux_(neighborElements[k],
- fvGeometry,
- curElemVolVars,
- scvf,
- elemFluxVarsCache);
- }
- }
- }
- else
- {
- // we are using backward differences, i.e. we don't need
- // to calculate f(x + \epsilon) and we can recycle the
- // (already calculated) residual f(x)
- if (!isGhost)
- partialDeriv = this->residual(0);
- neighborDeriv = origFlux;
- }
-
- if (numericDifferenceMethod_ <= 0)
- {
- // we are not using forward differences, i.e. we
- // need to calculate f(x - \epsilon)
-
- // deflect the primary variables
- curSol[globalI_][pvIdx] -= delta + eps;
- delta += eps;
-
- // update the volume variables and the flux var cache
- curVolVars.update(this->model_().elementSolution(element, curSol), this->problem_(), element, scv);
- elemFluxVarsCache.update(element, fvGeometry, curElemVolVars);
-
- if (!isGhost)
- {
- // calculate the residual with the deflected primary variables
- this->localResidual().eval(element,
- fvGeometry,
- prevElemVolVars,
- curElemVolVars,
- elemBcTypes,
- elemFluxVarsCache);
-
- // subtract the residual from the derivative storage
- partialDeriv -= this->localResidual().residual(0);
- }
-
- // calculate the fluxes into element with the deflected primary variables
- for (std::size_t k = 0; k < numNeighbors; ++k)
- {
- for (auto scvfIdx : assemblyMap_[globalI_][k].scvfsJ)
- {
- auto&& scvf = fvGeometry.scvf(scvfIdx);
- neighborDeriv[k] -= this->localResidual().evalFlux_(neighborElements[k],
- fvGeometry,
- curElemVolVars,
- scvf,
- elemFluxVarsCache);
- }
- }
- }
- else
- {
- // we are using forward differences, i.e. we don't need to
- // calculate f(x - \epsilon) and we can recycle the
- // (already calculated) residual f(x)
- if (!isGhost)
- partialDeriv -= this->residual(0);
- neighborDeriv -= origFlux;
- }
-
- // divide difference in residuals by the magnitude of the
- // deflections between the two function evaluation
- if (!isGhost)
- partialDeriv /= delta;
- neighborDeriv /= delta;
-
- // restore the original state of the scv's volume variables
- curVolVars = origVolVars;
-
- // restore the current element solution
- curSol[globalI_] = origPriVars;
-
- // update the global jacobian matrix with the current partial derivatives
- this->updateGlobalJacobian_(matrix, globalI_, globalI_, pvIdx, partialDeriv);
-
- j = 0;
- for (const auto& dataJ : assemblyMap_[globalI_])
- this->updateGlobalJacobian_(matrix, dataJ.globalJ, globalI_, pvIdx, neighborDeriv[j++]);
- }
- }
-
- void evalAdditionalDerivatives_(const std::vector<IndexType>& additionalDofDependencies,
- const Element& element,
- const FVElementGeometry& fvGeometry,
- ElementVolumeVariables& curElemVolVars,
- JacobianMatrix& matrix,
- SolutionVector& residual)
- {
- // get the elements and calculate the flux into the element in the undeflected state
- auto&& scv = fvGeometry.scv(globalI_);
- auto source = this->localResidual().computeSource(element, fvGeometry, curElemVolVars, scv);
- const auto& curVolVarsI = curElemVolVars[scv];
- source *= -scv.volume()*curVolVarsI.extrusionFactor();
-
- for (auto globalJ : additionalDofDependencies)
- {
- auto&& scvJ = fvGeometry.scv(globalJ);
- auto& curVolVarsJ = getCurVolVars(curElemVolVars, scvJ);
- const auto& elementJ = fvGeometry.fvGridGeometry().element(globalJ);
- auto& curSol = this->model_().curSol();
-
- // save a copy of the original privars and volvars
- // to restore original solution after deflection
- auto origPriVars = curSol[globalJ];
- auto origVolVarsJ = curVolVarsJ;
-
- // derivatives with repect to the additional DOF we depend on
- for (int pvIdx = 0; pvIdx < numEq; pvIdx++)
- {
- // derivatives of element dof with respect to itself
- PrimaryVariables partialDeriv(0.0);
- const auto eps = this->numericEpsilon(curVolVarsJ.priVar(pvIdx));
- Scalar delta = 0;
-
- if (numericDifferenceMethod_ >= 0)
- {
- // we are not using backward differences, i.e. we need to
- // calculate f(x + \epsilon)
-
- // deflect primary variables
- curSol[globalJ][pvIdx] += eps;
- delta += eps;
-
- // update the volume variables and the flux var cache
- curVolVarsJ.update(this->model_().elementSolution(elementJ, curSol), this->problem_(), elementJ, scvJ);
-
- // calculate the source with the deflected primary variables
- auto deflSource = this->localResidual().computeSource(element, fvGeometry, curElemVolVars, scv);
- deflSource *= -scv.volume()*curVolVarsI.extrusionFactor();
- partialDeriv = std::move(deflSource);
- }
- else
- {
- // we are using backward differences, i.e. we don't need
- // to calculate f(x + \epsilon) and we can recycle the
- // (already calculated) source f(x)
- partialDeriv = source;
- }
-
- if (numericDifferenceMethod_ <= 0)
- {
- // we are not using forward differences, i.e. we
- // need to calculate f(x - \epsilon)
-
- // deflect the primary variables
- curSol[globalJ][pvIdx] -= delta + eps;
- delta += eps;
-
- // update the volume variables and the flux var cache
- curVolVarsJ.update(this->model_().elementSolution(elementJ, curSol), this->problem_(), elementJ, scvJ);
-
- // calculate the source with the deflected primary variables and subtract
- auto deflSource = this->localResidual().computeSource(element, fvGeometry, curElemVolVars, scv);
- deflSource *= -scv.volume()*curVolVarsI.extrusionFactor();
- partialDeriv -= std::move(deflSource);
- }
- else
- {
- // we are using forward differences, i.e. we don't need to
- // calculate f(x - \epsilon) and we can recycle the
- // (already calculated) source f(x)
- partialDeriv -= source;
- }
-
- // divide difference in residuals by the magnitude of the
- // deflections between the two function evaluation
- partialDeriv /= delta;
-
- // restore the original state of the dofs privars and the volume variables
- curSol[globalJ] = origPriVars;
- curVolVarsJ = origVolVarsJ;
-
- // update the global jacobian matrix with the current partial derivatives
- this->updateGlobalJacobian_(matrix, globalI_, globalJ, pvIdx, partialDeriv);
- }
- }
- }
-
- //! If the global vol vars caching is enabled we have to modify the global volvar object
- template<class T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables>::type&
- getCurVolVars(ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
- { return this->model_().nonConstCurGlobalVolVars().volVars(scv.dofIndex()); }
-
- //! When global volume variables caching is disabled, return the local volvar object
- template<class T = TypeTag>
- typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables>::type&
- getCurVolVars(ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
- { return elemVolVars[scv]; }
-
- IndexType globalI_;
- int numericDifferenceMethod_;
- AssemblyMap assemblyMap_;
-};
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/implicit/cellcentered/localresidual.hh b/dumux/implicit/cellcentered/localresidual.hh
index 56868fa1d154866060f7ed2e0bcd913663497927..faa023a190c924a8f8298c28bafb09fe230c7547 100644
--- a/dumux/implicit/cellcentered/localresidual.hh
+++ b/dumux/implicit/cellcentered/localresidual.hh
@@ -28,8 +28,6 @@
#include <dumux/common/valgrind.hh>
#include <dumux/implicit/localresidual.hh>
-#include "properties.hh"
-
namespace Dumux
{
/*!
@@ -44,262 +42,77 @@ template<class TypeTag>
class CCLocalResidual : public ImplicitLocalResidual<TypeTag>
{
using ParentType = ImplicitLocalResidual<TypeTag>;
- friend class ImplicitLocalResidual<TypeTag>;
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
-
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
-
- using Element = typename GridView::template Codim<0>::Entity;
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
+ using ElementResidualVector = Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, NumEqVector)>;
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
- using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
public:
- // copying the local residual class is not a good idea
- CCLocalResidual(const CCLocalResidual &) = delete;
-
- CCLocalResidual() : ParentType() {}
-
-protected:
-
- void evalFluxes_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const ElementBoundaryTypes& bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ using ParentType::ParentType;
+
+ void evalFlux(ElementResidualVector& residual,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const ElementBoundaryTypes& elemBcTypes,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
{
- // calculate the mass flux over the scv faces
- for (auto&& scvf : scvfs(fvGeometry))
- {
- this->residual_[0] += this->asImp_().computeFlux_(element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
- }
+ const auto& scv = fvGeometry.scv(scvf.insideScvIdx());
+ const auto localScvIdx = scv.indexInElement();
+ residual[localScvIdx] += evalFlux(problem, element, fvGeometry, elemVolVars, elemFluxVarsCache, scvf);
}
- PrimaryVariables computeFlux_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace &scvf,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ ResidualVector evalFlux(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
{
- if (!scvf.boundary())
- return this->asImp_().computeFlux(element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
- else
- return PrimaryVariables(0.0);
-
- }
+ ResidualVector flux(0.0);
- void evalBoundary_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const ElementBoundaryTypes& elemBcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
- {
- for (auto&& scvf : scvfs(fvGeometry))
+ // inner faces
+ if (!scvf.boundary())
{
- if (scvf.boundary())
- {
- auto bcTypes = this->problem().boundaryTypes(element, scvf);
- this->residual_[0] += evalBoundaryFluxes_(element, fvGeometry, elemVolVars, scvf, bcTypes, elemFluxVarsCache);
- }
+ flux += this->asImp().computeFlux(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
}
- // additionally treat mixed D/N conditions in a strong sense
- if (elemBcTypes.hasDirichlet())
+ // boundary faces
+ else
{
- for (auto&& scvf : scvfs(fvGeometry))
- {
- if (scvf.boundary())
- this->asImp_().evalDirichlet_(element, fvGeometry, elemVolVars, scvf);
- }
- }
- }
+ const auto& bcTypes = problem.boundaryTypes(element, scvf);
- /*!
- * \brief Add all fluxes resulting from Neumann, outflow and pure Dirichlet
- * boundary conditions to the local residual.
- */
- PrimaryVariables evalBoundaryFluxes_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace &scvf,
- const BoundaryTypes& bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
- {
- // evaluate the Neumann conditions at the boundary face
- PrimaryVariables flux(0);
- if (bcTypes.hasNeumann())
- flux += this->asImp_().evalNeumannSegment_(element, fvGeometry, elemVolVars, scvf, bcTypes);
-
- // TODO: evaluate the outflow conditions at the boundary face
- //if (bcTypes.hasOutflow())
- // flux += this->asImp_().evalOutflowSegment_(&intersection, bcTypes);
-
- // evaluate the pure Dirichlet conditions at the boundary face
- if (bcTypes.hasDirichlet() && !bcTypes.hasNeumann())
- flux += this->asImp_().evalDirichletSegment_(element, fvGeometry, elemVolVars, scvf, bcTypes, elemFluxVarsCache);
-
- return flux;
- }
-
-
- /*!
- * \brief Evaluate Dirichlet conditions on faces that have mixed
- * Dirichlet/Neumann boundary conditions.
- */
- void evalDirichlet_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace &scvf)
- {
- BoundaryTypes bcTypes = this->problem().boundaryTypes(element, scvf);
-
- if (bcTypes.hasDirichlet() && bcTypes.hasNeumann())
- this->asImp_().evalDirichletSegmentMixed_(element, fvGeometry, elemVolVars, scvf, bcTypes);
- }
-
- /*!
- * \brief Add Neumann boundary conditions for a single scv face
- */
- PrimaryVariables evalNeumannSegment_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace &scvf,
- const BoundaryTypes &bcTypes)
- {
- // temporary vector to store the neumann boundary fluxes
- PrimaryVariables flux(0);
+ // Dirichlet boundaries
+ if (bcTypes.hasDirichlet() && !bcTypes.hasNeumann())
+ flux += this->asImp().computeFlux(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
- auto neumannFluxes = this->problem().neumann(element, fvGeometry, elemVolVars, scvf);
-
- // multiply neumann fluxes with the area and the extrusion factor
- auto&& scv = fvGeometry.scv(scvf.insideScvIdx());
- neumannFluxes *= scvf.area()*elemVolVars[scv].extrusionFactor();
-
- // add fluxes to the residual
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
- if (bcTypes.isNeumann(eqIdx))
- flux[eqIdx] += neumannFluxes[eqIdx];
-
- return flux;
- }
-
- /*!
- * \brief Treat Dirichlet boundary conditions in a weak sense for a single
- * intersection that only has Dirichlet boundary conditions
- */
- PrimaryVariables evalDirichletSegment_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace &scvf,
- const BoundaryTypes &bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
- {
- // temporary vector to store the Dirichlet boundary fluxes
- PrimaryVariables flux(0);
-
- auto dirichletFlux = this->asImp_().computeFlux(element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
-
- // add fluxes to the residual
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
- if (bcTypes.isDirichlet(eqIdx))
- flux[eqIdx] += dirichletFlux[eqIdx];
-
- return flux;
- }
-
- /*!
- * \brief Treat Dirichlet boundary conditions in a strong sense for a
- * single intersection that has mixed D/N boundary conditions
- */
- void evalDirichletSegmentMixed_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace &scvf,
- const BoundaryTypes &bcTypes)
- {
- // temporary vector to store the Dirichlet values
- PrimaryVariables dirichletValues = this->problem().dirichlet(element, scvf);
-
- // get the primary variables
- const auto& priVars = elemVolVars[scvf.insideScvIdx()].priVars();
-
- // set Dirichlet conditions in a strong sense
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
- {
- if (bcTypes.isDirichlet(eqIdx))
+ // Neumann and Robin ("solution dependent Neumann") boundary conditions
+ else if (bcTypes.hasNeumann() && !bcTypes.hasDirichlet())
{
- auto pvIdx = bcTypes.eqToDirichletIndex(eqIdx);
- this->residual_[0][eqIdx] = priVars[pvIdx] - dirichletValues[pvIdx];
- }
- }
- }
-
- /*!
- * \brief Add outflow boundary conditions for a single intersection
- */
- /*template <class IntersectionIterator>
- void evalOutflowSegment_(const IntersectionIterator &isIt,
- const BoundaryTypes &bcTypes)
- {
- if (this->element_().geometry().type().isCube() == false)
- DUNE_THROW(Dune::InvalidStateException,
- "for cell-centered models, outflow BCs only work for cubes.");
-
- // store pointer to the current FVElementGeometry
- const FVElementGeometry *oldFVGeometryPtr = this->fvElemGeomPtr_;
-
- // copy the current FVElementGeometry to a local variable
- // and set the pointer to this local variable
- FVElementGeometry fvGeometry = this->fvGeometry_();
- this->fvElemGeomPtr_ = &fvGeometry;
-
- // get the index of the boundary face
- unsigned bfIdx = isIt->indexInInside();
- unsigned oppositeIdx = bfIdx^1;
+ auto neumannFluxes = problem.neumann(element, fvGeometry, elemVolVars, scvf);
- // manipulate the corresponding subcontrolvolume face
- SCVFace& boundaryFace = fvGeometry.boundaryFace[bfIdx];
+ // multiply neumann fluxes with the area and the extrusion factor
+ const auto& scv = fvGeometry.scv(scvf.insideScvIdx());
+ neumannFluxes *= scvf.area()*elemVolVars[scv].extrusionFactor();
- // set the second flux approximation index for the boundary face
- for (int nIdx = 0; nIdx < fvGeometry.numNeighbors-1; nIdx++)
- {
- // check whether the two faces are opposite of each other
- if (fvGeometry.subContVolFace[nIdx].fIdx == oppositeIdx)
- {
- boundaryFace.j = nIdx+1;
- break;
+ flux += neumannFluxes;
}
- }
- boundaryFace.fapIndices[1] = boundaryFace.j;
- boundaryFace.grad[0] *= -0.5;
- boundaryFace.grad[1] *= -0.5;
-
- // temporary vector to store the outflow boundary fluxes
- PrimaryVariables values;
- Valgrind::SetUndefined(values);
- this->asImp_().computeFlux(values, bfIdx, true);
- values *= this->curVolVars_(0).extrusionFactor();
-
- // add fluxes to the residual
- Valgrind::CheckDefined(values);
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
- {
- if (bcTypes.isOutflow(eqIdx))
- this->residual_[0][eqIdx] += values[eqIdx];
+ else
+ DUNE_THROW(Dune::NotImplemented, "Mixed boundary conditions. Use pure boundary conditions by converting Dirichlet BCs to Robin BCs");
}
- // restore the pointer to the FVElementGeometry
- this->fvElemGeomPtr_ = oldFVGeometryPtr;
- }*/
+ return flux;
+ }
};
-}
+} // end namespace Dumux
-#endif // DUMUX_CC_LOCAL_RESIDUAL_HH
+#endif
diff --git a/dumux/implicit/cellcentered/mpfa/localresidual.hh b/dumux/implicit/cellcentered/mpfa/localresidual.hh
deleted file mode 100644
index ed566cd41f1614656063d32d0ff2625857449134..0000000000000000000000000000000000000000
--- a/dumux/implicit/cellcentered/mpfa/localresidual.hh
+++ /dev/null
@@ -1,148 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Calculates the residual of models based on the box scheme element-wise.
- */
-#ifndef DUMUX_CC_MPFA_LOCAL_RESIDUAL_HH
-#define DUMUX_CC_MPFA_LOCAL_RESIDUAL_HH
-
-#include <dune/istl/matrix.hh>
-
-#include <dumux/common/valgrind.hh>
-#include <dumux/implicit/localresidual.hh>
-#include <dumux/implicit/cellcentered/localresidual.hh>
-
-#include "properties.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup CCMpfaModel
- * \ingroup CCMpfaLocalResidual
- * \brief Element-wise calculation of the residual for models
- * based on the fully implicit cell-centered mpfa scheme.
- *
- * \todo Please doc me more!
- */
-template<class TypeTag>
-class CCMpfaLocalResidual : public CCLocalResidual<TypeTag>
-{
- friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
- using ParentType = CCLocalResidual<TypeTag>;
- friend class CCLocalResidual<TypeTag>;
- friend class ImplicitLocalResidual<TypeTag>;
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
-
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
-
- using Element = typename GridView::template Codim<0>::Entity;
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
- using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
-
- static const bool useTpfaBoundary = GET_PROP_VALUE(TypeTag, UseTpfaBoundary);
-
-public:
- // copying the local residual class is not a good idea
- CCMpfaLocalResidual(const CCMpfaLocalResidual &) = delete;
-
- CCMpfaLocalResidual() : ParentType() {}
-
-protected:
-
- PrimaryVariables computeFlux_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace &scvf,
- const ElementFluxVariablesCache& elemFluxVarsCache)
- {
- if (!scvf.boundary() || !useTpfaBoundary)
- return this->asImp_().computeFlux(element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
- else
- return PrimaryVariables(0.0);
-
- }
-
- PrimaryVariables evalFlux_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf,
- const ElementFluxVariablesCache& elemFluxVarsCache)
- {
- if (!scvf.boundary() || !useTpfaBoundary)
- return this->asImp_().computeFlux_(element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
- else
- {
- auto bcTypes = this->problem().boundaryTypes(element, scvf);
- return this->asImp_().evalBoundaryFluxes_(element, fvGeometry, elemVolVars, scvf, bcTypes, elemFluxVarsCache);
- }
- }
-
- void evalBoundary_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const ElementBoundaryTypes& elemBcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
- {
- if (!useTpfaBoundary)
- return;
-
- for (auto&& scvf : scvfs(fvGeometry))
- {
- if (scvf.boundary())
- {
- auto bcTypes = this->problem().boundaryTypes(element, scvf);
- this->residual_[0] += this->asImp_().evalBoundaryFluxes_(element, fvGeometry, elemVolVars, scvf, bcTypes, elemFluxVarsCache);
- }
- }
- }
-
- /*!
- * \brief Add all fluxes resulting from Neumann, outflow and pure Dirichlet
- * boundary conditions to the local residual
- */
- PrimaryVariables evalBoundaryFluxes_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace &scvf,
- const BoundaryTypes& bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
- {
- // return the boundary fluxes
- if (bcTypes.hasOnlyDirichlet())
- return this->asImp_().computeFlux(element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
- else if (bcTypes.hasOnlyNeumann())
- return this->asImp_().evalNeumannSegment_(element, fvGeometry, elemVolVars, scvf, bcTypes);
- else if (bcTypes.hasOutflow())
- DUNE_THROW(Dune::NotImplemented, "Outflow BC for mpfa methods.");
- else
- DUNE_THROW(Dune::InvalidStateException, "Mixed BC can not be set when using an mpfa method");
- }
-};
-
-}
-
-#endif // DUMUX_CC_LOCAL_RESIDUAL_HH
diff --git a/dumux/implicit/cellcentered/mpfa/properties.hh b/dumux/implicit/cellcentered/mpfa/properties.hh
deleted file mode 100644
index f78c330e81eb1f0fea0c3d883be694784f7ab48e..0000000000000000000000000000000000000000
--- a/dumux/implicit/cellcentered/mpfa/properties.hh
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-#ifndef DUMUX_CC_MPFA_PROPERTIES_HH
-#define DUMUX_CC_MPFA_PROPERTIES_HH
-
-#include <dumux/implicit/properties.hh>
-#include <dumux/implicit/cellcentered/properties.hh>
-
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup CCMpfaModel
- * \file
- * \brief Specify classes used in Mpfa models.
- */
-namespace Dumux
-{
-
-namespace Properties
-{
-// \{
-
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tag for models based on the cell-centered multi-point flux approximation scheme
-NEW_TYPE_TAG(CCMpfaModel, INHERITS_FROM(CCModel));
-
-NEW_PROP_TAG(MpfaMethod); //! Specifies the mpfa method to be used
-NEW_PROP_TAG(MpfaHelper); //! A Helper class depending on the mpfa method and grid dimension
-NEW_PROP_TAG(InteractionVolume); //! The inner interaction volume type
-NEW_PROP_TAG(BoundaryInteractionVolume); //! The interaction volume type used on the boundaries
-NEW_PROP_TAG(GlobalInteractionVolumeSeeds); //! Class storing and managing the interaction volume seeds
-NEW_PROP_TAG(UseTpfaBoundary); //! This property specifies whether or not tpfa is to be used to handle the boundary fluxes
-NEW_PROP_TAG(InteriorBoundaryData); //! Stores and obtains additional data on interior boundaries
-NEW_PROP_TAG(MpfaFacetCoupling); //! Specifies if the interior boundaries are static or coupled to another domain
-NEW_PROP_TAG(MpfaXi); //! Parameter for the coupling conditions when using mpfa in a context with coupling on facets (0 <= xi <= 1)
-NEW_PROP_TAG(MpfaQ); //! The quadrature point on the sub control volume faces (0.0 <= q <= 1.0)
-NEW_PROP_TAG(MpfaC); //! Parameterisation of the size of the auxiliary volume in the FPS scheme
-NEW_PROP_TAG(MpfaP); //! The quadrature point on the auxiliary sub faces in the FPS scheme
-}
-}
-
-// \}
-
-#include <dumux/implicit/cellcentered/mpfa/propertydefaults.hh>
-
-#endif
diff --git a/dumux/implicit/cellcentered/mpfa/propertydefaults.hh b/dumux/implicit/cellcentered/mpfa/propertydefaults.hh
deleted file mode 100644
index 3c39f209b4594edde0fefade6d35eae42e05fe9c..0000000000000000000000000000000000000000
--- a/dumux/implicit/cellcentered/mpfa/propertydefaults.hh
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup CCMpfaProperties
- * \ingroup CCMpfaModel
- * \file
- *
- * \brief Default properties for cell centered models
- */
-#ifndef DUMUX_CCMPFA_PROPERTY_DEFAULTS_HH
-#define DUMUX_CCMPFA_PROPERTY_DEFAULTS_HH
-
-#include <dumux/implicit/propertydefaults.hh>
-#include <dumux/porousmediumflow/implicit/fluxvariablescache.hh>
-#include <dumux/discretization/methods.hh>
-#include <dumux/discretization/cellcentered/mpfa/methods.hh>
-#include <dumux/discretization/cellcentered/mpfa/fvgridgeometry.hh>
-#include <dumux/discretization/cellcentered/mpfa/globalvolumevariables.hh>
-#include <dumux/discretization/cellcentered/mpfa/globalfluxvariablescache.hh>
-#include <dumux/discretization/cellcentered/mpfa/fvelementgeometry.hh>
-#include <dumux/discretization/cellcentered/mpfa/elementvolumevariables.hh>
-#include <dumux/discretization/cellcentered/mpfa/elementfluxvariablescache.hh>
-#include <dumux/discretization/cellcentered/mpfa/subcontrolvolumeface.hh>
-#include <dumux/discretization/cellcentered/mpfa/helper.hh>
-#include <dumux/discretization/cellcentered/mpfa/interactionvolume.hh>
-#include <dumux/discretization/cellcentered/mpfa/globalinteractionvolumeseeds.hh>
-#include <dumux/discretization/cellcentered/mpfa/interiorboundarydata.hh>
-#include <dumux/implicit/cellcentered/mpfa/localresidual.hh>
-#include <dumux/implicit/cellcentered/mpfa/assemblymap.hh>
-#include <dumux/implicit/cellcentered/properties.hh>
-
-namespace Dumux {
-
-namespace Properties {
-//! Set the corresponding discretization method property
-SET_PROP(CCMpfaModel, DiscretizationMethod)
-{
- static const DiscretizationMethods value = DiscretizationMethods::CCMpfa;
-};
-
-//! Set the BaseLocalResidual to CCMpfaLocalResidual
-SET_TYPE_PROP(CCMpfaModel, BaseLocalResidual, CCMpfaLocalResidual<TypeTag>);
-
-//! By default we set the o-method as the Mpfa method of choice
-SET_PROP(CCMpfaModel, MpfaMethod)
-{
- static const MpfaMethods value = MpfaMethods::oMethod;
-};
-
-//! The mpfa helper class
-SET_TYPE_PROP(CCMpfaModel, MpfaHelper, CCMpfaHelper<TypeTag>);
-
-//! The assembly map for mpfa schemes
-SET_TYPE_PROP(CCMpfaModel, AssemblyMap, CCMpfaAssemblyMap<TypeTag>);
-
-//! The interaction volume class
-SET_TYPE_PROP(CCMpfaModel, InteractionVolume, CCMpfaInteractionVolume<TypeTag>);
-
-//! The boundary interaction volume class (for methods other than the omethod)
-SET_TYPE_PROP(CCMpfaModel, BoundaryInteractionVolume, typename GET_PROP_TYPE(TypeTag, InteractionVolume)::BoundaryInteractionVolume);
-
-//! The global interaction volume seeds class
-SET_TYPE_PROP(CCMpfaModel, GlobalInteractionVolumeSeeds, CCMpfaGlobalInteractionVolumeSeeds<TypeTag>);
-
-//! Set the default for the global finite volume geometry
-SET_TYPE_PROP(CCMpfaModel, FVGridGeometry, CCMpfaFVGridGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
-
-//! The global current volume variables vector class
-SET_TYPE_PROP(CCMpfaModel, GlobalVolumeVariables, Dumux::CCMpfaGlobalVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
-
-//! The global flux variables cache vector class
-SET_TYPE_PROP(CCMpfaModel, GlobalFluxVariablesCache, CCMpfaGlobalFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
-
-//! Set the default for the local finite volume geometry
-SET_TYPE_PROP(CCMpfaModel, FVElementGeometry, CCMpfaFVElementGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
-
-//! The global previous volume variables vector class
-SET_TYPE_PROP(CCMpfaModel, ElementVolumeVariables, Dumux::CCMpfaElementVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
-
-//! The local flux variables cache vector class
-SET_TYPE_PROP(CCMpfaModel, ElementFluxVariablesCache, Dumux::CCMpfaElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
-
-SET_PROP(CCMpfaModel, SubControlVolumeFace)
-{
-private:
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Scalar = typename GridView::ctype;
- static const int dim = GridView::dimension;
- static const int dimWorld = GridView::dimensionworld;
- using ScvfGeometry = Dune::MultiLinearGeometry<Scalar, dim-1, dimWorld>;
- using IndexType = typename GridView::IndexSet::IndexType;
-public:
- typedef Dumux::CCMpfaSubControlVolumeFace<GET_PROP_VALUE(TypeTag, MpfaMethod), ScvfGeometry, IndexType> type;
-};
-
-// By default, we use tpfa on the boundaries
-SET_BOOL_PROP(CCMpfaModel, UseTpfaBoundary, true);
-
-// By default, interior boundaries are static
-SET_BOOL_PROP(CCMpfaModel, MpfaFacetCoupling, false);
-
-// The default interior Dirichlet boundary data
-SET_TYPE_PROP(CCMpfaModel, InteriorBoundaryData, InteriorBoundaryData<TypeTag>);
-
-// By default, we use simple coupling conditions (Xi = 1)
-SET_SCALAR_PROP(CCMpfaModel, MpfaXi, 1.0);
-
-// By default, we set the quadrature point to the mid point of the element facets
-SET_SCALAR_PROP(CCMpfaModel, MpfaQ, 0.0);
-
-// By default, the auxiliary volume size is half of the interaction region
-SET_SCALAR_PROP(CCMpfaModel, MpfaC, 0.5);
-
-// By default, we set the quadrature point 1/2 away from the mid point of the auxiliary sub faces
-SET_SCALAR_PROP(CCMpfaModel, MpfaP, 0.75);
-
-} // namespace Properties
-
-} // namespace Dumux
-
-#endif
diff --git a/dumux/implicit/cellcentered/properties.hh b/dumux/implicit/cellcentered/properties.hh
deleted file mode 100644
index c5757fcbc3db4f28f83c9d6d633e339c4e60c65f..0000000000000000000000000000000000000000
--- a/dumux/implicit/cellcentered/properties.hh
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-#ifndef DUMUX_CC_PROPERTIES_HH
-#define DUMUX_CC_PROPERTIES_HH
-
-#include <dumux/implicit/properties.hh>
-
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup CCModel
- * \file
- * \brief Specify the shape functions, operator assemblers, etc
- * used for the CCModel.
- */
-namespace Dumux
-{
-
-namespace Properties
-{
-// \{
-
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tag for models based on the cell-centered scheme
-NEW_TYPE_TAG(CCModel, INHERITS_FROM(ImplicitBase));
-
-NEW_PROP_TAG(AssemblyMap);
-NEW_PROP_TAG(EnableInteriorBoundaries); //! Enables or disables the use of internal boundaries on interior scvfs
-}
-}
-
-// \}
-
-#include "propertydefaults.hh"
-
-#endif
diff --git a/dumux/implicit/cellcentered/propertydefaults.hh b/dumux/implicit/cellcentered/propertydefaults.hh
deleted file mode 100644
index 99fbb8925c9fadc81dfe84ac82ad9ae3929d5e99..0000000000000000000000000000000000000000
--- a/dumux/implicit/cellcentered/propertydefaults.hh
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup CCProperties
- * \ingroup CCModel
- * \file
- *
- * \brief Default properties for cell centered models
- */
-#ifndef DUMUX_CC_PROPERTY_DEFAULTS_HH
-#define DUMUX_CC_PROPERTY_DEFAULTS_HH
-
-#include <dumux/implicit/propertydefaults.hh>
-#include <dumux/discretization/cellcentered/globalvolumevariables.hh>
-#include <dumux/discretization/cellcentered/subcontrolvolume.hh>
-
-#include "elementboundarytypes.hh"
-#include "localresidual.hh"
-#include "properties.hh"
-#include "localjacobian.hh"
-#include "assembler.hh"
-#include "assemblymap.hh"
-
-namespace Dumux
-{
-
-// forward declaration
-template<class TypeTag> class CCElementBoundaryTypes;
-template<class TypeTag> class CCLocalResidual;
-
-namespace Properties
-{
-//! Set the default for the ElementBoundaryTypes
-SET_TYPE_PROP(CCModel, ElementBoundaryTypes, CCElementBoundaryTypes<TypeTag>);
-
-//! Mapper for the degrees of freedoms.
-SET_TYPE_PROP(CCModel, DofMapper, typename GET_PROP_TYPE(TypeTag, ElementMapper));
-
-//! The local jacobian operator
-SET_TYPE_PROP(CCModel, LocalJacobian, CCLocalJacobian<TypeTag>);
-
-//! Assembler for the global jacobian matrix
-SET_TYPE_PROP(CCModel, JacobianAssembler, CCAssembler<TypeTag>);
-
-//! The sub control volume
-SET_PROP(CCModel, SubControlVolume)
-{
-private:
- using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
- using ScvGeometry = typename Grid::template Codim<0>::Geometry;
- using IndexType = typename Grid::LeafGridView::IndexSet::IndexType;
-public:
- using type = CCSubControlVolume<ScvGeometry, IndexType>;
-};
-
-//! The global current volume variables vector class
-SET_TYPE_PROP(CCModel, GlobalVolumeVariables, CCGlobalVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
-
-//! Set the BaseLocalResidual to CCLocalResidual
-SET_TYPE_PROP(CCModel, BaseLocalResidual, CCLocalResidual<TypeTag>);
-
-//! Set the AssemblyMap to the CCAssemblyMap per default
-SET_TYPE_PROP(CCModel, AssemblyMap, Dumux::CCSimpleAssemblyMap<TypeTag>);
-
-// By default, we disable interior boundaries
-SET_BOOL_PROP(CCModel, EnableInteriorBoundaries, false);
-
-//! indicate that this is no box discretization
-SET_BOOL_PROP(CCModel, ImplicitIsBox, false);
-
-} // end namespace Properties
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/implicit/cellcentered/tpfa/properties.hh b/dumux/implicit/cellcentered/tpfa/properties.hh
deleted file mode 100644
index 20db9f635fe2ea54282c1c82f916ff900feb09fb..0000000000000000000000000000000000000000
--- a/dumux/implicit/cellcentered/tpfa/properties.hh
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-#ifndef DUMUX_CC_TPFA_PROPERTIES_HH
-#define DUMUX_CC_TPFA_PROPERTIES_HH
-
-#include <dumux/implicit/properties.hh>
-#include <dumux/implicit/cellcentered/properties.hh>
-
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup CCTpfaModel
- * \file
- * \brief Specify the shape functions, operator assemblers, etc
- * used for the CCTpfaModel.
- */
-namespace Dumux
-{
-
-namespace Properties
-{
-// \{
-
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tag for models based on the cell-centered two-point flux approximation scheme
-NEW_TYPE_TAG(CCTpfaModel, INHERITS_FROM(CCModel));
-}
-}
-
-// \}
-
-#include <dumux/implicit/cellcentered/tpfa/propertydefaults.hh>
-
-#endif
diff --git a/dumux/implicit/cellcentered/tpfa/propertydefaults.hh b/dumux/implicit/cellcentered/tpfa/propertydefaults.hh
deleted file mode 100644
index 73fba7ee448540a762f2c090e2f9d22a67d55f6a..0000000000000000000000000000000000000000
--- a/dumux/implicit/cellcentered/tpfa/propertydefaults.hh
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup CCTpfaProperties
- * \ingroup CCTpfaModel
- * \file
- *
- * \brief Default properties for cell centered models
- */
-#ifndef DUMUX_CCTPFA_PROPERTY_DEFAULTS_HH
-#define DUMUX_CCTPFA_PROPERTY_DEFAULTS_HH
-
-#include <dumux/implicit/propertydefaults.hh>
-#include <dumux/porousmediumflow/implicit/fluxvariablescache.hh>
-#include <dumux/discretization/cellcentered/tpfa/fvgridgeometry.hh>
-#include <dumux/discretization/cellcentered/tpfa/globalfluxvariablescache.hh>
-#include <dumux/discretization/cellcentered/tpfa/fvelementgeometry.hh>
-#include <dumux/discretization/cellcentered/tpfa/elementvolumevariables.hh>
-#include <dumux/discretization/cellcentered/tpfa/elementfluxvariablescache.hh>
-#include <dumux/discretization/cellcentered/tpfa/subcontrolvolumeface.hh>
-#include <dumux/implicit/cellcentered/properties.hh>
-#include <dumux/discretization/methods.hh>
-
-namespace Dumux {
-
-// forward declarations
-template<class TypeTag> class CCElementBoundaryTypes;
-
-namespace Properties {
-//! Set the corresponding discretization method property
-SET_PROP(CCTpfaModel, DiscretizationMethod)
-{
- static const DiscretizationMethods value = DiscretizationMethods::CCTpfa;
-};
-
-//! Set the default for the global finite volume geometry
-SET_TYPE_PROP(CCTpfaModel, FVGridGeometry, CCTpfaFVGridGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
-
-//! The global flux variables cache vector class
-SET_TYPE_PROP(CCTpfaModel, GlobalFluxVariablesCache, Dumux::CCTpfaGlobalFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
-
-//! Set the default for the local finite volume geometry
-SET_TYPE_PROP(CCTpfaModel, FVElementGeometry, CCTpfaFVElementGeometry<TypeTag, GET_PROP_VALUE(TypeTag, EnableFVGridGeometryCache)>);
-
-//! The global previous volume variables vector class
-SET_TYPE_PROP(CCTpfaModel, ElementVolumeVariables, Dumux::CCTpfaElementVolumeVariables<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>);
-
-//! The local flux variables cache vector class
-SET_TYPE_PROP(CCTpfaModel, ElementFluxVariablesCache, Dumux::CCTpfaElementFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableGlobalFluxVariablesCache)>);
-
-SET_PROP(CCTpfaModel, SubControlVolumeFace)
-{
-private:
- using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
- using ScvfGeometry = typename Grid::template Codim<1>::Geometry;
- using IndexType = typename Grid::LeafGridView::IndexSet::IndexType;
-public:
- typedef Dumux::CCTpfaSubControlVolumeFace<ScvfGeometry, IndexType> type;
-};
-
-} // namespace Properties
-
-} // namespace Dumux
-
-#endif
diff --git a/dumux/implicit/gridvariables.hh b/dumux/implicit/gridvariables.hh
new file mode 100644
index 0000000000000000000000000000000000000000..c4c99d97be8d00edae9faea06ccc666adfbc74c4
--- /dev/null
+++ b/dumux/implicit/gridvariables.hh
@@ -0,0 +1,135 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Class storing scv and scvf variables
+ */
+#ifndef DUMUX_GRID_VARIABLES_HH
+#define DUMUX_GRID_VARIABLES_HH
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup ImplicitModel
+ * \brief Class storing scv and scvf variables
+ */
+template<class TypeTag>
+class GridVariables
+{
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+
+public:
+ //! Constructor
+ GridVariables(std::shared_ptr<Problem> problem, std::shared_ptr<FVGridGeometry> fvGridGeometry)
+ : problem_(problem)
+ , fvGridGeometry_(fvGridGeometry)
+ , curGridVolVars_(*problem)
+ , prevGridVolVars_(*problem)
+ , gridFluxVarsCache_(*problem)
+ {}
+
+ //! update all variables
+ void update(const SolutionVector& curSol)
+ {
+ // resize and update the volVars with the initial solution
+ curGridVolVars_.update(*fvGridGeometry_, curSol);
+
+ // update the flux variables caches
+ gridFluxVarsCache_.update(*fvGridGeometry_, curGridVolVars_, curSol);
+ }
+
+ //! initialize all variables (stationary case)
+ void init(const SolutionVector& curSol)
+ {
+ // resize and update the volVars with the initial solution
+ curGridVolVars_.update(*fvGridGeometry_, curSol);
+
+ // update the flux variables caches
+ gridFluxVarsCache_.update(*fvGridGeometry_, curGridVolVars_, curSol, true);
+ }
+
+ //! initialize all variables (instationary case)
+ void init(const SolutionVector& curSol, const SolutionVector& initSol)
+ {
+ // resize and update the volVars with the initial solution
+ curGridVolVars_.update(*fvGridGeometry_, curSol);
+
+ // update the flux variables caches
+ gridFluxVarsCache_.update(*fvGridGeometry_, curGridVolVars_, curSol, true);
+
+ // update the old time step vol vars with the initial solution
+ // prevGridVolVars_ = curGridVolVars_;
+ prevGridVolVars_.update(*fvGridGeometry_, initSol);
+ }
+
+ //! Sets the current state as the previous for next time step
+ //! this has to be called at the end of each time step
+ void advanceTimeStep()
+ {
+ prevGridVolVars_ = curGridVolVars_;
+ }
+
+ //! resets state to the one before time integration
+ void resetTimeStep(const SolutionVector& solution)
+ {
+ // set the new time step vol vars to old vol vars
+ curGridVolVars_ = prevGridVolVars_;
+
+ // update the flux variables caches
+ gridFluxVarsCache_.update(*fvGridGeometry_, curGridVolVars_, solution);
+ }
+
+ const GridFluxVariablesCache& gridFluxVarsCache() const
+ { return gridFluxVarsCache_; }
+
+ const GridVolumeVariables& curGridVolVars() const
+ { return curGridVolVars_; }
+
+ const GridVolumeVariables& prevGridVolVars() const
+ { return prevGridVolVars_; }
+
+ GridFluxVariablesCache& gridFluxVarsCache()
+ { return gridFluxVarsCache_; }
+
+ GridVolumeVariables& curGridVolVars()
+ { return curGridVolVars_; }
+
+ GridVolumeVariables& prevGridVolVars()
+ { return prevGridVolVars_; }
+
+private:
+ std::shared_ptr<Problem> problem_;
+ std::shared_ptr<FVGridGeometry> fvGridGeometry_;
+
+ // the current and previous variables (primary and secondary variables)
+ GridVolumeVariables curGridVolVars_;
+ GridVolumeVariables prevGridVolVars_;
+
+ // the flux variables cache vector vector
+ GridFluxVariablesCache gridFluxVarsCache_;
+};
+
+} // end namespace
+
+#endif
diff --git a/dumux/implicit/localjacobian.hh b/dumux/implicit/localjacobian.hh
deleted file mode 100644
index 31235e13bfbcd4a87c99f5151514b398bed7b9c9..0000000000000000000000000000000000000000
--- a/dumux/implicit/localjacobian.hh
+++ /dev/null
@@ -1,247 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Caculates the Jacobian of the local residual for fully-implicit models
- */
-#ifndef DUMUX_IMPLICIT_LOCAL_JACOBIAN_HH
-#define DUMUX_IMPLICIT_LOCAL_JACOBIAN_HH
-
-#include <dune/istl/io.hh>
-#include <dune/istl/matrix.hh>
-
-#include <dumux/common/math.hh>
-#include <dumux/common/valgrind.hh>
-
-#include "properties.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup ImplicitLocalJacobian
- * \brief Calculates the Jacobian of the local residual for fully-implicit models
- *
- * The default behavior is to use numeric differentiation, i.e.
- * forward or backward differences (2nd order), or central
- * differences (3rd order). The method used is determined by the
- * "NumericDifferenceMethod" property:
- *
- * - if the value of this property is smaller than 0, backward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x) - f(x - \epsilon)}{\epsilon}
- * \f]
- *
- * - if the value of this property is 0, central
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x - \epsilon)}{2 \epsilon}
- * \f]
- *
- * - if the value of this property is larger than 0, forward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x)}{\epsilon}
- * \f]
- *
- * Here, \f$ f \f$ is the residual function for all equations, \f$x\f$
- * is the value of a sub-control volume's primary variable at the
- * evaluation point and \f$\epsilon\f$ is a small value larger than 0.
- */
-template<class TypeTag>
-class ImplicitLocalJacobian
-{
- using Implementation = typename GET_PROP_TYPE(TypeTag, LocalJacobian);
- using JacobianAssembler = typename GET_PROP_TYPE(TypeTag, JacobianAssembler);
- using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
- using LocalResidual = typename GET_PROP_TYPE(TypeTag, LocalResidual);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Model = typename GET_PROP_TYPE(TypeTag, Model);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Element = typename GridView::template Codim<0>::Entity;
- using IndexType = typename GridView::IndexSet::IndexType;
-
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
-
-public:
- // copying a local jacobian is not a good idea
- ImplicitLocalJacobian(const ImplicitLocalJacobian &) = delete;
- // default constructor
- ImplicitLocalJacobian() = default;
-
- /*!
- * \brief Initialize the local Jacobian object.
- *
- * At this point we can assume that everything has been allocated,
- * although some objects may not yet be completely initialized.
- *
- * \param problem The problem which we want to simulate.
- */
- void init(Problem &problem)
- {
- problemPtr_ = &problem;
- localResidual_.init(problem);
- }
-
- /*!
- * \brief Assemble an element's local Jacobian matrix of the
- * defect.
- *
- * \param element The DUNE Codim<0> entity which we look at.
- */
- void assemble(const Element& element, JacobianMatrix& matrix, SolutionVector& residual)
- {
- DUNE_THROW(Dune::NotImplemented, "Assemble routine not provided by the actual implementation of the local jacobian!");
- }
-
- /*!
- * \brief Returns a reference to the object which calculates the
- * local residual.
- */
- const LocalResidual &localResidual() const
- { return localResidual_; }
-
- /*!
- * \brief Returns a reference to the object which calculates the
- * local residual.
- */
- LocalResidual &localResidual()
- { return localResidual_; }
-
- /*!
- * \brief Returns the residual of the equations at subcontrolvolume i.
- *
- * \param i The local subcontrolvolume index on which
- * the equations are defined
- */
- const PrimaryVariables &residual(const int i) const
- { return residual_[i]; }
-
-
-protected:
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
-
- /*!
- * \brief Returns a reference to the problem.
- */
- const Problem &problem_() const
- { return *problemPtr_; }
-
- /*!
- * \brief Returns a reference to the problem.
- */
- Problem &problem_()
- { return *problemPtr_; }
-
- /*!
- * \brief Returns a reference to the grid view.
- */
- const GridView &gridView_() const
- { return problem_().gridView(); }
-
- /*!
- * \brief Returns a reference to the model.
- */
- const Model &model_() const
- { return problem_().model(); }
-
- /*!
- * \brief Returns a reference to the model.
- */
- Model &model_()
- { return problem_().model(); }
-
- /*!
- * \brief Returns a reference to the jacobian assembler.
- */
- const JacobianAssembler &jacAsm_() const
- { return model_().jacobianAssembler(); }
-
- /*!
- * \brief Returns a reference to the vertex mapper.
- */
- const VertexMapper &vertexMapper_() const
- { return problem_().vertexMapper(); }
-
-
- Scalar numericEpsilon(const Scalar priVar) const
- {
- // define the base epsilon as the geometric mean of 1 and the
- // resolution of the scalar type. E.g. for standard 64 bit
- // floating point values, the resolution is about 10^-16 and
- // the base epsilon is thus approximately 10^-8.
- /*
- static const Scalar baseEps
- = Dumux::geometricMean<Scalar>(std::numeric_limits<Scalar>::epsilon(), 1.0);
- */
- static const Scalar baseEps = 1e-10;
- assert(std::numeric_limits<Scalar>::epsilon()*1e4 < baseEps);
- // the epsilon value used for the numeric differentiation is
- // now scaled by the absolute value of the primary variable...
- return baseEps*(std::abs(priVar) + 1.0);
- }
-
- /*!
- * \brief Updates the current global Jacobian matrix with the
- * partial derivatives of all equations in regard to the
- * primary variable 'pvIdx' at dof 'col'.
- * \param matrix A block matrix with block depth 1
- */
- template<class Matrix>
- void updateGlobalJacobian_(Matrix& matrix,
- const int globalI,
- const int globalJ,
- const int pvIdx,
- const PrimaryVariables &partialDeriv)
- {
- assert(partialDeriv.size() == numEq);
-
- for (int eqIdx = 0; eqIdx < numEq; eqIdx++)
- {
- // A[i][col][eqIdx][pvIdx] is the rate of change of
- // the residual of equation 'eqIdx' at dof 'i'
- // depending on the primary variable 'pvIdx' at dof
- // 'col'.
- matrix[globalI][globalJ][eqIdx][pvIdx] += partialDeriv[eqIdx];
- }
- }
-
- // The problem we would like to solve
- Problem *problemPtr_;
-
- LocalResidual localResidual_;
-
- ElementSolutionVector residual_;
-};
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/implicit/localresidual.hh b/dumux/implicit/localresidual.hh
index c86f3aff1580fed9ae31ed060c3647366f0f82d4..3472b9ba36f5a28f9965b81615ad9d2b25742981 100644
--- a/dumux/implicit/localresidual.hh
+++ b/dumux/implicit/localresidual.hh
@@ -27,95 +27,61 @@
#include <dumux/common/valgrind.hh>
#include <dumux/common/capabilities.hh>
+#include <dumux/common/timeloop.hh>
-#include "properties.hh"
+#include <dumux/discretization/methods.hh>
namespace Dumux
{
+
/*!
* \ingroup ImplicitLocalResidual
* \brief Element-wise calculation of the residual matrix for models
* using a fully implicit discretization.
*
- * \todo Please doc me more!
+ * \note This class defines the interface used by the assembler using
+ * static polymorphism.
*/
template<class TypeTag>
class ImplicitLocalResidual
{
- friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
using Implementation = typename GET_PROP_TYPE(TypeTag, LocalResidual);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Model = typename GET_PROP_TYPE(TypeTag, Model);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Element = typename GridView::template Codim<0>::Entity;
+ using Element = typename GET_PROP_TYPE(TypeTag, GridView)::template Codim<0>::Entity;
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using ElementResidualVector = Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, NumEqVector)>;
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using TimeLoop = TimeLoopBase<Scalar>;
public:
- // copying the local residual class is not a good idea
- ImplicitLocalResidual(const ImplicitLocalResidual &) = delete;
-
- // the default constructor
- ImplicitLocalResidual() = default;
-
- /*!
- * \brief Initialize the local residual.
- *
- * This assumes that all objects of the simulation have been fully
- * allocated but not necessarily initialized completely.
- *
- * \param problem The representation of the physical problem to be
- * solved.
- */
- void init(Problem &problem)
- { problemPtr_ = &problem; }
+ //! the constructor for stationary problems
+ ImplicitLocalResidual() : prevSol_(nullptr) {}
+ //! the constructor for instationary problems
+ ImplicitLocalResidual(std::shared_ptr<TimeLoop> timeLoop)
+ : timeLoop_(timeLoop)
+ , prevSol_(nullptr)
+ {}
/*!
* \name User interface
* \note The following methods are usually expensive to evaluate
- * They are useful for outputting residual information.
+ * They are useful for outputting / postprocessing residual information.
*/
// \{
- /*!
- * \brief Compute the local residual, i.e. the deviation of the
- * equations from zero.
- *
- * \param element The DUNE Codim<0> entity for which the residual
- * ought to be calculated
- */
- void eval(const Element &element)
- {
- // make sure FVElementGeometry and volume variables are bound to the element
- auto fvGeometry = localView(problem().model().fvGridGeometry());
- fvGeometry.bind(element);
-
- auto curElemVolVars = localView(problem().model().curGlobalVolVars());
- curElemVolVars.bind(element, fvGeometry, problem().model().curSol());
-
- auto prevElemVolVars = localView(problem().model().prevGlobalVolVars());
- prevElemVolVars.bindElement(element, fvGeometry, problem().model().prevSol());
-
- auto elemFluxVarsCache = localView(problem().model().globalFluxVarsCache());
- elemFluxVarsCache.bindElement(element, fvGeometry, curElemVolVars);
-
- ElementBoundaryTypes bcTypes;
- bcTypes.update(problem(), element, fvGeometry);
-
- asImp_().eval(element, fvGeometry, prevElemVolVars, curElemVolVars, bcTypes, elemFluxVarsCache);
- }
-
/*!
* \brief Compute the storage term for the current solution.
*
@@ -125,52 +91,36 @@ public:
* \param element The DUNE Codim<0> entity for which the storage
* term ought to be calculated
*/
- void evalStorage(const Element &element)
+ ElementResidualVector evalStorage(const Problem& problem,
+ const Element &element,
+ const FVGridGeometry& fvGridGeometry,
+ const GridVariables& gridVariables,
+ const SolutionVector& sol) const
{
// make sure FVElementGeometry and volume variables are bound to the element
- auto fvGeometry = localView(problem().model().fvGridGeometry());
- fvGeometry.bindElement(element);
-
- auto curElemVolVars = localView(problem().model().curGlobalVolVars());
- curElemVolVars.bindElement(element, fvGeometry, problem().model().curSol());
-
- auto prevElemVolVars = localView(problem().model().prevGlobalVolVars());
- prevElemVolVars.bindElement(element, fvGeometry, problem().model().prevSol());
-
- asImp_().evalStorage_(fvGeometry, prevElemVolVars, curElemVolVars);
- }
-
- // !
- // * \brief Compute the flux term for the current solution.
- // *
- // * \param element The DUNE Codim<0> entity for which the residual
- // * ought to be calculated
- // * \param curVolVars The volume averaged variables for all
- // * sub-contol volumes of the element
-
- // void evalFluxes(const Element &element)
- // {
- // elemPtr_ = &element;
+ auto fvGeometry = localView(fvGridGeometry);
+ fvGeometry.bind(element);
- // // make sure FVElementGeometry and volume variables are bound to the element
- // problem().model().fvGeometries_().bind(element);
- // problem().model().curVolVars_().bind(element);
- // problem().model().prevVolVars_().bindElement(element);
- // problem().model().fluxVariablesCache_().bindElement(element);
+ auto elemVolVars = localView(gridVariables.curGridVolVars());
+ elemVolVars.bind(element, fvGeometry, sol);
- // ElementBoundaryTypes bcTypes;
- // bcTypes.update(problem(), element, fvGeometry_());
+ ElementResidualVector storage(fvGeometry.numScv());
- // residual_.resize(fvGeometry_().numScv);
- // residual_ = 0;
+ // calculate the amount of conservation each quantity inside
+ // all sub control volumes
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ auto localScvIdx = scv.indexInElement();
+ const auto& volVars = elemVolVars[scv];
+ storage[localScvIdx] = asImp().computeStorage(scv, volVars);
+ storage[localScvIdx] *= scv.volume() * volVars.extrusionFactor();
+ }
- // bcTypesPtr_ = &bcTypes;
- // asImp_().evalFluxes_();
- // }
+ return storage;
+ }
// \}
-
/*!
* \name Main interface
* \note Methods used by the assembler to compute derivatives and residual
@@ -179,244 +129,389 @@ public:
/*!
* \brief Compute the local residual, i.e. the deviation of the
- * equations from zero.
- *
+ * equations from zero for instationary problems.
+ * \param problem The problem to solve
+
* \param element The DUNE Codim<0> entity for which the residual
* ought to be calculated
* \param fvGeometry The finite-volume geometry of the element
* \param prevVolVars The volume averaged variables for all
- * sub-control volumes of the element at the previous
- * time level
+ * sub-control volumes of the element at the previous
+ * time level
* \param curVolVars The volume averaged variables for all
* sub-control volumes of the element at the current
* time level
* \param bcTypes The types of the boundary conditions for all
* vertices of the element
*/
- void eval(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- const ElementVolumeVariables& curElemVolVars,
- const ElementBoundaryTypes &bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ ElementResidualVector eval(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& prevElemVolVars,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementBoundaryTypes &bcTypes,
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
- // resize the vectors for all terms
- auto numScv = fvGeometry.numScv();
- residual_.resize(numScv);
- storageTerm_.resize(numScv);
+ assert(timeLoop_ && "no time loop set for storage term evaluation");
+ assert(prevSol_ && "no solution set for storage term evaluation");
- residual_ = 0.0;
- storageTerm_ = 0.0;
+ // initialize the residual vector for all scvs in this element
+ ElementResidualVector residual(fvGeometry.numScv());
+ residual = 0.0;
- asImp_().evalVolumeTerms_(element, fvGeometry, prevElemVolVars, curElemVolVars, bcTypes);
- asImp_().evalFluxes_(element, fvGeometry, curElemVolVars, bcTypes, elemFluxVarsCache);
- asImp_().evalBoundary_(element, fvGeometry, curElemVolVars, bcTypes, elemFluxVarsCache);
+ // evaluate the volume terms (storage + source terms)
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ //! foward to the local residual specialized for the discretization methods
+ asImp().evalStorage(residual, problem, element, fvGeometry, prevElemVolVars, curElemVolVars, scv);
+ asImp().evalSource(residual, problem, element, fvGeometry, curElemVolVars, scv);
+ }
+
+ for (auto&& scvf : scvfs(fvGeometry))
+ {
+ //! foward to the local residual specialized for the discretization methods
+ asImp().evalFlux(residual, problem, element, fvGeometry, curElemVolVars, bcTypes, elemFluxVarsCache, scvf);
+ }
+
+ return residual;
}
/*!
- * \brief Calculate the source term of the equation
- *
- * \param scv The sub-control volume over which we integrate the source term
- *
+ * \brief Compute the storage local residual, i.e. the deviation of the
+ * storage term from zero for instationary problems.
+ * \param problem The problem to solve
+
+ * \param element The DUNE Codim<0> entity for which the residual
+ * ought to be calculated
+ * \param fvGeometry The finite-volume geometry of the element
+ * \param prevVolVars The volume averaged variables for all
+ * sub-control volumes of the element at the previous
+ * time level
+ * \param curVolVars The volume averaged variables for all
+ * sub-control volumes of the element at the current
+ * time level
+ * \param bcTypes The types of the boundary conditions for all
+ * vertices of the element
*/
- PrimaryVariables computeSource(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolume &scv)
+ ElementResidualVector evalStorage(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& prevElemVolVars,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementBoundaryTypes &bcTypes,
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
- PrimaryVariables source(0);
+ assert(timeLoop_ && "no time loop set for storage term evaluation");
+ assert(prevSol_ && "no solution set for storage term evaluation");
- // add contributions from volume flux sources
- source += this->problem().source(element, fvGeometry, elemVolVars, scv);
+ // initialize the residual vector for all scvs in this element
+ ElementResidualVector residual(fvGeometry.numScv());
+ residual = 0.0;
- // add contribution from possible point sources
- source += this->problem().scvPointSources(element, fvGeometry, elemVolVars, scv);
+ // evaluate the volume terms (storage + source terms)
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ //! foward to the local residual specialized for the discretization methods
+ asImp().evalStorage(residual, problem, element, fvGeometry, prevElemVolVars, curElemVolVars, scv);
+ }
- return source;
+ return residual;
}
/*!
- * \brief Returns the local residual for all sub-control
- * volumes of the element.
- */
- const ElementSolutionVector &residual() const
- { return residual_; }
+ * \brief Compute the local residual, i.e. the deviation of the
+ * equations from zero for stationary problem.
+ * \param problem The problem to solve
- /*!
- * \brief Returns the local residual for a given sub-control
- * volume of the element.
- *
- * \param localScvIdx The local index of the sub-control volume
+ * \param element The DUNE Codim<0> entity for which the residual
+ * ought to be calculated
+ * \param fvGeometry The finite-volume geometry of the element
+ * \param curVolVars The volume averaged variables for all
+ * sub-control volumes of the element at the current
+ * time level
+ * \param bcTypes The types of the boundary conditions for all
+ * vertices of the element
*/
- const PrimaryVariables &residual(const int localScvIdx) const
- { return residual_[localScvIdx]; }
+ ElementResidualVector eval(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementBoundaryTypes &bcTypes,
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
+ {
+ // initialize the residual vector for all scvs in this element
+ ElementResidualVector residual(fvGeometry.numScv());
+ residual = 0.0;
+
+ // evaluate the volume terms (storage + source terms)
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ //! foward to the local residual specialized for the discretization methods
+ asImp().evalSource(residual, problem, element, fvGeometry, curElemVolVars, scv);
+ }
+
+ for (auto&& scvf : scvfs(fvGeometry))
+ {
+ //! foward to the local residual specialized for the discretization methods
+ asImp().evalFlux(residual, problem, element, fvGeometry, curElemVolVars, bcTypes, elemFluxVarsCache, scvf);
+ }
+
+ return residual;
+ }
+
+ // \}
- /*!
- * \brief Returns the storage term for all sub-control volumes of the
- * element.
- */
- const ElementSolutionVector &storageTerm() const
- { return storageTerm_; }
/*!
- * \brief Returns the storage term for a given sub-control volumes
- * of the element.
+ * \name Model specific interface
+ * \note The following method are the model specific implementations of the actual residual
*/
- const PrimaryVariables &storageTerm(const int localScvIdx) const
- { return storageTerm_[localScvIdx]; }
+ // \{
/*!
- * \brief Return the problem we are solving. Only call this after init()!
+ * \brief Calculate the source term of the equation
+ *
+ * \param scv The sub-control volume over which we integrate the source term
+ * \note has to be implemented by the model specific residual class
+ *
*/
- const Problem& problem() const
- { return *problemPtr_; }
+ ResidualVector computeStorage(const Problem& problem,
+ const SubControlVolume& scv,
+ const VolumeVariables& volVars) const
+ {
+ DUNE_THROW(Dune::NotImplemented, "This model does not implement a storage method!");
+ }
/*!
- * \brief Return the problem we are solving. Only call this after init()!
+ * \brief Calculate the source term of the equation
+ *
+ * \param scv The sub-control volume over which we integrate the source term
+ * \note This is the default implementation for all models as sources are computed
+ * in the user interface of the problem
+ *
*/
- Problem& problem()
- { return *problemPtr_; }
+ ResidualVector computeSource(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolume &scv) const
+ {
+ ResidualVector source(0.0);
- // \}
+ // add contributions from volume flux sources
+ source += problem.source(element, fvGeometry, elemVolVars, scv);
-protected:
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
+ // add contribution from possible point sources
+ source += problem.scvPointSources(element, fvGeometry, elemVolVars, scv);
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
+ return source;
+ }
- PrimaryVariables evalFlux_(const Element &element,
+ /*!
+ * \brief Calculate the source term of the equation
+ *
+ * \param scv The sub-control volume over which we integrate the source term
+ * \note has to be implemented by the model specific residual class
+ *
+ */
+ ResidualVector computeFlux(const Problem& problem,
+ const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
- return asImp_().computeFlux_(element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
+ DUNE_THROW(Dune::NotImplemented, "This model does not implement a flux method!");
}
+ // \}
+
/*!
- * \brief Set the local residual to the storage terms of all
- * sub-control volumes of the current element.
+ * \name Discretization specific interface
+ * \note The following method are the discretization specific wrapper methods
*/
- void evalStorage_(const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- const ElementVolumeVariables& curElemVolVars)
+ // \{
+
+ void evalStorage(ElementResidualVector& residual,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& prevElemVolVars,
+ const ElementVolumeVariables& curElemVolVars,
+ const SubControlVolume& scv) const
{
- storageTerm_.resize(fvGeometry.numScv());
- storageTerm_ = 0;
+ const auto& curVolVars = curElemVolVars[scv];
+ const auto& prevVolVars = prevElemVolVars[scv];
- // calculate the amount of conservation each quantity inside
- // all sub control volumes
- for (auto&& scv : scvs(fvGeometry))
- {
- auto localScvIdx = scv.indexInElement();
- const auto& volVars = curElemVolVars[scv];
- storageTerm_[localScvIdx] = asImp_().computeStorage(scv, volVars);
- storageTerm_[localScvIdx] *= scv.volume() * volVars.extrusionFactor();
- }
- }
+ // mass balance within the element. this is the
+ // \f$\frac{m}{\partial t}\f$ term if using implicit or explicit
+ // euler as time discretization.
+ //
+ // We might need a more explicit way for
+ // doing the time discretization...
- // PrimaryVariables evalSource_(const Element& element,
- // const FVElementGeometry& fvGeometry)
- // {
- // PrimaryVariables source(0);
- // const auto& fvGeometry = fvGeometry.fvElementGeometry();
- // for (auto&& scv : scvs(fvGeometry))
- // {
- // source += this->problem().source(element, scv);
+ //! Compute storage with the model specific storage residual
+ ResidualVector prevStorage = asImp().computeStorage(problem, scv, prevVolVars);
+ ResidualVector storage = asImp().computeStorage(problem, scv, curVolVars);
- // // add contribution from possible point sources
- // source += this->problem().scvPointSources(element, scv);
- // }
+ prevStorage *= prevVolVars.extrusionFactor();
+ storage *= curVolVars.extrusionFactor();
- // return source;
- // }
+ storage -= prevStorage;
+ storage *= scv.volume();
+ storage /= timeLoop_->timeStepSize();
- /*!
- * \brief Add the change the source term for stationary problems
- * to the local residual of all sub-control volumes of the
- * current element.
- */
- template<class P = Problem>
- typename std::enable_if<Dumux::Capabilities::isStationary<P>::value, void>::type
- evalVolumeTerms_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- const ElementVolumeVariables& curElemVolVars,
- const ElementBoundaryTypes &bcTypes)
+ residual[scv.indexInElement()] += storage;
+ }
+
+ void evalSource(ElementResidualVector& residual,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const SubControlVolume& scv) const
{
- // evaluate the volume terms (storage + source terms)
- for (auto&& scv : scvs(fvGeometry))
- {
- auto localScvIdx = scv.indexInElement();
- auto curExtrusionFactor = curElemVolVars[scv].extrusionFactor();
+ //! Compute source with the model specific storage residual
+ const auto& curVolVars = curElemVolVars[scv];
+ ResidualVector source = asImp().computeSource(problem, element, fvGeometry, curElemVolVars, scv);
+ source *= scv.volume()*curVolVars.extrusionFactor();
- // subtract the source term from the local rate
- PrimaryVariables source = asImp_().computeSource(element, fvGeometry, curElemVolVars, scv);
- source *= scv.volume()*curExtrusionFactor;
+ //! subtract source from local rate (sign convention in user interface)
+ residual[scv.indexInElement()] -= source;
+ }
- residual_[localScvIdx] -= source;
- }
+ void evalFlux(ElementResidualVector& residual,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const ElementBoundaryTypes& elemBcTypes,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const {}
+
+ ResidualVector evalFlux(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ return asImp().evalFlux(problem, element, fvGeometry, elemVolVars, elemFluxVarsCache, scvf);
}
- /*!
- * \brief Add the change in the storage terms and the source term
- * to the local residual of all sub-control volumes of the
- * current element.
- */
- template<class P = Problem>
- typename std::enable_if<!Dumux::Capabilities::isStationary<P>::value, void>::type
- evalVolumeTerms_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- const ElementVolumeVariables& curElemVolVars,
- const ElementBoundaryTypes &bcTypes)
+ template<class PartialDerivativeMatrix>
+ void addStorageDerivatives(PartialDerivativeMatrix& partialDerivatives,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const VolumeVariables& curVolVars,
+ const SubControlVolume& scv) const
{
- // evaluate the volume terms (storage + source terms)
- for (auto&& scv : scvs(fvGeometry))
- {
- auto localScvIdx = scv.indexInElement();
+ DUNE_THROW(Dune::NotImplemented, "analytic storage derivative");
+ }
- const auto& curVolVars = curElemVolVars[scv];
- const auto& prevVolVars = prevElemVolVars[scv];
+ template<class PartialDerivativeMatrix>
+ void addSourceDerivatives(PartialDerivativeMatrix& partialDerivatives,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const VolumeVariables& curVolVars,
+ const SubControlVolume& scv) const
+ {
+ DUNE_THROW(Dune::NotImplemented, "analytic source derivative");
+ }
- // mass balance within the element. this is the
- // \f$\frac{m}{\partial t}\f$ term if using implicit
- // euler as time discretization.
- //
- // We might need a more explicit way for
- // doing the time discretization...
- PrimaryVariables prevStorage = asImp_().computeStorage(scv, prevVolVars);
- PrimaryVariables curStorage = asImp_().computeStorage(scv, curVolVars);
+ template<class PartialDerivativeMatrices, class T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) != DiscretizationMethods::Box, void>
+ addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ DUNE_THROW(Dune::NotImplemented, "analytic flux derivative for cell-centered models");
+ }
- prevStorage *= prevVolVars.extrusionFactor();
- curStorage *= curVolVars.extrusionFactor();
+ template<class JacobianMatrix, class T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::Box, void>
+ addFluxDerivatives(JacobianMatrix& A,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ DUNE_THROW(Dune::NotImplemented, "analytic flux derivative for box models");
+ }
- storageTerm_[localScvIdx] = std::move(curStorage);
- storageTerm_[localScvIdx] -= std::move(prevStorage);
- storageTerm_[localScvIdx] *= scv.volume();
- storageTerm_[localScvIdx] /= problem().timeManager().timeStepSize();
+ template<class PartialDerivativeMatrices>
+ void addCCDirichletFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ DUNE_THROW(Dune::NotImplemented, "analytic Dirichlet flux derivative");
+ }
- // add the storage term to the residual
- residual_[localScvIdx] += storageTerm_[localScvIdx];
+ template<class PartialDerivativeMatrices>
+ void addRobinFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ DUNE_THROW(Dune::NotImplemented, "analytic Robin flux derivative");
+ }
- // subtract the source term from the local rate
- PrimaryVariables source = asImp_().computeSource(element, fvGeometry, curElemVolVars, scv);
- source *= scv.volume()*curVolVars.extrusionFactor();
+ /*!
+ * \brief Sets the solution from which to start the time integration. Has to be
+ * called prior to assembly for time-dependent problems.
+ */
+ void setPreviousSolution(const SolutionVector& u)
+ { prevSol_ = &u; }
- residual_[localScvIdx] -= source;
- }
+ /*!
+ * \brief Return the solution that has been set as the previous one.
+ */
+ const SolutionVector& prevSol() const
+ {
+ assert(prevSol_ && "no solution set for storage term evaluation");
+ return *prevSol_;
}
+ /*!
+ * \brief If no solution has been set, we treat the problem as stationary.
+ */
+ bool isStationary() const
+ { return !prevSol_; }
+
+ // \}
protected:
- ElementSolutionVector storageTerm_;
- ElementSolutionVector residual_;
+ TimeLoop& timeLoop()
+ { return *timeLoop_; }
+
+ const TimeLoop& timeLoop() const
+ { return *timeLoop_; }
+
+ Implementation &asImp()
+ { return *static_cast<Implementation*>(this); }
+
+ const Implementation &asImp() const
+ { return *static_cast<const Implementation*>(this); }
private:
- Problem* problemPtr_;
+ std::shared_ptr<TimeLoop> timeLoop_;
+ const SolutionVector* prevSol_;
};
-}
+} // end namespace Dumux
#endif
diff --git a/dumux/implicit/model.hh b/dumux/implicit/model.hh
deleted file mode 100644
index b385c5be8d36c566266c6131563eec1cf2c08c1d..0000000000000000000000000000000000000000
--- a/dumux/implicit/model.hh
+++ /dev/null
@@ -1,844 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for fully-implicit models
- */
-#ifndef DUMUX_IMPLICIT_MODEL_HH
-#define DUMUX_IMPLICIT_MODEL_HH
-
-#include <dune/geometry/type.hh>
-#include <dune/istl/bvector.hh>
-
-#include "properties.hh"
-#include "localresidual.hh"
-#include <dumux/implicit/adaptive/gridadaptproperties.hh>
-#include <dumux/common/valgrind.hh>
-#include <dumux/parallel/vertexhandles.hh>
-#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
-
-namespace Dumux
-{
-
-// forward declaration of the friend localresidual classes
-template <class TypeTag> class CCLocalResidual;
-template <class TypeTag> class BoxLocalResidual;
-
-/*!
- * \ingroup ImplicitModel
- * \brief The base class for the vertex centered finite volume
- * discretization scheme.
- */
-template<class TypeTag>
-class ImplicitModel
-{
- // The local jacobian needs to be able to modify objects during the assembly
- friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
-
- // the primary variable need to modify the volume variables when global caching is enabled
- friend class PrimaryVariableSwitch<TypeTag>;
- friend typename GET_PROP_TYPE(TypeTag, PrimaryVariableSwitch);
-
- using Implementation = typename GET_PROP_TYPE(TypeTag, Model);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using ElementMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
- using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using JacobianAssembler = typename GET_PROP_TYPE(TypeTag, JacobianAssembler);
- using GlobalVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using FluxVariablesCache = typename GET_PROP_TYPE(TypeTag, FluxVariablesCache);
- using GlobalFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
-
- enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
- dim = GridView::dimension
- };
-
- using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using LocalJacobian = typename GET_PROP_TYPE(TypeTag, LocalJacobian);
- using LocalResidual = typename GET_PROP_TYPE(TypeTag, LocalResidual);
- using NewtonMethod = typename GET_PROP_TYPE(TypeTag, NewtonMethod);
- using NewtonController = typename GET_PROP_TYPE(TypeTag, NewtonController);
- using CoordScalar = typename GridView::ctype;
- using Element = typename GridView::template Codim<0>::Entity;
- using ReferenceElements = typename Dune::ReferenceElements<CoordScalar, dim>;
-
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dim : 0 };
-
-public:
-
- // copying a model is not a good idea
- ImplicitModel(const ImplicitModel &) = delete;
-
- /*!
- * \brief The constructor.
- */
- ImplicitModel() : problemPtr_(nullptr) {}
-
- //! "Properties"
-
- //! If a certain component is balanced in this model
- // per default all phases are balanced. See e.g. Richards for an example where
- // the air component exists but is not balanced. Or the tracer model where the
- // carrier phase main component exists but is not balanced.
- static constexpr bool mainComponentIsBalanced(int phaseIdx)
- { return true; }
-
- /*!
- * \brief Apply the initial conditions to the model.
- *
- * \param problem The object representing the problem which needs to
- * be simulated.
- */
- void init(Problem &problem)
- {
- problemPtr_ = &problem;
-
- updateBoundaryIndices_();
-
- fvGridGeometryPtr_ = std::make_shared<FVGridGeometry>(problem.gridView());
- fvGridGeometryPtr_->update(problem);
-
- int numDofs = asImp_().numDofs();
- uCur_.resize(numDofs);
-
- // apply initial solution
- // for compositional models initial the phase presence herein
- asImp_().applyInitialSolution_();
-
- // resize and update the volVars with the initial solution
- curGlobalVolVars_.update(problem, curSol());
-
- // initialize assembler and create matrix
- localJacobian_.init(problem);
- jacAsm_ = std::make_shared<JacobianAssembler>();
- jacAsm_->init(problem);
-
- // update the flux variables caches
- globalfluxVarsCache_.update(problem);
-
- // also set the solution of the "previous" time step to the
- // initial solution.
- uPrev_ = uCur_;
- prevGlobalVolVars_ = curGlobalVolVars_;
- }
-
- /*!
- * \brief Compute the global residual for an arbitrary solution
- * vector.
- *
- * \param residual Stores the result
- * \param u The solution for which the residual ought to be calculated
- */
- Scalar globalResidual(SolutionVector &residual,
- const SolutionVector &u)
- {
- SolutionVector tmp(curSol());
- curSol() = u;
- Scalar res = globalResidual(residual);
- curSol() = tmp;
- return res;
- }
-
- /*!
- * \brief Compute the global residual for the current solution
- * vector.
- *
- * \param residual Stores the result
- */
- Scalar globalResidual(SolutionVector &residual)
- {
- residual = 0;
-
- for (const auto& element : elements(gridView_())) {
- localResidual().eval(element);
-
- if (isBox)
- {
- for (unsigned int i = 0; i < element.subEntities(dim); ++i)
- {
- int globalI = vertexMapper().subIndex(element, i, dim);
- residual[globalI] += localResidual().residual(i);
- }
- }
- else
- {
- int globalI = elementMapper().index(element);
- residual[globalI] = localResidual().residual(0);
- }
- }
-
- // calculate the square norm of the residual
- Scalar result2 = residual.two_norm2();
- if (gridView_().comm().size() > 1)
- result2 = gridView_().comm().sum(result2);
-
- // add up the residuals on the process borders
- if (isBox && gridView_().comm().size() > 1) {
- VertexHandleSum<PrimaryVariables, SolutionVector, VertexMapper>
- sumHandle(residual, vertexMapper());
- gridView_().communicate(sumHandle,
- Dune::InteriorBorder_InteriorBorder_Interface,
- Dune::ForwardCommunication);
- }
- using std::sqrt;
- return sqrt(result2);
- }
-
- /*!
- * \brief Compute the integral over the domain of the storage
- * terms of all conservation quantities.
- *
- * \param storage Stores the result
- */
- void globalStorage(PrimaryVariables &storage)
- {
- storage = 0;
-
- for (const auto& element : elements(gridView_(), Dune::Partitions::interior))
- {
- localResidual().evalStorage(element);
-
- if (isBox)
- {
- for (int i = 0; i < element.subEntities(dim); ++i)
- {
- storage += localResidual().storageTerm()[i];
- }
- }
- else
- {
- storage += localResidual().storageTerm()[0];
- }
- }
-
- if (gridView_().comm().size() > 1)
- storage = gridView_().comm().sum(storage);
- }
-
- void adaptVariableSize()
- {
- uCur_.resize(numDofs());
- }
-
- /*!
- * \brief Reference to the current solution as a block vector.
- */
- const SolutionVector &curSol() const
- { return uCur_; }
-
- /*!
- * \brief Reference to the current solution as a block vector.
- */
- SolutionVector &curSol()
- { return uCur_; }
-
- /*!
- * \brief Reference to the previous solution as a block vector.
- */
- const SolutionVector &prevSol() const
- { return uPrev_; }
-
- /*!
- * \brief Reference to the previous solution as a block vector.
- */
- SolutionVector &prevSol()
- { return uPrev_; }
-
- /*!
- * \brief Obtains the current solution inside a given element.
- * Specialization for the box method.
- */
- template<class T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, ImplicitIsBox), ElementSolution>::type
- elementSolution(const Element& element, const SolutionVector& sol) const
- {
- auto numVert = element.subEntities(dofCodim);
- ElementSolution elemSol(numVert);
- for (int v = 0; v < numVert; ++v)
- elemSol[v] = sol[vertexMapper().subIndex(element, v, dofCodim)];
- return elemSol;
- }
-
- /*!
- * \brief Obtains the current solution inside a given element.
- * Specialization for cell-centered methods.
- */
- template<class T = TypeTag>
- typename std::enable_if<!GET_PROP_VALUE(T, ImplicitIsBox), ElementSolution>::type
- elementSolution(const Element& element, const SolutionVector& sol) const
- { return ElementSolution({ sol[elementMapper().index(element)] }); }
-
- /*!
- * \brief Returns the operator assembler for the global jacobian of
- * the problem.
- */
- JacobianAssembler &jacobianAssembler()
- { return *jacAsm_; }
-
- /*!
- * \copydoc jacobianAssembler()
- */
- const JacobianAssembler &jacobianAssembler() const
- { return *jacAsm_; }
-
- /*!
- * \brief Returns the local jacobian which calculates the local
- * stiffness matrix for an arbitrary element.
- *
- * The local stiffness matrices of the element are used by
- * the jacobian assembler to produce a global linerization of the
- * problem.
- */
- LocalJacobian &localJacobian()
- { return localJacobian_; }
- /*!
- * \copydoc localJacobian()
- */
- const LocalJacobian &localJacobian() const
- { return localJacobian_; }
-
- /*!
- * \brief Returns the local residual function.
- */
- LocalResidual &localResidual()
- { return localJacobian().localResidual(); }
- /*!
- * \copydoc localResidual()
- */
- const LocalResidual &localResidual() const
- { return localJacobian().localResidual(); }
-
- /*!
- * \brief Returns the maximum relative shift between two vectors of
- * primary variables.
- *
- * \param priVars1 The first vector of primary variables
- * \param priVars2 The second vector of primary variables
- */
- Scalar relativeShiftAtDof(const PrimaryVariables &priVars1,
- const PrimaryVariables &priVars2)
- {
- Scalar result = 0.0;
- using std::abs;
- using std::max;
- for (int j = 0; j < numEq; ++j) {
- Scalar eqErr = abs(priVars1[j] - priVars2[j]);
- eqErr /= max<Scalar>(1.0,abs(priVars1[j] + priVars2[j])/2);
-
- result = max(result, eqErr);
- }
- return result;
- }
-
- /*!
- * \brief Try to progress the model to the next timestep.
- *
- * \param solver The non-linear solver
- * \param controller The controller which specifies the behaviour
- * of the non-linear solver
- */
- bool update(NewtonMethod &solver,
- NewtonController &controller)
- {
-#if HAVE_VALGRIND
- for (size_t i = 0; i < curSol().size(); ++i)
- Valgrind::CheckDefined(curSol()[i]);
-#endif // HAVE_VALGRIND
-
- asImp_().updateBegin();
-
- int converged = solver.execute(controller);
-
- if (this->gridView_().comm().size() > 1)
- {
- converged = this->gridView_().comm().min(converged);
- }
- if (converged) {
- asImp_().updateSuccessful();
- }
- else
- asImp_().updateFailed();
-
-#if HAVE_VALGRIND
- for (size_t i = 0; i < curSol().size(); ++i) {
- Valgrind::CheckDefined(curSol()[i]);
- }
-#endif // HAVE_VALGRIND
-
- return converged;
- }
-
- /*!
- * \brief Check the plausibility of the current solution
- *
- * This has to be done by the actual model, it knows
- * best, what (ranges of) variables to check.
- * This is primarily a hook
- * which the actual model can overload.
- */
- void checkPlausibility() const
- { }
-
- /*!
- * \brief Called by the update() method before it tries to
- * apply the newton method. This is primarily a hook
- * which the actual model can overload.
- */
- void updateBegin()
- {
- if(GET_PROP_VALUE(TypeTag, AdaptiveGrid) && problem_().gridChanged())
- {
- // update boundary indices
- updateBoundaryIndices_();
-
- // update the fv geometry
- fvGridGeometryPtr_->update(problem_());
-
- // resize and update the volVars with the initial solution
- curGlobalVolVars_.update(problem_(), curSol());
-
- // resize the matrix and assembly map if necessary
- localJacobian().init(problem_());
- jacobianAssembler().init(problem_());
-
- // update the flux variables caches
- globalfluxVarsCache_.update(problem_());
-
- // update the previous solution and volvars
- uPrev_ = uCur_;
- prevGlobalVolVars_ = curGlobalVolVars_;
- }
- }
-
- /*!
- * \brief Called by the update() method if it was
- * successful. This is primarily a hook which the actual
- * model can overload.
- */
- void updateSuccessful()
- {}
-
- void newtonEndStep()
- {
- // TODO resize vector if grid was adapted
- curGlobalVolVars_.update(problem_(), curSol());
- }
-
- /*!
- * \brief Called by the update() method if it was
- * unsuccessful. This is primarily a hook which the actual
- * model can overload.
- */
- void updateFailed()
- {
- // Reset the current solution to the one of the
- // previous time step so that we can start the next
- // update at a physically meaningful solution.
- uCur_ = uPrev_;
- curGlobalVolVars_ = prevGlobalVolVars_;
- }
-
- /*!
- * \brief Called by the problem if a time integration was
- * successful, post processing of the solution is done and
- * the result has been written to disk.
- *
- * This should prepare the model for the next time integration.
- */
- void advanceTimeLevel()
- {
- // make the current solution the previous one.
- uPrev_ = uCur_;
- prevGlobalVolVars_ = curGlobalVolVars_;
- }
-
- /*!
- * \brief Serializes the current state of the model.
- *
- * \tparam Restarter The type of the serializer class
- *
- * \param res The serializer object
- */
- template <class Restarter>
- void serialize(Restarter &res)
- {
- res.template serializeEntities<dofCodim>(asImp_(), this->gridView_());
- }
-
- /*!
- * \brief Deserializes the state of the model.
- *
- * \tparam Restarter The type of the serializer class
- *
- * \param res The serializer object
- */
- template <class Restarter>
- void deserialize(Restarter &res)
- {
- res.template deserializeEntities<dofCodim>(asImp_(), this->gridView_());
- prevSol() = curSol();
- }
-
- /*!
- * \brief Write the current solution for a vertex to a restart
- * file.
- *
- * \param outstream The stream into which the vertex data should
- * be serialized to
- * \param entity The entity which's data should be
- * serialized, i.e. a vertex for the box method
- * and an element for the cell-centered method
- */
- template <class Entity>
- void serializeEntity(std::ostream &outstream,
- const Entity &entity)
- {
- int dofIdxGlobal = dofMapper().index(entity);
-
- // write phase state
- if (!outstream.good()) {
- DUNE_THROW(Dune::IOError,
- "Could not serialize vertex "
- << dofIdxGlobal);
- }
-
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
- outstream << curSol()[dofIdxGlobal][eqIdx] << " ";
- }
- }
-
- /*!
- * \brief Reads the current solution variables for a vertex from a
- * restart file.
- *
- * \param instream The stream from which the vertex data should
- * be deserialized from
- * \param entity The entity which's data should be
- * serialized, i.e. a vertex for the box method
- * and an element for the cell-centered method
- */
- template <class Entity>
- void deserializeEntity(std::istream &instream,
- const Entity &entity)
- {
- int dofIdxGlobal = dofMapper().index(entity);
-
- for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
- if (!instream.good())
- DUNE_THROW(Dune::IOError,
- "Could not deserialize vertex "
- << dofIdxGlobal);
- instream >> curSol()[dofIdxGlobal][eqIdx];
- }
- }
-
- /*!
- * \brief Returns the number of global degrees of freedoms (DOFs)
- */
- size_t numDofs() const
- {
- return gridView_().size(dofCodim);
- }
-
- /*!
- * \brief Mapper for the entities where degrees of freedoms are
- * defined to indices.
- *
- * Is the box method is used, this means a mapper
- * for vertices, if the cell centered method is used,
- * this means a mapper for elements.
- */
- template <class T = TypeTag>
- const typename std::enable_if<GET_PROP_VALUE(T, ImplicitIsBox), VertexMapper>::type &dofMapper() const
- {
- return problem_().vertexMapper();
- }
- template <class T = TypeTag>
- const typename std::enable_if<!GET_PROP_VALUE(T, ImplicitIsBox), ElementMapper>::type &dofMapper() const
- {
- return problem_().elementMapper();
- }
-
- /*!
- * \brief Mapper for vertices to indices.
- */
- const VertexMapper &vertexMapper() const
- { return problem_().vertexMapper(); }
-
- /*!
- * \brief Mapper for elements to indices.
- */
- const ElementMapper &elementMapper() const
- { return problem_().elementMapper(); }
-
- /*!
- * \brief Resets the Jacobian matrix assembler, so that the
- * boundary types can be altered.
- */
- void resetJacobianAssembler ()
- {
- jacAsm_.template reset<JacobianAssembler>(0);
- jacAsm_ = std::make_shared<JacobianAssembler>();
- jacAsm_->init(problem_());
- }
-
- /*!
- * \brief Update the weights of all primary variables within an
- * element given the complete set of volume variables
- *
- * \param element The DUNE codim 0 entity
- * \param volVars All volume variables for the element
- */
- void updatePVWeights(const FVElementGeometry& fvGeometry) const
- {}
-
- /*!
- * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
- */
- template<class VtkOutputModule>
- void addVtkOutputFields(VtkOutputModule& outputModule) const
- {}
-
- /*!
- * \brief Reference to the grid view of the spatial domain.
- */
- const GridView &gridView() const
- { return problem_().gridView(); }
-
- /*!
- * \brief Returns true if the entity indicated by 'dofIdxGlobal'
- * is located on / touches the grid's boundary.
- *
- * \param dofIdxGlobal The global index of the entity
- */
- bool onBoundary(const int dofIdxGlobal) const
- { return boundaryIndices_[dofIdxGlobal]; }
-
- /*!
- * \brief Returns true if a vertex is located on the grid's
- * boundary.
- *
- * \param element A DUNE Codim<0> entity which contains the control
- * volume's associated vertex.
- * \param vIdx The local vertex index inside element
- */
- bool onBoundary(const SubControlVolume &scv) const
- {
- return asImp_().onBoundary(scv.dofIndex());
- }
-
- const GlobalFluxVariablesCache& globalFluxVarsCache() const
- { return globalfluxVarsCache_; }
-
- const GlobalVolumeVariables& curGlobalVolVars() const
- { return curGlobalVolVars_; }
-
- const GlobalVolumeVariables& prevGlobalVolVars() const
- { return prevGlobalVolVars_; }
-
- const FVGridGeometry& fvGridGeometry() const
- { return *fvGridGeometryPtr_; }
-
-protected:
-
- /*!
- * \brief A non const reference to current global vol vars vector.
- *
- * The local jacobian needs this access during the calculation of
- * the derivatives in the case of global volume variables caching.
- */
- template<class T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), GlobalVolumeVariables>::type&
- nonConstCurGlobalVolVars()
- { return curGlobalVolVars_; }
-
- /*!
- * \brief A reference to the problem on which the model is applied.
- */
- Problem &problem_()
- { return *problemPtr_; }
- /*!
- * \copydoc problem_()
- */
- const Problem &problem_() const
- { return *problemPtr_; }
-
- /*!
- * \brief Reference to the grid view of the spatial domain.
- */
- const GridView &gridView_() const
- { return problem_().gridView(); }
-
- /*!
- * \brief Reference to the local residual object
- */
- LocalResidual &localResidual_()
- { return localJacobian_.localResidual(); }
-
- /*!
- * \brief Applies the initial solution for all degrees of freedom of the grid.
- *
- */
- void applyInitialSolution_()
- {
- // first set the whole domain to zero
- uCur_ = Scalar(0.0);
-
- // set the initial values by forwarding to a specialized method
- applyInitialSolutionImpl_(std::integral_constant<bool, isBox>());
-
- // add up the primary variables which cross process borders
- if (isBox && gridView_().comm().size() > 1)
- {
- VertexHandleSum<PrimaryVariables, SolutionVector, VertexMapper>
- sumPVHandle(uCur_, vertexMapper());
- gridView_().communicate(sumPVHandle,
- Dune::InteriorBorder_InteriorBorder_Interface,
- Dune::ForwardCommunication);
- }
- }
-
- /*!
- * \brief Applies the initial solution for the box method
- */
- void applyInitialSolutionImpl_(std::true_type)
- {
- for (const auto& vertex : vertices(problem_().gridView()))
- {
- const auto dofIdxGlobal = dofMapper().index(vertex);
- uCur_[dofIdxGlobal] = problem_().initial(vertex);
- }
- }
-
- /*!
- * \brief Applies the initial solution for cell-centered methods
- */
- void applyInitialSolutionImpl_(std::false_type)
- {
- for (const auto& element : elements(problem_().gridView()))
- {
- const auto dofIdxGlobal = dofMapper().index(element);
- uCur_[dofIdxGlobal] = problem_().initial(element);
- }
- }
-
- /*!
- * \brief Find all indices of boundary vertices (box) / elements (cell centered).
- */
- void updateBoundaryIndices_()
- {
- boundaryIndices_.resize(numDofs());
- std::fill(boundaryIndices_.begin(), boundaryIndices_.end(), false);
-
- for (const auto& element : elements(gridView_())) {
- Dune::GeometryType geomType = element.geometry().type();
- const auto &refElement = ReferenceElements::general(geomType);
-
- for (const auto& intersection : intersections(gridView_(), element))
- {
- if (isBox)
- {
- if (intersection.boundary())
- {
- // add all vertices on the intersection to the set of
- // boundary vertices
- int fIdx = intersection.indexInInside();
- int numFaceVerts = refElement.size(fIdx, 1, dim);
- for (int faceVertexIdx = 0;
- faceVertexIdx < numFaceVerts;
- ++faceVertexIdx)
- {
- int vIdx = refElement.subEntity(fIdx,
- 1,
- faceVertexIdx,
- dim);
- int vIdxGlobal = vertexMapper().subIndex(element, vIdx, dim);
- boundaryIndices_[vIdxGlobal] = true;
- }
- }
- }
- else
- {
- if (intersection.boundary() || problem_().isInteriorBoundary(element, intersection))
- {
- int eIdxGlobal = elementMapper().index(element);
- boundaryIndices_[eIdxGlobal] = true;
- }
- }
- }
- }
- }
-
- // the problem we want to solve. defines the constitutive
- // relations, material laws, etc.
- Problem *problemPtr_;
-
- // calculates the local jacobian matrix for a given element
- LocalJacobian localJacobian_;
- // Linearizes the problem at the current time step using the
- // local jacobian
- std::shared_ptr<JacobianAssembler> jacAsm_;
-
- // the set of all indices of vertices on the boundary
- std::vector<bool> boundaryIndices_;
-
- // cur is the current iterative solution, prev the converged
- // solution of the previous time step
- SolutionVector uCur_;
- SolutionVector uPrev_;
-
- // the current and previous variables (primary and secondary variables)
- GlobalVolumeVariables curGlobalVolVars_;
- GlobalVolumeVariables prevGlobalVolVars_;
-
- // the flux variables cache vector vector
- GlobalFluxVariablesCache globalfluxVarsCache_;
-
- // the finite volume element geometries
- std::shared_ptr<FVGridGeometry> fvGridGeometryPtr_;
-
-private:
- /*!
- * \brief Returns whether messages should be printed
- */
- bool verbose_() const
- { return gridView_().comm().rank() == 0; }
-
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
-
-};
-
-} // end namespace Dumux
-
-#include "propertydefaults.hh"
-
-#endif
diff --git a/dumux/implicit/properties.hh b/dumux/implicit/properties.hh
deleted file mode 100644
index 87b8cf07e1840ac4cbd7780a53651f180417eeb1..0000000000000000000000000000000000000000
--- a/dumux/implicit/properties.hh
+++ /dev/null
@@ -1,167 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-#ifndef DUMUX_IMPLICIT_PROPERTIES_HH
-#define DUMUX_IMPLICIT_PROPERTIES_HH
-
-#include <dumux/common/propertysystem.hh>
-
-#include <dumux/common/basicproperties.hh>
-#include <dumux/linear/linearsolverproperties.hh>
-#include <dumux/nonlinear/newtonmethod.hh>
-#include <dumux/implicit/adaptive/gridadaptproperties.hh>
-
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \file
- * \brief Specify the shape functions, operator assemblers, etc
- * used for the ImplicitModel.
- */
-namespace Dumux
-{
-
-namespace Properties
-{
-// \{
-
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tag for fully-implicit models
-NEW_TYPE_TAG(ImplicitBase, INHERITS_FROM(NewtonMethod, LinearSolverTypeTag, NumericModel, GridAdapt));
-
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-
-NEW_PROP_TAG(BaseModel); //!< The type of the base class of the model
-NEW_PROP_TAG(NumEq); //!< Number of equations in the system of PDEs
-NEW_PROP_TAG(BaseLocalResidual); //!< The type of the base class of the local residual
-NEW_PROP_TAG(LocalResidual); //!< The type of the local residual function
-NEW_PROP_TAG(EnergyLocalResidual); //! The local residual of the energy equation
-NEW_PROP_TAG(LocalJacobian); //!< The type of the local jacobian operator
-
-NEW_PROP_TAG(SubControlVolume);//!< The type of the sub control volume
-NEW_PROP_TAG(SubControlVolumeFace); //!< The type of the sub control volume face
-NEW_PROP_TAG(FVElementGeometry); //!< The type of the local finite volume geometry (iterators over scvs, scvfs)
-NEW_PROP_TAG(FVGridGeometry); //!< The type of the global finite volume geometry
-NEW_PROP_TAG(EnableFVGridGeometryCache); //! specifies if geometric data is be saved (faster, but more memory consuming)
-
-NEW_PROP_TAG(JacobianAssembler); //!< Assembles the global jacobian matrix
-NEW_PROP_TAG(JacobianMatrix); //!< Type of the global jacobian matrix
-NEW_PROP_TAG(BoundaryTypes); //!< Stores the boundary types of a single degree of freedom
-NEW_PROP_TAG(ElementBoundaryTypes); //!< Stores the boundary types on an element
-
-NEW_PROP_TAG(PrimaryVariables); //!< A vector of primary variables within a sub-control volume
-NEW_PROP_TAG(SolutionVector); //!< Vector containing all primary variable vector of the grid
-NEW_PROP_TAG(ElementSolutionVector); //!< A vector of primary variables within a sub-control volume
-
-NEW_PROP_TAG(EnableGlobalVolumeVariablesCache); //!< If disabled, the volume variables are not stored (reduces memory, but is slower)
-NEW_PROP_TAG(VolumeVariables); //!< The secondary variables within a sub-control volume
-NEW_PROP_TAG(ElementVolumeVariables); //!< The type for a local (element/stencil) container for the volume variables
-NEW_PROP_TAG(GlobalVolumeVariables); //!< The type for a global container for the volume variables
-NEW_PROP_TAG(FluxVariables); //!< Container storing the different types of flux variables
-NEW_PROP_TAG(FluxVariablesCache); //!< Stores data associated with flux vars (if enabled)
-NEW_PROP_TAG(GlobalFluxVariablesCache); //!< The global vector of flux variable containers
-NEW_PROP_TAG(ElementFluxVariablesCache); //!< A local vector of flux variable caches per element
-NEW_PROP_TAG(EnableGlobalFluxVariablesCache); //! specifies if data on flux vars should be saved (faster, but more memory consuming)
-NEW_PROP_TAG(BoundaryVariables); //!< Data required to calculate fluxes over boundary faces in cc models(outflow)
-NEW_PROP_TAG(ConstantBoundaryConditions); //!< specifies whether or not the boundary conditions are constant over time
-NEW_PROP_TAG(DiscretizationMethod); //!< Property for the used discretization method
-NEW_PROP_TAG(PrimaryVariableSwitch); //!< The primary variable switch needed for compositional models
-
-// Specify the forms of fluxes that should be considered in the model
-// also, specify their corresponding flux variables
-NEW_PROP_TAG(EnableAdvection); //! specifies if advection is considered in the model
-NEW_PROP_TAG(AdvectionType); //! The type for the calculation the advective fluxes
-NEW_PROP_TAG(SolutionDependentAdvection); //!< specifies if the parameters for the advective fluxes depend on the solution
-NEW_PROP_TAG(EnableMolecularDiffusion); //! specifies if molecular diffusive fluxes are considered in the model
-NEW_PROP_TAG(MolecularDiffusionType); //! The type for the calculation of the molecular diffusion fluxes
-NEW_PROP_TAG(SolutionDependentMolecularDiffusion); //!< specifies if the parameters for the diffusive fluxes depend on the solution
-NEW_PROP_TAG(EnableEnergyBalance); //! Specifies if the model solves an energy equation
-NEW_PROP_TAG(HeatConductionType); //! The type for the calculation of the heat conduction fluxes
-NEW_PROP_TAG(SolutionDependentHeatConduction); //!< specifies if the parameters for the heat conduction fluxes depend on the solution
-
-// specify if we evaluate the permeability in the volume (for discontinuous fields)
-// or at the scvf center for analytical permeability fields (e.g. convergence studies)
-NEW_PROP_TAG(EvaluatePermeabilityAtScvfIP);
-
-// vtk output
-NEW_PROP_TAG(VtkAddVelocity); //!< specifies if an element velocity it reconstructed for the output
-NEW_PROP_TAG(VtkAddProcessRank); //!< specifies if the process rank should be added the output
-NEW_PROP_TAG(VtkOutputModule); //!< specifies the output module to be used
-NEW_PROP_TAG(VelocityOutput); //!< specifies the velocity calculation module to be used
-
-// high level simulation control
-NEW_PROP_TAG(TimeManager); //!< Manages the simulation time
-NEW_PROP_TAG(NewtonMethod); //!< The type of the newton method
-NEW_PROP_TAG(NewtonController); //!< The type of the newton controller
-NEW_PROP_TAG(NewtonConvergenceWriter); //!< The type of the newton convergence writer
-
-//! Specify whether the jacobian matrix of the last iteration of a
-//! time step should be re-used as the jacobian of the first iteration
-//! of the next time step.
-NEW_PROP_TAG(ImplicitEnableJacobianRecycling);
-
-//! Specify whether the jacobian matrix should be only reassembled for
-//! elements where at least one vertex is above the specified
-//! tolerance
-NEW_PROP_TAG(ImplicitEnablePartialReassemble);
-
-/*!
- * \brief Specify which kind of method should be used to numerically
- * calculate the partial derivatives of the residual.
- *
- * -1 means backward differences, 0 means central differences, 1 means
- * forward differences. By default we use central differences.
- */
-NEW_PROP_TAG(ImplicitNumericDifferenceMethod);
-
-// mappers from local to global indices
-
-//! mapper for vertices
-NEW_PROP_TAG(VertexMapper);
-//! mapper for elements
-NEW_PROP_TAG(ElementMapper);
-//! mapper for degrees of freedom
-NEW_PROP_TAG(DofMapper);
-
-//! the maximum allowed number of timestep divisions for the
-//! Newton solver
-NEW_PROP_TAG(ImplicitMaxTimeStepDivisions);
-
-//! indicate whether discretization is box or not
-NEW_PROP_TAG(ImplicitIsBox);
-
-//! the upwind weight for the advective term
-NEW_PROP_TAG(ImplicitUpwindWeight);
-
-//! the local fem space used for the AMG backend
-NEW_PROP_TAG(ImplicitLocalFemMap);
-
-//! the PDELab backend used for the AMG backend
-NEW_PROP_TAG(ImplicitPDELabBackend);
-
-}
-}
-
-// \}
-
-#endif
diff --git a/dumux/implicit/propertydefaults.hh b/dumux/implicit/propertydefaults.hh
deleted file mode 100644
index 0cb162d8e0b324d105ea2228bb86bf92a49ced6b..0000000000000000000000000000000000000000
--- a/dumux/implicit/propertydefaults.hh
+++ /dev/null
@@ -1,240 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \file
- * \brief Default properties for implicit models
- */
-#ifndef DUMUX_IMPLICIT_PROPERTY_DEFAULTS_HH
-#define DUMUX_IMPLICIT_PROPERTY_DEFAULTS_HH
-
-#include <dune/common/fvector.hh>
-#include <dune/common/fmatrix.hh>
-#include <dune/grid/common/mcmgmapper.hh>
-#include <dune/istl/bcrsmatrix.hh>
-
-#include <dumux/nonlinear/newtonmethod.hh>
-#include <dumux/nonlinear/newtoncontroller.hh>
-#include <dumux/nonlinear/newtonconvergencewriter.hh>
-#include <dumux/common/boundarytypes.hh>
-#include <dumux/common/timemanager.hh>
-#include <dumux/linear/amgbackend.hh>
-
-#include <dumux/porousmediumflow/implicit/fluxvariables.hh>
-#include <dumux/porousmediumflow/implicit/fluxvariablescache.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh>
-#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
-
-#include <dumux/discretization/volumevariables.hh>
-#include <dumux/discretization/darcyslaw.hh>
-#include <dumux/discretization/fickslaw.hh>
-#include <dumux/discretization/fourierslaw.hh>
-
-#include <dumux/io/vtkoutputmodulebase.hh>
-#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
-
-#include "properties.hh"
-#include "model.hh"
-#include "assembler.hh"
-#include "localjacobian.hh"
-
-#include <dune/common/version.hh>
-
-namespace Dumux {
-
-// forward declarations
-template <class TypeTag> class NewtonController;
-template <class TypeTag> class AMGBackend;
-
-namespace Properties {
-//////////////////////////////////////////////////////////////////
-// Some defaults for very fundamental properties
-//////////////////////////////////////////////////////////////////
-
-//! Set the default type for the time manager
-SET_TYPE_PROP(ImplicitBase, TimeManager, TimeManager<TypeTag>);
-
-//////////////////////////////////////////////////////////////////
-// Properties
-//////////////////////////////////////////////////////////////////
-
-//! Use the leaf grid view if not defined otherwise
-SET_TYPE_PROP(ImplicitBase,
- GridView,
- typename GET_PROP_TYPE(TypeTag, Grid)::LeafGridView);
-
-//! use the plain newton method by default
-SET_TYPE_PROP(ImplicitBase, NewtonMethod, NewtonMethod<TypeTag>);
-
-//! use the plain newton controller by default
-SET_TYPE_PROP(ImplicitBase, NewtonController, NewtonController<TypeTag>);
-
-//! use the plain newton convergence writer by default
-SET_TYPE_PROP(ImplicitBase, NewtonConvergenceWriter, NewtonConvergenceWriter<TypeTag>);
-
-//! Mapper for the grid view's vertices.
-#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
-SET_TYPE_PROP(ImplicitBase,
- VertexMapper,
- Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView)>);
-#else
-SET_TYPE_PROP(ImplicitBase,
- VertexMapper,
- Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView),
- Dune::MCMGVertexLayout>);
-#endif
-
-
-//! Mapper for the grid view's elements.
-#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
-SET_TYPE_PROP(ImplicitBase,
- ElementMapper,
- Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView)>);
-#else
-SET_TYPE_PROP(ImplicitBase,
- ElementMapper,
- Dune::MultipleCodimMultipleGeomTypeMapper<typename GET_PROP_TYPE(TypeTag, GridView),
- Dune::MCMGElementLayout>);
-#endif
-
-//! Set the BaseModel to ImplicitModel
-SET_TYPE_PROP(ImplicitBase, BaseModel, ImplicitModel<TypeTag>);
-
-//! The volume variable class, to be overloaded by the model
-SET_TYPE_PROP(ImplicitBase, VolumeVariables, ImplicitVolumeVariables<TypeTag>);
-
-//! The class that contains the different flux variables (i.e. darcy, diffusion, energy)
-//! by default, we set the flux variables to ones for porous media
-SET_TYPE_PROP(ImplicitBase, FluxVariables, PorousMediumFluxVariables<TypeTag>);
-
-//! The flux variables cache class, by default the one for porous media
-SET_TYPE_PROP(ImplicitBase, FluxVariablesCache, PorousMediumFluxVariablesCache<TypeTag>);
-
-//! We use darcy's law as the default for the advective fluxes
-SET_TYPE_PROP(ImplicitBase, AdvectionType, DarcysLaw<TypeTag>);
-
-//! We use fick's law as the default for the diffusive fluxes
-SET_TYPE_PROP(ImplicitBase, MolecularDiffusionType, FicksLaw<TypeTag>);
-
-//! We use fourier's law as the default for heat conduction fluxes
-SET_TYPE_PROP(ImplicitBase, HeatConductionType, FouriersLaw<TypeTag>);
-
-//! The type of a solution for the whole grid at a fixed time
-SET_TYPE_PROP(ImplicitBase,
- SolutionVector,
- Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, PrimaryVariables)>);
-
-//! The type of a solution for a whole element
-SET_TYPE_PROP(ImplicitBase,
- ElementSolutionVector,
- Dune::BlockVector<typename GET_PROP_TYPE(TypeTag, PrimaryVariables)>);
-
-//! A vector of primary variables
-SET_TYPE_PROP(ImplicitBase,
- PrimaryVariables,
- Dune::FieldVector<typename GET_PROP_TYPE(TypeTag, Scalar),
- GET_PROP_VALUE(TypeTag, NumEq)>);
-
-//! Boundary types at a single degree of freedom
-SET_TYPE_PROP(ImplicitBase,
- BoundaryTypes,
- BoundaryTypes<GET_PROP_VALUE(TypeTag, NumEq)>);
-
-//! use forward differences to calculate the jacobian by default
-SET_INT_PROP(ImplicitBase, ImplicitNumericDifferenceMethod, +1);
-
-//! disable jacobian matrix recycling by default
-SET_BOOL_PROP(ImplicitBase, ImplicitEnableJacobianRecycling, false);
-
-//! disable partial reassembling by default
-SET_BOOL_PROP(ImplicitBase, ImplicitEnablePartialReassemble, false);
-
-//! We do not store the FVGeometry by default
-SET_BOOL_PROP(ImplicitBase, EnableFVGridGeometryCache, false);
-
-//! We do not store the volume variables by default
-SET_BOOL_PROP(ImplicitBase, EnableGlobalVolumeVariablesCache, false);
-
-//! disable flux variables data caching by default
-SET_BOOL_PROP(ImplicitBase, EnableGlobalFluxVariablesCache, false);
-
-//! by default, parameters are solution-dependent
-SET_BOOL_PROP(ImplicitBase, SolutionDependentAdvection, true);
-SET_BOOL_PROP(ImplicitBase, SolutionDependentMolecularDiffusion, true);
-SET_BOOL_PROP(ImplicitBase, SolutionDependentHeatConduction, true);
-
-//! specify if we evaluate the permeability in the volume (for discontinuous fields, default)
-//! or at the scvf center for analytical permeability fields (e.g. convergence studies)
-SET_BOOL_PROP(ImplicitBase, EvaluatePermeabilityAtScvfIP, false);
-
-//! by default, boundary conditions are not constant over time
-SET_BOOL_PROP(ImplicitBase, ConstantBoundaryConditions, false);
-
-SET_TYPE_PROP(ImplicitBase, PrimaryVariableSwitch, NoPrimaryVariableSwitch<TypeTag> );
-
-//! Set the type of a global jacobian matrix from the solution types
-SET_PROP(ImplicitBase, JacobianMatrix)
-{
-private:
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
- using MatrixBlock = typename Dune::FieldMatrix<Scalar, numEq, numEq>;
-public:
- using type = typename Dune::BCRSMatrix<MatrixBlock>;
-};
-
-//! use the AMGBackend solver by default
-SET_TYPE_PROP(ImplicitBase, LinearSolver, Dumux::AMGBackend<TypeTag> );
-
-// if the deflection of the newton method is large, we do not
-// need to solve the linear approximation accurately. Assuming
-// that the initial value for the delta vector u is quite
-// close to the final value, a reduction of 6 orders of
-// magnitude in the defect should be sufficient...
-SET_SCALAR_PROP(ImplicitBase, LinearSolverResidualReduction, 1e-6);
-
-//! set the default number of maximum iterations for the linear solver
-SET_INT_PROP(ImplicitBase, LinearSolverMaxIterations, 250);
-
-//! set number of equations of the mathematical model as default
-SET_INT_PROP(ImplicitBase, LinearSolverBlockSize, GET_PROP_VALUE(TypeTag, NumEq));
-
-//! set number of maximum timestep divisions to 10
-SET_INT_PROP(ImplicitBase, ImplicitMaxTimeStepDivisions, 10);
-
-//! Per default we have assume isothermal problems. Set this to true to solve an energy equation
-SET_BOOL_PROP(ImplicitBase, EnableEnergyBalance, false);
-
-SET_TYPE_PROP(ImplicitBase, EnergyLocalResidual, EnergyLocalResidual<TypeTag> );
-
-//! Set the upwind weight for the advective term
-SET_SCALAR_PROP(ImplicitBase, ImplicitUpwindWeight, 1.0);
-
-//! vtk output
-SET_BOOL_PROP(ImplicitBase, VtkAddVelocity, false); //!< Don't reconstruct velocity per default
-SET_BOOL_PROP(ImplicitBase, VtkAddProcessRank, true); //!< Add process rank to output per default
-SET_TYPE_PROP(ImplicitBase, VtkOutputModule, VtkOutputModuleBase<TypeTag>);
-SET_TYPE_PROP(ImplicitBase, VelocityOutput, ImplicitVelocityOutput<TypeTag>);
-
-} // namespace Properties
-
-} // namespace Dumux
-
-#endif
diff --git a/dumux/implicit/staggered/assembler.hh b/dumux/implicit/staggered/assembler.hh
deleted file mode 100644
index 30a84437f48a4d034775c40d66aa360913032387..0000000000000000000000000000000000000000
--- a/dumux/implicit/staggered/assembler.hh
+++ /dev/null
@@ -1,174 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief An assembler for the global Jacobian matrix for fully implicit models.
- */
-#ifndef DUMUX_STAGGERED_ASSEMBLER_HH
-#define DUMUX_STAGGERED_ASSEMBLER_HH
-
-#include <dumux/implicit/properties.hh>
-#include <dumux/implicit/assembler.hh>
-#include <dune/istl/matrixindexset.hh>
-
-namespace Dumux {
-
-/*!
- * \ingroup ImplicitModel
- * \brief An assembler for the global Jacobian matrix for fully implicit models.
- */
-template<class TypeTag>
-class StaggeredAssembler : public ImplicitAssembler<TypeTag>
-{
- typedef ImplicitAssembler<TypeTag> ParentType;
- friend class ImplicitAssembler<TypeTag>;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::IndexSet::IndexType IndexType;
-
- typedef typename GET_PROP(TypeTag, JacobianMatrix)::MatrixBlockCCToCC CCToCCMatrixBlock;
- typedef typename GET_PROP(TypeTag, JacobianMatrix)::MatrixBlockCCToFace CCToFaceMatrixBlock;
-
- typedef typename GET_PROP(TypeTag, JacobianMatrix)::MatrixBlockFaceToFace FaceToFaceMatrixBlock;
- typedef typename GET_PROP(TypeTag, JacobianMatrix)::MatrixBlockFaceToCC FaceToCCMatrixBlock;
-
- using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
- typename DofTypeIndices::CellCenterIdx cellCenterIdx;
- typename DofTypeIndices::FaceIdx faceIdx;
-
-public:
-
- /*!
- * \brief Initialize the jacobian assembler.
- *
- * At this point we can assume that all objects in the problem and
- * the model have been allocated. We can not assume that they are
- * fully initialized, though.
- *
- * \param problem The problem object
- */
- void init(Problem& problem)
- {
- std::cout << "init(Problem& problem)" << std::endl;
- this->problemPtr_ = &problem;
-
- // initialize the BCRS matrix
- createMatrix_();
-
- // initialize the jacobian matrix with zeros
- *this->matrix_ = 0;
-
- // allocate the residual vector
- this->residual_[cellCenterIdx].resize(problem.model().numCellCenterDofs());
- this->residual_[faceIdx].resize(problem.model().numFaceDofs());
-// printmatrix(std::cout, matrix(), "", "");
- }
-
-
-private:
-
- // Construct the multitype matrix for the global jacobian
- void createMatrix_()
- {
- // create the multitype matrix
- this->matrix_ = std::make_shared<JacobianMatrix>();
-
- // get sub matrix sizes
- const auto cellCenterSize = this->problem_().model().numCellCenterDofs();
- const auto faceSize = this->problem_().model().numFaceDofs();
-
- // allocate the sub matrices (BCRS matrices)
- auto A11 = CCToCCMatrixBlock(cellCenterSize, cellCenterSize, CCToCCMatrixBlock::random);
- auto A12 = CCToFaceMatrixBlock(cellCenterSize, faceSize, CCToFaceMatrixBlock::random);
-
- auto A21 = FaceToCCMatrixBlock(faceSize, cellCenterSize, FaceToCCMatrixBlock::random);
- auto A22 = FaceToFaceMatrixBlock(faceSize, faceSize, FaceToFaceMatrixBlock::random);
-
- setupMatrices_(A11, A12, A21, A22);
-
- (*this->matrix_)[cellCenterIdx][cellCenterIdx] = A11;
- (*this->matrix_)[cellCenterIdx][faceIdx] = A12;
- (*this->matrix_)[faceIdx][cellCenterIdx] = A21;
- (*this->matrix_)[faceIdx][faceIdx] = A22;
-
-// printmatrix(std::cout, A11, "A11", "");
-// printmatrix(std::cout, A12, "A12", "");
-// printmatrix(std::cout, A21, "A21", "");
-// printmatrix(std::cout, A22, "A22", "");
- }
-
- void setupMatrices_(CCToCCMatrixBlock &A11, CCToFaceMatrixBlock &A12,
- FaceToCCMatrixBlock &A21, FaceToFaceMatrixBlock &A22)
- {
- // get sub matrix sizes
- const auto numDofsCC = this->problem_().model().numCellCenterDofs();
- const auto numDofsFace = this->problem_().model().numFaceDofs();
-
- // get occupation pattern of the matrix
- Dune::MatrixIndexSet occupationPatternA11;
- Dune::MatrixIndexSet occupationPatternA12;
- Dune::MatrixIndexSet occupationPatternA21;
- Dune::MatrixIndexSet occupationPatternA22;
- occupationPatternA11.resize(numDofsCC, numDofsCC);
- occupationPatternA12.resize(numDofsCC, numDofsFace);
- occupationPatternA21.resize(numDofsFace, numDofsCC);
- occupationPatternA22.resize(numDofsFace, numDofsFace);
-
- const auto& assemblyMap = this->problem_().model().localJacobian().assemblyMap();
-
- for (const auto& element : elements(this->gridView_()))
- {
- // the global index of the element at hand
- const auto ccGlobalI = this->elementMapper_().index(element);
-
- for (auto&& ccGlobalJ : assemblyMap(cellCenterIdx, cellCenterIdx, ccGlobalI))
- occupationPatternA11.add(ccGlobalI, ccGlobalJ);
- for (auto&& faceGlobalJ : assemblyMap(cellCenterIdx, faceIdx, ccGlobalI))
- occupationPatternA12.add(ccGlobalI, faceGlobalJ);
-
- auto fvGeometry = localView(this->problem_().model().fvGridGeometry());
- fvGeometry.bindElement(element);
-
- // loop over sub control faces
- for (auto&& scvf : scvfs(fvGeometry))
- {
- const auto faceGlobalI = scvf.dofIndex();
- for (auto&& ccGlobalJ : assemblyMap(faceIdx, cellCenterIdx, scvf.index()))
- occupationPatternA21.add(faceGlobalI, ccGlobalJ);
- for (auto&& faceGlobalJ : assemblyMap(faceIdx, faceIdx, scvf.index()))
- occupationPatternA22.add(faceGlobalI, faceGlobalJ);
- }
- }
- // export patterns to matrices
- occupationPatternA11.exportIdx(A11);
- occupationPatternA12.exportIdx(A12);
- occupationPatternA21.exportIdx(A21);
- occupationPatternA22.exportIdx(A22);
- }
-
-
-};
-
-} // namespace Dumux
-
-#endif
diff --git a/dumux/implicit/staggered/gridvariables.hh b/dumux/implicit/staggered/gridvariables.hh
new file mode 100644
index 0000000000000000000000000000000000000000..1140c791f1c29e195288bf4f39fbd8b0a556b8cf
--- /dev/null
+++ b/dumux/implicit/staggered/gridvariables.hh
@@ -0,0 +1,115 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Class storing scv and scvf variables
+ */
+#ifndef DUMUX_STAGGERED_GRID_VARIABLES_HH
+#define DUMUX_STAGGERED_GRID_VARIABLES_HH
+
+#include <dumux/implicit/gridvariables.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup ImplicitModel
+ * \brief Class storing scv and scvf variables
+ */
+template<class TypeTag>
+class StaggeredGridVariables : public GridVariables<TypeTag>
+{
+ using ParentType = GridVariables<TypeTag>;
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using GridFaceVariables = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
+ using GridFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, GlobalFluxVariablesCache);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+
+public:
+ //! Constructor
+ StaggeredGridVariables(std::shared_ptr<Problem> problem, std::shared_ptr<FVGridGeometry> fvGridGeometry)
+ : ParentType(problem, fvGridGeometry)
+ , fvGridGeometry_(fvGridGeometry)
+ , curGridFaceVariables_(*problem)
+ , prevGridFaceVariables_(*problem)
+ {}
+
+ //! update all variables
+ void update(const SolutionVector& curSol)
+ {
+ ParentType::update(curSol);
+ curGridFaceVariables_.update(*fvGridGeometry_, curSol);
+ }
+
+ //! initialize all variables (stationary case)
+ void init(const SolutionVector& curSol)
+ {
+ ParentType::init(curSol);
+ curGridFaceVariables_.update(*fvGridGeometry_, curSol);
+ }
+
+ //! initialize all variables (instationary case)
+ void init(const SolutionVector& curSol, const SolutionVector& initSol)
+ {
+ ParentType::init(curSol, initSol);
+ curGridFaceVariables_.update(*fvGridGeometry_, curSol);
+ prevGridFaceVariables_.update(*fvGridGeometry_, initSol);
+ }
+
+ //! Sets the current state as the previous for next time step
+ //! this has to be called at the end of each time step
+ void advanceTimeStep()
+ {
+ ParentType::advanceTimeStep();
+ prevGridFaceVariables_ = curGridFaceVariables_;
+ }
+
+ //! resets state to the one before time integration
+ void resetTimeStep(const SolutionVector& solution)
+ {
+ ParentType::resetTimeStep(solution);
+ curGridFaceVariables_ = prevGridFaceVariables_;
+ }
+
+ const GridFaceVariables& curGridFaceVars() const
+ { return curGridFaceVariables_; }
+
+ const GridFaceVariables& prevGridFaceVars() const
+ { return prevGridFaceVariables_; }
+
+ GridFaceVariables& curGridFaceVars()
+ { return curGridFaceVariables_; }
+
+ GridFaceVariables& prevGridFaceVars()
+ { return prevGridFaceVariables_; }
+
+private:
+
+ std::shared_ptr<FVGridGeometry> fvGridGeometry_;
+
+ GridFaceVariables curGridFaceVariables_;
+ GridFaceVariables prevGridFaceVariables_;
+
+};
+
+} // end namespace
+
+#endif
diff --git a/dumux/implicit/staggered/localjacobian.hh b/dumux/implicit/staggered/localjacobian.hh
deleted file mode 100644
index 571956299ea6e831480d678783ee65904b5c301c..0000000000000000000000000000000000000000
--- a/dumux/implicit/staggered/localjacobian.hh
+++ /dev/null
@@ -1,594 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Caculates the Jacobian of the local residual for fully-implicit models
- */
-#ifndef DUMUX_STAGGERED_LOCAL_JACOBIAN_HH
-#define DUMUX_STAGGERED_LOCAL_JACOBIAN_HH
-
-#include <dune/istl/io.hh>
-#include <dune/istl/matrix.hh>
-
-#include <dumux/common/math.hh>
-#include <dumux/common/valgrind.hh>
-
-#include <dumux/implicit/properties.hh>
-#include "primaryvariables.hh"
-#include "assemblymap.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup ImplicitLocalJacobian
- * \brief Calculates the Jacobian of the local residual for fully-implicit models
- *
- * The default behavior is to use numeric differentiation, i.e.
- * forward or backward differences (2nd order), or central
- * differences (3rd order). The method used is determined by the
- * "NumericDifferenceMethod" property:
- *
- * - if the value of this property is smaller than 0, backward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x) - f(x - \epsilon)}{\epsilon}
- * \f]
- *
- * - if the value of this property is 0, central
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x - \epsilon)}{2 \epsilon}
- * \f]
- *
- * - if the value of this property is larger than 0, forward
- * differences are used, i.e.:
- * \f[
- \frac{\partial f(x)}{\partial x} \approx \frac{f(x + \epsilon) - f(x)}{\epsilon}
- * \f]
- *
- * Here, \f$ f \f$ is the residual function for all equations, \f$x\f$
- * is the value of a sub-control volume's primary variable at the
- * evaluation point and \f$\epsilon\f$ is a small value larger than 0.
- */
-template<class TypeTag>
-class StaggeredLocalJacobian
-{
- using Implementation = typename GET_PROP_TYPE(TypeTag, LocalJacobian);
- using JacobianAssembler = typename GET_PROP_TYPE(TypeTag, JacobianAssembler);
- using LocalResidual = typename GET_PROP_TYPE(TypeTag, LocalResidual);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Model = typename GET_PROP_TYPE(TypeTag, Model);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
-
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using ElementBoundaryTypes = typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes);
- using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Element = typename GridView::template Codim<0>::Entity;
- using IndexType = typename GridView::IndexSet::IndexType;
-
- enum {
- numEqCellCenter = GET_PROP_VALUE(TypeTag, NumEqCellCenter),
- numEqFace = GET_PROP_VALUE(TypeTag, NumEqFace),
- };
-
- using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
- typename DofTypeIndices::CellCenterIdx cellCenterIdx;
- typename DofTypeIndices::FaceIdx faceIdx;
-
- using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
- using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
- using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
-
- using FaceSolutionVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
-
- using PriVarIndices = typename Dumux::PriVarIndices<TypeTag>;
-
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
-
- using AssemblyMap = Dumux::StaggeredAssemblyMap<TypeTag>;
-
-
-public:
-
- StaggeredLocalJacobian(const StaggeredLocalJacobian &) = delete;
-
- StaggeredLocalJacobian()
- {
- numericDifferenceMethod_ = GET_PARAM_FROM_GROUP(TypeTag, int, Implicit, NumericDifferenceMethod);
- }
-
- /*!
- * \brief Initialize the local Jacobian object.
- *
- * At this point we can assume that everything has been allocated,
- * although some objects may not yet be completely initialized.
- *
- * \param problem The problem which we want to simulate.
- */
- void init(Problem &problem)
- {
- problemPtr_ = &problem;
- localResidual_.init(problem);
- assemblyMap_.init(problem);
- }
-
- /*!
- * \brief Assemble an element's local Jacobian matrix of the
- * defect.
- *
- * \param element The DUNE Codim<0> entity which we look at.
- */
- void assemble(const Element& element, JacobianMatrix& matrix, SolutionVector& residual)
- {
- const bool isGhost = (element.partitionType() == Dune::GhostEntity);
- if(isGhost)
- DUNE_THROW(Dune::NotImplemented, "Support for ghost cells not implemented");
-
- // prepare the volvars/fvGeometries in case caching is disabled
- auto fvGeometry = localView(this->model_().fvGridGeometry());
- fvGeometry.bind(element);
-
- auto curElemVolVars = localView(this->model_().curGlobalVolVars());
- curElemVolVars.bind(element, fvGeometry, this->model_().curSol());
-
- auto prevElemVolVars = localView(this->model_().prevGlobalVolVars());
- prevElemVolVars.bindElement(element, fvGeometry, this->model_().prevSol());
-
- auto elemFluxVarsCache = localView(this->model_().globalFluxVarsCache());
- elemFluxVarsCache.bind(element, fvGeometry, curElemVolVars);
-
- // set the actual cell center dof index
- ccGlobalI_ = this->problem_().elementMapper().index(element);
-
- ElementBoundaryTypes elemBcTypes;
- elemBcTypes.update(this->problem_(), element, fvGeometry);
-
- auto& curGlobalFaceVars = getCurrNonConstGlobalFaceVars_();
- auto& prevGlobalFaceVars = getPrevGlobalFaceVars_();
-
- // calculate the local residual for all dofs of this element
- this->localResidual().eval(element, fvGeometry,
- prevElemVolVars, curElemVolVars,
- prevGlobalFaceVars, curGlobalFaceVars,
- elemBcTypes, elemFluxVarsCache);
- // store the cell center residual in global container
- residual[cellCenterIdx][ccGlobalI_] = this->localResidual().ccResidual();
-
- // treat the local residua of the face dofs:
- // create a cache to reuse some results for the calculation of the derivatives
- FaceSolutionVector faceResidualCache;
- faceResidualCache.resize(fvGeometry.numScvf());
- faceResidualCache = 0.0;
- for(auto&& scvf : scvfs(fvGeometry))
- {
- residual[faceIdx][scvf.dofIndex()] += this->localResidual().faceResidual(scvf.localFaceIdx());
- faceResidualCache[scvf.localFaceIdx()] = this->localResidual().faceResidual(scvf.localFaceIdx());
- }
-
- this->model_().updatePVWeights(fvGeometry);
-
- // calculate derivatives of all dofs in stencil with respect to the dofs in the element
- evalPartialDerivatives_(element,
- fvGeometry,
- prevElemVolVars,
- curElemVolVars,
- prevGlobalFaceVars,
- curGlobalFaceVars,
- elemFluxVarsCache,
- elemBcTypes,
- matrix,
- residual[cellCenterIdx][ccGlobalI_],
- faceResidualCache);
- }
-
- /*!
- * \brief Returns a reference to the object which calculates the
- * local residual.
- */
- const LocalResidual &localResidual() const
- { return localResidual_; }
-
- /*!
- * \brief Returns a reference to the object which calculates the
- * local residual.
- */
- LocalResidual &localResidual()
- { return localResidual_; }
-
- const AssemblyMap& assemblyMap() const
- { return assemblyMap_; }
-
-protected:
- void evalPartialDerivatives_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevGlobalFaceVars,
- GlobalFaceVars& curGlobalFaceVars,
- ElementFluxVariablesCache& elemFluxVarsCache,
- const ElementBoundaryTypes& elemBcTypes,
- JacobianMatrix& matrix,
- const CellCenterPrimaryVariables& ccResidual,
- const FaceSolutionVector& faceResidualCache)
- {
- // compute the derivatives of the cell center residuals with respect to cell center dofs
- dCCdCC_(element, fvGeometry, prevElemVolVars, curElemVolVars, prevGlobalFaceVars, curGlobalFaceVars, elemFluxVarsCache, elemBcTypes, matrix, ccResidual);
-
- // compute the derivatives of the cell center residuals with respect to face dofs
- dCCdFace_(element, fvGeometry, prevElemVolVars, curElemVolVars, prevGlobalFaceVars, curGlobalFaceVars, elemFluxVarsCache, elemBcTypes, matrix, ccResidual);
-
- // compute the derivatives of the face residuals with respect to cell center dofs
- dFacedCC_(element, fvGeometry, prevElemVolVars, curElemVolVars, prevGlobalFaceVars, curGlobalFaceVars, elemFluxVarsCache, elemBcTypes, matrix, faceResidualCache);
-
- // compute the derivatives of the face residuals with respect to face dofs
- dFacedFace_(element, fvGeometry, prevElemVolVars, curElemVolVars, prevGlobalFaceVars, curGlobalFaceVars, elemFluxVarsCache, elemBcTypes, matrix, faceResidualCache);
- }
-
- /*!
- * \brief Computes the derivatives of the cell center residuals with respect to cell center dofs
- */
- void dCCdCC_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevGlobalFaceVars,
- const GlobalFaceVars& curGlobalFaceVars,
- ElementFluxVariablesCache& elemFluxVarsCache,
- const ElementBoundaryTypes& elemBcTypes,
- JacobianMatrix& matrix,
- const CellCenterPrimaryVariables& ccResidual)
- {
- // build derivatives with for cell center dofs w.r.t. cell center dofs
- auto&& scvI = fvGeometry.scv(ccGlobalI_);
-
- for(const auto& globalJ : assemblyMap_(cellCenterIdx, cellCenterIdx, ccGlobalI_))
- {
- // get the volVars of the element with respect to which we are going to build the derivative
- auto&& scvJ = fvGeometry.scv(globalJ);
- const auto elementJ = fvGeometry.fvGridGeometry().element(globalJ);
- auto& curVolVars = getCurVolVars(curElemVolVars, scvJ);
- VolumeVariables origVolVars(curVolVars);
-
- for(auto pvIdx : PriVarIndices(cellCenterIdx))
- {
- PrimaryVariables priVars(CellCenterPrimaryVariables(this->model_().curSol()[cellCenterIdx][globalJ]),
- FacePrimaryVariables(0.0));
-
- const Scalar eps = numericEpsilon(priVars[pvIdx], cellCenterIdx, cellCenterIdx);
- priVars[pvIdx] += eps;
- ElementSolutionVector elemSol{std::move(priVars)};
- curVolVars.update(elemSol, this->problem_(), elementJ, scvJ);
-
- this->localResidual().evalCellCenter(element, fvGeometry, scvI,
- prevElemVolVars, curElemVolVars,
- prevGlobalFaceVars, curGlobalFaceVars,
- elemBcTypes, elemFluxVarsCache);
-
- auto partialDeriv = (this->localResidual().ccResidual() - ccResidual);
- partialDeriv /= eps;
-
- // update the global jacobian matrix with the current partial derivatives
- this->updateGlobalJacobian_(matrix[cellCenterIdx][cellCenterIdx], ccGlobalI_, globalJ, pvIdx, partialDeriv);
-
- // restore the original volVars
- curVolVars = origVolVars;
- }
- }
- }
-
- /*!
- * \brief Computes the derivatives of the cell center residuals with respect to face dofs
- */
- void dCCdFace_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- const ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevGlobalFaceVars,
- GlobalFaceVars& curGlobalFaceVars,
- ElementFluxVariablesCache& elemFluxVarsCache,
- const ElementBoundaryTypes& elemBcTypes,
- JacobianMatrix& matrix,
- const CellCenterPrimaryVariables& ccResidual)
- {
- // build derivatives with for cell center dofs w.r.t. face dofs
- auto&& scvI = fvGeometry.scv(ccGlobalI_);
-
- for(const auto& globalJ : assemblyMap_(cellCenterIdx, faceIdx, ccGlobalI_))
- {
- // get the faceVars of the face with respect to which we are going to build the derivative
- auto origFaceVars = curGlobalFaceVars.faceVars(globalJ);
- auto& curFaceVars = curGlobalFaceVars.faceVars(globalJ);
-
- for(auto pvIdx : PriVarIndices(faceIdx))
- {
- PrimaryVariables priVars(CellCenterPrimaryVariables(0.0), FacePrimaryVariables(this->model_().curSol()[faceIdx][globalJ]));
-
- const Scalar eps = numericEpsilon(priVars[pvIdx], cellCenterIdx, faceIdx);
- priVars[pvIdx] += eps;
- curFaceVars.update(priVars[faceIdx]);
-
- this->localResidual().evalCellCenter(element, fvGeometry, scvI,
- prevElemVolVars, curElemVolVars,
- prevGlobalFaceVars, curGlobalFaceVars,
- elemBcTypes, elemFluxVarsCache);
-
- auto partialDeriv = (this->localResidual().ccResidual() - ccResidual);
- partialDeriv /= eps;
-
- // update the global jacobian matrix with the current partial derivatives
- this->updateGlobalJacobian_(matrix[cellCenterIdx][faceIdx], ccGlobalI_, globalJ, pvIdx - Indices::faceOffset, partialDeriv);
-
- // restore the original faceVars
- curFaceVars = origFaceVars;
- }
- }
- }
-
- /*!
- * \brief Computes the derivatives of the face residuals with respect to cell center dofs
- */
- void dFacedCC_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevGlobalFaceVars,
- const GlobalFaceVars& curGlobalFaceVars,
- ElementFluxVariablesCache& elemFluxVarsCache,
- const ElementBoundaryTypes& elemBcTypes,
- JacobianMatrix& matrix,
- const FaceSolutionVector& cachedResidual)
- {
- for(auto&& scvf : scvfs(fvGeometry))
- {
- // set the actual dof index
- const auto faceGlobalI = scvf.dofIndex();
-
- // build derivatives with for face dofs w.r.t. cell center dofs
- for(const auto& globalJ : assemblyMap_(faceIdx, cellCenterIdx, scvf.index()))
- {
- // get the volVars of the element with respect to which we are going to build the derivative
- auto&& scvJ = fvGeometry.scv(globalJ);
- const auto elementJ = fvGeometry.fvGridGeometry().element(globalJ);
- auto& curVolVars = getCurVolVars(curElemVolVars, scvJ);
- VolumeVariables origVolVars(curVolVars);
-
- for(auto pvIdx : PriVarIndices(cellCenterIdx))
- {
- PrimaryVariables priVars(CellCenterPrimaryVariables(this->model_().curSol()[cellCenterIdx][globalJ]),
- FacePrimaryVariables(0.0));
-
- const Scalar eps = numericEpsilon(priVars[pvIdx], faceIdx, cellCenterIdx);
- priVars[pvIdx] += eps;
- ElementSolutionVector elemSol{std::move(priVars)};
- curVolVars.update(elemSol, this->problem_(), elementJ, scvJ);
-
- this->localResidual().evalFace(element, fvGeometry, scvf,
- prevElemVolVars, curElemVolVars,
- prevGlobalFaceVars, curGlobalFaceVars,
- elemBcTypes, elemFluxVarsCache);
-
- auto partialDeriv = (this->localResidual().faceResidual(scvf.localFaceIdx()) - cachedResidual[scvf.localFaceIdx()]);
- partialDeriv /= eps;
- // update the global jacobian matrix with the current partial derivatives
- this->updateGlobalJacobian_(matrix[faceIdx][cellCenterIdx], faceGlobalI, globalJ, pvIdx, partialDeriv);
-
- // restore the original volVars
- curVolVars = origVolVars;
- }
- }
- }
- }
-
- /*!
- * \brief Computes the derivatives of the face residuals with respect to cell center dofs
- */
- void dFacedFace_(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- const ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevGlobalFaceVars,
- GlobalFaceVars& curGlobalFaceVars,
- ElementFluxVariablesCache& elemFluxVarsCache,
- const ElementBoundaryTypes& elemBcTypes,
- JacobianMatrix& matrix,
- const FaceSolutionVector& cachedResidual)
- {
- for(auto&& scvf : scvfs(fvGeometry))
- {
- // set the actual dof index
- const auto faceGlobalI = scvf.dofIndex();
-
- // build derivatives with for face dofs w.r.t. cell center dofs
- for(const auto& globalJ : assemblyMap_(faceIdx, faceIdx, scvf.index()))
- {
- // get the faceVars of the face with respect to which we are going to build the derivative
- auto origFaceVars = curGlobalFaceVars.faceVars(globalJ);
- auto& curFaceVars = curGlobalFaceVars.faceVars(globalJ);
-
- for(auto pvIdx : PriVarIndices(faceIdx))
- {
- PrimaryVariables priVars(CellCenterPrimaryVariables(0.0), FacePrimaryVariables(this->model_().curSol()[faceIdx][globalJ]));
-
- const Scalar eps = numericEpsilon(priVars[pvIdx], faceIdx, faceIdx);
- priVars[pvIdx] += eps;
- curFaceVars.update(priVars[faceIdx]);
-
- this->localResidual().evalFace(element, fvGeometry, scvf,
- prevElemVolVars, curElemVolVars,
- prevGlobalFaceVars, curGlobalFaceVars,
- elemBcTypes, elemFluxVarsCache);
-
- auto partialDeriv = (this->localResidual().faceResidual(scvf.localFaceIdx()) - cachedResidual[scvf.localFaceIdx()]);
- partialDeriv /= eps;
-
- // update the global jacobian matrix with the current partial derivatives
- this->updateGlobalJacobian_(matrix[faceIdx][faceIdx], faceGlobalI, globalJ, pvIdx - Indices::faceOffset, partialDeriv);
-
- // restore the original faceVars
- curFaceVars = origFaceVars;
- }
- }
- }
- }
-
- /*!
- * \brief Returns a reference to the problem.
- */
- const Problem &problem_() const
- {
- Valgrind::CheckDefined(problemPtr_);
- return *problemPtr_;
- }
-
- /*!
- * \brief Returns a reference to the problem.
- */
- Problem &problem_()
- {
- Valgrind::CheckDefined(problemPtr_);
- return *problemPtr_;
- }
-
- /*!
- * \brief Returns a reference to the grid view.
- */
- const GridView &gridView_() const
- { return problem_().gridView(); }
-
- /*!
- * \brief Returns a reference to the model.
- */
- const Model &model_() const
- { return problem_().model(); }
-
- /*!
- * \brief Returns a reference to the model.
- */
- Model &model_()
- { return problem_().model(); }
-
- /*!
- * \brief Returns a reference to the jacobian assembler.
- */
- const JacobianAssembler &jacAsm_() const
- { return model_().jacobianAssembler(); }
-
- /*!
- * \brief Return the epsilon used to calculate the numeric derivative of a localResidual w.r.t a certain priVar
- *
- * \param priVar The the value of primary varible w.r.t which to derivative of the localResidual is calculated
- * \param idx1 Indicates whether the the derivative is build for a cellCenter or face localResidual
- * \param idx2 Indicates whether the the derivative is build w.r.t a priVar living on a cellCenter or face
- */
- Scalar numericEpsilon(const Scalar priVar, const int idx1, const int idx2) const
- {
- // define the base epsilon as the geometric mean of 1 and the
- // resolution of the scalar type. E.g. for standard 64 bit
- // floating point values, the resolution is about 10^-16 and
- // the base epsilon is thus approximately 10^-8.
- /*
- static const Scalar baseEps
- = Dumux::geometricMean<Scalar>(std::numeric_limits<Scalar>::epsilon(), 1.0);
- */
-
- static const Scalar baseEps = baseEps_[idx1][idx2];
- assert(std::numeric_limits<Scalar>::epsilon()*1e4 < baseEps);
- // the epsilon value used for the numeric differentiation is
- // now scaled by the absolute value of the primary variable...
- return baseEps*(std::abs(priVar) + 1.0);
- }
-
- /*!
- * \brief Updates the current global Jacobian matrix with the
- * partial derivatives of all equations in regard to the
- * primary variable 'pvIdx' at dof 'col'. Specialization for cc methods.
- */
- template<class SubMatrix, class CCOrFacePrimaryVariables>
- void updateGlobalJacobian_(SubMatrix& matrix,
- const int globalI,
- const int globalJ,
- const int pvIdx,
- const CCOrFacePrimaryVariables &partialDeriv)
- {
- for (int eqIdx = 0; eqIdx < partialDeriv.size(); eqIdx++)
- {
- // A[i][col][eqIdx][pvIdx] is the rate of change of
- // the residual of equation 'eqIdx' at dof 'i'
- // depending on the primary variable 'pvIdx' at dof
- // 'col'.
-
- assert(pvIdx >= 0);
- assert(eqIdx < matrix[globalI][globalJ].size());
- assert(pvIdx < matrix[globalI][globalJ][eqIdx].size());
- matrix[globalI][globalJ][eqIdx][pvIdx] += partialDeriv[eqIdx];
- Valgrind::CheckDefined(matrix[globalI][globalJ][eqIdx][pvIdx]);
- }
- }
-
- //! If the global vol vars caching is enabled we have to modify the global volvar object
- template<class T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables>::type&
- getCurVolVars(ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
- { return this->model_().nonConstCurGlobalVolVars().volVars(scv); }
-
- //! When global volume variables caching is disabled, return the local volvar object
- template<class T = TypeTag>
- typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables>::type&
- getCurVolVars(ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
- { return elemVolVars[scv]; }
-
-
- //! Convenience function to get the current non-const global face vars. This is necessary for classes that inherit from this class.
- auto& getCurrNonConstGlobalFaceVars_()
- {
- return this->model_().nonConstCurFaceVars();
- }
-
- //! Convenience function to get the previous global face vars
- auto& getPrevGlobalFaceVars_()
- {
- return this->model_().prevGlobalFaceVars();
- }
-
- IndexType ccGlobalI_;
- int numericDifferenceMethod_;
-
- // The problem we would like to solve
- Problem *problemPtr_;
-
- LocalResidual localResidual_;
-
- AssemblyMap assemblyMap_;
-
- using BaseEpsilon = typename GET_PROP(TypeTag, BaseEpsilon);
- const std::array<std::array<Scalar, 2>, 2> baseEps_ = BaseEpsilon::getEps();
-};
-
-}
-
-#endif
diff --git a/dumux/implicit/staggered/localresidual.hh b/dumux/implicit/staggered/localresidual.hh
index fe799358cfd1741ef83e9b1f376366afa70b6a1a..7be67fc539dab4369c17d41d506dbd1d209ed58b 100644
--- a/dumux/implicit/staggered/localresidual.hh
+++ b/dumux/implicit/staggered/localresidual.hh
@@ -23,14 +23,17 @@
#ifndef DUMUX_STAGGERED_LOCAL_RESIDUAL_HH
#define DUMUX_STAGGERED_LOCAL_RESIDUAL_HH
-#include <dune/istl/matrix.hh>
-
#include <dumux/common/valgrind.hh>
-
-#include "properties.hh"
+#include <dumux/common/capabilities.hh>
+#include <dumux/common/timeloop.hh>
namespace Dumux
{
+
+namespace Properties
+{
+ NEW_PROP_TAG(ElementFaceVariables);
+}
/*!
* \ingroup CCModel
* \ingroup StaggeredLocalResidual
@@ -42,8 +45,6 @@ namespace Dumux
template<class TypeTag>
class StaggeredLocalResidual
{
- using ParentType = ImplicitLocalResidual<TypeTag>;
- friend class ImplicitLocalResidual<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
@@ -62,9 +63,14 @@ class StaggeredLocalResidual
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using CellCenterSolutionVector = typename GET_PROP_TYPE(TypeTag, CellCenterSolutionVector);
using FaceSolutionVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
- using GlobalFaceVars = typename GET_PROP_TYPE(TypeTag, GlobalFaceVars);
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+
+ using CellCenterResidual = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
+ using FaceResidual = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
+ using FaceResidualVector = typename GET_PROP_TYPE(TypeTag, FaceSolutionVector);
+ using ElementFaceVariables = typename GET_PROP_TYPE(TypeTag, ElementFaceVariables);
using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
@@ -77,25 +83,17 @@ class StaggeredLocalResidual
dimWorld = GridView::dimensionworld
};
-public:
- // copying the local residual class is not a good idea
- StaggeredLocalResidual(const StaggeredLocalResidual &) = delete;
-
- StaggeredLocalResidual() = default;
+ using TimeLoop = TimeLoopBase<Scalar>;
- /*!
- * \brief Initialize the local residual.
- *
- * This assumes that all objects of the simulation have been fully
- * allocated but not necessarily initialized completely.
- *
- * \param problem The representation of the physical problem to be
- * solved.
- */
- void init(Problem &problem)
- { problemPtr_ = &problem; }
+public:
+ //! the constructor for stationary problems
+ StaggeredLocalResidual() : prevSol_(nullptr) {}
+ StaggeredLocalResidual(std::shared_ptr<TimeLoop> timeLoop)
+ : timeLoop_(timeLoop)
+ , prevSol_(nullptr)
+ {}
/*!
* \name User interface
@@ -104,88 +102,6 @@ public:
*/
// \{
- /*!
- * \brief Compute the local residual, i.e. the deviation of the
- * equations from zero.
- *
- * \param element The DUNE Codim<0> entity for which the residual
- * ought to be calculated
- */
- void eval(const Element &element)
- {
- // make sure FVElementGeometry and volume variables are bound to the element
- auto fvGeometry = localView(this->problem().model().fvGridGeometry());
- fvGeometry.bind(element);
-
- auto curElemVolVars = localView(problem().model().curGlobalVolVars());
- curElemVolVars.bind(element, fvGeometry, problem().model().curSol());
-
- auto prevElemVolVars = localView(problem().model().prevGlobalVolVars());
- prevElemVolVars.bindElement(element, fvGeometry, problem().model().prevSol());
-
- auto elemFluxVarsCache = localView(problem().model().globalFluxVarsCache());
- elemFluxVarsCache.bindElement(element, fvGeometry, curElemVolVars);
-
- ElementBoundaryTypes bcTypes;
- bcTypes.update(problem(), element, fvGeometry);
-
- auto& curGlobalFaceVars = problem().model().curGlobalFaceVars();
- auto& prevGlobalFaceVars = problem().model().prevGlobalFaceVars();
-
-
- asImp_().eval(element, fvGeometry,
- prevElemVolVars, curElemVolVars,
- prevGlobalFaceVars, curGlobalFaceVars,
- bcTypes, elemFluxVarsCache);
- }
-
- /*!
- * \brief Compute the local residual, i.e. the deviation of the
- * equations from zero.
- *
- * \param element The DUNE Codim<0> entity for which the residual
- * ought to be calculated
- * \param fvGeometry The finite-volume geometry of the element
- * \param prevVolVars The volume averaged variables for all
- * sub-control volumes of the element at the previous
- * time level
- * \param curVolVars The volume averaged variables for all
- * sub-control volumes of the element at the current
- * time level
- * \param bcTypes The types of the boundary conditions for all
- * vertices of the element
- */
- void eval(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& prevElemVolVars,
- const ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevFaceVars,
- const GlobalFaceVars& curFaceVars,
- const ElementBoundaryTypes &bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
- {
- // resize and reset all face terms
- const auto numScvf = fvGeometry.numScvf();
-
- faceResiduals_.resize(numScvf, false /*copyOldValues*/);
- faceStorageTerms_.resize(numScvf, false /*copyOldValues*/);
- faceResiduals_ = 0.0;
- faceStorageTerms_ = 0.0;
-
- // evaluate the volume terms (storage + source terms)
- for (auto&& scv : scvs(fvGeometry))
- {
- // treat the cell center dof
- evalCellCenter(element, fvGeometry, scv, prevElemVolVars, curElemVolVars, prevFaceVars, curFaceVars, bcTypes, elemFluxVarsCache);
-
- // now, treat the dofs on the facets:
- for(auto&& scvf : scvfs(fvGeometry))
- {
- evalFace(element, fvGeometry, scvf, prevElemVolVars, curElemVolVars, prevFaceVars, curFaceVars, bcTypes, elemFluxVarsCache);
- }
- }
- }
-
/*!
* \brief Compute the local residual, i.e. the deviation of the
* equations from zero.
@@ -202,23 +118,26 @@ public:
* \param bcTypes The types of the boundary conditions for all
* vertices of the element
*/
- void evalCellCenter(const Element &element,
+ auto evalCellCenter(const Problem& problem,
+ const Element &element,
const FVElementGeometry& fvGeometry,
- const SubControlVolume& scv,
const ElementVolumeVariables& prevElemVolVars,
const ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevFaceVars,
- const GlobalFaceVars& curFaceVars,
+ const ElementFaceVariables& prevElemFaceVars,
+ const ElementFaceVariables& curElemFaceVars,
const ElementBoundaryTypes &bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
// reset all terms
- ccResidual_ = 0.0;
- ccStorageTerm_ = 0.0;
+ CellCenterResidual residual;
+ residual = 0.0;
+ // ccStorageTerm_ = 0.0;
+
+ asImp_().evalVolumeTermForCellCenter_(residual, problem, element, fvGeometry, prevElemVolVars, curElemVolVars, prevElemFaceVars, curElemFaceVars, bcTypes);
+ asImp_().evalFluxesForCellCenter_(residual, problem, element, fvGeometry, curElemVolVars, curElemFaceVars, bcTypes, elemFluxVarsCache);
+ asImp_().evalBoundaryForCellCenter_(residual, problem, element, fvGeometry, curElemVolVars, curElemFaceVars, bcTypes, elemFluxVarsCache);
- asImp_().evalVolumeTermForCellCenter_(element, fvGeometry, scv, prevElemVolVars, curElemVolVars, prevFaceVars, curFaceVars, bcTypes);
- asImp_().evalFluxesForCellCenter_(element, fvGeometry, curElemVolVars, curFaceVars, bcTypes, elemFluxVarsCache);
- asImp_().evalBoundaryForCellCenter_(element, fvGeometry, curElemVolVars, curFaceVars, bcTypes, elemFluxVarsCache);
+ return residual;
}
/*!
@@ -237,53 +156,48 @@ public:
* \param bcTypes The types of the boundary conditions for all
* vertices of the element
*/
- void evalFace(const Element &element,
+ auto evalFace(const Problem& problem,
+ const Element &element,
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf,
const ElementVolumeVariables& prevElemVolVars,
const ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevFaceVars,
- const GlobalFaceVars& curFaceVars,
+ const ElementFaceVariables& prevElemFaceVars,
+ const ElementFaceVariables& curElemFaceVars,
const ElementBoundaryTypes &bcTypes,
const ElementFluxVariablesCache& elemFluxVarsCache,
- const bool resizeResidual = false)
+ const bool resizeResidual = false) const
{
- if(resizeResidual)
- {
- const auto numScvf = fvGeometry.numScvf();
- faceResiduals_.resize(numScvf);
- faceStorageTerms_.resize(numScvf);
- }
+ FaceResidual residual;
- faceResiduals_[scvf.localFaceIdx()] = 0.0;
- faceStorageTerms_[scvf.localFaceIdx()] = 0.0;
+ asImp_().evalVolumeTermForFace_(residual, problem, element, fvGeometry, scvf, prevElemVolVars, curElemVolVars, prevElemFaceVars, curElemFaceVars, bcTypes);
+ asImp_().evalFluxesForFace_(residual, problem, element, fvGeometry, scvf, curElemVolVars, curElemFaceVars, bcTypes, elemFluxVarsCache);
+ asImp_().evalBoundaryForFace_(residual, problem, element, fvGeometry, scvf, curElemVolVars, curElemFaceVars, bcTypes, elemFluxVarsCache);
- asImp_().evalVolumeTermForFace_(element, fvGeometry, scvf, prevElemVolVars, curElemVolVars, prevFaceVars, curFaceVars, bcTypes);
- asImp_().evalFluxesForFace_(element, fvGeometry, scvf, curElemVolVars, curFaceVars, bcTypes, elemFluxVarsCache);
- asImp_().evalBoundaryForFace_(element, fvGeometry, scvf, curElemVolVars, curFaceVars, bcTypes, elemFluxVarsCache);
+ return residual;
}
-
- /*!
- * \brief Return the problem we are solving. Only call this after init()!
+ /*!
+ * \brief Sets the solution from which to start the time integration. Has to be
+ * called prior to assembly for time-dependent problems.
*/
- const Problem& problem() const
- { return *problemPtr_; }
+ void setPreviousSolution(const SolutionVector& u)
+ { prevSol_ = &u; }
/*!
- * \brief Return the problem we are solving. Only call this after init()!
+ * \brief Return the solution that has been set as the previous one.
*/
- Problem& problem()
- { return *problemPtr_; }
-
- const auto& ccResidual() const
- { return ccResidual_; }
-
- const auto& faceResiduals() const
- { return faceResiduals_; }
+ const SolutionVector& prevSol() const
+ {
+ assert(prevSol_ && "no solution set for storage term evaluation");
+ return *prevSol_;
+ }
- const auto& faceResidual(const int fIdx) const
- { return faceResiduals_[fIdx]; }
+ /*!
+ * \brief If no solution has been set, we treat the problem as stationary.
+ */
+ bool isStationary() const
+ { return !prevSol_; }
protected:
@@ -291,42 +205,47 @@ protected:
/*!
* \brief Evaluate the flux terms for cell center dofs
*/
- void evalFluxesForCellCenter_(const Element& element,
+ void evalFluxesForCellCenter_(CellCenterResidual& residual,
+ const Problem& problem,
+ const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& faceVars,
+ const ElementFaceVariables& elemFaceVars,
const ElementBoundaryTypes& bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
for (auto&& scvf : scvfs(fvGeometry))
{
if(!scvf.boundary())
- ccResidual_ += asImp_().computeFluxForCellCenter(element, fvGeometry, elemVolVars, faceVars, scvf, elemFluxVarsCache);
+ residual += asImp_().computeFluxForCellCenter(problem, element, fvGeometry, elemVolVars, elemFaceVars, scvf, elemFluxVarsCache);
}
}
/*!
* \brief Evaluate the flux terms for face dofs
*/
- void evalFluxesForFace_(const Element& element,
+ void evalFluxesForFace_(FaceResidual& residual,
+ const Problem& problem,
+ const Element& element,
const FVElementGeometry& fvGeometry,
const SubControlVolumeFace& scvf,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& globalFaceVars,
+ const ElementFaceVariables& elemFaceVars,
const ElementBoundaryTypes& bcTypes,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
if(!scvf.boundary())
- faceResiduals_[scvf.localFaceIdx()] += asImp_().computeFluxForFace(element, scvf, fvGeometry, elemVolVars, globalFaceVars, elemFluxVarsCache);
+ residual += asImp_().computeFluxForFace(problem, element, scvf, fvGeometry, elemVolVars, elemFaceVars, elemFluxVarsCache);
}
/*!
* \brief Evaluate boundary conditions
*/
- void evalBoundary_(const Element& element,
+ void evalBoundary_(const Problem& problem,
+ const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
- const GlobalFaceVars& faceVars,
+ const ElementFaceVariables& elemFaceVars,
const ElementBoundaryTypes& bcTypes,
const ElementFluxVariablesCache& elemFluxVarsCache)
{
@@ -340,22 +259,25 @@ protected:
*/
template<class P = Problem>
typename std::enable_if<Dumux::Capabilities::isStationary<P>::value, void>::type
- evalVolumeTermForCellCenter_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolume& scv,
- const ElementVolumeVariables& prevElemVolVars,
- const ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevFaceVars,
- const GlobalFaceVars& curFaceVars,
- const ElementBoundaryTypes &bcTypes)
+ evalVolumeTermForCellCenter_(CellCenterResidual& residual,
+ const Problem& problem,
+ const Element &element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& prevElemVolVars,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFaceVariables& prevFaceVars,
+ const ElementFaceVariables& curFaceVars,
+ const ElementBoundaryTypes &bcTypes) const
{
- const auto curExtrusionFactor = curElemVolVars[scv].extrusionFactor();
-
- // subtract the source term from the local rate
- CellCenterPrimaryVariables source = asImp_().computeSourceForCellCenter(element, fvGeometry, curElemVolVars, curFaceVars, scv);
- source *= scv.volume()*curExtrusionFactor;
+ for(auto&& scv : scvs(fvGeometry))
+ {
+ const auto curExtrusionFactor = curElemVolVars[scv].extrusionFactor();
- ccResidual_ -= source;
+ // subtract the source term from the local rate
+ CellCenterPrimaryVariables source = asImp_().computeSourceForCellCenter(problem, element, fvGeometry, curElemVolVars, curFaceVars, scv);
+ source *= scv.volume()*curExtrusionFactor;
+ residual -= source;
+ }
}
/*!
@@ -363,21 +285,23 @@ protected:
*/
template<class P = Problem>
typename std::enable_if<Dumux::Capabilities::isStationary<P>::value, void>::type
- evalVolumeTermForFace_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf,
- const ElementVolumeVariables& prevElemVolVars,
- const ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevFaceVars,
- const GlobalFaceVars& curFaceVars,
- const ElementBoundaryTypes &bcTypes)
+ evalVolumeTermForFace_(FaceResidual& residual,
+ const Problem& problem,
+ const Element &element,
+ const FVElementGeometry& fvGeometry,
+ const SubControlVolumeFace& scvf,
+ const ElementVolumeVariables& prevElemVolVars,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFaceVariables& prevFaceVars,
+ const ElementFaceVariables& curFaceVars,
+ const ElementBoundaryTypes &bcTypes) const
{
// the source term:
- auto faceSource = asImp_().computeSourceForFace(scvf, curElemVolVars, curFaceVars);
+ auto faceSource = asImp_().computeSourceForFace(problem, scvf, curElemVolVars, curFaceVars);
const auto& scv = fvGeometry.scv(scvf.insideScvIdx());
const auto curExtrusionFactor = curElemVolVars[scv].extrusionFactor();
faceSource *= 0.5*scv.volume()*curExtrusionFactor;
- faceResiduals_[scvf.localFaceIdx()] -= faceSource;
+ residual -= faceSource;
}
/*!
@@ -385,43 +309,49 @@ protected:
*/
template<class P = Problem>
typename std::enable_if<!Dumux::Capabilities::isStationary<P>::value, void>::type
- evalVolumeTermForCellCenter_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolume& scv,
- const ElementVolumeVariables& prevElemVolVars,
- const ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevFaceVars,
- const GlobalFaceVars& curFaceVars,
- const ElementBoundaryTypes &bcTypes)
+ evalVolumeTermForCellCenter_(CellCenterResidual& residual,
+ const Problem& problem,
+ const Element &element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& prevElemVolVars,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFaceVariables& prevFaceVars,
+ const ElementFaceVariables& curFaceVars,
+ const ElementBoundaryTypes &bcTypes) const
{
- const auto& curVolVars = curElemVolVars[scv];
- const auto& prevVolVars = prevElemVolVars[scv];
+ for(auto&& scv : scvs(fvGeometry))
+ {
+ const auto& curVolVars = curElemVolVars[scv];
+ const auto& prevVolVars = prevElemVolVars[scv];
+
+ // mass balance within the element. this is the
+ // \f$\frac{m}{\partial t}\f$ term if using implicit
+ // euler as time discretization.
+ //
+ // We might need a more explicit way for
+ // doing the time discretization...
+ auto prevCCStorage = asImp_().computeStorageForCellCenter(problem, scv, prevVolVars);
+ auto curCCStorage = asImp_().computeStorageForCellCenter(problem, scv, curVolVars);
- // mass balance within the element. this is the
- // \f$\frac{m}{\partial t}\f$ term if using implicit
- // euler as time discretization.
- //
- // We might need a more explicit way for
- // doing the time discretization...
- auto prevCCStorage = asImp_().computeStorageForCellCenter(scv, prevVolVars);
- auto curCCStorage = asImp_().computeStorageForCellCenter(scv, curVolVars);
+ prevCCStorage *= prevVolVars.extrusionFactor();
+ curCCStorage *= curVolVars.extrusionFactor();
- prevCCStorage *= prevVolVars.extrusionFactor();
- curCCStorage *= curVolVars.extrusionFactor();
+ CellCenterResidual storageTerm(0.0);
- ccStorageTerm_ = std::move(curCCStorage);
- ccStorageTerm_ -= std::move(prevCCStorage);
- ccStorageTerm_ *= scv.volume();
- ccStorageTerm_ /= problem().timeManager().timeStepSize();
+ storageTerm = std::move(curCCStorage);
+ storageTerm -= std::move(prevCCStorage);
+ storageTerm *= scv.volume();
+ storageTerm /= timeLoop_->timeStepSize();
- // add the storage term to the residual
- ccResidual_ += ccStorageTerm_;
+ // add the storage term to the residual
+ residual += storageTerm;
- // subtract the source term from the local rate
- CellCenterPrimaryVariables source = asImp_().computeSourceForCellCenter(element, fvGeometry, curElemVolVars, curFaceVars, scv);
- source *= scv.volume()*curVolVars.extrusionFactor();
+ // subtract the source term from the local rate
+ CellCenterPrimaryVariables source = asImp_().computeSourceForCellCenter(problem, element, fvGeometry, curElemVolVars, curFaceVars, scv);
+ source *= scv.volume()*curVolVars.extrusionFactor();
- ccResidual_ -= source;
+ residual -= source;
+ }
}
/*!
@@ -429,32 +359,34 @@ protected:
*/
template<class P = Problem>
typename std::enable_if<!Dumux::Capabilities::isStationary<P>::value, void>::type
- evalVolumeTermForFace_(const Element &element,
- const FVElementGeometry& fvGeometry,
- const SubControlVolumeFace& scvf,
- const ElementVolumeVariables& prevElemVolVars,
- const ElementVolumeVariables& curElemVolVars,
- const GlobalFaceVars& prevFaceVars,
- const GlobalFaceVars& curFaceVars,
- const ElementBoundaryTypes &bcTypes)
+ evalVolumeTermForFace_(FaceResidual& residual,
+ const Problem& problem,
+ const Element &element,
+ const FVElementGeometry& fvGeometry,
+ const SubControlVolumeFace& scvf,
+ const ElementVolumeVariables& prevElemVolVars,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFaceVariables& prevFaceVars,
+ const ElementFaceVariables& curFaceVars,
+ const ElementBoundaryTypes &bcTypes) const
{
const auto& scv = fvGeometry.scv(scvf.insideScvIdx());
const auto& curVolVars = curElemVolVars[scv];
const auto& prevVolVars = prevElemVolVars[scv];
- auto prevFaceStorage = asImp_().computeStorageForFace(scvf, prevVolVars, prevFaceVars);
- auto curFaceStorage = asImp_().computeStorageForFace(scvf, curVolVars, curFaceVars);
+ auto prevFaceStorage = asImp_().computeStorageForFace(problem, scvf, prevVolVars, prevFaceVars);
+ auto curFaceStorage = asImp_().computeStorageForFace(problem, scvf, curVolVars, curFaceVars);
// the storage term
- faceStorageTerms_[scvf.localFaceIdx()] = std::move(curFaceStorage);
- faceStorageTerms_[scvf.localFaceIdx()] -= std::move(prevFaceStorage);
- faceStorageTerms_[scvf.localFaceIdx()] *= (scv.volume()/2.0);
- faceStorageTerms_[scvf.localFaceIdx()] /= problem().timeManager().timeStepSize();
- faceResiduals_[scvf.localFaceIdx()] += faceStorageTerms_[scvf.localFaceIdx()];
+ residual = std::move(curFaceStorage);
+ residual -= std::move(prevFaceStorage);
+ residual *= (scv.volume()/2.0);
+ residual /= timeLoop_->timeStepSize();
+ // residuals[scvf.localFaceIdx()] += faceStorageTerms_[scvf.localFaceIdx()];
// the source term:
- auto faceSource = asImp_().computeSourceForFace(scvf, curElemVolVars, curFaceVars);
+ auto faceSource = asImp_().computeSourceForFace(problem, scvf, curElemVolVars, curFaceVars);
faceSource *= 0.5*scv.volume()*curVolVars.extrusionFactor();
- faceResiduals_[scvf.localFaceIdx()] -= faceSource;
+ residual -= faceSource;
}
Implementation &asImp_()
@@ -463,13 +395,22 @@ protected:
const Implementation &asImp_() const
{ return *static_cast<const Implementation*>(this); }
- CellCenterPrimaryVariables ccResidual_;
- CellCenterPrimaryVariables ccStorageTerm_;
- FaceSolutionVector faceResiduals_;
- FaceSolutionVector faceStorageTerms_;
+
+ TimeLoop& timeLoop()
+ { return *timeLoop_; }
+
+ const TimeLoop& timeLoop() const
+ { return *timeLoop_; }
+
+ Implementation &asImp()
+ { return *static_cast<Implementation*>(this); }
+
+ const Implementation &asImp() const
+ { return *static_cast<const Implementation*>(this); }
private:
- Problem* problemPtr_;
+ std::shared_ptr<TimeLoop> timeLoop_;
+ const SolutionVector* prevSol_;
};
diff --git a/dumux/implicit/staggered/model.hh b/dumux/implicit/staggered/model.hh
deleted file mode 100644
index e59dbaab1590ee9a864f04ce07f730903390c346..0000000000000000000000000000000000000000
--- a/dumux/implicit/staggered/model.hh
+++ /dev/null
@@ -1,565 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Base class for all models which use the one-phase,
- * fully implicit model.
- * Adaption of the fully implicit scheme to the one-phase flow model.
- */
-
-#ifndef DUMUX_STAGGERED_BASEMODEL_HH
-#define DUMUX_STAGGERED_BASEMODEL_HH
-
-// #include <dumux/porousmediumflow/implicit/velocityoutput.hh>
-#include <dumux/implicit/model.hh>
-#include <dumux/discretization/staggered/globalfacevariables.hh>
-#include "properties.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup NavierStokesModel
- * \brief A single-phase, isothermal flow model using the fully implicit scheme.
- *
- * Single-phase, isothermal flow model, which uses a standard Darcy approach as the
- * equation for the conservation of momentum:
- * \f[
- v = - \frac{\textbf K}{\mu}
- \left(\textbf{grad}\, p - \varrho {\textbf g} \right)
- * \f]
- *
- * and solves the mass continuity equation:
- * \f[
- \phi \frac{\partial \varrho}{\partial t} + \text{div} \left\lbrace
- - \varrho \frac{\textbf K}{\mu} \left( \textbf{grad}\, p -\varrho {\textbf g} \right) \right\rbrace = q,
- * \f]
- * All equations are discretized using a vertex-centered finite volume (box)
- * or cell-centered finite volume scheme as spatial
- * and the implicit Euler method as time discretization.
- * The model supports compressible as well as incompressible fluids.
- */
-template<class TypeTag >
-class StaggeredBaseModel : public ImplicitModel<TypeTag>
-{
- friend typename GET_PROP_TYPE(TypeTag, LocalJacobian);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using JacobianAssembler = typename GET_PROP_TYPE(TypeTag, JacobianAssembler);
-
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
-
- enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
-
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dim : 0 };
- using Element = typename GridView::template Codim<0>::Entity;
- using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
- using Implementation = typename GET_PROP_TYPE(TypeTag, Model);
- using NewtonMethod = typename GET_PROP_TYPE(TypeTag, NewtonMethod);
- using NewtonController = typename GET_PROP_TYPE(TypeTag, NewtonController);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
-
- using GlobalFaceVariables = Dumux::StaggeredGlobalFaceVariables<TypeTag>;
- using ParentType = ImplicitModel<TypeTag>;
-
- using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
- typename DofTypeIndices::CellCenterIdx cellCenterIdx;
- typename DofTypeIndices::FaceIdx faceIdx;
-
- static_assert(!isBox, "must not be box!");
-
-public:
-
- /*!
- * \brief Apply the initial conditions to the model.
- *
- * \param problem The object representing the problem which needs to
- * be simulated.
- */
- void init(Problem &problem)
- {
- this->problemPtr_ = &problem;
-
- this->updateBoundaryIndices_();
-
- this->fvGridGeometryPtr_ = std::make_shared<FVGridGeometry>(problem.gridView());
- this->fvGridGeometryPtr_->update(problem);
-
- this->uCur_[cellCenterIdx].resize(asImp_().numCellCenterDofs());
- this->uCur_[faceIdx].resize(asImp_().numFaceDofs());
-
- // apply initial solution
- // for compositional models initial the phase presence herein
- asImp_().applyInitialSolution_();
-
- // resize and update the volVars with the initial solution
- this->curGlobalVolVars_.update(problem, this->curSol());
-
- curGlobalFaceVariables_.update(problem, this->curSol()[faceIdx]);
-
- // update the flux variables caches
- this->globalfluxVarsCache_.update(problem);
-
- // initialize assembler and create matrix
- this->localJacobian_.init(problem);
- this->jacAsm_ = std::make_shared<JacobianAssembler>();
- this->jacAsm_->init(problem);
-
- // also set the solution of the "previous" time step to the
- // initial solution.
- this->uPrev_ = this->uCur_;
- this->prevGlobalVolVars_ = this->curGlobalVolVars_;
- prevGlobalFaceVariables_ = curGlobalFaceVariables_;
- }
-
- /*!
- * \brief Try to progress the model to the next timestep.
- *
- * \param solver The non-linear solver
- * \param controller The controller which specifies the behaviour
- * of the non-linear solver
- */
- bool update(NewtonMethod &solver,
- NewtonController &controller)
- {
-#if HAVE_VALGRIND
- for (size_t i = 0; i < this->curSol()[cellCenterIdx].size(); ++i)
- Valgrind::CheckDefined(this->curSol()[cellCenterIdx][i]);
- for (size_t i = 0; i < this->curSol()[faceIdx].size(); ++i)
- Valgrind::CheckDefined(this->curSol()[faceIdx][i]);
-#endif // HAVE_VALGRIND
-
- asImp_().updateBegin();
-
- int converged = solver.execute(controller);
-
- if (this->gridView_().comm().size() > 1)
- {
- converged = this->gridView_().comm().min(converged);
- }
- if (converged) {
- asImp_().updateSuccessful();
- }
- else
- asImp_().updateFailed();
-
-#if HAVE_VALGRIND
- for (size_t i = 0; i < this->curSol()[cellCenterIdx].size(); ++i)
- Valgrind::CheckDefined(this->curSol()[cellCenterIdx][i]);
- for (size_t i = 0; i < this->curSol()[faceIdx].size(); ++i)
- Valgrind::CheckDefined(this->curSol()[faceIdx][i]);
-#endif // HAVE_VALGRIND
-
- return converged;
- }
-
- void newtonEndStep()
- {
- ParentType::newtonEndStep();
- curGlobalFaceVariables_.update(this->problem_(), this->curSol()[faceIdx]);
-
- }
-
- /*!
- * \brief Returns the maximum relative shift between two vectors of
- * primary variables.
- *
- * \param priVars1 The first vector of primary variables
- * \param priVars2 The second vector of primary variables
- */
- template<class CellCenterOrFacePriVars>
- Scalar relativeShiftAtDof(const CellCenterOrFacePriVars &priVars1,
- const CellCenterOrFacePriVars &priVars2)
- {
- const auto numEq = priVars1.size();
- Scalar result = 0.0;
- for (int j = 0; j < numEq; ++j) {
- Scalar eqErr = std::abs(priVars1[j] - priVars2[j]);
- eqErr /= std::max<Scalar>(1.0, std::abs(priVars1[j] + priVars2[j])/2);
-
- result = std::max(result, eqErr);
- }
- return result;
- }
-
- /*!
- * \brief Called by the update() method if it was
- * unsuccessful. This is primarily a hook which the actual
- * model can overload.
- */
- void updateFailed()
- {
- ParentType::updateFailed();
- curGlobalFaceVariables_ = prevGlobalFaceVariables_;
- }
-
- /*!
- * \brief Called by the problem if a time integration was
- * successful, post processing of the solution is done and
- * the result has been written to disk.
- *
- * This should prepare the model for the next time integration.
- */
- void advanceTimeLevel()
- {
- ParentType::advanceTimeLevel();
- // make the current solution the previous one.
- prevGlobalFaceVariables_ = curGlobalFaceVariables_;
- }
-
- /*!
- * \brief Applies the initial solution for all vertices of the grid.
- *
- * \todo the initial condition needs to be unique for
- * each vertex. we should think about the API...
- */
- void applyInitialSolution_()
- {
- // first set the whole domain to zero
- this->uCur_ = Scalar(0.0);
-
- // iterate through leaf grid and evaluate initial
- // condition at the center of each sub control volume
- for (const auto& element : elements(this->gridView_()))
- {
- // deal with the current element, bind FVGeometry to it
- auto fvGeometry = localView(this->fvGridGeometry());
- fvGeometry.bindElement(element);
-
- // loop over sub control volumes
- for (auto&& scv : scvs(fvGeometry))
- {
- // let the problem do the dirty work of nailing down
- // the initial solution.
- auto initPriVars = this->problem_().initialAtPos(scv.center())[cellCenterIdx];
-
- auto dofIdxGlobal = scv.dofIndex();
- this->uCur_[cellCenterIdx][dofIdxGlobal] += initPriVars;
- }
-
- // loop over faces
- for(auto&& scvf : scvfs(fvGeometry))
- {
- auto initPriVars = this->problem_().initialAtPos(scvf.center())[faceIdx][scvf.directionIndex()];
- this->uCur_[faceIdx][scvf.dofIndex()] = initPriVars;
- }
- }
- }
-
- /*!
- * \brief Returns the element solution
- *
- * \param element The element
- * \param sol The solution vector
- * \NOTE: Only returns cell-center related values. Might be revised if face data are needed as well.
- */
- ElementSolution elementSolution(const Element& element, const SolutionVector& sol) const
- {
- PrimaryVariables priVars(0.0);
- priVars[cellCenterIdx] = sol[cellCenterIdx][this->elementMapper().index(element)];
- return ElementSolution{std::move(priVars)};
- }
-
- /*!
- * \brief Write the current solution for a vertex to a restart
- * file.
- *
- * \param outstream The stream into which the vertex data should
- * be serialized to
- * \param entity The entity which's data should be
- * serialized, i.e. a vertex for the box method
- * and an element for the cell-centered method
- */
- template <class Entity>
- void serializeEntity(std::ostream &outstream,
- const Entity &entity)
- {
- DUNE_THROW(Dune::NotImplemented, "deserializeEntity() not implemented yet");
-// int dofIdxGlobal = dofMapper().index(entity);
-// int dofIdxGlobal = dofMapper().index(entity);
-//
-// // write phase state
-// if (!outstream.good()) {
-// DUNE_THROW(Dune::IOError,
-// "Could not serialize vertex "
-// << dofIdxGlobal);
-// }
-//
-// for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
-// outstream << curSol()[dofIdxGlobal][eqIdx] << " ";
-// }
- }
-
- /*!
- * \brief Reads the current solution variables for a vertex from a
- * restart file.
- *
- * \param instream The stream from which the vertex data should
- * be deserialized from
- * \param entity The entity which's data should be
- * serialized, i.e. a vertex for the box method
- * and an element for the cell-centered method
- */
- template <class Entity>
- void deserializeEntity(std::istream &instream,
- const Entity &entity)
- {
- DUNE_THROW(Dune::NotImplemented, "deserializeEntity() not implemented yet");
-// int dofIdxGlobal = dofMapper().index(entity);
-//
-// for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
-// if (!instream.good())
-// DUNE_THROW(Dune::IOError,
-// "Could not deserialize vertex "
-// << dofIdxGlobal);
-// instream >> curSol()[dofIdxGlobal][eqIdx];
-// }
- }
-
- /*!
- * \brief \copybrief Dumux::ImplicitModel::addOutputVtkFields
- *
- * Specialization for the NavierStokesModel, adding the pressure and
- * the process rank to the VTK writer.
- */
- template<class MultiWriter>
- void addOutputVtkFields(const SolutionVector &sol,
- MultiWriter &writer)
- {
- // TODO: implement vtk output
-// // typedef Dune::BlockVector<Dune::FieldVector<double, dimWorld> > VectorField;
-//
-// // create the required scalar fields
-// unsigned numDofs = this->numDofs();
-// auto *p = writer.allocateManagedBuffer(numDofs);
-// // VectorField *velocity = writer.template allocateManagedBuffer<double, dimWorld>(numDofs);
-// // ImplicitVelocityOutput<TypeTag> velocityOutput(this->problem_());
-//
-// // if (velocityOutput.enableOutput())
-// // {
-// // // initialize velocity field
-// // for (unsigned int i = 0; i < numDofs; ++i)
-// // {
-// // (*velocity)[i] = double(0);
-// // }
-// // }
-//
-// unsigned numElements = this->gridView_().size(0);
-// auto *rank = writer.allocateManagedBuffer(numElements);
-//
-// for (const auto& element : elements(this->gridView_(), Dune::Partitions::interior))
-// {
-// auto eIdx = this->elementMapper().index(element);
-// (*rank)[eIdx] = this->gridView_().comm().rank();
-//
-// // get the local fv geometry
-// auto fvGeometry = localView(this->fvGridGeometry());
-// fvGeometry.bindElement(element);
-//
-// auto elemVolVars = localView(this->curGlobalVolVars());
-// elemVolVars.bindElement(element, fvGeometry, this->curSol());
-//
-// for (auto&& scv : scvs(fvGeometry))
-// {
-// const auto& volVars = elemVolVars[scv];
-// auto dofIdxGlobal = scv.dofIndex();
-//
-// (*p)[dofIdxGlobal] = volVars.pressure();
-// }
-//
-// // velocity output
-// //velocityOutput.calculateVelocity(*velocity, elemVolVars, fvGeometry, element, /*phaseIdx=*/0);
-// }
-//
-// writer.attachDofData(*p, "p", isBox);
-// // if (velocityOutput.enableOutput())
-// // {
-// // writer.attachDofData(*velocity, "velocity", isBox, dim);
-// // }
-// writer.attachCellData(*rank, "process rank");
- }
-
- /*!
- * \brief Add the vector fields for analysing the convergence of
- * the newton method to the a VTK multi writer.
- *
- * \tparam MultiWriter The type of the VTK multi writer
- *
- * \param writer The VTK multi writer object on which the fields should be added.
- * \param u The solution function
- * \param deltaU The delta of the solution function before and after the Newton update
- */
- template <class MultiWriter>
- void addConvergenceVtkFields(MultiWriter &writer,
- const SolutionVector &u,
- const SolutionVector &deltaU)
- {
-// typedef Dune::BlockVector<Dune::FieldVector<double, 1> > ScalarField;
-//
-// SolutionVector residual(u);
-// asImp_().globalResidual(residual, u);
-//
-// // create the required scalar fields
-// unsigned numDofs = asImp_().numDofs();
-//
-// // global defect of the two auxiliary equations
-// ScalarField* def[numEq];
-// ScalarField* delta[numEq];
-// ScalarField* x[numEq];
-// for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
-// x[eqIdx] = writer.allocateManagedBuffer(numDofs);
-// delta[eqIdx] = writer.allocateManagedBuffer(numDofs);
-// def[eqIdx] = writer.allocateManagedBuffer(numDofs);
-// }
-//
-// for (unsigned int dofIdxGlobal = 0; dofIdxGlobal < u.size(); dofIdxGlobal++)
-// {
-// for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
-// {
-// (*x[eqIdx])[dofIdxGlobal] = u[dofIdxGlobal][eqIdx];
-// (*delta[eqIdx])[dofIdxGlobal] = - deltaU[dofIdxGlobal][eqIdx];
-// (*def[eqIdx])[dofIdxGlobal] = residual[dofIdxGlobal][eqIdx];
-// }
-// }
-//
-// for (int eqIdx = 0; eqIdx < numEq; ++eqIdx) {
-// std::ostringstream oss;
-// oss.str(""); oss << "x_" << eqIdx;
-// if (isBox)
-// writer.attachVertexData(*x[eqIdx], oss.str());
-// else
-// writer.attachCellData(*x[eqIdx], oss.str());
-// oss.str(""); oss << "delta_" << eqIdx;
-// if (isBox)
-// writer.attachVertexData(*delta[eqIdx], oss.str());
-// else
-// writer.attachCellData(*delta[eqIdx], oss.str());
-// oss.str(""); oss << "defect_" << eqIdx;
-// if (isBox)
-// writer.attachVertexData(*def[eqIdx], oss.str());
-// else
-// writer.attachCellData(*def[eqIdx], oss.str());
-// }
-//
-// asImp_().addOutputVtkFields(u, writer);
- }
-
- /*!
- * \brief Compute the global residual for an arbitrary solution
- * vector.
- *
- * \param residual Stores the result
- * \param u The solution for which the residual ought to be calculated
- */
- Scalar globalResidual(SolutionVector &residual,
- const SolutionVector &u)
- {
- SolutionVector tmp(this->curSol());
- this->curSol() = u;
- Scalar res = globalResidual(residual);
- this->curSol() = tmp;
- return res;
- }
-
- /*!
- * \brief Compute the global residual for the current solution
- * vector.
- *
- * \param residual Stores the result
- */
- Scalar globalResidual(SolutionVector &residual)
- {
- residual = 0;
-
- for (const auto& element : elements(this->gridView_())) {
- this->localResidual().eval(element);
-
-
-// int globalI = this->elementMapper().index(element);
-// residual[cellCenterIdx][globalI] = this->localResidual().residual(0);
- }
-
- // calculate the square norm of the residual
- Scalar result2 = residual.two_norm2();
- if (this->gridView_().comm().size() > 1)
- result2 = this->gridView_().comm().sum(result2);
-
- return std::sqrt(result2);
- }
-
- /*!
- * \brief Returns the number of global degrees of freedoms (DOFs)
- */
- size_t numDofs() const
- {
- return numCellCenterDofs() + numFaceDofs();
- }
-
- /*!
- * \brief Returns the number of cell center degrees of freedoms (DOFs)
- */
- size_t numCellCenterDofs() const
- {
- return this->gridView_().size(0);
- }
-
- /*!
- * \brief Returns the number of face degrees of freedoms (DOFs)
- */
- size_t numFaceDofs() const
- {
- return this->fvGridGeometryPtr_->numIntersections();
- }
-
- const GlobalFaceVariables& curGlobalFaceVars() const
- { return curGlobalFaceVariables_; }
-
- const GlobalFaceVariables& prevGlobalFaceVars() const
- { return prevGlobalFaceVariables_; }
-
-protected:
-
- GlobalFaceVariables& nonConstCurFaceVars()
- { return curGlobalFaceVariables_; }
-
- GlobalFaceVariables curGlobalFaceVariables_;
- GlobalFaceVariables prevGlobalFaceVariables_;
-
-
-private:
-
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
-
-};
-}
-
-#include "propertydefaults.hh"
-
-#endif
diff --git a/dumux/implicit/staggered/newtoncontroller.hh b/dumux/implicit/staggered/newtoncontroller.hh
index 1e4cf1dd4a867d24d564b3fdcde479b0a21f9ae1..70d4841b5f04322a4dda8b860244d2f1557e6922 100644
--- a/dumux/implicit/staggered/newtoncontroller.hh
+++ b/dumux/implicit/staggered/newtoncontroller.hh
@@ -18,7 +18,7 @@
*****************************************************************************/
/*!
* \file
- * \brief A 2p1cni specific controller for the newton solver.
+ * \brief A StaggeredModel specific controller for the newton solver.
*
* This controller 'knows' what a 'physically meaningful' solution is
* which allows the newton method to abort quicker if the solution is
@@ -27,28 +27,19 @@
#ifndef DUMUX_STAGGERED_NEWTON_CONTROLLER_HH
#define DUMUX_STAGGERED_NEWTON_CONTROLLER_HH
-#include "properties.hh"
+#include <dumux/discretization/staggered/properties.hh>
+#include <dumux/common/properties.hh>
#include <dumux/nonlinear/newtoncontroller.hh>
#include <dumux/linear/linearsolveracceptsmultitypematrix.hh>
#include <dumux/linear/matrixconverter.hh>
-#include "newtonconvergencewriter.hh"
+// #include "newtonconvergencewriter.hh"
namespace Dumux {
-namespace Properties
-{
- SET_PROP(StaggeredModel, LinearSolverBlockSize)
- {
- // LinearSolverAcceptsMultiTypeMatrix<T>::value
- // TODO: make somehow dependend? or only relevant for direct solvers?
- public:
- static constexpr auto value = 1;
- };
-}
/*!
- * \ingroup PNMModel
- * \brief A PNM specific controller for the newton solver.
+ * \ingroup StaggeredModel
+ * \brief A StaggeredModel specific controller for the newton solver.
*
* This controller 'knows' what a 'physically meaningful' solution is
* which allows the newton method to abort quicker if the solution is
@@ -58,12 +49,14 @@ namespace Properties
template <class TypeTag>
class StaggeredNewtonController : public NewtonController<TypeTag>
{
- typedef NewtonController<TypeTag> ParentType;
- typedef NewtonConvergenceWriter<TypeTag> StaggeredNewtonConvergenceWriter;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ using ParentType = NewtonController<TypeTag>;
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Communicator = typename GridView::CollectiveCommunication;
using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
typename DofTypeIndices::CellCenterIdx cellCenterIdx;
@@ -75,8 +68,12 @@ class StaggeredNewtonController : public NewtonController<TypeTag>
};
public:
- StaggeredNewtonController(const Problem &problem)
- : ParentType(problem)
+ StaggeredNewtonController(const Communicator& comm)
+ : ParentType(comm)
+ {}
+
+ StaggeredNewtonController(const Communicator& comm, std::shared_ptr<TimeLoop<Scalar>> timeLoop)
+ : ParentType(comm, timeLoop)
{}
/*!
@@ -92,11 +89,13 @@ public:
* \param x The vector which solves the linear system
* \param b The right hand side of the linear system
*/
- template<typename T = TypeTag>
- typename std::enable_if<!LinearSolverAcceptsMultiTypeMatrix<T>::value, void>::type
- newtonSolveLinear(JacobianMatrix &A,
- SolutionVector &x,
- SolutionVector &b)
+ // template<typename T = TypeTag>
+ // typename std::enable_if<!LinearSolverAcceptsMultiTypeMatrix<T>::value, void>::type
+ template<class LinearSolver, class JacobianMatrix, class SolutionVector>
+ void solveLinearSystem(LinearSolver& ls,
+ JacobianMatrix& A,
+ SolutionVector& x,
+ SolutionVector& b)
{
try
{
@@ -124,10 +123,10 @@ public:
BlockVector y;
y.resize(numRows);
- // printmatrix(std::cout, M, "", "");
+ // printmatrix(std::cout, M, "old", "");
// solve
- const bool converged = this->linearSolver_.solve(M, y, bTmp);
+ const bool converged = ls.solve(M, y, bTmp);
// copy back the result y into x
VectorConverter<SolutionVector>::retrieveValues(x, y);
@@ -153,29 +152,29 @@ public:
* \param x The vector which solves the linear system
* \param b The right hand side of the linear system
*/
- template<typename T = TypeTag>
- typename std::enable_if<LinearSolverAcceptsMultiTypeMatrix<T>::value, void>::type
- newtonSolveLinear(JacobianMatrix &A,
- SolutionVector &x,
- SolutionVector &b)
- {
- try
- {
- if (this->numSteps_ == 0)
- this->initialResidual_ = b.two_norm();
-
- bool converged = this->linearSolver_.solve(A, x, b);
-
- if (!converged)
- DUNE_THROW(NumericalProblem, "Linear solver did not converge");
- }
- catch (const Dune::Exception &e)
- {
- Dumux::NumericalProblem p;
- p.message(e.what());
- throw p;
- }
- }
+ // template<typename T = TypeTag>
+ // typename std::enable_if<LinearSolverAcceptsMultiTypeMatrix<T>::value, void>::type
+ // newtonSolveLinear(JacobianMatrix &A,
+ // SolutionVector &x,
+ // SolutionVector &b)
+ // {
+ // try
+ // {
+ // if (this->numSteps_ == 0)
+ // this->initialResidual_ = b.two_norm();
+ //
+ // bool converged = this->linearSolver_.solve(A, x, b);
+ //
+ // if (!converged)
+ // DUNE_THROW(NumericalProblem, "Linear solver did not converge");
+ // }
+ // catch (const Dune::Exception &e)
+ // {
+ // Dumux::NumericalProblem p;
+ // p.message(e.what());
+ // throw p;
+ // }
+ // }
/*!
* \brief Update the current solution with a delta vector.
@@ -194,18 +193,20 @@ public:
* system of equations. This parameter also stores
* the updated solution.
*/
- void newtonUpdate(SolutionVector &uCurrentIter,
- const SolutionVector &uLastIter,
- const SolutionVector &deltaU)
+ template<class JacobianAssembler, class SolutionVector>
+ void newtonUpdate(JacobianAssembler& assembler,
+ SolutionVector &uCurrentIter,
+ const SolutionVector &uLastIter,
+ const SolutionVector &deltaU)
{
if (this->enableShiftCriterion_)
this->newtonUpdateShift(uLastIter, deltaU);
- this->writeConvergence_(uLastIter, deltaU);
+ // this->writeConvergence_(uLastIter, deltaU);
if (this->useLineSearch_)
{
- this->lineSearchUpdate_(uCurrentIter, uLastIter, deltaU);
+ this->lineSearchUpdate_(assembler, uCurrentIter, uLastIter, deltaU);
}
else {
for (unsigned int i = 0; i < uLastIter[cellCenterIdx].size(); ++i) {
@@ -219,11 +220,14 @@ public:
if (this->enableResidualCriterion_)
{
- SolutionVector tmp(uLastIter);
- this->reduction_ = this->method().model().globalResidual(tmp, uCurrentIter);
+ this->residualNorm_ = assembler.residualNorm(uCurrentIter);
+ this->reduction_ = this->residualNorm_;
this->reduction_ /= this->initialResidual_;
}
}
+
+ // update the variables class to the new solution
+ assembler.gridVariables().update(uCurrentIter);
}
/*!
@@ -242,7 +246,7 @@ public:
auto uNewI = uLastIter[cellCenterIdx][i];
uNewI -= deltaU[cellCenterIdx][i];
- Scalar shiftAtDof = this->model_().relativeShiftAtDof(uLastIter[cellCenterIdx][i],
+ Scalar shiftAtDof = this->relativeShiftAtDof_(uLastIter[cellCenterIdx][i],
uNewI);
this->shift_ = std::max(this->shift_, shiftAtDof);
}
@@ -250,13 +254,13 @@ public:
auto uNewI = uLastIter[faceIdx][i];
uNewI -= deltaU[faceIdx][i];
- Scalar shiftAtDof = this->model_().relativeShiftAtDof(uLastIter[faceIdx][i],
+ Scalar shiftAtDof = this->relativeShiftAtDof_(uLastIter[faceIdx][i],
uNewI);
this->shift_ = std::max(this->shift_, shiftAtDof);
}
- if (this->gridView_().comm().size() > 1)
- this->shift_ = this->gridView_().comm().max(this->shift_);
+ if (this->communicator().size() > 1)
+ this->shift_ = this->communicator().max(this->shift_);
}
};
diff --git a/dumux/implicit/staggered/primaryvariables.hh b/dumux/implicit/staggered/primaryvariables.hh
index e798becaa47c8627ac748a2c359277b45f01898c..06c1b66ecbf3aa9e6aa2f44a138098f9ede98934 100644
--- a/dumux/implicit/staggered/primaryvariables.hh
+++ b/dumux/implicit/staggered/primaryvariables.hh
@@ -23,7 +23,6 @@
#ifndef DUMUX_STAGGERED_PRIMARYVARIABLES_HH
#define DUMUX_STAGGERED_PRIMARYVARIABLES_HH
-#include "properties.hh"
#include <dune/istl/multitypeblockvector.hh>
#include <dumux/common/intrange.hh>
diff --git a/dumux/implicit/staggered/properties.hh b/dumux/implicit/staggered/properties.hh
deleted file mode 100644
index 03dbcd48effa518f8119753b8501dc05a0b9b460..0000000000000000000000000000000000000000
--- a/dumux/implicit/staggered/properties.hh
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-#ifndef DUMUX_STAGGERED_PROPERTIES_HH
-#define DUMUX_STAGGERED_PROPERTIES_HH
-
-#include <dumux/implicit/properties.hh>
-
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup StaggeredModel
- * \file
- * \brief Specify the shape functions, operator assemblers, etc
- * used for the StaggeredModel.
- */
-namespace Dumux
-{
-
-namespace Properties
-{
-// \{
-
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tag for models based on staggered scheme
-NEW_TYPE_TAG(StaggeredModel, INHERITS_FROM(ImplicitBase));
-
-NEW_PROP_TAG(StaggeredGeometryHelper); //!< Helper class to ease the creation of stencils, etc.
-
-NEW_PROP_TAG(CellCenterPrimaryVariables); //!< A vector of primary variables for cell center dofs
-NEW_PROP_TAG(FacePrimaryVariables); //!< A vector of primary variables for face dofs
-NEW_PROP_TAG(CellCenterSolutionVector); //!< Vector containing all cell centered primary variables
-NEW_PROP_TAG(FaceSolutionVector); //!< Vector containing all face primary variables
-
-NEW_PROP_TAG(EnableInteriorBoundaries); //!< For compatibility
-
-NEW_PROP_TAG(BaseEpsilon); //!< Set one or different base epsilons for the calculations of the localJacobian's derivatives
-
-NEW_PROP_TAG(NumEqCellCenter); //!< Number of equations per cell center dof
-NEW_PROP_TAG(NumEqFace); //!< Number of equations per face dof
-NEW_PROP_TAG(DofTypeIndices); //!< Indices to choose between cell center and face dofs
-
-NEW_PROP_TAG(FaceVariables); //!< Variables associated to facets (equivalent to volVars)
-NEW_PROP_TAG(GlobalFaceVars); //!< Global vector of facet variables
-
-NEW_PROP_TAG(IntersectionMapper); //!< The intersection mapper
-
-NEW_PROP_TAG(VtkWriteFaceData); //!< Decide whether to write separate vtp files for face variables
-
-}
-}
-
-// \}
-
-#include <dumux/implicit/staggered/propertydefaults.hh>
-
-#endif
diff --git a/dumux/implicit/box/properties.hh b/dumux/io/defaultvtkoutputfields.hh
similarity index 70%
rename from dumux/implicit/box/properties.hh
rename to dumux/io/defaultvtkoutputfields.hh
index dae59220bc84bd45c690ca5c13fa260532f3082e..23a1e508f958008d230e2ed0b6fde2116c21a91e 100644
--- a/dumux/implicit/box/properties.hh
+++ b/dumux/io/defaultvtkoutputfields.hh
@@ -16,37 +16,33 @@
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
-#ifndef DUMUX_BOX_PROPERTIES_HH
-#define DUMUX_BOX_PROPERTIES_HH
-
-#include <dumux/implicit/properties.hh>
-
/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup BoxModel
* \file
- * \brief Specify the shape functions, operator assemblers, etc
- * used for the BoxModel.
+ * \brief Adds vtk output fields specific to a model, this is the default if a
+ model doesn't implement this functionality
*/
+#ifndef DUMUX_DEFAULT_VTK_OUTPUT_FIELDS_HH
+#define DUMUX_DEFAULT_VTK_OUTPUT_FIELDS_HH
+
+#include <dune/common/exceptions.hh>
+
namespace Dumux
{
-namespace Properties
+/*!
+ * \ingroup Common, InputOutput
+ * \brief Adds vtk output fields specific to a model
+ */
+class DefaultVtkOutputFields
{
-// \{
-
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tag for models based on the box-scheme
-NEW_TYPE_TAG(BoxModel, INHERITS_FROM(ImplicitBase));
-}
-}
-
-// \}
-
-#include "propertydefaults.hh"
+public:
+ template<class VtkOutputModule>
+ static void init(VtkOutputModule& vtk)
+ {
+ DUNE_THROW(Dune::NotImplemented, "This model doesn't implement default vtk fields!");
+ }
+};
+
+} // end namespace Dumux
#endif
diff --git a/dumux/io/gridcreator.hh b/dumux/io/gridcreator.hh
index e12a9cce721b01f3b432f8cc3d7a43ead1c8618a..6d91fc1e4dc8788981e3918016fa7817cb9f4fde 100644
--- a/dumux/io/gridcreator.hh
+++ b/dumux/io/gridcreator.hh
@@ -71,30 +71,29 @@
#endif
#endif
-#include <dumux/common/propertysystem.hh>
+#include <dumux/common/properties.hh>
#include <dumux/common/parameters.hh>
+#include <dumux/discretization/methods.hh>
namespace Dumux
{
-namespace Properties
-{
-// poperty forward declarations
-NEW_PROP_TAG(Grid);
-NEW_PROP_TAG(GridParameterGroup);
-NEW_PROP_TAG(AdaptiveGrid);
-NEW_PROP_TAG(Scalar);
-NEW_PROP_TAG(ImplicitIsBox);
-}
-
/*!
* \brief Provides the grid creator base interface (public) and methods common
* to most grid creator specializations (protected).
*/
-template <class TypeTag, class Grid>
+template <class Grid>
class GridCreatorBase
{
public:
+ /*!
+ * \brief Make the grid. Implement this method in the specialization of this class for a grid type.
+ */
+ static void makeGrid(const std::string& modelParamGroup = "")
+ {
+ DUNE_THROW(Dune::NotImplemented,
+ "The GridCreator for grid type " << Dune::className<Grid>() << " is not implemented! Consider providing your own GridCreator.");
+ }
/*!
* \brief Returns a reference to the grid.
@@ -143,8 +142,7 @@ public:
else
DUNE_THROW(Dune::InvalidStateException, "The getBoundaryDomainMarker method is only available if DomainMarkers for Gmsh were enabled!"
<< " If your Gmsh file contains domain markers / physical entities,"
- << " enable them by setting " << GET_PROP_VALUE(TypeTag, GridParameterGroup)
- << ".DomainMarkers = 1 in the input file.");
+ << " enable them by setting 'Grid.DomainMarkers = true' in the input file.");
}
/*!
@@ -163,8 +161,7 @@ public:
else
DUNE_THROW(Dune::InvalidStateException, "The getElementDomainMarker method is only available if DomainMarkers for Gmsh were enabled!"
<< " If your Gmsh file contains domain markers / physical entities,"
- << " enable them by setting " << GET_PROP_VALUE(TypeTag, GridParameterGroup)
- << ".DomainMarkers = 1 in the input file.");
+ << " enable them by setting 'Grid.DomainMarkers = true' in the input file.");
}
/*!
@@ -228,7 +225,8 @@ protected:
/*!
* \brief Makes a grid from a file. We currently support *.dgf (Dune Grid Format) and *.msh (Gmsh mesh format).
*/
- static void makeGridFromFile(const std::string& fileName)
+ static void makeGridFromFile(const std::string& fileName,
+ const std::string& modelParamGroup)
{
// We found a file in the input file...does it have a supported extension?
const std::string extension = getFileExtension(fileName);
@@ -244,17 +242,9 @@ protected:
if(extension == "msh")
{
// get some optional parameters
- bool verbose = false;
- try { verbose = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Verbosity);}
- catch (ParameterException &e) { }
-
- bool boundarySegments = false;
- try { boundarySegments = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), BoundarySegments);}
- catch (ParameterException &e) { }
-
- bool domainMarkers = false;
- try { domainMarkers = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), DomainMarkers);}
- catch (ParameterException &e) { }
+ const bool verbose = getParamFromGroup<bool>(modelParamGroup, "Grid.Verbosity", false);
+ const bool boundarySegments = getParamFromGroup<bool>(modelParamGroup, "Grid.BoundarySegments", false);
+ const bool domainMarkers = getParamFromGroup<bool>(modelParamGroup, "Grid.DomainMarkers", false);
if(domainMarkers)
{
@@ -307,45 +297,39 @@ protected:
* \brief Makes a structured cube grid using the structured grid factory
*/
template <int dim, int dimworld>
- static void makeStructuredGrid(CellType cellType)
+ static void makeStructuredGrid(CellType cellType,
+ const std::string& modelParamGroup)
{
- // The required parameters
- typedef Dune::FieldVector<typename Grid::ctype, dimworld> GlobalPosition;
- const GlobalPosition upperRight = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, GlobalPosition, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), UpperRight);
-
- // The optional parameters (they have a default)
- GlobalPosition lowerLeft(0.0);
- try { lowerLeft = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, GlobalPosition, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), LowerLeft); }
- catch (ParameterException &e) { }
+ using GlobalPosition = Dune::FieldVector<typename Grid::ctype, dimworld>;
+ const auto upperRight = getParamFromGroup<GlobalPosition>(modelParamGroup, "Grid.UpperRight");
+ const auto lowerLeft = getParamFromGroup<GlobalPosition>(modelParamGroup, "Grid.LowerLeft", GlobalPosition(0.0));
- typedef std::array<unsigned int, dim> CellArray;
- CellArray cells;
- std::fill(cells.begin(), cells.end(), 1);
- try { cells = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Cells); }
- catch (ParameterException &e) { }
+ using CellArray = std::array<unsigned int, dim>;
+ CellArray cells; cells.fill(1);
+ cells = getParamFromGroup<CellArray>(modelParamGroup, "Grid.Cells", cells);
// make the grid
if (cellType == CellType::Cube)
{
gridPtr() = Dune::StructuredGridFactory<Grid>::createCubeGrid(lowerLeft, upperRight, cells);
}
- if (cellType == CellType::Simplex)
+ else if (cellType == CellType::Simplex)
{
gridPtr() = Dune::StructuredGridFactory<Grid>::createSimplexGrid(lowerLeft, upperRight, cells);
}
+ else
+ {
+ DUNE_THROW(Dune::GridError, "Unknown cell type for making structured grid! Choose Cube or Simplex.");
+ }
}
/*!
* \brief Refines a grid after construction if GridParameterGroup.Refinement is set in the input file
*/
- static void maybeRefineGrid()
+ static void maybeRefineGrid(const std::string& modelParamGroup)
{
- try {
- const int level = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, int, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Refinement);
- grid().globalRefine(level);
- }
- catch (ParameterException &e) {}
- catch (...) { throw; }
+ if (haveParamInGroup(modelParamGroup, "Grid.Refinement"))
+ grid().globalRefine(getParamFromGroup<int>(modelParamGroup, "Grid.Refinement"));
}
/*!
@@ -367,45 +351,35 @@ protected:
static std::vector<int> boundaryMarkers_;
};
-template <class TypeTag, class Grid>
-bool GridCreatorBase<TypeTag, Grid>::enableDgfGridPointer_ = false;
+template <class Grid>
+bool GridCreatorBase<Grid>::enableDgfGridPointer_ = false;
-template <class TypeTag, class Grid>
-bool GridCreatorBase<TypeTag, Grid>::enableGmshDomainMarkers_ = false;
+template <class Grid>
+bool GridCreatorBase<Grid>::enableGmshDomainMarkers_ = false;
-template <class TypeTag, class Grid>
-std::vector<int> GridCreatorBase<TypeTag, Grid>::elementMarkers_;
+template <class Grid>
+std::vector<int> GridCreatorBase<Grid>::elementMarkers_;
-template <class TypeTag, class Grid>
-std::vector<int> GridCreatorBase<TypeTag, Grid>::boundaryMarkers_;
+template <class Grid>
+std::vector<int> GridCreatorBase<Grid>::boundaryMarkers_;
/*!
* \brief Provides the grid creator implementation for all supported grid managers that constructs a grid
* from information in the input file. This class is specialised below for all
* supported grid managers. It inherits the functionality of the base class.
*/
-template <class TypeTag, class Grid>
-class GridCreatorImpl : public GridCreatorBase<TypeTag, Grid>
-{
-public:
- /*!
- * \brief Make the grid. This is implemented by specializations of this class.
- */
- static void makeGrid()
- {
- DUNE_THROW(Dune::NotImplemented,
- "The GridCreator for grid type " << Dune::className<Grid>() << " is not implemented! Consider providing your own GridCreator.");
- }
-};
+template <class Grid, DiscretizationMethods DM>
+class GridCreatorImpl : public GridCreatorBase<Grid> {};
/*!
* \brief Provides the grid creator (this is the class called by the user) for all supported grid managers that constructs a grid
* from information in the input file. This class is specialised below for all
* supported grid managers. It inherits the functionality of the base class.
+ * \todo TODO The grid creator is independent of TypeTag now,
+ * it would only need two template parameters, none of the functions use a TypeTag directly
*/
template <class TypeTag>
-class GridCreator : public GridCreatorImpl<TypeTag, typename GET_PROP_TYPE(TypeTag, Grid)>
-{};
+using GridCreator = GridCreatorImpl<typename GET_PROP_TYPE(TypeTag, Grid), GET_PROP_VALUE(TypeTag, DiscretizationMethod)>;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Specializations //////////////////////////////////////////////////////////////////////////////////////////////
@@ -413,43 +387,26 @@ class GridCreator : public GridCreatorImpl<TypeTag, typename GET_PROP_TYPE(TypeT
/*!
* \brief Helper class for determining the default overlap in case of parallel yasp grids
+ * \note the default of 1 works for all overlapping implementation like the cell-centered discretization schemes
*/
-template <class TypeTag>
-class YaspOverlapHelper
+template <DiscretizationMethods DM>
+struct YaspOverlapHelper
{
-public:
- // trick to set overlap different for implicit models...
- template<class T = TypeTag>
- static typename std::enable_if<Properties::propertyDefined<T, T, PTAG_(ImplicitIsBox)>::value, int>::type
- getOverlap()
+ static int getOverlap(const std::string& modelParamGroup)
{
- // the default is dependent on the discretization:
- // our box models only work with overlap 0
- // our cc models only work with overlap > 0
- static const int isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
- int overlap = isBox ? 0 : 1;
- try { overlap = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, int, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Overlap);}
- catch (ParameterException &e) { }
-
- if (isBox && overlap != 0)
- DUNE_THROW(Dune::NotImplemented, "Parallel overlapping grids for box models.");
- if (!isBox && overlap < 1)
- DUNE_THROW(Dune::NotImplemented, "Parallel non-overlapping grids for cc models.");
-
- return overlap;
- }
-
- //... then for other models (e.g. sequential)
- template<class T = TypeTag>
- static typename std::enable_if<!Properties::propertyDefined<T, T, PTAG_(ImplicitIsBox)>::value, int>::type
- getOverlap()
- {
- int overlap = 1;
- try { overlap = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, int, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Overlap);}
- catch (ParameterException &e) { }
+ int overlap = getParamFromGroup<int>(modelParamGroup, "Grid.Overlap", 1);
+ if (overlap < 1)
+ DUNE_THROW(Dune::InvalidStateException, "Parallel non-overlapping grids for cc discretization is not allowed.");
return overlap;
}
+};
+//! specialization for the box method
+template <>
+struct YaspOverlapHelper<DiscretizationMethods::Box>
+{
+ static int getOverlap(const std::string& modelParamGroup)
+ { return 0; }
};
/*!
@@ -469,85 +426,81 @@ public:
* - Refinement : the number of global refines to apply initially.
*
*/
-template<class TypeTag, class ct, int dim>
-class GridCreatorImpl<TypeTag, Dune::YaspGrid<dim, Dune::EquidistantCoordinates<ct, dim> > >
- : public GridCreatorBase<TypeTag, Dune::YaspGrid<dim, Dune::EquidistantCoordinates<ct, dim> > >
+template<DiscretizationMethods DiscMethod, class ct, int dim>
+class GridCreatorImpl<Dune::YaspGrid<dim, Dune::EquidistantCoordinates<ct, dim> >, DiscMethod>
+ : public GridCreatorBase<Dune::YaspGrid<dim, Dune::EquidistantCoordinates<ct, dim> > >
{
public:
- typedef typename Dune::YaspGrid<dim, Dune::EquidistantCoordinates<ct, dim> > Grid;
- typedef GridCreatorBase<TypeTag, Grid> ParentType;
+ using Grid = typename Dune::YaspGrid<dim, Dune::EquidistantCoordinates<ct, dim> >;
+ using ParentType = GridCreatorBase<Grid>;
/*!
* \brief Make the grid. This is implemented by specializations of this method.
*/
- static void makeGrid()
+ static void makeGrid(const std::string& modelParamGroup = "")
{
// First try to create it from a DGF file in GridParameterGroup.File
- try {
- const std::string fileName = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, std::string, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), File);
- ParentType::makeGridFromDgfFile(fileName);
- postProcessing_();
+ if (haveParamInGroup(modelParamGroup, "Grid.File"))
+ {
+ ParentType::makeGridFromDgfFile(getParamFromGroup<std::string>(modelParamGroup, "Grid.File"));
+ postProcessing_(modelParamGroup);
return;
}
- catch (ParameterException &e) {}
- catch (...) { throw; }
// Then look for the necessary keys to construct from the input file
- try {
- // The required parameters
- typedef Dune::FieldVector<ct, dim> GlobalPosition;
- const GlobalPosition upperRight = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, GlobalPosition, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), UpperRight);
+ else if (haveParamInGroup(modelParamGroup, "Grid.UpperRight"))
+ {
- // The optional parameters (they have a default)
- typedef std::array<int, dim> CellArray;
- CellArray cells;
- std::fill(cells.begin(), cells.end(), 1);
- try { cells = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Cells); }
- catch (ParameterException &e) { }
+ // get the upper right corner coordinates
+ const auto upperRight = getParamFromGroup<Dune::FieldVector<ct, dim>>(modelParamGroup, "Grid.UpperRight");
- typedef std::bitset<dim> BitSet;
- BitSet periodic;
- try { periodic = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, BitSet, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Periodic);}
- catch (ParameterException &e) { }
+ // number of cells in each direction
+ std::array<int, dim> cells; cells.fill(1);
+ cells = getParamFromGroup<std::array<int, dim>>(modelParamGroup, "Grid.Cells", cells);
- // get the overlap dependent on some template parameters
- int overlap = YaspOverlapHelper<TypeTag>::getOverlap();
+ // periodic boundaries
+ const auto periodic = getParamFromGroup<std::bitset<dim>>(modelParamGroup, "Grid.Periodic", std::bitset<dim>());
- bool default_lb = false;
- CellArray partitioning;
- try { partitioning = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Partitioning);}
- catch (ParameterException &e) { default_lb = true; }
+ // get the overlap dependent on the discretization method
+ const int overlap = YaspOverlapHelper<DiscMethod>::getOverlap(modelParamGroup);
- //make the grid
- if (default_lb)
+ // make the grid
+ if (!haveParamInGroup(modelParamGroup, "Grid.Partitioning"))
+ {
+ // construct using default load balancing
ParentType::gridPtr() = std::make_shared<Grid>(upperRight, cells, periodic, overlap);
+ }
else
{
- typename Dune::YaspFixedSizePartitioner<dim> lb(partitioning);
+ // construct using user defined partitioning
+ const auto partitioning = getParamFromGroup<std::array<int, dim>>(modelParamGroup, "Grid.Partitioning");
+ Dune::YaspFixedSizePartitioner<dim> lb(partitioning);
ParentType::gridPtr() = std::make_shared<Grid>(upperRight, cells, periodic, overlap, typename Grid::CollectiveCommunicationType(), &lb);
}
- postProcessing_();
+ postProcessing_(modelParamGroup);
}
- catch (ParameterException &e) {
- DUNE_THROW(ParameterException, "Please supply the mandatory parameter "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
+
+ // Didn't find a way to construct the grid
+ else
+ {
+ const auto prefix = modelParamGroup == "" ? modelParamGroup : modelParamGroup + ".";
+ DUNE_THROW(ParameterException, "Please supply one of the parameters "
+ << prefix + "Grid.UpperRight"
+ << ", or a grid file in " << prefix + "Grid.File");
+
}
- catch (...) { throw; }
}
private:
/*!
* \brief Postprocessing for YaspGrid
*/
- static void postProcessing_()
+ static void postProcessing_(const std::string& modelParamGroup)
{
// Check if should refine the grid
- bool keepPhysicalOverlap = true;
- try { keepPhysicalOverlap = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), KeepPhysicalOverlap);}
- catch (ParameterException &e) { }
+ bool keepPhysicalOverlap = getParamFromGroup<bool>(modelParamGroup, "Grid.KeepPhysicalOverlap", true);
ParentType::grid().refineOptions(keepPhysicalOverlap);
- ParentType::maybeRefineGrid();
+ ParentType::maybeRefineGrid(modelParamGroup);
}
};
@@ -568,80 +521,81 @@ private:
* - Refinement : the number of global refines to apply initially.
*
*/
-template<class TypeTag, class ct, int dim>
-class GridCreatorImpl<TypeTag, Dune::YaspGrid<dim, Dune::EquidistantOffsetCoordinates<ct, dim> > >
- : public GridCreatorBase<TypeTag, Dune::YaspGrid<dim, Dune::EquidistantOffsetCoordinates<ct, dim> > >
+template<DiscretizationMethods DiscMethod, class ct, int dim>
+class GridCreatorImpl<Dune::YaspGrid<dim, Dune::EquidistantOffsetCoordinates<ct, dim> >, DiscMethod>
+ : public GridCreatorBase<Dune::YaspGrid<dim, Dune::EquidistantOffsetCoordinates<ct, dim> > >
{
public:
- typedef typename Dune::YaspGrid<dim, Dune::EquidistantOffsetCoordinates<ct, dim> > Grid;
- typedef GridCreatorBase<TypeTag, Grid> ParentType;
+ using Grid = typename Dune::YaspGrid<dim, Dune::EquidistantOffsetCoordinates<ct, dim> >;
+ using ParentType = GridCreatorBase<Grid>;
/*!
* \brief Make the grid. This is implemented by specializations of this method.
*/
- static void makeGrid()
+ static void makeGrid(const std::string& modelParamGroup = "")
{
- // Only construction from the input file is possible
- // Look for the necessary keys to construct from the input file
- try {
- // The required parameters
- typedef Dune::FieldVector<ct, dim> GlobalPosition;
- const GlobalPosition upperRight = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, GlobalPosition, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), UpperRight);
-
- // The optional parameters (they have a default)
- GlobalPosition lowerLeft(0.0);
- try { lowerLeft = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, GlobalPosition, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), LowerLeft); }
- catch (ParameterException &e) { }
-
- typedef std::array<int, dim> CellArray;
- CellArray cells;
- std::fill(cells.begin(), cells.end(), 1);
- try { cells = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Cells); }
- catch (ParameterException &e) { }
-
- typedef std::bitset<dim> BitSet;
- BitSet periodic;
- try { periodic = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, BitSet, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Periodic);}
- catch (ParameterException &e) { }
-
- // the default is dependent on the discretization
- int overlap = YaspOverlapHelper<TypeTag>::getOverlap();
-
- bool default_lb = false;
- CellArray partitioning;
- try { partitioning = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Partitioning);}
- catch (ParameterException &e) { default_lb = true; }
-
- //make the grid
- if (default_lb)
+ // First try to create it from a DGF file in GridParameterGroup.File
+ if (haveParamInGroup(modelParamGroup, "Grid.File"))
+ {
+ ParentType::makeGridFromDgfFile(getParamFromGroup<std::string>(modelParamGroup, "Grid.File"));
+ postProcessing_(modelParamGroup);
+ return;
+ }
+
+ // Then look for the necessary keys to construct from the input file
+ else if (haveParamInGroup(modelParamGroup, "Grid.UpperRight"))
+ {
+ using GlobalPosition = Dune::FieldVector<ct, dim>;
+ const auto upperRight = getParamFromGroup<GlobalPosition>(modelParamGroup, "Grid.UpperRight");
+ const auto lowerLeft = getParamFromGroup<GlobalPosition>(modelParamGroup, "Grid.LowerLeft", GlobalPosition(0.0));
+
+ // number of cells in each direction
+ std::array<int, dim> cells; cells.fill(1);
+ cells = getParamFromGroup<std::array<int, dim>>(modelParamGroup, "Grid.Cells", cells);
+
+ // periodic boundaries
+ const auto periodic = getParamFromGroup<std::bitset<dim>>(modelParamGroup, "Grid.Periodic", std::bitset<dim>());
+
+ // get the overlap dependent on some template parameters
+ const int overlap = YaspOverlapHelper<DiscMethod>::getOverlap(modelParamGroup);
+
+ // make the grid
+ if (!haveParamInGroup(modelParamGroup, "Grid.Partitioning"))
+ {
+ // construct using default load balancing
ParentType::gridPtr() = std::make_shared<Grid>(lowerLeft, upperRight, cells, periodic, overlap);
+ }
else
{
- typename Dune::YaspFixedSizePartitioner<dim> lb(partitioning);
+ // construct using user defined partitioning
+ const auto partitioning = getParamFromGroup<std::array<int, dim>>(modelParamGroup, "Grid.Partitioning");
+ Dune::YaspFixedSizePartitioner<dim> lb(partitioning);
ParentType::gridPtr() = std::make_shared<Grid>(lowerLeft, upperRight, cells, periodic, overlap, typename Grid::CollectiveCommunicationType(), &lb);
}
- postProcessing_();
+ postProcessing_(modelParamGroup);
}
- catch (ParameterException &e) {
- DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
+
+ // Didn't find a way to construct the grid
+ else
+ {
+ const auto prefix = modelParamGroup == "" ? modelParamGroup : modelParamGroup + ".";
+ DUNE_THROW(ParameterException, "Please supply one of the parameters "
+ << prefix + "Grid.UpperRight"
+ << ", or a grid file in " << prefix + "Grid.File");
+
}
- catch (...) { throw; }
}
private:
/*!
* \brief Postprocessing for YaspGrid
*/
- static void postProcessing_()
+ static void postProcessing_(const std::string& modelParamGroup)
{
// Check if should refine the grid
- bool keepPhysicalOverlap = true;
- try { keepPhysicalOverlap = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), KeepPhysicalOverlap);}
- catch (ParameterException &e) { }
+ const bool keepPhysicalOverlap = getParamFromGroup<bool>(modelParamGroup, "Grid.KeepPhysicalOverlap", true);
ParentType::grid().refineOptions(keepPhysicalOverlap);
- ParentType::maybeRefineGrid();
+ ParentType::maybeRefineGrid(modelParamGroup);
}
};
@@ -673,227 +627,204 @@ private:
* \f$ g = -\frac{1}{g_\textrm{negative}} \f$
* to avoid issues with imprecise fraction numbers.
*/
-template<class TypeTag, class ct, int dim>
-class GridCreatorImpl<TypeTag, Dune::YaspGrid<dim, Dune::TensorProductCoordinates<ct, dim> > >
- : public GridCreatorBase<TypeTag, Dune::YaspGrid<dim, Dune::TensorProductCoordinates<ct, dim> > >
+template<DiscretizationMethods DiscMethod, class ctype, int dim>
+class GridCreatorImpl<Dune::YaspGrid<dim, Dune::TensorProductCoordinates<ctype, dim> >, DiscMethod>
+ : public GridCreatorBase<Dune::YaspGrid<dim, Dune::TensorProductCoordinates<ctype, dim> > >
{
public:
- typedef typename Dune::YaspGrid<dim, Dune::TensorProductCoordinates<ct, dim> > Grid;
- typedef GridCreatorBase<TypeTag, Grid> ParentType;
+ using Grid = typename Dune::YaspGrid<dim, Dune::TensorProductCoordinates<ctype, dim> >;
+ using ParentType = GridCreatorBase<Grid>;
/*!
* \brief Make the grid. This is implemented by specializations of this method.
*/
- static void makeGrid()
+ static void makeGrid(const std::string& modelParamGroup = "")
{
// Only construction from the input file is possible
// Look for the necessary keys to construct from the input file
- try {
- typedef typename GET_PROP(TypeTag, ParameterTree) Params;
- auto params = Params::tree();
- typedef ct Scalar;
- typedef std::vector<int> IntVector;
- typedef std::vector<Scalar> ScalarVector;
-
- // The positions
- std::array<ScalarVector, dim> positions;
- for (int i = 0; i < dim; ++i)
+ // The positions
+ std::array<std::vector<ctype>, dim> positions;
+ for (int i = 0; i < dim; ++i)
+ positions[i] = getParamFromGroup<std::vector<ctype>>(modelParamGroup, "Grid.Positions" + std::to_string(i));
+
+ // the number of cells (has a default)
+ std::array<std::vector<int>, dim> cells;
+ for (int i = 0; i < dim; ++i)
+ {
+ cells[i].resize(positions[i].size()-1, 1.0);
+ cells[i] = getParamFromGroup<std::vector<int>>(modelParamGroup, "Grid.Cells" + std::to_string(i), cells[i]);
+ }
+
+ // grading factor (has a default)
+ std::array<std::vector<ctype>, dim> grading;
+ for (int i = 0; i < dim; ++i)
+ {
+ grading[i].resize(positions[i].size()-1, 1.0);
+ grading[i] = getParamFromGroup<std::vector<ctype>>(modelParamGroup, "Grid.Grading" + std::to_string(i), grading[i]);
+ }
+
+ // Additional arameters (they have a default)
+ const auto periodic = getParamFromGroup<std::bitset<dim>>(modelParamGroup, "Grid.Periodic", std::bitset<dim>());
+ const int overlap = YaspOverlapHelper<DiscMethod>::getOverlap(modelParamGroup);
+ const bool verbose = getParamFromGroup<bool>(modelParamGroup, "Grid.Verbosity", false);
+
+ // Some sanity checks
+ for (unsigned int dimIdx = 0; dimIdx < dim; ++dimIdx)
+ {
+ if (cells[dimIdx].size() + 1 != positions[dimIdx].size())
{
- std::string paramName = GET_PROP_VALUE(TypeTag, GridParameterGroup);
- paramName += ".Positions";
- paramName += std::to_string(i);
- positions[i] = GET_RUNTIME_PARAM_CSTRING(TypeTag, ScalarVector, paramName.c_str());
+ DUNE_THROW(Dune::RangeError, "Make sure to specify correct \"Cells\" and \"Positions\" arrays");
}
-
- // the number of cells (has a default)
- std::array<IntVector, dim> cells;
- for (int i = 0; i < dim; ++i)
+ if (grading[dimIdx].size() + 1 != positions[dimIdx].size())
{
- std::string paramName = GET_PROP_VALUE(TypeTag, GridParameterGroup);
- paramName += ".Cells";
- paramName += std::to_string(i);
- try { cells[i] = GET_RUNTIME_PARAM_CSTRING(TypeTag, IntVector, paramName.c_str()); }
- catch (ParameterException &e) { cells[i].resize(positions[i].size()-1, 1.0); }
+ DUNE_THROW(Dune::RangeError, "Make sure to specify correct \"Grading\" and \"Positions\" arrays");
}
-
- // grading factor (has a default)
- std::array<ScalarVector, dim> grading;
- for (int i = 0; i < dim; ++i)
+ ctype temp = std::numeric_limits<ctype>::lowest();
+ for (unsigned int posIdx = 0; posIdx < positions[dimIdx].size(); ++posIdx)
{
- std::string paramName = GET_PROP_VALUE(TypeTag, GridParameterGroup);
- paramName += ".Grading";
- paramName += std::to_string(i);
- try { grading[i] = GET_RUNTIME_PARAM_CSTRING(TypeTag, ScalarVector, paramName.c_str()); }
- catch (ParameterException &e) { grading[i].resize(positions[i].size()-1, 1.0); }
+ if (temp > positions[dimIdx][posIdx])
+ {
+ DUNE_THROW(Dune::RangeError, "Make sure to specify a monotone increasing \"Positions\" array");
+ }
+ temp = positions[dimIdx][posIdx];
}
+ }
- // The optional parameters (they have a default)
- typedef std::bitset<dim> BitSet;
- BitSet periodic;
- try { periodic = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, BitSet, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Periodic);}
- catch (ParameterException &e) { }
+ const auto globalPositions = computeGlobalPositions_(positions, cells, grading, verbose);
- // the default is dependent on the discretization
- int overlap = YaspOverlapHelper<TypeTag>::getOverlap();
+ // make the grid
+ if (!haveParamInGroup(modelParamGroup, "Grid.Partitioning"))
+ {
+ // construct using default load balancing
+ ParentType::gridPtr() = std::make_shared<Grid>(globalPositions, periodic, overlap);
+ }
+ else
+ {
+ // construct using user defined partitioning
+ const auto partitioning = getParamFromGroup<std::array<int, dim>>(modelParamGroup, "Grid.Partitioning");
+ Dune::YaspFixedSizePartitioner<dim> lb(partitioning);
+ ParentType::gridPtr() = std::make_shared<Grid>(globalPositions, periodic, overlap, typename Grid::CollectiveCommunicationType(), &lb);
+ }
- bool default_lb = false;
- typedef std::array<int, dim> CellArray;
- CellArray partitioning;
- try { partitioning = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Partitioning);}
- catch (ParameterException &e) { default_lb = true; }
+ postProcessing_(modelParamGroup);
+ }
- //make the grid
- // sanity check of the input parameters
- bool verbose = false;
- try { verbose = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Verbosity);}
- catch (ParameterException &e) { }
+private:
+ /*!
+ * \brief Postprocessing for YaspGrid
+ */
+ static void postProcessing_(const std::string& modelParamGroup)
+ {
+ // Check if should refine the grid
+ const bool keepPhysicalOverlap = getParamFromGroup<bool>(modelParamGroup, "Grid.KeepPhysicalOverlap", true);
+ ParentType::grid().refineOptions(keepPhysicalOverlap);
+ ParentType::maybeRefineGrid(modelParamGroup);
+ }
- for (unsigned int dimIdx = 0; dimIdx < dim; ++dimIdx)
+ //! Compute the global position tensor grid from the given positions, cells, and grading factors
+ static std::array<std::vector<ctype>, dim>
+ computeGlobalPositions_(const std::array<std::vector<ctype>, dim>& positions,
+ const std::array<std::vector<int>, dim>& cells,
+ const std::array<std::vector<ctype>, dim>& grading,
+ bool verbose = false)
+ {
+ std::array<std::vector<ctype>, dim> globalPositions;
+ using std::pow;
+ for (int dimIdx = 0; dimIdx < dim; dimIdx++)
+ {
+ for (int zoneIdx = 0; zoneIdx < cells[dimIdx].size(); ++zoneIdx)
{
- if (cells[dimIdx].size() + 1 != positions[dimIdx].size())
+ ctype lower = positions[dimIdx][zoneIdx];
+ ctype upper = positions[dimIdx][zoneIdx+1];
+ int numCells = cells[dimIdx][zoneIdx];
+ ctype gradingFactor = grading[dimIdx][zoneIdx];
+ ctype length = upper - lower;
+ ctype height = 1.0;
+ bool increasingCellSize = false;
+
+ if (verbose)
{
- DUNE_THROW(Dune::RangeError, "Make sure to specify correct \"Cells\" and \"Positions\" arrays");
+ std::cout << "dim " << dimIdx
+ << " lower " << lower
+ << " upper " << upper
+ << " numCells " << numCells
+ << " grading " << gradingFactor;
}
- if (grading[dimIdx].size() + 1 != positions[dimIdx].size())
+
+ if (gradingFactor > 1.0)
{
- DUNE_THROW(Dune::RangeError, "Make sure to specify correct \"Grading\" and \"Positions\" arrays");
+ increasingCellSize = true;
}
- Scalar temp = std::numeric_limits<Scalar>::lowest();
- for (unsigned int posIdx = 0; posIdx < positions[dimIdx].size(); ++posIdx)
+
+ // take absolute values and reverse cell size increment to achieve
+ // reverse behavior for negative values
+ if (gradingFactor < 0.0)
{
- if (temp > positions[dimIdx][posIdx])
+ using std::abs;
+ gradingFactor = abs(gradingFactor);
+ if (gradingFactor < 1.0)
{
- DUNE_THROW(Dune::RangeError, "Make sure to specify a monotone increasing \"Positions\" array");
+ increasingCellSize = true;
}
- temp = positions[dimIdx][posIdx];
}
- }
- std::array<ScalarVector, dim> globalPositions;
- using std::pow;
- for (int dimIdx = 0; dimIdx < dim; dimIdx++)
- {
- for (int zoneIdx = 0; zoneIdx < cells[dimIdx].size(); ++zoneIdx)
+ // if the grading factor is exactly 1.0 do equal spacing
+ if (gradingFactor > 1.0 - 1e-7 && gradingFactor < 1.0 + 1e-7)
{
- Scalar lower = positions[dimIdx][zoneIdx];
- Scalar upper = positions[dimIdx][zoneIdx+1];
- int numCells = cells[dimIdx][zoneIdx];
- Scalar gradingFactor = grading[dimIdx][zoneIdx];
- Scalar length = upper - lower;
- Scalar height = 1.0;
- bool increasingCellSize = false;
-
+ height = 1.0 / numCells;
if (verbose)
{
- std::cout << "dim " << dimIdx
- << " lower " << lower
- << " upper " << upper
- << " numCells " << numCells
- << " grading " << gradingFactor;
- }
-
- if (gradingFactor > 1.0)
- {
- increasingCellSize = true;
+ std::cout << " -> h " << height * length << std::endl;
}
+ }
+ // if grading factor is not 1.0, do power law spacing
+ else
+ {
+ height = (1.0 - gradingFactor) / (1.0 - pow(gradingFactor, numCells));
- // take absolute values and reverse cell size increment to achieve
- // reverse behavior for negative values
- if (gradingFactor < 0.0)
+ if (verbose)
{
- using std::abs;
- gradingFactor = abs(gradingFactor);
- if (gradingFactor < 1.0)
- {
- increasingCellSize = true;
- }
+ std::cout << " -> grading_eff " << gradingFactor
+ << " h_min " << height * pow(gradingFactor, 0) * length
+ << " h_max " << height * pow(gradingFactor, numCells-1) * length
+ << std::endl;
}
+ }
- // if the grading factor is exactly 1.0 do equal spacing
- if (gradingFactor > 1.0 - 1e-7 && gradingFactor < 1.0 + 1e-7)
- {
- height = 1.0 / numCells;
- if (verbose)
- {
- std::cout << " -> h " << height * length << std::endl;
- }
- }
- // if grading factor is not 1.0, do power law spacing
- else
+ std::vector<ctype> localPositions;
+ localPositions.push_back(0);
+ for (int i = 0; i < numCells-1; i++)
+ {
+ ctype hI = height;
+ if (!(gradingFactor < 1.0 + 1e-7 && gradingFactor > 1.0 - 1e-7))
{
- height = (1.0 - gradingFactor) / (1.0 - pow(gradingFactor, numCells));
-
- if (verbose)
+ if (increasingCellSize)
{
- std::cout << " -> grading_eff " << gradingFactor
- << " h_min " << height * pow(gradingFactor, 0) * length
- << " h_max " << height * pow(gradingFactor, numCells-1) * length
- << std::endl;
+ hI *= pow(gradingFactor, i);
}
- }
-
- std::vector<Scalar> localPositions;
- localPositions.push_back(0);
- for (int i = 0; i < numCells-1; i++)
- {
- Scalar hI = height;
- if (!(gradingFactor < 1.0 + 1e-7 && gradingFactor > 1.0 - 1e-7))
+ else
{
- if (increasingCellSize)
- {
- hI *= pow(gradingFactor, i);
- }
- else
- {
- hI *= pow(gradingFactor, numCells-i-1);
- }
+ hI *= pow(gradingFactor, numCells-i-1);
}
- localPositions.push_back(localPositions[i] + hI);
}
+ localPositions.push_back(localPositions[i] + hI);
+ }
- for (int i = 0; i < localPositions.size(); i++)
- {
- localPositions[i] *= length;
- localPositions[i] += lower;
- }
-
-
- for (unsigned int i = 0; i < localPositions.size(); ++i)
- {
- globalPositions[dimIdx].push_back(localPositions[i]);
- }
+ for (int i = 0; i < localPositions.size(); i++)
+ {
+ localPositions[i] *= length;
+ localPositions[i] += lower;
}
- globalPositions[dimIdx].push_back(positions[dimIdx].back());
- }
- if (default_lb)
- ParentType::gridPtr() = std::make_shared<Grid>(globalPositions, periodic, overlap);
- else
- {
- typename Dune::YaspFixedSizePartitioner<dim> lb(partitioning);
- ParentType::gridPtr() = std::make_shared<Grid>(globalPositions, periodic, overlap, typename Grid::CollectiveCommunicationType(), &lb);
+ for (unsigned int i = 0; i < localPositions.size(); ++i)
+ {
+ globalPositions[dimIdx].push_back(localPositions[i]);
+ }
}
- postProcessing_();
+ globalPositions[dimIdx].push_back(positions[dimIdx].back());
}
- catch (ParameterException &e) {
- DUNE_THROW(ParameterException, "Please supply the mandatory parameters:" << std::endl
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".Positions0, ..." << std::endl);
- }
- catch (...) { throw; }
- }
-private:
- /*!
- * \brief Postprocessing for YaspGrid
- */
- static void postProcessing_()
- {
- // Check if should refine the grid
- bool keepPhysicalOverlap = true;
- try { keepPhysicalOverlap = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, bool, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), KeepPhysicalOverlap);}
- catch (ParameterException &e) { }
- ParentType::grid().refineOptions(keepPhysicalOverlap);
- ParentType::maybeRefineGrid();
+ return globalPositions;
}
};
@@ -910,88 +841,78 @@ private:
* - Refinement : the number of global refines to apply initially.
*
*/
-template<class TypeTag>
-class GridCreatorImpl<TypeTag, Dune::OneDGrid>
- : public GridCreatorBase<TypeTag, Dune::OneDGrid>
+template<DiscretizationMethods DiscMethod>
+class GridCreatorImpl<Dune::OneDGrid, DiscMethod>
+ : public GridCreatorBase<Dune::OneDGrid>
{
public:
- typedef typename Dune::OneDGrid Grid;
- typedef GridCreatorBase<TypeTag, Grid> ParentType;
+ using Grid = Dune::OneDGrid;
+ using ParentType = GridCreatorBase<Grid>;
/*!
* \brief Make the grid. This is implemented by specializations of this method.
*/
- static void makeGrid()
+ static void makeGrid(const std::string& modelParamGroup = "")
{
- // First try to create it from a DGF file in GridParameterGroup.File
- try {
- const std::string fileName = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, std::string, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), File);
- ParentType::makeGridFromDgfFile(fileName);
- postProcessing_();
+
+ // try to create it from a DGF or msh file in GridParameterGroup.File
+ if (haveParamInGroup(modelParamGroup, "Grid.File"))
+ {
+ ParentType::makeGridFromDgfFile(getParamFromGroup<std::string>(modelParamGroup, "Grid.File"));
+ postProcessing_(modelParamGroup);
return;
}
- catch (ParameterException &e) {}
- catch (...) { throw; }
// Look for the necessary keys to construct from the input file
- try {
+ else if (haveParamInGroup(modelParamGroup, "Grid.RightBoundary"))
+ {
// The required parameters
- typedef typename Grid::ctype Coordinate;
- const Coordinate leftBoundary = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, Coordinate, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), LeftBoundary);
- const Coordinate rightBoundary = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, Coordinate, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), RightBoundary);
-
- // The optional parameters
- int cells = 1;
- try { cells = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, int, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Cells);}
- catch (ParameterException &e) { }
+ using CoordinateType = typename Grid::ctype;
+ const auto leftBoundary = getParamFromGroup<CoordinateType>(modelParamGroup, "Grid.LeftBoundary", 0.0);
+ const auto rightBoundary = getParamFromGroup<CoordinateType>(modelParamGroup, "Grid.RightBoundary");
+ const int cells = getParamFromGroup<int>(modelParamGroup, "Grid.Cells", 1);
ParentType::gridPtr() = std::make_shared<Grid>(cells, leftBoundary, rightBoundary);
- postProcessing_();
+ postProcessing_(modelParamGroup);
+ return;
}
- catch (ParameterException &e) {}
- catch (...) { throw; }
// Look for the necessary keys to construct from the input file with just a coordinates vector
- try {
- // The required parameters
- typedef std::vector<typename Grid::ctype> Coordinates;
- const Coordinates coordinates = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, Coordinates, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Coordinates);
- // make the grid
+ else if (haveParamInGroup(modelParamGroup, "Grid.Coordinates"))
+ {
+ const auto coordinates = getParamFromGroup<std::vector<typename Grid::ctype>>(modelParamGroup, "Grid.Coordinates");
ParentType::gridPtr() = std::make_shared<Grid>(coordinates);
- postProcessing_();
+ postProcessing_(modelParamGroup);
}
- catch (ParameterException &e) {
- DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".LeftBoundary, "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".RightBoundary or "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".Coordinates or a grid file in "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
+
+ // Didn't find a way to construct the grid
+ else
+ {
+ const auto prefix = modelParamGroup == "" ? modelParamGroup : modelParamGroup + ".";
+ DUNE_THROW(ParameterException, "Please supply one of the parameters "
+ << prefix + "Grid.RightBoundary"
+ << ", or " << prefix + "Grid.Coordinates"
+ << ", or a grid file in " << prefix + "Grid.File");
}
- catch (...) { throw; }
}
private:
/*!
* \brief Do some operatrion after making the grid, like global refinement
*/
- static void postProcessing_()
+ static void postProcessing_(const std::string& modelParamGroup)
{
- // Check for refinement type
- std::string refType = "Local";
- try { refType = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, std::string, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), RefinementType);
- if (refType != "Local" && refType != "Copy")
- DUNE_THROW(Dune::IOError, "OneGrid only supports 'Local' or 'Copy' as refinment type. Not '"<< refType<<"'!");
- }
- catch (ParameterException &e) {}
- catch (...) { throw; }
-
+ // Set refinement type
+ const auto refType = getParamFromGroup<std::string>(modelParamGroup, "Grid.RefinementType", "Local");
if (refType == "Local")
ParentType::grid().setRefinementType(Dune::OneDGrid::RefinementType::LOCAL);
- if (refType == "Copy")
+ else if (refType == "Copy")
ParentType::grid().setRefinementType(Dune::OneDGrid::RefinementType::COPY);
+ else
+ DUNE_THROW(Dune::IOError, "OneGrid only supports 'Local' or 'Copy' as refinment type. Not '"<< refType<<"'!");
// Check if should refine the grid
- ParentType::maybeRefineGrid();
+ ParentType::maybeRefineGrid(modelParamGroup);
}
};
@@ -1015,107 +936,90 @@ private:
* - BoundarySegments : whether to insert boundary segments into the grid
*
*/
-template<class TypeTag, int dim>
-class GridCreatorImpl<TypeTag, Dune::UGGrid<dim> >
- : public GridCreatorBase<TypeTag, Dune::UGGrid<dim> >
+template<DiscretizationMethods DiscMethod, int dim>
+class GridCreatorImpl<Dune::UGGrid<dim>, DiscMethod>
+ : public GridCreatorBase<Dune::UGGrid<dim> >
{
public:
- typedef typename Dune::UGGrid<dim> Grid;
- typedef GridCreatorBase<TypeTag, Grid> ParentType;
+ using Grid = typename Dune::UGGrid<dim>;
+ using ParentType = GridCreatorBase<Grid>;
/*!
* \brief Make the UGGrid.
*/
- static void makeGrid()
+ static void makeGrid(const std::string& modelParamGroup = "")
{
- // First try to create it from a DGF or msh file in GridParameterGroup.File
- try {
- const std::string fileName = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, std::string, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), File);
- preProcessing_();
- ParentType::makeGridFromFile(fileName);
- postProcessing_();
+
+ // try to create it from a DGF or msh file in GridParameterGroup.File
+ if (haveParamInGroup(modelParamGroup, "Grid.File"))
+ {
+ preProcessing_(modelParamGroup);
+ ParentType::makeGridFromFile(getParamFromGroup<std::string>(modelParamGroup, "Grid.File"), modelParamGroup);
+ postProcessing_(modelParamGroup);
return;
}
- catch (ParameterException &e) {}
- catch (...) { throw; }
// Then look for the necessary keys to construct from the input file
- try {
- preProcessing_();
- // Check for cell type
- std::string cellType = "Cube";
- try { cellType = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, std::string, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), CellType);
- if (cellType != "Cube" && cellType != "Simplex")
- DUNE_THROW(Dune::IOError, "UGGrid only supports 'Cube' or 'Simplex' as cell type. Not '"<< cellType<<"'!");
- }
- catch (ParameterException &e) {}
- catch (...) { throw; }
-
+ else if (haveParamInGroup(modelParamGroup, "Grid.UpperRight"))
+ {
+ preProcessing_(modelParamGroup);
// make the grid
+ const auto cellType = getParamFromGroup<std::string>(modelParamGroup, "Grid.CellType", "Cube");
if (cellType == "Cube")
- ParentType::template makeStructuredGrid<dim, dim>(ParentType::CellType::Cube);
+ ParentType::template makeStructuredGrid<dim, dim>(ParentType::CellType::Cube, modelParamGroup);
if (cellType == "Simplex")
- ParentType::template makeStructuredGrid<dim, dim>(ParentType::CellType::Simplex);
- postProcessing_();
+ ParentType::template makeStructuredGrid<dim, dim>(ParentType::CellType::Simplex, modelParamGroup);
+ else
+ DUNE_THROW(Dune::IOError, "UGGrid only supports 'Cube' or 'Simplex' as cell type. Not '"<< cellType<<"'!");
+ postProcessing_(modelParamGroup);
}
- catch (ParameterException &e) {
- DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
+
+ // Didn't find a way to construct the grid
+ else
+ {
+ const auto prefix = modelParamGroup == "" ? modelParamGroup : modelParamGroup + ".";
+ DUNE_THROW(ParameterException, "Please supply one of the parameters "
+ << prefix + "Grid.UpperRight"
+ << ", or a grid file in " << prefix + "Grid.File");
+
}
- catch (...) { throw; }
}
private:
/*!
* \brief Do some operatrion before making the grid
*/
- static void preProcessing_()
+ static void preProcessing_(const std::string& modelParamGroup)
{
- bool setDefaultHeapSize = true;
- unsigned defaultHeapSize;
- try { defaultHeapSize = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, unsigned, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), HeapSize);}
- catch (ParameterException &e) { setDefaultHeapSize = false; }
-
- if(setDefaultHeapSize)
- Grid::setDefaultHeapSize(defaultHeapSize);
+ if(haveParamInGroup(modelParamGroup, "Grid.HeapSize"))
+ Grid::setDefaultHeapSize(getParamFromGroup<unsigned>(modelParamGroup, "Grid.HeapSize"));
}
/*!
* \brief Do some operatrion after making the grid, like global refinement
*/
- static void postProcessing_()
+ static void postProcessing_(const std::string& modelParamGroup)
{
- // Check for refinement type
- std::string refType = "Local";
- try { refType = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, std::string, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), RefinementType);
- if (refType != "Local" && refType != "Copy")
- DUNE_THROW(Dune::IOError, "UGGrid only supports 'Local' or 'Copy' as refinment type. Not '"<< refType<<"'!");
- }
- catch (ParameterException &e) {}
- catch (...) { throw; }
-
+ // Set refinement type
+ const auto refType = getParamFromGroup<std::string>(modelParamGroup, "Grid.RefinementType", "Local");
if (refType == "Local")
ParentType::grid().setRefinementType(Dune::UGGrid<dim>::RefinementType::LOCAL);
- if (refType == "Copy")
+ else if (refType == "Copy")
ParentType::grid().setRefinementType(Dune::UGGrid<dim>::RefinementType::COPY);
+ else
+ DUNE_THROW(Dune::IOError, "UGGrid only supports 'Local' or 'Copy' as refinment type. Not '"<< refType<<"'!");
- // Check for closure type
- std::string closureType = "Green";
- try { closureType = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, std::string, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), ClosureType);
- if (closureType != "None" && closureType != "Green")
- DUNE_THROW(Dune::IOError, "UGGrid only supports 'Green' or 'None' as closure type. Not '"<< closureType<<"'!");
- }
- catch (ParameterException &e) {}
- catch (...) { throw; }
-
+ // Set closure type
+ const auto closureType = getParamFromGroup<std::string>(modelParamGroup, "Grid.ClosureType", "Green");
if (closureType == "Green")
ParentType::grid().setClosureType(Dune::UGGrid<dim>::ClosureType::GREEN);
- if (closureType == "None")
+ else if (closureType == "None")
ParentType::grid().setClosureType(Dune::UGGrid<dim>::ClosureType::NONE);
+ else
+ DUNE_THROW(Dune::IOError, "UGGrid only supports 'Green' or 'None' as closure type. Not '"<< closureType<<"'!");
// Check if should refine the grid
- ParentType::maybeRefineGrid();
+ ParentType::maybeRefineGrid(modelParamGroup);
}
};
@@ -1139,77 +1043,60 @@ private:
* - BoundarySegments : whether to insert boundary segments into the grid
*
*/
-template<class TypeTag, int dim, int dimworld, Dune::ALUGridElementType elType, Dune::ALUGridRefinementType refinementType>
-class GridCreatorImpl<TypeTag, Dune::ALUGrid<dim, dimworld, elType, refinementType> >
- : public GridCreatorBase<TypeTag, Dune::ALUGrid<dim, dimworld, elType, refinementType> >
+template<DiscretizationMethods DiscMethod, int dim, int dimworld, Dune::ALUGridElementType elType, Dune::ALUGridRefinementType refinementType>
+class GridCreatorImpl<Dune::ALUGrid<dim, dimworld, elType, refinementType>, DiscMethod>
+ : public GridCreatorBase<Dune::ALUGrid<dim, dimworld, elType, refinementType> >
{
public:
typedef typename Dune::ALUGrid<dim, dimworld, elType, refinementType> Grid;
- typedef GridCreatorBase<TypeTag, Grid> ParentType;
+ using ParentType = GridCreatorBase<Grid>;
/*!
* \brief Make the grid. This is implemented by specializations of this method.
*/
- static void makeGrid()
+ static void makeGrid(const std::string& modelParamGroup = "", bool adaptiveRestart = false)
{
-#if HAVE_DUNE_ALUGRID
- // First check if a restart for an adaptive grid is required
- try {
- if (GET_PROP_VALUE(TypeTag, AdaptiveGrid))
- {
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- Scalar restartTime = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, Restart);
- // we came until here so the restart key was found. Restore the grid.
- int rank = 0;
-#if HAVE_MPI
- MPI_Comm_rank(Dune::MPIHelper::getCommunicator(), &rank);
-#endif
- try {
- std::string name = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name);
- std::ostringstream oss;
- oss << name << "_time=" << restartTime << "_rank=" << rank << ".grs";
- std::cout << "Restoring an ALUGrid from " << oss.str() << std::endl;
- ParentType::gridPtr() = std::shared_ptr<Grid>(Dune::BackupRestoreFacility<Grid>::restore(oss.str()));
- return;
- }
- catch (ParameterException &e)
- {
- std::cerr << e.what() << std::endl;
- std::cerr << "Restart functionality for an adaptive grid requested, but failed." << std::endl;
- std::cerr << "Did you forget to provide Problem.Name in your .input file?" << std::endl;
- throw;
- }
- }
+ // restarting an adaptive grid using Dune's BackupRestoreFacility
+ if (adaptiveRestart)
+ {
+ const auto restartTime = getParamFromGroup<double>(modelParamGroup, "TimeLoop.Restart");
+ const int rank = Dune::MPIHelper::getCollectiveCommunication().rank();
+ const std::string name = getParamFromGroup<std::string>(modelParamGroup, "Problem.Name");
+ std::ostringstream oss;
+ oss << name << "_time=" << restartTime << "_rank=" << rank << ".grs";
+ std::cout << "Restoring an ALUGrid from " << oss.str() << std::endl;
+ ParentType::gridPtr() = std::shared_ptr<Grid>(Dune::BackupRestoreFacility<Grid>::restore(oss.str()));
+ return;
}
- catch (ParameterException &e) {}
- catch (...) { throw; }
-#endif
- // Then try to create it from a DGF or msh file in GridParameterGroup.File
- try {
- const std::string fileName = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, std::string, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), File);
- ParentType::makeGridFromFile(fileName);
- ParentType::maybeRefineGrid();
+ // try to create it from a DGF or msh file in GridParameterGroup.File
+ else if (haveParamInGroup(modelParamGroup, "Grid.File"))
+ {
+ ParentType::makeGridFromFile(getParamFromGroup<std::string>(modelParamGroup, "Grid.File"), modelParamGroup);
+ ParentType::maybeRefineGrid(modelParamGroup);
return;
}
- catch (ParameterException &e) {}
- catch (...) { throw; }
// Then look for the necessary keys to construct from the input file
- try {
+ else if (haveParamInGroup(modelParamGroup, "Grid.UpperRight"))
+ {
// make a structured grid
if (elType == Dune::cube)
- ParentType::template makeStructuredGrid<dim, dimworld>(ParentType::CellType::Cube);
+ ParentType::template makeStructuredGrid<dim, dimworld>(ParentType::CellType::Cube, modelParamGroup);
if (elType == Dune::simplex)
- ParentType::template makeStructuredGrid<dim, dimworld>(ParentType::CellType::Simplex);
- ParentType::maybeRefineGrid();
+ ParentType::template makeStructuredGrid<dim, dimworld>(ParentType::CellType::Simplex, modelParamGroup);
+ ParentType::maybeRefineGrid(modelParamGroup);
}
- catch (ParameterException &e) {
- DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
+
+ // Didn't find a way to construct the grid
+ else
+ {
+ const auto prefix = modelParamGroup == "" ? modelParamGroup : modelParamGroup + ".";
+ DUNE_THROW(ParameterException, "Please supply one of the parameters "
+ << prefix + "Grid.UpperRight"
+ << ", or a grid file in " << prefix + "Grid.File");
+
}
- catch (...) { throw; }
}
};
@@ -1231,40 +1118,43 @@ public:
* - Cells : number of elements in a structured grid
*
*/
-template<class TypeTag, int dim, int dimworld>
-class GridCreatorImpl<TypeTag, Dune::FoamGrid<dim, dimworld> >
- : public GridCreatorBase<TypeTag, Dune::FoamGrid<dim, dimworld> >
+template<DiscretizationMethods DiscMethod, int dim, int dimworld>
+class GridCreatorImpl<Dune::FoamGrid<dim, dimworld>, DiscMethod>
+ : public GridCreatorBase<Dune::FoamGrid<dim, dimworld> >
{
public:
typedef typename Dune::FoamGrid<dim, dimworld> Grid;
- typedef GridCreatorBase<TypeTag, Grid> ParentType;
+ using ParentType = GridCreatorBase<Grid>;
/*!
* \brief Make the grid. This is implemented by specializations of this method.
*/
- static void makeGrid()
+ static void makeGrid(const std::string& modelParamGroup = "")
{
- // First try to create it from a DGF or msh file in GridParameterGroup.File
- try {
- const std::string fileName = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, std::string, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), File);
- ParentType::makeGridFromFile(fileName);
- ParentType::maybeRefineGrid();
+ // try to create it from file
+ if (haveParamInGroup(modelParamGroup, "Grid.File"))
+ {
+ ParentType::makeGridFromFile(getParamFromGroup<std::string>(modelParamGroup, "Grid.File"), modelParamGroup);
+ ParentType::maybeRefineGrid(modelParamGroup);
return;
}
- catch (ParameterException &e) {}
- catch (...) { throw; }
// Then look for the necessary keys to construct a structured grid from the input file
- try {
- ParentType::template makeStructuredGrid<dim, dimworld>(ParentType::CellType::Simplex);
- ParentType::maybeRefineGrid();
+ else if (haveParamInGroup(modelParamGroup, "Grid.UpperRight"))
+ {
+ ParentType::template makeStructuredGrid<dim, dimworld>(ParentType::CellType::Simplex, modelParamGroup);
+ ParentType::maybeRefineGrid(modelParamGroup);
}
- catch (ParameterException &e) {
- DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
+
+ // Didn't find a way to construct the grid
+ else
+ {
+ const auto prefix = modelParamGroup == "" ? modelParamGroup : modelParamGroup + ".";
+ DUNE_THROW(ParameterException, "Please supply one of the parameters "
+ << prefix + "Grid.UpperRight"
+ << ", or a grid file in " << prefix + "Grid.File");
+
}
- catch (...) { throw; }
}
};
@@ -1282,72 +1172,53 @@ public:
* - Cells : number of elements in a structured grid
*
*/
-template<class TypeTag, int dimworld>
-class GridCreatorImpl<TypeTag, Dune::FoamGrid<1, dimworld> >
- : public GridCreatorBase<TypeTag, Dune::FoamGrid<1, dimworld> >
+template<DiscretizationMethods DiscMethod, int dimworld>
+class GridCreatorImpl<Dune::FoamGrid<1, dimworld>, DiscMethod>
+ : public GridCreatorBase<Dune::FoamGrid<1, dimworld> >
{
public:
typedef typename Dune::FoamGrid<1, dimworld> Grid;
- typedef GridCreatorBase<TypeTag, Grid> ParentType;
+ using ParentType = GridCreatorBase<Grid>;
/*!
* \brief Make the grid. This is implemented by specializations of this method.
*/
- static void makeGrid()
+ static void makeGrid(const std::string& modelParamGroup = "")
{
- // First try to create it from a DGF or msh file in GridParameterGroup.File
- try {
- const std::string fileName = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, std::string, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), File);
- ParentType::makeGridFromFile(fileName);
- ParentType::maybeRefineGrid();
+ // try to create it from file
+ if (haveParamInGroup(modelParamGroup, "Grid.File"))
+ {
+ ParentType::makeGridFromFile(getParamFromGroup<std::string>(modelParamGroup, "Grid.File"), modelParamGroup);
+ ParentType::maybeRefineGrid(modelParamGroup);
return;
}
- catch (ParameterException &e) {}
- catch (...) { throw; }
- // Then look for the necessary keys to construct a structured grid from the input file
- try {
- // The required parameters
- typedef Dune::FieldVector<typename Grid::ctype, dimworld> GlobalPosition;
- const GlobalPosition upperRight = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, GlobalPosition, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), UpperRight);
-
- // The optional parameters (they have a default)
- GlobalPosition lowerLeft(0.0);
- try { lowerLeft = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, GlobalPosition, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), LowerLeft); }
- catch (ParameterException &e) { }
-
- typedef std::array<unsigned int, 1> CellArray;
- CellArray cells;
- std::fill(cells.begin(), cells.end(), 1);
- try { cells = GET_RUNTIME_PARAM_FROM_GROUP_CSTRING(TypeTag, CellArray, GET_PROP_VALUE(TypeTag, GridParameterGroup).c_str(), Cells); }
- catch (ParameterException &e) { }
-
- // make the grid (structured interval grid in dimworld space)
- Dune::GridFactory<Grid> factory;
- Dune::GeometryType geomType(1);
-
- // create a step vector
- GlobalPosition step = upperRight;
- step -= lowerLeft, step /= cells[0];
-
- // create the vertices
- GlobalPosition globalPos = lowerLeft;
- for (unsigned int vIdx = 0; vIdx <= cells[0]; vIdx++, globalPos += step)
- factory.insertVertex(globalPos);
-
- // create the cells
- for(unsigned int eIdx = 0; eIdx < cells[0]; eIdx++)
- factory.insertElement(geomType, {eIdx, eIdx+1});
-
- ParentType::gridPtr() = std::shared_ptr<Grid>(factory.createGrid());
- ParentType::maybeRefineGrid();
- }
- catch (ParameterException &e) {
- DUNE_THROW(ParameterException, "Please supply the mandatory parameters "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".UpperRight or a grid file in "
- << GET_PROP_VALUE(TypeTag, GridParameterGroup) << ".File.");
- }
- catch (...) { throw; }
+ // The required parameters
+ using GlobalPosition = Dune::FieldVector<typename Grid::ctype, dimworld>;
+ const auto upperRight = getParamFromGroup<GlobalPosition>(modelParamGroup, "Grid.UpperRight");
+ const auto lowerLeft = getParamFromGroup<GlobalPosition>(modelParamGroup, "Grid.UpperRight", GlobalPosition(0.0));
+ using CellArray = std::array<unsigned int, 1>;
+ const auto cells = getParamFromGroup<CellArray>(modelParamGroup, "Grid.Cells", std::array<unsigned int, 1>{{1}});
+
+ // make the grid (structured interval grid in dimworld space)
+ Dune::GridFactory<Grid> factory;
+ constexpr auto geomType = Dune::GeometryTypes::simplex(1);
+
+ // create a step vector
+ GlobalPosition step = upperRight;
+ step -= lowerLeft, step /= cells[0];
+
+ // create the vertices
+ GlobalPosition globalPos = lowerLeft;
+ for (unsigned int vIdx = 0; vIdx <= cells[0]; vIdx++, globalPos += step)
+ factory.insertVertex(globalPos);
+
+ // create the cells
+ for(unsigned int eIdx = 0; eIdx < cells[0]; eIdx++)
+ factory.insertElement(geomType, {eIdx, eIdx+1});
+
+ ParentType::gridPtr() = std::shared_ptr<Grid>(factory.createGrid());
+ ParentType::maybeRefineGrid(modelParamGroup);
}
};
diff --git a/dumux/io/pointcloudvtkwriter.hh b/dumux/io/pointcloudvtkwriter.hh
index c008658e0a126745d75ad09c687d61c1fb5f6357..946254fd1b0e1e3594bf357ca996774ca10031f1 100644
--- a/dumux/io/pointcloudvtkwriter.hh
+++ b/dumux/io/pointcloudvtkwriter.hh
@@ -25,7 +25,7 @@
#include <dune/common/fvector.hh>
-#include <dumux/io/vtkoutputmodulebase.hh>
+#include <dumux/io/vtkoutputmodule.hh>
#include <dumux/io/staggeredvtkoutputmodule.hh>
#include <dune/grid/io/file/vtk/common.hh>
#include <dune/common/path.hh>
@@ -178,10 +178,10 @@ public:
* \param name The name of the data set
* \param ncomps The number of components of the data set
*/
- void addPointData(const std::vector<Scalar>& v, const std::string &name, int ncomps = 1)
+ void addPointData(const std::vector<Scalar>& v, const std::string &name)
{
- assert(v.size() == ncomps * coordinates_.size());
- scalarPointData_.push_back(ScalarFunction(v, name, ncomps));
+ assert(v.size() == coordinates_.size());
+ scalarPointData_.push_back(ScalarFunction(v, name, 1));
}
/*!
@@ -191,10 +191,10 @@ public:
* \param name The name of the data set
* \param ncomps The number of components of the data set
*/
- void addPointData(const std::vector<GlobalPosition>& v, const std::string &name, int ncomps = 1)
+ void addPointData(const std::vector<GlobalPosition>& v, const std::string &name)
{
assert(v.size() == coordinates_.size());
- vectorPointData_.push_back(VectorFunction(v, name, ncomps));
+ vectorPointData_.push_back(VectorFunction(v, name, 3));
}
/*!
diff --git a/dumux/io/staggeredvtkoutputmodule.hh b/dumux/io/staggeredvtkoutputmodule.hh
index 4d8fcec2d24d7140e97f670c4e247cc0b312bffb..9aa6709bc68c6314bfc0927757b124ef53658576 100644
--- a/dumux/io/staggeredvtkoutputmodule.hh
+++ b/dumux/io/staggeredvtkoutputmodule.hh
@@ -25,15 +25,10 @@
#include <dune/common/fvector.hh>
-#include <dumux/io/vtkoutputmodulebase.hh>
+#include <dumux/io/vtkoutputmodule.hh>
#include <dumux/io/pointcloudvtkwriter.hh>
#include <dumux/io/vtksequencewriter.hh>
-namespace Properties
-{
-NEW_PROP_TAG(VtkAddVelocity);
-NEW_PROP_TAG(VtkAddProcessRank);
-}
namespace Dumux
{
@@ -44,14 +39,19 @@ namespace Dumux
* Specialization for staggered grids with dofs on faces.
*/
template<typename TypeTag>
-class StaggeredVtkOutputModule : public VtkOutputModuleBase<TypeTag>
+class StaggeredVtkOutputModule : public VtkOutputModule<TypeTag>
{
- friend class VtkOutputModuleBase<TypeTag>;
- using ParentType = VtkOutputModuleBase<TypeTag>;
- using Implementation = typename GET_PROP_TYPE(TypeTag, VtkOutputModule);
+ friend class VtkOutputModule<TypeTag>;
+ using ParentType = VtkOutputModule<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using FaceVariables = typename GET_PROP_TYPE(TypeTag, FaceVariables);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+
enum { dim = GridView::dimension };
enum { dimWorld = GridView::dimensionworld };
@@ -62,120 +62,120 @@ class StaggeredVtkOutputModule : public VtkOutputModuleBase<TypeTag>
typename DofTypeIndices::CellCenterIdx cellCenterIdx;
typename DofTypeIndices::FaceIdx faceIdx;
- struct PriVarScalarDataInfo { unsigned int pvIdx; std::string name; };
- struct PriVarVectorDataInfo { std::vector<unsigned int> pvIdx; std::string name; };
+ struct FaceVarScalarDataInfo { std::function<Scalar(const FaceVariables&)> get; std::string name; };
+ struct FaceVarVectorDataInfo { std::function<GlobalPosition(const SubControlVolumeFace& scvf, const FaceVariables&)> get; std::string name; };
- using Positions = std::vector<Scalar>;
- using Data = std::vector<std::vector<Scalar>>;
+ struct FaceFieldScalarDataInfo
+ {
+ FaceFieldScalarDataInfo(const std::vector<Scalar>& f, const std::string& n) : data(f), name(n) {}
+ const std::vector<Scalar>& data;
+ const std::string name;
+ };
+
+ struct FaceFieldVectorDataInfo
+ {
+ FaceFieldVectorDataInfo(const std::vector<GlobalPosition>& f, const std::string& n) : data(f), name(n) {}
+ const std::vector<GlobalPosition>& data;
+ const std::string name;
+ };
public:
StaggeredVtkOutputModule(const Problem& problem,
- Dune::VTK::DataMode dm = Dune::VTK::conforming) : ParentType(problem, dm),
- faceWriter_(std::make_shared<PointCloudVtkWriter<Scalar, dim>>(coordinates_)),
- sequenceWriter_(faceWriter_, problem.name() + "-face", "","",
- problem.gridView().comm().rank(),
- problem.gridView().comm().size() )
+ const FVGridGeometry& fvGridGeometry,
+ const GridVariables& gridVariables,
+ const SolutionVector& sol,
+ const std::string& name,
+ bool verbose = true,
+ Dune::VTK::DataMode dm = Dune::VTK::conforming)
+ : ParentType(problem, fvGridGeometry, gridVariables, sol, name, verbose, dm)
+ , problem_(problem)
+ , gridGeom_(fvGridGeometry)
+ , gridVariables_(gridVariables)
+ , sol_(sol)
+ , faceWriter_(std::make_shared<PointCloudVtkWriter<Scalar, dim>>(coordinates_))
+ , sequenceWriter_(faceWriter_, problem.name() + "-face", "","",
+ fvGridGeometry.gridView().comm().rank(),
+ fvGridGeometry.gridView().comm().size() )
{
- writeFaceVars_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, WriteFaceData);
+ writeFaceVars_ = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Vtk.WriteFaceData", false);
coordinatesInitialized_ = false;
}
//////////////////////////////////////////////////////////////////////////////////////////////
- //! Methods to conveniently add primary and secondary variables upon problem initialization
+ //! Methods to conveniently add face variables
//! Do not call these methods after initialization
//////////////////////////////////////////////////////////////////////////////////////////////
-
- //! Output a scalar field
+ //! Add a scalar valued field
+ //! \param v The field to be added
//! \param name The name of the vtk field
- //! \returns A reference to the resized scalar field to be filled with the actual data
- std::vector<Scalar>& createFaceScalarField(const std::string& name)
+ void addFaceField(const std::vector<Scalar>& v, const std::string& name)
{
- faceScalarFields_.emplace_back(std::make_pair(std::vector<Scalar>(this->problem().model().numFaceDofs()), name));
- return faceScalarFields_.back().first;
+ if (v.size() == this->gridGeom_.gridView().size(1))
+ faceFieldScalarDataInfo_.emplace_back(v, name);
+ else
+ DUNE_THROW(Dune::RangeError, "Size mismatch of added field!");
}
- //! Output a vector field
+ //! Add a vector valued field
+ //! \param v The field to be added
//! \param name The name of the vtk field
- //! \returns A reference to the resized vector field to be filled with the actual data
- std::vector<GlobalPosition>& createFaceVectorField(const std::string& name)
+ void addFaceField(const std::vector<GlobalPosition>& v, const std::string& name)
{
- faceVectorFields_.emplace_back(std::make_pair(std::vector<GlobalPosition>(this->problem().model().numFaceDofs()), name));
- return faceVectorFields_.back().first;
+ if (v.size() == this->gridGeom_.gridView().size(1))
+ faceFieldVectorDataInfo_.emplace_back(v, name);
+ else
+ DUNE_THROW(Dune::RangeError, "Size mismatch of added field!");
}
- //! Output a scalar primary variable
+ //! Add a scalar-valued faceVarible
+ //! \param f A function taking a FaceVariables object and returning the desired scalar
//! \param name The name of the vtk field
- //! \param pvIdx The index in the primary variables vector
- void addFacePrimaryVariable(const std::string& name, unsigned int pvIdx)
+ void addFaceVariable(std::function<Scalar(const FaceVariables&)>&& f, const std::string& name)
{
- priVarScalarDataInfo_.push_back(PriVarScalarDataInfo{pvIdx, name});
+ faceVarScalarDataInfo_.push_back(FaceVarScalarDataInfo{f, name});
}
- //! Output a vector primary variable
+ //! Add a vector-valued faceVarible
+ //! \param f A function taking a SubControlVolumeFace and FaceVariables object and returning the desired vector
//! \param name The name of the vtk field
- //! \param pvIndices A vector of indices in the primary variables vector to group for vector visualization
- void addFacePrimaryVariable(const std::string& name, std::vector<unsigned int> pvIndices)
+ void addFaceVariable(std::function<GlobalPosition(const SubControlVolumeFace& scvf, const FaceVariables&)>&& f, const std::string& name)
{
- assert(pvIndices.size() < 4 && "Vtk doesn't support vector dimensions greater than 3!");
- priVarVectorDataInfo_.push_back(PriVarVectorDataInfo{pvIndices, name});
+ faceVarVectorDataInfo_.push_back(FaceVarVectorDataInfo{f, name});
}
+ //! Write the values to vtp files
+ //! \param time The current time
+ //! \param type The output type
void write(double time, Dune::VTK::OutputType type = Dune::VTK::ascii)
{
ParentType::write(time, type);
if(writeFaceVars_)
- getFaceDataAndWrite_();
- }
-
-protected:
-
- /*!
- * \brief Returns the number of cell center dofs
- */
- unsigned int numDofs_() const
- {
- return this->problem().model().numCellCenterDofs();
- }
-
- /*!
- * \brief Returns priVar data from dofs not on the face.
- *
- * \param dofIdxGlobal The global dof index
- * \param pvIdx The primary variable index
- */
- auto getPriVarData_(const std::size_t dofIdxGlobal, const std::size_t pvIdx)
- {
- return this->problem().model().curSol()[cellCenterIdx][dofIdxGlobal][pvIdx];
+ getFaceDataAndWrite_(time);
}
- std::vector<PriVarScalarDataInfo> priVarScalarDataInfo_;
- std::vector<PriVarVectorDataInfo> priVarVectorDataInfo_;
- std::vector<PriVarScalarDataInfo> secondVarScalarDataInfo_;
- std::vector<PriVarVectorDataInfo> secondVarVectorDataInfo_;
private:
+ //! Update the coordinates (the face centers)
void updateCoordinates_()
{
- std::cout << "updating coordinates" << std::endl;
- coordinates_.resize(this->problem().model().numFaceDofs());
- for(auto&& facet : facets(this->problem().gridView()))
+ coordinates_.resize(gridGeom_.numFaceDofs());
+ for(auto&& facet : facets(gridGeom_.gridView()))
{
- const int dofIdxGlobal = this->problem().gridView().indexSet().index(facet);
+ const int dofIdxGlobal = gridGeom_.gridView().indexSet().index(facet);
coordinates_[dofIdxGlobal] = facet.geometry().center();
}
coordinatesInitialized_ = true;
}
- /*!
- * \brief Gathers all face-related data and invokes the face vtk-writer using these data.
- */
- void getFaceDataAndWrite_()
+ //! Gathers all face-related data and invokes the face vtk-writer using these data.
+ //! \param time The current time
+ void getFaceDataAndWrite_(const Scalar time)
{
- const int numPoints = this->problem().model().numFaceDofs();
+ const auto numPoints = gridGeom_.numFaceDofs();
// make sure not to iterate over the same dofs twice
std::vector<bool> dofVisited(numPoints, false);
@@ -184,79 +184,77 @@ private:
if(!coordinatesInitialized_)
updateCoordinates_();
- Data priVarScalarData(priVarScalarDataInfo_.size(), std::vector<Scalar>(numPoints));
+ // prepare some containers to store the relevant data
+ std::vector<std::vector<Scalar>> faceVarScalarData;
+ std::vector<std::vector<GlobalPosition>> faceVarVectorData;
- Data priVarVectorData(priVarVectorDataInfo_.size());
- for (std::size_t i = 0; i < priVarVectorDataInfo_.size(); ++i)
- priVarVectorData[i].resize(numPoints*priVarVectorDataInfo_[i].pvIdx.size());
+ if(!faceVarScalarDataInfo_.empty())
+ faceVarScalarData.resize(faceVarScalarDataInfo_.size(), std::vector<Scalar>(numPoints));
- for(auto&& element : elements(this->problem().gridView()))
+ if(!faceVarVectorDataInfo_.empty())
+ faceVarVectorData.resize(faceVarVectorDataInfo_.size(), std::vector<GlobalPosition>(numPoints));
+
+ for (const auto& element : elements(gridGeom_.gridView(), Dune::Partitions::interior))
{
- auto fvGeometry = localView(this->problem().model().fvGridGeometry());
- fvGeometry.bindElement(element);
- for(auto && scvf : scvfs(fvGeometry))
+ auto fvGeometry = localView(gridGeom_);
+ auto elemFaceVars = localView(gridVariables_.curGridFaceVars());
+
+ if (!faceVarScalarDataInfo_.empty() || !faceVarVectorDataInfo_.empty())
{
- if(dofVisited[scvf.dofIndex()])
- continue;
+ fvGeometry.bind(element);
+ elemFaceVars.bindElement(element, fvGeometry, sol_);
+
+ for (auto&& scvf : scvfs(fvGeometry))
+ {
+ const auto dofIdxGlobal = scvf.dofIndex();
+ if(dofVisited[dofIdxGlobal])
+ continue;
- asImp_().getPrivarScalarData_(priVarScalarData, scvf);
- asImp_().getPrivarVectorData_(priVarVectorData, scvf);
+ dofVisited[dofIdxGlobal] = true;
- dofVisited[scvf.dofIndex()] = true;
+ const auto& faceVars = elemFaceVars[scvf];
+
+ // get the scalar-valued data
+ for (std::size_t i = 0; i < faceVarScalarDataInfo_.size(); ++i)
+ faceVarScalarData[i][dofIdxGlobal] = faceVarScalarDataInfo_[i].get(faceVars);
+
+ // get the vector-valued data
+ for (std::size_t i = 0; i < faceVarVectorDataInfo_.size(); ++i)
+ faceVarVectorData[i][dofIdxGlobal] = faceVarVectorDataInfo_[i].get(scvf, faceVars);
+ }
}
}
- // transfer priVar scalar data to writer
- for(int i = 0; i < priVarScalarDataInfo_.size(); ++i)
- faceWriter_->addPointData(priVarScalarData[i], priVarScalarDataInfo_[i].name);
-
- // transfer priVar vector data to writer
- for(int i = 0; i < priVarVectorDataInfo_.size(); ++i)
- faceWriter_->addPointData(priVarVectorData[i], priVarVectorDataInfo_[i].name, priVarVectorDataInfo_[i].pvIdx.size());
+ // transfer the data to the point writer
+ if(!faceVarScalarDataInfo_.empty())
+ for (std::size_t i = 0; i < faceVarScalarDataInfo_.size(); ++i)
+ faceWriter_->addPointData(faceVarScalarData[i], faceVarScalarDataInfo_[i].name);
- // transfer custom scalar data to writer
- for(auto&& scalarField : faceScalarFields_)
- faceWriter_->addPointData(scalarField.first, scalarField.second);
+ if(!faceVarVectorDataInfo_.empty())
+ for (std::size_t i = 0; i < faceVarVectorDataInfo_.size(); ++i)
+ faceWriter_->addPointData(faceVarVectorData[i], faceVarVectorDataInfo_[i].name);
- // transfer custom vector data to writer
- for(auto&& vectorField : faceVectorFields_)
- faceWriter_->addPointData(vectorField.first, vectorField.second, 3);
+ // account for the custom fields
+ for(const auto& field: faceFieldScalarDataInfo_)
+ faceWriter_->addPointData(field.data, field.name);
- sequenceWriter_.write(this->problem().timeManager().time() + 1.0);
- faceScalarFields_.clear();
- faceVectorFields_.clear();
- }
+ for(const auto& field: faceFieldVectorDataInfo_)
+ faceWriter_->addPointData(field.data, field.name);
+ // write for the current time step
+ sequenceWriter_.write(time);
- /*!
- * \brief Retrives scalar-valued data from the face.
- *
- * \param priVarScalarData Container to store the data
- * \param face The face
- */
- template<class Face>
- void getPrivarScalarData_(Data& priVarScalarData, const Face& face)
- {
- const int dofIdxGlobal = face.dofIndex();
- for(int pvIdx = 0; pvIdx < priVarScalarDataInfo_.size(); ++pvIdx)
- priVarScalarData[pvIdx][dofIdxGlobal] = this->problem().model().curSol()[faceIdx][dofIdxGlobal][pvIdx];
+ // clear coordinates to save some memory
+ coordinates_.clear();
+ coordinates_.shrink_to_fit();
+ coordinatesInitialized_ = false;
}
- /*!
- * \brief Retrives vector-valued data from the face.
- *
- * \param priVarVectorData Container to store the data
- * \param face The face
- */
- template<class Face>
- void getPrivarVectorData_(Data& priVarVectorData, const Face& face)
- {
- const int dofIdxGlobal = face.dofIndex();
- for (int i = 0; i < priVarVectorDataInfo_.size(); ++i)
- for (int j = 0; j < priVarVectorDataInfo_[i].pvIdx.size(); ++j)
- priVarVectorData[i][dofIdxGlobal*priVarVectorDataInfo_[i].pvIdx.size() + j]
- = this->problem().model().curSol()[faceIdx][dofIdxGlobal][priVarVectorDataInfo_[i].pvIdx[j]];
- }
+
+ const Problem& problem_;
+ const FVGridGeometry& gridGeom_;
+ const GridVariables& gridVariables_;
+ const SolutionVector& sol_;
std::shared_ptr<PointCloudVtkWriter<Scalar, dim>> faceWriter_;
@@ -267,16 +265,12 @@ private:
std::vector<GlobalPosition> coordinates_;
bool coordinatesInitialized_;
- std::list<std::pair<std::vector<Scalar>, std::string>> faceScalarFields_;
- std::list<std::pair<std::vector<GlobalPosition>, std::string>> faceVectorFields_;
+ std::vector<FaceVarScalarDataInfo> faceVarScalarDataInfo_;
+ std::vector<FaceVarVectorDataInfo> faceVarVectorDataInfo_;
- //! Returns the implementation of the problem (i.e. static polymorphism)
- Implementation &asImp_()
- { return *static_cast<Implementation *>(this); }
+ std::vector<FaceFieldScalarDataInfo> faceFieldScalarDataInfo_;
+ std::vector<FaceFieldVectorDataInfo> faceFieldVectorDataInfo_;
- //! \copydoc asImp_()
- const Implementation &asImp_() const
- { return *static_cast<const Implementation *>(this); }
};
} // end namespace Dumux
diff --git a/dumux/io/vtkoutputmodule.hh b/dumux/io/vtkoutputmodule.hh
new file mode 100644
index 0000000000000000000000000000000000000000..7647ab8f6109e6b827c41e3de3944b42263af78c
--- /dev/null
+++ b/dumux/io/vtkoutputmodule.hh
@@ -0,0 +1,484 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief A VTK output module to simplify writing dumux simulation data to VTK format
+ */
+#ifndef VTK_OUTPUT_MODULE_HH
+#define VTK_OUTPUT_MODULE_HH
+
+#include <functional>
+
+#include <dune/common/timer.hh>
+#include <dune/common/fvector.hh>
+#include <dune/common/typetraits.hh>
+
+#include <dune/geometry/type.hh>
+#include <dune/geometry/multilineargeometry.hh>
+
+#include <dune/grid/common/mcmgmapper.hh>
+#include <dune/grid/io/file/vtk/function.hh>
+#include <dune/grid/io/file/vtk/vtkwriter.hh>
+#include <dune/grid/io/file/vtk/vtksequencewriter.hh>
+
+#include <dumux/discretization/methods.hh>
+#include <dumux/io/vtknestedfunction.hh>
+
+namespace Dumux
+{
+
+namespace Vtk
+{
+ //! struct that can hold any field that fulfills the VTKFunction interface
+ template<class GridView>
+ class Field
+ {
+ enum { dim = GridView::dimension };
+ using ctype = typename GridView::ctype;
+ using Element = typename GridView::template Codim<0>::Entity;
+
+ // a VTK function that supports both scalar and vector values for each element
+ template <typename F>
+ struct VectorP0VTKFunction : Dune::VTKFunction<GridView>
+ {
+ using Mapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
+ public:
+ //! return number of components
+ virtual int ncomps () const
+ { return nComps_; }
+
+ //! evaluate
+ virtual double evaluate (int mycomp, const Element& e,
+ const Dune::FieldVector<ctype,dim>&) const
+ { return accessChooser_(mycomp, mapper_.index(e), Dune::is_indexable<decltype(field_[0])>()); }
+
+ //! get name
+ virtual std::string name () const
+ { return name_; }
+
+ VectorP0VTKFunction(const GridView &gridView, const Mapper& mapper, const F& field, const std::string& name, int nComps)
+ : field_(field), name_(name), nComps_(nComps), mapper_(mapper)
+ {
+ if (field.size()!=(unsigned int)(gridView.size(0)))
+ DUNE_THROW(Dune::IOError, "NestedP0VTKFunction: size mismatch");
+ }
+ private:
+ double accessChooser_(int mycomp, int i, std::true_type) const
+ { return field_[i][mycomp]; }
+
+ double accessChooser_(int mycomp, int i, std::false_type) const
+ { return field_[i]; }
+
+ const F& field_;
+ const std::string name_;
+ int nComps_;
+ const Mapper& mapper_;
+ };
+
+ // a VTK function that supports both scalar and vector values for each vertex
+ template <typename F>
+ struct VectorP1VTKFunction : Dune::VTKFunction<GridView>
+ {
+ using Mapper = Dune::MultipleCodimMultipleGeomTypeMapper<GridView>;
+ public:
+ //! return number of components
+ virtual int ncomps () const
+ { return nComps_; }
+
+ //! evaluate
+ virtual double evaluate (int mycomp, const Element& e,
+ const Dune::FieldVector<ctype,dim>& xi) const
+ {
+ const unsigned int dim = Element::mydimension;
+ const unsigned int nVertices = e.subEntities(dim);
+
+ std::vector<Dune::FieldVector<ctype, 1>> cornerValues(nVertices);
+ for (unsigned i = 0; i < nVertices; ++i)
+ cornerValues[i] = accessChooser_(mycomp, mapper_.subIndex(e, i, dim), Dune::is_indexable<decltype(field_[0])>());
+
+ // (Ab)use the MultiLinearGeometry class to do multi-linear interpolation between scalars
+ const Dune::MultiLinearGeometry<ctype, dim, 1> interpolation(e.type(), std::move(cornerValues));
+ return interpolation.global(xi);
+ }
+
+ //! get name
+ virtual std::string name () const
+ { return name_; }
+
+ VectorP1VTKFunction(const GridView &gridView, const Mapper& mapper, const F& field, const std::string& name, int nComps)
+ : field_(field), name_(name), nComps_(nComps), mapper_(mapper)
+ {
+ if (field.size()!=(unsigned int)(gridView.size(GridView::dimension)))
+ DUNE_THROW(Dune::IOError, "NestedP1VTKFunction: size mismatch");
+ }
+ private:
+ double accessChooser_(int mycomp, int i, std::true_type) const
+ { return field_[i][mycomp]; }
+
+ double accessChooser_(int mycomp, int i, std::false_type) const
+ { return field_[i]; }
+
+ const F& field_;
+ const std::string name_;
+ int nComps_;
+ const Mapper& mapper_;
+ };
+
+ public:
+ // template constructor selects the right VTKFunction implementation
+ template <typename F, class Mapper>
+ Field(const GridView& gridView, const Mapper& mapper, F const& f,
+ const std::string& name, int numComp = 1, int codim = 0)
+ : codim_(codim)
+ {
+ if (codim == GridView::dimension)
+ field_ = std::make_shared<VectorP1VTKFunction<F>>(gridView, mapper, f, name, numComp);
+ else if (codim == 0)
+ field_ = std::make_shared<VectorP0VTKFunction<F>>(gridView, mapper, f, name, numComp);
+ else
+ DUNE_THROW(Dune::NotImplemented, "Only element or vertex quantities allowed.");
+ }
+
+ virtual std::string name () const
+ { return field_->name(); }
+
+ virtual int ncomps() const
+ { return field_->ncomps(); }
+
+ virtual double evaluate(int mycomp,
+ const Element &element,
+ const Dune::FieldVector< ctype, dim > &xi) const
+ { return field_->evaluate(mycomp, element, xi); }
+
+ int codim() const
+ { return codim_; }
+
+ const std::shared_ptr<Dune::VTKFunction<GridView>>& get() const
+ { return field_; }
+
+ private:
+ int codim_;
+ // can point to anything fulfilling the VTKFunction interface
+ std::shared_ptr<Dune::VTKFunction<GridView>> field_;
+ };
+}
+
+/*!
+ * \ingroup InputOutput
+ * \brief A VTK output module to simplify writing dumux simulation data to VTK format
+ *
+ * Handles the output of scalar and vector fields to VTK formatted file for multiple
+ * variables and timesteps. Certain predefined fields can be registered on
+ * initialization and/or be turned on/off using the designated properties. Additionally
+ * non-standardized scalar and vector fields can be added to the writer manually.
+ */
+template<typename TypeTag>
+class VtkOutputModule
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using ElementMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
+ using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
+ using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+
+ enum {
+ dim = GridView::dimension,
+ dimWorld = GridView::dimensionworld
+ };
+
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+
+ static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static constexpr int dofCodim = isBox ? dim : 0;
+
+ struct VolVarScalarDataInfo { std::function<Scalar(const VolumeVariables&)> get; std::string name; };
+ using Field = Vtk::template Field<GridView>;
+
+public:
+
+ VtkOutputModule(const Problem& problem,
+ const FVGridGeometry& fvGridGeometry,
+ const GridVariables& gridVariables,
+ const SolutionVector& sol,
+ const std::string& name,
+ bool verbose = true,
+ Dune::VTK::DataMode dm = Dune::VTK::conforming)
+ : problem_(problem)
+ , gridGeom_(fvGridGeometry)
+ , gridVariables_(gridVariables)
+ , sol_(sol)
+ , name_(name)
+ , verbose_(fvGridGeometry.gridView().comm().rank() == 0 && verbose)
+ , writer_(std::make_shared<Dune::VTKWriter<GridView>>(fvGridGeometry.gridView(), dm))
+ , sequenceWriter_(writer_, name)
+ {}
+
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ //! Methods to conveniently add primary and secondary variables upon initialization
+ //! Do not call these methods after initialization i.e. _not_ within the time loop
+ //////////////////////////////////////////////////////////////////////////////////////////////
+
+ //! Output a scalar volume variable
+ //! \param name The name of the vtk field
+ //! \param f A function taking a VolumeVariables object and returning the desired scalar
+ DUNE_DEPRECATED_MSG("Will be removed after next release. Please use addVolumeVariable(function, name) instead!")
+ void addSecondaryVariable(const std::string& name, std::function<Scalar(const VolumeVariables&)>&& f)
+ {
+ volVarScalarDataInfo_.push_back(VolVarScalarDataInfo{f, name});
+ }
+
+ //! Output a scalar volume variable
+ //! \param name The name of the vtk field
+ //! \param f A function taking a VolumeVariables object and returning the desired scalar
+ void addVolumeVariable(std::function<Scalar(const VolumeVariables&)>&& f, const std::string& name)
+ {
+ volVarScalarDataInfo_.push_back(VolVarScalarDataInfo{f, name});
+ }
+
+ //! Add a scalar or vector valued field
+ //! \param v The scalar field to be added
+ //! \param name The name of the vtk field
+ //! \param nComp Number of components of the vector (maximum 3)
+ template<typename Vector>
+ void addField(const Vector& v, const std::string& name, int nComp = 1)
+ {
+ if (v.size() == gridGeom_.gridView().size(0))
+ fields_.emplace_back(gridGeom_.gridView(), gridGeom_.elementMapper(), v, name, nComp, 0);
+ else if (v.size() == gridGeom_.gridView().size(dim))
+ fields_.emplace_back(gridGeom_.gridView(), gridGeom_.vertexMapper(), v, name, nComp, dim);
+ else
+ DUNE_THROW(Dune::RangeError, "Size mismatch of added field!");
+ }
+
+ //////////////////////////////////////////////////////////////////////////////////////////////
+ //! Writing data
+ //////////////////////////////////////////////////////////////////////////////////////////////
+
+ //! Write the data for this timestep to file in four steps
+ //! (1) We assemble all registered variable fields
+ //! (2) We register them with the vtk writer
+ //! (3) The writer writes the output for us
+ //! (4) Clear the writer for the next time step
+ void write(double time, Dune::VTK::OutputType type = Dune::VTK::ascii)
+ {
+ Dune::Timer timer;
+
+ //////////////////////////////////////////////////////////////
+ //! (1) Assemble all variable fields with registered info
+ //////////////////////////////////////////////////////////////
+
+ // instatiate the velocity output
+ VelocityOutput velocityOutput(problem_, gridGeom_, gridVariables_, sol_);
+ std::array<std::vector<GlobalPosition>, numPhases> velocity;
+
+ // process rank
+ static const std::string modelParamGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ static bool addProcessRank = getParamFromGroup<bool>(modelParamGroup, "Vtk.AddProcessRank");
+ std::vector<double> rank;
+
+ // volume variable data
+ std::vector<std::vector<Scalar>> volVarScalarData;
+
+ //! Abort if no data was registered
+ if (!volVarScalarDataInfo_.empty()
+ || !fields_.empty()
+ || velocityOutput.enableOutput()
+ || addProcessRank)
+ {
+ const auto numCells = gridGeom_.gridView().size(0);
+ const auto numDofs = numDofs_();
+
+ // get fields for all volume variables
+ if (!volVarScalarDataInfo_.empty())
+ volVarScalarData.resize(volVarScalarDataInfo_.size(), std::vector<Scalar>(numDofs));
+
+ if (velocityOutput.enableOutput())
+ {
+ for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
+ {
+ if(isBox && dim == 1)
+ velocity[phaseIdx].resize(numCells);
+ else
+ velocity[phaseIdx].resize(numDofs);
+ }
+ }
+
+ // maybe allocate space for the process rank
+ if (addProcessRank) rank.resize(numCells);
+
+ for (const auto& element : elements(gridGeom_.gridView(), Dune::Partitions::interior))
+ {
+ const auto eIdxGlobal = gridGeom_.elementMapper().index(element);
+
+ auto fvGeometry = localView(gridGeom_);
+ auto elemVolVars = localView(gridVariables_.curGridVolVars());
+
+ // If velocity output is enabled we need to bind to the whole stencil
+ // otherwise element-local data is sufficient
+ if (velocityOutput.enableOutput())
+ fvGeometry.bind(element);
+ else
+ fvGeometry.bindElement(element);
+
+ // If velocity output is enabled we need to bind to the whole stencil
+ // otherwise element-local data is sufficient
+ if (velocityOutput.enableOutput())
+ elemVolVars.bind(element, fvGeometry, sol_);
+ else if (!volVarScalarDataInfo_.empty())
+ elemVolVars.bindElement(element, fvGeometry, sol_);
+
+ if (!volVarScalarDataInfo_.empty())
+ {
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ const auto dofIdxGlobal = scv.dofIndex();
+ const auto& volVars = elemVolVars[scv];
+
+ for (std::size_t i = 0; i < volVarScalarDataInfo_.size(); ++i)
+ volVarScalarData[i][dofIdxGlobal] = volVarScalarDataInfo_[i].get(volVars);
+ }
+ }
+
+ // velocity output
+ if (velocityOutput.enableOutput())
+ for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
+ velocityOutput.calculateVelocity(velocity[phaseIdx], elemVolVars, fvGeometry, element, phaseIdx);
+
+ //! the rank
+ if (addProcessRank)
+ rank[eIdxGlobal] = static_cast<double>(gridGeom_.gridView().comm().rank());
+ }
+
+ //////////////////////////////////////////////////////////////
+ //! (2) Register data fields with the vtk writer
+ //////////////////////////////////////////////////////////////
+
+ // volume variables if any
+ for (std::size_t i = 0; i < volVarScalarDataInfo_.size(); ++i)
+ addDofDataForWriter_(sequenceWriter_, volVarScalarData[i], volVarScalarDataInfo_[i].name);
+
+ // the velocity field
+ if (velocityOutput.enableOutput())
+ {
+ if (isBox && dim > 1)
+ {
+ for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
+ sequenceWriter_.addVertexData(Field(gridGeom_.gridView(), gridGeom_.vertexMapper(), velocity[phaseIdx],
+ "velocity_" + std::string(FluidSystem::phaseName(phaseIdx)) + " (m/s)",
+ dimWorld, dim).get());
+ }
+ // cell-centered models
+ else
+ {
+ for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
+ sequenceWriter_.addCellData(Field(gridGeom_.gridView(), gridGeom_.elementMapper(), velocity[phaseIdx],
+ "velocity_" + std::string(FluidSystem::phaseName(phaseIdx)) + " (m/s)",
+ dimWorld, 0).get());
+ }
+ }
+
+ // the process rank
+ if (addProcessRank)
+ sequenceWriter_.addCellData(Field(gridGeom_.gridView(), gridGeom_.elementMapper(), rank, "process rank", 1, 0).get());
+
+ // also register additional (non-standardized) user fields if any
+ for (auto&& field : fields_)
+ {
+ if (field.codim() == 0)
+ sequenceWriter_.addCellData(field.get());
+ else if (field.codim() == dim)
+ sequenceWriter_.addVertexData(field.get());
+ else
+ DUNE_THROW(Dune::RangeError, "Cannot add wrongly sized vtk scalar field!");
+ }
+ }
+
+ //////////////////////////////////////////////////////////////
+ //! (3) The writer writes the output for us
+ //////////////////////////////////////////////////////////////
+ sequenceWriter_.write(time, type);
+
+ //////////////////////////////////////////////////////////////
+ //! (4) Clear the writer
+ //////////////////////////////////////////////////////////////
+ writer_->clear();
+
+ //! output
+ timer.stop();
+ if (verbose_)
+ {
+ std::cout << "Writing output for problem \"" << name_ << "\". Took " << timer.elapsed() << " seconds." << std::endl;
+ }
+ }
+
+private:
+
+ template<typename Writer, typename... Args>
+ void addDofDataForWriter_(Writer& writer,
+ Args&&... args)
+ {
+ if (isBox)
+ writer.addVertexData(std::forward<Args>(args)...);
+ else
+ writer.addCellData(std::forward<Args>(args)...);
+ }
+
+ //! return the number of dofs
+ std::size_t numDofs_() const
+ {
+ return gridGeom_.gridView().size(dofCodim);
+ }
+
+ /*!
+ * \brief Helper function to retrieve privar data from the solution vector
+ * May be specialized.
+ *
+ * \param dofIdxGlobal The global dof index
+ * \param pvIdx The index of the primary variable
+ */
+ auto getPriVarData_(const std::size_t dofIdxGlobal, const std::size_t pvIdx)
+ {
+ return sol_[dofIdxGlobal][pvIdx];
+ }
+
+ const Problem& problem_;
+ const FVGridGeometry& gridGeom_;
+ const GridVariables& gridVariables_;
+ const SolutionVector& sol_;
+
+ std::string name_;
+ bool verbose_;
+
+ std::shared_ptr<Dune::VTKWriter<GridView>> writer_;
+ Dune::VTKSequenceWriter<GridView> sequenceWriter_;
+
+ std::vector<VolVarScalarDataInfo> volVarScalarDataInfo_; //! Registered volume variables
+ std::vector<Field> fields_; //! Registered scalar and vector fields
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/io/vtkoutputmodulebase.hh b/dumux/io/vtkoutputmodulebase.hh
deleted file mode 100644
index d299d2b9a8700ed428fb23199c799d0fe45373ea..0000000000000000000000000000000000000000
--- a/dumux/io/vtkoutputmodulebase.hh
+++ /dev/null
@@ -1,453 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief A VTK output module to simplify writing dumux simulation data to VTK format
- */
-#ifndef VTK_OUTPUT_MODULE_HH
-#define VTK_OUTPUT_MODULE_HH
-
-#include <dune/common/fvector.hh>
-#include <dune/grid/io/file/vtk/vtkwriter.hh>
-#include <dune/grid/io/file/vtk/vtksequencewriter.hh>
-
-#include <dumux/io/vtknestedfunction.hh>
-
-namespace Properties
-{
-NEW_PROP_TAG(VtkAddVelocity);
-NEW_PROP_TAG(VtkAddProcessRank);
-}
-
-namespace Dumux
-{
-
-/*!
- * \ingroup InputOutput
- * \brief A VTK output module to simplify writing dumux simulation data to VTK format
- *
- * Handles the output of scalar and vector fields to VTK formatted file for multiple
- * variables and timesteps. Certain predefined fields can be registered on problem / model
- * initialization and/or be turned on/off using the designated properties. Additionally
- * non-standardized scalar and vector fields can be added to the writer manually.
- */
-template<typename TypeTag>
-class VtkOutputModuleBase
-{
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
- using VertexMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
- using Implementation = typename GET_PROP_TYPE(TypeTag, VtkOutputModule);
- using VelocityOutput = typename GET_PROP_TYPE(TypeTag, VelocityOutput);
-
- enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
-
- static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
-
- struct PriVarScalarDataInfo { unsigned int pvIdx; std::string name; };
- struct PriVarVectorDataInfo { std::vector<unsigned int> pvIdx; std::string name; };
- struct SecondVarScalarDataInfo { std::function<Scalar(const VolumeVariables&)> get; std::string name; };
-
-public:
-
- VtkOutputModuleBase(const Problem& problem,
- Dune::VTK::DataMode dm = Dune::VTK::conforming)
- : problem_(problem),
- writer_(std::make_shared<Dune::VTKWriter<GridView>>(problem.gridView(), dm)),
- sequenceWriter_(writer_, problem.name())
- {}
-
- //////////////////////////////////////////////////////////////////////////////////////////////
- //! Methods to conveniently add primary and secondary variables upon problem initialization
- //! Do not call these methods after initialization
- //////////////////////////////////////////////////////////////////////////////////////////////
-
- //! Output a scalar primary variable
- //! \param name The name of the vtk field
- //! \param pvIdx The index in the primary variables vector
- void addPrimaryVariable(const std::string& name, unsigned int pvIdx)
- {
- priVarScalarDataInfo_.push_back(PriVarScalarDataInfo{pvIdx, name});
- }
-
- //! Output a vector primary variable
- //! \param name The name of the vtk field
- //! \param pvIndices A vector of indices in the primary variables vector to group for vector visualization
- void addPrimaryVariable(const std::string& name, std::vector<unsigned int> pvIndices)
- {
- assert(pvIndices.size() < 4 && "Vtk doesn't support vector dimensions greater than 3!");
- priVarVectorDataInfo_.push_back(PriVarVectorDataInfo{pvIndices, name});
- }
-
- //! Output a secondary scalar variable
- //! \param name The name of the vtk field
- //! \param f A function taking a VolumeVariables object and returning the desired scalar
- void addSecondaryVariable(const std::string& name, std::function<Scalar(const VolumeVariables&)>&& f)
- {
- secondVarScalarDataInfo_.push_back(SecondVarScalarDataInfo{f, name});
- }
-
- //////////////////////////////////////////////////////////////////////////////////////////////
- //! Methods to add addtional (non-standardized) scalar or vector fields to the output queue
- //! Call these methods on the output module obtained as argument of the addVtkOutputFields
- //! method that can be overloaded in the problem implementation
- //////////////////////////////////////////////////////////////////////////////////////////////
-
- //! Output a scalar field
- //! \param name The name of the vtk field
- //! \param codim The codimension of the entities the vtk field lives on (options: 0 := elements, dim := vertices)
- //! \returns A reference to the resized scalar field to be filled with the actual data
- std::vector<Scalar>& createScalarField(const std::string& name, int codim)
- {
- scalarFields_.emplace_back(std::make_pair(std::vector<Scalar>(problem_.gridView().size(codim)), name));
- return scalarFields_.back().first;
- }
-
- //! Output a vector field
- //! \param name The name of the vtk field
- //! \param codim The codimension of the entities the vtk field lives on (options: 0 := elements, dim := vertices)
- //! \returns A reference to the resized vector field to be filled with the actual data
- std::vector<GlobalPosition>& createVectorField(const std::string& name, int codim)
- {
- vectorFields_.emplace_back(std::make_pair(std::vector<GlobalPosition>(problem_.gridView().size(codim)), name));
- return vectorFields_.back().first;
- }
-
- //! Write the data for this timestep to file in four steps
- //! (1) Allow user to register additional (non-standardized) fields
- //! (2) We assemble all registered variable fields
- //! (3) We register them with the vtk writer
- //! (4) The writer writes the output for us
- //! (5) Clear the writer for the next time step
- void write(double time, Dune::VTK::OutputType type = Dune::VTK::ascii)
- {
-
- //////////////////////////////////////////////////////////////
- //! (1) Register addtional (non-standardized) data fields with the vtk writer
- //! Using the add scalar field or vector field methods
- //////////////////////////////////////////////////////////////
- problem_.model().addVtkOutputFields(asImp_());
- problem_.addVtkOutputFields(asImp_());
-
- //! Abort if no data was registered
- //! \todo This is not necessary anymore once the old style multiwriter is removed
- if (priVarScalarDataInfo_.empty()
- && priVarVectorDataInfo_.empty()
- && secondVarScalarDataInfo_.empty()
- && scalarFields_.empty()
- && vectorFields_.empty())
- return;
-
- //////////////////////////////////////////////////////////////
- //! (2) Assemble all variable fields with registered info
- //////////////////////////////////////////////////////////////
- auto numCells = problem_.gridView().size(0);
- auto numDofs = asImp_().numDofs_();
-
- // get fields for all primary variables
- std::vector<std::vector<Scalar>> priVarScalarData(priVarScalarDataInfo_.size(), std::vector<Scalar>(numDofs));
-
- std::vector<std::vector<Scalar>> priVarVectorData(priVarVectorDataInfo_.size());
- for (std::size_t i = 0; i < priVarVectorDataInfo_.size(); ++i)
- priVarVectorData[i].resize(numDofs*priVarVectorDataInfo_[i].pvIdx.size());
-
- // get fields for all secondary variables
- std::vector<std::vector<Scalar>> secondVarScalarData(secondVarScalarDataInfo_.size(), std::vector<Scalar>(numDofs));
-
- // instatiate the velocity output
- VelocityOutput velocityOutput(problem_);
- std::array<std::vector<GlobalPosition>, numPhases> velocity;
-
- if (velocityOutput.enableOutput())
- {
- for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
- {
- if(isBox && dim == 1)
- velocity[phaseIdx].resize(numCells);
- else
- velocity[phaseIdx].resize(numDofs);
- }
- }
-
- // maybe allocate space for the process rank
- std::vector<Scalar> rank;
- if (GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddProcessRank))
- rank.resize(numCells);
-
- for (const auto& element : elements(problem_.gridView(), Dune::Partitions::interior))
- {
- const auto eIdxGlobal = problem_.elementMapper().index(element);
-
- // cell-centered models
- if(!isBox)
- {
- //! primary variable data
- for (std::size_t i = 0; i < priVarScalarDataInfo_.size(); ++i)
- priVarScalarData[i][eIdxGlobal] = asImp_().getPriVarData_(eIdxGlobal, priVarScalarDataInfo_[i].pvIdx);
-
- for (std::size_t i = 0; i < priVarVectorDataInfo_.size(); ++i)
- for (std::size_t j = 0; j < priVarVectorDataInfo_[i].pvIdx.size(); ++j)
- priVarVectorData[i][eIdxGlobal*priVarVectorDataInfo_[i].pvIdx.size() + j]
- = asImp_().getPriVarData_(eIdxGlobal, priVarVectorDataInfo_[i].pvIdx[j]);
- }
-
- auto fvGeometry = localView(problem_.model().fvGridGeometry());
- auto elemVolVars = localView(problem_.model().curGlobalVolVars());
-
- // If velocity output is enabled we need to bind to the whole stencil
- // otherwise element-local data is sufficient
- if (velocityOutput.enableOutput())
- fvGeometry.bind(element);
- else
- fvGeometry.bindElement(element);
-
- // If velocity output is enabled we need to bind to the whole stencil
- // otherwise element-local data is sufficient
- if (velocityOutput.enableOutput())
- elemVolVars.bind(element, fvGeometry, problem_.model().curSol());
- else
- elemVolVars.bindElement(element, fvGeometry, problem_.model().curSol());
-
- for (auto&& scv : scvs(fvGeometry))
- {
- const auto dofIdxGlobal = scv.dofIndex();
-
- // for box model do the privars here
- if (isBox)
- {
- //! primary variable data
- for (std::size_t i = 0; i < priVarScalarDataInfo_.size(); ++i)
- priVarScalarData[i][dofIdxGlobal] = asImp_().getPriVarData_(dofIdxGlobal, priVarScalarDataInfo_[i].pvIdx);
-
- for (std::size_t i = 0; i < priVarVectorDataInfo_.size(); ++i)
- for (std::size_t j = 0; j < priVarVectorDataInfo_[i].pvIdx.size(); ++j)
- priVarVectorData[i][dofIdxGlobal*priVarVectorDataInfo_[i].pvIdx.size() + j]
- = asImp_().getPriVarData_(dofIdxGlobal,priVarVectorDataInfo_[i].pvIdx[j]);
-
- }
-
- // secondary variables
- const auto& volVars = elemVolVars[scv];
-
- for (std::size_t i = 0; i < secondVarScalarDataInfo_.size(); ++i)
- secondVarScalarData[i][dofIdxGlobal] = secondVarScalarDataInfo_[i].get(volVars);
- }
-
- // velocity output
- if (velocityOutput.enableOutput())
- for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
- velocityOutput.calculateVelocity(velocity[phaseIdx], elemVolVars, fvGeometry, element, phaseIdx);
-
- //! the rank
- if (GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddProcessRank))
- rank[eIdxGlobal] = problem_.gridView().comm().rank();
- }
-
- //////////////////////////////////////////////////////////////
- //! (3) Register data fields with the vtk writer
- //////////////////////////////////////////////////////////////
-
- // primary variables
- for (std::size_t i = 0; i < priVarScalarDataInfo_.size(); ++i)
- addDofDataForWriter_(sequenceWriter_, priVarScalarData[i], priVarScalarDataInfo_[i].name);
-
- for (std::size_t i = 0; i < priVarVectorDataInfo_.size(); ++i)
- addDofDataForWriter_(sequenceWriter_, priVarVectorData[i], priVarVectorDataInfo_[i].name, priVarVectorDataInfo_[i].pvIdx.size());
-
- // secondary variables
- for (std::size_t i = 0; i < secondVarScalarDataInfo_.size(); ++i)
- addDofDataForWriter_(sequenceWriter_, secondVarScalarData[i], secondVarScalarDataInfo_[i].name);
-
- // the velocity field
- if (velocityOutput.enableOutput())
- {
- if (isBox && dim > 1)
- {
- using NestedFunction = VtkNestedFunction<GridView, VertexMapper, std::vector<GlobalPosition>>;
- for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
- sequenceWriter_.addVertexData(std::make_shared<NestedFunction>("velocity_" + std::string(FluidSystem::phaseName(phaseIdx)) + " (m/s)",
- problem_.gridView(), problem_.vertexMapper(),
- velocity[phaseIdx], dim, dimWorld));
- }
- // cell-centered models
- else
- {
- using NestedFunction = VtkNestedFunction<GridView, ElementMapper, std::vector<GlobalPosition>>;
- for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
- sequenceWriter_.addCellData(std::make_shared<NestedFunction>("velocity_" + std::string(FluidSystem::phaseName(phaseIdx)) + " (m/s)",
- problem_.gridView(), problem_.elementMapper(),
- velocity[phaseIdx], 0, dimWorld));
- }
- }
-
- // the process rank
- if (GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddProcessRank))
- sequenceWriter_.addCellData(rank, "process rank");
-
- // also register additional (non-standardized) user fields
- for (auto&& field : scalarFields_)
- {
- if (field.first.size() == std::size_t(problem_.gridView().size(0)))
- sequenceWriter_.addCellData(field.first, field.second);
- else if (field.first.size() == std::size_t(problem_.gridView().size(dim)))
- sequenceWriter_.addVertexData(field.first, field.second);
- else
- DUNE_THROW(Dune::RangeError, "Cannot add wrongly sized vtk scalar field!");
- }
-
- for (auto&& field : vectorFields_)
- {
- if (field.first.size() == std::size_t(problem_.gridView().size(0)))
- {
- using NestedFunction = VtkNestedFunction<GridView, ElementMapper, std::vector<GlobalPosition>>;
- sequenceWriter_.addCellData(std::make_shared<NestedFunction>(field.second,
- problem_.gridView(), problem_.elementMapper(),
- field.first, 0, dimWorld));
- }
- else if (field.first.size() == std::size_t(problem_.gridView().size(dim)))
- {
- using NestedFunction = VtkNestedFunction<GridView, VertexMapper, std::vector<GlobalPosition>>;
- sequenceWriter_.addVertexData(std::make_shared<NestedFunction>(field.second,
- problem_.gridView(), problem_.vertexMapper(),
- field.first, dim, dimWorld));
- }
- else
- DUNE_THROW(Dune::RangeError, "Cannot add wrongly sized vtk vector field!");
- }
-
- //////////////////////////////////////////////////////////////
- //! (4) The writer writes the output for us
- //////////////////////////////////////////////////////////////
- sequenceWriter_.write(time, type);
-
- //////////////////////////////////////////////////////////////
- //! (5) Clear all fields and writer for the next time step
- //////////////////////////////////////////////////////////////
- clear();
- }
-
- //! clear all data in the writer
- void clear()
- {
- writer_->clear();
- scalarFields_.clear();
- vectorFields_.clear();
- }
-
- /*!
- * \brief This method writes the complete state of the problem
- * to the harddisk.
- *
- * The file will start with the prefix returned by the name()
- * method, has the current time of the simulation clock in it's
- * name and uses the extension <tt>.drs</tt>. (Dumux ReStart
- * file.) See Restart for details.
- *
- * \tparam Restarter The serializer type
- *
- * \param res The serializer object
- */
- template <class Restarter>
- void serialize(Restarter &res)
- {
- // TODO implement
- }
-
- /*!
- * \brief This method restores the complete state of the problem
- * from disk.
- *
- * It is the inverse of the serialize() method.
- *
- * \tparam Restarter The deserializer type
- *
- * \param res The deserializer object
- */
- template <class Restarter>
- void deserialize(Restarter &res)
- {
- // TODO implement
- }
-
- const Problem &problem() const
- { return problem_; }
-
-private:
-
- template<typename Writer, typename... Args>
- void addDofDataForWriter_(Writer& writer,
- Args&&... args)
- {
- if (isBox)
- writer.addVertexData(std::forward<Args>(args)...);
- else
- writer.addCellData(std::forward<Args>(args)...);
- }
-
- const Problem& problem_;
- std::shared_ptr<Dune::VTKWriter<GridView>> writer_;
- Dune::VTKSequenceWriter<GridView> sequenceWriter_;
-
- std::vector<PriVarScalarDataInfo> priVarScalarDataInfo_;
- std::vector<PriVarVectorDataInfo> priVarVectorDataInfo_;
- std::vector<SecondVarScalarDataInfo> secondVarScalarDataInfo_;
-
- std::list<std::pair<std::vector<Scalar>, std::string>> scalarFields_;
- std::list<std::pair<std::vector<GlobalPosition>, std::string>> vectorFields_;
-
- //! return the number of dofs
- unsigned int numDofs_() const
- {
- return problem_.model().numDofs();
- }
-
- /*!
- * \brief Helper function to retrieve privar data from the solution vector
- * May be specialized.
- *
- * \param dofIdxGlobal The global dof index
- * \param pvIdx The index of the primary variable
- */
- auto getPriVarData_(const std::size_t dofIdxGlobal, const std::size_t pvIdx)
- {
- return problem_.model().curSol()[dofIdxGlobal][pvIdx];
- }
-
- //! Returns the implementation of the problem (i.e. static polymorphism)
- Implementation &asImp_()
- { return *static_cast<Implementation *>(this); }
-
- //! \copydoc asImp_()
- const Implementation &asImp_() const
- { return *static_cast<const Implementation *>(this); }
-};
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/linear/amgbackend.hh b/dumux/linear/amgbackend.hh
index 05f0fcc5651e478edbedac079a89a2de221d2f62..5fb8dcbc34e3825cbb0a5d1336e7319647089972 100644
--- a/dumux/linear/amgbackend.hh
+++ b/dumux/linear/amgbackend.hh
@@ -31,6 +31,7 @@
#include <dune/istl/paamg/pinfo.hh>
#include <dune/istl/solvers.hh>
+#include <dumux/linear/solver.hh>
#include <dumux/linear/linearsolverproperties.hh>
#include <dumux/linear/amgproperties.hh>
#include <dumux/linear/amgparallelhelpers.hh>
@@ -71,32 +72,32 @@ void scaleLinearSystem(Matrix& matrix, Vector& rhs)
* \brief Provides a linear solver using the ISTL AMG.
*/
template <class TypeTag>
-class AMGBackend
+class AMGBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP(TypeTag, AmgTraits) AmgTraits;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
+ using AmgTraits = typename GET_PROP(TypeTag, AmgTraits);
enum { numEq = AmgTraits::numEq };
- typedef typename AmgTraits::LinearOperator LinearOperator;
- typedef typename AmgTraits::VType VType;
- typedef typename AmgTraits::Comm Comm;
- typedef typename AmgTraits::Smoother Smoother;
- typedef Dune::Amg::AMG<typename AmgTraits::LinearOperator, VType,
- Smoother,Comm> AMGType;
- typedef typename AmgTraits::LinearOperator::matrix_type BCRSMat;
-
+ using LinearOperator = typename AmgTraits::LinearOperator;
+ using ScalarProduct = typename AmgTraits::ScalarProduct;
+ using VType = typename AmgTraits::VType;
+ using Comm = typename AmgTraits::Comm;
+ using Smoother = typename AmgTraits::Smoother;
+ using AMGType = Dune::Amg::AMG<typename AmgTraits::LinearOperator, VType, Smoother,Comm>;
+ using BCRSMat = typename AmgTraits::LinearOperator::matrix_type;
+ using DofMapper = typename AmgTraits::DofMapper;
public:
/*!
* \brief Construct the backend.
*
* \param problem the problem at hand
*/
- AMGBackend(const Problem& problem)
- : problem_(problem), phelper_(problem_), firstCall_(true)
- {
- }
+ AMGBackend(const GridView& gridView, const DofMapper& dofMapper)
+ : gridView_(gridView)
+ , dofMapper_(dofMapper)
+ , phelper_(gridView, dofMapper)
+ , firstCall_(true)
+ {}
/*!
* \brief Solve a linear system.
@@ -108,41 +109,40 @@ public:
template<class Matrix, class Vector>
bool solve(Matrix& A, Vector& x, Vector& b)
{
- int maxIt = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, MaxIterations);
- int verbosity = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, Verbosity);
- static const double residReduction = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, ResidualReduction);
-
int rank = 0;
- std::shared_ptr<typename AmgTraits::Comm> comm;
- std::shared_ptr<typename AmgTraits::LinearOperator> fop;
- std::shared_ptr<typename AmgTraits::ScalarProduct> sp;
+ std::shared_ptr<Comm> comm;
+ std::shared_ptr<LinearOperator> fop;
+ std::shared_ptr<ScalarProduct> sp;
static const int dofCodim = AmgTraits::dofCodim;
static const bool isParallel = Dune::Capabilities::canCommunicate<Grid, dofCodim>::v;
prepareLinearAlgebra_<Matrix, Vector, isParallel>(A, b, rank, comm, fop, sp);
- typedef typename Dune::Amg::SmootherTraits<Smoother>::Arguments
- SmootherArgs;
- typedef Dune::Amg::CoarsenCriterion<Dune::Amg::SymmetricCriterion<BCRSMat,
- Dune::Amg::FirstDiagonal> >
- Criterion;
+ using SmootherArgs = typename Dune::Amg::SmootherTraits<Smoother>::Arguments;
+ using Criterion = Dune::Amg::CoarsenCriterion<Dune::Amg::SymmetricCriterion<BCRSMat, Dune::Amg::FirstDiagonal>>;
+
//! \todo Check whether the default accumulation mode atOnceAccu is needed.
Dune::Amg::Parameters params(15,2000,1.2,1.6,Dune::Amg::atOnceAccu);
- params.setDefaultValuesIsotropic(GET_PROP_TYPE(TypeTag, GridView)::Traits::Grid::dimension);
- params.setDebugLevel(verbosity);
+ params.setDefaultValuesIsotropic(Grid::dimension);
+ params.setDebugLevel(this->verbosity());
Criterion criterion(params);
SmootherArgs smootherArgs;
smootherArgs.iterations = 1;
smootherArgs.relaxationFactor = 1;
AMGType amg(*fop, criterion, smootherArgs, *comm);
- Dune::BiCGSTABSolver<typename AmgTraits::VType> solver(*fop, *sp, amg, residReduction, maxIt,
- rank == 0 ? verbosity : 0);
+ Dune::BiCGSTABSolver<VType> solver(*fop, *sp, amg, this->residReduction(), this->maxIter(),
+ rank == 0 ? this->verbosity() : 0);
solver.apply(x, b, result_);
firstCall_ = false;
return result_.converged;
}
+ std::string name() const
+ {
+ return "AMG preconditioned BiCGSTAB solver";
+ }
+
/*!
* \brief The result containing the convergence history.
*/
@@ -151,11 +151,6 @@ public:
return result_;
}
- const Problem& problem() const
- {
- return problem_;
- }
-
private:
/*!
@@ -175,16 +170,18 @@ private:
*/
template<class Matrix, class Vector, bool isParallel>
void prepareLinearAlgebra_(Matrix& A, Vector& b, int& rank,
- std::shared_ptr<typename AmgTraits::Comm>& comm,
- std::shared_ptr<typename AmgTraits::LinearOperator>& fop,
- std::shared_ptr<typename AmgTraits::ScalarProduct>& sp)
+ std::shared_ptr<Comm>& comm,
+ std::shared_ptr<LinearOperator>& fop,
+ std::shared_ptr<ScalarProduct>& sp)
{
LinearAlgebraPreparator<TypeTag, isParallel>
::prepareLinearAlgebra(A, b, rank, comm, fop, sp,
- problem_, phelper_, firstCall_);
+ gridView_, dofMapper_, phelper_, firstCall_);
}
- const Problem& problem_;
+ GridView gridView_;
+ DofMapper dofMapper_;
+
ParallelISTLHelper<TypeTag> phelper_;
Dune::InverseOperatorResult result_;
bool firstCall_;
diff --git a/dumux/linear/amgparallelhelpers.hh b/dumux/linear/amgparallelhelpers.hh
index 7775afd943b94984c5fb973858f7b7ebacabb3ad..24da796f3faf55b9175ddf97099e8362f511c848 100644
--- a/dumux/linear/amgparallelhelpers.hh
+++ b/dumux/linear/amgparallelhelpers.hh
@@ -47,27 +47,24 @@ NEW_PROP_TAG(AmgTraits);
template<class TypeTag>
class ParallelISTLHelper
{
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP(TypeTag, AmgTraits) AmgTraits;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using AmgTraits = typename GET_PROP(TypeTag, AmgTraits);
+ using DofMapper = typename AmgTraits::DofMapper;
enum { dofCodim = AmgTraits::dofCodim };
class BaseGatherScatter
{
public:
- BaseGatherScatter(const Problem& problem)
- : problem_(problem)
- {}
+ BaseGatherScatter(const DofMapper& mapper)
+ : mapper_(mapper) {}
template<class EntityType>
int index(const EntityType& e) const
- {
- return problem_.model().dofMapper().index(e);
- }
+ { return mapper_.index(e); }
private:
- const Problem& problem_;
+ const DofMapper& mapper_;
};
/**
@@ -81,8 +78,8 @@ class ParallelISTLHelper
public:
typedef typename V::block_type DataType;
- ConsistencyBoxGatherScatter(V& container, const Problem& problem)
- : BaseGatherScatter(problem), container_(container)
+ ConsistencyBoxGatherScatter(V& container, const DofMapper& mapper)
+ : BaseGatherScatter(mapper), container_(container)
{}
bool contains(int dim, int codim) const
@@ -132,9 +129,8 @@ class ParallelISTLHelper
public:
typedef std::size_t DataType;
- GhostGatherScatter(std::vector<std::size_t>& ranks,
- const Problem& problem)
- : BaseGatherScatter(problem), ranks_(ranks)
+ GhostGatherScatter(std::vector<std::size_t>& ranks, const DofMapper& mapper)
+ : BaseGatherScatter(mapper), ranks_(ranks)
{}
@@ -189,9 +185,8 @@ class ParallelISTLHelper
public:
typedef std::size_t DataType;
- InteriorBorderGatherScatter(std::vector<std::size_t>& ranks,
- const Problem& problem)
- : BaseGatherScatter(problem), ranks_(ranks)
+ InteriorBorderGatherScatter(std::vector<std::size_t>& ranks, const DofMapper& mapper)
+ : BaseGatherScatter(mapper), ranks_(ranks)
{}
@@ -248,8 +243,8 @@ class ParallelISTLHelper
{
typedef int DataType;
- NeighbourGatherScatter(const Problem& problem, int rank_, std::set<int>& neighbours_)
- : BaseGatherScatter(problem), myrank(rank_), neighbours(neighbours_)
+ NeighbourGatherScatter(const DofMapper& mapper, int rank_, std::set<int>& neighbours_)
+ : BaseGatherScatter(mapper), myrank(rank_), neighbours(neighbours_)
{}
@@ -297,9 +292,8 @@ class ParallelISTLHelper
{
typedef int DataType;
- SharedGatherScatter(std::vector<int>& shared,
- const Problem& problem)
- : BaseGatherScatter(problem), shared_(shared)
+ SharedGatherScatter(std::vector<int>& shared, const DofMapper& mapper)
+ : BaseGatherScatter(mapper), shared_(shared)
{}
bool contains(int dim, int codim) const
@@ -336,7 +330,6 @@ class ParallelISTLHelper
}
private:
std::vector<int>& shared_;
-
};
/**
@@ -349,9 +342,8 @@ class ParallelISTLHelper
public Dune::CommDataHandleIF<GlobalIndexGatherScatter<GI>, GI>
{
typedef GI DataType;
- GlobalIndexGatherScatter(std::vector<GI>& gindices,
- const Problem& problem)
- : BaseGatherScatter(problem), gindices_(gindices)
+ GlobalIndexGatherScatter(std::vector<GI>& gindices, const DofMapper& mapper)
+ : BaseGatherScatter(mapper), gindices_(gindices)
{}
bool contains(int dim, int codim) const
@@ -390,36 +382,34 @@ class ParallelISTLHelper
public:
- ParallelISTLHelper (const Problem& problem, int verbose=1)
- : problem_(problem), verbose_(verbose), initialized_(false)
+ ParallelISTLHelper (const GridView& gridView, const DofMapper& mapper, int verbose=1)
+ : gridView_(gridView), mapper_(mapper), verbose_(verbose), initialized_(false)
{}
// \brief Initializes the markers for ghosts and owners with the correct size and values.
//
- void initGhostsAndOwners(){
- owner_.resize(problem_.model().dofMapper().size(),
- problem_.gridView().comm().rank());
- isGhost_.resize(problem_.model().dofMapper().size(),0.0);
+ void initGhostsAndOwners()
+ {
+ owner_.resize(mapper_.size(),
+ gridView_.comm().rank());
+ isGhost_.resize(mapper_.size(),0.0);
// find out about ghosts
- GhostGatherScatter ggs(owner_,problem_);
+ GhostGatherScatter ggs(owner_, mapper_);
- if (problem_.gridView().comm().size()>1)
- problem_.gridView().communicate(ggs,Dune::InteriorBorder_All_Interface,Dune::ForwardCommunication);
+ if (gridView_.comm().size()>1)
+ gridView_.communicate(ggs, Dune::InteriorBorder_All_Interface, Dune::ForwardCommunication);
isGhost_ = owner_;
// partition interior/border
- InteriorBorderGatherScatter dh(owner_, problem_);
+ InteriorBorderGatherScatter dh(owner_, mapper_);
- if (problem_.gridView().comm().size()>1)
- problem_.gridView().communicate(dh,Dune::InteriorBorder_InteriorBorder_Interface,Dune::ForwardCommunication);
+ if (gridView_.comm().size()>1)
+ gridView_.communicate(dh, Dune::InteriorBorder_InteriorBorder_Interface, Dune::ForwardCommunication);
// convert vector into mask vector
- for(auto v=owner_.begin(), vend=owner_.end(); v!=vend;++v)
- if(*v==problem_.gridView().comm().rank())
- *v=1.0;
- else
- *v=0.0;
+ for (auto& v : owner_)
+ v = (v == gridView_.comm().rank()) ? 1.0 : 0.0;
initialized_=true;
}
@@ -430,7 +420,7 @@ public:
{
auto v1=w.begin();
- for(auto v2=owner_.begin(), vend=owner_.end(); v2!=vend;++v1,++v2)
+ for(auto v2=owner_.begin(), vend=owner_.end(); v2!=vend; ++v1, ++v2)
v1*=v2;
}
@@ -451,11 +441,10 @@ public:
void makeNonOverlappingConsistent(Dune::BlockVector<B,A>& v)
{
#if HAVE_MPI
- const GridView& gridview = problem_.gridView();
- ConsistencyBoxGatherScatter<Dune::BlockVector<B,A> > gs(v, problem_);
- if (gridview.comm().size()>1)
- gridview.communicate(gs,Dune::InteriorBorder_InteriorBorder_Interface,
- Dune::ForwardCommunication);
+ ConsistencyBoxGatherScatter<Dune::BlockVector<B,A> > gs(v, mapper_);
+ if (gridView_.comm().size() > 1)
+ gridView_.communicate(gs, Dune::InteriorBorder_InteriorBorder_Interface,
+ Dune::ForwardCommunication);
#endif
}
@@ -475,14 +464,16 @@ public:
template<typename MatrixType, typename Comm>
void createIndexSetAndProjectForAMG(MatrixType& m, Comm& c);
#endif
+
private:
- const Problem& problem_;
- std::vector<std::size_t> owner_; // vector to identify unique decomposition
- std::vector<std::size_t> isGhost_; //vector to identify ghost dofs
- int verbose_; //verbosity
- // \brief whether isGhost and owner arrays are initialized
- bool initialized_;
-};
+ const GridView gridView_; //! the grid view
+ const DofMapper& mapper_; //! the dof mapper
+ std::vector<std::size_t> owner_; //! vector to identify unique decomposition
+ std::vector<std::size_t> isGhost_; //! vector to identify ghost dofs
+ int verbose_; //! verbosity
+ bool initialized_; //! whether isGhost and owner arrays are initialized
+
+}; // class ParallelISTLHelper
/**
* @brief Helper class for adding up matrix entries on border.
@@ -492,46 +483,44 @@ private:
template<class TypeTag>
class EntityExchanger
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP(TypeTag, AmgTraits) AmgTraits;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using AmgTraits = typename GET_PROP(TypeTag, AmgTraits);
enum { numEq = AmgTraits::numEq };
- typedef Dune::BCRSMatrix<Dune::FieldMatrix<Scalar,numEq,numEq> > Matrix;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ using Matrix = Dune::BCRSMatrix<Dune::FieldMatrix<Scalar,numEq,numEq> >;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
enum { dim = GridView::dimension };
enum { dofCodim = AmgTraits::dofCodim };
- typedef typename GridView::Traits::Grid Grid;
- typedef typename Matrix::block_type BlockType;
- typedef typename Grid::Traits::GlobalIdSet IDS;
- typedef typename IDS::IdType IdType;
- typedef typename Matrix::RowIterator RowIterator;
- typedef typename Matrix::ColIterator ColIterator;
+ using Grid = typename GridView::Traits::Grid;
+ using BlockType = typename Matrix::block_type;
+ using IDS = typename Grid::Traits::GlobalIdSet;
+ using IdType = typename IDS::IdType;
+ using RowIterator = typename Matrix::RowIterator;
+ using ColIterator = typename Matrix::ColIterator;
+ using DofMapper = typename AmgTraits::DofMapper;
public:
/*! \brief Constructor. Sets up the local to global relations.
- \param[in] problem The problem to be solved.
+ \param[in] gridView The gridView on which we are operating
+ \param[in] dofMapper The local dof mapper
*/
- EntityExchanger(const Problem& problem)
- : problem_(problem)
+ EntityExchanger(const GridView& gridView, const DofMapper& mapper)
+ : gridView_(gridView), mapper_(mapper)
{
gid2Index_.clear();
index2GID_.clear();
- const GridView& gridView = problem.gridView();
-
- for (const auto& entity : entities(gridView, Dune::Codim<dofCodim>()))
+ for (const auto& entity : entities(gridView_, Dune::Codim<dofCodim>()))
{
if (entity.partitionType() == Dune::BorderEntity)
{
- int localIdx = problem_.model().dofMapper().index(entity);
- IdType dofIdxGlobal = gridView.grid().globalIdSet().id(entity);
+ int localIdx = mapper_.index(entity);
+ IdType dofIdxGlobal = gridView_.grid().globalIdSet().id(entity);
- std::pair<IdType,int> g2iPair(dofIdxGlobal, localIdx);
+ std::pair<IdType, int> g2iPair(dofIdxGlobal, localIdx);
gid2Index_.insert(g2iPair);
- std::pair<int,IdType> i2gPair(localIdx, dofIdxGlobal);
+ std::pair<int, IdType> i2gPair(localIdx, dofIdxGlobal);
index2GID_.insert(i2gPair);
-
}
}
}
@@ -558,12 +547,28 @@ public:
* that contains all missing connections.
*/
class MatPatternExchange
- : public Dune::CommDataHandleIF<MatPatternExchange,IdType> {
- typedef typename Matrix::RowIterator RowIterator;
- typedef typename Matrix::ColIterator ColIterator;
+ : public Dune::CommDataHandleIF<MatPatternExchange, IdType>
+ {
+ using RowIterator = typename Matrix::RowIterator;
+ using ColIterator = typename Matrix::ColIterator;
public:
//! Export type of data for message buffer
- typedef IdType DataType;
+ using DataType = IdType;
+
+ /** @brief Constructor
+ @param[in] mapper The local dof mapper.
+ @param[in] g2i Global to local index map.
+ @param[in] i2g Local to global index map.
+ @param[in] A Matrix to operate on.
+ @param[in] helper parallel istl helper.
+ */
+ MatPatternExchange (const DofMapper& mapper,
+ const std::map<IdType,int>& g2i,
+ const std::map<int,IdType>& i2g, Matrix& A,
+ const ParallelISTLHelper<TypeTag>& helper)
+ : mapper_(mapper), gid2Index_(g2i), index2GID_(i2g),
+ sparsity_(A.N()), A_(A), helper_(helper)
+ {}
/** @brief Returns true if data for given valid codim should be communicated
*/
@@ -584,7 +589,7 @@ public:
template<class EntityType>
size_t size (EntityType& e) const
{
- int i = problem_.model().dofMapper().index(e);
+ int i = mapper_.index(e);
int n = 0;
for (ColIterator j = A_[i].begin(); j != A_[i].end(); ++j)
{
@@ -601,7 +606,7 @@ public:
template<class MessageBuffer, class EntityType>
void gather (MessageBuffer& buff, const EntityType& e) const
{
- int i = problem_.model().dofMapper().index(e);
+ int i = mapper_.index(e);
for (ColIterator j = A_[i].begin(); j != A_[i].end(); ++j)
{
typename std::map<int,IdType>::const_iterator it=index2GID_.find(j.index());
@@ -616,7 +621,7 @@ public:
template<class MessageBuffer, class EntityType>
void scatter (MessageBuffer& buff, const EntityType& e, size_t n)
{
- int i = problem_.model().dofMapper().index(e);
+ int i = mapper_.index(e);
for (size_t k = 0; k < n; k++)
{
IdType id;
@@ -639,47 +644,46 @@ public:
return sparsity_;
}
- /** @brief Constructor
- @param[in] problem The problem to be solved.
- @param[in] g2i Global to local index map.
- @param[in] i2g Local to global index map.
- @param[in] A Matrix to operate on.
- @param[in] helper parallel istl helper.
- */
- MatPatternExchange (const Problem& problem,
- const std::map<IdType,int>& g2i,
- const std::map<int,IdType>& i2g, Matrix& A,
- const ParallelISTLHelper<TypeTag>& helper)
- : problem_(problem), gid2Index_(g2i), index2GID_(i2g),
- sparsity_(A.N()), A_(A), helper_(helper)
- {}
-
private:
- const Problem& problem_;
+ const DofMapper& mapper_;
const std::map<IdType,int>& gid2Index_;
const std::map<int,IdType>& index2GID_;
std::vector<std::set<int> > sparsity_;
Matrix& A_;
const ParallelISTLHelper<TypeTag>& helper_;
- };
+
+ }; // class MatPatternExchange
//! Local matrix blocks associated with the global id set
struct MatEntry
{
IdType first;
BlockType second;
- MatEntry (const IdType& f, const BlockType& s) : first(f),second(s) {}
+ MatEntry (const IdType& f, const BlockType& s) : first(f), second(s) {}
MatEntry () {}
};
//! A DataHandle class to exchange matrix entries
class MatEntryExchange
- : public Dune::CommDataHandleIF<MatEntryExchange,MatEntry> {
- typedef typename Matrix::RowIterator RowIterator;
- typedef typename Matrix::ColIterator ColIterator;
+ : public Dune::CommDataHandleIF<MatEntryExchange,MatEntry>
+ {
+ using RowIterator = typename Matrix::RowIterator;
+ using ColIterator = typename Matrix::ColIterator;
public:
//! Export type of data for message buffer
- typedef MatEntry DataType;
+ using DataType = MatEntry;
+
+ /** @brief Constructor
+ @param[in] mapper The local dof mapper.
+ @param[in] g2i Global to local index map.
+ @param[in] i2g Local to global index map.
+ @param[in] A Matrix to operate on.
+ */
+ MatEntryExchange (const DofMapper& mapper, const std::map<IdType,int>& g2i,
+ const std::map<int,IdType>& i2g,
+ Matrix& A)
+ : mapper_(mapper), gid2Index_(g2i), index2GID_(i2g), A_(A)
+ {}
/** @brief Returns true if data for given valid codim should be communicated
*/
@@ -700,7 +704,7 @@ public:
template<class EntityType>
size_t size (EntityType& e) const
{
- int i = problem_.model().dofMapper().index(e);
+ int i = mapper_.index(e);
int n = 0;
for (ColIterator j = A_[i].begin(); j != A_[i].end(); ++j)
{
@@ -717,7 +721,7 @@ public:
template<class MessageBuffer, class EntityType>
void gather (MessageBuffer& buff, const EntityType& e) const
{
- int i = problem_.model().dofMapper().index(e);
+ int i = mapper_.index(e);
for (ColIterator j = A_[i].begin(); j != A_[i].end(); ++j)
{
typename std::map<int,IdType>::const_iterator it=index2GID_.find(j.index());
@@ -732,7 +736,7 @@ public:
template<class MessageBuffer, class EntityType>
void scatter (MessageBuffer& buff, const EntityType& e, size_t n)
{
- int i = problem_.model().dofMapper().index(e);
+ int i = mapper_.index(e);
for (size_t k = 0; k < n; k++)
{
MatEntry m;
@@ -745,63 +749,58 @@ public:
}
}
- /** @brief Constructor
- @param[in] problem The problem to be solved.
- @param[in] g2i Global to local index map.
- @param[in] i2g Local to global index map.
- @param[in] A Matrix to operate on.
- */
- MatEntryExchange (const Problem& problem, const std::map<IdType,int>& g2i,
- const std::map<int,IdType>& i2g,
- Matrix& A)
- : problem_(problem), gid2Index_(g2i), index2GID_(i2g), A_(A)
- {}
-
private:
- const Problem& problem_;
+ const DofMapper& mapper_;
const std::map<IdType,int>& gid2Index_;
const std::map<int,IdType>& index2GID_;
Matrix& A_;
- };
+
+ }; // class MatEntryExchange
/** @brief communicates values for the sparsity pattern of the new matrix.
@param A Matrix to operate on.
@param helper ParallelelISTLHelper.
*/
- void getExtendedMatrix (Matrix& A,const ParallelISTLHelper<TypeTag>& helper)
+ void getExtendedMatrix (Matrix& A, const ParallelISTLHelper<TypeTag>& helper)
{
- if (problem_.gridView().comm().size() > 1) {
+ if (gridView_.comm().size() > 1)
+ {
Matrix tmp(A);
std::size_t nnz=0;
// get entries from other processes
- MatPatternExchange datahandle(problem_, gid2Index_, index2GID_, A, helper);
- problem_.gridView().communicate(datahandle,
- Dune::InteriorBorder_InteriorBorder_Interface,
- Dune::ForwardCommunication);
+ MatPatternExchange datahandle(mapper_, gid2Index_, index2GID_, A, helper);
+ gridView_.communicate(datahandle, Dune::InteriorBorder_InteriorBorder_Interface,
+ Dune::ForwardCommunication);
std::vector<std::set<int> >& sparsity = datahandle.sparsity();
// add own entries, count number of nonzeros
- for (RowIterator i = A.begin(); i != A.end(); ++i){
- for (ColIterator j = A[i.index()].begin(); j != A[i.index()].end(); ++j){
+ for (RowIterator i = A.begin(); i != A.end(); ++i)
+ {
+ for (ColIterator j = A[i.index()].begin(); j != A[i.index()].end(); ++j)
+ {
if (sparsity[i.index()].find(j.index()) == sparsity[i.index()].end())
+ {
sparsity[i.index()].insert(j.index());
+ }
}
nnz += sparsity[i.index()].size();
}
+
A.setSize(tmp.N(), tmp.N(), nnz);
A.setBuildMode(Matrix::row_wise);
typename Matrix::CreateIterator citer = A.createbegin();
typedef typename std::vector<std::set<int> >::const_iterator Iter;
- for (Iter i = sparsity.begin(), end = sparsity.end(); i!=end; ++i, ++citer){
+ for (Iter i = sparsity.begin(), end = sparsity.end(); i!=end; ++i, ++citer)
+ {
typedef typename std::set<int>::const_iterator SIter;
for (SIter si = i->begin(), send = i->end(); si!=send; ++si)
citer.insert(*si);
}
+
// set matrix old values
A = 0;
for (RowIterator i = tmp.begin(); i != tmp.end(); ++i)
- for (ColIterator j = tmp[i.index()].begin(); j != tmp[i.index()].end(); ++j){
+ for (ColIterator j = tmp[i.index()].begin(); j != tmp[i.index()].end(); ++j)
A[i.index()][j.index()] = tmp[i.index()][j.index()];
- }
}
}
@@ -810,12 +809,11 @@ public:
*/
void sumEntries (Matrix& A)
{
- if (problem_.gridView().comm().size() > 1)
+ if (gridView_.comm().size() > 1)
{
- MatEntryExchange datahandle(problem_, gid2Index_, index2GID_, A);
- problem_.gridView().communicate(datahandle,
- Dune::InteriorBorder_InteriorBorder_Interface,
- Dune::ForwardCommunication);
+ MatEntryExchange datahandle(mapper_, gid2Index_, index2GID_, A);
+ gridView_.communicate(datahandle, Dune::InteriorBorder_InteriorBorder_Interface,
+ Dune::ForwardCommunication);
}
}
@@ -828,33 +826,39 @@ public:
#endif
private:
- const Problem& problem_;
- std::map<IdType,int> gid2Index_;
- std::map<int,IdType> index2GID_;
-};
+ const GridView gridView_;
+ const DofMapper& mapper_;
+ std::map<IdType, int> gid2Index_;
+ std::map<int, IdType> index2GID_;
+
+}; // class EntityExchanger
+// methods that only exist if MPI is available
#if HAVE_MPI
template<class TypeTag>
void EntityExchanger<TypeTag>::getExtendedMatrix (Matrix& A) const
{
- const GridView& gridView = problem_.gridView();
- if (gridView.comm().size() > 1) {
+ if (gridView_.comm().size() > 1)
+ {
Matrix tmp(A);
- std::size_t nnz=0;
+ std::size_t nnz = 0;
// get entries from other processes
- MatPatternExchange datahandle(problem_, gid2Index_, index2GID_, A, *this);
- gridView.communicate(datahandle,
- Dune::InteriorBorder_InteriorBorder_Interface,
- Dune::ForwardCommunication);
+ MatPatternExchange datahandle(mapper_, gid2Index_, index2GID_, A, *this);
+ gridView_.communicate(datahandle, Dune::InteriorBorder_InteriorBorder_Interface,
+ Dune::ForwardCommunication);
std::vector<std::set<int> >& sparsity = datahandle.sparsity();
+
// add own entries, count number of nonzeros
- for (RowIterator i = A.begin(); i != A.end(); ++i){
- for (ColIterator j = A[i.index()].begin(); j != A[i.index()].end(); ++j){
+ for (RowIterator i = A.begin(); i != A.end(); ++i)
+ {
+ for (ColIterator j = A[i.index()].begin(); j != A[i.index()].end(); ++j)
+ {
if (sparsity[i.index()].find(j.index()) == sparsity[i.index()].end())
sparsity[i.index()].insert(j.index());
}
nnz += sparsity[i.index()].size();
}
+
A.setSize(tmp.N(), tmp.N(), nnz);
A.setBuildMode(Matrix::row_wise);
typename Matrix::CreateIterator citer = A.createbegin();
@@ -864,124 +868,126 @@ void EntityExchanger<TypeTag>::getExtendedMatrix (Matrix& A) const
for (SIter si = i->begin(), send = i->end(); si!=send; ++si)
citer.insert(*si);
}
+
// set matrix old values
A = 0;
for (RowIterator i = tmp.begin(); i != tmp.end(); ++i)
- for (ColIterator j = tmp[i.index()].begin(); j != tmp[i.index()].end(); ++j){
+ for (ColIterator j = tmp[i.index()].begin(); j != tmp[i.index()].end(); ++j)
A[i.index()][j.index()] = tmp[i.index()][j.index()];
- }
+
sumEntries(A);
}
-}
+
+} // EntityExchanger::getExtendedMatrix
template<class TypeTag>
-template<typename M, typename C>
-void ParallelISTLHelper<TypeTag>::createIndexSetAndProjectForAMG(M& m, C& c)
+template<typename MatrixType, typename Comm>
+void ParallelISTLHelper<TypeTag>::createIndexSetAndProjectForAMG(MatrixType& m, Comm& comm)
{
- if(!initialized_){
+ if(!initialized_)
+ {
// This is the first time this function is called.
// Therefore we need to initialize the marker vectors for ghosts and
// owned dofs
initGhostsAndOwners();
}
- const GridView& gridview = problem_.gridView();
// First find out which dofs we share with other processors
- std::vector<int> sharedDofs(problem_.model().dofMapper().size(), false);
+ std::vector<int> sharedDofs(mapper_.size(), false);
- SharedGatherScatter sgs(sharedDofs, problem_);
+ SharedGatherScatter sgs(sharedDofs, mapper_);
- if (gridview.comm().size()>1)
- gridview.communicate(sgs,Dune::All_All_Interface,
- Dune::ForwardCommunication);
+ if (gridView_.comm().size() > 1)
+ gridView_.communicate(sgs, Dune::All_All_Interface,
+ Dune::ForwardCommunication);
// Count shared dofs that we own
- typedef typename C::ParallelIndexSet::GlobalIndex GlobalIndex;
- GlobalIndex count=0;
- auto owned=owner_.begin();
+ using GlobalIndex = typename Comm::ParallelIndexSet::GlobalIndex;
+ GlobalIndex count = 0;
+ auto owned = owner_.begin();
- for(auto v=sharedDofs.begin(), vend=sharedDofs.end(); v != vend; ++v, ++owned)
+ for (auto v=sharedDofs.begin(), vend=sharedDofs.end(); v != vend; ++v, ++owned)
if(*v && *owned==1)
++count;
- Dune::dverb<<gridview.comm().rank()<<": shared count is "<< count.touint()
- <<std::endl;
+ Dune::dverb << gridView_.comm().rank() << ": shared count is " << count.touint()
+ << std::endl;
- std::vector<GlobalIndex> counts(gridview.comm().size());
- gridview.comm().allgather(&count, 1, &(counts[0]));
+ std::vector<GlobalIndex> counts(gridView_.comm().size());
+ gridView_.comm().allgather(&count, 1, &(counts[0]));
// Compute start index start_p = \sum_{i=0}^{i<p} counts_i
- GlobalIndex start=0;
- for(int i=0; i<gridview.comm().rank(); ++i)
- start=start+counts[i];
- //std::cout<<gv.comm().rank()<<": start index = "<<start.touint()<<std::endl;
-
+ GlobalIndex start = 0;
+ for (int i = 0; i < gridView_.comm().rank(); ++i)
+ start += counts[i];
- typedef std::vector<GlobalIndex> GIVector;
- GIVector scalarIndices(problem_.model().dofMapper().size(),
- std::numeric_limits<GlobalIndex>::max());
+ std::vector<GlobalIndex> scalarIndices(mapper_.size(),
+ std::numeric_limits<GlobalIndex>::max());
- auto shared=sharedDofs.begin();
- auto index=scalarIndices.begin();
+ auto shared = sharedDofs.begin();
+ auto index = scalarIndices.begin();
- for(auto i=owner_.begin(), iend=owner_.end(); i!=iend; ++i, ++shared, ++index)
- if(*i==1 && *shared){
+ for (auto i=owner_.begin(), iend=owner_.end(); i!=iend; ++i, ++shared, ++index)
+ {
+ if(*i==1 && *shared)
+ {
*index=start;
++start;
}
+ }
// publish global indices for the shared DOFS to other processors.
- typedef GlobalIndexGatherScatter<GlobalIndex> GIGS;
- GIGS gigs(scalarIndices, problem_);
- if (gridview.comm().size()>1)
- gridview.communicate(gigs,Dune::All_All_Interface,
- Dune::ForwardCommunication);
+ GlobalIndexGatherScatter<GlobalIndex> gigs(scalarIndices, mapper_);
+ if (gridView_.comm().size()>1)
+ gridView_.communicate(gigs, Dune::All_All_Interface,
+ Dune::ForwardCommunication);
// Setup the index set
- c.indexSet().beginResize();
- index=scalarIndices.begin();
- auto ghost=isGhost_.begin();
+ comm.indexSet().beginResize();
+ index = scalarIndices.begin();
+ auto ghost = isGhost_.begin();
- for(auto i=owner_.begin(), iend=owner_.end(); i!=iend; ++i, ++ghost, ++index)
+ for (auto i=owner_.begin(), iend=owner_.end(); i!=iend; ++i, ++ghost, ++index)
{
Dune::OwnerOverlapCopyAttributeSet::AttributeSet attr;
- if(*index!=std::numeric_limits<GlobalIndex>::max()){
+ if (*index!=std::numeric_limits<GlobalIndex>::max())
+ {
// global index exist in index set
- if(*i>0){
+ if (*i>0)
+ {
// This dof is managed by us.
attr = Dune::OwnerOverlapCopyAttributeSet::owner;
}
- else if ( *ghost==(1<<24) && ( c.getSolverCategory() ==
- static_cast<int>(Dune::SolverCategory::nonoverlapping)) ){
+ else if ( *ghost==(1<<24) && ( comm.getSolverCategory() ==
+ static_cast<int>(Dune::SolverCategory::nonoverlapping)) )
+ {
//use attribute overlap for ghosts in novlp grids
attr = Dune::OwnerOverlapCopyAttributeSet::overlap;
}
- else {
+ else
+ {
attr = Dune::OwnerOverlapCopyAttributeSet::copy;
}
- c.indexSet().add(*index, typename C::ParallelIndexSet::LocalIndex(i-owner_.begin(), attr));
+ comm.indexSet().add(*index, typename Comm::ParallelIndexSet::LocalIndex(i-owner_.begin(), attr));
}
}
- c.indexSet().endResize();
- //std::cout<<gv.comm().rank()<<": index set size = "<<c.indexSet().size()<<std::endl;
- //std::cout<<gv.comm().rank()<<": "<<c.indexSet()<<std::endl;
+ comm.indexSet().endResize();
// Compute neighbours using communication
std::set<int> neighbours;
- NeighbourGatherScatter ngs(problem_, gridview.comm().rank(),
+ NeighbourGatherScatter ngs(mapper_, gridView_.comm().rank(),
neighbours);
- if (gridview.comm().size()>1)
- gridview.communicate(ngs,Dune::All_All_Interface,
- Dune::ForwardCommunication);
- c.remoteIndices().setNeighbours(neighbours);
- //std::cout<<gv.comm().rank()<<": no neighbours="<<neighbours.size()<<std::endl;
+ if (gridView_.comm().size() > 1)
+ gridView_.communicate(ngs, Dune::All_All_Interface,
+ Dune::ForwardCommunication);
- c.remoteIndices().template rebuild<false>();
- //std::cout<<c.remoteIndices()<<std::endl;
+ comm.remoteIndices().setNeighbours(neighbours);
+ comm.remoteIndices().template rebuild<false>();
+
+} // ParallelISTLHelper::createIndexSetAndProjectForAMG
-}
#endif // HAVE_MPI
/*!
@@ -1001,8 +1007,9 @@ void ParallelISTLHelper<TypeTag>::createIndexSetAndProjectForAMG(M& m, C& c)
template<class TypeTag, bool isParallel>
struct LinearAlgebraPreparator
{
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using AmgTraits = typename GET_PROP(TypeTag, AmgTraits);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using DofMapper = typename AmgTraits::DofMapper;
using ParallelHelper = ParallelISTLHelper<TypeTag>;
using Comm = typename AmgTraits::Comm;
using LinearOperator = typename AmgTraits::LinearOperator;
@@ -1014,7 +1021,8 @@ struct LinearAlgebraPreparator
std::shared_ptr<Comm>& comm,
std::shared_ptr<LinearOperator>& fop,
std::shared_ptr<ScalarProduct>& sp,
- const Problem& problem,
+ const GridView& gridView,
+ const DofMapper& mapper,
ParallelHelper& pHelper,
const bool firstCall)
{
@@ -1031,8 +1039,9 @@ struct LinearAlgebraPreparator
template<class TypeTag>
struct LinearAlgebraPreparator<TypeTag, true>
{
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using AmgTraits = typename GET_PROP(TypeTag, AmgTraits);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using DofMapper = typename AmgTraits::DofMapper;
using ParallelHelper = ParallelISTLHelper<TypeTag>;
using Comm = typename AmgTraits::Comm;
using LinearOperator = typename AmgTraits::LinearOperator;
@@ -1044,7 +1053,8 @@ struct LinearAlgebraPreparator<TypeTag, true>
std::shared_ptr<Comm>& comm,
std::shared_ptr<LinearOperator>& fop,
std::shared_ptr<ScalarProduct>& sp,
- const Problem& problem,
+ const GridView& gridView,
+ const DofMapper& mapper,
ParallelHelper& pHelper,
const bool firstCall)
{
@@ -1056,12 +1066,12 @@ struct LinearAlgebraPreparator<TypeTag, true>
pHelper.initGhostsAndOwners();
}
- comm = std::make_shared<Comm>(problem.gridView().comm(), category);
+ comm = std::make_shared<Comm>(gridView.comm(), category);
if(AmgTraits::isNonOverlapping)
{
// extend the matrix pattern such that it is usable for AMG
- EntityExchanger<TypeTag> exchanger(problem);
+ EntityExchanger<TypeTag> exchanger(gridView, mapper);
exchanger.getExtendedMatrix(A, pHelper);
exchanger.sumEntries(A);
}
@@ -1077,8 +1087,10 @@ struct LinearAlgebraPreparator<TypeTag, true>
pHelper.makeNonOverlappingConsistent(b);
}
}
-};
-#endif
+
+}; // parallel LinearAlgebraPreparator
+
+#endif // HAVE_MPI
} // end namespace Dumux
diff --git a/dumux/linear/amgproperties.hh b/dumux/linear/amgproperties.hh
index dbbb9780032bd7b1b1a5afcf71df3936281d1eeb..8497e99f7a16bacd53b11a30e1b29aa70ae5d7dc 100644
--- a/dumux/linear/amgproperties.hh
+++ b/dumux/linear/amgproperties.hh
@@ -26,7 +26,6 @@
#ifndef DUMUXAMGPROPERTIES_HH
#define DUMUXAMGPROPERTIES_HH
-
#include <dune/istl/schwarz.hh>
#include <dune/istl/novlpschwarz.hh>
#include <dune/istl/owneroverlapcopy.hh>
@@ -35,8 +34,9 @@
#include <dune/grid/common/capabilities.hh>
#include <dune/common/version.hh>
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/properties.hh>
+#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/mpfa/properties.hh>
#include <dumux/porousmediumflow/sequential/properties.hh>
#include <dumux/porousmediumflow/sequential/pressureproperties.hh>
#include "linearsolverproperties.hh"
@@ -56,10 +56,10 @@ template <class MType, class VType, bool isParallel>
class NonoverlappingSolverTraits
{
public:
- typedef Dune::Amg::SequentialInformation Comm;
- typedef Dune::MatrixAdapter<MType,VType,VType> LinearOperator;
- typedef Dune::SeqScalarProduct<VType> ScalarProduct;
- typedef Dune::SeqSSOR<MType,VType, VType> Smoother;
+ using Comm = Dune::Amg::SequentialInformation;
+ using LinearOperator = Dune::MatrixAdapter<MType,VType,VType>;
+ using ScalarProduct = Dune::SeqScalarProduct<VType>;
+ using Smoother = Dune::SeqSSOR<MType,VType, VType>;
};
#if HAVE_MPI
@@ -67,10 +67,10 @@ template <class MType, class VType>
class NonoverlappingSolverTraits<MType, VType, true>
{
public:
- typedef Dune::OwnerOverlapCopyCommunication<Dune::bigunsignedint<96>,int> Comm;
- typedef Dune::NonoverlappingSchwarzOperator<MType,VType, VType,Comm> LinearOperator;
- typedef Dune::NonoverlappingSchwarzScalarProduct<VType,Comm> ScalarProduct;
- typedef Dune::NonoverlappingBlockPreconditioner<Comm,Dune::SeqSSOR<MType,VType, VType> > Smoother;
+ using Comm = Dune::OwnerOverlapCopyCommunication<Dune::bigunsignedint<96>,int>;
+ using LinearOperator = Dune::NonoverlappingSchwarzOperator<MType,VType, VType,Comm>;
+ using ScalarProduct = Dune::NonoverlappingSchwarzScalarProduct<VType,Comm>;
+ using Smoother = Dune::NonoverlappingBlockPreconditioner<Comm,Dune::SeqSSOR<MType,VType, VType> >;
};
#endif
@@ -78,32 +78,34 @@ public:
SET_PROP(BoxModel, AmgTraits)
{
public:
- typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
enum {
numEq = JacobianMatrix::block_type::rows,
dofCodim = Grid::dimension,
isNonOverlapping = true,
isParallel = Dune::Capabilities::canCommunicate<Grid, dofCodim>::v
};
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::BCRSMatrix<Dune::FieldMatrix<Scalar,numEq,numEq> > MType;
- typedef Dune::BlockVector<Dune::FieldVector<Scalar,numEq> > VType;
- typedef NonoverlappingSolverTraits<MType, VType, isParallel> SolverTraits;
- typedef typename SolverTraits::Comm Comm;
- typedef typename SolverTraits::LinearOperator LinearOperator;
- typedef typename SolverTraits::ScalarProduct ScalarProduct;
- typedef typename SolverTraits::Smoother Smoother;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using MType = Dune::BCRSMatrix<Dune::FieldMatrix<Scalar,numEq,numEq> >;
+ using VType = Dune::BlockVector<Dune::FieldVector<Scalar,numEq> >;
+ using SolverTraits = NonoverlappingSolverTraits<MType, VType, isParallel>;
+ using Comm = typename SolverTraits::Comm;
+ using LinearOperator = typename SolverTraits::LinearOperator;
+ using ScalarProduct = typename SolverTraits::ScalarProduct;
+ using Smoother = typename SolverTraits::Smoother;
+
+ using DofMapper = typename GET_PROP_TYPE(TypeTag, VertexMapper);
};
template <class MType, class VType, bool isParallel>
class OverlappingSolverTraits
{
public:
- typedef Dune::Amg::SequentialInformation Comm;
- typedef Dune::MatrixAdapter<MType,VType,VType> LinearOperator;
- typedef Dune::SeqScalarProduct<VType> ScalarProduct;
- typedef Dune::SeqSSOR<MType,VType, VType> Smoother;
+ using Comm = Dune::Amg::SequentialInformation;
+ using LinearOperator = Dune::MatrixAdapter<MType,VType,VType>;
+ using ScalarProduct = Dune::SeqScalarProduct<VType>;
+ using Smoother = Dune::SeqSSOR<MType,VType, VType>;
};
#if HAVE_MPI
@@ -111,55 +113,83 @@ template <class MType, class VType>
class OverlappingSolverTraits<MType, VType, true>
{
public:
- typedef Dune::OwnerOverlapCopyCommunication<Dune::bigunsignedint<96>,int> Comm;
- typedef Dune::OverlappingSchwarzOperator<MType,VType, VType,Comm> LinearOperator;
- typedef Dune::OverlappingSchwarzScalarProduct<VType,Comm> ScalarProduct;
- typedef Dune::BlockPreconditioner<VType,VType,Comm,Dune::SeqSSOR<MType,VType, VType> > Smoother;
+ using Comm = Dune::OwnerOverlapCopyCommunication<Dune::bigunsignedint<96>,int>;
+ using LinearOperator = Dune::OverlappingSchwarzOperator<MType,VType, VType,Comm>;
+ using ScalarProduct = Dune::OverlappingSchwarzScalarProduct<VType,Comm>;
+ using Smoother = Dune::BlockPreconditioner<VType,VType,Comm,Dune::SeqSSOR<MType,VType, VType> >;
};
#endif
-//! Cell-centered: use the overlapping AMG
-SET_PROP(CCModel, AmgTraits)
+//! Cell-centered tpfa: use the overlapping AMG
+SET_PROP(CCTpfaModel, AmgTraits)
{
public:
- typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
enum {
numEq = JacobianMatrix::block_type::rows,
dofCodim = 0,
isNonOverlapping = false,
isParallel = Dune::Capabilities::canCommunicate<Grid, dofCodim>::v
};
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::BCRSMatrix<Dune::FieldMatrix<Scalar,numEq,numEq> > MType;
- typedef Dune::BlockVector<Dune::FieldVector<Scalar,numEq> > VType;
- typedef OverlappingSolverTraits<MType, VType, isParallel> SolverTraits;
- typedef typename SolverTraits::Comm Comm;
- typedef typename SolverTraits::LinearOperator LinearOperator;
- typedef typename SolverTraits::ScalarProduct ScalarProduct;
- typedef typename SolverTraits::Smoother Smoother;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using MType = Dune::BCRSMatrix<Dune::FieldMatrix<Scalar,numEq,numEq> >;
+ using VType = Dune::BlockVector<Dune::FieldVector<Scalar,numEq> >;
+ using SolverTraits = OverlappingSolverTraits<MType, VType, isParallel>;
+ using Comm = typename SolverTraits::Comm;
+ using LinearOperator = typename SolverTraits::LinearOperator;
+ using ScalarProduct = typename SolverTraits::ScalarProduct;
+ using Smoother = typename SolverTraits::Smoother;
+
+ using DofMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
+};
+
+//! Cell-centered mpfa: use the overlapping AMG
+SET_PROP(CCMpfaModel, AmgTraits)
+{
+public:
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
+ enum {
+ numEq = JacobianMatrix::block_type::rows,
+ dofCodim = 0,
+ isNonOverlapping = false,
+ isParallel = Dune::Capabilities::canCommunicate<Grid, dofCodim>::v
+ };
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using MType = Dune::BCRSMatrix<Dune::FieldMatrix<Scalar,numEq,numEq> >;
+ using VType = Dune::BlockVector<Dune::FieldVector<Scalar,numEq> >;
+ using SolverTraits = OverlappingSolverTraits<MType, VType, isParallel>;
+ using Comm = typename SolverTraits::Comm;
+ using LinearOperator = typename SolverTraits::LinearOperator;
+ using ScalarProduct = typename SolverTraits::ScalarProduct;
+ using Smoother = typename SolverTraits::Smoother;
+
+ using DofMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
};
//! Sequential model: use the overlapping AMG
SET_PROP(SequentialModel, AmgTraits)
{
public:
- typedef typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix) JacobianMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, PressureCoefficientMatrix);
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
enum {
numEq = JacobianMatrix::block_type::rows,
dofCodim = 0,
isNonOverlapping = false,
isParallel = Dune::Capabilities::canCommunicate<Grid, dofCodim>::v
};
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::BCRSMatrix<Dune::FieldMatrix<Scalar,numEq,numEq> > MType;
- typedef Dune::BlockVector<Dune::FieldVector<Scalar,numEq> > VType;
- typedef OverlappingSolverTraits<MType, VType, isParallel> SolverTraits;
- typedef typename SolverTraits::Comm Comm;
- typedef typename SolverTraits::LinearOperator LinearOperator;
- typedef typename SolverTraits::ScalarProduct ScalarProduct;
- typedef typename SolverTraits::Smoother Smoother;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using MType = Dune::BCRSMatrix<Dune::FieldMatrix<Scalar,numEq,numEq> >;
+ using VType = Dune::BlockVector<Dune::FieldVector<Scalar,numEq> >;
+ using SolverTraits = OverlappingSolverTraits<MType, VType, isParallel>;
+ using Comm = typename SolverTraits::Comm;
+ using LinearOperator = typename SolverTraits::LinearOperator;
+ using ScalarProduct = typename SolverTraits::ScalarProduct;
+ using Smoother = typename SolverTraits::Smoother;
+
+ using DofMapper = typename GET_PROP_TYPE(TypeTag, ElementMapper);
};
} // namespace Properties
diff --git a/dumux/linear/linearsolverproperties.hh b/dumux/linear/linearsolverproperties.hh
index 32bdbbb1748364ca423829baaea3873c6b47ef51..d623337becbb9ba471277e027a931cedf7d1c52f 100644
--- a/dumux/linear/linearsolverproperties.hh
+++ b/dumux/linear/linearsolverproperties.hh
@@ -36,38 +36,15 @@ namespace Properties
//! Linear solver type tag for all models.
NEW_TYPE_TAG(LinearSolverTypeTag);
-//! The type of the linear solver to be used
-NEW_PROP_TAG(LinearSolver);
-
-/*!
- * \brief Specifies the verbosity of the linear solver
- *
- * By default it is 0, i.e. it doesn't print anything. Setting this
- * property to 1 prints aggregated convergence rates, 2 prints the
- * convergence rate of every iteration of the scheme.
- */
-NEW_PROP_TAG(LinearSolverVerbosity);
-
-//! target reduction of the initial residual
-NEW_PROP_TAG(LinearSolverResidualReduction);
-
-//! maximum number of iterations of solver
-NEW_PROP_TAG(LinearSolverMaxIterations);
-
-//! relaxation parameter for the preconditioner
-NEW_PROP_TAG(LinearSolverPreconditionerRelaxation);
-
-//! number of preconditioner iterations per solver iteration
-NEW_PROP_TAG(LinearSolverPreconditionerIterations);
+///////////////////////////////////
+// Property tag declarations:
+///////////////////////////////////
//! Block level depth for the preconditioner
// Set this to more than one if the matrix to solve is nested multiple times
// e.g. for Dune::MultiTypeBlockMatrix'es.
NEW_PROP_TAG(LinearSolverPreconditionerBlockLevel);
-//! restart parameter for GMRes
-NEW_PROP_TAG(LinearSolverGMResRestart);
-
//! Size of the matrix/vector blocks
/*!
* The number of different types of equations which build the system of equations to solve
@@ -77,19 +54,15 @@ NEW_PROP_TAG(LinearSolverGMResRestart);
*/
NEW_PROP_TAG(LinearSolverBlockSize);
-SET_INT_PROP(LinearSolverTypeTag, LinearSolverVerbosity, 0);
-
-//! set the preconditioner relaxation parameter to 1.0 by default
-SET_SCALAR_PROP(LinearSolverTypeTag, LinearSolverPreconditionerRelaxation, 1.0);
-
-//! set the preconditioner iterations to 1 by default
-SET_INT_PROP(LinearSolverTypeTag, LinearSolverPreconditionerIterations, 1);
+///////////////////////////////////
+// Default values for properties:
+///////////////////////////////////
//! set the block level to 1, suitable for e.g. a simple Dune::BCRSMatrix.
SET_INT_PROP(LinearSolverTypeTag, LinearSolverPreconditionerBlockLevel, 1);
-//! set the GMRes restart parameter to 10 by default
-SET_INT_PROP(LinearSolverTypeTag, LinearSolverGMResRestart, 10);
+//! set the block size to number of equations as default
+SET_INT_PROP(LinearSolverTypeTag, LinearSolverBlockSize, GET_PROP_VALUE(TypeTag, NumEq));
} // namespace Properties
} // namespace Dumux
diff --git a/dumux/linear/matrixconverter.hh b/dumux/linear/matrixconverter.hh
index 0615754cd0968cd04a4b77018dec2f8e918e15bb..87adb0a09239b5f199bd50fb9a2e82451a7708bf 100644
--- a/dumux/linear/matrixconverter.hh
+++ b/dumux/linear/matrixconverter.hh
@@ -28,6 +28,7 @@
#include <dune/common/hybridutilities.hh>
#include <dune/istl/bvector.hh>
#include <dune/istl/bcrsmatrix.hh>
+#include <dune/istl/matrixindexset.hh>
#include <dune/istl/multitypeblockvector.hh>
#include <dune/istl/multitypeblockmatrix.hh>
diff --git a/dumux/linear/pardisobackend.hh b/dumux/linear/pardisobackend.hh
deleted file mode 100644
index 7ed7894c5e901a24479298fcb63e3b9fc2bb1563..0000000000000000000000000000000000000000
--- a/dumux/linear/pardisobackend.hh
+++ /dev/null
@@ -1,473 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Dumux solver backend the Pardiso direct solver.
- */
-#ifndef DUMUX_PARDISO_BACKEND_HH
-#define DUMUX_PARDISO_BACKEND_HH
-
-#ifdef HAVE_PARDISO
-
-#include <dune/istl/solvers.hh>
-#include <dune/istl/preconditioners.hh>
-#include <dumux/linear/linearsolverproperties.hh>
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/porousmediumflow/sequential/properties.hh>
-
-
-
-/* Change this, if your Fortran compiler does not append underscores. */
-/* e.g. the AIX compiler: #define F77_FUN(func) func */
-#ifdef AIX
-#define F77_FUN(func) func
-#else
-#define F77_FUN(func) func ## _
-#endif
-
-/* PARDISO prototype. */
-extern "C" int F77_FUN(pardisoinit)
- (void *pt, int *mtype, int *solver, int *iparm, double *dparm, int *error);
-
-extern "C" int F77_FUN(pardiso)
- (void *pt, int *maxfct, int *mnum, int *mtype, int *phase, int *n,
- double *a, int *ia, int *ja, int *perm, int *nrhs, int *iparm,
- int *msglvl, double *b, double *x, int *error, double *dparm);
-
-
-
-namespace Dumux
-{
-// forward declaration
-template<class Matrix, class Vector> class Pardiso;
-
-
-/*!
- * \ingroup Linear
- * \brief A solver backend for the Pardiso direct solver.
- *
- * See http://www.pardiso-project.org.
- */
-template <class TypeTag>
-class PardisoBackend
-{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP(TypeTag, ParameterTree) ParameterTree;
-
-public:
-
- PardisoBackend(const Problem& problem)
- {}
-
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- int verbosity = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, Verbosity);
- const int maxIter = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, MaxIterations);
- const double residReduction = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, ResidualReduction);
-
- Vector bTmp(b);
- Matrix ATemp(A);
-
- int numProcs = 1;
- using std::max;
- if (ParameterTree::tree().hasKey("Pardiso.NumProcessors"))
- numProcs = max(numProcs, GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Pardiso, NumProcessors));
-
- Pardiso<Matrix, Vector> precond(ATemp, verbosity > 0, numProcs);
-
- typedef Dune::MatrixAdapter<Matrix, Vector, Vector> MatrixAdapter;
- MatrixAdapter operatorA(ATemp);
-
- Dune::BiCGSTABSolver<Vector> solver(operatorA, precond, residReduction, maxIter, verbosity);
- // Dune::LoopSolver<Vector> solver(operatorA, precond, residReduction, maxIter, verbosity);
-
- solver.apply(x, bTmp, result_);
-
- return result_.converged;
- }
-
- const Dune::InverseOperatorResult& result() const
- {
- return result_;
- }
-
-private:
- Dune::InverseOperatorResult result_;
-
-};
-
-
-/*!
- * \brief A Pardiso preconditioner.
- *
- * Put the Pardiso direct solver into the preconditioner framework.
- */
-template<class Matrix, class Vector>
-class Pardiso : public Dune::Preconditioner<Vector, Vector>
-{
-public:
- typedef typename Matrix::RowIterator RowIterator;
- typedef typename Matrix::ColIterator ColIterator;
-
- // define the category
- enum {
- //! \brief The category the preconditioner is part of
- category=Dune::SolverCategory::sequential
- };
-
- /*! \brief Constructor.
-
- Constructor gets all parameters to operate the preconditioner.
- \param A The matrix to operate on
- \param verbose Write messages if true
- */
- Pardiso (Matrix& A, bool verbose = false, int numProcs = 1)
- : verbose_(verbose), num_procs_(numProcs)
- {
- initAndFactor(A);
- }
-
- ~Pardiso()
- {
- if (phase_ != -1)
- {
- phase_ = -1; // Release internal memory.
- int idum;
- double ddum;
-
- F77_FUN(pardiso) (pt_, &maxfct_, &mnum_, &mtype_, &phase_,
- &n_, &ddum, ia_, ja_, &idum, &nrhs_,
- iparm_, &msglvl_, &ddum, &ddum, &error_, dparm_);
- delete a_;
- delete ia_;
- delete ja_;
- }
- }
-
- /*!
- * \brief Initialize and factorize the matrix
- *
- * \param A the matrix
- */
- void initAndFactor(Matrix& A)
- {
- mtype_ = 11;
- nrhs_ = 1;
- maxfct_ = 1;
- mnum_ = 1;
- msglvl_ = 0;
- error_ = 0;
- solver_ = 0; // solver_ = 0, choose sparse direct solver, = 1 multi-recursive iterative solver
-
- RowIterator i0 = A.begin();
- ColIterator j0 = (*i0).begin();
-
- systemsize_ = (*j0).N();
- n_ = A.N()*systemsize_;
-
- int nnz = 0;
- RowIterator endi = A.end();
- int rows = 0;
- for (RowIterator i = A.begin(); i != endi; ++i)
- {
- rows++;
- ColIterator endj = (*i).end();
- for (ColIterator j = (*i).begin(); j != endj; ++j) {
- nnz += systemsize_*systemsize_;
- }
- }
- if (verbose_)
- std::cout << "Pardiso: dimension = " << n_ << ", number of nonzeros = " << nnz << std::endl;
-
- a_ = new double[nnz];
- ia_ = new int[n_+1];
- ja_ = new int[nnz];
-
- int count = 0;
- for (RowIterator i = A.begin(); i != endi; ++i)
- {
- for (int iComp = 0; iComp < systemsize_; iComp++) {
- ia_[i.index()*systemsize_ + iComp] = count+1;
- ColIterator endj = (*i).end();
- for (ColIterator j = (*i).begin(); j != endj; ++j) {
- for (int jComp = 0; jComp < systemsize_; jComp++) {
- a_[count] = (*j)[iComp][jComp];
- ja_[count] = j.index()*systemsize_ + jComp + 1;
-
- count++;
- }
- }
- }
- }
- ia_[n_] = count+1;
-
- F77_FUN(pardisoinit) (pt_, &mtype_, &solver_, iparm_, dparm_, &error_);
-
- if (error_)
- {
- switch(error_)
- {
- case -10:
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: pardisoinit failed. No license file found. Error code " << error_);
- break;
- case -11:
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: pardisoinit failed. License has expired. Error code " << error_);
- break;
- case -12:
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: pardisoinit failed. Wrong username or hostname. Error code " << error_);
- break;
- default:
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: pardisoinit failed. Error code " << error_);
- break;
- }
- }
-
- phase_ = 11;
- int idum;
- double ddum;
- iparm_[2] = num_procs_;
-
- F77_FUN(pardiso) (pt_, &maxfct_, &mnum_, &mtype_, &phase_,
- &n_, a_, ia_, ja_, &idum, &nrhs_,
- iparm_, &msglvl_, &ddum, &ddum, &error_, dparm_);
-
- if (error_ != 0)
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: Reordering failed. Error code " << error_);
-
- if (verbose_)
- std::cout << " Reordering completed. Number of nonzeros in factors = " << iparm_[17] << std::endl;
-
- phase_ = 22;
-
- F77_FUN(pardiso) (pt_, &maxfct_, &mnum_, &mtype_, &phase_,
- &n_, a_, ia_, ja_, &idum, &nrhs_,
- iparm_, &msglvl_, &ddum, &ddum, &error_, dparm_);
-
- if (error_ != 0)
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: Factorization failed. Error code " << error_);
-
- if (verbose_)
- std::cout << " Factorization completed." << std::endl;
- }
-
- /*!
- * \brief Factorize the matrix.
- *
- * \param A The matrix
- */
- void factorize (Matrix& A)
- {
- RowIterator i0 = A.begin();
- ColIterator j0 = (*i0).begin();
-
- systemsize_ = (*j0).N();
- n_ = A.N()*systemsize_;
- int nnz = 0;
- RowIterator endi = A.end();
- int rows = 0;
- for (RowIterator i = A.begin(); i != endi; ++i)
- {
- rows++;
- ColIterator endj = (*i).end();
- for (ColIterator j = (*i).begin(); j != endj; ++j) {
- nnz += systemsize_*systemsize_;
- }
- }
- if (verbose_)
- std::cout << "Pardiso: dimension = " << n_ << ", number of nonzeros = " << nnz << std::endl;
-
- a_ = new double[nnz];
- ia_ = new int[n_+1];
- ja_ = new int[nnz];
-
- int count = 0;
- for (RowIterator i = A.begin(); i != endi; ++i)
- {
- for (int iComp = 0; iComp < systemsize_; iComp++) {
- ia_[i.index()*systemsize_ + iComp] = count+1;
- ColIterator endj = (*i).end();
- for (ColIterator j = (*i).begin(); j != endj; ++j) {
- for (int jComp = 0; jComp < systemsize_; jComp++) {
- a_[count] = (*j)[iComp][jComp];
- ja_[count] = j.index()*systemsize_ + jComp + 1;
-
- count++;
- }
- }
- }
- }
- ia_[n_] = count+1;
-
- F77_FUN(pardisoinit) (pt_, &mtype_, &solver_, iparm_, dparm_, &error_);
-
- if (error_)
- {
- switch(error_)
- {
- case -10:
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: pardisoinit failed. No license file found. Error code " << error_);
- break;
- case -11:
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: pardisoinit failed. License has expired. Error code " << error_);
- break;
- case -12:
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: pardisoinit failed. Wrong username or hostname. Error code " << error_);
- break;
- default:
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: pardisoinit failed. Error code " << error_);
- break;
- }
- }
-
-
- phase_ = 11;
- int idum;
- double ddum;
- iparm_[2] = num_procs_;
-
- F77_FUN(pardiso) (pt_, &maxfct_, &mnum_, &mtype_, &phase_,
- &n_, a_, ia_, ja_, &idum, &nrhs_,
- iparm_, &msglvl_, &ddum, &ddum, &error_, dparm_);
-
- if (error_ != 0)
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: Reordering failed. Error code " << error_);
-
- if (verbose_)
- std::cout << " Reordering completed. Number of nonzeros in factors = " << iparm_[17] << std::endl;
-
- phase_ = 22;
-
- F77_FUN(pardiso) (pt_, &maxfct_, &mnum_, &mtype_, &phase_,
- &n_, a_, ia_, ja_, idum, &nrhs_,
- iparm_, &msglvl_, &ddum, &ddum, &error_, dparm_);
-
- if (error_ != 0)
- DUNE_THROW(Dune::MathError, "Constructor Pardiso: Factorization failed. Error code " << error_);
-
- if (verbose_)
- std::cout << " Factorization completed." << std::endl;
- }
-
- /*!
- * \brief Prepare the preconditioner.
- *
- * A solver solves a linear operator equation A(x)=b by applying
- * one or several steps of the preconditioner. The method pre()
- * is called before the first apply operation.
- * b and x are right hand side and solution vector of the linear
- * system respectively. It may. e.g., scale the system, allocate memory or
- * compute a (I)LU decomposition.
- * Note: The ILU decomposition could also be computed in the constructor
- * or with a separate method of the derived method if several
- * linear systems with the same matrix are to be solved.
- *
- * \param x The left hand side of the equation.
- * \param b The right hand side of the equation.
- */
- virtual void pre (Vector& x, Vector& b)
- {}
-
- /*! \brief Apply one step of the preconditioner to the system \f$ A(v)=d \f$.
- *
- * On entry \f$ v=0 \f$ and \f$ d=b-A(x) \f$ (although this might not be
- * computed in that way. On exit v contains the update, i.e
- * one step computes \f$ v = M^{-1} d \f$ where \f$ M \f$ is the
- * approximate inverse of the operator \f$ A \f$ characterizing
- * the preconditioner.
- * \param[out] v The update to be computed
- * \param d The current defect.
- */
- virtual void apply (Vector& v, const Vector& d)
- {
- phase_ = 33;
-
- iparm_[7] = 1; /* Max numbers of iterative refinement steps. */
- int idum;
- double x[n_];
- double b[n_];
- for (typename Vector::size_type i = 0; i < v.size(); i++) {
- for (int comp = 0; comp < systemsize_; comp++) {
- x[i*systemsize_ + comp] = v[i][comp];
- b[i*systemsize_ + comp] = d[i][comp];
- }
- }
-
- F77_FUN(pardiso) (pt_, &maxfct_, &mnum_, &mtype_, &phase_,
- &n_, a_, ia_, ja_, &idum, &nrhs_,
- //&n_, &ddum, &idum, &idum, &idum, &nrhs_,
- iparm_, &msglvl_, b, x, &error_, dparm_);
-
- if (error_ != 0)
- DUNE_THROW(Dune::MathError, "Pardiso.apply: Backsolve failed. Error code " << error_);
-
- for (typename Vector::size_type i = 0; i < v.size(); i++)
- for (int comp = 0; comp < systemsize_; comp++)
- v[i][comp] = x[i*systemsize_ + comp];
- }
-
- /*! \brief Clean up.
- *
- * This method is called after the last apply call for the
- * linear system to be solved. Memory may be deallocated safely
- * here. x is the solution of the linear equation.
- *
- * \param b The right hand side of the equation.
- */
- virtual void post (Vector& b)
- {
- phase_ = -1; // Release internal memory.
- int idum;
- double ddum;
-
- F77_FUN(pardiso) (pt_, &maxfct_, &mnum_, &mtype_, &phase_,
- &n_, &ddum, ia_, ja_, &idum, &nrhs_,
- iparm_, &msglvl_, &ddum, &ddum, &error_, dparm_);
- delete a_;
- delete ia_;
- delete ja_;
- }
-
-private:
- int n_; //!< dimension of the system
- double *a_; //!< matrix values
- int *ia_; //!< indices to rows
- int *ja_; //!< column indices
- int mtype_; //!< matrix type, currently only 11 (real unsymmetric matrix) is supported
- int nrhs_; //!< number of right hand sides
- void *pt_[64]; //!< internal solver memory pointer
- int iparm_[64]; //!< Pardiso control parameters.
- int maxfct_; //!< Maximum number of numerical factorizations.
- int mnum_; //!< Which factorization to use.
- int msglvl_; //!< flag to print statistical information
- int error_; //!< error flag
- bool verbose_;
- int num_procs_; //!< number of processors.
- int systemsize_;
- int phase_;
- double dparm_[64];
- int solver_;
-};
-
-}
-#else
-#warning "no Pardiso library available, reconfigure with correct --with-pardiso options"
-#endif // HAVE_PARDISO
-
-#endif // PARDISO_BACKEND
diff --git a/dumux/linear/seqsolverbackend.hh b/dumux/linear/seqsolverbackend.hh
index a729428ff8a47bad8bc9424b28b89c6881dddbf1..e14ca263852ce64196667d2619bf512a8db57fe7 100644
--- a/dumux/linear/seqsolverbackend.hh
+++ b/dumux/linear/seqsolverbackend.hh
@@ -18,10 +18,12 @@
*****************************************************************************/
/*!
* \file
- * \brief Dumux solver backend
+ * \brief Dumux sequential solver backends
*/
-#ifndef DUMUX_SOLVER_BACKEND_HH
-#define DUMUX_SOLVER_BACKEND_HH
+#ifndef DUMUX_SEQ_SOLVER_BACKEND_HH
+#define DUMUX_SEQ_SOLVER_BACKEND_HH
+
+#include <type_traits>
#include <dune/istl/preconditioners.hh>
#include <dune/istl/solvers.hh>
@@ -31,6 +33,7 @@
#include <dumux/common/parameters.hh>
#include <dumux/common/basicproperties.hh>
#include <dumux/linear/linearsolverproperties.hh>
+#include <dumux/linear/solver.hh>
namespace Dumux
{
@@ -55,67 +58,94 @@ namespace Dumux
* preconditioner is applied. In case of ILU(n), it specifies the order of the
* applied ILU.
*/
-template <class TypeTag>
-class IterativePrecondSolverBackend
+class IterativePreconditionedSolverImpl
{
public:
- template<class Preconditioner, class Solver, class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- int verbosity = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, Verbosity);
- const int maxIter = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, MaxIterations);
- const double residReduction = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, ResidualReduction);
+ template<class Preconditioner, class Solver, class SolverInterface, class Matrix, class Vector>
+ static bool solve(const SolverInterface& s, const Matrix& A, Vector& x, const Vector& b,
+ const std::string& modelParamGroup = "")
+ {
+ Preconditioner precond(A, s.precondIter(), s.relaxation());
- Vector bTmp(b);
+ // make a linear operator from a matrix
+ using MatrixAdapter = Dune::MatrixAdapter<Matrix, Vector, Vector>;
+ MatrixAdapter linearOperator(A);
- const double relaxation = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, PreconditionerRelaxation);
- const int precondIter = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, PreconditionerIterations);
+ Solver solver(linearOperator, precond, s.residReduction(), s.maxIter(), s.verbosity());
- Preconditioner precond(A, precondIter, relaxation);
+ Vector bTmp(b);
- typedef Dune::MatrixAdapter<Matrix, Vector, Vector> MatrixAdapter;
- MatrixAdapter operatorA(A);
+ Dune::InverseOperatorResult result;
+ solver.apply(x, bTmp, result);
- Solver solver(operatorA, precond, residReduction, maxIter, verbosity);
+ return result.converged;
+ }
- solver.apply(x, bTmp, result_);
+ template<class Preconditioner, class Solver, class SolverInterface, class Matrix, class Vector>
+ static bool solveWithGMRes(const SolverInterface& s, const Matrix& A, Vector& x, const Vector& b,
+ const std::string& modelParamGroup = "")
+ {
+ // get the restart threshold
+ const int restartGMRes = getParamFromGroup<double>(modelParamGroup, "LinearSolver.GMResRestart");
- return result_.converged;
- }
+ Preconditioner precond(A, s.precondIter(), s.relaxation());
- // solve with RestartedGMRes (needs restartGMRes as additional argument)
- template<class Preconditioner, class Solver, class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b, const int restartGMRes)
- {
- int verbosity = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, Verbosity);
- const int maxIter = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, MaxIterations);
- const double residReduction = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, ResidualReduction);
+ // make a linear operator from a matrix
+ using MatrixAdapter = Dune::MatrixAdapter<Matrix, Vector, Vector>;
+ MatrixAdapter linearOperator(A);
- Vector bTmp(b);
+ Solver solver(linearOperator, precond, s.residReduction(), restartGMRes, s.maxIter(), s.verbosity());
- const double relaxation = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, PreconditionerRelaxation);
- const int precondIter = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, PreconditionerIterations);
+ Vector bTmp(b);
- Preconditioner precond(A, precondIter, relaxation);
+ Dune::InverseOperatorResult result;
+ solver.apply(x, bTmp, result);
- typedef Dune::MatrixAdapter<Matrix, Vector, Vector> MatrixAdapter;
- MatrixAdapter operatorA(A);
+ return result.converged;
+ }
+
+ template<class Preconditioner, class Solver, class SolverInterface, class Matrix, class Vector>
+ static bool solveWithILU0Prec(const SolverInterface& s, const Matrix& A, Vector& x, const Vector& b,
+ const std::string& modelParamGroup = "")
+ {
+ Preconditioner precond(A, s.relaxation());
- Solver solver(operatorA, precond, residReduction, restartGMRes, maxIter, verbosity);
+ using MatrixAdapter = Dune::MatrixAdapter<Matrix, Vector, Vector>;
+ MatrixAdapter operatorA(A);
- solver.apply(x, bTmp, result_);
+ Solver solver(operatorA, precond, s.residReduction(), s.maxIter(), s.verbosity());
- return result_.converged;
- }
+ Vector bTmp(b);
- const Dune::InverseOperatorResult& result() const
- {
- return result_;
- }
+ Dune::InverseOperatorResult result;
+ solver.apply(x, bTmp, result);
-private:
- Dune::InverseOperatorResult result_;
+ return result.converged;
+ }
+
+ // solve with RestartedGMRes (needs restartGMRes as additional argument)
+ template<class Preconditioner, class Solver, class SolverInterface, class Matrix, class Vector>
+ static bool solveWithILU0PrecGMRes(const SolverInterface& s, const Matrix& A, Vector& x, const Vector& b,
+ const std::string& modelParamGroup = "")
+ {
+ // get the restart threshold
+ const int restartGMRes = getParamFromGroup<int>(modelParamGroup, "LinearSolver.GMResRestart");
+
+ Preconditioner precond(A, s.relaxation());
+
+ using MatrixAdapter = Dune::MatrixAdapter<Matrix, Vector, Vector>;
+ MatrixAdapter operatorA(A);
+
+ Solver solver(operatorA, precond, s.residReduction(), restartGMRes, s.maxIter(), s.verbosity());
+
+ Vector bTmp(b);
+
+ Dune::InverseOperatorResult result;
+ solver.apply(x, bTmp, result);
+
+ return result.converged;
+ }
};
/*!
@@ -136,24 +166,25 @@ private:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class ILUnBiCGSTABBackend: public IterativePrecondSolverBackend<TypeTag>
+class ILUnBiCGSTABBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- ILUnBiCGSTABBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqILUn<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::BiCGSTABSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqILUn<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::BiCGSTABSolver<Vector> Solver;
+ return IterativePreconditionedSolverImpl::template solve<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+ std::string name() const
+ {
+ return "ILUn preconditioned BiCGSTAB solver";
+ }
};
/*!
@@ -174,24 +205,25 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class SORBiCGSTABBackend: public IterativePrecondSolverBackend<TypeTag>
+class SORBiCGSTABBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- SORBiCGSTABBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqSOR<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::BiCGSTABSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqSOR<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::BiCGSTABSolver<Vector> Solver;
+ return IterativePreconditionedSolverImpl::template solve<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+ std::string name() const
+ {
+ return "SOR preconditioned BiCGSTAB solver";
+ }
};
/*!
@@ -212,24 +244,25 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class SSORBiCGSTABBackend: public IterativePrecondSolverBackend<TypeTag>
+class SSORBiCGSTABBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- SSORBiCGSTABBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqSSOR<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::BiCGSTABSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqSSOR<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::BiCGSTABSolver<Vector> Solver;
+ return IterativePreconditionedSolverImpl::template solve<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+ std::string name() const
+ {
+ return "SSOR preconditioned BiCGSTAB solver";
+ }
};
/*!
@@ -250,24 +283,25 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class GSBiCGSTABBackend: public IterativePrecondSolverBackend<TypeTag>
+class GSBiCGSTABBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- GSBiCGSTABBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqGS<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::BiCGSTABSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqGS<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::BiCGSTABSolver<Vector> Solver;
+ return IterativePreconditionedSolverImpl::template solve<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+ std::string name() const
+ {
+ return "SSOR preconditioned BiCGSTAB solver";
+ }
};
/*!
@@ -287,24 +321,25 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class JacBiCGSTABBackend: public IterativePrecondSolverBackend<TypeTag>
+class JacBiCGSTABBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- JacBiCGSTABBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqJac<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::BiCGSTABSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqJac<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::BiCGSTABSolver<Vector> Solver;
+ return IterativePreconditionedSolverImpl::template solve<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+ std::string name() const
+ {
+ return "Jac preconditioned BiCGSTAB solver";
+ }
};
/*!
@@ -324,24 +359,25 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class ILUnCGBackend: public IterativePrecondSolverBackend<TypeTag>
+class ILUnCGBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- ILUnCGBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqILUn<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::CGSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqILUn<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::CGSolver<Vector> Solver;
+ return IterativePreconditionedSolverImpl::template solve<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+ std::string name() const
+ {
+ return "ILUn preconditioned CG solver";
+ }
};
/*!
@@ -361,24 +397,25 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class SORCGBackend: public IterativePrecondSolverBackend<TypeTag>
+class SORCGBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- SORCGBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqSOR<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::CGSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqSOR<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::CGSolver<Vector> Solver;
+ return IterativePreconditionedSolverImpl::template solve<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+ std::string name() const
+ {
+ return "SOR preconditioned CG solver";
+ }
};
/*!
@@ -398,24 +435,25 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class SSORCGBackend: public IterativePrecondSolverBackend<TypeTag>
+class SSORCGBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- SSORCGBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqSSOR<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::CGSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqSSOR<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::CGSolver<Vector> Solver;
+ return IterativePreconditionedSolverImpl::template solve<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+ std::string name() const
+ {
+ return "SSOR preconditioned CG solver";
+ }
};
/*!
@@ -435,24 +473,25 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class GSCGBackend: public IterativePrecondSolverBackend<TypeTag>
+class GSCGBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- GSCGBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqGS<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::CGSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqGS<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::CGSolver<Vector> Solver;
+ return IterativePreconditionedSolverImpl::template solve<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+ std::string name() const
+ {
+ return "GS preconditioned CG solver";
+ }
};
/*!
@@ -471,24 +510,25 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class JacCGBackend: public IterativePrecondSolverBackend<TypeTag>
+class JacCGBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- JacCGBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqJac<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::CGSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqJac<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::CGSolver<Vector> Solver;
+ return IterativePreconditionedSolverImpl::template solve<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+ std::string name() const
+ {
+ return "GS preconditioned CG solver";
+ }
};
/*!
@@ -509,102 +549,25 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class SSORRestartedGMResBackend: public IterativePrecondSolverBackend<TypeTag>
+class SSORRestartedGMResBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- SSORRestartedGMResBackend(const Problem& problem)
- {}
-
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqSSOR<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::RestartedGMResSolver<Vector> Solver;
- const int restart = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, GMResRestart);
-
- return ParentType::template solve<Preconditioner, Solver>(A, x, b, restart);
- }
-};
-
-/*!
- * \ingroup Linear
- * \brief Base class for backend combinations of linear solvers and a ILU0 preconditioner
- *
- * This class is used as a base class for combinations of a specific linear
- * solver with the ILU(0) preconditioner. Several parameters from the group
- * LinearSolver are read to customize the solver and preconditioner:
- *
- * Verbosity: determines how verbose the linear solver should print output.
- *
- * MaxIterations: the maximum number of iterations for the linear solver.
- *
- * ResidualReduction: the threshold for declaration of convergence.
- *
- * PreconditionerRelaxation: relaxation parameter for the preconditioner.
- */
-template <class TypeTag>
-class ILU0SolverBackend
-{
-public:
-
- template<class Preconditioner, class Solver, class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- int verbosity = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, Verbosity);
- const int maxIter = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, MaxIterations);
- const double residReduction = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, ResidualReduction);
-
- Vector bTmp(b);
-
- const double relaxation = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, PreconditionerRelaxation);
-
- Preconditioner precond(A, relaxation);
-
- typedef Dune::MatrixAdapter<Matrix, Vector, Vector> MatrixAdapter;
- MatrixAdapter operatorA(A);
-
- Solver solver(operatorA, precond, residReduction, maxIter, verbosity);
-
- solver.apply(x, bTmp, result_);
-
- return result_.converged;
- }
-
- // solve with RestartedGMRes (needs restartGMRes as additional argument)
- template<class Preconditioner, class Solver, class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b, const int restartGMRes)
- {
- int verbosity = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, Verbosity);
- const int maxIter = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, MaxIterations);
- const double residReduction = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, ResidualReduction);
-
- Vector bTmp(b);
-
- const double relaxation = GET_PARAM_FROM_GROUP(TypeTag, double, LinearSolver, PreconditionerRelaxation);
-
- Preconditioner precond(A, relaxation);
-
- typedef Dune::MatrixAdapter<Matrix, Vector, Vector> MatrixAdapter;
- MatrixAdapter operatorA(A);
-
- Solver solver(operatorA, precond, residReduction, restartGMRes, maxIter, verbosity);
-
- solver.apply(x, bTmp, result_);
-
- return result_.converged;
- }
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqSSOR<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::RestartedGMResSolver<Vector>;
- const Dune::InverseOperatorResult& result() const
- {
- return result_;
- }
+ return IterativePreconditionedSolverImpl::template solveWithGMRes<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
-private:
- Dune::InverseOperatorResult result_;
+ std::string name() const
+ {
+ return "SSOR preconditioned GMRes solver";
+ }
};
/*!
@@ -624,24 +587,25 @@ private:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class ILU0BiCGSTABBackend : public ILU0SolverBackend<TypeTag>
+class ILU0BiCGSTABBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef ILU0SolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
- public:
-
- ILU0BiCGSTABBackend(const Problem& problem)
- {}
-
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqILU0<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::BiCGSTABSolver<Vector> Solver;
-
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+public:
+
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqILU0<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::BiCGSTABSolver<Vector>;
+
+ return IterativePreconditionedSolverImpl::template solveWithILU0Prec<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
+
+ std::string name() const
+ {
+ return "ILU0 preconditioned BiCGSTAB solver";
+ }
};
/*!
@@ -660,24 +624,25 @@ class ILU0BiCGSTABBackend : public ILU0SolverBackend<TypeTag>
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class ILU0CGBackend : public ILU0SolverBackend<TypeTag>
+class ILU0CGBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef ILU0SolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- ILU0CGBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqILU0<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::CGSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqILU0<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::CGSolver<Vector> Solver;
+ return IterativePreconditionedSolverImpl::template solveWithILU0Prec<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b);
- }
+ std::string name() const
+ {
+ return "ILU0 preconditioned BiCGSTAB solver";
+ }
};
/*!
@@ -697,25 +662,25 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class ILU0RestartedGMResBackend : public ILU0SolverBackend<TypeTag>
+class ILU0RestartedGMResBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef ILU0SolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- ILU0RestartedGMResBackend(const Problem& problem)
- {}
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqILU0<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::RestartedGMResSolver<Vector>;
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqILU0<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::RestartedGMResSolver<Vector> Solver;
- const int restart = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, GMResRestart);
+ return IterativePreconditionedSolverImpl::template solveWithILU0PrecGMRes<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
- return ParentType::template solve<Preconditioner, Solver>(A, x, b, restart);
- }
+ std::string name() const
+ {
+ return "ILU0 preconditioned BiCGSTAB solver";
+ }
};
/*!
@@ -736,25 +701,20 @@ public:
* See: Golub, G. H., and Van Loan, C. F. (2012). Matrix computations. JHU Press.
*/
template <class TypeTag>
-class ILUnRestartedGMResBackend : public IterativePrecondSolverBackend<TypeTag>
+class ILUnRestartedGMResBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef IterativePrecondSolverBackend<TypeTag> ParentType;
- enum { blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel) };
public:
- ILUnRestartedGMResBackend(const Problem& problem)
- {}
-
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- typedef Dune::SeqILUn<Matrix, Vector, Vector, blockLevel> Preconditioner;
- typedef Dune::RestartedGMResSolver<Vector> Solver;
- const int restart = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, GMResRestart);
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockLevel = GET_PROP_VALUE(TypeTag, LinearSolverPreconditionerBlockLevel);
+ using Preconditioner = Dune::SeqILUn<Matrix, Vector, Vector, blockLevel>;
+ using Solver = Dune::RestartedGMResSolver<Vector>;
- return ParentType::template solve<Preconditioner, Solver>(A, x, b, restart);
- }
+ return IterativePreconditionedSolverImpl::template solveWithGMRes<Preconditioner, Solver>(*this, A, x, b, paramGroup);
+ }
};
#if HAVE_SUPERLU
@@ -767,62 +727,57 @@ public:
* http://crd-legacy.lbl.gov/~xiaoye/SuperLU/
*/
template <class TypeTag>
-class SuperLUBackend
+class SuperLUBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
public:
- SuperLUBackend(const Problem& problem)
- : problem_(problem)
- {}
-
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- Vector bTmp(b);
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- enum {blockSize = GET_PROP_VALUE(TypeTag, LinearSolverBlockSize)};
- typedef typename Dune::FieldMatrix<Scalar, blockSize, blockSize> MatrixBlock;
- typedef typename Dune::BCRSMatrix<MatrixBlock> ISTLMatrix;
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockSize = GET_PROP_VALUE(TypeTag, LinearSolverBlockSize);
+ using MatrixBlock = typename Dune::FieldMatrix<double, blockSize, blockSize>;
+ using ISTLMatrix = typename Dune::BCRSMatrix<MatrixBlock>;
+ static_assert(std::is_same<Matrix, ISTLMatrix>::value, "SuperLU only works with BCRS matrices!");
- int verbosity = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, Verbosity);
- Dune::SuperLU<ISTLMatrix> solver(A, verbosity > 0);
+ Dune::SuperLU<ISTLMatrix> solver(A, this->verbosity() > 0);
- solver.apply(x, bTmp, result_);
+ Vector bTmp(b);
+ solver.apply(x, bTmp, result_);
- int size = x.size();
- for (int i = 0; i < size; i++)
- {
- for (int j = 0; j < blockSize; j++)
+ int size = x.size();
+ for (int i = 0; i < size; i++)
{
- using std::isnan;
- using std::isinf;
- if (isnan(x[i][j]) || isinf(x[i][j]))
+ for (int j = 0; j < blockSize; j++)
{
- result_.converged = false;
- break;
+ using std::isnan;
+ using std::isinf;
+ if (isnan(x[i][j]) || isinf(x[i][j]))
+ {
+ result_.converged = false;
+ break;
+ }
}
}
+
+ return result_.converged;
}
- return result_.converged;
- }
+ std::string name() const
+ {
+ return "SuperLU solver";
+ }
- const Dune::InverseOperatorResult& result() const
- {
- return result_;
- }
+ const Dune::InverseOperatorResult& result() const
+ {
+ return result_;
+ }
private:
- Dune::InverseOperatorResult result_;
- const Problem& problem_;
+ Dune::InverseOperatorResult result_;
};
#endif // HAVE_SUPERLU
-
-
#if HAVE_UMFPACK
/*!
* \ingroup Linear
@@ -833,59 +788,57 @@ private:
* http://faculty.cse.tamu.edu/davis/suitesparse.html
*/
template <class TypeTag>
-class UMFPackBackend
+class UMFPackBackend : public LinearSolver<TypeTag>
{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
public:
- UMFPackBackend(const Problem& problem)
- : problem_(problem)
- {}
-
- template<class Matrix, class Vector>
- bool solve(const Matrix& A, Vector& x, const Vector& b)
- {
- Vector bTmp(b);
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- enum {blockSize = GET_PROP_VALUE(TypeTag, LinearSolverBlockSize)};
- typedef typename Dune::FieldMatrix<Scalar, blockSize, blockSize> MatrixBlock;
- typedef typename Dune::BCRSMatrix<MatrixBlock> ISTLMatrix;
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ static const std::string paramGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ constexpr auto blockSize = GET_PROP_VALUE(TypeTag, LinearSolverBlockSize);
+ using MatrixBlock = typename Dune::FieldMatrix<double, blockSize, blockSize>;
+ using ISTLMatrix = typename Dune::BCRSMatrix<MatrixBlock>;
+ static_assert(std::is_same<Matrix, ISTLMatrix>::value, "UMFPack only works with BCRS matrices!");
- int verbosity = GET_PARAM_FROM_GROUP(TypeTag, int, LinearSolver, Verbosity);
- Dune::UMFPack<ISTLMatrix> solver(A, verbosity > 0);
+ Dune::UMFPack<ISTLMatrix> solver(A, this->verbosity() > 0);
- solver.apply(x, bTmp, result_);
+ Vector bTmp(b);
+ solver.apply(x, bTmp, result_);
- int size = x.size();
- for (int i = 0; i < size; i++)
- {
- for (int j = 0; j < blockSize; j++)
+ int size = x.size();
+ for (int i = 0; i < size; i++)
{
- using std::isnan;
- using std::isinf;
- if (isnan(x[i][j]) || isinf(x[i][j]))
+ for (int j = 0; j < blockSize; j++)
{
- result_.converged = false;
- break;
+ using std::isnan;
+ using std::isinf;
+ if (isnan(x[i][j]) || isinf(x[i][j]))
+ {
+ result_.converged = false;
+ break;
+ }
}
}
+
+ return result_.converged;
}
- return result_.converged;
- }
+ std::string name() const
+ {
+ return "UMFPack solver";
+ }
- const Dune::InverseOperatorResult& result() const
- {
- return result_;
- }
+ const Dune::InverseOperatorResult& result() const
+ {
+ return result_;
+ }
private:
- Dune::InverseOperatorResult result_;
- const Problem& problem_;
+ Dune::InverseOperatorResult result_;
};
#endif // HAVE_UMFPACK
-}
+} // end namespace Dumux
+
#endif
diff --git a/dumux/linear/solver.hh b/dumux/linear/solver.hh
new file mode 100644
index 0000000000000000000000000000000000000000..5e0299603fe513ed9412c46d813865f6516c517c
--- /dev/null
+++ b/dumux/linear/solver.hh
@@ -0,0 +1,116 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Dumux sequential solver backends
+ */
+#ifndef DUMUX_LINEAR_SOLVER_HH
+#define DUMUX_LINEAR_SOLVER_HH
+
+#include <dune/common/exceptions.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/basicproperties.hh>
+#include <dumux/linear/linearsolverproperties.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup Linear
+ * \brief Base class for linear solvers
+ */
+template <class TypeTag>
+class LinearSolver
+{
+public:
+ //! export scalar type (might be needed to set parameters from output)
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+
+ //! default constructor sets some parameters
+ LinearSolver()
+ {
+ static const std::string modelParamGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ verbosity_ = getParamFromGroup<int>(modelParamGroup, "LinearSolver.Verbosity");
+ maxIter_ = getParamFromGroup<int>(modelParamGroup, "LinearSolver.MaxIterations");
+ residReduction_ = getParamFromGroup<Scalar>(modelParamGroup, "LinearSolver.ResidualReduction");
+ relaxation_ = getParamFromGroup<Scalar>(modelParamGroup, "LinearSolver.PreconditionerRelaxation");
+ precondIter_ = getParamFromGroup<int>(modelParamGroup, "LinearSolver.PreconditionerIterations");
+ }
+
+ template<class Matrix, class Vector>
+ bool solve(const Matrix& A, Vector& x, const Vector& b)
+ {
+ DUNE_THROW(Dune::NotImplemented, "Linear solver doesn't implement a solve method!");
+ }
+
+ //! the name of the linear solver
+ std::string name() const
+ { return "unknown solver"; }
+
+ //! the verbosity level
+ int verbosity() const
+ { return verbosity_; }
+
+ //! set the verbosity level
+ void setVerbosity(int v)
+ { verbosity_ = v; }
+
+ //! the maximum number of linear solver iterations
+ int maxIter() const
+ { return maxIter_; }
+
+ //! set the maximum number of linear solver iterations
+ void setMaxIter(int i)
+ { maxIter_ = i; }
+
+ //! the linear solver residual reduction
+ Scalar residReduction() const
+ { return residReduction_; }
+
+ //! set the linear solver residual reduction
+ void setResidualReduction(Scalar r)
+ { residReduction_ = r; }
+
+ //! the linear solver relaxation factor
+ Scalar relaxation() const
+ { return relaxation_; }
+
+ //! set the linear solver relaxation factor
+ void setRelaxation(Scalar r)
+ { relaxation_ = r; }
+
+ //! the number of preconditioner iterations
+ int precondIter() const
+ { return precondIter_; }
+
+ //! set the number of preconditioner iterations
+ void setPrecondIter(int i)
+ { precondIter_ = i; }
+
+private:
+ int verbosity_;
+ int maxIter_;
+ Scalar residReduction_;
+ Scalar relaxation_;
+ int precondIter_;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistry.hh b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
index 3c37d3eeb9f50519755f190e16aaccf274a14b63..a2545cf394db19d5f2f5b617bcaebe221d900f82 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistry.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistry.hh
@@ -35,15 +35,6 @@
namespace Dumux
{
-namespace Properties
-{
-NEW_PROP_TAG(FluidSystem);
-NEW_PROP_TAG(FVElementGeometry);
-NEW_PROP_TAG(Indices);
-NEW_PROP_TAG(NumEqVector);
-NEW_PROP_TAG(VolumeVariables);
-}
-
/*!
* \brief
* The type of electrochemistry models implemented here (Ochs (2008) \cite ochs2008 or Acosta et al. (2006) \cite A3:acosta:2006 )
@@ -97,7 +88,7 @@ class ElectroChemistry
energyEqIdx = FluidSystem::numComponents //energy equation
};
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
enum { dofCodim = isBox ? GridView::dimension : 0 };
using GlobalPosition = typename Dune::FieldVector<Scalar, GridView::dimensionworld>;
@@ -118,8 +109,8 @@ public:
//correction to account for actually relevant reaction area
//current density has to be devided by the half length of the box
//\todo Do we have multiply with the electrochemically active surface area (ECSA) here instead?
- static Scalar gridYMax = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, Grid.UpperRight)[1];
- static Scalar nCellsY = GET_RUNTIME_PARAM(TypeTag, CellVector, Grid.Cells)[1];
+ static Scalar gridYMax =getParamFromGroup<GlobalPosition>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Grid.UpperRight")[1];
+ static Scalar nCellsY = getParamFromGroup<GlobalPosition>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Grid.Cells")[1];
// Warning: This assumes the reaction layer is always just one cell (cell-centered) or half a box (box) thick
const auto lengthBox = gridYMax/nCellsY;
@@ -128,7 +119,7 @@ public:
else
currentDensity *= 1.0/lengthBox;
- static Scalar transportNumberH2O = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.TransportNumberH20);
+ static Scalar transportNumberH2O = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.TransportNumberH20");
//calculation of flux terms with faraday equation
values[contiH2OEqIdx] = currentDensity/(2*Constant::F); //reaction term in reaction layer
@@ -142,10 +133,11 @@ public:
*/
static Scalar calculateCurrentDensity(const VolumeVariables &volVars)
{
- static Scalar maxIter = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.MaxIterations);
- static Scalar specificResistance = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.SpecificResistance);
- static Scalar reversibleVoltage = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.ReversibleVoltage);
- static Scalar cellVoltage = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.CellVoltage);
+ static Scalar maxIter = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.MaxIterations");
+
+ static Scalar specificResistance = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.SpecificResistance");
+ static Scalar reversibleVoltage = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.ReversibleVoltage");
+ static Scalar cellVoltage = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.CellVoltage");
//initial guess for the current density and initial newton solver parameters
Scalar currentDensity = reversibleVoltage - cellVoltage - 0.5;
@@ -210,9 +202,9 @@ private:
*/
static Scalar calculateActivationLosses_(const VolumeVariables &volVars, const Scalar currentDensity)
{
- static Scalar refO2PartialPressure = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.RefO2PartialPressure);
- static Scalar numElectrons = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.NumElectrons);
- static Scalar transferCoefficient = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.TransferCoefficient);
+ static Scalar refO2PartialPressure = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.RefO2PartialPressure");
+ static Scalar numElectrons = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.NumElectrons");
+ static Scalar transferCoefficient = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.TransferCoefficient");
//Saturation sw for Acosta calculation
Scalar sw = volVars.saturation(wPhaseIdx);
@@ -249,9 +241,9 @@ private:
*/
static Scalar calculateConcentrationLosses_(const VolumeVariables &volVars)
{
- static Scalar pO2Inlet = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.pO2Inlet);
- static Scalar numElectrons = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.NumElectrons);
- static Scalar transferCoefficient = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.TransferCoefficient);
+ static Scalar pO2Inlet = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.pO2Inlet");
+ static Scalar numElectrons = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.NumElectrons");
+ static Scalar transferCoefficient =getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.TransferCoefficient");
//Calculate preFactor
Scalar preFactor = Constant::R*volVars.temperature()/transferCoefficient/Constant::F/numElectrons;
@@ -280,10 +272,10 @@ private:
static Scalar exchangeCurrentDensity_(const VolumeVariables &volVars)
{
using std::exp;
- static Scalar activationBarrier = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.ActivationBarrier);
- static Scalar surfaceIncreasingFactor = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.SurfaceIncreasingFactor);
- static Scalar refTemperature = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.RefTemperature);
- static Scalar refCurrentDensity = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.RefCurrentDensity);
+ static Scalar activationBarrier =getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.ActivationBarrier");
+ static Scalar surfaceIncreasingFactor = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.SurfaceIncreasingFactor");
+ static Scalar refTemperature = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.RefTemperature");
+ static Scalar refCurrentDensity = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.RefCurrentDensity");
Scalar T = volVars.fluidState().temperature();
Scalar refExchangeCurrentDensity = -1.0
diff --git a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
index 45f96dd4e629742f0a4a1343f8f5d5400d7056da..92e4becacc4d068e388fff73b47a47c0390b6b1b 100644
--- a/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
+++ b/dumux/material/chemistry/electrochemistry/electrochemistryni.hh
@@ -32,14 +32,6 @@
namespace Dumux
{
-namespace Properties
-{
-NEW_PROP_TAG(FluidSystem);
-NEW_PROP_TAG(Indices);
-NEW_PROP_TAG(VolumeVariables);
-NEW_PROP_TAG(NumEqVector);
-}
-
/*!
* \brief
* Class calculating source terms and current densities for fuel cells
@@ -73,7 +65,7 @@ class ElectroChemistryNI : public ElectroChemistry<TypeTag, electroChemistryMode
energyEqIdx = FluidSystem::numComponents, //energy equation
};
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
enum { dofCodim = isBox ? GridView::dimension : 0 };
using GlobalPosition = typename Dune::FieldVector<Scalar, GridView::dimensionworld>;
@@ -94,8 +86,8 @@ public:
//correction to account for actually relevant reaction area
//current density has to be devided by the half length of the box
//\todo Do we have multiply with the electrochemically active surface area (ECSA) here instead?
- static Scalar gridYMax = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, Grid.UpperRight)[1];
- static Scalar nCellsY = GET_RUNTIME_PARAM(TypeTag, CellVector, Grid.Cells)[1];
+ static Scalar gridYMax =getParamFromGroup<GlobalPosition>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Grid.UpperRight")[1];
+ static Scalar nCellsY = getParamFromGroup<GlobalPosition>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Grid.Cells")[1];
// Warning: This assumes the reaction layer is always just one cell (cell-centered) or half a box (box) thick
const auto lengthBox = gridYMax/nCellsY;
@@ -104,9 +96,9 @@ public:
else
currentDensity *= 1.0/lengthBox;
- static Scalar transportNumberH2O = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.TransportNumberH20);
- static Scalar thermoneutralVoltage = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.ThermoneutralVoltage);
- static Scalar cellVoltage = GET_RUNTIME_PARAM(TypeTag, Scalar, ElectroChemistry.CellVoltage);
+ static Scalar transportNumberH2O = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.TransportNumberH20");
+ static Scalar thermoneutralVoltage = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.ThermoneutralVoltage");
+ static Scalar cellVoltage = getParamFromGroup<Scalar>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "ElectroChemistry.CellVoltage");
//calculation of flux terms with faraday equation
values[contiH2OEqIdx] = currentDensity/(2*Constant::F); //reaction term in reaction layer
diff --git a/dumux/material/components/component.hh b/dumux/material/components/component.hh
index be463bdec31658233e9b59b440cc6b55ffcfd6ee..ef4178b09c3c5646b1eb21c7556e596b8061fb63 100644
--- a/dumux/material/components/component.hh
+++ b/dumux/material/components/component.hh
@@ -63,13 +63,19 @@ public:
/*!
* \brief Returns true if the gas phase is assumed to be compressible
*/
- static bool gasIsCompressible()
+ static constexpr bool gasIsCompressible()
{ DUNE_THROW(Dune::NotImplemented, "Component::gasIsCompressible()"); }
+ /*!
+ * \brief Returns true if the gas phase viscostiy is constant
+ */
+ static constexpr bool gasViscosityIsConstant()
+ { DUNE_THROW(Dune::NotImplemented, "Component::gasViscosityIsConstant()"); }
+
/*!
* \brief Returns true if the gas phase is assumed to be ideal
*/
- static bool gasIsIdeal()
+ static constexpr bool gasIsIdeal()
{ DUNE_THROW(Dune::NotImplemented, "Component::gasIsCompressible()"); }
/*!
@@ -78,6 +84,12 @@ public:
static constexpr bool liquidIsCompressible()
{ DUNE_THROW(Dune::NotImplemented, "Component::liquidIsCompressible()"); }
+ /*!
+ * \brief Returns true if the liquid phase viscostiy is constant
+ */
+ static constexpr bool liquidViscosityIsConstant()
+ { DUNE_THROW(Dune::NotImplemented, "Component::liquidViscosityIsConstant()"); }
+
/*!
* \brief A human readable name for the component.
*/
diff --git a/dumux/material/components/constant.hh b/dumux/material/components/constant.hh
index 507e090cfc16983b795ac788479f8a3540fa4c9c..1b90313aa9b59d267b24e024156bce1bcea04e9b 100644
--- a/dumux/material/components/constant.hh
+++ b/dumux/material/components/constant.hh
@@ -19,37 +19,17 @@
/*!
* \file
* \ingroup Components
- * \brief Setting constant fluid properties via the input file for testing purposes.
+ * \brief Setting constant fluid properties via the input file.
*/
-#ifndef DUMUX_CONSTANT_HH
-#define DUMUX_CONSTANT_HH
+#ifndef DUMUX_COMPONENTS_CONSTANT_HH
+#define DUMUX_COMPONENTS_CONSTANT_HH
+#include <dune/common/deprecated.hh>
#include <dumux/common/parameters.hh>
-#include <dumux/common/basicproperties.hh>
-
#include "component.hh"
-namespace Dumux
-{
-
-namespace Properties
-{
-// forward declaration of the needed properties
-NEW_PROP_TAG(ProblemMolarMass);
-NEW_PROP_TAG(ProblemLiquidDensity);
-NEW_PROP_TAG(ProblemLiquidKinematicViscosity);
-NEW_PROP_TAG(ProblemGasDensity);
-NEW_PROP_TAG(ProblemGasKinematicViscosity);
-NEW_PROP_TAG(ComponentName);
-
-// set default values
-SET_SCALAR_PROP(NumericModel, ProblemMolarMass, 1.0);
-SET_SCALAR_PROP(NumericModel, ProblemLiquidDensity, 1.0);
-SET_SCALAR_PROP(NumericModel, ProblemLiquidKinematicViscosity, 1.0);
-SET_SCALAR_PROP(NumericModel, ProblemGasDensity, 1.0);
-SET_SCALAR_PROP(NumericModel, ProblemGasKinematicViscosity, 1.0);
-SET_STRING_PROP(NumericModel, ComponentName, "c");
-} // end namespace Properties
+namespace Dumux {
+namespace Components {
/*!
* \ingroup Components
@@ -57,20 +37,57 @@ SET_STRING_PROP(NumericModel, ComponentName, "c");
* \brief A component which returns run time specified values
* for all fluid properties.
*
+ * \tparam id The id used to read from the input file / parametertree
* \tparam Scalar The type used for scalar values
+ *
+ * \note For the constant component with id=1 you would specify the parameters in the input file as follows
+ * \code{.ini}
+ * [1.Component]
+ * MolarMass = 0.018 # kg/mol
+ * \endcode
+ * \note If you only have one component you can also leaf out the "1.".
*/
-template<class TypeTag, class Scalar>
-class Constant : public Component<Scalar, Constant<TypeTag, Scalar> >
+template<int id, class Scalar>
+class Constant : public Component<Scalar, Constant<id, Scalar> >
{
public:
+ /*!
+ * \brief Returns true if the gas phase is assumed to be compressible
+ */
+ static constexpr bool gasIsCompressible()
+ { return false; }
+
+ /*!
+ * \brief Returns true if the gas phase viscostiy is constant
+ */
+ static constexpr bool gasViscosityIsConstant()
+ { return true; }
+
+ /*!
+ * \brief Returns true if the gas phase is assumed to be ideal
+ */
+ static constexpr bool gasIsIdeal()
+ { return true; }
+
+ /*!
+ * \brief Returns true if the liquid phase is assumed to be compressible
+ */
+ static constexpr bool liquidIsCompressible()
+ { return false; }
+
+ /*!
+ * \brief Returns true if the liquid phase viscostiy is constant
+ */
+ static constexpr bool liquidViscosityIsConstant()
+ { return true; }
+
/*!
* \brief A human readable name for the component.
*/
static const std::string& name()
{
- static const std::string name
- = GET_PARAM_FROM_GROUP(TypeTag, std::string, Component, Name);
+ static const std::string name = getParamFromGroup<std::string>(std::to_string(id), "Component.Name", "component");
return name;
}
@@ -79,17 +96,10 @@ public:
*/
static Scalar molarMass()
{
- static const Scalar molarMass
- = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, MolarMass);
+ static const Scalar molarMass = getParamFromGroup<Scalar>(std::to_string(id), "Component.MolarMass", 1.0);
return molarMass;
}
- /*!
- * \brief Returns true if the liquid phase is assumed to be compressible
- */
- static constexpr bool liquidIsCompressible()
- { return false; }
-
/*!
* \brief Sets the liquid density in \f$\mathrm{[kg/m^3]}\f$.
*
@@ -98,8 +108,7 @@ public:
*/
static Scalar liquidDensity(Scalar temperature, Scalar pressure)
{
- static const Scalar density
- = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, LiquidDensity);
+ static const Scalar density = getParamFromGroup<Scalar>(std::to_string(id), "Component.LiquidDensity", 1.0);
return density;
}
@@ -114,18 +123,10 @@ public:
*/
static Scalar liquidViscosity(Scalar temperature, Scalar pressure)
{
- static const Scalar kinematicViscosity
- = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, LiquidKinematicViscosity);
+ static const Scalar kinematicViscosity = getParamFromGroup<Scalar>(std::to_string(id), "Component.LiquidKinematicViscosity", 1.0);
return kinematicViscosity * liquidDensity(temperature, pressure);
}
-
- /*!
- * \brief Returns true if the gas phase is assumed to be compressible
- */
- static bool gasIsCompressible()
- { return false; }
-
/*!
* \brief Sets the gas density in \f$\mathrm{[kg/m^3]}\f$.
*
@@ -134,8 +135,7 @@ public:
*/
static Scalar gasDensity(Scalar temperature, Scalar pressure)
{
- static const Scalar density
- = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, GasDensity);
+ static const Scalar density = getParamFromGroup<Scalar>(std::to_string(id), "Component.GasDensity", 1.0);
return density;
}
@@ -150,12 +150,16 @@ public:
*/
static Scalar gasViscosity(Scalar temperature, Scalar pressure)
{
- static const Scalar kinematicViscosity
- = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, GasKinematicViscosity);
+ static const Scalar kinematicViscosity = getParamFromGroup<Scalar>(std::to_string(id), "Component.GasKinematicViscosity", 1.0);
return kinematicViscosity * gasDensity(temperature, pressure);
}
};
-} // end namespace
+} // end namespace Components
+
+template<class TypeTag, class Scalar>
+using Constant DUNE_DEPRECATED_MSG("Use Components::Constant<id, Scalar> instead") = Dumux::Components::Constant<1, Scalar>;
+
+} // end namespace Dumux
-#endif // DUMUX_CONSTANT_HH
+#endif // DUMUX_COMPONENTS_CONSTANT_HH
diff --git a/dumux/material/components/simpleh2o.hh b/dumux/material/components/simpleh2o.hh
index a5540e9499c2f08982cdf0235c5689007a5818aa..568705d6f261994002648039ffdba8c8dd0700d5 100644
--- a/dumux/material/components/simpleh2o.hh
+++ b/dumux/material/components/simpleh2o.hh
@@ -184,7 +184,7 @@ public:
/*!
* \brief Returns true if the gas phase is assumed to be compressible
*/
- static bool gasIsCompressible()
+ static constexpr bool gasIsCompressible()
{ return true; }
/*!
@@ -193,6 +193,18 @@ public:
static constexpr bool liquidIsCompressible()
{ return false; }
+ /*!
+ * \brief Returns true if the gas phase viscostiy is constant
+ */
+ static constexpr bool gasViscosityIsConstant()
+ { return true; }
+
+ /*!
+ * \brief Returns true if the liquid phase viscostiy is constant
+ */
+ static constexpr bool liquidViscosityIsConstant()
+ { return true; }
+
/*!
* \brief The density \f$\mathrm{[kg/m^3]}\f$ of steam at a given pressure and temperature.
*
diff --git a/dumux/material/components/unit.hh b/dumux/material/components/unit.hh
index b623fcd8109fa0afda258ed1654aad88665bc559..807653b60843b9dc0bbbffc70e6c85fc1ae2e2d4 100644
--- a/dumux/material/components/unit.hh
+++ b/dumux/material/components/unit.hh
@@ -24,6 +24,7 @@
#ifndef DUMUX_UNIT_HH
#define DUMUX_UNIT_HH
+#include <dune/common/deprecated.hh>
#include "component.hh"
namespace Dumux
@@ -36,7 +37,8 @@ namespace Dumux
* \tparam Scalar The type used for scalar values
*/
template <class Scalar>
-class Unit : public Component<Scalar, Unit<Scalar> >
+class DUNE_DEPRECATED_MSG("Use Components::Constant<id, Scalar> instead. The default is a unit fluid system.")
+Unit : public Component<Scalar, Unit<Scalar> >
{
public:
diff --git a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
index 426ca41f98495c9a9448e2decf92dff4a3538c1c..d8f552d806d4ca54bf44ea4fd121d67575f3182e 100644
--- a/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
+++ b/dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh
@@ -220,14 +220,33 @@ public:
*/
static Scalar dpc_dswe(const Params ¶ms, Scalar swe)
{
- // derivative of the regualarization
- if (swe < params.pcLowSw()) {
+ // retrieve the low and the high threshold saturations for the
+ // unregularized capillary pressure curve from the parameters
+ const Scalar swThLow = params.pcLowSw();
+ const Scalar swThHigh = params.pcHighSw();
+
+ // derivative of the regularization
+ if (swe < swThLow) {
// the slope of the straight line used in pc()
return mLow_(params);
}
- else if (swe > params.pcHighSw()) {
- // the slope of the straight line used in pc()
- return mHigh_(params);
+ else if (swe > swThHigh)
+ {
+ Scalar yTh = VanGenuchten::pc(params, swThHigh);
+ Scalar m1 = (0.0 - yTh)/(1.0 - swThHigh)*2;
+
+ if (swe < 1.0) {
+ // use spline between threshold swe and 1.0
+ Scalar mTh = VanGenuchten::dpc_dswe(params, swThHigh);
+ Spline<Scalar> sp(swThHigh, 1.0, // x0, x1
+ yTh, 0, // y0, y1
+ mTh, m1); // m0, m1
+ return sp.evalDerivative(swe);
+ }
+ else {
+ // straight line for swe > 1.0
+ return m1;
+ }
}
return VanGenuchten::dpc_dswe(params, swe);
@@ -248,6 +267,7 @@ public:
*/
static Scalar dswe_dpc(const Params ¶ms, Scalar pc)
{
+ // TODO: This is most probably still buggy!!
// calculate the saturation which corrosponds to the
// saturation in the non-regularized verision of van
// Genuchten's law
@@ -306,6 +326,40 @@ public:
return VanGenuchten::krw(params, swe);
}
+ /*!
+ * \brief A regularized version of the derivative of the relative
+ * permeability for the wetting phase in regard to the wetting
+ * saturation of the medium implied by the van Genuchten parameterization.
+ *
+ \copydetails VanGenuchten::dkrw_dswe()
+ */
+ static Scalar dkrw_dswe(const Params ¶ms, Scalar swe)
+ {
+ // retrieve the high threshold saturation for the
+ // unregularized relative permeability curve of the wetting
+ // phase from the parameters
+ const Scalar swThHigh = params.krwHighSw();
+
+ // derivative of the regualarization
+ if (swe < 0) {
+ // the slope is zero
+ return 0.0;
+ }
+ else if (swe > 1 - std::numeric_limits<Scalar>::epsilon()) {
+ // the slope is zero
+ return 0.0;
+ }
+ else if (swe > swThHigh) {
+ typedef Dumux::Spline<Scalar> Spline;
+ Spline sp(swThHigh, 1.0, // x1, x2
+ VanGenuchten::krw(params, swThHigh), 1.0, // y1, y2
+ VanGenuchten::dkrw_dswe(params, swThHigh), 0); // m1, m2
+ return sp.evalDerivative(swe);
+ }
+
+ return VanGenuchten::dkrw_dswe(params, swe);
+ }
+
/*!
* \brief Regularized version of the relative permeability
* for the non-wetting phase of
@@ -342,6 +396,35 @@ public:
return VanGenuchten::krn(params, swe);
}
+ /*!
+ * \brief A regularized version of the derivative of the relative permeability
+ * for the non-wetting phase in regard to the wetting saturation of
+ * the medium as implied by the van Genuchten parameterization.
+ *
+ \copydetails VanGenuchten::dkrw_dswe()
+ */
+ static Scalar dkrn_dswe(const Params ¶ms, Scalar swe)
+ {
+ // retrieve the low threshold saturation for the unregularized
+ // relative permeability curve of the non-wetting phase from
+ // the parameters
+ const Scalar swThLow = params.krnLowSw();
+
+ if (swe <= 0)
+ return 0.0;
+ else if (swe >= 1)
+ return 0.0;
+ else if (swe < swThLow) {
+ typedef Dumux::Spline<Scalar> Spline;
+ Spline sp(0.0, swThLow, // x1, x2
+ 1.0, VanGenuchten::krn(params, swThLow), // y1, y2
+ 0.0, VanGenuchten::dkrn_dswe(params, swThLow)); // m1, m2
+ return sp.evalDerivative(swe);
+ }
+
+ return VanGenuchten::dkrn_dswe(params, swe);
+ }
+
private:
// the slope of the straight line used to regularize saturations
// below the minimum saturation
diff --git a/dumux/material/fluidsystems/1p.hh b/dumux/material/fluidsystems/1p.hh
index 52184fa87b459fe7b7e3aa49f3982b3534907777..c5cc7303c2996a17d5b6b33b08a40b78075719cc 100644
--- a/dumux/material/fluidsystems/1p.hh
+++ b/dumux/material/fluidsystems/1p.hh
@@ -87,7 +87,7 @@ public:
*
* \param phaseIdx The index of the fluid phase to consider
*/
- static bool isLiquid(int phaseIdx)
+ static constexpr bool isLiquid(int phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
@@ -111,6 +111,16 @@ public:
return Fluid::isCompressible();
}
+ /*!
+ * \brief Returns true if the fluid viscosity is constant
+ */
+ static constexpr bool viscosityIsConstant(int phaseIdx)
+ {
+ assert(0 <= phaseIdx && phaseIdx < numPhases);
+
+ return Fluid::viscosityIsConstant();
+ }
+
/*!
* \brief Returns true if and only if a fluid phase is assumed to
* be an ideal mixture.
@@ -139,7 +149,7 @@ public:
*
* \param phaseIdx The index of the fluid phase to consider
*/
- static bool isIdealGas(int phaseIdx)
+ static constexpr bool isIdealGas(int phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
diff --git a/dumux/material/fluidsystems/base.hh b/dumux/material/fluidsystems/base.hh
index cc2a54f611113a6bee9e2016301ea448768cf018..4fe6af8cb0da6f421fa9295f999c0f713ee1ec68 100644
--- a/dumux/material/fluidsystems/base.hh
+++ b/dumux/material/fluidsystems/base.hh
@@ -92,7 +92,7 @@ public:
*
* \param phaseIdx The index of the fluid phase to consider
*/
- static constexpr std::string phaseName(int phaseIdx)
+ static std::string phaseName(int phaseIdx)
{ return "DefaultPhaseName"; }
/*!
@@ -100,7 +100,7 @@ public:
*
* \param phaseIdx The index of the fluid phase to consider
*/
- static constexpr std::string componentName(int phaseIdx)
+ static std::string componentName(int phaseIdx)
{ return "DefaultComponentName"; }
/*!
diff --git a/dumux/material/fluidsystems/liquidphase.hh b/dumux/material/fluidsystems/liquidphase.hh
index 41bb8e697b90e9e60266ff617d75316399b89a7e..d5c699b39e326d6db3b33b278aabd534610e8852 100644
--- a/dumux/material/fluidsystems/liquidphase.hh
+++ b/dumux/material/fluidsystems/liquidphase.hh
@@ -114,6 +114,12 @@ public:
static constexpr bool isCompressible(int phaseIdx = 0)
{ return Component::liquidIsCompressible(); }
+ /*!
+ * \brief Returns true if the fluid viscosity is constant
+ */
+ static constexpr bool viscosityIsConstant(int phaseIdx = 0)
+ { return Component::liquidViscosityIsConstant(); }
+
/*!
* \brief Returns true if the fluid is assumed to be an ideal gas
*/
diff --git a/dumux/material/spatialparams/fv1p.hh b/dumux/material/spatialparams/fv1p.hh
index 2fb76a3325bd3c79463e365e417646fec6e10b47..622be593161b31da140ec61d62ffbf51c91369fd 100644
--- a/dumux/material/spatialparams/fv1p.hh
+++ b/dumux/material/spatialparams/fv1p.hh
@@ -71,11 +71,6 @@ public:
FVSpatialParamsOneP(const GridView &gridView)
{
}
-
- ~FVSpatialParamsOneP()
- {
- }
-
/*!
* \brief Averages the intrinsic permeability (Scalar).
* \param K1 intrinsic permeability of the first element
diff --git a/dumux/material/spatialparams/gstatrandomfield.hh b/dumux/material/spatialparams/gstatrandomfield.hh
index fbe0924f757563a7d072c36504f13d395019d3eb..c6c51b8aea3da2ddc286f24bcf2888fcff829c65 100644
--- a/dumux/material/spatialparams/gstatrandomfield.hh
+++ b/dumux/material/spatialparams/gstatrandomfield.hh
@@ -71,14 +71,11 @@ public:
*
* \param gridView the used gridView
*/
- GstatRandomField(const GridView& gridView)
- : gridView_(gridView),
-#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
- elementMapper_(gridView, Dune::mcmgElementLayout()),
-#else
- elementMapper_(gridView),
-#endif
- data_(gridView.size(0)) {}
+ GstatRandomField(const GridView& gridView, const ElementMapper& elementMapper)
+ : gridView_(gridView)
+ , elementMapper_(elementMapper)
+ , data_(gridView.size(0))
+ {}
/*!
* \brief Creates a new field with random variables, if desired.
@@ -171,11 +168,17 @@ public:
}
//! \brief Return an entry of the data vector
- Scalar data(const Element& e)
+ Scalar data(const Element& e) const
{
return data_[elementMapper_.index(e)];
}
+ //! \brief Return the data vector for analysis or external vtk output
+ const DataVector& data() const
+ {
+ return data_;
+ }
+
//! \brief Write the data to a vtk file
void writeVtk(const std::string& vtkName,
const std::string& dataName = "data") const
@@ -195,12 +198,12 @@ public:
}
private:
- GridView gridView_;
- ElementMapper elementMapper_;
+ const GridView gridView_;
+ const ElementMapper& elementMapper_;
DataVector data_;
FieldType fieldType_;
};
-}
+} // end namespace Dumux
#endif
diff --git a/dumux/material/spatialparams/implicit.hh b/dumux/material/spatialparams/implicit.hh
index 60ef3ef69fa0adb44d7ca20df6897675d1ef0d90..a36e9276e61f4efd33e42fe389063325f03794cd 100644
--- a/dumux/material/spatialparams/implicit.hh
+++ b/dumux/material/spatialparams/implicit.hh
@@ -62,8 +62,8 @@ class ImplicitSpatialParams: public ImplicitSpatialParamsOneP<TypeTag>
using GlobalPosition = Dune::FieldVector<CoordScalar,dimWorld>;
public:
- ImplicitSpatialParams(const Problem &problem, const GridView &gridView)
- : ImplicitSpatialParamsOneP<TypeTag>(problem, gridView)
+ ImplicitSpatialParams(const Problem& problem)
+ : ImplicitSpatialParamsOneP<TypeTag>(problem)
{}
/*!
@@ -78,7 +78,7 @@ public:
const SubControlVolume& scv,
const ElementSolutionVector& elemSol) const
{
- return asImp_().materialLawParamsAtPos(scv.center());
+ return this->asImp_().materialLawParamsAtPos(scv.center());
}
/*!
@@ -93,13 +93,6 @@ public:
"The spatial parameters do not provide "
"a materialLawParamsAtPos() method.");
}
-
-private:
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
-
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
};
} // namespace Dumux
diff --git a/dumux/material/spatialparams/implicit1p.hh b/dumux/material/spatialparams/implicit1p.hh
index 79268057fbac4d563013c4303ee4857915a640e1..493f07aaffcb6fc4775beffa7c05b2d97b7c899c 100644
--- a/dumux/material/spatialparams/implicit1p.hh
+++ b/dumux/material/spatialparams/implicit1p.hh
@@ -29,22 +29,14 @@
#include <dumux/common/propertysystem.hh>
#include <dumux/common/math.hh>
-#include <dumux/implicit/properties.hh>
-
#include <dune/common/fmatrix.hh>
namespace Dumux {
-// forward declaration of property tags
-namespace Properties {
-NEW_PROP_TAG(SpatialParams);
-NEW_PROP_TAG(SpatialParamsForchCoeff);
-}
/*!
* \ingroup SpatialParameters
*/
-
/**
* \brief The base class for spatial parameters of one-phase problems
* using a fully implicit discretization method.
@@ -68,7 +60,7 @@ class ImplicitSpatialParamsOneP
using GlobalPosition = Dune::FieldVector<CoordScalar,dimWorld>;
public:
- ImplicitSpatialParamsOneP(const Problem& problem, const GridView &gridView)
+ ImplicitSpatialParamsOneP(const Problem& problem)
: problemPtr_(&problem)
{}
@@ -306,18 +298,20 @@ public:
return forchCoeff;
}
- const Problem& problem()
+ //! The problem we are associated with
+ const Problem& problem() const
{
return *problemPtr_;
}
-private:
+protected:
Implementation &asImp_()
{ return *static_cast<Implementation*>(this); }
const Implementation &asImp_() const
{ return *static_cast<const Implementation*>(this); }
+private:
const Problem *problemPtr_;
};
diff --git a/dumux/mixeddimension/embedded/cellcentered/bboxtreecouplingmanager.hh b/dumux/mixeddimension/embedded/cellcentered/bboxtreecouplingmanager.hh
index a8ed791ae2e2e6d6907998d60f2a91e14efb72c1..29adbfbfee78dc6648e77169f4f44fdfa41d4f53 100644
--- a/dumux/mixeddimension/embedded/cellcentered/bboxtreecouplingmanager.hh
+++ b/dumux/mixeddimension/embedded/cellcentered/bboxtreecouplingmanager.hh
@@ -492,7 +492,7 @@ public:
fvGeometry.bindElement(element);
BulkVolumeVariables volVars;
- volVars.update(BulkElementSolutionVector({bulkPriVars}),
+ volVars.update(BulkElementSolutionVector(bulkPriVars),
bulkProblem(),
element,
fvGeometry.scv(data.bulkElementIdx()));
diff --git a/dumux/mixeddimension/embedded/cellcentered/bboxtreecouplingmanagersimple.hh b/dumux/mixeddimension/embedded/cellcentered/bboxtreecouplingmanagersimple.hh
index 030eec9cfbe4cd1bb151fbd714e7b1b09e5adba7..4e30e1cd745d06791c4bda54290bbbadd0da4e8b 100644
--- a/dumux/mixeddimension/embedded/cellcentered/bboxtreecouplingmanagersimple.hh
+++ b/dumux/mixeddimension/embedded/cellcentered/bboxtreecouplingmanagersimple.hh
@@ -424,7 +424,7 @@ public:
fvGeometry.bindElement(element);
BulkVolumeVariables volVars;
- volVars.update(BulkElementSolutionVector({bulkPriVars}),
+ volVars.update(BulkElementSolutionVector(bulkPriVars),
bulkProblem(),
element,
fvGeometry.scv(data.bulkElementIdx()));
@@ -443,7 +443,7 @@ public:
fvGeometry.bindElement(element);
LowDimVolumeVariables volVars;
- volVars.update(LowDimElementSolutionVector({lowDimPriVars}),
+ volVars.update(LowDimElementSolutionVector(lowDimPriVars),
lowDimProblem(),
element,
fvGeometry.scv(data.lowDimElementIdx()));
diff --git a/dumux/mixeddimension/facet/mpfa/properties.hh b/dumux/mixeddimension/facet/mpfa/properties.hh
index 5b8104083a17a29b35ebd3d6c589730655635b99..78fad39a0f17e9e4a17f1a6f796caf3381a1713e 100644
--- a/dumux/mixeddimension/facet/mpfa/properties.hh
+++ b/dumux/mixeddimension/facet/mpfa/properties.hh
@@ -26,8 +26,6 @@
#ifndef DUMUX_FACET_MIXEDDIMENSION_PROPERTIES_HH
#define DUMUX_FACET_MIXEDDIMENSION_PROPERTIES_HH
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-
#include <dumux/mixeddimension/subproblemproperties.hh>
#include <dumux/mixeddimension/facet/mpfa/interactionvolume.hh>
#include <dumux/mixeddimension/facet/mpfa/interiorboundarydata.hh>
diff --git a/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh b/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
deleted file mode 100644
index f3422f812ddda6061f52a8b3bf0fcba1ce79b612..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh
+++ /dev/null
@@ -1,161 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Extending the TwoPTwoCNILocalResidual by the required functions for
- * a coupled application.
- */
-#ifndef DUMUX_2P2CNI_COUPLING_LOCAL_RESIDUAL_HH
-#define DUMUX_2P2CNI_COUPLING_LOCAL_RESIDUAL_HH
-
-#include <dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh>
-#include <dumux/porousmediumflow/2p2c/implicit/indices.hh>
-#include <dumux/porousmediumflow/2p2c/implicit/properties.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup ImplicitLocalResidual
- * \ingroup TwoPTwoCNIStokesTwoCNIModel
- * \ingroup TwoPTwoCNIZeroEqTwoCNIModel
- * \brief Extending the TwoPTwoCNILocalResidual by the required functions for
- * a coupled application.
- */
-template<class TypeTag>
-class TwoPTwoCNICouplingLocalResidual : public NILocalResidual<TypeTag>
-{
- typedef NILocalResidual<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum { dim = GridView::dimension };
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
- enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
- enum { useMoles = GET_PROP_VALUE(TypeTag, UseMoles) };
- enum { nPhaseIdx = Indices::nPhaseIdx };
- enum { wCompIdx = Indices::wCompIdx, };
- enum {
- massBalanceIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx),
- contiWEqIdx = Indices::contiWEqIdx,
- energyEqIdx = Indices::energyEqIdx
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef Dune::BlockVector<Dune::FieldVector<Scalar,1> > ElementFluxVector;
-
- typedef Dune::FieldVector<Scalar, dim> DimVector;
-
-public:
- /*!
- * \brief Implementation of the boundary evaluation for the Darcy model
- *
- * Evaluate one part of the Dirichlet-like coupling conditions for a single
- * sub-control volume face; rest is done in the local coupling operator
- */
- void evalBoundary_()
- {
- ParentType::evalBoundary_();
-
- typedef Dune::ReferenceElements<Scalar, dim> ReferenceElements;
- typedef Dune::ReferenceElement<Scalar, dim> ReferenceElement;
- const ReferenceElement &refElement = ReferenceElements::general(this->element_().geometry().type());
-
- for (int scvIdx = 0; scvIdx < this->fvGeometry_().numScv; scvIdx++)
- {
- // consider only SCVs on the boundary
- if (this->fvGeometry_().subContVol[scvIdx].inner)
- continue;
-
- // evaluate boundary conditions for the intersections of the current element
- for (const auto& intersection : intersections(this->gridView_(), this->element_()))
- {
- // handle only intersections on the boundary
- if (!intersection.boundary())
- continue;
-
- // assemble the boundary for all vertices of the current face
- const int fIdx = intersection.indexInInside();
- const int numFaceVertices = refElement.size(fIdx, 1, dim);
-
- // loop over the single vertices on the current face
- for (int faceVertexIdx = 0; faceVertexIdx < numFaceVertices; ++faceVertexIdx)
- {
- // only evaluate, if we consider the same face vertex as in the outer
- // loop over the element vertices
- if (refElement.subEntity(fIdx, 1, faceVertexIdx, dim) != scvIdx)
- continue;
-
- const VolumeVariables &volVars = this->curVolVars_()[scvIdx];
-
- // set pressure as part of the momentum coupling
- if (this->bcTypes_(scvIdx).isCouplingDirichlet(massBalanceIdx))
- this->residual_[scvIdx][massBalanceIdx] = volVars.pressure(nPhaseIdx);
-
- // set mass/mole fraction for transported component
- static_assert(GET_PROP_VALUE(TypeTag, NumComponents) == 2,
- "This coupling condition is only implemented for two components.");
- if (this->bcTypes_(scvIdx).isCouplingDirichlet(contiWEqIdx))
- {
- if (useMoles)
- this->residual_[scvIdx][contiWEqIdx] = volVars.moleFraction(nPhaseIdx, wCompIdx);
- else
- this->residual_[scvIdx][contiWEqIdx] = volVars.massFraction(nPhaseIdx, wCompIdx);
- }
-
- // set temperature
- if (this->bcTypes_(scvIdx).isCouplingDirichlet(energyEqIdx))
- this->residual_[scvIdx][energyEqIdx] = volVars.temperature();
- }
- }
- }
- }
-
- /*!
- * \brief Evaluates the time derivative of the storage term
- *
- * \param storage The vector in which the result is written
- * \param scvIdx The sub-control-volume index
- */
- void evalStorageDerivative(PrimaryVariables &storage, const int scvIdx) const
- {
- PrimaryVariables result;
- this->computeStorage(result, scvIdx, false);
- Valgrind::CheckDefined(result);
- storage = result;
- this->computeStorage(result, scvIdx, true);
- Valgrind::CheckDefined(result);
- storage -= result;
-
- storage *= this->fvGeometry_().subContVol[scvIdx].volume
- / this->problem_().timeManager().timeStepSize()
- * this->curVolVars_(scvIdx).extrusionFactor();
- }
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_2P2CNI_COUPLING_LOCAL_RESIDUAL_HH
diff --git a/dumux/multidomain/2cnistokes2p2cni/CMakeLists.txt b/dumux/multidomain/2cnistokes2p2cni/CMakeLists.txt
deleted file mode 100644
index 2756ffc388598803c3ff13d699e2db7855f77609..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cnistokes2p2cni/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#install headers
-install(FILES
-localoperator.hh
-properties.hh
-propertydefaults.hh
-2p2cnicouplinglocalresidual.hh
-stokesncnicouplinglocalresidual.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/multidomain/2cnistokes2p2cni)
diff --git a/dumux/multidomain/2cnistokes2p2cni/localoperator.hh b/dumux/multidomain/2cnistokes2p2cni/localoperator.hh
deleted file mode 100644
index 8db004ebf0da080ce377b01a3f257a5cb7f77e6c..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cnistokes2p2cni/localoperator.hh
+++ /dev/null
@@ -1,357 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief This local operator extends the 2cstokes2p2clocaloperator
- * by non-isothermal conditions.
- */
-#ifndef DUMUX_TWOCNISTOKES2P2CNILOCALOPERATOR_HH
-#define DUMUX_TWOCNISTOKES2P2CNILOCALOPERATOR_HH
-
-#include <dumux/multidomain/2cstokes2p2c/localoperator.hh>
-
-namespace Dumux {
-
-/*!
- * \ingroup TwoPTwoCNIStokesTwoCNIModel
- * \ingroup TwoPTwoCNIZeroEqTwoCNIModel
- * \brief The extension of the local operator for the coupling of a two-component Stokes model
- * and a two-phase two-component Darcy model for non-isothermal conditions.
- *
- * This model implements the coupling between a free-flow model
- * and a porous-medium flow model under non-isothermal conditions.
- * Here the coupling conditions for the individual balance are presented:
- *
- * The total mass balance equation:
- * \f[
- * \left[
- * \left( \varrho_\textrm{g} {\boldsymbol{v}}_\textrm{g} \right) \cdot \boldsymbol{n}
- * \right]^\textrm{ff}
- * = -\left[
- * \left( \varrho_\textrm{g} \boldsymbol{v}_\textrm{g}
- * + \varrho_\textrm{l} \boldsymbol{v}_\textrm{l} \right) \cdot \boldsymbol{n}
- * \right]^\textrm{pm}
- * \f]
- * in which \f$n\f$ represents a vector normal to the interface pointing outside of
- * the specified subdomain.
- *
- * The momentum balance (tangential), which corresponds to the Beavers-Jospeh Saffman condition:
- * \f[
- * \left[
- * \left( {\boldsymbol{v}}_\textrm{g}
- * + \frac{\sqrt{\left(\boldsymbol{K} \boldsymbol{t}_i \right) \cdot \boldsymbol{t}_i}}
- * {\alpha_\textrm{BJ} \mu_\textrm{g}} \boldsymbol{{\tau}}_\textrm{t} \boldsymbol{n}
- * \right) \cdot \boldsymbol{t}_i
- * \right]^\textrm{ff}
- * = 0
- * \f]
- * with
- * \f$
- * \boldsymbol{{\tau}_\textrm{t}} = \left[ \mu_\textrm{g} + \mu_\textrm{g,t} \right]
- * \nabla \left( \boldsymbol{v}_\textrm{g}
- * + \boldsymbol{v}_\textrm{g}^\intercal \right)
- * \f$
- * in which the eddy viscosity \f$ \mu_\textrm{g,t} = 0 \f$ for the Stokes equation.
- *
- * The momentum balance (normal):
- * \f[
- * \left[
- * \left(
- * \left\lbrace
- * \varrho_\textrm{g} {\boldsymbol{v}}_\textrm{g} {\boldsymbol{v}}_\textrm{g}^\intercal
- * - \boldsymbol{{\tau}}_\textrm{t}
- * + {p}_\textrm{g} \boldsymbol{I}
- * \right\rbrace \boldsymbol{n}
- * \right) \cdot \boldsymbol{n}
- * \right]^\textrm{ff}
- * = p_\textrm{g}^\textrm{pm}
- * \f]
- *
- * The component mass balance equation (continuity of fluxes):
- * \f[
- * \left[
- * \left(
- * \varrho_\textrm{g} {X}^\kappa_\textrm{g} {\boldsymbol{v}}_\textrm{g}
- * - {\boldsymbol{j}}^\kappa_\textrm{g,ff,t,diff}
- * \right) \cdot \boldsymbol{n}
- * \right]^\textrm{ff}
- * = -\left[
- * \left(
- * \varrho_\textrm{g} X^\kappa_\textrm{g} \boldsymbol{v}_\textrm{g}
- * - \boldsymbol{j}^\kappa_\textrm{g,pm,diff}
- * + \varrho_\textrm{l} \boldsymbol{v}_\textrm{l} X^\kappa_\textrm{l}
- * - \boldsymbol{j}^\kappa_\textrm{l,pm,diff}
- * \right) \cdot \boldsymbol{n}
- * \right]^\textrm{pm}
- * = 0
- * \f]
- * in which the diffusive fluxes \f$ j_\textrm{diff} \f$ are the diffusive fluxes as
- * they are implemented in the individual subdomain models.
- *
- * The component mass balance equation (continuity of mass/ mole fractions):
- * \f[
- * \left[ {X}^{\kappa}_\textrm{g} \right]^\textrm{ff}
- * = \left[ X^{\kappa}_\textrm{g} \right]^\textrm{pm}
- * \f]
- *
- * The energy balance equation (continuity of fluxes):
- * \f[
- * \left[
- * \left(
- * \varrho_\textrm{g} {h}_\textrm{g} {\boldsymbol{v}}_\textrm{g}
- * - {h}^\textrm{a}_\textrm{g} {\boldsymbol{j}}^\textrm{a}_\textrm{g,ff,t,diff}
- * - {h}^\textrm{w}_\textrm{g} {\boldsymbol{j}}^\textrm{w}_\textrm{g,ff,t,diff}
- * - \left( \lambda_\textrm{g} + \lambda_\textrm{g,t} \right) \nabla {T}
- * \right) \cdot \boldsymbol{n}
- * \right]^\textrm{ff}
- * = -\left[
- * \left(
- * \varrho_\textrm{g} h_\textrm{g} \boldsymbol{v}_\textrm{g}
- * + \varrho_\textrm{l} h_\textrm{l} \boldsymbol{v}_\textrm{l}
- * - \lambda_\textrm{pm} \nabla T
- * \right) \cdot \boldsymbol{n}
- * \right]^\textrm{pm}
- * \f]
- *
- * The energy balance equation (continuity of temperature):
- * \f[
- * \left[ {T} \right]^\textrm{ff}
- * = \left[ T \right]^\textrm{pm}
- * \f]
- *
- * This is discretized by a fully-coupled vertex-centered finite volume
- * (box) scheme in space and by the implicit Euler method in time.
- */
-template<class TypeTag>
-class TwoCNIStokesTwoPTwoCNILocalOperator :
- public TwoCStokesTwoPTwoCLocalOperator<TypeTag>
-{
-public:
- typedef TwoCStokesTwoPTwoCLocalOperator<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) GlobalProblem;
-
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) Stokes2cniTypeTag;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) TwoPTwoCNITypeTag;
-
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- typedef typename GET_PROP_TYPE(Stokes2cniTypeTag, FluxVariables) BoundaryVariables1;
- typedef typename GET_PROP_TYPE(TwoPTwoCNITypeTag, FluxVariables) BoundaryVariables2;
-
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MDGrid;
-
- typedef typename GET_PROP_TYPE(Stokes2cniTypeTag, GridView) Stokes2cniGridView;
- typedef typename GET_PROP_TYPE(TwoPTwoCNITypeTag, GridView) TwoPTwoCNIGridView;
- typedef typename Stokes2cniGridView::template Codim<0>::Entity SDElement1;
- typedef typename TwoPTwoCNIGridView::template Codim<0>::Entity SDElement2;
-
- typedef typename GET_PROP_TYPE(Stokes2cniTypeTag, Indices) Stokes2cniIndices;
- typedef typename GET_PROP_TYPE(TwoPTwoCNITypeTag, Indices) TwoPTwoCNIIndices;
-
- enum {
- dimWorld = MDGrid::dimensionworld
- };
-
- // Stokes
- enum { numComponents1 = Stokes2cniIndices::numComponents };
- enum { // equation indices
- energyEqIdx1 = Stokes2cniIndices::energyEqIdx //!< Index of the energy balance equation
- };
- enum { // component indices
- transportCompIdx1 = Stokes2cniIndices::transportCompIdx, //!< Index of transported component
- phaseCompIdx1 = Stokes2cniIndices::phaseCompIdx //!< Index of main component of the phase
- };
-
- // Darcy
- enum { numPhases2 = GET_PROP_VALUE(TwoPTwoCNITypeTag, NumPhases) };
- enum { // equation indices
- energyEqIdx2 = TwoPTwoCNIIndices::energyEqIdx //!< Index of the energy balance equation
- };
- enum { // phase indices
- wPhaseIdx2 = TwoPTwoCNIIndices::wPhaseIdx, //!< Index for the liquid phase
- nPhaseIdx2 = TwoPTwoCNIIndices::nPhaseIdx //!< Index for the gas phase
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename MDGrid::ctype CoordScalar;
- typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
-
- // multidomain flags
- static const bool doAlphaCoupling = true;
- static const bool doPatternCoupling = true;
-
- TwoCNIStokesTwoPTwoCNILocalOperator(GlobalProblem& globalProblem)
- : ParentType(globalProblem)
- { }
-
-public:
- //! \copydoc TwoCStokesTwoPTwoCLocalOperator::evalCoupling()
- template<typename LFSU1, typename LFSU2, typename RES1, typename RES2, typename CParams>
- void evalCoupling(const LFSU1& lfsu1, const LFSU2& lfsu2,
- const int vertInElem1, const int vertInElem2,
- const SDElement1& sdElement1, const SDElement2& sdElement2,
- const BoundaryVariables1& boundaryVars1, const BoundaryVariables2& boundaryVars2,
- const CParams &cParams,
- RES1& couplingRes1, RES2& couplingRes2) const
- {
- // evaluate coupling of mass and momentum balances
- ParentType::evalCoupling(lfsu1, lfsu2,
- vertInElem1, vertInElem2,
- sdElement1, sdElement2,
- boundaryVars1, boundaryVars2,
- cParams,
- couplingRes1, couplingRes2);
-
- const GlobalPosition& globalPos1 = cParams.fvGeometry1.subContVol[vertInElem1].global;
- const GlobalPosition& globalPos2 = cParams.fvGeometry2.subContVol[vertInElem2].global;
-
- // ENERGY Balance
- // Neumann-like conditions
- if (cParams.boundaryTypes1.isCouplingNeumann(energyEqIdx1))
- {
- if (this->globalProblem().sdProblem2().isCornerPoint(globalPos2))
- {
- // convective energy flux (enthalpy is mass based, mass flux also needed for useMoles)
- Scalar convectiveFlux = 0.0;
- for (int phaseIdx=0; phaseIdx<numPhases2; ++phaseIdx)
- {
- convectiveFlux -= boundaryVars2.volumeFlux(phaseIdx)
- * cParams.elemVolVarsCur2[vertInElem2].density(phaseIdx)
- * cParams.elemVolVarsCur2[vertInElem2].enthalpy(phaseIdx);
- }
-
- // conductive energy flux
- Scalar conductiveFlux = boundaryVars2.normalMatrixHeatFlux();
-
- couplingRes1.accumulate(lfsu1.child(energyEqIdx1), vertInElem1,
- -(convectiveFlux - conductiveFlux));
- }
- else
- {
- couplingRes1.accumulate(lfsu1.child(energyEqIdx1), vertInElem1,
- this->globalProblem().localResidual2().residual(vertInElem2)[energyEqIdx2]);
- }
- }
- if (cParams.boundaryTypes2.isCouplingNeumann(energyEqIdx2))
- {
- const GlobalPosition& bfNormal1 = boundaryVars1.face().normal;
- // only enter here, if a boundary layer model is used for the computation of the diffusive fluxes
- if (ParentType::blModel_)
- {
- // convective energy flux (enthalpy is mass based, mass flux also needed for useMoles)
- Scalar convectiveFlux = boundaryVars1.normalVelocity()
- * cParams.elemVolVarsCur1[vertInElem1].density()
- * cParams.elemVolVarsCur1[vertInElem1].enthalpy();
-
- // conductive energy flux
- Scalar conductiveFlux = bfNormal1.two_norm()
- * this->globalProblem().evalBoundaryLayerTemperatureGradient(cParams, vertInElem1)
- * (boundaryVars1.thermalConductivity()
- + boundaryVars1.thermalEddyConductivity());
-
- // enthalpy transported by diffusive fluxes
- Scalar sumDiffusiveFluxes = 0.0;
- Scalar sumDiffusiveEnergyFlux = 0.0;
- for (int compIdx=0; compIdx < numComponents1; compIdx++)
- {
- if (compIdx != phaseCompIdx1)
- {
- Scalar diffusiveFlux = bfNormal1.two_norm()
- * this->globalProblem().evalBoundaryLayerConcentrationGradient(cParams, vertInElem1)
- * (boundaryVars1.diffusionCoeff(compIdx)
- + boundaryVars1.eddyDiffusivity())
- * boundaryVars1.molarDensity()
- * this->globalProblem().evalMassTransferCoefficient(cParams, vertInElem1, vertInElem2);
- sumDiffusiveFluxes += diffusiveFlux;
- sumDiffusiveEnergyFlux += diffusiveFlux
- * boundaryVars1.componentEnthalpy(compIdx)
- * FluidSystem::molarMass(compIdx); // Multiplied by molarMass [kg/mol] to convert from [mol/m^3 s] to [kg/m^3 s]
- }
- }
- sumDiffusiveEnergyFlux -= sumDiffusiveFluxes
- * boundaryVars1.componentEnthalpy(phaseCompIdx1)
- * FluidSystem::molarMass(phaseCompIdx1);
-
- couplingRes2.accumulate(lfsu2.child(energyEqIdx2), vertInElem2,
- -(convectiveFlux - sumDiffusiveEnergyFlux - conductiveFlux));
- }
- else if (this->globalProblem().sdProblem1().isCornerPoint(globalPos1))
- {
- // convective energy flux (enthalpy is mass based, mass flux also needed for useMoles)
- Scalar convectiveFlux = boundaryVars1.normalVelocity()
- * cParams.elemVolVarsCur1[vertInElem1].density()
- * cParams.elemVolVarsCur1[vertInElem1].enthalpy();
-
- // conductive energy flux
- Scalar conductiveFlux = bfNormal1
- * boundaryVars1.temperatureGrad()
- * (boundaryVars1.thermalConductivity()
- + boundaryVars1.thermalEddyConductivity());
-
- // enthalpy transported by diffusive fluxes
- Scalar sumDiffusiveFluxes = 0.0;
- Scalar sumDiffusiveEnergyFlux = 0.0;
- for (int compIdx=0; compIdx < numComponents1; compIdx++)
- {
- if (compIdx != phaseCompIdx1)
- {
- Scalar diffusiveFlux = bfNormal1
- * boundaryVars1.moleFractionGrad(compIdx)
- * (boundaryVars1.diffusionCoeff(compIdx)
- + boundaryVars1.eddyDiffusivity())
- * boundaryVars1.molarDensity();
- sumDiffusiveFluxes += diffusiveFlux;
- sumDiffusiveEnergyFlux += diffusiveFlux
- * boundaryVars1.componentEnthalpy(compIdx)
- * FluidSystem::molarMass(compIdx); // Multiplied by molarMass [kg/mol] to convert from [mol/m^3 s] to [kg/m^3 s]
- }
- }
- sumDiffusiveEnergyFlux -= sumDiffusiveFluxes
- * boundaryVars1.componentEnthalpy(phaseCompIdx1)
- * FluidSystem::molarMass(phaseCompIdx1);
-
- couplingRes2.accumulate(lfsu2.child(energyEqIdx2), vertInElem2,
- -(convectiveFlux - sumDiffusiveEnergyFlux - conductiveFlux));
- }
- else
- {
- couplingRes2.accumulate(lfsu2.child(energyEqIdx2), vertInElem2,
- this->globalProblem().localResidual1().residual(vertInElem1)[energyEqIdx1]);
- }
- }
-
- // Dirichlet-like conditions
- if (cParams.boundaryTypes1.isCouplingDirichlet(energyEqIdx1))
- {
- // set residualStokes[energyIdx1] = T in stokesncnicouplinglocalresidual.hh
- couplingRes1.accumulate(lfsu1.child(energyEqIdx1), vertInElem1,
- -cParams.elemVolVarsCur2[vertInElem2].temperature());
- }
-
- if (cParams.boundaryTypes2.isCouplingDirichlet(energyEqIdx2))
- {
- // set residualDarcy[energyEqIdx2] = T in 2p2cnicouplinglocalresidual.hh
- couplingRes2.accumulate(lfsu2.child(energyEqIdx2), vertInElem2,
- -cParams.elemVolVarsCur1[vertInElem1].temperature());
- }
- }
-};
-} // end namespace Dumux
-
-#endif // DUMUX_TWOCNISTOKES2P2CNILOCALOPERATOR_HH
diff --git a/dumux/multidomain/2cnistokes2p2cni/problem.hh b/dumux/multidomain/2cnistokes2p2cni/problem.hh
deleted file mode 100644
index 0b87fbfb5de52081b338c92d665348e0b488857c..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cnistokes2p2cni/problem.hh
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief The problem class for the coupling of a non-isothermal two-component Stokes
- * and a non-isothermal two-phase two-component Darcy model.
- */
-
-#ifndef DUMUX_2CNI_STOKES_2P2CNI_PROBLEM_HH
-#define DUMUX_2CNI_STOKES_2P2CNI_PROBLEM_HH
-
-#include <dumux/freeflow/stokesncni/properties.hh>
-#include <dumux/multidomain/2cstokes2p2c/problem.hh>
-#include <dumux/porousmediumflow/2p2c/implicit/properties.hh>
-
-#include "properties.hh"
-
-namespace Dumux
-{
-
-/*!
- * \ingroup TwoPTwoCNIStokesTwoCNIModel
- * \ingroup TwoPTwoCNIZeroEqTwoCNIModel
- * \brief The problem class for the coupling of a non-isothermal two-component Stokes
- * and a non-isothermal two-phase two-component Darcy model.
- */
-template <class TypeTag>
-class TwoCNIStokesTwoPTwoCNIProblem : public TwoCStokesTwoPTwoCProblem<TypeTag>
-{
- typedef TwoCStokesTwoPTwoCProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
-public:
- //! The constructor
- template<class GridView>
- TwoCNIStokesTwoPTwoCNIProblem(TimeManager &timeManager,
- GridView gridView)
- : ParentType(timeManager, gridView)
- { }
-
- /*!
- * \brief Returns the temperature gradient through the boundary layer
- *
- * \param cParams a parameter container
- * \param scvIdx The local index of the sub-control volume of the Stokes domain
- */
- template<typename CParams>
- Scalar evalBoundaryLayerTemperatureGradient(CParams cParams, const int scvIdx) const
- {
- const Scalar temperatureOut = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefTemperature);
- Scalar normalTemperatureGrad = cParams.elemVolVarsCur1[scvIdx].temperature()
- - temperatureOut;
- return normalTemperatureGrad
- / asImp_().evalBoundaryLayerModel(cParams, scvIdx).thermalBoundaryLayerThickness();
- }
-
-private:
- //! Returns the implementation of the problem (i.e. static polymorphism)
- Implementation &asImp_()
- { return *static_cast<Implementation *>(this); }
-
- //! \copydoc asImp_()
- const Implementation &asImp_() const
- { return *static_cast<const Implementation *>(this); }
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_2CNI_STOKES_2P2CNI_PROBLEM_HH
diff --git a/dumux/multidomain/2cnistokes2p2cni/properties.hh b/dumux/multidomain/2cnistokes2p2cni/properties.hh
deleted file mode 100644
index 5bc41ce38fa99919cbcf712733a0ad22bee35f10..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cnistokes2p2cni/properties.hh
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup MultidomainModel
- *
- * \brief Defines the properties required for the coupled 2cnistokes2p2cni model.
- */
-
-#ifndef DUMUX_TWOCNISTOKESTWOPTWOCNI_PROPERTIES_HH
-#define DUMUX_TWOCNISTOKESTWOPTWOCNI_PROPERTIES_HH
-
-#include <dumux/multidomain/2cstokes2p2c/propertydefaults.hh>
-
-namespace Dumux
-{
-
-////////////////////////////////
-// properties
-////////////////////////////////
-namespace Properties
-{
-
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tags for the coupled 2cnistokes2p2cni model
-NEW_TYPE_TAG(TwoCNIStokesTwoPTwoCNI, INHERITS_FROM(TwoCStokesTwoPTwoC));
-
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-
-} // end namespace properties
-
-} // end namespace Dumux
-
-
-#endif
diff --git a/dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh b/dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh
deleted file mode 100644
index 77499416125fc8e28d3afbf583203d4c26e6549c..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh
+++ /dev/null
@@ -1,199 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Element-wise calculation of the Jacobian matrix for problems
- * using the coupled compositional non-isothermal Stokes box model.
- */
-
-#ifndef DUMUX_STOKESNCNI_COUPLING_LOCAL_RESIDUAL_HH
-#define DUMUX_STOKESNCNI_COUPLING_LOCAL_RESIDUAL_HH
-
-#include <dumux/freeflow/stokesncni/localresidual.hh>
-#include <dumux/freeflow/stokesncni/model.hh>
-
-namespace Dumux
-{
- /*!
- * \ingroup ImplicitLocalResidual
- * \ingroup TwoPTwoCNIStokesTwoCNIModel
- * \ingroup TwoPTwoCNIZeroEqTwoCNIModel
- * \brief Element-wise calculation of the Jacobian matrix for problems
- * using the coupled compositional non-isothermal Stokes box model.
- * It is derived from the compositional non-isothermal Stokes box model.
- */
-template<class TypeTag>
-class StokesncniCouplingLocalResidual : public StokesncniLocalResidual<TypeTag>
-{
- typedef StokesncLocalResidual<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
- numComponents = Indices::numComponents
- };
- enum {
- //indices of the equations
- massBalanceIdx = Indices::massBalanceIdx, //!< Index of the mass balance
- momentumXIdx = Indices::momentumXIdx, //!< Index of the x-component of the momentum balance
- momentumYIdx = Indices::momentumYIdx, //!< Index of the y-component of the momentum balance
- momentumZIdx = Indices::momentumZIdx, //!< Index of the z-component of the momentum balance
- lastMomentumIdx = Indices::lastMomentumIdx, //!< Index of the last component of the momentum balance
- transportEqIdx = Indices::transportEqIdx, //!< Index of the transport equation
- energyEqIdx = Indices::energyEqIdx, //!< Index of the energy equation
- conti0EqIdx = Indices::conti0EqIdx
- };
-
- typedef typename GridView::ctype CoordScalar;
- typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
- typedef Dune::FieldVector<Scalar, dim> DimVector;
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
-
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
-
- static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
-
-public:
- /*!
- * \brief Implementation of the boundary evaluation for the Stokes model
- *
- * Evaluate one part of the Dirichlet-like coupling conditions for a single
- * sub-control volume face; rest is done in the local coupling operator
- */
- void evalBoundary_()
- {
- ParentType::evalBoundary_();
-
- typedef Dune::ReferenceElements<Scalar, dim> ReferenceElements;
- typedef Dune::ReferenceElement<Scalar, dim> ReferenceElement;
- const ReferenceElement &refElement = ReferenceElements::general(this->element_().geometry().type());
-
- // loop over vertices of the element
- for (int scvIdx = 0; scvIdx < this->fvGeometry_().numScv; scvIdx++)
- {
- // consider only SCVs on the boundary
- if (this->fvGeometry_().subContVol[scvIdx].inner)
- continue;
-
- const BoundaryTypes &bcTypes = this->bcTypes_(scvIdx);
-
- // evaluate boundary conditions for the intersections of the current element
- for (const auto& intersection : intersections(this->gridView_(), this->element_()))
- {
- // handle only intersections on the boundary
- if (!intersection.boundary())
- continue;
-
- // assemble the boundary for all vertices of the current face
- const int fIdx = intersection.indexInInside();
- const int numFaceVertices = refElement.size(fIdx, 1, dim);
-
- // loop over the single vertices on the current face
- for (int faceVertexIdx = 0; faceVertexIdx < numFaceVertices; ++faceVertexIdx)
- {
- // only evaluate, if we consider the same face vertex as in the outer
- // loop over the element vertices
- if (refElement.subEntity(fIdx, 1, faceVertexIdx, dim) != scvIdx)
- continue;
-
- const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertexIdx);
- FluxVariables boundaryVars;
- boundaryVars.update(this->problem_(),
- this->element_(),
- this->fvGeometry_(),
- boundaryFaceIdx,
- this->curVolVars_(),
- true);
- const VolumeVariables &volVars = this->curVolVars_()[scvIdx];
-
-
- // set velocity normal to the interface
- if (bcTypes.isCouplingDirichlet(momentumYIdx))
- {
- this->residual_[scvIdx][momentumYIdx] = volVars.velocity()
- * boundaryVars.face().normal
- / boundaryVars.face().normal.two_norm();
- Valgrind::CheckDefined(this->residual_[scvIdx][momentumYIdx]);
- }
-
- // add pressure correction - required for pressure coupling,
- // if p.n comes from the pm
- if (bcTypes.isCouplingNeumann(momentumYIdx) || bcTypes.isCouplingMortar(momentumYIdx))
- {
- this->residual_[scvIdx][momentumYIdx] -= volVars.pressure()
- * boundaryVars.face().normal[momentumYIdx];
- Valgrind::CheckDefined(this->residual_[scvIdx][momentumYIdx]);
- }
-
- // set mole fraction for the transported components
- for (int compIdx = 0; compIdx < numComponents; compIdx++)
- {
- int eqIdx = conti0EqIdx + compIdx;
- if ((eqIdx != massBalanceIdx) && bcTypes.isCouplingDirichlet(eqIdx))
- {
- if(useMoles)
- this->residual_[scvIdx][eqIdx] = volVars.moleFraction(compIdx);
- else
- this->residual_[scvIdx][eqIdx] = volVars.massFraction(compIdx);
- Valgrind::CheckDefined(this->residual_[scvIdx][compIdx]);
- }
- }
-
- // set temperature
- if (bcTypes.isCouplingDirichlet(energyEqIdx))
- {
- this->residual_[scvIdx][energyEqIdx] = volVars.temperature();
- Valgrind::CheckDefined(this->residual_[scvIdx][energyEqIdx]);
- }
- }
- }
- }
- }
-
- /*!
- * \brief Removes the stabilization for the Stokes model.
- */
- void evalBoundaryPDELab_()
- {
- // loop over vertices of the element
- for (int idx = 0; idx < this->fvGeometry_().numScv; idx++)
- {
- // consider only SCVs on the boundary
- if (this->fvGeometry_().subContVol[idx].inner)
- continue;
-
- this->removeStabilizationAtBoundary_(idx);
- }
- }
-};
-
-} // Dumux
-
-#endif // DUMUX_STOKESNCNI_COUPLING_LOCAL_RESIDUAL_HH
diff --git a/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh b/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh
deleted file mode 100644
index 9d9a480da3b3b8ded2e421413809fc210067ab4b..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh
+++ /dev/null
@@ -1,158 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Extending the TwoPTwoCLocalResidual by the required functions for
- * a coupled application.
- */
-#ifndef DUMUX_2P2C_COUPLING_LOCAL_RESIDUAL_HH
-#define DUMUX_2P2C_COUPLING_LOCAL_RESIDUAL_HH
-
-#include <dumux/porousmediumflow/2p2c/implicit/indices.hh>
-#include <dumux/porousmediumflow/2p2c/implicit/localresidual.hh>
-#include <dumux/porousmediumflow/2p2c/implicit/properties.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup ImplicitLocalResidual
- * \ingroup TwoPTwoCStokesTwoCModel
- * \ingroup TwoPTwoCZeroEqTwoCModel
- * \brief Extending the TwoPTwoCLocalResidual by the required functions for
- * a coupled application.
- */
-template<class TypeTag>
-class TwoPTwoCCouplingLocalResidual : public TwoPTwoCLocalResidual<TypeTag>
-{
- typedef TwoPTwoCLocalResidual<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum { dim = GridView::dimension };
- enum { useMoles = GET_PROP_VALUE(TypeTag, UseMoles) };
- enum { nPhaseIdx = Indices::nPhaseIdx };
- enum { wCompIdx = Indices::wCompIdx };
- enum {
- massBalanceIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx),
- contiWEqIdx = Indices::contiWEqIdx
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef Dune::BlockVector<Dune::FieldVector<Scalar,1> > ElementFluxVector;
-
- typedef Dune::FieldVector<Scalar, dim> DimVector;
-
-public:
- /*!
- * \brief Implementation of the boundary evaluation for the Darcy model
- *
- * Evaluate one part of the Dirichlet-like coupling conditions for a single
- * sub-control volume face; rest is done in the local coupling operator
- */
- void evalBoundary_()
- {
- ParentType::evalBoundary_();
-
- typedef Dune::ReferenceElements<Scalar, dim> ReferenceElements;
- typedef Dune::ReferenceElement<Scalar, dim> ReferenceElement;
- const ReferenceElement &refElement = ReferenceElements::general(this->element_().geometry().type());
-
- // loop over vertices of the element
- for (int scvIdx = 0; scvIdx < this->fvGeometry_().numScv; scvIdx++)
- {
- // consider only SCVs on the boundary
- if (this->fvGeometry_().subContVol[scvIdx].inner)
- continue;
-
- // evaluate boundary conditions for the intersections of the current element
- for (const auto& intersection : intersections(this->gridView_(), this->element_()))
- {
- // handle only intersections on the boundary
- if (!intersection.boundary())
- continue;
-
- // assemble the boundary for all vertices of the current face
- const int fIdx = intersection.indexInInside();
- const int numFaceVertices = refElement.size(fIdx, 1, dim);
-
- // loop over the single vertices on the current face
- for (int faceVertexIdx = 0; faceVertexIdx < numFaceVertices; ++faceVertexIdx)
- {
- // only evaluate, if we consider the same face vertex as in the outer
- // loop over the element vertices
- if (refElement.subEntity(fIdx, 1, faceVertexIdx, dim) != scvIdx)
- continue;
-
- const VolumeVariables &volVars = this->curVolVars_()[scvIdx];
-
- // set pressure as part of the momentum coupling
- if (this->bcTypes_(scvIdx).isCouplingDirichlet(massBalanceIdx))
- this->residual_[scvIdx][massBalanceIdx] = volVars.pressure(nPhaseIdx);
-
- // set mass/mole fraction for transported component
- static_assert(GET_PROP_VALUE(TypeTag, NumComponents) == 2,
- "This coupling condition is only implemented for two components.");
- if (this->bcTypes_(scvIdx).isCouplingDirichlet(contiWEqIdx))
- {
- if (useMoles)
- this->residual_[scvIdx][contiWEqIdx] = volVars.moleFraction(nPhaseIdx, wCompIdx);
- else
- this->residual_[scvIdx][contiWEqIdx] = volVars.massFraction(nPhaseIdx, wCompIdx);
- }
- }
- }
- }
- }
-
- /*!
- * \brief Evaluates the time derivative of the storage term
- *
- * \param storage The vector in which the result is written
- * \param scvIdx The sub-control-volume index
- */
- void evalStorageDerivative(PrimaryVariables &storage, const int scvIdx) const
- {
- PrimaryVariables result;
- this->computeStorage(result, scvIdx, false);
- Valgrind::CheckDefined(result);
- storage = result;
- this->computeStorage(result, scvIdx, true);
- Valgrind::CheckDefined(result);
- storage -= result;
-
- storage *= this->fvGeometry_().subContVol[scvIdx].volume
- / this->problem_().timeManager().timeStepSize()
- * this->curVolVars_(scvIdx).extrusionFactor();
- }
-
-protected:
- ElementFluxVector elementFluxes_;
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_2P2C_COUPLING_LOCAL_RESIDUAL_HH
diff --git a/dumux/multidomain/2cstokes2p2c/CMakeLists.txt b/dumux/multidomain/2cstokes2p2c/CMakeLists.txt
deleted file mode 100644
index 4edbf946cc608645c34fe74b343e6ff798e9933d..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cstokes2p2c/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#install headers
-install(FILES
-localoperator.hh
-newtoncontroller.hh
-properties.hh
-propertydefaults.hh
-2p2ccouplinglocalresidual.hh
-stokesnccouplinglocalresidual.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/multidomain/2cstokes2p2c)
diff --git a/dumux/multidomain/2cstokes2p2c/localoperator.hh b/dumux/multidomain/2cstokes2p2c/localoperator.hh
deleted file mode 100644
index c6ac77710c50c96bcbfc438db22050ff1df4967f..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cstokes2p2c/localoperator.hh
+++ /dev/null
@@ -1,695 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief The local operator for the coupling of a two-component Stokes model
- * and a two-phase two-component porous-medium model under isothermal conditions.
- */
-#ifndef DUMUX_2CSTOKES_2P2C_LOCALOPERATOR_HH
-#define DUMUX_2CSTOKES_2P2C_LOCALOPERATOR_HH
-
-#include <iostream>
-
-#include <dune/pdelab/multidomain/couplingutilities.hh>
-#include <dune/pdelab/localoperator/pattern.hh>
-#include <dune/pdelab/localoperator/idefault.hh>
-
-#include <dumux/freeflow/boundarylayermodel.hh>
-#include <dumux/freeflow/masstransfermodel.hh>
-#include <dumux/freeflow/stokesnc/model.hh>
-#include <dumux/multidomain/properties.hh>
-#include <dumux/porousmediumflow/2p2c/implicit/model.hh>
-
-#include "propertydefaults.hh"
-
-namespace Dumux {
-
-/*!
- * \ingroup TwoPTwoCStokesTwoCModel
- * \ingroup TwoPTwoCZeroEqTwoCModel
- * \brief The local operator for the coupling of a two-component Stokes model
- * and a two-phase two-component porous-medium model under isothermal conditions.
- *
- * This model implements the coupling between a free-flow model
- * and a porous-medium flow model under isothermal conditions.
- * Here the coupling conditions for the individual balance are presented:
- *
- * The total mass balance equation:
- * \f[
- * \left[
- * \left(
- * \varrho_\textrm{g} {\boldsymbol{v}}_\textrm{g}
- * - \sum_\kappa {\boldsymbol{j}}^\kappa_\textrm{g,ff,t,diff}
- * \right) \cdot \boldsymbol{n}
- * \right]^\textrm{ff}
- * = -\left[
- * \left(
- * \varrho_\textrm{g} \boldsymbol{v}_\textrm{g}
- * + \varrho_\textrm{l} \boldsymbol{v}_\textrm{l}
- * - \sum_\kappa {\boldsymbol{j}}^\kappa_\textrm{g,pm,diff}
- * - \sum_\kappa {\boldsymbol{j}}^\kappa_\textrm{l,pm,diff}
-* \right) \cdot \boldsymbol{n}
- * \right]^\textrm{pm}
- * \f]
- * in which \f$n\f$ represents a vector normal to the interface pointing outside of
- * the specified subdomain. The diffusive fluxes \f$ j_\textrm{diff} \f$ are the diffusive fluxes as
- * they are implemented in the individual subdomain models.
- *
- * The momentum balance (tangential), which corresponds to the Beavers-Jospeh Saffman condition:
- * \f[
- * \left[
- * \left( {\boldsymbol{v}}_\textrm{g}
- * + \frac{\sqrt{\left(\boldsymbol{K} \boldsymbol{t}_i \right) \cdot \boldsymbol{t}_i}}
- * {\alpha_\textrm{BJ} \mu_\textrm{g}} \boldsymbol{{\tau}}_\textrm{t} \boldsymbol{n}
- * \right) \cdot \boldsymbol{t}_i
- * \right]^\textrm{ff}
- * = 0
- * \f]
- * with
- * \f$
- * \boldsymbol{{\tau}_\textrm{t}} = \left[ \mu_\textrm{g} + \mu_\textrm{g,t} \right]
- * \nabla \left( \boldsymbol{v}_\textrm{g}
- * + \boldsymbol{v}_\textrm{g}^\intercal \right)
- * \f$
- * in which the eddy viscosity \f$ \mu_\textrm{g,t} = 0 \f$ for the Stokes equation.
- *
- * The momentum balance (normal):
- * \f[
- * \left[
- * \left(
- * \left\lbrace
- * \varrho_\textrm{g} {\boldsymbol{v}}_\textrm{g} {\boldsymbol{v}}_\textrm{g}^\intercal
- * - \boldsymbol{{\tau}}_\textrm{t}
- * + {p}_\textrm{g} \boldsymbol{I}
- * \right\rbrace \boldsymbol{n}
- * \right) \cdot \boldsymbol{n}
- * \right]^\textrm{ff}
- * = p_\textrm{g}^\textrm{pm}
- * \f]
- *
- * The component mass balance equation (continuity of fluxes):
- * \f[
- * \left[
- * \left(
- * \varrho_\textrm{g} {X}^\kappa_\textrm{g} {\boldsymbol{v}}_\textrm{g}
- * - {\boldsymbol{j}}^\kappa_\textrm{g,ff,t,diff}
- * \right) \cdot \boldsymbol{n}
- * \right]^\textrm{ff}
- * = -\left[
- * \left(
- * \varrho_\textrm{g} X^\kappa_\textrm{g} \boldsymbol{v}_\textrm{g}
- * - \boldsymbol{j}^\kappa_\textrm{g,pm,diff}
- * + \varrho_\textrm{l} \boldsymbol{v}_\textrm{l} X^\kappa_\textrm{l}
- * - \boldsymbol{j}^\kappa_\textrm{l,pm,diff}
- * \right) \cdot \boldsymbol{n}
- * \right]^\textrm{pm}
- * = 0
- * \f]
- *
- * The component mass balance equation (continuity of mass/ mole fractions):
- * \f[
- * \left[ {X}^{\kappa}_\textrm{g} \right]^\textrm{ff}
- * = \left[ X^{\kappa}_\textrm{g} \right]^\textrm{pm}
- * \f]
- *
- * This is discretized by a fully-coupled vertex-centered finite volume
- * (box) scheme in space and by the implicit Euler method in time.
- */
-template<class TypeTag>
-class TwoCStokesTwoPTwoCLocalOperator :
- public Dune::PDELab::MultiDomain::CouplingOperatorDefaultFlags,
- public Dune::PDELab::MultiDomain::NumericalJacobianCoupling<TwoCStokesTwoPTwoCLocalOperator<TypeTag>>,
- public Dune::PDELab::MultiDomain::FullCouplingPattern,
- public Dune::PDELab::InstationaryLocalOperatorDefaultMethods<double>
-{
-public:
- typedef typename GET_PROP_TYPE(TypeTag, Problem) GlobalProblem;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainCouplingLocalOperator) Implementation;
-
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) Stokes2cTypeTag;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) TwoPTwoCTypeTag;
-
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TwoPTwoCTypeTag, SpatialParams) SpatialParams;
-
- typedef typename GET_PROP_TYPE(Stokes2cTypeTag, ElementVolumeVariables) ElementVolumeVariables1;
- typedef typename GET_PROP_TYPE(TwoPTwoCTypeTag, ElementVolumeVariables) ElementVolumeVariables2;
-
- typedef typename GET_PROP_TYPE(Stokes2cTypeTag, FluxVariables) BoundaryVariables1;
- typedef typename GET_PROP_TYPE(TwoPTwoCTypeTag, FluxVariables) BoundaryVariables2;
-
- typedef typename GET_PROP_TYPE(Stokes2cTypeTag, ElementBoundaryTypes) ElementBoundaryTypes1;
- typedef typename GET_PROP_TYPE(TwoPTwoCTypeTag, ElementBoundaryTypes) ElementBoundaryTypes2;
-
- typedef typename GET_PROP_TYPE(Stokes2cTypeTag, BoundaryTypes) BoundaryTypes1;
- typedef typename GET_PROP_TYPE(TwoPTwoCTypeTag, BoundaryTypes) BoundaryTypes2;
-
- typedef typename GET_PROP_TYPE(Stokes2cTypeTag, FVElementGeometry) FVElementGeometry1;
- typedef typename GET_PROP_TYPE(TwoPTwoCTypeTag, FVElementGeometry) FVElementGeometry2;
-
- // Multidomain Grid types
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MDGrid;
- typedef typename MDGrid::Traits::template Codim<0>::Entity MDElement;
-
- typedef typename GET_PROP_TYPE(Stokes2cTypeTag, GridView) Stokes2cGridView;
- typedef typename GET_PROP_TYPE(TwoPTwoCTypeTag, GridView) TwoPTwoCGridView;
- typedef typename Stokes2cGridView::template Codim<0>::Entity SDElement1;
- typedef typename TwoPTwoCGridView::template Codim<0>::Entity SDElement2;
-
- typedef typename GET_PROP_TYPE(Stokes2cTypeTag, Indices) Stokes2cIndices;
- typedef typename GET_PROP_TYPE(TwoPTwoCTypeTag, Indices) TwoPTwoCIndices;
-
- enum {
- dim = MDGrid::dimension,
- dimWorld = MDGrid::dimensionworld
- };
-
- // Stokes
- enum { numEq1 = GET_PROP_VALUE(Stokes2cTypeTag, NumEq),
- useMoles1 = GET_PROP_VALUE(Stokes2cTypeTag, UseMoles) };
- enum { numComponents1 = Stokes2cIndices::numComponents };
- enum { // equation indices
- momentumXIdx1 = Stokes2cIndices::momentumXIdx, //!< Index of the x-component of the momentum balance
- momentumYIdx1 = Stokes2cIndices::momentumYIdx, //!< Index of the y-component of the momentum balance
- momentumZIdx1 = Stokes2cIndices::momentumZIdx, //!< Index of the z-component of the momentum balance
- lastMomentumIdx1 = Stokes2cIndices::lastMomentumIdx, //!< Index of the last component of the momentum balance
- massBalanceIdx1 = Stokes2cIndices::massBalanceIdx, //!< Index of the mass balance
- transportEqIdx1 = Stokes2cIndices::transportEqIdx //!< Index of the transport equation
- };
- enum { // component indices
- transportCompIdx1 = Stokes2cIndices::transportCompIdx, //!< Index of transported component
- phaseCompIdx1 = Stokes2cIndices::phaseCompIdx //!< Index of main component of the phase
- };
-
- // Darcy
- enum { numEq2 = GET_PROP_VALUE(TwoPTwoCTypeTag, NumEq),
- useMoles2 = GET_PROP_VALUE(TwoPTwoCTypeTag, UseMoles) };
- enum { numPhases2 = GET_PROP_VALUE(TwoPTwoCTypeTag, NumPhases) };
- enum { // equation indices
- contiWEqIdx2 = TwoPTwoCIndices::contiWEqIdx, //!< Index of the continuity equation for water component
- massBalanceIdx2 = TwoPTwoCIndices::contiNEqIdx //!< Index of the total mass balance (if one component balance is replaced)
- };
- enum { // component indices
- wCompIdx2 = TwoPTwoCIndices::wCompIdx, //!< Index of the liquids main component
- nCompIdx2 = TwoPTwoCIndices::nCompIdx //!< Index of the main component of the gas
- };
- enum { // phase indices
- wPhaseIdx2 = TwoPTwoCIndices::wPhaseIdx, //!< Index for the liquid phase
- nPhaseIdx2 = TwoPTwoCIndices::nPhaseIdx //!< Index for the gas phase
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename MDGrid::ctype CoordScalar;
- typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
-
- typedef typename Stokes2cGridView::template Codim<dim>::EntityPointer VertexPointer1;
- typedef typename TwoPTwoCGridView::template Codim<dim>::EntityPointer VertexPointer2;
-
- // multidomain flags
- static const bool doAlphaCoupling = true;
- static const bool doPatternCoupling = true;
-
-public:
- //! \brief The constructor
- TwoCStokesTwoPTwoCLocalOperator(GlobalProblem& globalProblem)
- : globalProblem_(globalProblem)
- {
- static_assert(GET_PROP_VALUE(Stokes2cTypeTag, UseMoles) == GET_PROP_VALUE(TwoPTwoCTypeTag, UseMoles),
- "The coupling conditions is only implemented for same formulations (mass or mole) in both subdomains.");
-
- blModel_ = GET_PARAM_FROM_GROUP(TypeTag, int, BoundaryLayer, Model);
- massTransferModel_ = GET_PARAM_FROM_GROUP(TypeTag, int, MassTransfer, Model);
-
- if (blModel_ != 0)
- std::cout << "Using boundary layer model " << blModel_ << std::endl;
- if (massTransferModel_ != 0)
- std::cout << "Using mass transfer model " << massTransferModel_ << std::endl;
- }
-
- /*!
- * \brief Do the coupling. The unknowns are transferred from dune-multidomain.
- * Based on them, a coupling residual is calculated and added at the
- * respective positions in the matrix.
- *
- * \param intersectionGeometry the geometry of the intersection
- * \param lfsu1 local basis for the trial space of the Stokes domain
- * \param unknowns1 the unknowns vector of the Stokes element (formatted according to PDELab)
- * \param lfsv1 local basis for the test space of the Stokes domain
- * \param lfsu2 local basis for the trail space of the Darcy domain
- * \param unknowns2 the unknowns vector of the Darcy element (formatted according to PDELab)
- * \param lfsv2 local basis for the test space of the Darcy domain
- * \param couplingRes1 the coupling residual from the Stokes domain
- * \param couplingRes2 the coupling residual from the Darcy domain
- */
- template<typename IntersectionGeom, typename LFSU1, typename LFSU2,
- typename X, typename LFSV1, typename LFSV2,typename RES>
- void alpha_coupling(const IntersectionGeom& intersectionGeometry,
- const LFSU1& lfsu1, const X& unknowns1, const LFSV1& lfsv1,
- const LFSU2& lfsu2, const X& unknowns2, const LFSV2& lfsv2,
- RES& couplingRes1, RES& couplingRes2) const
- {
- const std::shared_ptr<MDElement> mdElement1
- = std::make_shared<MDElement>(intersectionGeometry.inside());
- const std::shared_ptr<MDElement> mdElement2
- = std::make_shared<MDElement>(intersectionGeometry.outside());
-
- // the subdomain elements
- const std::shared_ptr<SDElement1> sdElement1
- = std::make_shared<SDElement1>(globalProblem_.sdElementPointer1(*mdElement1));
- const std::shared_ptr<SDElement2> sdElement2
- = std::make_shared<SDElement2>(globalProblem_.sdElementPointer2(*mdElement2));
-
- // a container for the parameters on each side of the coupling interface (see below)
- CParams cParams;
-
- // update fvElementGeometry and the element volume variables
- updateElemVolVars(lfsu1, lfsu2,
- unknowns1, unknowns2,
- *sdElement1, *sdElement2,
- cParams);
-
- // first element
- const int faceIdx1 = intersectionGeometry.indexInInside();
- const Dune::ReferenceElement<typename MDGrid::ctype,dim>& referenceElement1 =
- Dune::ReferenceElements<typename MDGrid::ctype,dim>::general((*mdElement1).type());
- const int numVerticesOfFace = referenceElement1.size(faceIdx1, 1, dim);
-
- // second element
- const int faceIdx2 = intersectionGeometry.indexInOutside();
- const Dune::ReferenceElement<typename MDGrid::ctype,dim>& referenceElement2 =
- Dune::ReferenceElements<typename MDGrid::ctype,dim>::general((*mdElement2).type());
-
- for (int vertexInFace = 0; vertexInFace < numVerticesOfFace; ++vertexInFace)
- {
- const int vertInElem1 = referenceElement1.subEntity(faceIdx1, 1, vertexInFace, dim);
- const int vertInElem2 = referenceElement2.subEntity(faceIdx2, 1, vertexInFace, dim);
-
- const int boundaryFaceIdx1 = cParams.fvGeometry1.boundaryFaceIndex(faceIdx1, vertexInFace);
- const int boundaryFaceIdx2 = cParams.fvGeometry2.boundaryFaceIndex(faceIdx2, vertexInFace);
-
- // obtain the boundary types
- const VertexPointer1 vPtr1 = (*sdElement1).template subEntity<dim>(vertInElem1);
- const VertexPointer2 vPtr2 = (*sdElement2).template subEntity<dim>(vertInElem2);
-
- globalProblem_.sdProblem1().boundaryTypes(cParams.boundaryTypes1, vPtr1);
- globalProblem_.sdProblem2().boundaryTypes(cParams.boundaryTypes2, vPtr2);
-
- BoundaryVariables1 boundaryVars1;
- boundaryVars1.update(globalProblem_.sdProblem1(),
- *sdElement1,
- cParams.fvGeometry1,
- boundaryFaceIdx1,
- cParams.elemVolVarsCur1,
- /*onBoundary=*/true);
- BoundaryVariables2 boundaryVars2;
- boundaryVars2.update(globalProblem_.sdProblem2(),
- *sdElement2,
- cParams.fvGeometry2,
- boundaryFaceIdx2,
- cParams.elemVolVarsCur2,
- /*onBoundary=*/true);
-
- asImp_()->evalCoupling(lfsu1, lfsu2,
- vertInElem1, vertInElem2,
- *sdElement1, *sdElement2,
- boundaryVars1, boundaryVars2,
- cParams,
- couplingRes1, couplingRes2);
- }
- }
-
- /*!
- * \brief Update the volume variables of the element and extract the unknowns from dune-pdelab vectors
- * and bring them into a form which fits to dumux.
- *
- * \param lfsu1 local basis for the trial space of the Stokes domain
- * \param lfsu2 local basis for the trial space of the Darcy domain
- * \param unknowns1 the unknowns vector of the Stokes element (formatted according to PDELab)
- * \param unknowns2 the unknowns vector of the Darcy element (formatted according to PDELab)
- * \param sdElement1 the element in the Stokes domain
- * \param sdElement2 the element in the Darcy domain
- * \param cParams a parameter container
- */
- template<typename LFSU1, typename LFSU2, typename X, typename CParams>
- void updateElemVolVars(const LFSU1& lfsu1, const LFSU2& lfsu2,
- const X& unknowns1, const X& unknowns2,
- const SDElement1& sdElement1, const SDElement2& sdElement2,
- CParams &cParams) const
- {
- cParams.fvGeometry1.update(globalProblem_.sdGridView1(), sdElement1);
- cParams.fvGeometry2.update(globalProblem_.sdGridView2(), sdElement2);
-
- const int numVertsOfElem1 = sdElement1.subEntities(dim);
- const int numVertsOfElem2 = sdElement2.subEntities(dim);
-
- // bring the local unknowns x1 into a form that can be passed to elemVolVarsCur.update()
- Dune::BlockVector<Dune::FieldVector<Scalar,1>> elementSol1(0.);
- Dune::BlockVector<Dune::FieldVector<Scalar,1>> elementSol2(0.);
- elementSol1.resize(unknowns1.size());
- elementSol2.resize(unknowns2.size());
-
- for (int idx=0; idx<numVertsOfElem1; ++idx)
- {
- for (int eqIdx1=0; eqIdx1<numEq1; ++eqIdx1)
- elementSol1[eqIdx1*numVertsOfElem1+idx] = unknowns1(lfsu1.child(eqIdx1),idx);
- for (int eqIdx2=0; eqIdx2<numEq2; ++eqIdx2)
- elementSol2[eqIdx2*numVertsOfElem2+idx] = unknowns2(lfsu2.child(eqIdx2),idx);
- }
-#if HAVE_VALGRIND
- for (unsigned int i = 0; i < elementSol1.size(); i++)
- Valgrind::CheckDefined(elementSol1[i]);
- for (unsigned int i = 0; i < elementSol2.size(); i++)
- Valgrind::CheckDefined(elementSol2[i]);
-#endif // HAVE_VALGRIND
-
- cParams.elemVolVarsPrev1.update(globalProblem_.sdProblem1(),
- sdElement1,
- cParams.fvGeometry1,
- true /* oldSol? */);
- cParams.elemVolVarsCur1.updatePDELab(globalProblem_.sdProblem1(),
- sdElement1,
- cParams.fvGeometry1,
- elementSol1);
- cParams.elemVolVarsPrev2.update(globalProblem_.sdProblem2(),
- sdElement2,
- cParams.fvGeometry2,
- true /* oldSol? */);
- cParams.elemVolVarsCur2.updatePDELab(globalProblem_.sdProblem2(),
- sdElement2,
- cParams.fvGeometry2,
- elementSol2);
-
- ElementBoundaryTypes1 bcTypes1;
- ElementBoundaryTypes2 bcTypes2;
- bcTypes1.update(globalProblem_.sdProblem1(), sdElement1, cParams.fvGeometry1);
- bcTypes2.update(globalProblem_.sdProblem2(), sdElement2, cParams.fvGeometry2);
-
- globalProblem_.localResidual1().evalPDELab(sdElement1, cParams.fvGeometry1,
- cParams.elemVolVarsPrev1, cParams.elemVolVarsCur1,
- bcTypes1);
- globalProblem_.localResidual2().evalPDELab(sdElement2, cParams.fvGeometry2,
- cParams.elemVolVarsPrev2, cParams.elemVolVarsCur2,
- bcTypes2);
- }
-
- /*!
- * \brief Evaluation of the coupling between the Stokes (1) and Darcy (2).
- *
- * Dirichlet-like and Neumann-like conditions for the respective domain are evaluated.
- *
- * \param lfsu1 local basis for the trial space of the Stokes domain
- * \param lfsu2 local basis for the trial space of the Darcy domain
- * \param vertInElem1 local vertex index in element1
- * \param vertInElem2 local vertex index in element2
- * \param sdElement1 the element in the Stokes domain
- * \param sdElement2 the element in the Darcy domain
- * \param boundaryVars1 the boundary variables at the interface of the Stokes domain
- * \param boundaryVars2 the boundary variables at the interface of the Darcy domain
- * \param cParams a parameter container
- * \param couplingRes1 the coupling residual from the Stokes domain
- * \param couplingRes2 the coupling residual from the Darcy domain
- */
- template<typename LFSU1, typename LFSU2, typename RES1, typename RES2, typename CParams>
- void evalCoupling(const LFSU1& lfsu1, const LFSU2& lfsu2,
- const int vertInElem1, const int vertInElem2,
- const SDElement1& sdElement1, const SDElement2& sdElement2,
- const BoundaryVariables1& boundaryVars1, const BoundaryVariables2& boundaryVars2,
- const CParams &cParams,
- RES1& couplingRes1, RES2& couplingRes2) const
- {
- const GlobalPosition& globalPos1 = cParams.fvGeometry1.subContVol[vertInElem1].global;
- const GlobalPosition& globalPos2 = cParams.fvGeometry2.subContVol[vertInElem2].global;
-
- const GlobalPosition& bfNormal1 = boundaryVars1.face().normal;
- const Scalar density1 = useMoles1 ? cParams.elemVolVarsCur1[vertInElem1].molarDensity()
- : cParams.elemVolVarsCur1[vertInElem1].density();
- const Scalar massMoleFrac1 = useMoles1 ? cParams.elemVolVarsCur1[vertInElem1].moleFraction(transportCompIdx1)
- : cParams.elemVolVarsCur1[vertInElem1].massFraction(transportCompIdx1);
-
- const Scalar normalPhaseFlux1 = boundaryVars1.normalVelocity() * density1;
- const Scalar diffusiveMoleFlux1 = bfNormal1
- * boundaryVars1.moleFractionGrad(transportCompIdx1)
- * (boundaryVars1.diffusionCoeff(transportCompIdx1)
- + boundaryVars1.eddyDiffusivity())
- * boundaryVars1.molarDensity();
-
- using std::abs;
- if (abs(bfNormal1[1]) < 1e-10)
- {
- DUNE_THROW(Dune::NotImplemented, "The coupling conditions are not implemented for vertical interfaces.");
- }
-
- // MASS Balance
- // Neumann-like conditions
- if (cParams.boundaryTypes1.isCouplingNeumann(massBalanceIdx1))
- {
- DUNE_THROW(Dune::NotImplemented, "The boundary condition isCouplingNeumann(massBalanceIdx1) for the Stokes side is not implemented.");
- }
- if (cParams.boundaryTypes2.isCouplingNeumann(massBalanceIdx2))
- {
- if (globalProblem_.sdProblem1().isCornerPoint(globalPos1))
- {
- Scalar diffusiveFlux = diffusiveMoleFlux1 * FluidSystem::molarMass(transportCompIdx1)
- - diffusiveMoleFlux1 * FluidSystem::molarMass(phaseCompIdx1);
- if (useMoles1)
- {
- diffusiveFlux = 0.0;
- }
- couplingRes2.accumulate(lfsu2.child(massBalanceIdx2), vertInElem2,
- - normalPhaseFlux1 + diffusiveFlux);
- }
- else
- {
- couplingRes2.accumulate(lfsu2.child(massBalanceIdx2), vertInElem2,
- globalProblem_.localResidual1().residual(vertInElem1)[massBalanceIdx1]);
- }
- }
-
- // Dirichlet-like
- if (cParams.boundaryTypes1.isCouplingDirichlet(massBalanceIdx1))
- {
- DUNE_THROW(Dune::NotImplemented, "The boundary condition isCouplingDirichlet(massBalanceIdx1) for the Stokes side is not implemented.");
- }
- if (cParams.boundaryTypes2.isCouplingDirichlet(massBalanceIdx2))
- {
- couplingRes2.accumulate(lfsu2.child(massBalanceIdx2), vertInElem2,
- globalProblem_.localResidual1().residual(vertInElem1)[momentumYIdx1]
- -cParams.elemVolVarsCur1[vertInElem1].pressure());
- }
-
-
- // MOMENTUM_X Balance
- SpatialParams spatialParams = globalProblem_.sdProblem2().spatialParams();
- Scalar beaversJosephCoeff = spatialParams.beaversJosephCoeffAtPos(globalPos1);
- assert(beaversJosephCoeff > 0);
- using std::sqrt;
- beaversJosephCoeff /= sqrt(spatialParams.intrinsicPermeability(sdElement2, cParams.fvGeometry2, vertInElem2));
-
- // Neumann-like conditions
- if (cParams.boundaryTypes1.isCouplingNeumann(momentumXIdx1))
- {
- // v_tau = v - (v.n)n
- const Scalar normalComp = boundaryVars1.velocity()*bfNormal1;
- GlobalPosition normalV = bfNormal1;
- normalV *= normalComp;
- const GlobalPosition tangentialV = boundaryVars1.velocity() - normalV;
-
- // Implementation as Neumann-like condition: (v.n)n
- for (int dimIdx=0; dimIdx < dim; ++dimIdx)
- {
- couplingRes1.accumulate(lfsu1.child(momentumXIdx1), vertInElem1,
- beaversJosephCoeff
- * boundaryVars1.face().area
- * tangentialV[dimIdx]
- * (boundaryVars1.dynamicViscosity()
- + boundaryVars1.dynamicEddyViscosity()));
- }
- }
-
- // Dirichlet-like conditions
- if (cParams.boundaryTypes1.isCouplingDirichlet(momentumXIdx1))
- {
- // NOTE: This boundary condition is not implemented anymore because curPrimaryVars_ is protected
- DUNE_THROW(Dune::NotImplemented, "The boundary condition isCouplingNeumann(momentumXIdx1) on the Stokes side is not implemented anymore.");
-
- // tangential component: vx = sqrt K /alpha * (grad v n(unity))t
- // GlobalPosition tangentialVelGrad(0);
- // boundaryVars1.velocityGrad().umv(elementUnitNormal, tangentialVelGrad);
- // tangentialVelGrad /= -beaversJosephCoeff; // was - before
- // this->residual_[vertInElem1][momentumXIdx1] =
- // tangentialVelGrad[momentumXIdx1] - globalProblem_.localResidual1().curPriVars_(vertInElem1)[momentumXIdx1]);
- }
-
-
- // MOMENTUM_Y Balance
- // Neumann-like conditions
- if (cParams.boundaryTypes1.isCouplingNeumann(momentumYIdx1))
- {
- // p*A as condition for free flow
- // pressure correction is done in stokeslocalresidual.hh
- couplingRes1.accumulate(lfsu1.child(momentumYIdx1), vertInElem1,
- cParams.elemVolVarsCur2[vertInElem2].pressure(nPhaseIdx2)
- * bfNormal1[momentumYIdx1]);
- }
-
- // Dirichlet-like conditions
- if (cParams.boundaryTypes1.isCouplingDirichlet(momentumYIdx1))
- {
- // v.n as Dirichlet-like condition for the Stokes domain
- if (globalProblem_.sdProblem2().isCornerPoint(globalPos2))
- {
- Scalar sumNormalPhaseFluxes = 0.0;
- for (int phaseIdx=0; phaseIdx<numPhases2; ++phaseIdx)
- {
- Scalar density = useMoles2 ? cParams.elemVolVarsCur2[vertInElem2].molarDensity(phaseIdx)
- : cParams.elemVolVarsCur2[vertInElem2].density(phaseIdx);
- sumNormalPhaseFluxes -= boundaryVars2.volumeFlux(phaseIdx) * density;
- }
- couplingRes1.accumulate(lfsu1.child(momentumYIdx1), vertInElem1,
- -sumNormalPhaseFluxes / density1);
- }
- else
- {
- // set residualStokes[momentumYIdx1] = v_y in stokesnccouplinglocalresidual.hh
- couplingRes1.accumulate(lfsu1.child(momentumYIdx1), vertInElem1,
- globalProblem_.localResidual2().residual(vertInElem2)[massBalanceIdx2]
- / density1);
- }
- }
-
-
- // COMPONENT Balance
- // Neumann-like conditions
- if (cParams.boundaryTypes1.isCouplingNeumann(transportEqIdx1))
- {
- DUNE_THROW(Dune::NotImplemented, "The boundary condition isCouplingNeumann(transportEqIdx1) is not implemented \
- for the Stokes side for multicomponent systems.");
- }
- if (cParams.boundaryTypes2.isCouplingNeumann(contiWEqIdx2))
- {
- // only enter here, if a boundary layer model is used for the computation of the diffusive fluxes
- if (blModel_)
- {
- Scalar advectiveFlux = normalPhaseFlux1 * massMoleFrac1;
- Scalar diffusiveFluxBL = bfNormal1.two_norm()
- * globalProblem_.evalBoundaryLayerConcentrationGradient(cParams, vertInElem1)
- * (boundaryVars1.diffusionCoeff(transportCompIdx1)
- + boundaryVars1.eddyDiffusivity())
- * boundaryVars1.molarDensity();
- if (!useMoles1)
- {
- diffusiveFluxBL *= FluidSystem::molarMass(transportCompIdx1);
- }
-
- const Scalar massTransferCoeff = globalProblem_.evalMassTransferCoefficient(cParams, vertInElem1, vertInElem2);
-
- if (massTransferModel_ && globalProblem_.sdProblem1().isCornerPoint(globalPos1))
- {
- Scalar diffusiveFluxAtCorner = diffusiveMoleFlux1;
- if (!useMoles1)
- {
- diffusiveFluxAtCorner *= FluidSystem::molarMass(transportCompIdx1);
- }
-
- couplingRes2.accumulate(lfsu2.child(contiWEqIdx2), vertInElem2,
- -massTransferCoeff*(advectiveFlux - diffusiveFluxBL) -
- (1.-massTransferCoeff)*(advectiveFlux - diffusiveFluxAtCorner));
- }
- else
- {
- couplingRes2.accumulate(lfsu2.child(contiWEqIdx2), vertInElem2,
- -massTransferCoeff*(advectiveFlux - diffusiveFluxBL) +
- (1.-massTransferCoeff)*globalProblem_.localResidual1().residual(vertInElem1)[transportEqIdx1]);
- }
- }
- else if (globalProblem_.sdProblem1().isCornerPoint(globalPos1))
- {
- Scalar advectiveFlux = normalPhaseFlux1 * massMoleFrac1;
- Scalar diffusiveFlux = diffusiveMoleFlux1;
- if (!useMoles1)
- {
- diffusiveFlux *= FluidSystem::molarMass(transportCompIdx1);
- }
-
- couplingRes2.accumulate(lfsu2.child(contiWEqIdx2), vertInElem2,
- -(advectiveFlux - diffusiveFlux));
- }
- else
- {
- static_assert(GET_PROP_VALUE(Stokes2cTypeTag, UseMoles) == GET_PROP_VALUE(TwoPTwoCTypeTag, UseMoles),
- "This coupling condition is not implemented for different formulations (mass/mole) in the subdomains.");
-
- // the component mass flux from the stokes domain
- couplingRes2.accumulate(lfsu2.child(contiWEqIdx2), vertInElem2,
- globalProblem_.localResidual1().residual(vertInElem1)[transportEqIdx1]);
- }
- }
-
- // Dirichlet-like conditions
- if (cParams.boundaryTypes1.isCouplingDirichlet(transportEqIdx1))
- {
- // set residualStokes[transportEqIdx1] = x in stokesnccouplinglocalresidual.hh
- // coupling residual is added to "real" residual
- Scalar massMoleFrac = useMoles2 ? cParams.elemVolVarsCur2[vertInElem2].moleFraction(nPhaseIdx2, wCompIdx2)
- : cParams.elemVolVarsCur2[vertInElem2].massFraction(nPhaseIdx2, wCompIdx2);
- couplingRes1.accumulate(lfsu1.child(transportEqIdx1), vertInElem1,
- -massMoleFrac);
- }
- if (cParams.boundaryTypes2.isCouplingDirichlet(contiWEqIdx2))
- {
- DUNE_THROW(Dune::NotImplemented, "The boundary condition isCouplingDirichlet(contiWEqIdx2) is not implemented \
- for the Darcy side for multicomponent systems.");
- }
- }
-
- protected:
- GlobalProblem& globalProblem() const
- { return globalProblem_; }
-
- Implementation *asImp_()
- { return static_cast<Implementation *> (this); }
- const Implementation *asImp_() const
- { return static_cast<const Implementation *> (this); }
-
- unsigned int blModel_;
- unsigned int massTransferModel_;
-
- private:
- /*!
- * \brief A struct that contains data of the FF and PM including boundary types,
- * volume variables in both subdomains and geometric information
- */
- struct CParams
- {
- BoundaryTypes1 boundaryTypes1;
- BoundaryTypes2 boundaryTypes2;
- ElementVolumeVariables1 elemVolVarsPrev1;
- ElementVolumeVariables1 elemVolVarsCur1;
- ElementVolumeVariables2 elemVolVarsPrev2;
- ElementVolumeVariables2 elemVolVarsCur2;
- FVElementGeometry1 fvGeometry1;
- FVElementGeometry2 fvGeometry2;
- };
-
- GlobalProblem& globalProblem_;
-};
-
-} // end namespace Dumux
-
-#endif // DUMUX_2CSTOKES_2P2C_LOCALOPERATOR_HH
diff --git a/dumux/multidomain/2cstokes2p2c/newtoncontroller.hh b/dumux/multidomain/2cstokes2p2c/newtoncontroller.hh
deleted file mode 100644
index 982860f27864b09379ff85b0565f7cbdaadf1ad2..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cstokes2p2c/newtoncontroller.hh
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Reference implementation of a Newton controller for the coupling of a two-component Stokes model
- * and a two-phase two-component porous-medium model under isothermal conditions.
- */
-#ifndef DUMUX_2CSTOKES_2P2C_NEWTON_CONTROLLER_HH
-#define DUMUX_2CSTOKES_2P2C_NEWTON_CONTROLLER_HH
-
-#include <dumux/multidomain/newtoncontroller.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup Newton
- * \ingroup TwoPTwoCStokesTwoCModel
- * \ingroup TwoPTwoCZeroEqTwoCModel
- * \brief Implementation of a Newton controller for the coupling of a two-component Stokes model
- * and a two-phase two-component porous-medium model under isothermal conditions.
- *
- * The Newton controller ensures that the updateStaticData routine is called
- * in the porous-medium sub-problem
- */
-template <class TypeTag>
-class TwoCStokesTwoPTwoCNewtonController : public MultiDomainNewtonController<TypeTag>
-{
- typedef MultiDomainNewtonController<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
-
-public:
- //! \brief The constructor
- TwoCStokesTwoPTwoCNewtonController(const Problem &problem)
- : ParentType(problem)
- { }
-
- //! \copydoc NewtonController::newtonEndStep()
- void newtonEndStep(SolutionVector &uCurrentIter, SolutionVector &uLastIter)
- {
- ParentType::newtonEndStep(uCurrentIter, uLastIter);
-
- this->model_().sdModel2().updateStaticData(this->model_().sdModel2().curSol(),
- this->model_().sdModel2().prevSol());
- }
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_2CSTOKES_2P2C_NEWTON_CONTROLLER_HH
diff --git a/dumux/multidomain/2cstokes2p2c/problem.hh b/dumux/multidomain/2cstokes2p2c/problem.hh
deleted file mode 100644
index 47673ccacf5e7d1217620bea5496c015bb34bce6..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cstokes2p2c/problem.hh
+++ /dev/null
@@ -1,172 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief The problem class for the coupling of a isothermal two-component Stokes
- * and a isothermal two-phase two-component Darcy model.
- */
-
-#ifndef DUMUX_2C_STOKES_2P2C_PROBLEM_HH
-#define DUMUX_2C_STOKES_2P2C_PROBLEM_HH
-
-#include <dumux/freeflow/boundarylayermodel.hh>
-#include <dumux/freeflow/masstransfermodel.hh>
-#include <dumux/freeflow/stokesnc/properties.hh>
-#include <dumux/multidomain/problem.hh>
-#include <dumux/porousmediumflow/2p2c/implicit/properties.hh>
-
-#include "properties.hh"
-
-namespace Dumux
-{
-
-/*!
- * \ingroup TwoPTwoCStokesTwoCModel
- * \ingroup TwoPTwoCZeroEqTwoCModel
- * \brief The problem class for the coupling of a isothermal two-component Stokes
- * and a isothermal two-phase two-component Darcy model.
- */
-template <class TypeTag>
-class TwoCStokesTwoPTwoCProblem : public MultiDomainProblem<TypeTag>
-{
- typedef MultiDomainProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) Stokes2cTypeTag;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) TwoPTwoCTypeTag;
- typedef typename GET_PROP_TYPE(Stokes2cTypeTag, Indices) Stokes2cIndices;
- typedef typename GET_PROP_TYPE(TwoPTwoCTypeTag, Indices) TwoPTwoCIndices;
-
- // Stokes
- enum { numComponents1 = Stokes2cIndices::numComponents };
- enum { // component indices
- transportCompIdx1 = Stokes2cIndices::transportCompIdx, //!< Index of transported component
- phaseCompIdx1 = Stokes2cIndices::phaseCompIdx //!< Index of main component of the phase
- };
- // Darcy
- enum { // phase indices
- wPhaseIdx2 = TwoPTwoCIndices::wPhaseIdx, //!< Index for the liquid phase
- };
-
-public:
- //! The constructor
- template<class GridView>
- TwoCStokesTwoPTwoCProblem(TimeManager &timeManager,
- GridView gridView)
- : ParentType(timeManager, gridView)
- {
- blModel_ = GET_PARAM_FROM_GROUP(TypeTag, int, BoundaryLayer, Model);
- massTransferModel_ = GET_PARAM_FROM_GROUP(TypeTag, int, MassTransfer, Model);
- }
-
- /*!
- * \brief Returns a BoundaryLayerModel object
- *
- * \param cParams a parameter container
- * \param scvIdx1 The local index of the sub-control volume of the Stokes domain
- */
- template<typename CParams>
- BoundaryLayerModel<TypeTag> evalBoundaryLayerModel(CParams cParams, const int scvIdx1) const
- {
- // current position + additional virtual runup distance
- const Scalar distance = cParams.fvGeometry1.subContVol[scvIdx1].global[0]
- + GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, BoundaryLayer, Offset);
- BoundaryLayerModel<TypeTag> boundaryLayerModel(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefVelocity),
- distance,
- cParams.elemVolVarsCur1[scvIdx1].kinematicViscosity(),
- blModel_);
- if (blModel_ == 1)
- boundaryLayerModel.setConstThickness(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, BoundaryLayer, ConstThickness));
- if (blModel_ >= 4)
- boundaryLayerModel.setYPlus(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, BoundaryLayer, YPlus));
- if (blModel_ >= 5)
- boundaryLayerModel.setRoughnessLength(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, BoundaryLayer, RoughnessLength));
- if (blModel_ == 7)
- boundaryLayerModel.setHydraulicDiameter(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, BoundaryLayer, HydraulicDiameter));
-
- return boundaryLayerModel;
- }
-
- /*!
- * \brief Returns the concentration gradient through the boundary layer
- *
- * \param cParams a parameter container
- * \param scvIdx1 The local index of the sub-control volume of the Stokes domain
- */
- template<typename CParams>
- Scalar evalBoundaryLayerConcentrationGradient(CParams cParams, const int scvIdx1) const
- {
- static_assert(numComponents1 == 2,
- "This coupling condition is only implemented for two components.");
- Scalar massFractionOut = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefMassfrac);
- Scalar M1 = FluidSystem::molarMass(transportCompIdx1);
- Scalar M2 = FluidSystem::molarMass(phaseCompIdx1);
- Scalar X2 = 1.0 - massFractionOut;
- Scalar massToMoleDenominator = M2 + X2*(M1 - M2);
- Scalar moleFractionOut = massFractionOut * M2 /massToMoleDenominator;
-
- Scalar normalMoleFracGrad = cParams.elemVolVarsCur1[scvIdx1].moleFraction(transportCompIdx1)
- - moleFractionOut;
- return normalMoleFracGrad / asImp_().evalBoundaryLayerModel(cParams, scvIdx1).massBoundaryLayerThickness();
- }
-
- /*!
- * \brief Returns the mass transfer coefficient
- *
- * \param cParams a parameter container
- * \param scvIdx1 The local index of the sub-control volume of the Stokes domain
- * \param scvIdx2 The local index of the sub-control volume of the Darcy domain
- */
- template<typename CParams>
- Scalar evalMassTransferCoefficient(CParams cParams, const int scvIdx1, const int scvIdx2) const
- {
- MassTransferModel<TypeTag> massTransferModel(cParams.elemVolVarsCur2[scvIdx2].saturation(wPhaseIdx2),
- cParams.elemVolVarsCur2[scvIdx2].porosity(),
- asImp_().evalBoundaryLayerModel(cParams, scvIdx1).massBoundaryLayerThickness(),
- massTransferModel_);
- if (massTransferModel_ == 1)
- massTransferModel.setMassTransferCoeff(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, MassTransfer, Coefficient));
- if (massTransferModel_ == 2 || massTransferModel_ == 4)
- massTransferModel.setCharPoreRadius(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, MassTransfer, CharPoreRadius));
- if (massTransferModel_ == 3)
- massTransferModel.setCapillaryPressure(cParams.elemVolVarsCur2[scvIdx2].capillaryPressure());
-
- return massTransferModel.massTransferCoefficient();
- }
-
-private:
- //! Returns the implementation of the problem (i.e. static polymorphism)
- Implementation &asImp_()
- { return *static_cast<Implementation *>(this); }
-
- //! \copydoc asImp_()
- const Implementation &asImp_() const
- { return *static_cast<const Implementation *>(this); }
-
- unsigned int blModel_;
- unsigned int massTransferModel_;
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_2C_STOKES_2P2C_PROBLEM_HH
diff --git a/dumux/multidomain/2cstokes2p2c/properties.hh b/dumux/multidomain/2cstokes2p2c/properties.hh
deleted file mode 100644
index 36330a143e4838836ad6abca6b7efdb161f079df..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cstokes2p2c/properties.hh
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup MultidomainModel
- *
- * \brief Defines the properties required for the coupled 2cstokes2p2c model.
- */
-
-#ifndef DUMUX_TWOCSTOKESTWOPTWOC_PROPERTIES_HH
-#define DUMUX_TWOCSTOKESTWOPTWOC_PROPERTIES_HH
-
-#include <dumux/multidomain/propertydefaults.hh>
-
-namespace Dumux
-{
-
-////////////////////////////////
-// properties
-////////////////////////////////
-namespace Properties
-{
-
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tags for the coupled 2cstokes2p2c model
-NEW_TYPE_TAG(TwoCStokesTwoPTwoC, INHERITS_FROM(MultiDomain));
-
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-NEW_PROP_TAG(BoundaryLayerModel); //!< Type of the used boundary layer model
-NEW_PROP_TAG(MassTransferModel); //!< Type of the used mass transfer model
-
-} // end namespace properties
-
-} // end namespace Dumux
-
-
-#endif
diff --git a/dumux/multidomain/2cstokes2p2c/propertydefaults.hh b/dumux/multidomain/2cstokes2p2c/propertydefaults.hh
deleted file mode 100644
index 78bec087087806735e7e363f471fcc4308b1a14e..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cstokes2p2c/propertydefaults.hh
+++ /dev/null
@@ -1,66 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup MultidomainModel
- *
- * \brief Defines default values for the properties required by the
- * coupled 2cstokes2p2c model.
- */
-#ifndef DUMUX_TWOCSTOKESTWOPTWOC_PROPERTY_DEFAULTS_HH
-#define DUMUX_TWOCSTOKESTWOPTWOC_PROPERTY_DEFAULTS_HH
-
-#include "properties.hh"
-#include "newtoncontroller.hh"
-
-namespace Dumux
-{
-namespace Properties
-{
-//////////////////////////////////////////////////////////////////
-// Property defaults
-//////////////////////////////////////////////////////////////////
-
-// Specify the multidomain gridview
-SET_TYPE_PROP(TwoCStokesTwoPTwoC, GridView,
- typename GET_PROP_TYPE(TypeTag, MultiDomainGrid)::LeafGridView);
-
-// Specify the type of the used solution vector
-SET_TYPE_PROP(TwoCStokesTwoPTwoC, SolutionVector,
- typename GET_PROP_TYPE(TypeTag, MultiDomainGridOperator)::Traits::Domain);
-
-// Specif the used Newton controller
-SET_TYPE_PROP(TwoCStokesTwoPTwoC, NewtonController, TwoCStokesTwoPTwoCNewtonController<TypeTag>);
-
-// Set this to one here (must fit to the structure of the coupled matrix which has block length 1)
-SET_INT_PROP(TwoCStokesTwoPTwoC, NumEq, 1);
-
-// Specify the used boundary layer model
-SET_INT_PROP(TwoCStokesTwoPTwoC, BoundaryLayerModel, 0);
-
-// Specify the used mass transfer model
-SET_INT_PROP(TwoCStokesTwoPTwoC, MassTransferModel, 0);
-
-} // end namespace properties
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh b/dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh
deleted file mode 100644
index 83be63717c8855431eb1954a88b1def0a925380d..0000000000000000000000000000000000000000
--- a/dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh
+++ /dev/null
@@ -1,202 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Element-wise calculation of the Jacobian matrix for problems
- * using the coupled compositional Stokes box model.
- */
-
-#ifndef DUMUX_STOKESNC_COUPLING_LOCAL_RESIDUAL_HH
-#define DUMUX_STOKESNC_COUPLING_LOCAL_RESIDUAL_HH
-
-#include <dumux/freeflow/stokesnc/localresidual.hh>
-#include <dumux/freeflow/stokesnc/model.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup ImplicitLocalResidual
- * \ingroup TwoPTwoCStokesTwoCModel
- * \ingroup TwoPTwoCZeroEqTwoCModel
- * \brief Element-wise calculation of the Jacobian matrix for problems
- * using the coupled compositional Stokes box model.
- * It is derived from the compositional Stokes box model.
- */
-template<class TypeTag>
-class StokesncCouplingLocalResidual : public StokesncLocalResidual<TypeTag>
-{
- typedef StokesncLocalResidual<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- enum {
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
- numComponents = Indices::numComponents
- };
- enum {
- //indices of the equations
- massBalanceIdx = Indices::massBalanceIdx, //!< Index of the mass balance
-
- momentumXIdx = Indices::momentumXIdx, //!< Index of the x-component of the momentum balance
- momentumYIdx = Indices::momentumYIdx, //!< Index of the y-component of the momentum balance
- momentumZIdx = Indices::momentumZIdx, //!< Index of the z-component of the momentum balance
- lastMomentumIdx = Indices::lastMomentumIdx, //!< Index of the last component of the momentum balance
- transportEqIdx = Indices::transportEqIdx, //!< Index of the transport equation
- conti0EqIdx = Indices::conti0EqIdx
- };
- enum {
- //indices of phase and transported component
- phaseIdx = Indices::phaseIdx,
- transportCompIdx = Indices::transportCompIdx
- };
- enum {
- dimXIdx = Indices::dimXIdx, //!< Index for the first component of a vector
- dimYIdx = Indices::dimYIdx, //!< Index for the second component of a vector
- dimZIdx = Indices::dimZIdx //!< Index for the third component of a vector
- };
-
- typedef typename GridView::ctype CoordScalar;
-
- typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
- typedef Dune::FieldVector<Scalar, dim> DimVector;
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
-
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FluxVariables) FluxVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
-
- static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
-
-public:
- /*!
- * \brief Implementation of the boundary evaluation for the Stokes model
- *
- * Evaluate one part of the Dirichlet-like coupling conditions for a single
- * sub-control volume face; rest is done in the local coupling operator
- */
- void evalBoundary_()
- {
- ParentType::evalBoundary_();
-
- typedef Dune::ReferenceElements<Scalar, dim> ReferenceElements;
- typedef Dune::ReferenceElement<Scalar, dim> ReferenceElement;
- const ReferenceElement &refElement = ReferenceElements::general(this->element_().geometry().type());
-
- // loop over vertices of the element
- for (int scvIdx = 0; scvIdx < this->fvGeometry_().numScv; scvIdx++)
- {
- // consider only SCVs on the boundary
- if (this->fvGeometry_().subContVol[scvIdx].inner)
- continue;
-
- const BoundaryTypes &bcTypes = this->bcTypes_(scvIdx);
-
- // evaluate boundary conditions for the intersections of the current element
- for (const auto& intersection : intersections(this->gridView_(), this->element_()))
- {
- // handle only intersections on the boundary
- if (!intersection.boundary())
- continue;
-
- // assemble the boundary for all vertices of the current face
- const int fIdx = intersection.indexInInside();
- const int numFaceVertices = refElement.size(fIdx, 1, dim);
-
- // loop over the single vertices on the current face
- for (int faceVertexIdx = 0; faceVertexIdx < numFaceVertices; ++faceVertexIdx)
- {
- // only evaluate, if we consider the same face vertex as in the outer
- // loop over the element vertices
- if (refElement.subEntity(fIdx, 1, faceVertexIdx, dim) != scvIdx)
- continue;
-
- const int boundaryFaceIdx = this->fvGeometry_().boundaryFaceIndex(fIdx, faceVertexIdx);
- FluxVariables boundaryVars;
- boundaryVars.update(this->problem_(),
- this->element_(),
- this->fvGeometry_(),
- boundaryFaceIdx,
- this->curVolVars_(),
- true);
- const VolumeVariables &volVars = this->curVolVars_()[scvIdx];
-
- // set velocity normal to the interface
- if (bcTypes.isCouplingDirichlet(momentumYIdx))
- {
- this->residual_[scvIdx][momentumYIdx] = volVars.velocity()
- * boundaryVars.face().normal
- / boundaryVars.face().normal.two_norm();
- Valgrind::CheckDefined(this->residual_[scvIdx][momentumYIdx]);
- }
-
- // add pressure correction - required for pressure coupling,
- // if p.n comes from the pm
- if (bcTypes.isCouplingNeumann(momentumYIdx) || bcTypes.isCouplingMortar(momentumYIdx))
- {
- this->residual_[scvIdx][momentumYIdx] -= volVars.pressure()
- * boundaryVars.face().normal[momentumYIdx];
- Valgrind::CheckDefined(this->residual_[scvIdx][momentumYIdx]);
- }
-
- // set mole or mass fraction for the transported components
- for (int compIdx = 0; compIdx < numComponents; compIdx++)
- {
- int eqIdx = conti0EqIdx + compIdx;
- if ((eqIdx != massBalanceIdx) && bcTypes.isCouplingDirichlet(eqIdx))
- {
- if (useMoles)
- this->residual_[scvIdx][eqIdx] = volVars.moleFraction(compIdx);
- else
- this->residual_[scvIdx][eqIdx] = volVars.massFraction(compIdx);
- Valgrind::CheckDefined(this->residual_[scvIdx][compIdx]);
- }
- }
- }
- }
- }
- }
-
- /*!
- * \brief Removes the stabilization for the Stokes model.
- */
- void evalBoundaryPDELab_()
- {
- // loop over vertices of the element
- for (int scvIdx = 0; scvIdx < this->fvGeometry_().numScv; scvIdx++)
- {
- // consider only SCVs on the boundary
- if (this->fvGeometry_().subContVol[scvIdx].inner)
- continue;
-
- this->removeStabilizationAtBoundary_(scvIdx);
- }
- }
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_STOKESNC_COUPLING_LOCAL_RESIDUAL_HH
diff --git a/dumux/multidomain/CMakeLists.txt b/dumux/multidomain/CMakeLists.txt
deleted file mode 100644
index cadda95d1606bc15fcd5c268133be35f1ae68891..0000000000000000000000000000000000000000
--- a/dumux/multidomain/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-add_subdirectory(2cnistokes2p2cni)
-add_subdirectory(2cstokes2p2c)
-
-#install headers
-install(FILES
-assembler.hh
-boxcouplinglocalresidual.hh
-convergencewriter.hh
-localoperator.hh
-model.hh
-newtoncontroller.hh
-problem.hh
-properties.hh
-propertydefaults.hh
-splitandmerge.hh
-subdomainproperties.hh
-subdomainpropertydefaults.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/multidomain)
diff --git a/dumux/multidomain/assembler.hh b/dumux/multidomain/assembler.hh
deleted file mode 100644
index d4bfe93cf47bafaa0a8f4f536894ddb06e0fdc83..0000000000000000000000000000000000000000
--- a/dumux/multidomain/assembler.hh
+++ /dev/null
@@ -1,218 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief An assembler for the global Jacobian matrix for multidomain models.
- */
-
-#ifndef DUMUX_MULTIDOMAIN_ASSEMBLER_HH
-#define DUMUX_MULTIDOMAIN_ASSEMBLER_HH
-
-#include <dune/pdelab/constraints/common/constraintsparameters.hh>
-#include <dune/pdelab/multidomain/constraints.hh>
-
-#include "properties.hh"
-#include "propertydefaults.hh"
-
-namespace Dumux {
-
-/*!
- * \ingroup MultidomainModel
- * \brief An assembler for the global Jacobian matrix for multidomain models.
- */
-template<class TypeTag>
-class MultiDomainAssembler
-{
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) SubDomain1TypeTag;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) SubDomain2TypeTag;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, Problem) SubDomainProblem1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, Problem) SubDomainProblem2;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, LocalFEMSpace) FEM1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, LocalFEMSpace) FEM2;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, ScalarGridFunctionSpace) ScalarGridFunctionSpace1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, ScalarGridFunctionSpace) ScalarGridFunctionSpace2;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, GridFunctionSpace) GridFunctionSpace1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, GridFunctionSpace) GridFunctionSpace2;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, LocalOperator) LocalOperator1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, LocalOperator) LocalOperator2;
-
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGridFunctionSpace) MultiDomainGridFunctionSpace;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainCondition) MultiDomainCondition;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainSubProblem1) MultiDomainSubProblem1;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainSubProblem2) MultiDomainSubProblem2;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainCouplingLocalOperator) MultiDomainCouplingLocalOperator;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainCoupling) MultiDomainCoupling;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainConstraintsTrafo) MultiDomainConstraintsTrafo;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGridOperator) MultiDomainGridOperator;
-
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
-
- // copying the jacobian assembler is not a good idea
- MultiDomainAssembler(const MultiDomainAssembler &);
-
-public:
- //! \brief The constructor
- MultiDomainAssembler()
- {
- globalProblem_ = 0;
- sdProblem1_= 0;
- sdProblem2_= 0;
- }
-
- //! \brief The destructor
- ~MultiDomainAssembler()
- { }
-
- //! \copydoc ImplicitAssembler::init()
- void init(Problem& problem)
- {
- globalProblem_ = &problem;
- sdProblem1_ = &globalProblem_->sdProblem1();
- sdProblem2_ = &globalProblem_->sdProblem2();
-
- fem1_ = std::make_shared<FEM1>(globalProblem_->sdGridView1());
- fem2_ = std::make_shared<FEM2>(globalProblem_->sdGridView2());
-
- scalarGridFunctionSpace1_ = std::make_shared<ScalarGridFunctionSpace1>(globalProblem_->sdGridView1(),
- *fem1_);
- scalarGridFunctionSpace2_ = std::make_shared<ScalarGridFunctionSpace2>(globalProblem_->sdGridView2(),
- *fem2_);
-
- gridFunctionSpace1_ = std::make_shared<GridFunctionSpace1>(*scalarGridFunctionSpace1_);
- gridFunctionSpace2_ = std::make_shared<GridFunctionSpace2>(*scalarGridFunctionSpace2_);
-
- mdGridFunctionSpace_ = std::make_shared<MultiDomainGridFunctionSpace>(globalProblem_->mdGrid(),
- *gridFunctionSpace1_,
- *gridFunctionSpace2_);
-
- localOperator1_ = std::make_shared<LocalOperator1>(sdProblem1_->model());
- localOperator2_ = std::make_shared<LocalOperator2>(sdProblem2_->model());
-
- condition1_ = std::make_shared<MultiDomainCondition>(0);
- condition2_ = std::make_shared<MultiDomainCondition>(1);
-
- mdSubProblem1_ = std::make_shared<MultiDomainSubProblem1>(*localOperator1_, *condition1_);
- mdSubProblem2_ = std::make_shared<MultiDomainSubProblem2>(*localOperator2_, *condition2_);
-
- couplingLocalOperator_ = std::make_shared<MultiDomainCouplingLocalOperator>(*globalProblem_);
- mdCoupling_ = std::make_shared<MultiDomainCoupling>(*mdSubProblem1_, *mdSubProblem2_, *couplingLocalOperator_);
-
- constraintsTrafo_ = std::make_shared<MultiDomainConstraintsTrafo>();
-
- mdGridOperator_ = std::make_shared<MultiDomainGridOperator>(*mdGridFunctionSpace_, *mdGridFunctionSpace_,
- *constraintsTrafo_, *constraintsTrafo_,
- *mdSubProblem1_, *mdSubProblem2_, *mdCoupling_);
-
- matrix_ = std::make_shared<JacobianMatrix>(*mdGridOperator_);
- residual_ = std::make_shared<SolutionVector>(*mdGridFunctionSpace_);
- }
-
- //! \copydoc ImplicitAssembler::assemble()
- void assemble()
- {
- // assemble the matrix
- *matrix_ = 0;
- mdGridOperator_->jacobian(globalProblem_->model().curSol(), *matrix_);
-
- // calculate the global residual
- *residual_ = 0;
- mdGridOperator_->residual(globalProblem_->model().curSol(), *residual_);
- }
-
- //! \copydoc ImplicitAssembler::reassembleAll()
- void reassembleAll()
- { }
-
- //! \copydoc ImplicitAssembler::matrix()
- const JacobianMatrix &matrix() const
- { return *matrix_; }
- JacobianMatrix &matrix()
- { return *matrix_; }
-
- //! \copydoc ImplicitAssembler::residual()
- const SolutionVector &residual() const
- { return *residual_; }
- SolutionVector &residual()
- { return *residual_; }
-
- /*!
- * \brief Return constant reference to the multidomain gridfunctionspace
- */
- MultiDomainGridFunctionSpace &gridFunctionSpace() const
- { return *mdGridFunctionSpace_; }
-
- /*!
- * \brief Return constant reference to the multidomain gridfunctionspace
- */
- MultiDomainGridFunctionSpace &mdGridFunctionSpace() const
- { return *mdGridFunctionSpace_; }
-
- /*!
- * \brief Return the multidomain constraints transformation
- */
- MultiDomainConstraintsTrafo &constraintsTrafo() const
- { return *constraintsTrafo_; }
-
-private:
- Problem *globalProblem_;
- SubDomainProblem1 *sdProblem1_;
- SubDomainProblem2 *sdProblem2_;
-
- std::shared_ptr<FEM1> fem1_;
- std::shared_ptr<FEM2> fem2_;
-
- std::shared_ptr<ScalarGridFunctionSpace1> scalarGridFunctionSpace1_;
- std::shared_ptr<ScalarGridFunctionSpace2> scalarGridFunctionSpace2_;
-
- std::shared_ptr<GridFunctionSpace1> gridFunctionSpace1_;
- std::shared_ptr<GridFunctionSpace2> gridFunctionSpace2_;
- std::shared_ptr<MultiDomainGridFunctionSpace> mdGridFunctionSpace_;
-
- std::shared_ptr<LocalOperator1> localOperator1_;
- std::shared_ptr<LocalOperator2> localOperator2_;
-
- std::shared_ptr<MultiDomainCondition> condition1_;
- std::shared_ptr<MultiDomainCondition> condition2_;
-
- std::shared_ptr<MultiDomainSubProblem1> mdSubProblem1_;
- std::shared_ptr<MultiDomainSubProblem2> mdSubProblem2_;
-
- std::shared_ptr<MultiDomainCouplingLocalOperator> couplingLocalOperator_;
- std::shared_ptr<MultiDomainCoupling> mdCoupling_;
-
- std::shared_ptr<MultiDomainConstraintsTrafo> constraintsTrafo_;
- std::shared_ptr<MultiDomainGridOperator> mdGridOperator_;
-
- std::shared_ptr<JacobianMatrix> matrix_;
-
- std::shared_ptr<SolutionVector> residual_;
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_MULTIDOMAIN_ASSEMBLER_HH
diff --git a/dumux/multidomain/boxcouplinglocalresidual.hh b/dumux/multidomain/boxcouplinglocalresidual.hh
deleted file mode 100644
index 0a8057b1c8efc526ca0fe6784b7074d953017e40..0000000000000000000000000000000000000000
--- a/dumux/multidomain/boxcouplinglocalresidual.hh
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Element-wise calculation of the Jacobian matrix for problems
- * using the coupled box model.
- */
-#ifndef DUMUX_BOX_COUPLING_LOCAL_RESIDUAL_HH
-#define DUMUX_BOX_COUPLING_LOCAL_RESIDUAL_HH
-
-#include <dumux/implicit/box/localresidual.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup ImplicitLocalResidual
- * \ingroup TwoPTwoCNIStokesTwoCNIModel
- * \ingroup TwoPTwoCNIZeroEqTwoCNIModel
- * \brief Element-wise calculation of the Jacobian matrix for problems
- * using the coupled box model.
- */
-template<class TypeTag>
-class BoxCouplingLocalResidual : public BoxLocalResidual<TypeTag>
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
- enum {
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
-
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GridView::Grid::ctype CoordScalar;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-
- typedef typename GET_PROP_TYPE(TypeTag, ElementBoundaryTypes) ElementBoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
-
- // copying the local residual class is not a good idea
- BoxCouplingLocalResidual(const BoxCouplingLocalResidual &);
-
-public:
- //! \brief The constructor
- BoxCouplingLocalResidual()
- { }
-
- /*!
- * \brief Compute the local residual, i.e. the deviation of the
- * equations from zero. Calls evalBoundaryPDELab,
- * where the stabilization of the mass balance (stokes)
- * is removed. No further boundary conditions are employed.
- *
- * \param element The DUNE Codim<0> entity for which the residual
- * ought to be calculated
- * \param fvGeometry The finite-volume geometry of the element
- * \param prevVolVars The volume averaged variables for all
- * sub-control volumes of the element at the previous
- * time level
- * \param curVolVars The volume averaged variables for all
- * sub-control volumes of the element at the current
- * time level
- * \param bcTypes The types of the boundary conditions for all
- * vertices of the element
- */
- void evalPDELab(const Element &element,
- const FVElementGeometry &fvGeometry,
- const ElementVolumeVariables &prevVolVars,
- const ElementVolumeVariables &curVolVars,
- const ElementBoundaryTypes &bcTypes)
- {
- const int numVerts = fvGeometry.numScv;
-#if HAVE_VALGRIND
- for (int i=0; i < numVerts; i++) {
- Valgrind::CheckDefined(prevVolVars[i]);
- Valgrind::CheckDefined(curVolVars[i]);
- }
-#endif // HAVE_VALGRIND
-
- this->elemPtr_ = &element;
- this->fvElemGeomPtr_ = &fvGeometry;
- this->bcTypesPtr_ = &bcTypes;
- this->prevVolVarsPtr_ = &prevVolVars;
- this->curVolVarsPtr_ = &curVolVars;
-
- // reset residual
- this->residual_.resize(numVerts);
- this->storageTerm_.resize(numVerts);
-
- this->residual_ = 0;
- this->storageTerm_ = 0;
-
- asImp_().evalFluxes_();
- asImp_().evalVolumeTerms_();
-
- // evaluate the boundary (modified version)
- asImp_().evalBoundaryPDELab_();
-
-#if HAVE_VALGRIND
- for (int i=0; i < numVerts; i++)
- Valgrind::CheckDefined(this->residual_[i]);
-#endif // HAVE_VALGRIND
- }
-
-protected:
- /*!
- * \brief Empty method, has to be overwritten if required.
- * Called e.g. for the removal of the stabilization of the
- * stokes model.
- */
- void evalBoundaryPDELab_()
- { }
-
- Implementation &asImp_()
- {
- assert(static_cast<Implementation*>(this) != 0);
- return *static_cast<Implementation*>(this);
- }
-
- const Implementation &asImp_() const
- {
- assert(static_cast<const Implementation*>(this) != 0);
- return *static_cast<const Implementation*>(this);
- }
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_BOX_COUPLING_LOCAL_RESIDUAL_HH
diff --git a/dumux/multidomain/convergencewriter.hh b/dumux/multidomain/convergencewriter.hh
deleted file mode 100644
index 01c959c261f9e671ea9295aa94308e577903a1a1..0000000000000000000000000000000000000000
--- a/dumux/multidomain/convergencewriter.hh
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Reference implementation of a newton convergence writer for coupled problems.
-*/
-#ifndef DUMUX_MULTIDOMAIN_CONVERGENCEWRITER_HH
-#define DUMUX_MULTIDOMAIN_CONVERGENCEWRITER_HH
-
-#include <dune/grid/multidomaingrid.hh>
-#include <dune/pdelab/backend/istlsolverbackend.hh>
-
-#include <dumux/io/vtkmultiwriter.hh>
-
-#include "splitandmerge.hh"
-#include "newtoncontroller.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup MultidomainModel
- * \brief Writes the intermediate solutions during
- * the Newton scheme
- */
-template <class TypeTag>
-struct MultiDomainConvergenceWriter
-{
- typedef typename GET_PROP_TYPE(TypeTag, NewtonController) NewtonController;
-
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, SplitAndMerge) SplitAndMerge;
-
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) SubDomain1TypeTag;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) SubDomain2TypeTag;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, GridView) GridView1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, GridView) GridView2;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, SolutionVector) SolutionVector1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, SolutionVector) SolutionVector2;
-
- typedef VtkMultiWriter<GridView1> VtkMultiWriter1;
- typedef VtkMultiWriter<GridView2> VtkMultiWriter2;
-
- /*!
- * \brief The constructor
- * \param ctl The newton controller
- */
- MultiDomainConvergenceWriter(NewtonController &ctl)
- : ctl_(ctl)
- {
- timeStepIndex_ = 0;
- iteration_ = 0;
- vtkMultiWriter1_ = 0;
- vtkMultiWriter2_ = 0;
- }
-
- /*!
- * \brief Start and advance in time
- */
- void beginTimestep()
- {
- ++timeStepIndex_;
- iteration_ = 0;
- }
-
- /*!
- * \brief Start and advance one iteration
- *
- * \param gridView1 The grid view of sub problem 1
- * \param gridView2 The grid view of sub problem 2
- */
- void beginIteration(const GridView1 &gridView1,
- const GridView2 &gridView2)
- {
- ++ iteration_;
- if (!vtkMultiWriter1_)
- vtkMultiWriter1_ = std::make_shared<VtkMultiWriter2>(gridView1, "convergence1");
- vtkMultiWriter1_->beginWrite(timeStepIndex_ + iteration_ / 100.0);
-
- if (!vtkMultiWriter2_)
- vtkMultiWriter2_ = std::make_shared<VtkMultiWriter2>(gridView2, "convergence2");
- vtkMultiWriter2_->beginWrite(timeStepIndex_ + iteration_ / 100.0);
- }
-
- /*!
- * \brief Write convergence to vtk
- *
- * \param uLastIter The solution of the last iteration
- * \param deltaU The delta as calculated from solving the linear
- * system of equations. This parameter also stores
- * the updated solution.
- */
- void writeFields(const SolutionVector &uLastIter,
- const SolutionVector &deltaU)
- {
- SolutionVector1 uLastIter1(ctl_.method().model().sdModel1().curSol());
- SolutionVector2 uLastIter2(ctl_.method().model().sdModel2().curSol());
- SolutionVector1 deltaU1(uLastIter1);
- SolutionVector2 deltaU2(uLastIter2);
-
- SplitAndMerge::splitSolVector(uLastIter, uLastIter1, uLastIter2);
- SplitAndMerge::splitSolVector(deltaU, deltaU1, deltaU2);
-
- std::cout << "\nWriting convergence file of current Newton iteration\n";
- ctl_.method().model().sdModel1().addConvergenceVtkFields(*vtkMultiWriter1_, uLastIter1, deltaU1);
- ctl_.method().model().sdModel2().addConvergenceVtkFields(*vtkMultiWriter2_, uLastIter2, deltaU2);
- }
-
- //! \brief End of iteration
- void endIteration()
- {
- vtkMultiWriter1_->endWrite();
- vtkMultiWriter2_->endWrite();
- }
-
- //! \brief End of time step
- void endTimestep()
- {
- iteration_ = 0;
- }
-
-private:
- int timeStepIndex_;
- int iteration_;
- std::shared_ptr<VtkMultiWriter1> vtkMultiWriter1_;
- std::shared_ptr<VtkMultiWriter2> vtkMultiWriter2_;
- NewtonController &ctl_;
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_MULTIDOMAIN_CONVERGENCEWRITER_HH
diff --git a/dumux/multidomain/localoperator.hh b/dumux/multidomain/localoperator.hh
deleted file mode 100644
index 84bf4a0eabd5e0fbb5a104788d8e0dc0234f3793..0000000000000000000000000000000000000000
--- a/dumux/multidomain/localoperator.hh
+++ /dev/null
@@ -1,134 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Local operator base class for multidomain problems
- */
-
-#ifndef DUMUX_MULTIDOMAIN_LOCAL_OPERATOR_HH
-#define DUMUX_MULTIDOMAIN_LOCAL_OPERATOR_HH
-
-#include<dune/pdelab/localoperator/pattern.hh>
-#include<dune/pdelab/localoperator/flags.hh>
-
-#include <dumux/implicit/box/properties.hh>
-
-namespace Dumux {
-
-namespace PDELab {
-
-/*!
- * \ingroup MultidomainModel
- * \brief Local operator base class for multidomain problems
- */
-template<class TypeTag>
-class MultiDomainLocalOperator
- : public Dune::PDELab::FullVolumePattern,
- public Dune::PDELab::LocalOperatorDefaultFlags
-{
- // copying the local operator for PDELab is not a good idea
- MultiDomainLocalOperator(const MultiDomainLocalOperator &);
-
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
-
- enum{numEq = GET_PROP_VALUE(TypeTag, NumEq)};
-
-public:
- // pattern assembly flags
- enum { doPatternVolume = true };
-
- // residual assembly flags
- enum { doAlphaVolume = true };
-
- //! \brief The constructor
- MultiDomainLocalOperator(Model &model)
- : model_(model)
- {}
-
- /*!
- * \brief Volume integral depending on test and ansatz functions
- *
- * \tparam EG Element geometry
- * \tparam LFSU Local function space for ansatz functions
- * \tparam X Coefficient vector
- * \tparam LFSV Local function space for test functions
- * \tparam R Residual vector
- *
- * \param eg Element geometry
- * \param lfsu Local functions space for ansatz functions
- * \param x Coefficient vector
- * \param lfsv Local function space for test functions
- * \param r Residual vector
- */
- template<typename EG, typename LFSU, typename X, typename LFSV, typename R>
- void alpha_volume (const EG& eg, const LFSU& lfsu, const X& x,
- const LFSV& lfsv, R& r) const
- {
- typedef typename LFSU::Traits::SizeType size_type;
-
- model_.localResidual().eval(model_.gridView().grid().subDomainEntityPointer(eg.entity()));
-
- int numVertices = x.size()/numEq;
- for (size_type comp = 0; comp < r.size(); comp++)
- r.accumulate(lfsv, comp, model_.localResidual().residual(comp%numVertices)[comp/numVertices]);
- }
-
- /*!
- * \brief Jacobian of volume term
- *
- * \tparam EG Element geometry
- * \tparam LFSU Local function space for ansatz functions
- * \tparam X Coefficient vector
- * \tparam LFSV Local function space for test functions
- * \tparam M Matrix
- *
- * \param eg Element geometry
- * \param lfsu Local functions space for ansatz functions
- * \param x Coefficient vector
- * \param lfsv Local function space for test functions
- * \param mat Matrix
- */
- template<typename EG, typename LFSU, typename X, typename LFSV, typename M>
- void jacobian_volume (const EG& eg,
- const LFSU& lfsu,
- const X& x,
- const LFSV& lfsv,
- M& mat) const
- {
- typedef typename LFSU::Traits::SizeType size_typeU;
- typedef typename LFSV::Traits::SizeType size_typeV;
-
- model_.localJacobian().assemble(model_.gridView().grid().subDomainEntityPointer(eg.entity()));
-
- int numVertices = x.size()/numEq;
- for (size_typeV j=0; j<lfsv.size(); j++) {
- for (size_typeU i=0; i<lfsu.size(); i++) {
- mat.accumulate(lfsv, i, lfsu, j, (model_.localJacobian().mat(i%numVertices,j%numVertices))[i/numVertices][j/numVertices]);
- }
- }
- }
-
-private:
- Model& model_;
-};
-
-} // namespace PDELab
-} // namespace Dumux
-
-#endif // DUMUX_MULTIDOMAIN_LOCAL_OPERATOR_HH
diff --git a/dumux/multidomain/model.hh b/dumux/multidomain/model.hh
deleted file mode 100644
index 5349abba2b4298833086a0ec772e16e95ad4060e..0000000000000000000000000000000000000000
--- a/dumux/multidomain/model.hh
+++ /dev/null
@@ -1,324 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief The base class of models which consist of two arbitrary
- * sub-models which are coupled
- */
-
-#ifndef DUMUX_MULTIDOMAIN_MODEL_HH
-#define DUMUX_MULTIDOMAIN_MODEL_HH
-
-#include "properties.hh"
-#include "propertydefaults.hh"
-#include "problem.hh"
-#include "convergencewriter.hh"
-#include "newtoncontroller.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup MultidomainModel
- * \brief The base class of models which consist of two arbitrary
- * sub-models which are coupled
- */
-template<class TypeTag>
-class MultiDomainModel
-{
- typedef typename GET_PROP_TYPE(TypeTag, Model) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonController) NewtonController;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
-
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) SubDomain1TypeTag;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) SubDomain2TypeTag;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, Problem) SubDomainProblem1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, Problem) SubDomainProblem2;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, Model) SubDomainModel1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, Model) SubDomainModel2;
-
- typedef typename GET_PROP_TYPE(TypeTag, SplitAndMerge) SplitAndMerge;
-
- enum {
- numEq1 = GET_PROP_VALUE(TypeTag, NumEq1),
- numEq2 = GET_PROP_VALUE(TypeTag, NumEq2)
- };
-
-public:
- /*!
- * \brief Apply the initial conditions to the model.
- *
- * \param problem The problem
- */
- void init(Problem &problem)
- {
- problem_ = &problem;
-
- // the two sub models have already been initialized by the
- // sub-problems!
- jacAsm_ = std::make_shared<JacobianAssembler>();
- jacAsm_->init(problem);
-
- uCur_ = std::make_shared<SolutionVector>(jacAsm_->gridFunctionSpace());
- uPrev_ = std::make_shared<SolutionVector>(jacAsm_->gridFunctionSpace());
-
- *uCur_= 0;
- *uPrev_= 0;
-
- SplitAndMerge::mergeSolVectors(sdModel1().curSol(),
- sdModel2().curSol(),
- *uCur_);
- SplitAndMerge::mergeSolVectors(sdModel1().prevSol(),
- sdModel2().prevSol(),
- *uPrev_);
- }
-
- /*!
- * \brief Reference to the current solution as a block vector.
- */
- SolutionVector &curSol()
- { return *uCur_; }
-
- //! \brief \copydoc curSol()
- const SolutionVector &curSol() const
- { return *uCur_; }
-
- /*!
- * \brief Reference to the previous solution as a block vector.
- */
- SolutionVector &prevSol()
- { return *uPrev_; }
-
- //! \brief \copydoc prevSol()
- const SolutionVector &prevSol() const
- { return *uPrev_; }
-
- /*!
- * \brief Returns the operator assembler for the global jacobian of
- * the problem.
- */
- JacobianAssembler &jacobianAssembler()
- { return *jacAsm_; }
-
- //! \brief \copydoc jacobianAssembler()
- const JacobianAssembler &jacobianAssembler() const
- { return *jacAsm_; }
-
- /*!
- * \brief A reference to the problem on which the model is applied.
- */
- Problem &problem()
- { return *problem_; }
-
- //! \brief \copydoc problem()
- const Problem &problem() const
- { return *problem_; }
-
- /*!
- * \brief A reference to the problem on which the model is applied.
- */
- SubDomainProblem1 &sdProblem1()
- { return problem().sdProblem1(); }
-
- //! \brief \copydoc sdProblem1()
- const SubDomainProblem1 &sdProblem1() const
- { return problem().sdProblem1(); }
-
- /*!
- * \brief A reference to the problem on which the model is applied.
- */
- SubDomainProblem2 &sdProblem2()
- { return problem().sdProblem2(); }
-
- //! \brief \copydoc sdProblem2()
- const SubDomainProblem2 &sdProblem2() const
- { return problem().sdProblem2(); }
-
- /*!
- * \brief A reference to the first sub-problem's model.
- */
- SubDomainModel1 &sdModel1()
- { return sdProblem1().model(); }
-
- //! \brief \copydoc sdModel1()
- const SubDomainModel1 &sdModel1() const
- { return sdProblem1().model(); }
-
- /*!
- * \brief A reference to the second sub-problem's model.
- */
- SubDomainModel2 &sdModel2()
- { return sdProblem2().model(); }
-
- //! \brief \copydoc sdModel2()
- const SubDomainModel2 &sdModel2() const
- { return sdProblem2().model(); }
-
- //! \copydoc ImplicitModel::update()
- bool update(NewtonMethod &solver,
- NewtonController &controller)
- {
-#if HAVE_VALGRIND
- for (size_t i = 0; i < curSol().base().size(); ++i)
- Valgrind::CheckDefined(curSol().base()[i]);
-#endif // HAVE_VALGRIND
-
- asImp_().updateBegin();
-
- bool converged = solver.execute(controller);
- if (!converged)
- asImp_().updateFailed();
- else
- asImp_().updateSuccessful();
-
-#if HAVE_VALGRIND
- for (size_t i = 0; i < curSol().base().size(); ++i) {
- Valgrind::CheckDefined(curSol().base()[i]);
- }
-#endif // HAVE_VALGRIND
-
- return converged;
- }
-
-
- //! \copydoc ImplicitModel::checkPlausibility()
- void checkPlausibility() const
- { }
-
- //! \copydoc ImplicitModel::updateBegin()
- void updateBegin()
- {
- sdModel1().updateBegin();
- sdModel2().updateBegin();
-
- SplitAndMerge::mergeSolVectors(sdModel1().curSol(), sdModel2().curSol(), *uCur_);
- }
-
- //! \copydoc ImplicitModel::updateSuccessful()
- void updateSuccessful()
- {
- sdModel1().updateSuccessful();
- sdModel2().updateSuccessful();
- }
-
- /*!
- * \brief Called by the problem if a timeintegration was
- * successful, post processing of the solution is done and the
- * result has been written to disk.
- *
- * This should perpare the model for the next time integration.
- * Note, that the advanceTimeLevel() methods of the sub-models
- * have already been called by the individual sub problems...
- */
- void advanceTimeLevel()
- {
- // merge the two sub-vectors together
- SplitAndMerge::mergeSolVectors(sdModel1().curSol(), sdModel2().curSol(), *uCur_);
- SplitAndMerge::mergeSolVectors(sdModel1().prevSol(), sdModel2().prevSol(), *uPrev_);
- }
-
- //! \copydoc ImplicitModel::updateFailed()
- void updateFailed()
- {
- sdModel1().updateFailed();
- sdModel2().updateFailed();
-
- // merge the two sub-vectors together
- SplitAndMerge::mergeSolVectors(sdModel1().curSol(), sdModel2().curSol(), *uCur_);
- }
-
- /*!
- * \brief Called by the update() method if a try was
- * unsuccessful. This is primary a hook which the
- * actual model can overload.
- */
- void updateFailedTry()
- {
- sdModel1().updateFailedTry();
- sdModel2().updateFailedTry();
-
- // merge the two sub-vectors together
- SplitAndMerge::mergeSolVectors(sdModel1().curSol(), sdModel2().curSol(), *uCur_);
- }
-
- /*!
- * \brief Calculate the global residual.
- *
- * \param globResidual The global residual
- *
- * The global deflection of the balance equation from zero.
- */
- void evalGlobalResidual(SolutionVector &globResidual)
- {
- DUNE_THROW(Dune::NotImplemented, "");
- }
-
- //! \copydoc ImplicitModel::serialize()
- template <class Restarter>
- void serialize(Restarter &res)
- {
- sdProblem1().serialize(res);
- sdProblem2().serialize(res);
- }
-
- //! \copydoc ImplicitModel::deserialize()
- template <class Restarter>
- void deserialize(Restarter &res)
- {
- sdProblem1().deserialize(res);
- sdProblem2().deserialize(res);
- wasRestarted_ = true;
- }
-
- //! \copydoc ImplicitModel::resetJacobianAssembler()
- void resetJacobianAssembler()
- {
- jacAsm_.template reset<JacobianAssembler>(0);
- jacAsm_ = std::make_shared<JacobianAssembler>(asImp_(), problem());
- }
-
-
-protected:
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
-
- // the problem we want to solve. defines the constitutive
- // relations, material laws, etc.
- Problem *problem_;
-
- // the jacobian assembler
- std::shared_ptr<JacobianAssembler> jacAsm_;
-
- // cur is the current solution, prev the solution of the previous
- // time step
- std::shared_ptr<SolutionVector> uCur_;
- std::shared_ptr<SolutionVector> uPrev_;
-
- bool wasRestarted_;
-};
-} // namespace Dumux
-
-#endif // DUMUX_MULTIDOMAIN_MODEL_HH
diff --git a/dumux/multidomain/newtoncontroller.hh b/dumux/multidomain/newtoncontroller.hh
deleted file mode 100644
index 1fefd9ac3d8ac123b1a4685b9956b7e383bad223..0000000000000000000000000000000000000000
--- a/dumux/multidomain/newtoncontroller.hh
+++ /dev/null
@@ -1,313 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Newton controller for multidomain problems
- */
-#ifndef DUMUX_MULTIDOMAIN_NEWTON_CONTROLLER_HH
-#define DUMUX_MULTIDOMAIN_NEWTON_CONTROLLER_HH
-
-#include <dumux/nonlinear/newtoncontroller.hh>
-#include "convergencewriter.hh"
-
-namespace Dumux
-{
-template <class TypeTag>
-class MultiDomainNewtonController;
-
-template <class TypeTag>
-struct MultiDomainConvergenceWriter;
-
-namespace Properties
-{
-NEW_PROP_TAG(NewtonWriteConvergence);
-
-// set default values for Newton for multidomain problems
-// they can be overwritten in the parameter file
-SET_INT_PROP(MultiDomain, NewtonTargetSteps, 8);
-SET_INT_PROP(MultiDomain, NewtonMaxSteps, 15);
-SET_SCALAR_PROP(MultiDomain, NewtonMaxRelativeShift, 1e-5);
-SET_BOOL_PROP(MultiDomain, NewtonWriteConvergence, false);
-}
-
-
-/*!
- * \ingroup Newton
- * \ingroup MultidomainModel
- * \brief Reference implementation of a newton controller for coupled problems.
- *
- * If you want to specialize only some methods but are happy with
- * the defaults of the reference controller, derive your
- * controller from this class and simply overload the required
- * methods.
- */
-template <class TypeTag>
-class MultiDomainNewtonController : public NewtonController<TypeTag>
-{
- typedef NewtonController<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonController) Implementation;
-
- typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, SplitAndMerge) SplitAndMerge;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
-
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) SubDomain1TypeTag;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) SubDomain2TypeTag;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, GridView) GridView1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, GridView) GridView2;
-
- typedef MultiDomainConvergenceWriter<TypeTag> ConvergenceWriter;
- typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) LinearSolver;
-
-public:
- /*!
- * \brief Constructor
- *
- * \param problem The problem
- */
- MultiDomainNewtonController(const Problem &problem)
- : ParentType(problem)
- , endIterMsgStream_(std::ostringstream::out)
- , linearSolver_(problem)
- , convergenceWriter_(asImp_())
- {
- std::cout << "NewtonMaxRelativeShift= "
- << PROP_DIAGNOSTIC(TypeTag, NewtonMaxRelativeShift)
- << ", "
- << GET_PROP_VALUE(TypeTag, NewtonMaxRelativeShift)
- << std::endl;
- }
-
- //! \copydoc ParentType::newtonUpdateShift()
- void newtonUpdateShift(const SolutionVector &uLastIter,
- const SolutionVector &deltaU)
- {
- // calculate the relative error as the maximum relative
- // deflection in any degree of freedom.
- this->shift_ = 0;
-
- SolutionVector uNewI = uLastIter;
- uNewI -= deltaU;
-
- using std::abs;
- using std::max;
- for (unsigned int i = 0; i < uLastIter.base().size(); ++i) {
- for (unsigned int j = 0; j < uLastIter.base()[i].size(); ++j) {
- Scalar vertexError = abs(deltaU.base()[i][j]);
- vertexError /= max<Scalar>(1.0, abs(uLastIter.base()[i][j] + uNewI.base()[i][j])/2);
-
- this->shift_ = max(this->shift_, vertexError);
- }
- }
- }
-
- /*!
- * \brief Solve the linear system of equations
- * \f$ \mathbf{A} x - b = 0\f$.
- *
- * \param A Coefficient matrix A
- * \param x Vector of unknowns
- * \param b Right hand side
- *
- * Throws NumericalProblem if the linear solver didn't
- * converge.
- */
- template <class Matrix, class Vector>
- void newtonSolveLinear(Matrix &A,
- Vector &x,
- Vector &b)
- {
- // if the deflection of the newton method is large, we do not
- // need to solve the linear approximation accurately. Assuming
- // that the initial value for the delta vector u is quite
- // close to the final value, a reduction of 6 orders of
- // magnitude in the defect should be sufficient...
- try {
- int converged = linearSolver_.solve(A.base(), x.base(), b.base());
-
-#if HAVE_MPI
- // make sure all processes converged
- int convergedSend = 1;
- MPI_Allreduce(/*sendBuf=*/&convergedSend,
- /*recvBuf=*/&converged,
- /*count=*/1,
- MPI_INT,
- MPI_MIN,
- MPI_COMM_WORLD);
-#endif
- if (!converged) {
- DUNE_THROW(NumericalProblem,
- "Linear solver did not converge");
- }
- }
- catch (const Dune::MatrixBlockError &e) {
-#if HAVE_MPI
- // make sure all processes converged
- int convergedSend = 0;
- int converged;
-
- MPI_Allreduce(/*sendBuf=*/&convergedSend,
- /*recvBuf=*/&converged,
- /*count=*/1,
- MPI_INT,
- MPI_MIN,
- MPI_COMM_WORLD);
-#endif
-
- NumericalProblem p;
- std::string msg;
- std::ostringstream ms(msg);
- ms << e.what() << "M=" << A.base()[e.r][e.c];
- p.message(ms.str());
- throw p;
- }
- catch (const Dune::Exception &e) {
-#if HAVE_MPI
- // make sure all processes converged
- int convergedSend = 0;
- int converged;
-
- MPI_Allreduce(/*sendBuf=*/&convergedSend,
- /*recvBuf=*/&converged,
- /*count=*/1,
- MPI_INT,
- MPI_MIN,
- MPI_COMM_WORLD);
-#endif
-
- NumericalProblem p;
- p.message(e.what());
- throw p;
- }
- }
-
- /*!
- * \brief Update the current solution function with a delta vector.
- *
- * The error estimates required for the newtonConverged() and
- * newtonProceed() methods should be updated here.
- *
- * Different update strategies, such as line search and chopped
- * updates can be implemented. The default behaviour is just to
- * subtract deltaU from uLastIter.
- *
- * \param uCurrentIter The solution of the current iteration
- * \param uLastIter The solution of the last iteration
- * \param deltaU The delta as calculated from solving the linear
- * system of equations. This parameter also stores
- * the updated solution.
- *
- */
- void newtonUpdate(SolutionVector &uCurrentIter,
- const SolutionVector &uLastIter,
- const SolutionVector &deltaU)
- {
- if (GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, WriteConvergence)) {
- writeConvergence_(uLastIter, deltaU);
- }
-
- newtonUpdateShift(uLastIter, deltaU);
-
- uCurrentIter = uLastIter;
- uCurrentIter -= deltaU;
- }
-
- /*!
- * \brief Indicates that one newton iteration was finished.
- *
- * \param uCurrentIter The solution of the current iteration
- * \param uLastIter The solution of the last iteration
- *
- */
- void newtonEndStep(SolutionVector &uCurrentIter, SolutionVector &uLastIter)
- {
- SplitAndMerge::splitSolVector(this->model_().curSol(),
- this->model_().sdModel1().curSol(),
- this->model_().sdModel2().curSol());
-
- ParentType::newtonEndStep(uCurrentIter, uLastIter);
- }
-
- /*!
- * \brief Called when the newton method was sucessful.
- *
- * This method is called _after_ newtonEnd()
- */
- void newtonSucceed()
- {
- }
-
- /*!
- * \brief the convergence writer produces the output
- *
- * \param uLastIter The solution of the last iteration
- * \param deltaU The delta as calculated from solving the linear
- * system of equations. This parameter also stores
- * the updated solution.
- *
- */
- void writeConvergence_(const SolutionVector &uLastIter,
- const SolutionVector &deltaU)
- {
- if (GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, WriteConvergence)) {
- convergenceWriter_.beginIteration(sdGridView1_(), sdGridView2_());
- convergenceWriter_.writeFields(uLastIter, deltaU);
- convergenceWriter_.endIteration();
- }
- }
-
- /*!
- * \brief the subdomain gridviews
- */
- const GridView1 sdGridView1_() const
- { return this->problem_().sdGridView1(); }
- const GridView2 sdGridView2_() const
- { return this->problem_().sdGridView2(); }
-
-
-private:
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
-
- bool verbose_;
-
- std::ostringstream endIterMsgStream_;
- NewtonMethod *method_;
-
- // optimal number of iterations we want to achieve
- int targetSteps_;
- // maximum number of iterations we do before giving up
- int maxSteps_;
- // actual number of steps done so far
- int numSteps_;
-
- // the linear solver
- LinearSolver linearSolver_;
-
- ConvergenceWriter convergenceWriter_;
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_MULTIDOMAIN_NEWTON_CONTROLLER_HH
diff --git a/dumux/multidomain/problem.hh b/dumux/multidomain/problem.hh
deleted file mode 100644
index 1aff9346c781b3c129746bf1d33efd321389b4c6..0000000000000000000000000000000000000000
--- a/dumux/multidomain/problem.hh
+++ /dev/null
@@ -1,457 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Base class for problems which involve two sub problems
- */
-
-#ifndef DUMUX_MULTIDOMAIN_PROBLEM_HH
-#define DUMUX_MULTIDOMAIN_PROBLEM_HH
-
-#include "model.hh"
-#include "newtoncontroller.hh"
-#include "propertydefaults.hh"
-#include "subdomainpropertydefaults.hh"
-#include "assembler.hh"
-
-#include <dumux/io/restart.hh>
-
-
-namespace Dumux
-{
-
-/*!
- * \ingroup ImplicitBaseProblems
- * \ingroup MultidomainModel
- * \brief Base class for problems which involve two sub problems (multidomain problems)s
- */
-template<class TypeTag>
-class MultiDomainProblem
-{
-
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
-
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonController) NewtonController;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
- typedef typename GET_PROP_TYPE(TypeTag, GridCreator) GridCreator;
-
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) SubDomain1TypeTag;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) SubDomain2TypeTag;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, LocalResidual) LocalResidual1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, LocalResidual) LocalResidual2;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, Problem) SubDomainProblem1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, Problem) SubDomainProblem2;
-
- typedef typename GET_PROP_TYPE(SubDomain1TypeTag, GridView) SubDomainGridView1;
- typedef typename GET_PROP_TYPE(SubDomain2TypeTag, GridView) SubDomainGridView2;
-
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MultiDomainGrid;
- typedef typename MultiDomainGrid::LeafGridView MultiDomainGridView;
- typedef typename MultiDomainGrid::Traits::template Codim<0>::Entity MultiDomainElement;
- typedef typename MultiDomainGrid::SubDomainGrid SubDomainGrid;
- typedef typename SubDomainGrid::template Codim<0>::EntityPointer SubDomainElementPointer;
-
- typedef Dune::MultiDomainMCMGMapper<MultiDomainGridView, Dune::MCMGVertexLayout> VertexMapper;
-
- // copying a problem is not a good idea
- MultiDomainProblem(const MultiDomainProblem &);
-
-public:
- /*!
- * \brief The problem for the coupling of Stokes and Darcy flow
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- */
- template<class GridView>
- MultiDomainProblem(TimeManager &timeManager,
- GridView gridView)
- : timeManager_(timeManager)
- , newtonMethod_(asImp_())
- , newtonCtl_(asImp_())
- {
- mdGrid_ = std::make_shared<MultiDomainGrid> (GridCreator::grid());
- mdGridView_ = std::make_shared<MultiDomainGridView> (mdGrid_->leafGridView());
- mdVertexMapper_ = std::make_shared<VertexMapper> (mdGrid_->leafGridView());
- sdProblem1_ = std::make_shared<SubDomainProblem1> (timeManager, mdGrid_->subDomain(sdID1()).leafGridView());
- sdProblem2_ = std::make_shared<SubDomainProblem2> (timeManager, mdGrid_->subDomain(sdID2()).leafGridView());
- maxTimeStepSize_ = GET_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, MaxTimeStepSize);
- }
-
- //! \copydoc ImplicitProblem::init()
- void init()
- {
- // initialize the sub-problems
- sdProblem1().init();
- sdProblem2().init();
-
- // set the initial condition of the model
- model().init(asImp_());
-
- // initialize Lagrange multipliers
- asImp_().initMortarElements();
- }
-
- //! \copydoc ImplicitProblem::serialize()
- template <class Restarter>
- void serialize(Restarter &res)
- {
- this->model().serialize(res);
- }
-
- //! \copydoc ImplicitProblem::serialize()
- void serialize()
- {
- typedef Restart Restarter;
- Restarter res;
- res.serializeBegin(this->asImp_());
- std::cout << "Serialize to file '" << res.fileName() << "'\n";
- this->timeManager().serialize(res);
- this->asImp_().serialize(res);
- res.serializeEnd();
- }
-
- //! \copydoc ImplicitProblem::restart()
- void restart(Scalar tRestart)
- {
- typedef Restart Restarter;
- Restarter res;
- res.deserializeBegin(this->asImp_(), tRestart);
- std::cout << "Deserialize from file '" << res.fileName() << "'\n";
- this->timeManager().deserialize(res);
- this->asImp_().deserialize(res);
- res.deserializeEnd();
- }
-
- //! \copydoc ImplicitProblem::deserialize()
- template <class Restarter>
- void deserialize(Restarter &res)
- {
- this->model().deserialize(res);
- }
-
- /*!
- * \name Simulation control
- */
- // \{
-
- /*!
- * \brief Called by the time manager before the time integration. Calls preTimeStep()
- * of the subproblems.
- */
- void preTimeStep()
- {
- asImp_().sdProblem1().preTimeStep();
- asImp_().sdProblem2().preTimeStep();
- }
-
- //! \copydoc ImplicitProblem::timeIntegration()
- void timeIntegration()
- {
- const int maxFails =
- GET_PARAM_FROM_GROUP(TypeTag, int, Newton, MaxTimeStepDivisions);
- for (int i = 0; i < maxFails; ++i)
- {
- if (model_.update(newtonMethod_, newtonCtl_))
- return;
-
- // update failed
- Scalar dt = timeManager().timeStepSize();
- Scalar nextDt = dt / 2;
- timeManager().setTimeStepSize(nextDt);
-
- std::cout << "Newton solver did not converge. Retrying with time step of "
- << timeManager().timeStepSize() << "sec\n";
- }
-
- DUNE_THROW(Dune::MathError,
- "Newton solver didn't converge after "
- << maxFails
- << " timestep divisions. dt="
- << timeManager().timeStepSize());
- }
-
- /*!
- * \brief Called by the time manager after the time integration to
- * do some post processing on the solution. Calls postTimeStep()
- * of the subproblems.
- */
- void postTimeStep()
- {
- asImp_().sdProblem1().postTimeStep();
- asImp_().sdProblem2().postTimeStep();
- }
-
- //! \copydoc ImplicitProblem::maxTimeStepSize()
- Scalar maxTimeStepSize() const
- {
- return maxTimeStepSize_;
- }
-
- //! \copydoc ImplicitProblem::nextTimeStepSize()
- Scalar nextTimeStepSize(const Scalar dt)
- {
- return newtonCtl_.suggestTimeStepSize(dt);
- }
-
- /*!
- * \brief This method is called by the model if the update to the
- * next time step failed completely.
- */
- void updateSuccessful()
- {
- model_.updateSuccessful();
- }
-
- //! \copydoc ImplicitProblem::shouldWriteOutput()
- bool shouldWriteOutput() const
- { return true; }
-
- //! \copydoc ImplicitProblem::shouldWriteRestartFile()
- bool shouldWriteRestartFile() const
- { return false; }
-
- //! \copydoc ImplicitProblem::episodeEnd()
- void episodeEnd()
- {
- std::cerr << "The end of an episode is reached, but the problem "
- << "does not override the episodeEnd() method. "
- << "Doing nothing!\n";
- }
-
- //! \copydoc ImplicitProblem::advanceTimeLevel()
- void advanceTimeLevel()
- {
- asImp_().sdProblem1().advanceTimeLevel();
- asImp_().sdProblem2().advanceTimeLevel();
-
- model_.advanceTimeLevel();
- }
-
- //! \copydoc ImplicitProblem::writeOutput()
- void writeOutput()
- {
- // write the current result to disk
- if (asImp_().shouldWriteOutput()) {
- asImp_().sdProblem1().writeOutput();
- asImp_().sdProblem2().writeOutput();
- }
- }
-
-
- // \}
-
- //! \copydoc ImplicitProblem::name()
- const std::string& name() const
- { return simname_; }
-
- //! \copydoc ImplicitProblem::setName()
- static void setName(std::string newName)
- { simname_ = newName; }
-
- //! \copydoc ImplicitProblem::timeManager()
- TimeManager &timeManager()
- { return timeManager_; }
-
- //! \copydoc ImplicitProblem::timeManager()
- const TimeManager &timeManager() const
- { return timeManager_; }
-
- //! \copydoc ImplicitProblem::newtonController()
- NewtonController &newtonController()
- { return newtonCtl_; }
-
- //! \copydoc ImplicitProblem::newtonController()
- const NewtonController &newtonController() const
- { return newtonCtl_; }
-
- //! \copydoc ImplicitProblem::model()
- Model &model()
- { return model_; }
-
- //! \copydoc ImplicitProblem::model()
- const Model &model() const
- { return model_; }
- // \}
-
- /*!
- * \brief Returns the ID of the first domain
- */
- const typename MultiDomainGrid::SubDomainIndex sdID1() const
- { return typename MultiDomainGrid::SubDomainIndex(0); }
-
- /*!
- * \brief Returns the ID of the second domain
- */
- const typename MultiDomainGrid::SubDomainIndex sdID2() const
- { return typename MultiDomainGrid::SubDomainIndex(1); }
-
- /*!
- * \brief Returns a reference to subproblem1
- */
- SubDomainProblem1& sdProblem1()
- { return *sdProblem1_; }
-
- /*!
- * \brief Returns a const reference to subproblem1
- */
- const SubDomainProblem1& sdProblem1() const
- { return *sdProblem1_; }
-
- /*!
- * \brief Returns a reference to subproblem2
- */
- SubDomainProblem2& sdProblem2()
- { return *sdProblem2_; }
-
- /*!
- * \brief Returns a const reference to subproblem2
- */
- const SubDomainProblem2& sdProblem2() const
- { return *sdProblem2_; }
-
- /*!
- * \brief Returns a reference to the localresidual1
- */
- LocalResidual1& localResidual1()
- { return sdProblem1().model().localResidual(); }
-
- /*!
- * \brief Returns a reference to the localresidual2
- */
- LocalResidual2& localResidual2()
- { return sdProblem2().model().localResidual(); }
-
- /*!
- * \brief Returns a reference to the multidomain grid
- */
- MultiDomainGrid& mdGrid()
- { return *mdGrid_; }
-
- /*!
- * \brief Returns a const reference to the multidomain grid
- */
- const MultiDomainGrid& mdGrid() const
- { return *mdGrid_; }
-
- /*!
- * \brief Returns the multidomain gridview
- */
- const MultiDomainGridView& mdGridView() const
- { return *mdGridView_; }
-
- /*!
- * \brief Returns the multidomain gridview
- */
- const MultiDomainGridView& gridView() const
- { return *mdGridView_; }
-
- /*!
- * \brief Provides a vertex mapper for the multidomain
- */
- VertexMapper& mdVertexMapper()
- { return *mdVertexMapper_; }
-
- /*!
- * \brief Returns a const reference to the subdomain1 grid
- */
- const SubDomainGrid& sdGrid1() const
- { return mdGrid_->subDomain(sdID1()); }
-
- /*!
- * \brief Returns a const reference to the subdomain2 grid
- */
- const SubDomainGrid& sdGrid2() const
- { return mdGrid_->subDomain(sdID2()); }
-
- /*!
- * \brief Returns the gridview of subdomain1
- */
- const SubDomainGridView1 sdGridView1() const
- { return sdGrid1().leafGridView(); }
-
- /*!
- * \brief Returns the gridview of subdomain2
- */
- const SubDomainGridView2 sdGridView2() const
- { return sdGrid2().leafGridView(); }
-
- /*!
- * \brief Returns a pointer to the subdomain1 element
- *
- * \param mdElement1 The multi domain element1
- */
- SubDomainElementPointer sdElementPointer1(const MultiDomainElement& mdElement1)
- { return sdGrid1().subDomainEntityPointer(mdElement1); }
-
- /*!
- * \brief Returns a pointer to the subdomain2 element
- *
- * \param mdElement2 The multi domain element2
- */
- SubDomainElementPointer sdElementPointer2(const MultiDomainElement& mdElement2)
- { return sdGrid2().subDomainEntityPointer(mdElement2); }
-
-
-protected:
- void initMortarElements()
- {}
-
- Implementation &asImp_()
- { return *static_cast<Implementation *>(this); }
-
- //! \copydoc asImp_()
- const Implementation &asImp_() const
- { return *static_cast<const Implementation *>(this); }
-
-private:
- // a string for the name of the current simulation, which could be
- // set by means of an program argument, for example.
- static std::string simname_;
-
- TimeManager &timeManager_;
- Scalar maxTimeStepSize_;
- NewtonMethod newtonMethod_;
- NewtonController newtonCtl_;
-
- Model model_;
-
- std::shared_ptr<MultiDomainGrid> mdGrid_;
- std::shared_ptr<MultiDomainGridView> mdGridView_;
- std::shared_ptr<VertexMapper> mdVertexMapper_;
-
- std::shared_ptr<SubDomainProblem1> sdProblem1_;
- std::shared_ptr<SubDomainProblem2> sdProblem2_;
-};
-
-// definition of the static class member simname_,
-// which is necessary because it is of type string.
-template <class TypeTag>
-std::string MultiDomainProblem<TypeTag>::simname_ = "simCoupled";
-
-} // namespace Dumux
-
-#endif // DUMUX_MULTIDOMAIN_PROBLEM_HH
diff --git a/dumux/multidomain/properties.hh b/dumux/multidomain/properties.hh
deleted file mode 100644
index c76e3cc61889d223b8ce1b36b4a2d31eebc79cab..0000000000000000000000000000000000000000
--- a/dumux/multidomain/properties.hh
+++ /dev/null
@@ -1,116 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup MultidomainModel
- * \brief Specify properties required for the coupled model
- */
-#ifndef DUMUX_MULTIDOMAIN_PROPERTIES_HH
-#define DUMUX_MULTIDOMAIN_PROPERTIES_HH
-
-#include <dumux/implicit/properties.hh>
-
-namespace Dumux
-{
-
-namespace Properties
-{
-// \{
-
-//////////////////////////////////////////////////////////////////
-// Type tags tags
-//////////////////////////////////////////////////////////////////
-
-//! The type tag for problems which utilize the coupling approach
-NEW_TYPE_TAG(MultiDomain, INHERITS_FROM(ImplicitBase));
-
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-
-//! Specifies the model
-NEW_PROP_TAG(Model);
-
-//! Specifies the maximum number of sub-problems
-NEW_PROP_TAG(MaxSubDomains);
-
-//! Specifies the type tag of the first sub-problem
-NEW_PROP_TAG(SubDomain1TypeTag);
-
-//! Specifies the type tag of the second sub-problem
-NEW_PROP_TAG(SubDomain2TypeTag);
-
-//! Specifies the type tag of the other sub-problem
-NEW_PROP_TAG(OtherSubDomainTypeTag);
-
-//! Specifies the type tag of coupled problem
-NEW_PROP_TAG(MultiDomainTypeTag);
-
-//! Specifies the host grid
-NEW_PROP_TAG(Grid);
-
-//! Specifies the multidomain grid
-NEW_PROP_TAG(MultiDomainGrid);
-
-//! Specifies the number of equations in submodel 1
-NEW_PROP_TAG(NumEq1);
-
-//! Specifies the number of equations in submodel 2
-NEW_PROP_TAG(NumEq2);
-
-//! Specifies the fluidsystem that is used in the subdomains
-NEW_PROP_TAG(FluidSystem);
-
-//! the maximum allowed number of timestep divisions for the
-//! Newton solver
-NEW_PROP_TAG(NewtonMaxTimeStepDivisions);
-
-//! Specifies the multidomain grid function space
-NEW_PROP_TAG(MultiDomainGridFunctionSpace);
-
-//! Specifies the multidomain grid operator
-NEW_PROP_TAG(MultiDomainGridOperator);
-
-//! Specifies the equality conditions
-NEW_PROP_TAG(MultiDomainCondition);
-
-//! Specifies the multidomain type based subproblem for subdomain 1
-NEW_PROP_TAG(MultiDomainSubProblem1);
-
-//! Specifies the multidomain type based subproblem for subdomain 2
-NEW_PROP_TAG(MultiDomainSubProblem2);
-
-//! the local coupling operator for use with dune-multidomain
-NEW_PROP_TAG(MultiDomainCouplingLocalOperator);
-
-//! Specifies the multidomain coupling
-NEW_PROP_TAG(MultiDomainCoupling);
-
-//! Property tag for the multidomain constraints transformation
-NEW_PROP_TAG(MultiDomainConstraintsTrafo);
-
-//! the routines that are used to split and merge solution vectors
-NEW_PROP_TAG(SplitAndMerge);
-
-} // namespace Properties
-} // namespace Dumux
-
-#endif // DUMUX_MULTIDOMAIN_PROPERTIES_HH
diff --git a/dumux/multidomain/propertydefaults.hh b/dumux/multidomain/propertydefaults.hh
deleted file mode 100644
index b3f837bac32de8113070c0f4e9a27f1275b61e0b..0000000000000000000000000000000000000000
--- a/dumux/multidomain/propertydefaults.hh
+++ /dev/null
@@ -1,258 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup MultidomainModel
- * \brief Sets default values for the MultiDomain properties
- */
-
-#ifndef DUMUX_MULTIDOMAIN_PROPERTY_DEFAULTS_HH
-#define DUMUX_MULTIDOMAIN_PROPERTY_DEFAULTS_HH
-
-#include <dune/istl/bvector.hh>
-#include <dune/istl/bcrsmatrix.hh>
-
-#include <dune/pdelab/backend/istlvectorbackend.hh>
-#include <dune/pdelab/backend/istlmatrixbackend.hh>
-#include <dune/pdelab/multidomain/multidomaingridfunctionspace.hh>
-#include <dune/pdelab/multidomain/subproblemlocalfunctionspace.hh>
-#include <dune/pdelab/multidomain/subproblem.hh>
-#include <dune/pdelab/multidomain/subdomainset.hh>
-#include <dune/pdelab/multidomain/coupling.hh>
-#include <dune/pdelab/multidomain/gridoperator.hh>
-
-#include <dune/pdelab/gridoperator/gridoperator.hh>
-
-#include "subdomainpropertydefaults.hh"
-#include "model.hh"
-#include "properties.hh"
-#include "newtoncontroller.hh"
-#include "splitandmerge.hh"
-
-#include <dumux/common/timemanager.hh>
-#include <dumux/nonlinear/newtonmethod.hh>
-
-namespace Dumux
-{
-template <class TypeTag> class MultiDomainModel;
-template <class TypeTag> class MultiDomainAssembler;
-template <class TypeTag> class MultiDomainNewtonController;
-
-namespace Properties
-{
-
-SET_INT_PROP(MultiDomain, MaxSubDomains, 2);
-
-SET_PROP(MultiDomain, MultiDomainGrid)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Grid) HostGrid;
- enum { maxSubDomains = GET_PROP_VALUE(TypeTag, MaxSubDomains) };
- typedef typename Dune::mdgrid::FewSubDomainsTraits<HostGrid::dimension, maxSubDomains> MDGridTraits;
-public:
- typedef typename Dune::MultiDomainGrid<HostGrid, MDGridTraits> type;
-};
-
-SET_PROP(MultiDomain, MultiDomainGridFunctionSpace)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MDGrid;
- typedef typename Dune::PDELab::LexicographicOrderingTag OrderingTag;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) SubTypeTag1;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) SubTypeTag2;
- typedef typename GET_PROP_TYPE(SubTypeTag1, GridFunctionSpace) GridFunctionSpace1;
- typedef typename GET_PROP_TYPE(SubTypeTag2, GridFunctionSpace) GridFunctionSpace2;
-public:
- typedef Dune::PDELab::MultiDomain::MultiDomainGridFunctionSpace<MDGrid,
- Dune::PDELab::ISTLVectorBackend<>,
- OrderingTag,
- GridFunctionSpace1,
- GridFunctionSpace2> type;
-};
-
-// set the subdomain equality condition by default
-SET_PROP(MultiDomain, MultiDomainCondition)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MDGrid;
-public:
- typedef Dune::PDELab::MultiDomain::SubDomainEqualityCondition<MDGrid> type;
-};
-
-SET_PROP(MultiDomain, MultiDomainSubProblem1)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGridFunctionSpace) MDGridFunctionSpace;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) SubTypeTag1;
- typedef typename GET_PROP_TYPE(SubTypeTag1, Constraints) Constraints1;
- typedef typename GET_PROP_TYPE(SubTypeTag1, LocalOperator) LocalOperator1;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainCondition) MDCondition;
- typedef typename GET_PROP_TYPE(SubTypeTag1, GridFunctionSpace) GridFunctionSpace1;
-public:
- typedef Dune::PDELab::MultiDomain::SubProblem<MDGridFunctionSpace,
- MDGridFunctionSpace,
- LocalOperator1, MDCondition,
- 0> type;
-};
-
-SET_PROP(MultiDomain, MultiDomainSubProblem2)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGridFunctionSpace) MDGridFunctionSpace;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) SubTypeTag2;
- typedef typename GET_PROP_TYPE(SubTypeTag2, Constraints) Constraints2;
- typedef typename GET_PROP_TYPE(SubTypeTag2, LocalOperator) LocalOperator2;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainCondition) MDCondition;
- typedef typename GET_PROP_TYPE(SubTypeTag2, GridFunctionSpace) GridFunctionSpace2;
-public:
- typedef Dune::PDELab::MultiDomain::SubProblem<MDGridFunctionSpace,
- MDGridFunctionSpace,
- LocalOperator2, MDCondition,
- 1> type;
-};
-
-SET_PROP(MultiDomain, MultiDomainCoupling)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainSubProblem1) MDSubProblem1;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainSubProblem2) MDSubProblem2;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainCouplingLocalOperator) MDCouplingLocalOperator;
-public:
- typedef Dune::PDELab::MultiDomain::Coupling<MDSubProblem1,
- MDSubProblem2,
- MDCouplingLocalOperator> type;
-};
-
-// set trivial constraints transformation by default
-SET_PROP(MultiDomain, MultiDomainConstraintsTrafo)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGridFunctionSpace) MDGridFunctionSpace;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public:
- typedef typename MDGridFunctionSpace::template ConstraintsContainer<Scalar>::Type type;
-};
-
-SET_PROP(MultiDomain, MultiDomainGridOperator)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGridFunctionSpace) MDGridFunctionSpace;
- typedef Dune::PDELab::ISTLMatrixBackend MBE;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainSubProblem1) MDSubProblem1;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainSubProblem2) MDSubProblem2;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainCoupling) MDCoupling;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainConstraintsTrafo) MDConstraintsTrafo;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public:
- typedef Dune::PDELab::MultiDomain::GridOperator<
- MDGridFunctionSpace, MDGridFunctionSpace,
- MBE, Scalar, Scalar, Scalar,
- MDConstraintsTrafo, MDConstraintsTrafo,
- MDSubProblem1, MDSubProblem2, MDCoupling> type;
-};
-
-SET_PROP(MultiDomain, JacobianMatrix)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGridOperator) MDGridOperator;
-public:
- typedef typename MDGridOperator::Traits::Jacobian type;
-};
-
-SET_INT_PROP(MultiDomain, LinearSolverBlockSize, GET_PROP_VALUE(TypeTag, NumEq));
-
-
-// Set property values for the coupled model
-SET_TYPE_PROP(MultiDomain, Model, MultiDomainModel<TypeTag>);
-
-SET_PROP(MultiDomain, SolutionVector)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
-public:
- typedef Dune::BlockVector<Dune::FieldVector<Scalar, numEq> > type;
-};
-
-// Specify the type of the multidomain assembler
-SET_TYPE_PROP(MultiDomain, JacobianAssembler, MultiDomainAssembler<TypeTag>);
-
-// use the plain newton method for the coupled problems by default
-SET_TYPE_PROP(MultiDomain, NewtonMethod, NewtonMethod<TypeTag>);
-
-// use the plain newton controller for coupled problems by default
-SET_TYPE_PROP(MultiDomain, NewtonController, MultiDomainNewtonController<TypeTag>);
-
-// Set the default type of the time manager for coupled models
-SET_TYPE_PROP(MultiDomain, TimeManager, TimeManager<TypeTag>);
-
-// needed to define size of ImplicitBase's PrimaryVariables
-SET_PROP(MultiDomain, NumEq)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) TypeTag1;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) TypeTag2;
-
- enum {
- numEq1 = GET_PROP_VALUE(TypeTag1, NumEq),
- numEq2 = GET_PROP_VALUE(TypeTag2, NumEq)
- };
-public:
- static const int value = numEq1;
-};
-
-SET_PROP(MultiDomain, NumEq1)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) TypeTag1;
- enum {numEq = GET_PROP_VALUE(TypeTag1, NumEq)};
-public:
- static const int value = numEq;
-};
-
-SET_PROP(MultiDomain, NumEq2)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) TypeTag2;
- enum {numEq = GET_PROP_VALUE(TypeTag2, NumEq)};
-public:
- static const int value = numEq;
-};
-
-// set the type of the linear solver
-SET_TYPE_PROP(MultiDomain, LinearSolver, ILU0BiCGSTABBackend<TypeTag>);
-
-// set the minimum residual reduction of the linear solver
-SET_SCALAR_PROP(MultiDomain, LinearSolverResidualReduction, 1e-6);
-
-// set the default number of maximum iterations for the linear solver
-SET_INT_PROP(MultiDomain, LinearSolverMaxIterations, 250);
-
-// set the maximum time step divisions
-SET_INT_PROP(MultiDomain, NewtonMaxTimeStepDivisions, 10);
-
-// set the routines for splitting and merging solution vectors
-SET_TYPE_PROP(MultiDomain, SplitAndMerge, SplitAndMerge<TypeTag>);
-
-} // namespace Properties
-} // namespace Dumux
-
-#endif // DUMUX_MULTIDOMAIN_PROPERTY_DEFAULTS_HH
diff --git a/dumux/multidomain/splitandmerge.hh b/dumux/multidomain/splitandmerge.hh
deleted file mode 100644
index 297971ff9cbc346a4629eb63e1392aea953d2fd3..0000000000000000000000000000000000000000
--- a/dumux/multidomain/splitandmerge.hh
+++ /dev/null
@@ -1,240 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/**
- * \file
- * \brief Some methods required by several classes of the coupling model.
- */
-#ifndef DUMUX_SPLIT_AND_MERGE_HH
-#define DUMUX_SPLIT_AND_MERGE_HH
-
-#include "properties.hh"
-#include <dumux/common/valgrind.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup MultidomainModel
- * \brief Some methods required by several classes of the coupling model.
- */
-template<class TypeTag>
-class SplitAndMerge
-{
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain1TypeTag) SubTypeTag1;
- typedef typename GET_PROP_TYPE(TypeTag, SubDomain2TypeTag) SubTypeTag2;
-
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(SubTypeTag1, SolutionVector) SolutionVector1;
- typedef typename GET_PROP_TYPE(SubTypeTag2, SolutionVector) SolutionVector2;
-
- typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
- typedef typename GET_PROP_TYPE(SubTypeTag1, JacobianMatrix) JacobianMatrix1;
- typedef typename GET_PROP_TYPE(SubTypeTag2, JacobianMatrix) JacobianMatrix2;
-
-
- enum {
- numEq1 = GET_PROP_VALUE(SubTypeTag1, NumEq),
- numEq2 = GET_PROP_VALUE(SubTypeTag2, NumEq)
- };
-public:
- /*!
- * \brief Merge two solution vectors of the sub models into a
- * global vector: nonoverlapping case.
- *
- * \param vec1 Input vector with solution of subdomain 1
- * \param vec2 Input vector with solution of subdomain 2
- * \param dest Destination vector for global solution
- *
- */
- static void mergeSolVectors(const SolutionVector1 &vec1,
- const SolutionVector2 &vec2,
- SolutionVector &dest)
- {
-// printvector(std::cout, vec1, "vec1", "row", 200, 1, 3);
-// printvector(std::cout, vec2, "vec2", "row", 200, 1, 3);
-
- int nDofs1 = vec1.size();
- int nDofs2 = vec2.size();
-
- for (int i = 0; i < nDofs1; ++i)
- for (int j = 0; j < numEq1; j++)
- {
- dest.base()[i*numEq1 + j][0] = vec1[i][j];
-
- Valgrind::CheckDefined(dest.base()[i*numEq1 + j][0]);
- }
-
- for (int i = 0; i < nDofs2; ++i)
- for (int j = 0; j < numEq2; j++)
- {
- dest.base()[nDofs1*numEq1 + i*numEq2 + j][0] = vec2[i][j];
-
- Valgrind::CheckDefined(dest.base()[nDofs1*numEq1 + i*numEq2 + j][0]);
- }
-// printvector(std::cout, dest.base(), "dest", "row", 200, 1, 3);
- }
-
- /*!
- * \brief Split a global solution vector into two solution vectors
- * of the sub models: nonoverlapping case.
- *
- * \param vec Input vector with global solution
- * \param dest1 Destination vector with solution of subdomain 1
- * \param dest2 Destination vector with solution of subdomain 2
- *
- */
- static void splitSolVector(const SolutionVector &vec,
- SolutionVector1 &dest1,
- SolutionVector2 &dest2)
- {
-// printvector(std::cout, vec.base(), "vec", "row", 200, 1, 3);
-
- int nDofs1 = dest1.size();
- int nDofs2 = dest2.size();
-
- for (int i = 0; i < nDofs1; ++i)
- for (int j = 0; j < numEq1; j++)
- dest1[i][j] = vec.base()[i*numEq1 + j][0];
-
- for (int i = 0; i < nDofs2; ++i)
- for (int j = 0; j < numEq2; j++)
- dest2[i][j] = vec.base()[nDofs1*numEq1 + i*numEq2 + j][0];
-
-// printvector(std::cout, dest1, "dest1", "row", 200, 1, 3);
-// printvector(std::cout, dest2, "dest2", "row", 200, 1, 3);
- }
-
- /*!
- * \brief Merge two solution vectors of the sub models into a
- * global vector: more general case.
- *
- * \param vec1 Input vector with solution of subdomain 1
- * \param vec2 Input vector with solution of subdomain 2
- * \param dest Destination vector for global solution
- * \param subDOFToCoupledDOF unused
- *
- */
- static void mergeSolVectors(const SolutionVector1 &vec1,
- const SolutionVector2 &vec2,
- SolutionVector &dest,
- const std::vector<int>& subDOFToCoupledDOF)
- {
- int nDofs1 = vec1.size();
- int nDofs2 = vec2.size();
-// printvector(std::cout, vec1, "vec1", "row", 200, 1, 3);
-// printvector(std::cout, vec2, "vec2", "row", 200, 1, 3);
-
- for (int i = 0; i < nDofs1; ++i)
- for (int j = 0; j < numEq1; j++)
- dest.base()[i*numEq1 + j] = vec1[i][j];
-
- for (int i = 0; i < nDofs2; ++i)
- {
- for (int j = numEq1; j < numEq2; j++)
- dest.base()[nDofs1*numEq1 + i*(numEq2-numEq1) + (j - numEq1)] = vec2[i][j];
- }
-// printvector(std::cout, dest.base(), "dest", "row", 200, 1, 3);
- }
-
- /*!
- * \brief Split a global solution vector into two solution vectors
- * of the sub models: more general case.
- *
- * \param vec Input vector with global solution
- * \param dest1 Destination vector with solution of subdomain 1
- * \param dest2 Destination vector with solution of subdomain 2
- * \param subDOFToCoupledDOF Identification vector between sub and global DOFs
- *
- */
- static void splitSolVector(const SolutionVector &vec,
- SolutionVector1 &dest1,
- SolutionVector2 &dest2,
- const std::vector<int>& subDOFToCoupledDOF)
- {
- int nDofs1 = dest1.size();
- int nDofs2 = dest2.size();
-
-// printvector(std::cout, vec.base(), "vec", "row", 200, 1, 3);
- for (int i = 0; i < nDofs1; ++i)
- for (int j = 0; j < numEq1; j++)
- dest1[i][j] = vec.base()[i*numEq1 + j];
-
- for (int i = 0; i < nDofs2; ++i)
- {
- int blockIdxCoupled = subDOFToCoupledDOF[i];
- for (int j = 0; j < numEq1; j++)
- {
- dest2[i][j] = vec.base()[blockIdxCoupled*numEq1 + j];
- }
-
- for (int j = numEq1; j < numEq2; j++)
- dest2[i][j] = vec.base()[nDofs1*numEq1 + i*(numEq2-numEq1) + (j - numEq1)];
- }
-// printvector(std::cout, dest1, "dest1", "row", 200, 1, 3);
-// printvector(std::cout, dest2, "dest2", "row", 200, 1, 3);
- }
-
-
- /*!
- * \brief Merge individual jacobian matrices of the sub models
- * into a global jacobian matrix.
- *
- * \param M1 Input jacobian matrix of subdomain 1
- * \param M2 Input jacobian matrix of subdomain 2
- * \param M Destination global jacobian matrix
- *
- */
- static void mergeMatrices(const JacobianMatrix1 &M1,
- const JacobianMatrix2 &M2,
- JacobianMatrix &M)
- {
- DUNE_THROW(Dune::NotImplemented, "mergeMatrices in coupled common");
- }
-
- /*!
- * \brief Copy a sub matrix into into the main diagonal of the global matrix.
- *
- * \param Msub Sub matrix
- * \param M Global matrix
- * \param offset Offset in rows and columns
- *
- */
- template <class SubMatrix>
- static void copyMatrix(const SubMatrix &Msub,
- JacobianMatrix &M,
- size_t offset)
- {
- // loop over all rows of the submatrix
- typedef typename SubMatrix::ConstRowIterator RowIterator;
- typedef typename SubMatrix::ConstColIterator ColIterator;
- RowIterator endRow = Msub.end();
- for (RowIterator row = Msub.begin(); row != endRow; ++row) {
- // loop over columns of the current row
- ColIterator endCol = row->end();
- for (ColIterator col = row->begin(); col != endCol; ++ col) {
- // copy entry in the global matrix
- M[row.index() + offset][col.index() + offset]
- = *col;
- }
- }
- }
-
-};
-} // namespace Dumux
-
-#endif // DUMUX_SPLIT_AND_MERGE_HH
diff --git a/dumux/multidomain/subdomainpropertydefaults.hh b/dumux/multidomain/subdomainpropertydefaults.hh
deleted file mode 100644
index 394fc044a82529178c3e43ed021fe4d4d16cd795..0000000000000000000000000000000000000000
--- a/dumux/multidomain/subdomainpropertydefaults.hh
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup MultidomainModel
- * \brief Specify default properties required in the subdomains of dune-multidomain
- */
-#ifndef DUMUX_SUBDOMAIN_PROPERTY_DEFAULTS_HH
-#define DUMUX_SUBDOMAIN_PROPERTY_DEFAULTS_HH
-
-#include <dune/grid/multidomaingrid.hh>
-#include <dune/pdelab/backend/istlvectorbackend.hh>
-#include <dune/pdelab/backend/istlmatrixbackend.hh>
-#include <dune/pdelab/finiteelementmap/qkfem.hh>
-#include <dune/pdelab/constraints/conforming.hh>
-
-#include "subdomainproperties.hh"
-#include "properties.hh"
-#include "localoperator.hh"
-#include "boxcouplinglocalresidual.hh"
-
-namespace Dumux
-{
-
-namespace Properties
-{
-
-// Specifies the grid type for the subdomains
-SET_PROP(SubDomain, Grid)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag) MultiDomain;
- typedef typename GET_PROP_TYPE(MultiDomain, Grid) HostGrid;
- enum { maxSubDomains = GET_PROP_VALUE(MultiDomain, MaxSubDomains) };
- typedef typename Dune::mdgrid::FewSubDomainsTraits<HostGrid::dimension,maxSubDomains> MDGridTraits;
- typedef typename Dune::MultiDomainGrid<HostGrid, MDGridTraits> Grid;
-public:
- typedef typename Grid::SubDomainGrid type;
-};
-
-// set the default BaseLocalResidual to BoxCouplingLocalResidual
-SET_TYPE_PROP(SubDomain, BaseLocalResidual, BoxCouplingLocalResidual<TypeTag>);
-
-// set the local operator used for submodels
-SET_TYPE_PROP(SubDomain, LocalOperator,
- PDELab::MultiDomainLocalOperator<TypeTag>);
-
-// use the time manager for the coupled problem in the sub problems
-SET_PROP(SubDomain, TimeManager)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag) MultiDomainTypeTag;
-public:
- typedef typename GET_PROP_TYPE(MultiDomainTypeTag, TimeManager) type;
-};
-
-// set the constraints for the sub-models
-SET_TYPE_PROP(SubDomain, Constraints, Dune::PDELab::NoConstraints);
-
-// set the grid functions space for the sub-models
-SET_PROP(SubDomain, ScalarGridFunctionSpace)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, LocalFEMSpace) FEM;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Constraints) Constraints;
- enum{numEq = GET_PROP_VALUE(TypeTag, NumEq)};
-public:
- typedef Dune::PDELab::GridFunctionSpace<GridView, FEM, Constraints,
- Dune::PDELab::ISTLVectorBackend<> > type;
-};
-
-// set the grid functions space for the sub-models
-SET_PROP(SubDomain, GridFunctionSpace)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, ScalarGridFunctionSpace) ScalarGridFunctionSpace;
- enum{numEq = GET_PROP_VALUE(TypeTag, NumEq)};
- typedef typename Dune::PDELab::EntityBlockedOrderingTag OrderingTag;
- typedef typename Dune::PDELab::ISTLVectorBackend<> VBE;
-public:
- typedef Dune::PDELab::PowerGridFunctionSpace<ScalarGridFunctionSpace, numEq, VBE, OrderingTag> type;
-};
-
-// use the local FEM space associated with cubes by default
-SET_PROP(SubDomain, LocalFEMSpace)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum{dim = GridView::dimension};
-public:
- typedef Dune::PDELab::QkLocalFiniteElementMap<GridView,Scalar,Scalar,1> type;
-};
-
-SET_PROP(SubDomain, ParameterTree)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag) MultiDomainTypeTag;
- typedef typename GET_PROP(MultiDomainTypeTag, ParameterTree) ParameterTree;
-public:
- typedef typename ParameterTree::type type;
-
- static type &tree()
- { return ParameterTree::tree(); }
-
- static type &compileTimeParams()
- { return ParameterTree::compileTimeParams(); }
-
- static type &runTimeParams()
- { return ParameterTree::runTimeParams(); }
-
- static type &deprecatedRunTimeParams()
- { return ParameterTree::deprecatedRunTimeParams(); }
-
- static type &unusedNewRunTimeParams()
- { return ParameterTree::unusedNewRunTimeParams(); }
-};
-
-} // namespace Properties
-} // namespace Dumux
-
-#endif // DUMUX_SUBDOMAIN_PROPERTY_DEFAULTS_HH
diff --git a/dumux/nonlinear/newtoncontroller.hh b/dumux/nonlinear/newtoncontroller.hh
index c2bf0118a458f77e0208cbffb658f79dee93ce0e..0a6435b447a3a09dee36987bd06624e5fe45564b 100644
--- a/dumux/nonlinear/newtoncontroller.hh
+++ b/dumux/nonlinear/newtoncontroller.hh
@@ -29,120 +29,13 @@
#include <dumux/common/propertysystem.hh>
#include <dumux/common/exceptions.hh>
#include <dumux/common/math.hh>
+#include <dumux/common/timeloop.hh>
#include <dumux/linear/seqsolverbackend.hh>
-#include "newtonconvergencewriter.hh"
#include "newtonmethod.hh"
namespace Dumux
{
-template <class TypeTag>
-class NewtonController;
-
-template <class TypeTag>
-class NewtonConvergenceWriter;
-
-namespace Properties
-{
-//! Specifies the implementation of the Newton controller
-NEW_PROP_TAG(NewtonController);
-
-//! Specifies the type of the actual Newton method
-NEW_PROP_TAG(NewtonMethod);
-
-//! Specifies the type of a solution
-NEW_PROP_TAG(SolutionVector);
-
-//! Specifies the type of a global Jacobian matrix
-NEW_PROP_TAG(JacobianMatrix);
-
-//! Specifies the type of the Vertex mapper
-NEW_PROP_TAG(VertexMapper);
-
-//! specifies the type of the time manager
-NEW_PROP_TAG(TimeManager);
-
-//! specifies whether the convergence rate and the global residual
-//! gets written out to disk for every Newton iteration (default is false)
-NEW_PROP_TAG(NewtonWriteConvergence);
-
-//! Specifies whether the Jacobian matrix should only be reassembled
-//! if the current solution deviates too much from the evaluation point
-NEW_PROP_TAG(ImplicitEnablePartialReassemble);
-
-//! Specify whether the jacobian matrix of the last iteration of a
-//! time step should be re-used as the jacobian of the first iteration
-//! of the next time step.
-NEW_PROP_TAG(ImplicitEnableJacobianRecycling);
-
-/*!
- * \brief Specifies whether the update should be done using the line search
- * method instead of the plain Newton method.
- *
- * Whether this property has any effect depends on whether the line
- * search method is implemented for the actual model's Newton
- * controller's update() method. By default line search is not used.
- */
-NEW_PROP_TAG(NewtonUseLineSearch);
-
-//! indicate whether the absolute residual should be used in the residual criterion
-NEW_PROP_TAG(NewtonEnableAbsoluteResidualCriterion);
-
-//! indicate whether the shift criterion should be used
-NEW_PROP_TAG(NewtonEnableShiftCriterion);
-
-//! the value for the maximum relative shift below which convergence is declared
-NEW_PROP_TAG(NewtonMaxRelativeShift);
-
-//! the value for the maximum absolute residual below which convergence is declared
-NEW_PROP_TAG(NewtonMaxAbsoluteResidual);
-
-//! indicate whether the residual criterion should be used
-NEW_PROP_TAG(NewtonEnableResidualCriterion);
-
-//! the value for the residual reduction below which convergence is declared
-NEW_PROP_TAG(NewtonResidualReduction);
-
-//! indicate whether both of the criteria should be satisfied to declare convergence
-NEW_PROP_TAG(NewtonSatisfyResidualAndShiftCriterion);
-
-//! indicate whether after each newton step the solution is chopped, e.g. to
-//! physically sensible values (if a chopper is implemented for this model)
-NEW_PROP_TAG(NewtonEnableChop);
-
-/*!
- * \brief The number of iterations at which the Newton method
- * should aim at.
- *
- * This is used to control the time-step size. The heuristic used
- * is to scale the last time-step size by the deviation of the
- * number of iterations used from the target steps.
- */
-NEW_PROP_TAG(NewtonTargetSteps);
-
-//! Number of maximum iterations for the Newton method.
-NEW_PROP_TAG(NewtonMaxSteps);
-
-//! The assembler for the Jacobian matrix
-NEW_PROP_TAG(JacobianAssembler);
-
-// set default values
-SET_TYPE_PROP(NewtonMethod, NewtonController, NewtonController<TypeTag>);
-SET_BOOL_PROP(NewtonMethod, NewtonWriteConvergence, false);
-SET_BOOL_PROP(NewtonMethod, NewtonUseLineSearch, false);
-SET_BOOL_PROP(NewtonMethod, NewtonEnableAbsoluteResidualCriterion, false);
-SET_BOOL_PROP(NewtonMethod, NewtonEnableShiftCriterion, true);
-SET_BOOL_PROP(NewtonMethod, NewtonEnableResidualCriterion, false);
-SET_BOOL_PROP(NewtonMethod, NewtonSatisfyResidualAndShiftCriterion, false);
-SET_BOOL_PROP(NewtonMethod, NewtonEnableChop, false);
-SET_SCALAR_PROP(NewtonMethod, NewtonMaxRelativeShift, 1e-8);
-SET_SCALAR_PROP(NewtonMethod, NewtonMaxAbsoluteResidual, 1e-5);
-SET_SCALAR_PROP(NewtonMethod, NewtonResidualReduction, 1e-5);
-SET_INT_PROP(NewtonMethod, NewtonTargetSteps, 10);
-SET_INT_PROP(NewtonMethod, NewtonMaxSteps, 18);
-
-} // end namespace Properties
-
/*!
* \ingroup Newton
* \brief A reference implementation of a Newton controller specific
@@ -155,62 +48,38 @@ SET_INT_PROP(NewtonMethod, NewtonMaxSteps, 18);
template <class TypeTag>
class NewtonController
{
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonController) Implementation;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonMethod) NewtonMethod;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianMatrix) JacobianMatrix;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
-
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Communicator = typename GridView::CollectiveCommunication;
using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
-
- typedef typename GET_PROP_TYPE(TypeTag, NewtonConvergenceWriter) ConvergenceWriter;
-
- typedef typename GET_PROP_TYPE(TypeTag, LinearSolver) LinearSolver;
-
static constexpr int numEq = GET_PROP_VALUE(TypeTag, NumEq);
public:
/*!
- * \brief Constructor
+ * \brief Constructor for stationary problems
*/
- NewtonController(const Problem &problem)
- : endIterMsgStream_(std::ostringstream::out),
- linearSolver_(problem)
+ NewtonController(const Communicator& comm)
+ : comm_(comm)
+ , endIterMsgStream_(std::ostringstream::out)
{
- enablePartialReassemble_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Implicit, EnablePartialReassemble);
- enableJacobianRecycling_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Implicit, EnableJacobianRecycling);
-
- useLineSearch_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, UseLineSearch);
- enableAbsoluteResidualCriterion_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, EnableAbsoluteResidualCriterion);
- enableShiftCriterion_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, EnableShiftCriterion);
- enableResidualCriterion_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, EnableResidualCriterion)
- || enableAbsoluteResidualCriterion_;
- satisfyResidualAndShiftCriterion_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, SatisfyResidualAndShiftCriterion);
- if (!enableShiftCriterion_ && !enableResidualCriterion_)
- {
- DUNE_THROW(Dune::NotImplemented,
- "at least one of NewtonEnableShiftCriterion or "
- << "NewtonEnableResidualCriterion has to be set to true");
- }
-
- setMaxRelativeShift(GET_PARAM_FROM_GROUP(TypeTag, Scalar, Newton, MaxRelativeShift));
- setMaxAbsoluteResidual(GET_PARAM_FROM_GROUP(TypeTag, Scalar, Newton, MaxAbsoluteResidual));
- setResidualReduction(GET_PARAM_FROM_GROUP(TypeTag, Scalar, Newton, ResidualReduction));
- setTargetSteps(GET_PARAM_FROM_GROUP(TypeTag, int, Newton, TargetSteps));
- setMaxSteps(GET_PARAM_FROM_GROUP(TypeTag, int, Newton, MaxSteps));
+ initParams_();
+ }
- verbose_ = true;
- numSteps_ = 0;
+ /*!
+ * \brief Constructor for stationary problems
+ */
+ NewtonController(const Communicator& comm, std::shared_ptr<TimeLoop<Scalar>> timeLoop)
+ : comm_(comm)
+ , timeLoop_(timeLoop)
+ , endIterMsgStream_(std::ostringstream::out)
+ {
+ initParams_();
}
+ const Communicator& communicator() const
+ { return comm_; }
+
/*!
* \brief Set the maximum acceptable difference of any primary variable
* between two iterations for declaring convergence.
@@ -266,11 +135,12 @@ public:
*
* \param uCurrentIter The solution of the current Newton iteration
*/
- bool newtonProceed(const SolutionVector &uCurrentIter)
+ template<class SolutionVector>
+ bool newtonProceed(const SolutionVector &uCurrentIter, bool converged)
{
if (numSteps_ < 2)
return true; // we always do at least two iterations
- else if (asImp_().newtonConverged()) {
+ else if (converged) {
return false; // we are below the desired tolerance
}
else if (numSteps_ >= maxSteps_) {
@@ -299,7 +169,7 @@ public:
else if (!enableShiftCriterion_ && enableResidualCriterion_)
{
if(enableAbsoluteResidualCriterion_)
- return residual_ <= residualTolerance_;
+ return residualNorm_ <= residualTolerance_;
else
return reduction_ <= reductionTolerance_;
}
@@ -307,7 +177,7 @@ public:
{
if(enableAbsoluteResidualCriterion_)
return shift_ <= shiftTolerance_
- && residual_ <= residualTolerance_;
+ && residualNorm_ <= residualTolerance_;
else
return shift_ <= shiftTolerance_
&& reduction_ <= reductionTolerance_;
@@ -316,7 +186,7 @@ public:
{
return shift_ <= shiftTolerance_
|| reduction_ <= reductionTolerance_
- || residual_ <= residualTolerance_;
+ || residualNorm_ <= residualTolerance_;
}
return false;
@@ -326,20 +196,12 @@ public:
* \brief Called before the Newton method is applied to an
* non-linear system of equations.
*
- * \param method The object where the NewtonMethod is executed
* \param u The initial solution
*/
- void newtonBegin(NewtonMethod &method, const SolutionVector &u)
+ template<class SolutionVector>
+ void newtonBegin(const SolutionVector &u)
{
- method_ = &method;
numSteps_ = 0;
-
- if (GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, WriteConvergence))
- {
- if (!convergenceWriter_)
- convergenceWriter_ = std::make_unique<ConvergenceWriter>(asImp_(), problem_().gridView());
- convergenceWriter_->advanceTimeStep();
- }
}
/*!
@@ -372,6 +234,7 @@ public:
* \param uLastIter The current iterative solution
* \param deltaU The difference between the current and the next solution
*/
+ template<class SolutionVector>
void newtonUpdateShift(const SolutionVector &uLastIter,
const SolutionVector &deltaU)
{
@@ -381,14 +244,25 @@ public:
typename SolutionVector::block_type uNewI = uLastIter[i];
uNewI -= deltaU[i];
- Scalar shiftAtDof = model_().relativeShiftAtDof(uLastIter[i],
- uNewI);
+ Scalar shiftAtDof = relativeShiftAtDof_(uLastIter[i], uNewI);
using std::max;
shift_ = max(shift_, shiftAtDof);
}
- if (gridView_().comm().size() > 1)
- shift_ = gridView_().comm().max(shift_);
+ if (communicator().size() > 1)
+ shift_ = communicator().max(shift_);
+ }
+
+ /*!
+ * \brief Assemble the linear system of equations \f$\mathbf{A}x - b = 0\f$.
+ *
+ * \param assembler The jacobian assembler
+ */
+ template<class JacobianAssembler, class SolutionVector>
+ void assembleLinearSystem(JacobianAssembler& assembler,
+ const SolutionVector& uCurrentIter)
+ {
+ assembler.assembleJacobianAndResidual(uCurrentIter);
}
/*!
@@ -397,20 +271,23 @@ public:
* Throws NumericalProblem if the linear solver didn't
* converge.
*
+ * \param ls The linear solver to be used
* \param A The matrix of the linear system of equations
* \param x The vector which solves the linear system
* \param b The right hand side of the linear system
*/
- void newtonSolveLinear(JacobianMatrix &A,
- SolutionVector &x,
- SolutionVector &b)
+ template<class LinearSolver, class JacobianMatrix, class SolutionVector>
+ void solveLinearSystem(LinearSolver& ls,
+ JacobianMatrix& A,
+ SolutionVector& x,
+ SolutionVector& b)
{
try {
if (numSteps_ == 0)
{
Scalar norm2 = b.two_norm2();
- if (gridView_().comm().size() > 1)
- norm2 = gridView_().comm().sum(norm2);
+ if (communicator().size() > 1)
+ norm2 = communicator().sum(norm2);
using std::sqrt;
initialResidual_ = sqrt(norm2);
@@ -423,20 +300,20 @@ public:
//! but it shouldn't impact performance too much
Dune::BlockVector<NumEqVector> xTmp; xTmp.resize(b.size());
Dune::BlockVector<NumEqVector> bTmp(xTmp);
- for (int i = 0; i < b.size(); ++i)
- for (int j = 0; j < numEq; ++j)
+ for (unsigned int i = 0; i < b.size(); ++i)
+ for (unsigned int j = 0; j < numEq; ++j)
bTmp[i][j] = b[i][j];
- int converged = linearSolver_.solve(A, xTmp, bTmp);
+ int converged = ls.solve(A, xTmp, bTmp);
- for (int i = 0; i < x.size(); ++i)
- for (int j = 0; j < numEq; ++j)
+ for (unsigned int i = 0; i < x.size(); ++i)
+ for (unsigned int j = 0; j < numEq; ++j)
x[i][j] = xTmp[i][j];
// make sure all processes converged
int convergedRemote = converged;
- if (gridView_().comm().size() > 1)
- convergedRemote = gridView_().comm().min(converged);
+ if (communicator().size() > 1)
+ convergedRemote = communicator().min(converged);
if (!converged) {
DUNE_THROW(NumericalProblem,
@@ -450,8 +327,8 @@ public:
catch (Dune::MatrixBlockError e) {
// make sure all processes converged
int converged = 0;
- if (gridView_().comm().size() > 1)
- converged = gridView_().comm().min(converged);
+ if (communicator().size() > 1)
+ converged = communicator().min(converged);
NumericalProblem p;
std::string msg;
@@ -463,8 +340,8 @@ public:
catch (const Dune::Exception &e) {
// make sure all processes converged
int converged = 0;
- if (gridView_().comm().size() > 1)
- converged = gridView_().comm().min(converged);
+ if (communicator().size() > 1)
+ converged = communicator().min(converged);
NumericalProblem p;
p.message(e.what());
@@ -483,24 +360,25 @@ public:
* subtract deltaU from uLastIter, i.e.
* \f[ u^{k+1} = u^k - \Delta u^k \f]
*
+ * \param assembler The assembler (needed for global residual evaluation)
* \param uCurrentIter The solution vector after the current iteration
* \param uLastIter The solution vector after the last iteration
* \param deltaU The delta as calculated from solving the linear
* system of equations. This parameter also stores
* the updated solution.
*/
- void newtonUpdate(SolutionVector &uCurrentIter,
+ template<class JacobianAssembler, class SolutionVector>
+ void newtonUpdate(JacobianAssembler& assembler,
+ SolutionVector &uCurrentIter,
const SolutionVector &uLastIter,
const SolutionVector &deltaU)
{
if (enableShiftCriterion_)
newtonUpdateShift(uLastIter, deltaU);
- writeConvergence_(uLastIter, deltaU);
-
if (useLineSearch_)
{
- lineSearchUpdate_(uCurrentIter, uLastIter, deltaU);
+ lineSearchUpdate_(assembler, uCurrentIter, uLastIter, deltaU);
}
else {
for (unsigned int i = 0; i < uLastIter.size(); ++i) {
@@ -510,26 +388,32 @@ public:
if (enableResidualCriterion_)
{
- SolutionVector tmp(uLastIter);
- residual_ = this->method().model().globalResidual(tmp, uCurrentIter);
- reduction_ = residual_;
+ residualNorm_ = assembler.residualNorm(uCurrentIter);
+ reduction_ = residualNorm_;
reduction_ /= initialResidual_;
}
+ else
+ {
+ // If we get here, the convergence criterion does not require
+ // additional residual evalutions. Thus, the grid variables have
+ // not yet been updated to the new uCurrentIter.
+ assembler.gridVariables().update(uCurrentIter);
+ }
}
}
/*!
* \brief Indicates that one Newton iteration was finished.
*
+ * \param assembler The jacobian assembler
* \param uCurrentIter The solution after the current Newton iteration
* \param uLastIter The solution at the beginning of the current Newton iteration
*/
- void newtonEndStep(SolutionVector &uCurrentIter,
+ template<class JacobianAssembler, class SolutionVector>
+ void newtonEndStep(JacobianAssembler& assembler,
+ SolutionVector &uCurrentIter,
const SolutionVector &uLastIter)
{
- // Update the volume variables
- this->model_().newtonEndStep();
-
++numSteps_;
if (verbose())
@@ -538,7 +422,7 @@ public:
if (enableShiftCriterion_)
std::cout << ", maximum relative shift = " << shift_;
if (enableResidualCriterion_ && enableAbsoluteResidualCriterion_)
- std::cout << ", residual = " << residual_;
+ std::cout << ", residual = " << residualNorm_;
else if (enableResidualCriterion_)
std::cout << ", residual reduction = " << reduction_;
std::cout << endIterMsg().str() << "\n";
@@ -546,33 +430,47 @@ public:
endIterMsgStream_.str("");
// When the Newton iterations are done: ask the model to check whether it makes sense
- model_().checkPlausibility();
+ // TODO: how do we realize this? -> do this here in the newton controller
+ // model_().checkPlausibility();
}
/*!
- * \brief Indicates that we're done solving the non-linear system
- * of equations.
+ * \brief Called if the Newton method ended
+ * (not known yet if we failed or succeeded)
*/
- void newtonEnd()
- {}
+ void newtonEnd() {}
/*!
- * \brief Called if the Newton method broke down.
- *
+ * \brief Called if the Newton method ended succcessfully
* This method is called _after_ newtonEnd()
*/
- void newtonFail()
- {
- numSteps_ = targetSteps_*2;
- }
+ void newtonSucceed() {}
/*!
- * \brief Called when the Newton method was successful.
- *
+ * \brief Called if the Newton method broke down.
* This method is called _after_ newtonEnd()
*/
- void newtonSucceed()
- {}
+ template<class Assembler, class SolutionVector>
+ void newtonFail(Assembler& assembler, SolutionVector& u)
+ {
+ if (!assembler.localResidual().isStationary())
+ {
+ // set solution to previous solution
+ u = assembler.prevSol();
+
+ // reset the grid variables to the previous solution
+ assembler.gridVariables().resetTimeStep(u);
+
+ std::cout << "Newton solver did not converge with dt = "
+ << timeLoop_->timeStepSize() << " seconds. Retrying with time step of "
+ << timeLoop_->timeStepSize()/2 << " seconds\n";
+
+ // try again with dt = dt/2
+ timeLoop_->setTimeStepSize(timeLoop_->timeStepSize()/2);
+ }
+ else
+ DUNE_THROW(Dune::MathError, "Newton solver did not converge");
+ }
/*!
* \brief Suggest a new time-step size based on the old time-step
@@ -598,20 +496,6 @@ public:
return oldTimeStep*(1.0 + percent/1.2);
}
- /*!
- * \brief Returns a reference to the current Newton method
- * which is controlled by this controller.
- */
- NewtonMethod &method()
- { return *method_; }
-
- /*!
- * \brief Returns a reference to the current Newton method
- * which is controlled by this controller.
- */
- const NewtonMethod &method() const
- { return *method_; }
-
std::ostringstream &endIterMsg()
{ return endIterMsgStream_; }
@@ -625,110 +509,102 @@ public:
* \brief Returns true if the Newton method ought to be chatty.
*/
bool verbose() const
- { return verbose_ && gridView_().comm().rank() == 0; }
+ { return verbose_ && communicator().rank() == 0; }
protected:
- /*!
- * \brief Returns a reference to the grid view.
- */
- const GridView &gridView_() const
- { return problem_().gridView(); }
-
- /*!
- * \brief Returns a reference to the vertex mapper.
- */
- const VertexMapper &vertexMapper_() const
- { return model_().vertexMapper(); }
-
- /*!
- * \brief Returns a reference to the problem.
- */
- Problem &problem_()
- { return method_->problem(); }
- /*!
- * \brief Returns a reference to the problem.
- */
- const Problem &problem_() const
- { return method_->problem(); }
+ void initParams_()
+ {
+ const std::string group = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
- /*!
- * \brief Returns a reference to the time manager.
- */
- TimeManager &timeManager_()
- { return problem_().timeManager(); }
+ useLineSearch_ = getParamFromGroup<bool>(group, "Newton.UseLineSearch");
+ enableAbsoluteResidualCriterion_ = getParamFromGroup<bool>(group, "Newton.EnableAbsoluteResidualCriterion");
+ enableShiftCriterion_ = getParamFromGroup<bool>(group, "Newton.EnableShiftCriterion");
+ enableResidualCriterion_ = getParamFromGroup<bool>(group, "Newton.EnableResidualCriterion") || enableAbsoluteResidualCriterion_;
+ satisfyResidualAndShiftCriterion_ = getParamFromGroup<bool>(group, "Newton.SatisfyResidualAndShiftCriterion");
+ if (!enableShiftCriterion_ && !enableResidualCriterion_)
+ {
+ DUNE_THROW(Dune::NotImplemented,
+ "at least one of NewtonEnableShiftCriterion or "
+ << "NewtonEnableResidualCriterion has to be set to true");
+ }
- /*!
- * \brief Returns a reference to the time manager.
- */
- const TimeManager &timeManager_() const
- { return problem_().timeManager(); }
+ setMaxRelativeShift(getParamFromGroup<Scalar>(group, "Newton.MaxRelativeShift"));
+ setMaxAbsoluteResidual(getParamFromGroup<Scalar>(group, "Newton.MaxAbsoluteResidual"));
+ setResidualReduction(getParamFromGroup<Scalar>(group, "Newton.ResidualReduction"));
+ setTargetSteps(getParamFromGroup<int>(group, "Newton.TargetSteps"));
+ setMaxSteps(getParamFromGroup<int>(group, "Newton.MaxSteps"));
- /*!
- * \brief Returns a reference to the problem.
- */
- Model &model_()
- { return problem_().model(); }
+ verbose_ = true;
+ numSteps_ = 0;
+ }
- /*!
- * \brief Returns a reference to the problem.
- */
- const Model &model_() const
- { return problem_().model(); }
-
- // returns the actual implementation for the controller we do
- // it this way in order to allow "poor man's virtual methods",
- // i.e. methods of subclasses which can be called by the base
- // class.
- Implementation &asImp_()
- { return *static_cast<Implementation*>(this); }
- const Implementation &asImp_() const
- { return *static_cast<const Implementation*>(this); }
-
- void writeConvergence_(const SolutionVector &uLastIter,
+ template<class JacobianAssembler, class SolutionVector>
+ void lineSearchUpdate_(const JacobianAssembler& assembler,
+ SolutionVector &uCurrentIter,
+ const SolutionVector &uLastIter,
const SolutionVector &deltaU)
{
- if (GET_PARAM_FROM_GROUP(TypeTag, bool, Newton, WriteConvergence))
+ Scalar lambda = 1.0;
+ SolutionVector tmp(uLastIter);
+
+ while (true)
{
- convergenceWriter_->advanceIteration();
- convergenceWriter_->write(uLastIter, deltaU);
+ uCurrentIter = deltaU;
+ uCurrentIter *= -lambda;
+ uCurrentIter += uLastIter;
+
+ residualNorm_ = assembler.residualNorm(uCurrentIter);
+ reduction_ = residualNorm_;
+ reduction_ /= initialResidual_;
+
+ if (reduction_ < lastReduction_ || lambda <= 0.125) {
+ endIterMsg() << ", residual reduction " << lastReduction_ << "->" << reduction_ << "@lambda=" << lambda;
+ return;
+ }
+
+ // try with a smaller update
+ lambda /= 2.0;
}
}
- void lineSearchUpdate_(SolutionVector &uCurrentIter,
- const SolutionVector &uLastIter,
- const SolutionVector &deltaU)
+ /*!
+ * \brief Returns the maximum relative shift between two vectors of
+ * primary variables.
+ *
+ * \param priVars1 The first vector of primary variables
+ * \param priVars2 The second vector of primary variables
+ */
+ template<class PrimaryVariables>
+ Scalar relativeShiftAtDof_(const PrimaryVariables &priVars1,
+ const PrimaryVariables &priVars2)
{
- Scalar lambda = 1.0;
- SolutionVector tmp(uLastIter);
-
- while (true) {
- uCurrentIter = deltaU;
- uCurrentIter *= -lambda;
- uCurrentIter += uLastIter;
-
- // calculate the residual of the current solution
- residual_ = this->method().model().globalResidual(tmp, uCurrentIter);
- reduction_ = residual_;
- reduction_ /= initialResidual_;
-
- if (reduction_ < lastReduction_ || lambda <= 0.125) {
- this->endIterMsg() << ", residual reduction " << lastReduction_ << "->" << reduction_ << "@lambda=" << lambda;
- return;
- }
-
- // try with a smaller update
- lambda /= 2.0;
- }
+ Scalar result = 0.0;
+ using std::abs;
+ using std::max;
+ // iterate over all primary variables
+ // note: we use PrimaryVariables::dimension (== numEq)
+ // for compatibility with the staggered grid implementation
+ for (int j = 0; j < PrimaryVariables::dimension; ++j) {
+ Scalar eqErr = abs(priVars1[j] - priVars2[j]);
+ eqErr /= max<Scalar>(1.0,abs(priVars1[j] + priVars2[j])/2);
+
+ result = max(result, eqErr);
+ }
+ return result;
}
+ // The grid view's communicator
+ const Communicator& comm_;
+
+ std::shared_ptr<TimeLoop<Scalar>> timeLoop_;
+
+ // message stream to be displayed at the end of iterations
std::ostringstream endIterMsgStream_;
- NewtonMethod *method_;
+ // switches on/off verbosity
bool verbose_;
- std::unique_ptr<ConvergenceWriter> convergenceWriter_;
-
// shift criterion variables
Scalar shift_;
Scalar lastShift_;
@@ -736,7 +612,7 @@ protected:
// residual criterion variables
Scalar reduction_;
- Scalar residual_;
+ Scalar residualNorm_;
Scalar lastReduction_;
Scalar initialResidual_;
Scalar reductionTolerance_;
@@ -749,17 +625,15 @@ protected:
// actual number of steps done so far
int numSteps_;
- // the linear solver
- LinearSolver linearSolver_;
-
+ // further parameters
bool enablePartialReassemble_;
- bool enableJacobianRecycling_;
bool useLineSearch_;
bool enableAbsoluteResidualCriterion_;
bool enableShiftCriterion_;
bool enableResidualCriterion_;
bool satisfyResidualAndShiftCriterion_;
};
+
} // namespace Dumux
#endif
diff --git a/dumux/nonlinear/newtonconvergencewriter.hh b/dumux/nonlinear/newtonconvergencewriter.hh
index d0dcd8241fcfeb4d5b432b219b8db24066ffce2d..2ef85f6a5e6e1eba3f81427cf2e716e02a8d885c 100644
--- a/dumux/nonlinear/newtonconvergencewriter.hh
+++ b/dumux/nonlinear/newtonconvergencewriter.hh
@@ -29,17 +29,9 @@
#include <dumux/common/basicproperties.hh>
-#include "newtoncontroller.hh"
-
namespace Dumux
{
-namespace Properties
-{
-NEW_PROP_TAG(NewtonController);
-NEW_PROP_TAG(SolutionVector);
-}
-
/*!
* \ingroup Newton
* \brief Writes the intermediate solutions during
@@ -50,21 +42,19 @@ class NewtonConvergenceWriter
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using NewtonController = typename GET_PROP_TYPE(TypeTag, NewtonController);
+ using LocalResidual = typename GET_PROP_TYPE(TypeTag, LocalResidual);
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
static constexpr int numEq = GET_PROP_VALUE(TypeTag, NumEq);
static constexpr bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
public:
- NewtonConvergenceWriter(NewtonController &ctl, const GridView& gridView)
- : ctl_(ctl),
- writer_(gridView, "convergence", "", "")
+ NewtonConvergenceWriter(const GridView& gridView, const std::size_t numDofs)
+ : writer_(gridView, "convergence", "", "")
{
timeStepIndex_ = 0;
iteration_ = 0;
- const auto numDofs = ctl_.method().model().numDofs();
for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
{
def_[eqIdx].resize(numDofs);
@@ -106,9 +96,7 @@ public:
void write(const SolutionVector &uLastIter,
const SolutionVector &deltaU)
{
- SolutionVector residual(uLastIter);
- ctl_.method().model().globalResidual(residual, uLastIter);
-
+ const auto residual = LocalResidual::globalResidual();
for (unsigned int dofIdxGlobal = 0; dofIdxGlobal < deltaU.size(); dofIdxGlobal++)
{
for (int eqIdx = 0; eqIdx < numEq; ++eqIdx)
@@ -130,7 +118,6 @@ private:
std::array<std::vector<Scalar>, numEq> delta_;
std::array<std::vector<Scalar>, numEq> x_;
- NewtonController &ctl_;
Dune::VTKSequenceWriter<GridView> writer_;
};
diff --git a/dumux/nonlinear/newtonmethod.hh b/dumux/nonlinear/newtonmethod.hh
index 55b5531036f4b9613929dd76505af9d57bc827b9..87f4da3d27ab9f102f7785fd43272d7bcf82dad8 100644
--- a/dumux/nonlinear/newtonmethod.hh
+++ b/dumux/nonlinear/newtonmethod.hh
@@ -21,7 +21,7 @@
*
* \brief The algorithmic part of the multi dimensional newton method.
*
- * In order to use the method you need a NewtonController.
+ * In order to use the method you need a Newtoncontroller
*/
#ifndef DUMUX_NEWTONMETHOD_HH
#define DUMUX_NEWTONMETHOD_HH
@@ -42,188 +42,169 @@ namespace Properties
// create a new type tag for models which apply the newton method
NEW_TYPE_TAG(NewtonMethod);
-NEW_PROP_TAG(Scalar);
-NEW_PROP_TAG(Problem);
-NEW_PROP_TAG(Model);
-NEW_PROP_TAG(NewtonController);
NEW_PROP_TAG(SolutionVector);
-NEW_PROP_TAG(JacobianAssembler);
+NEW_PROP_TAG(JacobianMatrix);
}
/*!
* \ingroup Newton
* \brief The algorithmic part of the multi dimensional newton method.
*
- * In order to use the method you need a NewtonController.
+ * In order to use the method you need a Newtoncontroller
*/
-template <class TypeTag>
+template <class NewtonController, class JacobianAssembler, class LinearSolver>
class NewtonMethod
{
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Model) Model;
- typedef typename GET_PROP_TYPE(TypeTag, NewtonController) NewtonController;
-
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
- typedef typename GET_PROP_TYPE(TypeTag, JacobianAssembler) JacobianAssembler;
public:
- NewtonMethod(Problem &problem)
- : problem_(problem)
- { }
-
- /*!
- * \brief Returns a reference to the current numeric problem.
- */
- Problem &problem()
- { return problem_; }
-
- /*!
- * \brief Returns a reference to the current numeric problem.
- */
- const Problem &problem() const
- { return problem_; }
-
- /*!
- * \brief Returns a reference to the numeric model.
- */
- Model &model()
- { return problem().model(); }
-
- /*!
- * \brief Returns a reference to the numeric model.
- */
- const Model &model() const
- { return problem().model(); }
+ NewtonMethod(std::shared_ptr<NewtonController> controller,
+ std::shared_ptr<JacobianAssembler> assembler,
+ std::shared_ptr<LinearSolver> linearSolver,
+ const std::string& modelParamGroup = "")
+ : controller_(controller)
+ , assembler_(assembler)
+ , linearSolver_(linearSolver)
+ {
+ // set the linear system (matrix & residual) in the assembler
+ assembler_->setLinearSystem();
+ // set a different default for the linear solver residual reduction
+ // within the Newton the linear solver doesn't need to solve too exact
+ using Scalar = typename LinearSolver::Scalar;
+ linearSolver_->setResidualReduction(getParamFromGroup<Scalar>(modelParamGroup, "LinearSolver.ResidualReduction", 1e-6));
+ }
/*!
- * \brief Run the newton method. The controller is responsible
- * for all the strategic decisions.
+ * \brief Run the newton method to solve a non-linear system.
+ * The controller is responsible for all the strategic decisions.
*/
- bool execute(NewtonController &ctl)
+ template<class SolutionVector>
+ bool solve(SolutionVector& u)
{
- try {
- return execute_(ctl);
- }
- catch (const NumericalProblem &e) {
- if (ctl.verbose())
- std::cout << "Newton: Caught exception: \"" << e.what() << "\"\n";
- ctl.newtonFail();
- return false;
- }
- }
-
-protected:
- bool execute_(NewtonController &ctl)
- {
- SolutionVector &uCurrentIter = model().curSol();
- SolutionVector uLastIter(uCurrentIter);
- SolutionVector deltaU(uCurrentIter);
-
- JacobianAssembler &jacobianAsm = model().jacobianAssembler();
-
- Dune::Timer assembleTimer(false);
- Dune::Timer solveTimer(false);
- Dune::Timer updateTimer(false);
-
- // tell the controller that we begin solving
- ctl.newtonBegin(*this, uCurrentIter);
-
- // execute the method as long as the controller thinks
- // that we should do another iteration
- while (ctl.newtonProceed(uCurrentIter))
+ try
{
- // notify the controller that we're about to start
- // a new timestep
- ctl.newtonBeginStep();
-
- // make the current solution to the old one
- uLastIter = uCurrentIter;
-
- if (ctl.verbose()) {
- std::cout << "Assemble: r(x^k) = dS/dt + div F - q; M = grad r";
- std::cout.flush();
+ // the given solution is the initial guess
+ SolutionVector& uCurrentIter = u;
+ SolutionVector uLastIter(uCurrentIter);
+ SolutionVector deltaU(uCurrentIter);
+
+ Dune::Timer assembleTimer(false);
+ Dune::Timer solveTimer(false);
+ Dune::Timer updateTimer(false);
+
+ // tell the controller that we begin solving
+ controller_->newtonBegin(uCurrentIter);
+
+ // execute the method as long as the controller thinks
+ // that we should do another iteration
+ while (controller_->newtonProceed(uCurrentIter, controller_->newtonConverged()))
+ {
+ // notify the controller that we're about to start
+ // a new timestep
+ controller_->newtonBeginStep();
+
+ // make the current solution to the old one
+ if (controller_->newtonNumSteps() > 0)
+ uLastIter = uCurrentIter;
+
+ if (controller_->verbose()) {
+ std::cout << "Assemble: r(x^k) = dS/dt + div F - q; M = grad r";
+ std::cout.flush();
+ }
+
+ ///////////////
+ // assemble
+ ///////////////
+
+ // linearize the problem at the current solution
+ assembleTimer.start();
+ controller_->assembleLinearSystem(*assembler_, u);
+ assembleTimer.stop();
+
+ ///////////////
+ // linear solve
+ ///////////////
+
+ // Clear the current line using an ansi escape
+ // sequence. for an explanation see
+ // http://en.wikipedia.org/wiki/ANSI_escape_code
+ const char clearRemainingLine[] = { 0x1b, '[', 'K', 0 };
+
+ if (controller_->verbose()) {
+ std::cout << "\rSolve: M deltax^k = r";
+ std::cout << clearRemainingLine;
+ std::cout.flush();
+ }
+
+ // solve the resulting linear equation system
+ solveTimer.start();
+
+ // set the delta vector to zero before solving the linear system!
+ deltaU = 0;
+ // ask the controller to solve the linearized system
+ controller_->solveLinearSystem(*linearSolver_,
+ assembler_->jacobian(),
+ deltaU,
+ assembler_->residual());
+ solveTimer.stop();
+
+ ///////////////
+ // update
+ ///////////////
+ if (controller_->verbose()) {
+ std::cout << "\rUpdate: x^(k+1) = x^k - deltax^k";
+ std::cout << clearRemainingLine;
+ std::cout.flush();
+ }
+
+ updateTimer.start();
+ // update the current solution (i.e. uOld) with the delta
+ // (i.e. u). The result is stored in u
+ controller_->newtonUpdate(*assembler_, uCurrentIter, uLastIter, deltaU);
+ updateTimer.stop();
+
+ // tell the controller that we're done with this iteration
+ controller_->newtonEndStep(*assembler_, uCurrentIter, uLastIter);
}
- ///////////////
- // assemble
- ///////////////
-
- // linearize the problem at the current solution
- assembleTimer.start();
- jacobianAsm.assemble();
- assembleTimer.stop();
-
- ///////////////
- // linear solve
- ///////////////
-
- // Clear the current line using an ansi escape
- // sequence. for an explanation see
- // http://en.wikipedia.org/wiki/ANSI_escape_code
- const char clearRemainingLine[] = { 0x1b, '[', 'K', 0 };
+ // tell controller we are done
+ controller_->newtonEnd();
- if (ctl.verbose()) {
- std::cout << "\rSolve: M deltax^k = r";
- std::cout << clearRemainingLine;
- std::cout.flush();
+ // reset state if newton failed
+ if (!controller_->newtonConverged())
+ {
+ controller_->newtonFail(*assembler_, u);
+ return false;
}
- // solve the resulting linear equation system
- solveTimer.start();
-
- // set the delta vector to zero before solving the linear system!
- deltaU = 0;
- // ask the controller to solve the linearized system
- ctl.newtonSolveLinear(jacobianAsm.matrix(),
- deltaU,
- jacobianAsm.residual());
- solveTimer.stop();
-
- ///////////////
- // update
- ///////////////
- if (ctl.verbose()) {
- std::cout << "\rUpdate: x^(k+1) = x^k - deltax^k";
- std::cout << clearRemainingLine;
- std::cout.flush();
- }
-
- updateTimer.start();
- // update the current solution (i.e. uOld) with the delta
- // (i.e. u). The result is stored in u
- ctl.newtonUpdate(uCurrentIter, uLastIter, deltaU);
- updateTimer.stop();
+ // tell controller we converged successfully
+ controller_->newtonSucceed();
- // tell the controller that we're done with this iteration
- ctl.newtonEndStep(uCurrentIter, uLastIter);
- }
-
- // tell the controller that we're done
- ctl.newtonEnd();
+ if (controller_->verbose()) {
+ const auto elapsedTot = assembleTimer.elapsed() + solveTimer.elapsed() + updateTimer.elapsed();
+ std::cout << "Assemble/solve/update time: "
+ << assembleTimer.elapsed() << "(" << 100*assembleTimer.elapsed()/elapsedTot << "%)/"
+ << solveTimer.elapsed() << "(" << 100*solveTimer.elapsed()/elapsedTot << "%)/"
+ << updateTimer.elapsed() << "(" << 100*updateTimer.elapsed()/elapsedTot << "%)"
+ << "\n";
+ }
+ return true;
- if (ctl.verbose()) {
- Scalar elapsedTot = assembleTimer.elapsed() + solveTimer.elapsed() + updateTimer.elapsed();
- std::cout << "Assemble/solve/update time: "
- << assembleTimer.elapsed() << "(" << 100*assembleTimer.elapsed()/elapsedTot << "%)/"
- << solveTimer.elapsed() << "(" << 100*solveTimer.elapsed()/elapsedTot << "%)/"
- << updateTimer.elapsed() << "(" << 100*updateTimer.elapsed()/elapsedTot << "%)"
- << "\n";
}
-
- if (!ctl.newtonConverged()) {
- ctl.newtonFail();
+ catch (const NumericalProblem &e)
+ {
+ if (controller_->verbose())
+ std::cout << "Newton: Caught exception: \"" << e.what() << "\"\n";
+ controller_->newtonFail(*assembler_, u);
return false;
}
-
- ctl.newtonSucceed();
- return true;
}
private:
- Problem &problem_;
+ std::shared_ptr<NewtonController> controller_;
+ std::shared_ptr<JacobianAssembler> assembler_;
+ std::shared_ptr<LinearSolver> linearSolver_;
};
-}
+} // end namespace Dumux
#endif
diff --git a/dumux/porousmediumflow/1p/implicit/incompressiblelocalresidual.hh b/dumux/porousmediumflow/1p/implicit/incompressiblelocalresidual.hh
new file mode 100644
index 0000000000000000000000000000000000000000..8b4af3635521f9c9a4917019d6aca3c5abf654ce
--- /dev/null
+++ b/dumux/porousmediumflow/1p/implicit/incompressiblelocalresidual.hh
@@ -0,0 +1,243 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief Element-wise calculation of the residual and its derivatives
+ * for a single-phase, incompressible, test problem.
+ */
+#ifndef DUMUX_1P_INCOMPRESSIBLE_LOCAL_RESIDUAL_HH
+#define DUMUX_1P_INCOMPRESSIBLE_LOCAL_RESIDUAL_HH
+
+#include <dumux/discretization/methods.hh>
+#include <dumux/porousmediumflow/immiscible/localresidual.hh>
+
+namespace Dumux
+{
+
+template<class TypeTag>
+class OnePIncompressibleLocalResidual : public ImmiscibleLocalResidual<TypeTag>
+{
+ using ParentType = ImmiscibleLocalResidual<TypeTag>;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using ElementResidualVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+ using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using EnergyLocalResidual = typename GET_PROP_TYPE(TypeTag, EnergyLocalResidual);
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ // first index for the mass balance
+ enum { conti0EqIdx = Indices::conti0EqIdx };
+ enum { pressureIdx = Indices::pressureIdx };
+
+ static const int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
+
+public:
+ using ParentType::ParentType;
+
+ template<class PartialDerivativeMatrix>
+ void addStorageDerivatives(PartialDerivativeMatrix& partialDerivatives,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const VolumeVariables& curVolVars,
+ const SubControlVolume& scv) const {}
+
+ template<class PartialDerivativeMatrix>
+ void addSourceDerivatives(PartialDerivativeMatrix& partialDerivatives,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const VolumeVariables& curVolVars,
+ const SubControlVolume& scv) const {}
+
+ //! flux derivatives for the cell-centered tpfa scheme
+ template<class PartialDerivativeMatrices, class T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::CCTpfa, void>
+ addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ static_assert(!FluidSystem::isCompressible(0),
+ "1p/incompressiblelocalresidual.hh: Only incompressible fluids are allowed!");
+ static_assert(FluidSystem::viscosityIsConstant(0),
+ "1p/incompressiblelocalresidual.hh: Only fluids with constant viscosities are allowed!");
+
+ // we know the "upwind factor" is constant, get inner one here and compute derivatives
+ static const Scalar up = curElemVolVars[scvf.insideScvIdx()].density()
+ / curElemVolVars[scvf.insideScvIdx()].viscosity();
+ const auto deriv = elemFluxVarsCache[scvf].advectionTij()*up;
+
+ // add partial derivatives to the respective given matrices
+ derivativeMatrices[scvf.insideScvIdx()][conti0EqIdx][pressureIdx] += deriv;
+ derivativeMatrices[scvf.outsideScvIdx()][conti0EqIdx][pressureIdx] -= deriv;
+ }
+
+ //! flux derivatives for the cell-centered mpfa scheme
+ template<class PartialDerivativeMatrices, class T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::CCMpfa, void>
+ addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ static_assert(!FluidSystem::isCompressible(0),
+ "1p/incompressiblelocalresidual.hh: Only incompressible fluids are allowed!");
+ static_assert(FluidSystem::viscosityIsConstant(0),
+ "1p/incompressiblelocalresidual.hh: Only fluids with constant viscosities are allowed!");
+
+ const auto& fluxVarsCache = elemFluxVarsCache[scvf];
+ const auto& volVarIndices = fluxVarsCache.advectionVolVarsStencil();
+ const auto& tij = fluxVarsCache.advectionTij();
+
+ // we know the "upwind factor" is constant, get inner one here and compute derivatives
+ static const Scalar up = curElemVolVars[scvf.insideScvIdx()].density()
+ / curElemVolVars[scvf.insideScvIdx()].viscosity();
+
+ // add partial derivatives to the respective given matrices
+ for (unsigned int i = 0; i < volVarIndices.size();++i)
+ {
+ if (fluxVarsCache.advectionSwitchFluxSign())
+ derivativeMatrices[volVarIndices[i]][conti0EqIdx][pressureIdx] -= tij[i]*up;
+ else
+ derivativeMatrices[volVarIndices[i]][conti0EqIdx][pressureIdx] += tij[i]*up;
+ }
+ }
+
+ //! flux derivatives for the box scheme
+ template<class JacobianMatrix, class T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::Box, void>
+ addFluxDerivatives(JacobianMatrix& A,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ static_assert(!FluidSystem::isCompressible(0),
+ "1p/incompressiblelocalresidual.hh: Only incompressible fluids are allowed!");
+ static_assert(FluidSystem::viscosityIsConstant(0),
+ "1p/incompressiblelocalresidual.hh: Only fluids with constant viscosities are allowed!");
+
+ using AdvectionType = typename GET_PROP_TYPE(T, AdvectionType);
+ const auto ti = AdvectionType::calculateTransmissibilities(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ scvf,
+ elemFluxVarsCache[scvf]);
+
+ const auto& insideScv = fvGeometry.scv(scvf.insideScvIdx());
+ const auto& outsideScv = fvGeometry.scv(scvf.outsideScvIdx());
+
+ // we know the "upwind factor" is constant, get inner one here and compute derivatives
+ static const Scalar up = curElemVolVars[scvf.insideScvIdx()].density()
+ / curElemVolVars[scvf.insideScvIdx()].viscosity();
+ for (const auto& scv : scvs(fvGeometry))
+ {
+ auto d = up*ti[scv.indexInElement()];
+ A[insideScv.dofIndex()][scv.dofIndex()][conti0EqIdx][pressureIdx] += d;
+ A[outsideScv.dofIndex()][scv.dofIndex()][conti0EqIdx][pressureIdx] -= d;
+ }
+ }
+
+ //! Dirichlet flux derivatives for the cell-centered tpfa scheme
+ template<class PartialDerivativeMatrices, class T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::CCTpfa, void>
+ addCCDirichletFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ // we know the "upwind factor" is constant, get inner one here
+ static const Scalar up = curElemVolVars[scvf.insideScvIdx()].density()
+ / curElemVolVars[scvf.insideScvIdx()].viscosity();
+ const auto deriv = elemFluxVarsCache[scvf].advectionTij()*up;
+
+ // compute and add partial derivative to the respective given matrices
+ derivativeMatrices[scvf.insideScvIdx()][conti0EqIdx][pressureIdx] += deriv;
+ }
+
+ //! Dirichlet flux derivatives for the cell-centered mpfa scheme
+ template<class PartialDerivativeMatrices, class T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::CCMpfa, void>
+ addCCDirichletFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ const auto& fluxVarsCache = elemFluxVarsCache[scvf];
+ const auto& volVarIndices = fluxVarsCache.advectionVolVarsStencil();
+ const auto& tij = fluxVarsCache.advectionTij();
+
+ // we know the "upwind factor" is constant, get inner one here and compute derivatives
+ static const Scalar up = curElemVolVars[scvf.insideScvIdx()].density()
+ / curElemVolVars[scvf.insideScvIdx()].viscosity();
+
+ // add partial derivatives to the respective given matrices
+ for (unsigned int i = 0; i < volVarIndices.size();++i)
+ {
+ if (fluxVarsCache.advectionSwitchFluxSign())
+ derivativeMatrices[volVarIndices[i]][conti0EqIdx][pressureIdx] -= tij[i]*up;
+ else
+ derivativeMatrices[volVarIndices[i]][conti0EqIdx][pressureIdx] += tij[i]*up;
+ }
+ }
+
+ template<class PartialDerivativeMatrices>
+ void addRobinFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ //! Robin-type boundary conditions are problem-specific.
+ //! We can't put a general implementation here - users defining Robin-type BCs
+ //! while using analytical Jacobian assembly must overload this function!
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/porousmediumflow/1p/implicit/model.hh b/dumux/porousmediumflow/1p/implicit/model.hh
index a4de22a69b54dbf8b9acadc2e6e932054a797dfe..c5516ab1ffc2125702e1cd7d88820fdff793bf47 100644
--- a/dumux/porousmediumflow/1p/implicit/model.hh
+++ b/dumux/porousmediumflow/1p/implicit/model.hh
@@ -17,23 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/*!
- * \file
+ * \file OnePModel
*
- * \brief Base class for all models which use the one-phase,
- * fully implicit model.
- * Adaption of the fully implicit scheme to the one-phase flow model.
- */
-
-#ifndef DUMUX_1P_MODEL_HH
-#define DUMUX_1P_MODEL_HH
-
-#include <dumux/porousmediumflow/nonisothermal/implicit/model.hh>
-
-#include "properties.hh"
-
-namespace Dumux
-{
-/*!
* \ingroup OnePModel
* \brief A single-phase, isothermal flow model using the fully implicit scheme.
*
@@ -54,41 +39,10 @@ namespace Dumux
* and the implicit Euler method as time discretization.
* The model supports compressible as well as incompressible fluids.
*/
-template<class TypeTag >
-class OnePModel : public GET_PROP_TYPE(TypeTag, BaseModel)
-{
- using ParentType = typename GET_PROP_TYPE(TypeTag, BaseModel);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using NonIsothermalModel = Dumux::NonIsothermalModel<TypeTag>;
-
- enum { dim = GridView::dimension };
- enum { dimWorld = GridView::dimensionworld };
-
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dim : 0 };
-
-public:
- void init(Problem& problem)
- {
- ParentType::init(problem);
-
- // register standardized vtk output fields
- auto& vtkOutputModule = problem.vtkOutputModule();
- vtkOutputModule.addPrimaryVariable("pressure", Indices::pressureIdx);
-
- NonIsothermalModel::maybeAddTemperature(vtkOutputModule);
- }
-};
-
-} // end namespace Dumux
+#ifndef DUMUX_1P_MODEL_HH
+#define DUMUX_1P_MODEL_HH
-#include "propertydefaults.hh"
+#include "properties.hh"
#endif
diff --git a/dumux/porousmediumflow/1p/implicit/properties.hh b/dumux/porousmediumflow/1p/implicit/properties.hh
index 568bd8e2853edef1ec8bd3c9cd697f663833b38e..c73e56136659f489e147ee06677ae24afd0f604e 100644
--- a/dumux/porousmediumflow/1p/implicit/properties.hh
+++ b/dumux/porousmediumflow/1p/implicit/properties.hh
@@ -27,48 +27,88 @@
#ifndef DUMUX_1P_PROPERTIES_HH
#define DUMUX_1P_PROPERTIES_HH
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/properties.hh>
+#include <dumux/common/basicproperties.hh>
+#include <dumux/linear/linearsolverproperties.hh>
+
+#include <dumux/material/components/nullcomponent.hh>
+#include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
+#include <dumux/material/fluidstates/immiscible.hh>
+#include <dumux/material/fluidsystems/liquidphase.hh>
+#include <dumux/material/fluidsystems/1p.hh>
+
+#include <dumux/porousmediumflow/properties.hh>
+#include <dumux/porousmediumflow/immiscible/localresidual.hh>
#include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
+#include "indices.hh"
+#include "volumevariables.hh"
+#include "vtkoutputfields.hh"
+
namespace Dumux
{
-// \{
+namespace Properties {
+//! The type tags for the isothermal & non-isothermal single phase model
+NEW_TYPE_TAG(OneP, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
+NEW_TYPE_TAG(OnePNI, INHERITS_FROM(OneP, NonIsothermal));
+
///////////////////////////////////////////////////////////////////////////
// properties for the isothermal single phase model
///////////////////////////////////////////////////////////////////////////
-namespace Properties {
-
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
+SET_INT_PROP(OneP, NumEq, 1); //! set the number of equations to 1
+SET_INT_PROP(OneP, NumPhases, 1); //! The number of phases in the 1p model is 1
+SET_INT_PROP(OneP, NumComponents, 1); //! The number of components in the 1p model is 1
+SET_TYPE_PROP(OneP, LocalResidual, ImmiscibleLocalResidual<TypeTag>); //! The local residual function
+SET_TYPE_PROP(OneP, VolumeVariables, OnePVolumeVariables<TypeTag>); //! the VolumeVariables property
+SET_BOOL_PROP(OneP, EnableAdvection, true); //! The one-phase model considers advection
+SET_BOOL_PROP(OneP, EnableMolecularDiffusion, false); //! The one-phase model has no molecular diffusion
+SET_BOOL_PROP(OneP, EnableEnergyBalance, false); //! Isothermal model by default
+SET_TYPE_PROP(OneP, Indices, OnePIndices); //! The indices required by the isothermal single-phase model
+SET_TYPE_PROP(OneP, VtkOutputFields, OnePVtkOutputFields<TypeTag>); //! Set the vtk output fields specific to this model
-//! The type tags for the implicit single-phase problems
-NEW_TYPE_TAG(OneP);
-NEW_TYPE_TAG(BoxOneP, INHERITS_FROM(BoxModel, OneP));
-NEW_TYPE_TAG(CCOneP, INHERITS_FROM(CCModel, OneP));
+//! The single-phase fluid system is used by default
+SET_TYPE_PROP(OneP,
+ FluidSystem,
+ FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Fluid)>);
-//! The type tags for the corresponding non-isothermal problems
-NEW_TYPE_TAG(OnePNI, INHERITS_FROM(OneP, NonIsothermal));
-NEW_TYPE_TAG(BoxOnePNI, INHERITS_FROM(BoxModel, OnePNI));
-NEW_TYPE_TAG(CCOnePNI, INHERITS_FROM(CCModel, OnePNI));
+//! We set a fluid that only throws exceptions.
+//! This hopefully makes the user set this property correctly
+SET_PROP(OneP, Fluid)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+public:
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
+};
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
+/*!
+ * \brief The fluid state which is used by the volume variables to
+ * store the thermodynamic state. This should be chosen
+ * appropriately for the model ((non-)isothermal, equilibrium, ...).
+ * This can be done in the problem.
+ */
+SET_PROP(OneP, FluidState)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+public:
+ typedef ImmiscibleFluidState<Scalar, FluidSystem> type;
+};
-NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system
-NEW_PROP_TAG(NumComponents); //!< Number of fluid phases in the system
-NEW_PROP_TAG(Indices); //!< Enumerations for the model
-NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters object
-NEW_PROP_TAG(FluidSystem); //!< The type of the fluid system to use
-NEW_PROP_TAG(Fluid); //!< The fluid used for the default fluid system
-NEW_PROP_TAG(FluidState); //!< The type of the fluid state to use
-NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
-// \}
-}
+///////////////////////////////////////////////////////////////////////////
+// properties for the non-isothermal single phase model
+///////////////////////////////////////////////////////////////////////////
+SET_INT_PROP(OnePNI, IsothermalNumEq, 1); //! set number of equations of isothermal model
+SET_BOOL_PROP(OnePNI, EnableEnergyBalance, true); //! we do solve for the energy balance here
+SET_TYPE_PROP(OnePNI, IsothermalVtkOutputFields, OnePVtkOutputFields<TypeTag>); //! the isothermal vtk output fields
+SET_TYPE_PROP(OnePNI, IsothermalVolumeVariables, OnePVolumeVariables<TypeTag>); //! Vol vars of the isothermal model
+SET_TYPE_PROP(OnePNI, IsothermalLocalResidual, ImmiscibleLocalResidual<TypeTag>); //! Local residual of the isothermal model
+SET_TYPE_PROP(OnePNI, IsothermalIndices, OnePIndices); //! Indices of the isothermal model
+SET_TYPE_PROP(OnePNI,
+ ThermalConductivityModel,
+ ThermalConductivityAverage<typename GET_PROP_TYPE(TypeTag, Scalar)>); //! Use the average for effective conductivities
-} // end namespace
+} // end namespace Properties
+} // end namespace Dumux
#endif
diff --git a/dumux/porousmediumflow/1p/implicit/propertydefaults.hh b/dumux/porousmediumflow/1p/implicit/propertydefaults.hh
deleted file mode 100644
index b30470f0870be87a3e29da6a52b53374b0cc8449..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/1p/implicit/propertydefaults.hh
+++ /dev/null
@@ -1,150 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup OnePModel
- * \file
- *
- * \brief Defines the properties required for the one-phase fully implicit model.
- */
-#ifndef DUMUX_1P_PROPERTY_DEFAULTS_HH
-#define DUMUX_1P_PROPERTY_DEFAULTS_HH
-
-#include "properties.hh"
-
-#include "model.hh"
-#include "volumevariables.hh"
-#include "indices.hh"
-
-#include <dumux/porousmediumflow/immiscible/localresidual.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
-#include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/material/components/nullcomponent.hh>
-#include <dumux/material/fluidsystems/1p.hh>
-#include <dumux/material/spatialparams/implicit1p.hh>
-#include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
-
-namespace Dumux
-{
-// \{
-
-///////////////////////////////////////////////////////////////////////////
-// default property values for the isothermal single phase model
-///////////////////////////////////////////////////////////////////////////
-namespace Properties {
-SET_INT_PROP(OneP, NumEq, 1); //!< set the number of equations to 1
-SET_INT_PROP(OneP, NumPhases, 1); //!< The number of phases in the 1p model is 1
-SET_INT_PROP(OneP, NumComponents, 1); //!< The number of components in the 1p model is 1
-
-//! The local residual function
-SET_TYPE_PROP(OneP, LocalResidual, ImmiscibleLocalResidual<TypeTag>);
-
-//! the Model property
-SET_TYPE_PROP(OneP, Model, OnePModel<TypeTag>);
-
-//! the VolumeVariables property
-SET_TYPE_PROP(OneP, VolumeVariables, OnePVolumeVariables<TypeTag>);
-
-//! Enable advection
-SET_BOOL_PROP(OneP, EnableAdvection, true);
-
-//! The one-phase model has no molecular diffusion
-SET_BOOL_PROP(OneP, EnableMolecularDiffusion, false);
-
-//! Isothermal model by default
-SET_BOOL_PROP(OneP, EnableEnergyBalance, false);
-
-//! The indices required by the isothermal single-phase model
-SET_TYPE_PROP(OneP, Indices, OnePIndices);
-
-//! The spatial parameters to be employed.
-//! Use ImplicitSpatialParamsOneP by default.
-SET_TYPE_PROP(OneP, SpatialParams, ImplicitSpatialParamsOneP<TypeTag>);
-
-//! The fluid system to use by default
-SET_TYPE_PROP(OneP, FluidSystem, FluidSystems::OneP<typename GET_PROP_TYPE(TypeTag, Scalar), typename GET_PROP_TYPE(TypeTag, Fluid)>);
-
-SET_PROP(OneP, Fluid)
-{ private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public:
- typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
-};
-
-/*!
- * \brief The fluid state which is used by the volume variables to
- * store the thermodynamic state. This should be chosen
- * appropriately for the model ((non-)isothermal, equilibrium, ...).
- * This can be done in the problem.
- */
-SET_PROP(OneP, FluidState){
- private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- public:
- typedef ImmiscibleFluidState<Scalar, FluidSystem> type;
-};
-
-// disable velocity output by default
-
-// enable gravity by default
-SET_BOOL_PROP(OneP, ProblemEnableGravity, true);
-
-//! default value for the forchheimer coefficient
-// Source: Ward, J.C. 1964 Turbulent flow in porous media. ASCE J. Hydraul. Div 90.
-// Actually the Forchheimer coefficient is also a function of the dimensions of the
-// porous medium. Taking it as a constant is only a first approximation
-// (Nield, Bejan, Convection in porous media, 2006, p. 10)
-SET_SCALAR_PROP(OneP, SpatialParamsForchCoeff, 0.55);
-
-//! average is used as default model to compute the effective thermal heat conductivity
-SET_PROP(OnePNI, ThermalConductivityModel)
-{ private :
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- public:
- typedef ThermalConductivityAverage<Scalar> type;
-};
-
-//////////////////////////////////////////////////////////////////
-// Property values for isothermal model required for the general non-isothermal model
-//////////////////////////////////////////////////////////////////
-
-// set isothermal Model
-SET_TYPE_PROP(OnePNI, IsothermalModel, OnePModel<TypeTag>);
-
-//set isothermal VolumeVariables
-SET_TYPE_PROP(OnePNI, IsothermalVolumeVariables, OnePVolumeVariables<TypeTag>);
-
-//set isothermal LocalResidual
-SET_TYPE_PROP(OnePNI, IsothermalLocalResidual, ImmiscibleLocalResidual<TypeTag>);
-
-//set isothermal Indices
-SET_TYPE_PROP(OnePNI, IsothermalIndices, OnePIndices);
-
-//set isothermal NumEq
-SET_INT_PROP(OnePNI, IsothermalNumEq, 1);
-
-// \}
-} // end namespace Properties
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/porousmediumflow/1p/implicit/volumevariables.hh b/dumux/porousmediumflow/1p/implicit/volumevariables.hh
index 414c661d8cb0d9fd4b7c0b194b682b92f62e1b5f..697c7e5ec72d520e7badb0ec733c05d449a2e8a4 100644
--- a/dumux/porousmediumflow/1p/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/1p/implicit/volumevariables.hh
@@ -55,8 +55,6 @@ class OnePVolumeVariables : public ImplicitVolumeVariables<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
- static const bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
-
public:
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
diff --git a/dumux/multidomain/2cnistokes2p2cni/propertydefaults.hh b/dumux/porousmediumflow/1p/implicit/vtkoutputfields.hh
similarity index 72%
rename from dumux/multidomain/2cnistokes2p2cni/propertydefaults.hh
rename to dumux/porousmediumflow/1p/implicit/vtkoutputfields.hh
index 704d8a6110575a9d47934905be10764e1a74626b..12296f473e9b81ab0b6ca393499cb4672db46f6a 100644
--- a/dumux/multidomain/2cnistokes2p2cni/propertydefaults.hh
+++ b/dumux/porousmediumflow/1p/implicit/vtkoutputfields.hh
@@ -18,28 +18,29 @@
*****************************************************************************/
/*!
* \file
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup MultidomainModel
- *
- * \brief Defines default values for the properties required by the
- * coupled 2cnistokes2p2cni model.
+ * \brief Adds vtk output fields specific to the onep model
*/
-#ifndef DUMUX_TWOCNISTOKESTWOPTWOCNI_PROPERTY_DEFAULTS_HH
-#define DUMUX_TWOCNISTOKESTWOPTWOCNI_PROPERTY_DEFAULTS_HH
-
-#include "properties.hh"
+#ifndef DUMUX_ONEP_VTK_OUTPUT_FIELDS_HH
+#define DUMUX_ONEP_VTK_OUTPUT_FIELDS_HH
namespace Dumux
{
-namespace Properties
-{
-//////////////////////////////////////////////////////////////////
-// Property defaults
-//////////////////////////////////////////////////////////////////
-
-} // end namespace properties
+/*!
+ * \ingroup OneP, InputOutput
+ * \brief Adds vtk output fields specific to the onep model
+ */
+template<class TypeTag>
+class OnePVtkOutputFields
+{
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+public:
+ template <class VtkOutputModule>
+ static void init(VtkOutputModule& vtk)
+ {
+ vtk.addVolumeVariable([](const auto& volVars){ return volVars.pressure(); }, "pressure");
+ }
+};
} // end namespace Dumux
diff --git a/dumux/porousmediumflow/2p/implicit/CMakeLists.txt b/dumux/porousmediumflow/2p/implicit/CMakeLists.txt
index 14092df9d3fd41f92c79d6368e7b6f8a079ac1cf..53a30db4f8ef3b632b96f010370408f18df00228 100644
--- a/dumux/porousmediumflow/2p/implicit/CMakeLists.txt
+++ b/dumux/porousmediumflow/2p/implicit/CMakeLists.txt
@@ -3,9 +3,11 @@
install(FILES
gridadaptindicator.hh
indices.hh
+incompressiblelocalresidual.hh
localresidual.hh
model.hh
properties.hh
propertydefaults.hh
volumevariables.hh
+vtkoutputfields.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/porousmediumflow/2p/implicit)
diff --git a/dumux/porousmediumflow/2p/implicit/incompressiblelocalresidual.hh b/dumux/porousmediumflow/2p/implicit/incompressiblelocalresidual.hh
new file mode 100644
index 0000000000000000000000000000000000000000..9c55f0d2aaf80ee2e30bc5d3350a6220e062dacd
--- /dev/null
+++ b/dumux/porousmediumflow/2p/implicit/incompressiblelocalresidual.hh
@@ -0,0 +1,439 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief Element-wise calculation of the residual and its derivatives
+ * for a two-phase, incompressible test problem.
+ */
+#ifndef DUMUX_2P_INCOMPRESSIBLE_TEST_LOCAL_RESIDUAL_HH
+#define DUMUX_2P_INCOMPRESSIBLE_TEST_LOCAL_RESIDUAL_HH
+
+#include <dumux/discretization/methods.hh>
+#include <dumux/porousmediumflow/immiscible/localresidual.hh>
+
+namespace Dumux
+{
+
+template<class TypeTag>
+class TwoPIncompressibleLocalResidual : public ImmiscibleLocalResidual<TypeTag>
+{
+ using ParentType = ImmiscibleLocalResidual<TypeTag>;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using ElementResidualVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
+ using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using EnergyLocalResidual = typename GET_PROP_TYPE(TypeTag, EnergyLocalResidual);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ // first index for the mass balance
+ enum
+ {
+ contiWEqIdx = Indices::contiWEqIdx,
+ contiNEqIdx = Indices::contiNEqIdx,
+
+ pressureIdx = Indices::pressureIdx,
+ saturationIdx = Indices::saturationIdx
+ };
+
+ static const int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
+
+public:
+ using ParentType::ParentType;
+
+ template<class PartialDerivativeMatrix>
+ void addStorageDerivatives(PartialDerivativeMatrix& partialDerivatives,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const VolumeVariables& curVolVars,
+ const SubControlVolume& scv) const
+ {
+ static_assert(!FluidSystem::isCompressible(FluidSystem::wPhaseIdx),
+ "2p/incompressiblelocalresidual.hh: Only incompressible fluids are allowed!");
+ static_assert(!FluidSystem::isCompressible(FluidSystem::nPhaseIdx),
+ "2p/incompressiblelocalresidual.hh: Only incompressible fluids are allowed!");
+
+ // we know that these values are constant throughout the simulation
+ static const auto phi = curVolVars.porosity();
+ static const auto phi_rho_w = phi*curVolVars.density(FluidSystem::wPhaseIdx);
+ static const auto phi_rho_n = phi*curVolVars.density(FluidSystem::nPhaseIdx);
+
+ const auto volume = scv.volume();
+
+ // partial derivative of wetting phase storage term w.r.t. p_w
+ partialDerivatives[contiWEqIdx][pressureIdx] += 0.0;
+ // partial derivative of wetting phase storage term w.r.t. S_n
+ partialDerivatives[contiWEqIdx][saturationIdx] -= volume*phi_rho_w/this->timeLoop().timeStepSize();
+ // partial derivative of non-wetting phase storage term w.r.t. p_w
+ partialDerivatives[contiNEqIdx][pressureIdx] += 0.0;
+ // partial derivative of non-wetting phase storage term w.r.t. S_n
+ partialDerivatives[contiNEqIdx][saturationIdx] += volume*phi_rho_n/this->timeLoop().timeStepSize();
+ }
+
+ template<class PartialDerivativeMatrix>
+ void addSourceDerivatives(PartialDerivativeMatrix& partialDerivatives,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const VolumeVariables& curVolVars,
+ const SubControlVolume& scv) const
+ { /* TODO maybe forward to problem for the user to implement the source derivatives?*/ }
+
+ template<class PartialDerivativeMatrices, class T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) != DiscretizationMethods::Box, void>
+ addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ static_assert(!FluidSystem::isCompressible(FluidSystem::wPhaseIdx),
+ "2p/incompressiblelocalresidual.hh: Only incompressible fluids are allowed!");
+ static_assert(!FluidSystem::isCompressible(FluidSystem::nPhaseIdx),
+ "2p/incompressiblelocalresidual.hh: Only incompressible fluids are allowed!");
+ static_assert(FluidSystem::viscosityIsConstant(FluidSystem::wPhaseIdx),
+ "2p/incompressiblelocalresidual.hh: Only fluids with constant viscosities are allowed!");
+ static_assert(FluidSystem::viscosityIsConstant(FluidSystem::nPhaseIdx),
+ "2p/incompressiblelocalresidual.hh: Only fluids with constant viscosities are allowed!");
+
+ using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
+ using AdvectionType = typename GET_PROP_TYPE(TypeTag, AdvectionType);
+
+ // evaluate the current wetting phase Darcy flux and resulting upwind weights
+ static const Scalar upwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
+ const auto flux_w = AdvectionType::flux(problem, element, fvGeometry, curElemVolVars,
+ scvf, FluidSystem::wPhaseIdx, elemFluxVarsCache);
+ const auto flux_n = AdvectionType::flux(problem, element, fvGeometry, curElemVolVars,
+ scvf, FluidSystem::nPhaseIdx, elemFluxVarsCache);
+ const auto insideWeight_w = std::signbit(flux_w) ? (1.0 - upwindWeight) : upwindWeight;
+ const auto outsideWeight_w = 1.0 - insideWeight_w;
+ const auto insideWeight_n = std::signbit(flux_n) ? (1.0 - upwindWeight) : upwindWeight;
+ const auto outsideWeight_n = 1.0 - insideWeight_n;
+
+ // get references to the two participating vol vars & parameters
+ const auto insideScvIdx = scvf.insideScvIdx();
+ const auto outsideScvIdx = scvf.outsideScvIdx();
+ const auto outsideElement = fvGeometry.fvGridGeometry().element(outsideScvIdx);
+ const auto& insideScv = fvGeometry.scv(insideScvIdx);
+ const auto& outsideScv = fvGeometry.scv(outsideScvIdx);
+ const auto& insideVolVars = curElemVolVars[insideScvIdx];
+ const auto& outsideVolVars = curElemVolVars[outsideScvIdx];
+ const auto& insideMaterialParams = problem.spatialParams().materialLawParams(element,
+ insideScv,
+ ElementResidualVector({insideVolVars.priVars()}));
+ const auto& outsideMaterialParams = problem.spatialParams().materialLawParams(outsideElement,
+ outsideScv,
+ ElementResidualVector({outsideVolVars.priVars()}));
+
+ // get references to the two participating derivative matrices
+ auto& dI_dI = derivativeMatrices[insideScvIdx];
+ auto& dI_dJ = derivativeMatrices[outsideScvIdx];
+
+ // some quantities to be reused (rho & mu are constant and thus equal for all cells)
+ static const auto rho_w = insideVolVars.density(FluidSystem::wPhaseIdx);
+ static const auto rho_n = insideVolVars.density(FluidSystem::nPhaseIdx);
+ static const auto rhow_muw = rho_w/insideVolVars.viscosity(FluidSystem::wPhaseIdx);
+ static const auto rhon_mun = rho_n/insideVolVars.viscosity(FluidSystem::nPhaseIdx);
+ const auto rhowKrw_muw_inside = rho_w*insideVolVars.mobility(FluidSystem::wPhaseIdx);
+ const auto rhonKrn_mun_inside = rho_n*insideVolVars.mobility(FluidSystem::nPhaseIdx);
+ const auto rhowKrw_muw_outside = rho_w*outsideVolVars.mobility(FluidSystem::wPhaseIdx);
+ const auto rhonKrn_mun_outside = rho_n*outsideVolVars.mobility(FluidSystem::nPhaseIdx);
+
+ // derivative w.r.t. to Sn is the negative of the one w.r.t. Sw
+ const auto insideSw = insideVolVars.saturation(FluidSystem::wPhaseIdx);
+ const auto outsideSw = outsideVolVars.saturation(FluidSystem::wPhaseIdx);
+ const auto dKrw_dSn_inside = MaterialLaw::dkrw_dsw(insideMaterialParams, insideSw);
+ const auto dKrw_dSn_outside = MaterialLaw::dkrw_dsw(outsideMaterialParams, outsideSw);
+ const auto dKrn_dSn_inside = MaterialLaw::dkrn_dsw(insideMaterialParams, insideSw);
+ const auto dKrn_dSn_outside = MaterialLaw::dkrn_dsw(outsideMaterialParams, outsideSw);
+ const auto dpc_dSn_inside = MaterialLaw::dpc_dsw(insideMaterialParams, insideSw);
+ const auto dpc_dSn_outside = MaterialLaw::dpc_dsw(outsideMaterialParams, outsideSw);
+
+ const auto tij = elemFluxVarsCache[scvf].advectionTij();
+
+ // precalculate values
+ const auto up_w = rhowKrw_muw_inside*insideWeight_w + rhowKrw_muw_outside*outsideWeight_w;
+ const auto up_n = rhonKrn_mun_inside*insideWeight_n + rhonKrn_mun_outside*outsideWeight_n;
+ const auto rho_mu_flux_w = rhow_muw*flux_w;
+ const auto rho_mu_flux_n = rhon_mun*flux_n;
+ const auto tij_up_w = tij*up_w;
+ const auto tij_up_n = tij*up_n;
+
+ // partial derivative of the wetting phase flux w.r.t. p_w
+ dI_dI[contiWEqIdx][pressureIdx] += tij_up_w;
+ dI_dJ[contiWEqIdx][pressureIdx] -= tij_up_w;
+
+ // partial derivative of the wetting phase flux w.r.t. S_n
+ dI_dI[contiWEqIdx][saturationIdx] -= rho_mu_flux_w*dKrw_dSn_inside*insideWeight_w;
+ dI_dJ[contiWEqIdx][saturationIdx] -= rho_mu_flux_w*dKrw_dSn_outside*outsideWeight_w;
+
+ // partial derivative of the non-wetting phase flux w.r.t. p_w
+ dI_dI[contiNEqIdx][pressureIdx] += tij_up_n;
+ dI_dJ[contiNEqIdx][pressureIdx] -= tij_up_n;
+
+ // partial derivative of the non-wetting phase flux w.r.t. S_n (relative permeability derivative contribution)
+ dI_dI[contiNEqIdx][saturationIdx] -= rho_mu_flux_n*dKrn_dSn_inside*insideWeight_n;
+ dI_dJ[contiNEqIdx][saturationIdx] -= rho_mu_flux_n*dKrn_dSn_outside*outsideWeight_n;
+
+ // partial derivative of the non-wetting phase flux w.r.t. S_n (capillary pressure derivative contribution)
+ dI_dI[contiNEqIdx][saturationIdx] -= tij_up_n*dpc_dSn_inside;
+ dI_dJ[contiNEqIdx][saturationIdx] += tij_up_n*dpc_dSn_outside;
+ }
+
+ template<class JacobianMatrix, class T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::Box, void>
+ addFluxDerivatives(JacobianMatrix& A,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ static_assert(!FluidSystem::isCompressible(FluidSystem::wPhaseIdx),
+ "2p/incompressiblelocalresidual.hh: Only incompressible fluids are allowed!");
+ static_assert(!FluidSystem::isCompressible(FluidSystem::nPhaseIdx),
+ "2p/incompressiblelocalresidual.hh: Only incompressible fluids are allowed!");
+ static_assert(FluidSystem::viscosityIsConstant(FluidSystem::wPhaseIdx),
+ "2p/incompressiblelocalresidual.hh: Only fluids with constant viscosities are allowed!");
+ static_assert(FluidSystem::viscosityIsConstant(FluidSystem::nPhaseIdx),
+ "2p/incompressiblelocalresidual.hh: Only fluids with constant viscosities are allowed!");
+
+ using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
+ using AdvectionType = typename GET_PROP_TYPE(TypeTag, AdvectionType);
+
+ // evaluate the current wetting phase Darcy flux and resulting upwind weights
+ static const Scalar upwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
+ const auto flux_w = AdvectionType::flux(problem, element, fvGeometry, curElemVolVars,
+ scvf, FluidSystem::wPhaseIdx, elemFluxVarsCache);
+ const auto flux_n = AdvectionType::flux(problem, element, fvGeometry, curElemVolVars,
+ scvf, FluidSystem::nPhaseIdx, elemFluxVarsCache);
+ const auto insideWeight_w = std::signbit(flux_w) ? (1.0 - upwindWeight) : upwindWeight;
+ const auto outsideWeight_w = 1.0 - insideWeight_w;
+ const auto insideWeight_n = std::signbit(flux_n) ? (1.0 - upwindWeight) : upwindWeight;
+ const auto outsideWeight_n = 1.0 - insideWeight_n;
+
+ // get references to the two participating vol vars & parameters
+ const auto insideScvIdx = scvf.insideScvIdx();
+ const auto outsideScvIdx = scvf.outsideScvIdx();
+ const auto& insideScv = fvGeometry.scv(insideScvIdx);
+ const auto& outsideScv = fvGeometry.scv(outsideScvIdx);
+ const auto& insideVolVars = curElemVolVars[insideScv];
+ const auto& outsideVolVars = curElemVolVars[outsideScv];
+
+ // we need the element solution for the material parameters
+ ElementResidualVector elemSol(fvGeometry.numScv());
+ for (const auto& scv : scvs(fvGeometry)) elemSol[scv.indexInElement()] = curElemVolVars[scv].priVars();
+ const auto& insideMaterialParams = problem.spatialParams().materialLawParams(element, insideScv, elemSol);
+ const auto& outsideMaterialParams = problem.spatialParams().materialLawParams(element, outsideScv, elemSol);
+
+ // some quantities to be reused (rho & mu are constant and thus equal for all cells)
+ static const auto rho_w = insideVolVars.density(FluidSystem::wPhaseIdx);
+ static const auto rho_n = insideVolVars.density(FluidSystem::nPhaseIdx);
+ static const auto rhow_muw = rho_w/insideVolVars.viscosity(FluidSystem::wPhaseIdx);
+ static const auto rhon_mun = rho_n/insideVolVars.viscosity(FluidSystem::nPhaseIdx);
+ const auto rhowKrw_muw_inside = rho_w*insideVolVars.mobility(FluidSystem::wPhaseIdx);
+ const auto rhonKrn_mun_inside = rho_n*insideVolVars.mobility(FluidSystem::nPhaseIdx);
+ const auto rhowKrw_muw_outside = rho_w*outsideVolVars.mobility(FluidSystem::wPhaseIdx);
+ const auto rhonKrn_mun_outside = rho_n*outsideVolVars.mobility(FluidSystem::nPhaseIdx);
+
+ // let the Law for the advective fluxes calculate the transmissibilities
+ const auto ti = AdvectionType::calculateTransmissibilities(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ scvf,
+ elemFluxVarsCache[scvf]);
+
+ // get the rows of the jacobian matrix for the inside/outside scv
+ auto& dI_dJ_inside = A[insideScv.dofIndex()];
+ auto& dI_dJ_outside = A[outsideScv.dofIndex()];
+
+ // precalculate values
+ const auto up_w = rhowKrw_muw_inside*insideWeight_w + rhowKrw_muw_outside*outsideWeight_w;
+ const auto up_n = rhonKrn_mun_inside*insideWeight_n + rhonKrn_mun_outside*outsideWeight_n;
+ const auto rho_mu_flux_w = rhow_muw*flux_w;
+ const auto rho_mu_flux_n = rhon_mun*flux_n;
+
+ // add the partial derivatives w.r.t all scvs in the element
+ for (const auto& scvJ : scvs(fvGeometry))
+ {
+ const auto globalJ = scvJ.dofIndex();
+ const auto localJ = scvJ.indexInElement();
+
+ // the transmissibily associated with the scvJ
+ const auto tj = ti[localJ];
+
+ // partial derivative of the wetting phase flux w.r.t. p_w
+ const auto tj_up_w = tj*up_w;
+ dI_dJ_inside[globalJ][contiWEqIdx][pressureIdx] += tj_up_w;
+ dI_dJ_outside[globalJ][contiWEqIdx][pressureIdx] -= tj_up_w;
+
+ // partial derivative of the non-wetting phase flux w.r.t. p_w
+ const auto tj_up_n = tj*up_n;
+ dI_dJ_inside[globalJ][contiNEqIdx][pressureIdx] += tj_up_n;
+ dI_dJ_outside[globalJ][contiNEqIdx][pressureIdx] -= tj_up_n;
+
+ // partial derivatives w.r.t. S_n (are the negative of those w.r.t sw)
+ // relative permeability contributions only for inside/outside
+ if (localJ == insideScvIdx)
+ {
+ // partial derivative of the wetting phase flux w.r.t. S_n
+ const auto insideSw = insideVolVars.saturation(FluidSystem::wPhaseIdx);
+ const auto dKrw_dSn_inside = MaterialLaw::dkrw_dsw(insideMaterialParams, insideSw);
+ const auto dFluxW_dSnJ = rho_mu_flux_w*dKrw_dSn_inside*insideWeight_w;
+ dI_dJ_inside[globalJ][contiWEqIdx][saturationIdx] -= dFluxW_dSnJ;
+ dI_dJ_outside[globalJ][contiWEqIdx][saturationIdx] += dFluxW_dSnJ;
+
+ // partial derivative of the non-wetting phase flux w.r.t. S_n (k_rn contribution)
+ const auto dKrn_dSn_inside = MaterialLaw::dkrn_dsw(insideMaterialParams, insideSw);
+ const auto dFluxN_dSnJ_krn = rho_mu_flux_n*dKrn_dSn_inside*insideWeight_n;
+ dI_dJ_inside[globalJ][contiNEqIdx][saturationIdx] -= dFluxN_dSnJ_krn;
+ dI_dJ_outside[globalJ][contiWEqIdx][saturationIdx] += dFluxN_dSnJ_krn;
+
+ // partial derivative of the non-wetting phase flux w.r.t. S_n (p_c contribution)
+ const auto dFluxN_dSnJ_pc = tj_up_n*MaterialLaw::dpc_dsw(insideMaterialParams, insideSw);
+ dI_dJ_inside[globalJ][contiNEqIdx][saturationIdx] -= dFluxN_dSnJ_pc;
+ dI_dJ_outside[globalJ][contiNEqIdx][saturationIdx] += dFluxN_dSnJ_pc;
+ }
+ else if (localJ == outsideScvIdx)
+ {
+ // see comments for (globalJ == insideScvIdx)
+ const auto outsideSw = outsideVolVars.saturation(FluidSystem::wPhaseIdx);
+ const auto dKrw_dSn_outside = MaterialLaw::dkrw_dsw(outsideMaterialParams, outsideSw);
+ const auto dFluxW_dSnJ = rho_mu_flux_w*dKrw_dSn_outside*outsideWeight_w;
+ dI_dJ_inside[globalJ][contiWEqIdx][saturationIdx] -= dFluxW_dSnJ;
+ dI_dJ_outside[globalJ][contiWEqIdx][saturationIdx] += dFluxW_dSnJ;
+
+ const auto dKrn_dSn_outside = MaterialLaw::dkrn_dsw(outsideMaterialParams, outsideSw);
+ const auto dFluxN_dSnJ_krn = rho_mu_flux_n*dKrn_dSn_outside*outsideWeight_n;
+ dI_dJ_inside[globalJ][contiNEqIdx][saturationIdx] -= dFluxN_dSnJ_krn;
+ dI_dJ_outside[globalJ][contiNEqIdx][saturationIdx] += dFluxN_dSnJ_krn;
+
+ const auto dFluxN_dSnJ_pc = tj_up_n*MaterialLaw::dpc_dsw(outsideMaterialParams, outsideSw);
+ dI_dJ_inside[globalJ][contiNEqIdx][saturationIdx] -= dFluxN_dSnJ_pc;
+ dI_dJ_outside[globalJ][contiNEqIdx][saturationIdx] += dFluxN_dSnJ_pc;
+ }
+ else
+ {
+ const auto& paramsJ = problem.spatialParams().materialLawParams(element, scvJ, elemSol);
+ const auto swJ = curElemVolVars[scvJ].saturation(FluidSystem::wPhaseIdx);
+ const auto dFluxN_dSnJ_pc = tj_up_n*MaterialLaw::dpc_dsw(paramsJ, swJ);
+ dI_dJ_inside[globalJ][contiNEqIdx][saturationIdx] -= dFluxN_dSnJ_pc;
+ dI_dJ_outside[globalJ][contiNEqIdx][saturationIdx] += dFluxN_dSnJ_pc;
+ }
+ }
+ }
+
+ template<class PartialDerivativeMatrices>
+ void addCCDirichletFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
+ using AdvectionType = typename GET_PROP_TYPE(TypeTag, AdvectionType);
+
+ // evaluate the current wetting phase Darcy flux and resulting upwind weights
+ static const Scalar upwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
+ const auto flux_w = AdvectionType::flux(problem, element, fvGeometry, curElemVolVars,
+ scvf, FluidSystem::wPhaseIdx, elemFluxVarsCache);
+ const auto flux_n = AdvectionType::flux(problem, element, fvGeometry, curElemVolVars,
+ scvf, FluidSystem::nPhaseIdx, elemFluxVarsCache);
+ const auto insideWeight_w = std::signbit(flux_w) ? (1.0 - upwindWeight) : upwindWeight;
+ const auto outsideWeight_w = 1.0 - insideWeight_w;
+ const auto insideWeight_n = std::signbit(flux_n) ? (1.0 - upwindWeight) : upwindWeight;
+ const auto outsideWeight_n = 1.0 - insideWeight_n;
+
+ // get references to the two participating vol vars & parameters
+ const auto insideScvIdx = scvf.insideScvIdx();
+ const auto& insideScv = fvGeometry.scv(insideScvIdx);
+ const auto& insideVolVars = curElemVolVars[insideScvIdx];
+ const auto& outsideVolVars = curElemVolVars[scvf.outsideScvIdx()];
+ const auto& insideMaterialParams = problem.spatialParams().materialLawParams(element,
+ insideScv,
+ ElementResidualVector({insideVolVars.priVars()}));
+
+ // some quantities to be reused (rho & mu are constant and thus equal for all cells)
+ static const auto rho_w = insideVolVars.density(FluidSystem::wPhaseIdx);
+ static const auto rho_n = insideVolVars.density(FluidSystem::nPhaseIdx);
+ static const auto rhow_muw = rho_w/insideVolVars.viscosity(FluidSystem::wPhaseIdx);
+ static const auto rhon_mun = rho_n/insideVolVars.viscosity(FluidSystem::nPhaseIdx);
+ const auto rhowKrw_muw_inside = rho_w*insideVolVars.mobility(FluidSystem::wPhaseIdx);
+ const auto rhonKrn_mun_inside = rho_n*insideVolVars.mobility(FluidSystem::nPhaseIdx);
+ const auto rhowKrw_muw_outside = rho_w*outsideVolVars.mobility(FluidSystem::wPhaseIdx);
+ const auto rhonKrn_mun_outside = rho_n*outsideVolVars.mobility(FluidSystem::nPhaseIdx);
+
+ // get reference to the inside derivative matrix
+ auto& dI_dI = derivativeMatrices[insideScvIdx];
+
+ // derivative w.r.t. to Sn is the negative of the one w.r.t. Sw
+ const auto insideSw = insideVolVars.saturation(FluidSystem::wPhaseIdx);
+ const auto dKrw_dSn_inside = -1.0*MaterialLaw::dkrw_dsw(insideMaterialParams, insideSw);
+ const auto dKrn_dSn_inside = -1.0*MaterialLaw::dkrn_dsw(insideMaterialParams, insideSw);
+ const auto dpc_dSn_inside = -1.0*MaterialLaw::dpc_dsw(insideMaterialParams, insideSw);
+
+ const auto tij = elemFluxVarsCache[scvf].advectionTij();
+ // partial derivative of the wetting phase flux w.r.t. p_w
+ const auto up_w = rhowKrw_muw_inside*insideWeight_w + rhowKrw_muw_outside*outsideWeight_w;
+ dI_dI[contiWEqIdx][pressureIdx] += tij*up_w;
+
+ // partial derivative of the wetting phase flux w.r.t. S_n
+ dI_dI[contiWEqIdx][saturationIdx] += rhow_muw*flux_w*dKrw_dSn_inside*insideWeight_w;
+
+ // partial derivative of the non-wetting phase flux w.r.t. p_w
+ const auto up_n = rhonKrn_mun_inside*insideWeight_n + rhonKrn_mun_outside*outsideWeight_n;
+ dI_dI[contiNEqIdx][pressureIdx] += tij*up_n;
+
+ // partial derivative of the non-wetting phase flux w.r.t. S_n (relative permeability derivative contribution)
+ dI_dI[contiNEqIdx][saturationIdx] += rhon_mun*flux_n*dKrn_dSn_inside*insideWeight_n;
+
+ // partial derivative of the non-wetting phase flux w.r.t. S_n (capillary pressure derivative contribution)
+ dI_dI[contiNEqIdx][saturationIdx] += tij*dpc_dSn_inside*up_n;
+ }
+
+ template<class PartialDerivativeMatrices>
+ void addRobinFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ { /* TODO maybe forward to problem for the user to implement the Robin derivatives?*/ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/porousmediumflow/2p/implicit/model.hh b/dumux/porousmediumflow/2p/implicit/model.hh
index 76bfdf440d090ce8b9d7a082aafc66e947337db5..4e6cb9813a4054623efe63c74a67c9c3e755c692 100644
--- a/dumux/porousmediumflow/2p/implicit/model.hh
+++ b/dumux/porousmediumflow/2p/implicit/model.hh
@@ -26,90 +26,6 @@
#ifndef DUMUX_TWOP_MODEL_HH
#define DUMUX_TWOP_MODEL_HH
-#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
#include "properties.hh"
-namespace Dumux
-{
-
-/*!
- * \ingroup TwoPModel
- * \brief Adaption of the fully implicit scheme to the two-phase flow model.
- *
- * This model implements two-phase flow of two immiscible fluids
- * \f$\alpha \in \{ w, n \}\f$ using a standard multiphase Darcy
- * approach as the equation for the conservation of momentum, i.e.
- \f[
- v_\alpha = - \frac{k_{r\alpha}}{\mu_\alpha} \textbf{K}
- \left(\textbf{grad}\, p_\alpha - \varrho_{\alpha} {\textbf g} \right)
- \f]
- *
- * By inserting this into the equation for the conservation of the
- * phase mass, one gets
- \f[
- \phi \frac{\partial \varrho_\alpha S_\alpha}{\partial t}
- -
- \text{div} \left\{
- \varrho_\alpha \frac{k_{r\alpha}}{\mu_\alpha} \mathbf{K} \left(\textbf{grad}\, p_\alpha - \varrho_{\alpha} \mbox{\bf g} \right)
- \right\} - q_\alpha = 0 \;,
- \f]
- *
- * All equations are discretized using a vertex-centered finite volume (box)
- * or cell-centered finite volume scheme as spatial
- * and the implicit Euler method as time discretization.
- *
- * By using constitutive relations for the capillary pressure \f$p_c =
- * p_n - p_w\f$ and relative permeability \f$k_{r\alpha}\f$ and taking
- * advantage of the fact that \f$S_w + S_n = 1\f$, the number of
- * unknowns can be reduced to two. Currently the model supports
- * choosing either \f$p_w\f$ and \f$S_n\f$ or \f$p_n\f$ and \f$S_w\f$
- * as primary variables. The formulation which ought to be used can be
- * specified by setting the <tt>Formulation</tt> property to either
- * <tt>TwoPFormulation::pwsn</tt> or <tt>TwoPFormulation::pnsw</tt>. By
- * default, the model uses \f$p_w\f$ and \f$S_n\f$.
- */
-template<class TypeTag >
-class TwoPModel : public GET_PROP_TYPE(TypeTag, BaseModel)
-{
- using ParentType = typename GET_PROP_TYPE(TypeTag, BaseModel);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- enum {
- nPhaseIdx = Indices::nPhaseIdx,
- wPhaseIdx = Indices::wPhaseIdx
- };
-
-public:
-
- /*!
- * \brief Apply the initial conditions to the model.
- *
- * \param problem The object representing the problem which needs to
- * be simulated.
- */
- void init(Problem& problem)
- {
- ParentType::init(problem);
-
- // register standardized vtk output fields
- auto& vtkOutputModule = problem.vtkOutputModule();
- vtkOutputModule.addSecondaryVariable("Sw", [](const VolumeVariables& v){ return v.saturation(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("Sn", [](const VolumeVariables& v){ return v.saturation(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pw", [](const VolumeVariables& v){ return v.pressure(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pn", [](const VolumeVariables& v){ return v.pressure(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pc", [](const VolumeVariables& v){ return v.capillaryPressure(); });
- vtkOutputModule.addSecondaryVariable("rhoW", [](const VolumeVariables& v){ return v.density(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("rhoN", [](const VolumeVariables& v){ return v.density(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("mobW", [](const VolumeVariables& v){ return v.mobility(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("mobN", [](const VolumeVariables& v){ return v.mobility(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("temperature", [](const VolumeVariables& v){ return v.temperature(); });
- vtkOutputModule.addSecondaryVariable("porosity", [](const VolumeVariables& v){ return v.porosity(); });
- }
-};
-
-} // end namespace Dumux
-
-#include "propertydefaults.hh"
-
#endif
diff --git a/dumux/porousmediumflow/2p/implicit/properties.hh b/dumux/porousmediumflow/2p/implicit/properties.hh
index 419a1305a259003b565185a26e7abf80dbdc42b8..0dda89e130da8b2c533c4d915bc0cf6360a158f6 100644
--- a/dumux/porousmediumflow/2p/implicit/properties.hh
+++ b/dumux/porousmediumflow/2p/implicit/properties.hh
@@ -30,15 +30,27 @@
#ifndef DUMUX_2P_PROPERTIES_HH
#define DUMUX_2P_PROPERTIES_HH
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/properties.hh>
+#include <dumux/common/basicproperties.hh>
+#include <dumux/linear/linearsolverproperties.hh>
+
+#include <dumux/material/components/nullcomponent.hh>
+#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
+#include <dumux/material/fluidsystems/liquidphase.hh>
+#include <dumux/material/fluidsystems/2pimmiscible.hh>
+#include <dumux/material/fluidstates/immiscible.hh>
+#include <dumux/material/spatialparams/implicit.hh>
+
+#include <dumux/porousmediumflow/properties.hh>
+#include <dumux/porousmediumflow/immiscible/localresidual.hh>
#include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
+#include "indices.hh"
+#include "volumevariables.hh"
+#include "vtkoutputfields.hh"
+
namespace Dumux
{
-
-
////////////////////////////////
// properties
////////////////////////////////
@@ -49,35 +61,103 @@ namespace Properties
// Type tags
//////////////////////////////////////////////////////////////////
-//! The type tags for the implicit two-phase problems
-NEW_TYPE_TAG(TwoP);
-NEW_TYPE_TAG(BoxTwoP, INHERITS_FROM(BoxModel, TwoP));
-NEW_TYPE_TAG(CCTwoP, INHERITS_FROM(CCModel, TwoP));
-
-//! The type tags for the corresponding non-isothermal problems
+//! The type tags for the isothermal & non-isothermal two-phase model
+NEW_TYPE_TAG(TwoP, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
NEW_TYPE_TAG(TwoPNI, INHERITS_FROM(TwoP, NonIsothermal));
-NEW_TYPE_TAG(BoxTwoPNI, INHERITS_FROM(BoxModel, TwoPNI));
-NEW_TYPE_TAG(CCTwoPNI, INHERITS_FROM(CCModel, TwoPNI));
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
+// properties for the isothermal two-phase model
+///////////////////////////////////////////////////////////////////////////
+SET_INT_PROP(TwoP, NumEq, 2); //! Set the number of equations to 2
+SET_INT_PROP(TwoP, NumPhases, 2); //! The number of phases in the 2p model is 2
+SET_INT_PROP(TwoP, NumComponents, 2); //! The number of components in the 2p model is 2
+SET_INT_PROP(TwoP, Formulation, TwoPFormulation::pwsn); //! Set the default formulation to pWsN
+SET_BOOL_PROP(TwoP, EnableAdvection, true); //! Enable advection
+SET_BOOL_PROP(TwoP, EnableMolecularDiffusion, false); //! The two-phase model has no molecular diffusion
+SET_BOOL_PROP(TwoP, EnableEnergyBalance, false); //! Isothermal model (non-isothermal type tag is below)
+SET_TYPE_PROP(TwoP, LocalResidual, ImmiscibleLocalResidual<TypeTag>); //! Use the immiscible local residual operator for the 2p model
+SET_TYPE_PROP(TwoP, VolumeVariables, TwoPVolumeVariables<TypeTag>); //! the VolumeVariables property
+SET_TYPE_PROP(TwoP, SpatialParams, ImplicitSpatialParams<TypeTag>); //! The spatial parameters. Use ImplicitSpatialParams by default.
+SET_TYPE_PROP(TwoP, VtkOutputFields, TwoPVtkOutputFields<TypeTag>); //! Set the vtk output fields specific to the twop model
-NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system
-NEW_PROP_TAG(NumComponents); //!< Number of components in the fluid system
-NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(Formulation); //!< The formulation of the model
-NEW_PROP_TAG(Indices); //!< Enumerations for the model
-NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
-NEW_PROP_TAG(MaterialLaw); //!< The material law which ought to be used (extracted from the spatial parameters)
-NEW_PROP_TAG(MaterialLawParams); //!< The context material law (extracted from the spatial parameters)
-NEW_PROP_TAG(WettingPhase); //!< The wetting phase for two-phase models
-NEW_PROP_TAG(NonwettingPhase); //!< The non-wetting phase for two-phase models
-NEW_PROP_TAG(FluidSystem); //!<The fluid systems including the information about the phases
-NEW_PROP_TAG(FluidState); //!<The phases state
-NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
-}
+SET_TYPE_PROP(TwoP,
+ MaterialLawParams,
+ typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params); //! Extract material law params from the law itself
+
+SET_TYPE_PROP(TwoP,
+ Indices,
+ TwoPIndices<TypeTag, GET_PROP_VALUE(TypeTag, Formulation), 0>); //! The indices required by the isothermal 2p model
+//! By default, we set a null component as wetting phase
+SET_PROP(TwoP, WettingPhase)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+public:
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
+};
+
+//! By default, we set a null component as non-wetting phase
+SET_PROP(TwoP, NonwettingPhase)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+public:
+ typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
+};
+
+//! The two-phase model uses the immiscible fluid system
+SET_PROP(TwoP, FluidSystem)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
+ typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
+
+public:
+ typedef FluidSystems::TwoPImmiscible<Scalar,
+ WettingPhase,
+ NonwettingPhase> type;
+};
+
+//! The two-phase model uses the immiscible fluid state
+SET_PROP(TwoP, FluidState)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+public:
+ typedef ImmiscibleFluidState<Scalar, FluidSystem> type;
+};
+
+////////////////////////////////////////////////////////
+// properties for the non-isothermal two-phase model
+////////////////////////////////////////////////////////
+SET_INT_PROP(TwoPNI, IsothermalNumEq, 2); //! set isothermal NumEq
+SET_TYPE_PROP(TwoPNI, IsothermalVolumeVariables, TwoPVolumeVariables<TypeTag>); //! set isothermal VolumeVariables
+SET_TYPE_PROP(TwoPNI, IsothermalLocalResidual, ImmiscibleLocalResidual<TypeTag>); //! set isothermal LocalResidual
+SET_TYPE_PROP(TwoPNI, IsothermalVtkOutputFields, TwoPVtkOutputFields<TypeTag>); //! set isothermal output fields
+
+//! set isothermal Indices
+SET_PROP(TwoPNI, IsothermalIndices)
+{
+private:
+ enum { Formulation = GET_PROP_VALUE(TypeTag, Formulation) };
+public:
+ typedef TwoPIndices<TypeTag, Formulation, 0> type;
+};
+
+//! Somerton is used as default model to compute the effective thermal heat conductivity
+SET_PROP(TwoPNI, ThermalConductivityModel)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+public:
+ typedef ThermalConductivitySomerton<Scalar, Indices> type;
+};
+
+}
}
#endif
diff --git a/dumux/porousmediumflow/2p/implicit/propertydefaults.hh b/dumux/porousmediumflow/2p/implicit/propertydefaults.hh
deleted file mode 100644
index 7fea86ed9f1725833a66b08af082ab2cd5948781..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/2p/implicit/propertydefaults.hh
+++ /dev/null
@@ -1,194 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup TwoPModel
- * \ingroup ImplicitProperties
- * \ingroup Properties
- * \file
- *
- * \brief Defines default values for the properties required by the
- * two-phase fully implicit model.
- */
-#ifndef DUMUX_2P_PROPERTY_DEFAULTS_HH
-#define DUMUX_2P_PROPERTY_DEFAULTS_HH
-
-#include "properties.hh"
-#include "model.hh"
-#include "indices.hh"
-#include "volumevariables.hh"
-
-#include <dumux/porousmediumflow/immiscible/localresidual.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh>
-#include <dumux/material/fluidsystems/gasphase.hh>
-#include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/material/components/nullcomponent.hh>
-#include <dumux/material/fluidsystems/2pimmiscible.hh>
-#include <dumux/material/fluidstates/immiscible.hh>
-#include <dumux/material/spatialparams/implicit.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
-
-namespace Dumux
-{
-namespace Properties
-{
-//////////////////////////////////////////////////////////////////
-// Property defaults
-//////////////////////////////////////////////////////////////////
-//! Set the number of equations to 2
-SET_INT_PROP(TwoP, NumEq, 2);
-
-//! The number of phases in the 2p model is 2
-SET_INT_PROP(TwoP, NumPhases, 2);
-
-//! The number of components in the 2p model is 2
-SET_INT_PROP(TwoP, NumComponents, 2);
-
-//! Set the default formulation to pWsN
-SET_INT_PROP(TwoP,
- Formulation,
- TwoPFormulation::pwsn);
-
-//! Use the 2p local jacobian operator for the 2p model
-SET_TYPE_PROP(TwoP,
- LocalResidual,
- ImmiscibleLocalResidual<TypeTag>);
-
-//! the Model property
-SET_TYPE_PROP(TwoP, Model, TwoPModel<TypeTag>);
-
-//! the VolumeVariables property
-SET_TYPE_PROP(TwoP, VolumeVariables, TwoPVolumeVariables<TypeTag>);
-
-//! Enable advection
-SET_BOOL_PROP(TwoP, EnableAdvection, true);
-
-//! The two-phase model has no molecular diffusion
-SET_BOOL_PROP(TwoP, EnableMolecularDiffusion, false);
-
-//! Isothermal model by default
-SET_BOOL_PROP(TwoP, EnableEnergyBalance, false);
-
-//! The indices required by the isothermal 2p model
-SET_TYPE_PROP(TwoP,
- Indices,
- TwoPIndices<TypeTag, GET_PROP_VALUE(TypeTag, Formulation), 0>);
-
-//! The spatial parameters to be employed.
-//! Use ImplicitSpatialParams by default.
-SET_TYPE_PROP(TwoP, SpatialParams, ImplicitSpatialParams<TypeTag>);
-
-/*!
- * \brief Set the property for the material parameters by extracting
- * it from the material law.
- */
-SET_TYPE_PROP(TwoP,
- MaterialLawParams,
- typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params);
-
-SET_PROP(TwoP, WettingPhase)
-{ private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public:
- typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
-};
-
-SET_PROP(TwoP, NonwettingPhase)
-{ private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public:
- typedef FluidSystems::LiquidPhase<Scalar, NullComponent<Scalar> > type;
-};
-
-SET_PROP(TwoP, FluidSystem)
-{ private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
-
-public:
- typedef FluidSystems::TwoPImmiscible<Scalar,
- WettingPhase,
- NonwettingPhase> type;
-};
-
-SET_PROP(TwoP, FluidState)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-public:
- typedef ImmiscibleFluidState<Scalar, FluidSystem> type;
-};
-
-// disable velocity output by default
-
-// enable gravity by default
-SET_BOOL_PROP(TwoP, ProblemEnableGravity, true);
-
-//! default value for the forchheimer coefficient
-// Source: Ward, J.C. 1964 Turbulent flow in porous media. ASCE J. Hydraul. Div 90.
-// Actually the Forchheimer coefficient is also a function of the dimensions of the
-// porous medium. Taking it as a constant is only a first approximation
-// (Nield, Bejan, Convection in porous media, 2006, p. 10)
-SET_SCALAR_PROP(TwoP, SpatialParamsForchCoeff, 0.55);
-
-//! Somerton is used as default model to compute the effective thermal heat conductivity
-SET_PROP(TwoPNI, ThermalConductivityModel)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-public:
- typedef ThermalConductivitySomerton<Scalar, Indices> type;
-};
-
-//! temperature is already written by the isothermal model
-SET_BOOL_PROP(TwoPNI, NiOutputLevel, 0);
-
-//////////////////////////////////////////////////////////////////
-// Property values for isothermal model required for the general non-isothermal model
-//////////////////////////////////////////////////////////////////
-
-// set isothermal Model
-SET_TYPE_PROP(TwoPNI, IsothermalModel, TwoPModel<TypeTag>);
-
-//set isothermal VolumeVariables
-SET_TYPE_PROP(TwoPNI, IsothermalVolumeVariables, TwoPVolumeVariables<TypeTag>);
-
-//set isothermal LocalResidual
-SET_TYPE_PROP(TwoPNI, IsothermalLocalResidual, ImmiscibleLocalResidual<TypeTag>);
-
-//set isothermal Indices
-SET_PROP(TwoPNI, IsothermalIndices)
-{
-private:
- enum { Formulation = GET_PROP_VALUE(TypeTag, Formulation) };
-public:
- typedef TwoPIndices<TypeTag, Formulation, 0> type;
-};
-
-//set isothermal NumEq
-SET_INT_PROP(TwoPNI, IsothermalNumEq, 2);
-
-}
-
-
-}
-
-#endif
diff --git a/dumux/porousmediumflow/2p/implicit/volumevariables.hh b/dumux/porousmediumflow/2p/implicit/volumevariables.hh
index 0e90d7625366df7d1e539c3bbe78ec484824d582..3ee856584dfae0032af2ec3862ecc05ff4556828 100644
--- a/dumux/porousmediumflow/2p/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2p/implicit/volumevariables.hh
@@ -71,8 +71,6 @@ class TwoPVolumeVariables : public ImplicitVolumeVariables<TypeTag>
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
-
public:
// export type of fluid state for non-isothermal models
using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
diff --git a/dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh
new file mode 100644
index 0000000000000000000000000000000000000000..9792db5f3a76b55293112a0ec40a127218037d78
--- /dev/null
+++ b/dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh
@@ -0,0 +1,57 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Adds vtk output fields specific to the twop model
+ */
+#ifndef DUMUX_TWOP_VTK_OUTPUT_FIELDS_HH
+#define DUMUX_TWOP_VTK_OUTPUT_FIELDS_HH
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup TwoP, InputOutput
+ * \brief Adds vtk output fields specific to the twop model
+ */
+template<class TypeTag>
+class TwoPVtkOutputFields
+{
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+public:
+ template <class VtkOutputModule>
+ static void init(VtkOutputModule& vtk)
+ {
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.saturation(Indices::wPhaseIdx); }, "Sw");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.saturation(Indices::nPhaseIdx); }, "Sn");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(Indices::wPhaseIdx); }, "pw");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(Indices::nPhaseIdx); }, "pn");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.capillaryPressure(); }, "pc");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.density(Indices::wPhaseIdx); }, "rhoW");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.density(Indices::nPhaseIdx); }, "rhoN");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.mobility(Indices::wPhaseIdx); }, "mobW");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.mobility(Indices::nPhaseIdx); }, "mobN");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.porosity(); }, "porosity");
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/porousmediumflow/2p2c/implicit/model.hh b/dumux/porousmediumflow/2p2c/implicit/model.hh
index 4c43a718935a1e1c828482d83895a78c7f9a96c9..8468b1489d365729b42b8d58bb08d50073f2851f 100644
--- a/dumux/porousmediumflow/2p2c/implicit/model.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/model.hh
@@ -16,25 +16,9 @@
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
-/*!
- * \file
- *
- * \brief Adaption of the fully implicit scheme to the
- * two-phase two-component fully implicit model.
- */
-#ifndef DUMUX_2P2C_MODEL_HH
-#define DUMUX_2P2C_MODEL_HH
-
-#include "properties.hh"
-#include "indices.hh"
-#include "primaryvariableswitch.hh"
-
-#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
-
-namespace Dumux
-{
/*!
* \ingroup TwoPTwoCModel
+ * \file
* \brief Adaption of the fully implicit scheme to the
* two-phase two-component fully implicit model.
*
@@ -90,284 +74,14 @@ namespace Dumux
* as long as the maximum mole fraction is not exceeded \f$(x^w_n<x^w_{n,max})\f$</li>
* </ul>
*/
+#ifndef DUMUX_2P2C_MODEL_HH
+#define DUMUX_2P2C_MODEL_HH
-template<class TypeTag>
-class TwoPTwoCModel: public GET_PROP_TYPE(TypeTag, BaseModel)
-{
- // the parent class needs to access the variable switch
- friend typename GET_PROP_TYPE(TypeTag, BaseModel);
- using ParentType = typename GET_PROP_TYPE(TypeTag, BaseModel);
-
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
-
- // phase indices
- enum
- {
- switchIdx = Indices::switchIdx,
-
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx,
- wCompIdx = Indices::wCompIdx,
- nCompIdx = Indices::nCompIdx,
-
- wPhaseOnly = Indices::wPhaseOnly,
- nPhaseOnly = Indices::nPhaseOnly,
- bothPhases = Indices::bothPhases,
-
- pwsn = TwoPTwoCFormulation::pwsn,
- pnsw = TwoPTwoCFormulation::pnsw,
- formulation = GET_PROP_VALUE(TypeTag, Formulation)
- };
-
- static constexpr int dim = GridView::dimension;
- static constexpr int dimWorld = GridView::dimensionworld;
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
-
- static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
- static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents);
- static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
-
- enum { dofCodim = isBox ? dim : 0 };
-
-public:
- /*!
- * \brief Apply the initial conditions to the model.
- *
- * \param problem The object representing the problem which needs to
- * be simulated.
- */
- void init(Problem& problem)
- {
- ParentType::init(problem);
-
- // register standardized vtk output fields
- auto& vtkOutputModule = problem.vtkOutputModule();
- vtkOutputModule.addSecondaryVariable("Sn", [](const VolumeVariables& v){ return v.saturation(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("Sw", [](const VolumeVariables& v){ return v.saturation(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pn", [](const VolumeVariables& v){ return v.pressure(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pw", [](const VolumeVariables& v){ return v.pressure(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pc", [](const VolumeVariables& v){ return v.capillaryPressure(); });
- vtkOutputModule.addSecondaryVariable("rhow", [](const VolumeVariables& v){ return v.density(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("rhon", [](const VolumeVariables& v){ return v.density(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("mobW", [](const VolumeVariables& v){ return v.mobility(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("mobN", [](const VolumeVariables& v){ return v.mobility(nPhaseIdx); });
-
- for (int i = 0; i < numPhases; ++i)
- for (int j = 0; j < numComponents; ++j)
- vtkOutputModule.addSecondaryVariable("x_" + FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j),
- [i,j](const VolumeVariables& v){ return v.moleFraction(i,j); });
-
- for (int i = 0; i < numPhases; ++i)
- for (int j = 0; j < numComponents; ++j)
- vtkOutputModule.addSecondaryVariable("X_" + FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j),
- [i,j](const VolumeVariables& v){ return v.massFraction(i,j); });
-
- vtkOutputModule.addSecondaryVariable("porosity", [](const VolumeVariables& v){ return v.porosity(); });
- vtkOutputModule.addSecondaryVariable("temperature", [](const VolumeVariables& v){ return v.temperature(); });
- }
-
- /*!
- * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
- */
- template<class VtkOutputModule>
- void addVtkOutputFields(VtkOutputModule& outputModule) const
- {
- auto& phasePresence = outputModule.createScalarField("phase presence", dofCodim);
- for (std::size_t i = 0; i < phasePresence.size(); ++i)
- phasePresence[i] = this->curSol()[i].state();
- }
-
- /*!
- * \brief One Newton iteration was finished.
- * \param uCurrent The solution after the current Newton iteration
- */
- template<typename T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), void>::type
- newtonEndStep()
- {
- // \todo resize volvars vector if grid was adapted
-
- // update the variable switch
- switchFlag_ = priVarSwitch_().update(this->problem_(), this->curSol());
-
- // update the secondary variables if global caching is enabled
- // \note we only updated if phase presence changed as the volume variables
- // are already updated once by the switch
- for (const auto& element : elements(this->problem_().gridView()))
- {
- // make sure FVElementGeometry & vol vars are bound to the element
- auto fvGeometry = localView(this->fvGridGeometry());
- fvGeometry.bindElement(element);
-
- if (switchFlag_)
- {
- for (auto&& scv : scvs(fvGeometry))
- {
- auto dofIdxGlobal = scv.dofIndex();
- if (priVarSwitch_().wasSwitched(dofIdxGlobal))
- {
- const auto eIdx = this->problem_().elementMapper().index(element);
- const auto elemSol = this->elementSolution(element, this->curSol());
- this->nonConstCurGlobalVolVars().volVars(eIdx, scv.indexInElement()).update(elemSol,
- this->problem_(),
- element,
- scv);
- }
- }
- }
-
- // handle the boundary volume variables for cell-centered models
- if(!isBox)
- {
- for (auto&& scvf : scvfs(fvGeometry))
- {
- // if we are not on a boundary, skip the rest
- if (!scvf.boundary())
- continue;
-
- // check if boundary is a pure dirichlet boundary
- const auto bcTypes = this->problem_().boundaryTypes(element, scvf);
- if (bcTypes.hasOnlyDirichlet())
- {
- const auto insideScvIdx = scvf.insideScvIdx();
- const auto& insideScv = fvGeometry.scv(insideScvIdx);
- const auto elemSol = ElementSolutionVector{this->problem_().dirichlet(element, scvf)};
-
- this->nonConstCurGlobalVolVars().volVars(scvf.outsideScvIdx(), 0/*indexInElement*/).update(elemSol, this->problem_(), element, insideScv);
- }
- }
- }
- }
- }
-
- /*!
- * \brief One Newton iteration was finished.
- * \param uCurrent The solution after the current Newton iteration
- */
- template<typename T = TypeTag>
- typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), void>::type
- newtonEndStep()
- {
- // update the variable switch
- switchFlag_ = priVarSwitch_().update(this->problem_(), this->curSol());
- }
-
- /*!
- * \brief Called by the update() method if applying the Newton
- * method was unsuccessful.
- */
- void updateFailed()
- {
- ParentType::updateFailed();
- // reset privar switch flag
- switchFlag_ = false;
- }
-
- /*!
- * \brief Called by the problem if a time integration was
- * successful, post processing of the solution is done and the
- * result has been written to disk.
- *
- * This should prepare the model for the next time integration.
- */
- void advanceTimeLevel()
- {
- ParentType::advanceTimeLevel();
- // reset privar switch flag
- switchFlag_ = false;
- }
-
- /*!
- * \brief Returns true if the primary variables were switched for
- * at least one dof after the last timestep.
- */
- bool switched() const
- {
- return switchFlag_;
- }
-
- /*!
- * \brief Write the current solution to a restart file.
- *
- * \param outStream The output stream of one entity for the restart file
- * \param entity The entity, either a vertex or an element
- */
- template<class Entity>
- void serializeEntity(std::ostream &outStream, const Entity &entity)
- {
- // write primary variables
- ParentType::serializeEntity(outStream, entity);
-
- int dofIdxGlobal = this->dofMapper().index(entity);
-
- if (!outStream.good())
- DUNE_THROW(Dune::IOError, "Could not serialize entity " << dofIdxGlobal);
-
- outStream << this->curSol()[dofIdxGlobal].state() << " ";
- }
-
- /*!
- * \brief Reads the current solution from a restart file.
- *
- * \param inStream The input stream of one entity from the restart file
- * \param entity The entity, either a vertex or an element
- */
- template<class Entity>
- void deserializeEntity(std::istream &inStream, const Entity &entity)
- {
- // read primary variables
- ParentType::deserializeEntity(inStream, entity);
-
- // read phase presence
- int dofIdxGlobal = this->dofMapper().index(entity);
-
- if (!inStream.good())
- DUNE_THROW(Dune::IOError, "Could not deserialize entity " << dofIdxGlobal);
-
- int phasePresence;
- inStream >> phasePresence;
-
- this->curSol()[dofIdxGlobal].setState(phasePresence);
- this->prevSol()[dofIdxGlobal].setState(phasePresence);
- }
-
- const Dumux::TwoPTwoCPrimaryVariableSwitch<TypeTag>& priVarSwitch() const
- { return switch_; }
-
-protected:
-
- Dumux::TwoPTwoCPrimaryVariableSwitch<TypeTag>& priVarSwitch_()
- { return switch_; }
-
- /*!
- * \brief Applies the initial solution for all vertices of the grid.
- *
- * \todo the initial condition needs to be unique for
- * each vertex. we should think about the API...
- */
- void applyInitialSolution_()
- {
- ParentType::applyInitialSolution_();
-
- // initialize the primary variable switch
- priVarSwitch_().init(this->problem_());
- }
-
- //! the class handling the primary variable switch
- TwoPTwoCPrimaryVariableSwitch<TypeTag> switch_;
- bool switchFlag_;
-};
-
-} // end namespace Dumux
-
+#include "properties.hh"
+#include "indices.hh"
+#include "volumevariables.hh"
+#include "primaryvariableswitch.hh"
+#include "vtkoutputfields.hh"
#include "propertydefaults.hh"
#endif
diff --git a/dumux/porousmediumflow/2p2c/implicit/newtoncontroller.hh b/dumux/porousmediumflow/2p2c/implicit/newtoncontroller.hh
deleted file mode 100644
index 786c55a6fc1f1ed2caeba0422fc30100ec8039fb..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/2p2c/implicit/newtoncontroller.hh
+++ /dev/null
@@ -1,68 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief A two-phase two-component specific controller for the Newton solver.
- */
-#ifndef DUMUX_2P2C_NEWTON_CONTROLLER_HH
-#define DUMUX_2P2C_NEWTON_CONTROLLER_HH
-
-#include "properties.hh"
-
-#include <dumux/nonlinear/newtoncontroller.hh>
-
-namespace Dumux {
-
-/*!
- * \ingroup Newton
- * \ingroup TwoPTwoCModel
- * \brief A two-phase two-component specific controller for the Newton solver.
- *
- * This controller 'knows' what a 'physically meaningful' solution is
- * which allows the Newton method to abort earlier if the solution is
- * way out of bounds.
- */
-template <class TypeTag>
-class TwoPTwoCNewtonController : public NewtonController<TypeTag>
-{
- typedef NewtonController<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, SolutionVector) SolutionVector;
-
-public:
- TwoPTwoCNewtonController(const Problem &problem)
- : ParentType(problem)
- {}
-
- /*!
- * \brief Returns true if the current solution can be considered to
- * be accurate enough
- */
- bool newtonConverged()
- {
- if (this->method().model().switched())
- return false;
-
- return ParentType::newtonConverged();
- }
-};
-
-} // end namespace Dumux
-
-#endif
diff --git a/dumux/porousmediumflow/2p2c/implicit/primaryvariableswitch.hh b/dumux/porousmediumflow/2p2c/implicit/primaryvariableswitch.hh
index 79230451cb1f1bf4e6b2e040601c7da2d1e89596..a281c97025b76294be1bc034ada2b46be0b7915a 100644
--- a/dumux/porousmediumflow/2p2c/implicit/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/primaryvariableswitch.hh
@@ -66,6 +66,9 @@ class TwoPTwoCPrimaryVariableSwitch : public PrimaryVariableSwitch<TypeTag>
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
+public:
+ using ParentType::ParentType;
+
protected:
// perform variable switch at a degree of freedom location
diff --git a/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh b/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh
index 6a272e05c68c23d98bf3e1b2150caf39d20108ac..003834cf7716cf3917bf89ba4bc07c092151f449 100644
--- a/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2p2c/implicit/propertydefaults.hh
@@ -29,14 +29,14 @@
#define DUMUX_2P2C_PROPERTY_DEFAULTS_HH
#include "properties.hh"
-#include "model.hh"
#include "indices.hh"
#include "volumevariables.hh"
-#include "newtoncontroller.hh"
#include "primaryvariableswitch.hh"
+#include "vtkoutputfields.hh"
#include <dumux/porousmediumflow/compositional/localresidual.hh>
#include <dumux/porousmediumflow/compositional/switchableprimaryvariables.hh>
+#include <dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh>
#include <dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh>
#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
#include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
@@ -47,6 +47,7 @@ namespace Dumux
{
namespace Properties {
+
//////////////////////////////////////////////////////////////////
// Property values
//////////////////////////////////////////////////////////////////
@@ -134,10 +135,7 @@ SET_BOOL_PROP(TwoPTwoC, EnableMolecularDiffusion, true);
SET_BOOL_PROP(TwoPTwoC, EnableEnergyBalance, false);
//! Use the 2p2c Newton controller
-SET_TYPE_PROP(TwoPTwoC, NewtonController, TwoPTwoCNewtonController<TypeTag>);
-
-//! Use the 2p2c model
-SET_TYPE_PROP(TwoPTwoC, Model, TwoPTwoCModel<TypeTag>);
+SET_TYPE_PROP(TwoPTwoC, NewtonController, PriVarSwitchNewtonController<TypeTag>);
//! The primary variable switch for the 2p2c model
SET_TYPE_PROP(TwoPTwoC, PrimaryVariableSwitch, TwoPTwoCPrimaryVariableSwitch<TypeTag>);
@@ -187,6 +185,9 @@ SET_SCALAR_PROP(TwoPTwoC, SpatialParamsForchCoeff, 0.55);
*/
SET_SCALAR_PROP(TwoPTwoC, TauTortuosity, 0.5);
+//! Set the vtk output fields specific to the TwoPTwoC model
+SET_TYPE_PROP(TwoPTwoC, VtkOutputFields, TwoPTwoCVtkOutputFields<TypeTag>);
+
//! Somerton is used as default model to compute the effective thermal heat conductivity
SET_PROP(TwoPTwoCNI, ThermalConductivityModel)
{
diff --git a/dumux/porousmediumflow/2p2c/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/2p2c/implicit/vtkoutputfields.hh
new file mode 100644
index 0000000000000000000000000000000000000000..50995b7d6623665a8bcc04b7d8fe503d4bf020c3
--- /dev/null
+++ b/dumux/porousmediumflow/2p2c/implicit/vtkoutputfields.hh
@@ -0,0 +1,69 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Adds vtk output fields specific to the twop model
+ */
+#ifndef DUMUX_TWOP_TWOC_VTK_OUTPUT_FIELDS_HH
+#define DUMUX_TWOP_TWOC_VTK_OUTPUT_FIELDS_HH
+
+#include <dumux/implicit/properties.hh>
+#include <dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup TwoPTwoC, InputOutput
+ * \brief Adds vtk output fields specific to the TwoPTwoC model
+ */
+template<class TypeTag>
+class TwoPTwoCVtkOutputFields
+{
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+
+ static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
+ static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents);
+
+public:
+ template <class VtkOutputModule>
+ static void init(VtkOutputModule& vtk)
+ {
+ // use default fields from the 2p model
+ TwoPVtkOutputFields<TypeTag>::init(vtk);
+
+ for (int i = 0; i < numPhases; ++i)
+ for (int j = 0; j < numComponents; ++j)
+ vtk.addSecondaryVariable("x_" + FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j),
+ [i,j](const VolumeVariables& v){ return v.moleFraction(i,j); });
+
+ for (int i = 0; i < numPhases; ++i)
+ for (int j = 0; j < numComponents; ++j)
+ vtk.addSecondaryVariable("X_" + FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j),
+ [i,j](const VolumeVariables& v){ return v.massFraction(i,j); });
+
+ vtk.addSecondaryVariable("phasePresence", [](const VolumeVariables& v){ return v.priVars().state(); });
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/porousmediumflow/2pnc/implicit/model.hh b/dumux/porousmediumflow/2pnc/implicit/model.hh
index 074037075a33f5dfd56356feab660542446a1429..9f4ff1d3f28e35762f43abfbf5e774bf0ada907d 100644
--- a/dumux/porousmediumflow/2pnc/implicit/model.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/model.hh
@@ -28,388 +28,5 @@
#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
#include "properties.hh"
-#include "indices.hh"
-#include "primaryvariableswitch.hh"
-
-namespace Dumux
-{
-/*!
- * \ingroup TwoPNCModel
- * \brief Adaption of the fully implicit scheme to the
- * two-phase n-component fully implicit model.
- *
- * This model implements two-phase n-component flow of two compressible and
- * partially miscible fluids \f$\alpha \in \{ w, n \}\f$ composed of the n components
- * \f$\kappa \in \{ w, n,\cdots \}\f$ in combination with mineral precipitation and dissolution.
- * The solid phases. The standard multiphase Darcy
- * approach is used as the equation for the conservation of momentum:
- * \f[
- v_\alpha = - \frac{k_{r\alpha}}{\mu_\alpha} \mbox{\bf K}
- \left(\text{grad}\, p_\alpha - \varrho_{\alpha} \mbox{\bf g} \right)
- * \f]
- *
- * By inserting this into the equations for the conservation of the
- * components, one gets one transport equation for each component
- * \f{eqnarray}
- && \frac{\partial (\sum_\alpha \varrho_\alpha X_\alpha^\kappa \phi S_\alpha )}
- {\partial t}
- - \sum_\alpha \text{div} \left\{ \varrho_\alpha X_\alpha^\kappa
- \frac{k_{r\alpha}}{\mu_\alpha} \mbox{\bf K}
- (\text{grad}\, p_\alpha - \varrho_{\alpha} \mbox{\bf g}) \right\}
- \nonumber \\ \nonumber \\
- &-& \sum_\alpha \text{div} \left\{{\bf D_{\alpha, pm}^\kappa} \varrho_{\alpha} \text{grad}\, X^\kappa_{\alpha} \right\}
- - \sum_\alpha q_\alpha^\kappa = 0 \qquad \kappa \in \{w, a,\cdots \} \, ,
- \alpha \in \{w, g\}
- \f}
- *
- * The solid or mineral phases are assumed to consist of a single component.
- * Their mass balance consist only of a storage and a source term:
- * \f$\frac{\partial \varrho_\lambda \phi_\lambda )} {\partial t}
- * = q_\lambda\f$
- *
- * All equations are discretized using a vertex-centered finite volume (box)
- * or cell-centered finite volume scheme as
- * spatial and the implicit Euler method as time discretization.
- *
- * By using constitutive relations for the capillary pressure \f$p_c =
- * p_n - p_w\f$ and relative permeability \f$k_{r\alpha}\f$ and taking
- * advantage of the fact that \f$S_w + S_n = 1\f$ and \f$X^\kappa_w + X^\kappa_n = 1\f$, the number of
- * unknowns can be reduced to number of components.
- *
- * The used primary variables are, like in the two-phase model, either \f$p_w\f$ and \f$S_n\f$
- * or \f$p_n\f$ and \f$S_w\f$. The formulation which ought to be used can be
- * specified by setting the <tt>Formulation</tt> property to either
- * TwoPTwoCIndices::pwsn or TwoPTwoCIndices::pnsw. By
- * default, the model uses \f$p_w\f$ and \f$S_n\f$.
- *
- * Moreover, the second primary variable depends on the phase state, since a
- * primary variable switch is included. The phase state is stored for all nodes
- * of the system. The model is uses mole fractions.
- *Following cases can be distinguished:
- * <ul>
- * <li> Both phases are present: The saturation is used (either \f$S_n\f$ or \f$S_w\f$, dependent on the chosen <tt>Formulation</tt>),
- * as long as \f$ 0 < S_\alpha < 1\f$</li>.
- * <li> Only wetting phase is present: The mole fraction of, e.g., air in the wetting phase \f$x^a_w\f$ is used,
- * as long as the maximum mole fraction is not exceeded (\f$x^a_w<x^a_{w,max}\f$)</li>
- * <li> Only non-wetting phase is present: The mole fraction of, e.g., water in the non-wetting phase, \f$x^w_n\f$, is used,
- * as long as the maximum mole fraction is not exceeded (\f$x^w_n<x^w_{n,max}\f$)</li>
- * </ul>
- *
- * For the other components, the mole fraction \f$x^\kappa_w\f$ is the primary variable.
- */
-
-template<class TypeTag>
-class TwoPNCModel: public GET_PROP_TYPE(TypeTag, BaseModel)
-{
- // the parent class needs to access the variable switch
- friend typename GET_PROP_TYPE(TypeTag, BaseModel);
- using ParentType = typename GET_PROP_TYPE(TypeTag, BaseModel);
-
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
-
- static constexpr int dim = GridView::dimension;
- static constexpr int dimWorld = GridView::dimensionworld;
-
- using CoordScalar = typename GridView::ctype;
- using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
- using Tensor = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
-
- // privar indices
- enum
- {
- pressureIdx = Indices::pressureIdx,
- switchIdx = Indices::switchIdx
- };
- // phase indices
- enum
- {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
- };
- // component indices
- enum
- {
- wCompIdx = FluidSystem::wCompIdx,
- nCompIdx = FluidSystem::nCompIdx
- };
- // phase state indices
- enum
- {
- wPhaseOnly = Indices::wPhaseOnly,
- nPhaseOnly = Indices::nPhaseOnly,
- bothPhases = Indices::bothPhases
- };
- // formulation indices
- enum
- {
- pwsn = TwoPNCFormulation::pwsn,
- pnsw = TwoPNCFormulation::pnsw,
- formulation = GET_PROP_VALUE(TypeTag, Formulation)
- };
-
- static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
- static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents);
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
-
- enum { dofCodim = isBox ? dim : 0 };
-
-public:
- /*!
- * \brief Apply the initial conditions to the model.
- *
- * \param problem The object representing the problem which needs to
- * be simulated.
- */
- void init(Problem& problem)
- {
- ParentType::init(problem);
-
- // register standardized vtk output fields
- auto& vtkOutputModule = problem.vtkOutputModule();
- vtkOutputModule.addSecondaryVariable("Sn", [](const VolumeVariables& v){ return v.saturation(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("Sw", [](const VolumeVariables& v){ return v.saturation(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pn", [](const VolumeVariables& v){ return v.pressure(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pw", [](const VolumeVariables& v){ return v.pressure(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pc", [](const VolumeVariables& v){ return v.capillaryPressure(); });
- vtkOutputModule.addSecondaryVariable("rhoW", [](const VolumeVariables& v){ return v.density(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("rhoN", [](const VolumeVariables& v){ return v.density(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("mobW", [](const VolumeVariables& v){ return v.mobility(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("mobN", [](const VolumeVariables& v){ return v.mobility(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("porosity", [](const VolumeVariables& v){ return v.porosity(); });
- vtkOutputModule.addSecondaryVariable("temperature", [](const VolumeVariables& v){ return v.temperature(); });
-
- vtkOutputModule.addSecondaryVariable("Kxx",
- [this](const VolumeVariables& v){ return this->perm_(v.permeability())[0][0]; });
- if (dim >= 2)
- vtkOutputModule.addSecondaryVariable("Kyy",
- [this](const VolumeVariables& v){ return this->perm_(v.permeability())[1][1]; });
- if (dim >= 3)
- vtkOutputModule.addSecondaryVariable("Kzz",
- [this](const VolumeVariables& v){ return this->perm_(v.permeability())[2][2]; });
-
- for (int i = 0; i < numPhases; ++i)
- for (int j = 0; j < numComponents; ++j)
- vtkOutputModule.addSecondaryVariable("x_" + FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j),
- [i,j](const VolumeVariables& v){ return v.moleFraction(i,j); });
-
- for (int j = 0; j < numComponents; ++j)
- vtkOutputModule.addSecondaryVariable("m_" + FluidSystem::phaseName(wPhaseIdx) + "^" + FluidSystem::componentName(j),
- [j](const VolumeVariables& v){ return v.molarity(wPhaseIdx,j); });
- }
-
- /*!
- * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
- */
- template<class VtkOutputModule>
- void addVtkOutputFields(VtkOutputModule& outputModule) const
- {
- auto& phasePresence = outputModule.createScalarField("phase presence", dofCodim);
- for (std::size_t i = 0; i < phasePresence.size(); ++i)
- phasePresence[i] = this->curSol()[i].state();
- }
-
- /*!
- * \brief One Newton iteration was finished.
- * \param uCurrent The solution after the current Newton iteration
- */
- template<typename T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), void>::type
- newtonEndStep()
- {
- // \todo resize volvars vector if grid was adapted
-
- // update the variable switch
- switchFlag_ = priVarSwitch_().update(this->problem_(), this->curSol());
-
- // update the secondary variables if global caching is enabled
- // \note we only updated if phase presence changed as the volume variables
- // are already updated once by the switch
- for (const auto& element : elements(this->problem_().gridView()))
- {
- // make sure FVElementGeometry & vol vars are bound to the element
- auto fvGeometry = localView(this->fvGridGeometry());
- fvGeometry.bindElement(element);
-
- if (switchFlag_)
- {
- for (auto&& scv : scvs(fvGeometry))
- {
- auto dofIdxGlobal = scv.dofIndex();
- if (priVarSwitch_().wasSwitched(dofIdxGlobal))
- {
- const auto eIdx = this->problem_().elementMapper().index(element);
- const auto elemSol = this->elementSolution(element, this->curSol());
- this->nonConstCurGlobalVolVars().volVars(eIdx, scv.indexInElement()).update(elemSol,
- this->problem_(),
- element,
- scv);
- }
- }
- }
-
- // handle the boundary volume variables for cell-centered models
- if(!isBox)
- {
- for (auto&& scvf : scvfs(fvGeometry))
- {
- // if we are not on a boundary, skip the rest
- if (!scvf.boundary())
- continue;
-
- // check if boundary is a pure dirichlet boundary
- const auto bcTypes = this->problem_().boundaryTypes(element, scvf);
- if (bcTypes.hasOnlyDirichlet())
- {
- const auto insideScvIdx = scvf.insideScvIdx();
- const auto& insideScv = fvGeometry.scv(insideScvIdx);
- const auto elemSol = ElementSolutionVector{this->problem_().dirichlet(element, scvf)};
-
- this->nonConstCurGlobalVolVars().volVars(scvf.outsideScvIdx(), 0/*indexInElement*/).update(elemSol, this->problem_(), element, insideScv);
- }
- }
- }
- }
- }
-
- /*!
- * \brief One Newton iteration was finished.
- * \param uCurrent The solution after the current Newton iteration
- */
- template<typename T = TypeTag>
- typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), void>::type
- newtonEndStep()
- {
- // update the variable switch
- switchFlag_ = priVarSwitch_().update(this->problem_(), this->curSol());
- }
-
- /*!
- * \brief Called by the update() method if applying the Newton
- * method was unsuccessful.
- */
- void updateFailed()
- {
- ParentType::updateFailed();
- // reset privar switch flag
- switchFlag_ = false;
- }
-
- /*!
- * \brief Called by the problem if a time integration was
- * successful, post processing of the solution is done and the
- * result has been written to disk.
- *
- * This should prepare the model for the next time integration.
- */
- void advanceTimeLevel()
- {
- ParentType::advanceTimeLevel();
- // reset privar switch flag
- switchFlag_ = false;
- }
-
- /*!
- * \brief Returns true if the primary variables were switched for
- * at least one dof after the last timestep.
- */
- bool switched() const
- { return switchFlag_; }
-
- /*!
- * \brief Write the current solution to a restart file.
- *
- * \param outStream The output stream of one entity for the restart file
- * \param entity The entity, either a vertex or an element
- */
- template<class Entity>
- void serializeEntity(std::ostream &outStream, const Entity &entity)
- {
- // write primary variables
- ParentType::serializeEntity(outStream, entity);
-
- int dofIdxGlobal = this->dofMapper().index(entity);
-
- if (!outStream.good())
- DUNE_THROW(Dune::IOError, "Could not serialize entity " << dofIdxGlobal);
-
- outStream << this->curSol()[dofIdxGlobal].state() << " ";
- }
-
- /*!
- * \brief Reads the current solution from a restart file.
- *
- * \param inStream The input stream of one entity from the restart file
- * \param entity The entity, either a vertex or an element
- */
- template<class Entity>
- void deserializeEntity(std::istream &inStream, const Entity &entity)
- {
- // read primary variables
- ParentType::deserializeEntity(inStream, entity);
-
- // read phase presence
- int dofIdxGlobal = this->dofMapper().index(entity);
-
- if (!inStream.good())
- DUNE_THROW(Dune::IOError, "Could not deserialize entity " << dofIdxGlobal);
-
- int phasePresence;
- inStream >> phasePresence;
-
- this->curSol()[dofIdxGlobal].setState(phasePresence);
- this->prevSol()[dofIdxGlobal].setState(phasePresence);
- }
-
- const TwoPNCPrimaryVariableSwitch<TypeTag>& priVarSwitch() const
- { return switch_; }
-
-private:
-
- TwoPNCPrimaryVariableSwitch<TypeTag>& priVarSwitch_()
- { return switch_; }
-
- /*!
- * \brief Applies the initial solution for all vertices of the grid.
- *
- * \todo the initial condition needs to be unique for
- * each vertex. we should think about the API...
- */
- void applyInitialSolution_()
- {
- ParentType::applyInitialSolution_();
-
- // initialize the primary variable switch
- priVarSwitch_().init(this->problem_());
- }
-
- //! the class handling the primary variable switch
- TwoPNCPrimaryVariableSwitch<TypeTag> switch_;
- bool switchFlag_;
-
- Tensor perm_(Scalar perm) const
- {
- Tensor K(0.0);
-
- for(int i=0; i<dimWorld; i++)
- K[i][i] = perm;
-
- return K;
- }
-
- const Tensor& perm_(const Tensor& perm) const
- {
- return perm;
- }
-};
-
-} // end namespace Dumux
-
-#include "propertydefaults.hh"
#endif
diff --git a/dumux/porousmediumflow/2pnc/implicit/primaryvariableswitch.hh b/dumux/porousmediumflow/2pnc/implicit/primaryvariableswitch.hh
index ea00b94729859bbbbd1d0afbe20417010b1587dc..941767ba9601d3bccc8a4767ec87c44b3dba1d66 100644
--- a/dumux/porousmediumflow/2pnc/implicit/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/primaryvariableswitch.hh
@@ -72,6 +72,9 @@ class TwoPNCPrimaryVariableSwitch : public Dumux::PrimaryVariableSwitch<TypeTag>
formulation = GET_PROP_VALUE(TypeTag, Formulation)
};
+public:
+ using ParentType::ParentType;
+
protected:
// perform variable switch at a degree of freedom location
@@ -92,92 +95,92 @@ protected:
if (this->wasSwitched_[dofIdxGlobal])
Smin = -0.01;
- //if saturation of liquid phase is smaller 0 switch
+ //if saturation of wetting phase is smaller 0 switch
if (volVars.saturation(wPhaseIdx) <= Smin)
{
wouldSwitch = true;
- //liquid phase has to disappear
- std::cout << "Liquid Phase disappears at vertex " << dofIdxGlobal
- << ", coordinated: " << globalPos << ", Sl: "
+ //wetting phase has to disappear
+ std::cout << "Wetting Phase disappears at vertex " << dofIdxGlobal
+ << ", coordinated: " << globalPos << ", Sw: "
<< volVars.saturation(wPhaseIdx) << std::endl;
newPhasePresence = nPhaseOnly;
//switch not depending on formulation
- //switch "Sl" to "xgH20"
+ //switch "Sw" to "xn20"
priVars[switchIdx]
= volVars.moleFraction(nPhaseIdx, wCompIdx /*H2O*/);
- //switch all secondary components to mole fraction in gas phase
+ //switch all secondary components to mole fraction in non-wetting phase
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
priVars[compIdx] = volVars.moleFraction(nPhaseIdx,compIdx);
}
- //if saturation of gas phase is smaller than 0 switch
+ //if saturation of non-wetting phase is smaller than 0 switch
else if (volVars.saturation(nPhaseIdx) <= Smin)
{
wouldSwitch = true;
- //gas phase has to disappear
- std::cout << "Gas Phase disappears at vertex " << dofIdxGlobal
- << ", coordinated: " << globalPos << ", Sg: "
+ //non-wetting phase has to disappear
+ std::cout << "Non-wetting Phase disappears at vertex " << dofIdxGlobal
+ << ", coordinated: " << globalPos << ", Sn: "
<< volVars.saturation(nPhaseIdx) << std::endl;
newPhasePresence = wPhaseOnly;
- //switch "Sl" to "xlN2"
+ //switch "Sn" to "xwN2"
priVars[switchIdx] = volVars.moleFraction(wPhaseIdx, nCompIdx /*N2*/);
}
}
else if (phasePresence == nPhaseOnly)
{
- Scalar xlmax = 1;
- Scalar sumxl = 0;
- //Calculate sum of mole fractions in the hypothetical liquid phase
+ Scalar xwmax = 1;
+ Scalar sumxw = 0;
+ //Calculate sum of mole fractions in the hypothetical wetting phase
for (int compIdx = 0; compIdx < numComponents; compIdx++)
{
- sumxl += volVars.moleFraction(wPhaseIdx, compIdx);
+ sumxw += volVars.moleFraction(wPhaseIdx, compIdx);
}
- if (sumxl > xlmax)
+ if (sumxw > xwmax)
wouldSwitch = true;
if (this->wasSwitched_[dofIdxGlobal])
- xlmax *=1.02;
- //liquid phase appears if sum is larger than one
- if (sumxl/*sum of mole fractions*/ > xlmax/*1*/)
+ xwmax *=1.02;
+ //wetting phase appears if sum is larger than one
+ if (sumxw/*sum of mole fractions*/ > xwmax/*1*/)
{
- std::cout << "Liquid Phase appears at vertex " << dofIdxGlobal
- << ", coordinated: " << globalPos << ", sumxl: "
- << sumxl << std::endl;
+ std::cout << "Wetting Phase appears at vertex " << dofIdxGlobal
+ << ", coordinated: " << globalPos << ", sumxw: "
+ << sumxw << std::endl;
newPhasePresence = bothPhases;
- //saturation of the liquid phase set to 0.0001 (if formulation pgSl and vice versa)
+ //saturation of the wetting phase set to 0.0001 (if formulation pnsw and vice versa)
if (formulation == pnsw)
priVars[switchIdx] = 0.0001;
else if (formulation == pwsn)
priVars[switchIdx] = 0.9999;
- //switch all secondary components back to liquid mole fraction
+ //switch all secondary components back to wetting mole fraction
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
priVars[compIdx] = volVars.moleFraction(wPhaseIdx,compIdx);
}
}
else if (phasePresence == wPhaseOnly)
{
- Scalar xgmax = 1;
- Scalar sumxg = 0;
- //Calculate sum of mole fractions in the hypothetical liquid phase
+ Scalar xnmax = 1;
+ Scalar sumxn = 0;
+ //Calculate sum of mole fractions in the hypothetical wetting phase
for (int compIdx = 0; compIdx < numComponents; compIdx++)
{
- sumxg += volVars.moleFraction(nPhaseIdx, compIdx);
+ sumxn += volVars.moleFraction(nPhaseIdx, compIdx);
}
- if (sumxg > xgmax)
+ if (sumxn > xnmax)
wouldSwitch = true;
if (this->wasSwitched_[dofIdxGlobal])
- xgmax *=1.02;
- //liquid phase appears if sum is larger than one
- if (sumxg > xgmax)
+ xnmax *=1.02;
+ //wetting phase appears if sum is larger than one
+ if (sumxn > xnmax)
{
- std::cout << "Gas Phase appears at vertex " << dofIdxGlobal
- << ", coordinated: " << globalPos << ", sumxg: "
- << sumxg << std::endl;
+ std::cout << "Non-wetting Phase appears at vertex " << dofIdxGlobal
+ << ", coordinated: " << globalPos << ", sumxn: "
+ << sumxn << std::endl;
newPhasePresence = bothPhases;
- //saturation of the liquid phase set to 0.9999 (if formulation pgSl and vice versa)
+ //saturation of the wetting phase set to 0.9999 (if formulation pnsw and vice versa)
if (formulation == pnsw)
priVars[switchIdx] = 0.9999;
else if (formulation == pwsn)
diff --git a/dumux/porousmediumflow/2pnc/implicit/properties.hh b/dumux/porousmediumflow/2pnc/implicit/properties.hh
index 582bceeb02410d6872db5cbc864a3b5771235653..b78abac3af17daf5e10d965a502888af72fd0f57 100644
--- a/dumux/porousmediumflow/2pnc/implicit/properties.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/properties.hh
@@ -29,10 +29,23 @@
#ifndef DUMUX_2PNC_PROPERTIES_HH
#define DUMUX_2PNC_PROPERTIES_HH
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/properties.hh>
+#include <dumux/common/basicproperties.hh>
+#include <dumux/linear/linearsolverproperties.hh>
+
+#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
+#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
+
+#include <dumux/porousmediumflow/properties.hh>
+#include <dumux/porousmediumflow/compositional/localresidual.hh>
+#include <dumux/porousmediumflow/compositional/switchableprimaryvariables.hh>
#include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
+#include "indices.hh"
+#include "volumevariables.hh"
+#include "primaryvariableswitch.hh"
+#include "vtkoutputfields.hh"
+
namespace Dumux
{
@@ -41,41 +54,105 @@ namespace Properties
//////////////////////////////////////////////////////////////////
// Type tags
//////////////////////////////////////////////////////////////////
-
-//! The type tag for the implicit isothermal two phase n component problems
-NEW_TYPE_TAG(TwoPNC);
-NEW_TYPE_TAG(BoxTwoPNC, INHERITS_FROM(BoxModel, TwoPNC));
-NEW_TYPE_TAG(CCTwoPNC, INHERITS_FROM(CCModel, TwoPNC));
-
-//! The type tag for the implicit non-isothermal two phase n component problems
+NEW_TYPE_TAG(TwoPNC, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
NEW_TYPE_TAG(TwoPNCNI, INHERITS_FROM(TwoPNC, NonIsothermal));
-NEW_TYPE_TAG(BoxTwoPNCNI, INHERITS_FROM(BoxModel, TwoPNCNI));
-NEW_TYPE_TAG(CCTwoPNCNI, INHERITS_FROM(CCModel, TwoPNCNI));
//////////////////////////////////////////////////////////////////
-// Property tags
+// Properties for the isothermal 2pnc model
//////////////////////////////////////////////////////////////////
+SET_TYPE_PROP(TwoPNC, PrimaryVariables, SwitchablePrimaryVariables<TypeTag, int>); //! The primary variables vector for the 2pnc model
+SET_TYPE_PROP(TwoPNC, PrimaryVariableSwitch, TwoPNCPrimaryVariableSwitch<TypeTag>); //! The primary variable switch for the 2pnc model
+SET_TYPE_PROP(TwoPNC, VolumeVariables, TwoPNCVolumeVariables<TypeTag>); //! the VolumeVariables property
+SET_TYPE_PROP(TwoPNC, Indices, TwoPNCIndices <TypeTag, /*PVOffset=*/0>); //! The indices required by the isothermal 2pnc model
+SET_TYPE_PROP(TwoPNC, SpatialParams, ImplicitSpatialParams<TypeTag>); //! Use the ImplicitSpatialParams by default
+SET_TYPE_PROP(TwoPNC, VtkOutputFields, TwoPNCVtkOutputFields<TypeTag>); //! Set the vtk output fields specific to the TwoPNC model
+SET_TYPE_PROP(TwoPNC, LocalResidual, CompositionalLocalResidual<TypeTag>); //! Use the compositional local residual
+
+SET_INT_PROP(TwoPNC, NumComponents, GET_PROP_TYPE(TypeTag, FluidSystem)::numComponents); //! Use the number of components of the fluid system
+SET_INT_PROP(TwoPNC, ReplaceCompEqIdx, GET_PROP_TYPE(TypeTag, FluidSystem)::numComponents); //! Per default, no component mass balance is replaced
+SET_INT_PROP(TwoPNC, NumEq, GET_PROP_TYPE(TypeTag, FluidSystem)::numComponents); //! We solve one equation per component
+SET_INT_PROP(TwoPNC, Formulation, TwoPNCFormulation::pwsn); //! Default formulation is pw-Sn, overwrite if necessary
+
+SET_BOOL_PROP(TwoPNC, SetMoleFractionsForWettingPhase, true); //! Set the primary variables mole fractions for the wetting or non-wetting phase
+SET_BOOL_PROP(TwoPNC, EnableAdvection, true); //! Enable advection
+SET_BOOL_PROP(TwoPNC, EnableMolecularDiffusion, true); //! Enable molecular diffusion
+SET_BOOL_PROP(TwoPNC, EnableEnergyBalance, false); //! This is the isothermal variant of the model
+SET_BOOL_PROP(TwoPNC, UseMoles, true); //! Use mole fractions in the balance equations by default
+
+
+//! Use the model after Millington (1961) for the effective diffusivity
+SET_TYPE_PROP(TwoPNC, EffectiveDiffusivityModel, DiffusivityMillingtonQuirk<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+
+//! The major components belonging to the existing phases, e.g. 2 for water and air being the major components in a liquid-gas-phase system
+SET_PROP(TwoPNC, NumMajorComponents)
+{
+private:
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+
+public:
+ static const int value = FluidSystem::numPhases;
+ static_assert(value == 2, "The model is restricted to two phases, thus number of major components must also be two.");
+};
+
+//! We use the number of phases of the fluid system. Make sure it is 2!
+SET_PROP(TwoPNC, NumPhases)
+{
+private:
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+
+public:
+ static const int value = FluidSystem::numPhases;
+ static_assert(value == 2, "Only fluid systems with 2 fluid phases are supported by the 2p-nc model!");
+};
+
+//! This model uses the compositional fluid state
+SET_PROP(TwoPNC, FluidState)
+{
+private:
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+public:
+ using type = CompositionalFluidState<Scalar, FluidSystem>;
+};
+
+//! Set the property for the material parameters by extracting it from the material law.
+SET_PROP(TwoPNC, MaterialLawParams)
+{
+private:
+ using MaterialLaw = typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw));
+
+public:
+ using type = typename MaterialLaw::Params;
+};
+
+/////////////////////////////////////////////////
+// Properties for the non-isothermal 2pnc model
+/////////////////////////////////////////////////
+SET_TYPE_PROP(TwoPNCNI, IsothermalVolumeVariables, TwoPNCVolumeVariables<TypeTag>); //! set isothermal VolumeVariables
+SET_TYPE_PROP(TwoPNCNI, IsothermalLocalResidual, CompositionalLocalResidual<TypeTag>); //! set isothermal LocalResidual
+SET_TYPE_PROP(TwoPNCNI, IsothermalIndices, TwoPNCIndices<TypeTag, /*PVOffset=*/0>); //! set isothermal Indices
+SET_TYPE_PROP(TwoPNCNI, IsothermalVtkOutputFields, TwoPNCVtkOutputFields<TypeTag>); //! set isothermal output fields
+
+//! Somerton is used as default model to compute the effective thermal heat conductivity
+SET_PROP(TwoPNCNI, ThermalConductivityModel)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+public:
+ typedef ThermalConductivitySomerton<Scalar, Indices> type;
+};
+
+//! set isothermal NumEq
+SET_PROP(TwoPNCNI, IsothermalNumEq)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
+
+public:
+ static const int value = FluidSystem::numComponents;
+};
-NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system
-NEW_PROP_TAG(NumComponents); //!< Number of fluid components in the system
-NEW_PROP_TAG(NumMajorComponents); //!< Number of major fluid components which are considered in the calculation of the phase density
-NEW_PROP_TAG(SetMoleFractionsForWettingPhase); //!< Set the mole fraction in the wetting or non-wetting phase
-NEW_PROP_TAG(TwoPNCIndices); //!< Enumerations for the 2pncMin models
-NEW_PROP_TAG(Formulation); //!< The formulation of the model
-NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
-NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
-NEW_PROP_TAG(FluidState); //!< Type of the fluid state of the 2pnc model
-NEW_PROP_TAG(Indices); //!< Enumerations for the model
-NEW_PROP_TAG(Chemistry); //!< The chemistry class with which solves equlibrium reactions
-
-NEW_PROP_TAG(MaterialLaw); //!< The material law which ought to be used (extracted from the spatial parameters)
-NEW_PROP_TAG(MaterialLawParams); //!< The parameters of the material law (extracted from the spatial parameters)
-NEW_PROP_TAG(EffectiveDiffusivityModel); //!< The employed model for the computation of the effective diffusivity
-
-NEW_PROP_TAG(ReplaceCompEqIdx); //!< The index of the total mass balance equation, if one component balance is replaced (ReplaceCompEqIdx < NumComponents)
-NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(BaseFluxVariables); //! The base flux variables
-NEW_PROP_TAG(UseMoles); //!< Defines whether mole (true) or mass (false) fractions are used
}
}
diff --git a/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh b/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh
deleted file mode 100644
index d06343303928ba397756632b6b70ea4a2a92b0e1..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh
+++ /dev/null
@@ -1,237 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup TwoPNCModel
- * \file
- *
- * \brief Defines default values for most properties required by the
- * two-phase n-component fully implicit model.
- */
-#ifndef DUMUX_2PNC_PROPERTY_DEFAULTS_HH
-#define DUMUX_2PNC_PROPERTY_DEFAULTS_HH
-
-#include "indices.hh"
-#include "model.hh"
-#include "volumevariables.hh"
-#include "properties.hh"
-#include "newtoncontroller.hh"
-#include "primaryvariableswitch.hh"
-
-#include <dumux/porousmediumflow/compositional/localresidual.hh>
-#include <dumux/porousmediumflow/compositional/switchableprimaryvariables.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh>
-#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
-#include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
-#include <dumux/material/spatialparams/implicit.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
-
-namespace Dumux
-{
-
-namespace Properties {
-//////////////////////////////////////////////////////////////////
-// Property values
-//////////////////////////////////////////////////////////////////
-
-/*!
- * \brief Set the property for the number of components.
- *
- * We just forward the number from the fluid system
- *
- */
-SET_PROP(TwoPNC, NumComponents)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-
-public:
- static const int value = FluidSystem::numComponents;
-
-};
-//! Set as default that no component mass balance is replaced by the total mass balance
-SET_PROP(TwoPNC, ReplaceCompEqIdx)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-
-public:
- static const int value = FluidSystem::numComponents;
-};
-//! The major components belonging to the existing phases, e.g. 2 for water and air being the major components in a liquid-gas-phase system
-SET_PROP(TwoPNC, NumMajorComponents)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-
-public:
- static const int value = FluidSystem::numPhases;
- static_assert(value == 2,
- "The model is restricted to two phases, thus number of major components must also be two.");
-};
-
-//! Set the primary variables mole fractions for the wetting or non-wetting phase
-SET_BOOL_PROP(TwoPNC, SetMoleFractionsForWettingPhase, true);
-
-/*!
- * \brief Set the property for the number of fluid phases.
- *
- * We just forward the number from the fluid system and use an static
- * assert to make sure it is 2.
- */
-SET_PROP(TwoPNC, NumPhases)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-
-public:
- static const int value = FluidSystem::numPhases;
- static_assert(value == 2,
- "Only fluid systems with 2 fluid phases are supported by the 2p-nc model!");
-};
-/*!
- * \brief Set the property for the number of equations: For each existing component one equation has to be solved.
- */
-SET_PROP(TwoPNC, NumEq)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-
-public:
- static const int value = FluidSystem::numComponents;
-};
-
-/*!
- * \brief The fluid state which is used by the volume variables to
- * store the thermodynamic state. This should be chosen
- * appropriately for the model ((non-)isothermal, equilibrium, ...).
- * This can be done in the problem.
- */
-SET_PROP(TwoPNC, FluidState)
-{
- private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- public:
- typedef CompositionalFluidState<Scalar, FluidSystem> type;
-};
-
-//! Set the default formulation to pw-Sn: This can be over written in the problem.
-SET_INT_PROP(TwoPNC, Formulation, TwoPNCFormulation::pwsn);
-
-//! Set the property for the material parameters by extracting it from the material law.
-SET_PROP(TwoPNC, MaterialLawParams)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(MaterialLaw)) MaterialLaw;
-
-public:
- typedef typename MaterialLaw::Params type;
-};
-
-//! Use the 2pnc local residual
-SET_TYPE_PROP(TwoPNC, LocalResidual, CompositionalLocalResidual<TypeTag>);
-
-//! Enable advection
-SET_BOOL_PROP(TwoPNC, EnableAdvection, true);
-
-//! Enable molecular diffusion
-SET_BOOL_PROP(TwoPNC, EnableMolecularDiffusion, true);
-
-//! Isothermal model by default
-SET_BOOL_PROP(TwoPNC, EnableEnergyBalance, false);
-
-//! Use the 2pnc newton controller
-SET_TYPE_PROP(TwoPNC, NewtonController, TwoPNCNewtonController<TypeTag>);
-
-//! the Model property
-SET_TYPE_PROP(TwoPNC, Model, TwoPNCModel<TypeTag>);
-
-//! The primary variable switch for the 2pnc model
-SET_TYPE_PROP(TwoPNC, PrimaryVariableSwitch, TwoPNCPrimaryVariableSwitch<TypeTag>);
-
-//! The primary variables vector for the 2pnc model
-SET_TYPE_PROP(TwoPNC, PrimaryVariables, SwitchablePrimaryVariables<TypeTag, int>);
-
-//! the VolumeVariables property
-SET_TYPE_PROP(TwoPNC, VolumeVariables, TwoPNCVolumeVariables<TypeTag>);
-
-//! The indices required by the isothermal 2pnc model
-SET_TYPE_PROP(TwoPNC, Indices, TwoPNCIndices <TypeTag, /*PVOffset=*/0>);
-
-//! Use the ImplicitSpatialParams by default
-SET_TYPE_PROP(TwoPNC, SpatialParams, ImplicitSpatialParams<TypeTag>);
-
-//! Use the model after Millington (1961) for the effective diffusivity
-SET_TYPE_PROP(TwoPNC, EffectiveDiffusivityModel, DiffusivityMillingtonQuirk<typename GET_PROP_TYPE(TypeTag, Scalar)>);
-
-//! Enable gravity by default
-SET_BOOL_PROP(TwoPNC, ProblemEnableGravity, true);
-
-//! Use mole fractions in the balance equations by default
-SET_BOOL_PROP(TwoPNC, UseMoles, true);
-
-//! Disable velocity output by default
-
-//! Somerton is used as default model to compute the effective thermal heat conductivity
-SET_PROP(TwoPNCNI, ThermalConductivityModel)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-public:
- typedef ThermalConductivitySomerton<Scalar, Indices> type;
-};
-
-//! temperature is already written by the isothermal model
-SET_BOOL_PROP(TwoPNCNI, NiOutputLevel, 0);
-
-//////////////////////////////////////////////////////////////////
-// Property values for isothermal model required for the general non-isothermal model
-//////////////////////////////////////////////////////////////////
-
-// set isothermal Model
-SET_TYPE_PROP(TwoPNCNI, IsothermalModel, TwoPNCModel<TypeTag>);
-
-//set isothermal VolumeVariables
-SET_TYPE_PROP(TwoPNCNI, IsothermalVolumeVariables, TwoPNCVolumeVariables<TypeTag>);
-
-//set isothermal LocalResidual
-SET_TYPE_PROP(TwoPNCNI, IsothermalLocalResidual, CompositionalLocalResidual<TypeTag>);
-
-//set isothermal Indices
-SET_TYPE_PROP(TwoPNCNI, IsothermalIndices, TwoPNCIndices<TypeTag, /*PVOffset=*/0>);
-
-//set isothermal NumEq
-SET_PROP(TwoPNCNI, IsothermalNumEq)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
-
-public:
- static const int value = FluidSystem::numComponents;
-};
-
-
-}
-
-}
-
-#endif
diff --git a/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh b/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
index 80bc88b7293c298a8fdc9067554bc5173fb1917d..01b56f98cb79c729f73efe2c3ce5359c3024ca3b 100644
--- a/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
@@ -28,15 +28,16 @@
#include <iostream>
#include <vector>
-#include <dumux/implicit/model.hh>
-#include <dumux/material/fluidstates/compositional.hh>
#include <dumux/common/math.hh>
-#include "properties.hh"
-#include "indices.hh"
+#include <dumux/material/fluidstates/compositional.hh>
+#include <dumux/discretization/volumevariables.hh>
#include <dumux/material/constraintsolvers/computefromreferencephase.hh>
#include <dumux/material/constraintsolvers/miscible2pnccomposition.hh>
+#include "properties.hh"
+#include "indices.hh"
+
namespace Dumux
{
@@ -104,7 +105,7 @@ class TwoPNCVolumeVariables : public ImplicitVolumeVariables<TypeTag>
using ComputeFromReferencePhase = Dumux::ComputeFromReferencePhase<Scalar, FluidSystem>;
static constexpr bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
static_assert(useMoles, "use moles has to be set true in the 2pnc model");
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
enum { dofCodim = isBox ? dim : 0 };
public:
@@ -185,21 +186,21 @@ public:
// set the saturations
/////////////
- Scalar Sg;
+ Scalar Sn;
if (phasePresence == nPhaseOnly)
{
- Sg = 1.0;
+ Sn = 1.0;
}
else if (phasePresence == wPhaseOnly)
{
- Sg = 0.0;
+ Sn = 0.0;
}
else if (phasePresence == bothPhases)
{
if (formulation == pwsn)
- Sg = priVars[switchIdx];
+ Sn = priVars[switchIdx];
else if (formulation == pnsw)
- Sg = 1.0 - priVars[switchIdx];
+ Sn = 1.0 - priVars[switchIdx];
else
DUNE_THROW(Dune::InvalidStateException, "Formulation: " << formulation << " is invalid.");
}
@@ -208,8 +209,8 @@ public:
DUNE_THROW(Dune::InvalidStateException, "phasePresence: " << phasePresence << " is invalid.");
}
- fluidState.setSaturation(nPhaseIdx, Sg);
- fluidState.setSaturation(wPhaseIdx, 1.0 - Sg);
+ fluidState.setSaturation(nPhaseIdx, Sn);
+ fluidState.setSaturation(wPhaseIdx, 1.0 - Sn);
/////////////
// set the pressures of the fluid phases
@@ -217,7 +218,7 @@ public:
// calculate capillary pressure
const auto& materialParams = problem.spatialParams().materialLawParams(element, scv, elemSol);
- auto pc = MaterialLaw::pc(materialParams, 1 - Sg);
+ auto pc = MaterialLaw::pc(materialParams, 1 - Sn);
// extract the pressures
if (formulation == pwsn)
@@ -233,7 +234,7 @@ public:
// Here we check for (p_g - pc) in order to ensure that (p_l > 0)
if (priVars[pressureIdx] - pc < 0.0)
{
- std::cout<< "p_g: "<< priVars[pressureIdx]<<" Cap_press: "<< pc << std::endl;
+ std::cout<< "p_n: "<< priVars[pressureIdx]<<" Cap_press: "<< pc << std::endl;
DUNE_THROW(NumericalProblem,"Capillary pressure is too high");
}
fluidState.setPressure(wPhaseIdx, priVars[pressureIdx] - pc);
@@ -312,19 +313,20 @@ public:
{
// only the wetting phase is present, i.e. wetting phase
// composition is stored explicitly.
- // extract _mass_ fractions in the nonwetting phase
+ // extract _mass_ fractions in the non-wetting phase
Dune::FieldVector<Scalar, numComponents> moleFrac;
+ moleFrac[nCompIdx] = priVars[switchIdx];
+
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
moleFrac[compIdx] = priVars[compIdx];
- moleFrac[nCompIdx] = priVars[switchIdx];
- Scalar sumMoleFracNotWater = 0;
+ Scalar sumMoleFracOtherComponents = 0;
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
- sumMoleFracNotWater+=moleFrac[compIdx];
+ sumMoleFracOtherComponents += moleFrac[compIdx];
- sumMoleFracNotWater += moleFrac[nCompIdx];
- moleFrac[wCompIdx] = 1 -sumMoleFracNotWater;
+ sumMoleFracOtherComponents += moleFrac[nCompIdx];
+ moleFrac[wCompIdx] = 1 - sumMoleFracOtherComponents;
// convert mass to mole fractions and set the fluid state
for (int compIdx=0; compIdx<numComponents; ++compIdx)
diff --git a/dumux/porousmediumflow/2pnc/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/2pnc/implicit/vtkoutputfields.hh
new file mode 100644
index 0000000000000000000000000000000000000000..3748b9848f55b9d7e12e0deadc0c3884a8ec72b7
--- /dev/null
+++ b/dumux/porousmediumflow/2pnc/implicit/vtkoutputfields.hh
@@ -0,0 +1,69 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Adds vtk output fields specific to the twop-nc model
+ */
+#ifndef DUMUX_TWOP_NC_VTK_OUTPUT_FIELDS_HH
+#define DUMUX_TWOP_NC_VTK_OUTPUT_FIELDS_HH
+
+#include <dumux/porousmediumflow/2p/implicit/vtkoutputfields.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup TwoPNC, InputOutput
+ * \brief Adds vtk output fields specific to the TwoPNC model
+ */
+template<class TypeTag>
+class TwoPNCVtkOutputFields
+{
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+
+ static constexpr int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
+ static constexpr int numComponents = GET_PROP_VALUE(TypeTag, NumComponents);
+ static constexpr int dim = GridView::dimension;
+
+
+public:
+ template <class VtkOutputModule>
+ static void init(VtkOutputModule& vtk)
+ {
+ // use default fields from the 2p model
+ TwoPVtkOutputFields<TypeTag>::init(vtk);
+
+ //output additional to TwoP output:
+ for (int i = 0; i < numPhases; ++i)
+ for (int j = 0; j < numComponents; ++j)
+ vtk.addVolumeVariable([i,j](const VolumeVariables& v){ return v.moleFraction(i,j); },"x_"+ FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j));
+
+ for (int j = 0; j < numComponents; ++j)
+ vtk.addVolumeVariable([j](const VolumeVariables& v){ return v.molarity(Indices::wPhaseIdx,j); },"m_"+ FluidSystem::phaseName(Indices::wPhaseIdx) + "^" + FluidSystem::componentName(j));
+
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.priVars().state(); }, "phasePresence");
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/porousmediumflow/3p/implicit/model.hh b/dumux/porousmediumflow/3p/implicit/model.hh
index 2178999bcc702912f9dacbf7b1e70b1737b0acdc..b4920149a98f712a3e994641826a1195dbbd625e 100644
--- a/dumux/porousmediumflow/3p/implicit/model.hh
+++ b/dumux/porousmediumflow/3p/implicit/model.hh
@@ -27,12 +27,8 @@
#ifndef DUMUX_3P_MODEL_HH
#define DUMUX_3P_MODEL_HH
-#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
-#include "properties.hh"
-
-namespace Dumux
-{
/*!
+ * \file
* \ingroup ThreePModel
* \brief Adaption of the fully implicit scheme to the three-phase flow model.
*
@@ -57,56 +53,7 @@ namespace Dumux
* The used primary variables are gas phase pressure \f$p_g\f$,
* water saturation \f$S_w\f$ and NAPL saturation \f$S_n\f$.
*/
-template<class TypeTag>
-class ThreePModel: public GET_PROP_TYPE(TypeTag, BaseModel)
-{
- using ParentType = typename GET_PROP_TYPE(TypeTag, BaseModel);
- using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using Indices = typename GET_PROP_TYPE(TypeTag, Indices);;
-
- enum {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx,
- gPhaseIdx = Indices::gPhaseIdx,
- };
-
-public:
- /*!
- * \brief Apply the initial conditions to the model.
- *
- * \param problem The object representing the problem which needs to
- * be simulated.
- */
- void init(Problem& problem)
- {
- ParentType::init(problem);
-
- // register standardized vtk output fields
- auto& vtkOutputModule = problem.vtkOutputModule();
- vtkOutputModule.addSecondaryVariable("sw", [](const VolumeVariables& v){ return v.saturation(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("sn", [](const VolumeVariables& v){ return v.saturation(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("sg", [](const VolumeVariables& v){ return v.saturation(gPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pw", [](const VolumeVariables& v){ return v.pressure(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pn", [](const VolumeVariables& v){ return v.pressure(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("pg", [](const VolumeVariables& v){ return v.pressure(gPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("rhow", [](const VolumeVariables& v){ return v.density(wPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("rhon", [](const VolumeVariables& v){ return v.density(nPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("rhog", [](const VolumeVariables& v){ return v.density(gPhaseIdx); });
- vtkOutputModule.addSecondaryVariable("porosity", [](const VolumeVariables& v){ return v.porosity(); });
- vtkOutputModule.addSecondaryVariable("permeability", [](const VolumeVariables& v){ return v.permeability(); });
- vtkOutputModule.addSecondaryVariable("temperature", [](const VolumeVariables& v){ return v.temperature(); });
-// vtkOutputModule.addSecondaryVariable("mobW", [](const VolumeVariables& v){ return v.mobility(wPhaseIdx); });
-// vtkOutputModule.addSecondaryVariable("mobN", [](const VolumeVariables& v){ return v.mobility(nPhaseIdx); });
-// vtkOutputModule.addSecondaryVariable("mobG", [](const VolumeVariables& v){ return v.mobility(gPhaseIdx); });
- // TODO: these lines are commented-out in order to comply with the "old" reference solution;
- // can be changed some time, as well as the parameter names
- }
-};
-
-}
-
-#include "propertydefaults.hh"
+#include "properties.hh"
#endif
diff --git a/dumux/porousmediumflow/3p/implicit/properties.hh b/dumux/porousmediumflow/3p/implicit/properties.hh
index 50b6e72ca6295225c30a4d51d3b25449bb99af60..9797132138d30d7b6ca97b346d1b39b125ce275d 100644
--- a/dumux/porousmediumflow/3p/implicit/properties.hh
+++ b/dumux/porousmediumflow/3p/implicit/properties.hh
@@ -27,10 +27,22 @@
#ifndef DUMUX_3P_PROPERTIES_HH
#define DUMUX_3P_PROPERTIES_HH
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/common/basicproperties.hh>
+#include <dumux/linear/linearsolverproperties.hh>
+
+#include <dumux/material/spatialparams/implicit.hh>
+#include <dumux/material/fluidstates/immiscible.hh>
+#include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh>
+
+#include <dumux/porousmediumflow/properties.hh>
+#include <dumux/porousmediumflow/immiscible/localresidual.hh>
#include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
+#include "indices.hh"
+#include "volumevariables.hh"
+#include "properties.hh"
+#include "vtkoutputfields.hh"
+
namespace Dumux
{
@@ -39,34 +51,117 @@ namespace Properties
//////////////////////////////////////////////////////////////////
// Type tags
//////////////////////////////////////////////////////////////////
-//! The type tags for the implicit isothermal one-phase two-component problems
-NEW_TYPE_TAG(ThreeP);
-NEW_TYPE_TAG(BoxThreeP, INHERITS_FROM(BoxModel, ThreeP));
-NEW_TYPE_TAG(CCThreeP, INHERITS_FROM(CCTpfaModel, ThreeP));
-
-//! The type tags for the corresponding non-isothermal problems
+NEW_TYPE_TAG(ThreeP, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
NEW_TYPE_TAG(ThreePNI, INHERITS_FROM(ThreeP, NonIsothermal));
-NEW_TYPE_TAG(BoxThreePNI, INHERITS_FROM(BoxModel, ThreePNI));
-NEW_TYPE_TAG(CCThreePNI, INHERITS_FROM(CCTpfaModel, ThreePNI));
+//////////////////////////////////////////////////////////////////
+// Properties for the isothermal 3p model
+//////////////////////////////////////////////////////////////////
+/*!
+ * \brief Set the property for the number of fluid phases.
+ *
+ * We just forward the number from the fluid system and use an static
+ * assert to make sure it is 3.
+ */
+SET_PROP(ThreeP, NumPhases)
+{
+ private:
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+
+ public:
+ static const int value = FluidSystem::numPhases;
+ static_assert(value == 3,
+ "Only fluid systems with 3 phases are supported by the 3p model!");
+};
+
+SET_PROP(ThreeP, NumComponents)
+{
+ private:
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+
+ public:
+ static const int value = FluidSystem::numComponents;
+ static_assert(value == 3,
+ "Only fluid systems with 3 components are supported by the 3p model!");
+};
+
+SET_INT_PROP(ThreeP, NumEq, 3); //!< set the number of equations to 3
+
+/*!
+ * \brief Set the property for the material parameters by extracting
+ * it from the material law.
+ */
+SET_TYPE_PROP(ThreeP, MaterialLawParams, typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params);
+
+//! The local residual function of the conservation equations
+SET_TYPE_PROP(ThreeP, LocalResidual, ImmiscibleLocalResidual<TypeTag>);
+
+//! Enable advection
+SET_BOOL_PROP(ThreeP, EnableAdvection, true);
+
+//! disable molecular diffusion for the 3p model
+SET_BOOL_PROP(ThreeP, EnableMolecularDiffusion, false);
+
+//! Isothermal model by default
+SET_BOOL_PROP(ThreeP, EnableEnergyBalance, false);
+
+//! the VolumeVariables property
+SET_TYPE_PROP(ThreeP, VolumeVariables, ThreePVolumeVariables<TypeTag>);
+
+//! The indices required by the isothermal 3p model
+SET_TYPE_PROP(ThreeP, Indices, ThreePIndices<TypeTag,/*PVOffset=*/0>);
+
+//! The spatial parameters to be employed.
+//! Use ImplicitSpatialParams by default.
+SET_TYPE_PROP(ThreeP, SpatialParams, ImplicitSpatialParams<TypeTag>);
+
+SET_PROP(ThreeP, FluidState)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+public:
+ typedef ImmiscibleFluidState<Scalar, FluidSystem> type;
+};
+
+//! Set the vtk output fields specific to the ThreeP model
+SET_TYPE_PROP(ThreeP, VtkOutputFields, ThreePVtkOutputFields<TypeTag>);
+
+
+/////////////////////////////////////////////////
+// Properties for the non-isothermal 3p model
+/////////////////////////////////////////////////
+
+//! Somerton is used as default model to compute the effective thermal heat conductivity
+SET_PROP(ThreePNI, ThermalConductivityModel)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+public:
+ typedef ThermalConductivitySomerton<Scalar, Indices> type;
+};
//////////////////////////////////////////////////////////////////
-// Property tags
+// Property values for isothermal model required for the general non-isothermal model
//////////////////////////////////////////////////////////////////
-NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system
-NEW_PROP_TAG(NumComponents); //!< Number of components in the system
-NEW_PROP_TAG(Indices); //!< Enumerations for the model
-NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
-NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
-NEW_PROP_TAG(FluidState); //!< the phases' state
+//set isothermal VolumeVariables
+SET_TYPE_PROP(ThreePNI, IsothermalVolumeVariables, ThreePVolumeVariables<TypeTag>);
+
+//set isothermal LocalResidual
+SET_TYPE_PROP(ThreePNI, IsothermalLocalResidual, ImmiscibleLocalResidual<TypeTag>);
+
+//set isothermal output fields
+SET_TYPE_PROP(ThreePNI, IsothermalVtkOutputFields, ThreePVtkOutputFields<TypeTag>);
+
+//set isothermal Indices
+SET_TYPE_PROP(ThreePNI, IsothermalIndices, ThreePIndices<TypeTag,/*PVOffset=*/0>);
-NEW_PROP_TAG(MaterialLaw); //!< The material law which ought to be used (extracted from the spatial parameters)
-NEW_PROP_TAG(MaterialLawParams); //!< The parameters of the material law (extracted from the spatial parameters)
+//set isothermal NumEq
+SET_INT_PROP(ThreePNI, IsothermalNumEq, 3);
+} // end namespace Properties
-NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
-}
-}
+} // end namespace Dumux
#endif
diff --git a/dumux/porousmediumflow/3p/implicit/propertydefaults.hh b/dumux/porousmediumflow/3p/implicit/propertydefaults.hh
deleted file mode 100644
index e524fe4142e307452b0cecfa2e327b1c2c7ae007..0000000000000000000000000000000000000000
--- a/dumux/porousmediumflow/3p/implicit/propertydefaults.hh
+++ /dev/null
@@ -1,166 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \ingroup ThreePModel
- */
-/*!
- * \file
- *
- * \brief Defines default values for most properties required by the
- * three-phase fully implicit model.
- */
-#ifndef DUMUX_3P_PROPERTY_DEFAULTS_HH
-#define DUMUX_3P_PROPERTY_DEFAULTS_HH
-
-#include "indices.hh"
-
-#include "model.hh"
-#include "indices.hh"
-#include "volumevariables.hh"
-#include "properties.hh"
-
-#include <dumux/porousmediumflow/immiscible/localresidual.hh>
-#include <dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh>
-#include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
-#include <dumux/material/spatialparams/implicit.hh>
-#include <dumux/material/fluidstates/immiscible.hh>
-#include <dumux/porousmediumflow/implicit/darcyfluxvariables.hh>
-#include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh>
-
-
-namespace Dumux
-{
-
-namespace Properties {
-//////////////////////////////////////////////////////////////////
-// Property values
-//////////////////////////////////////////////////////////////////
-
-/*!
- * \brief Set the property for the number of fluid phases.
- *
- * We just forward the number from the fluid system and use an static
- * assert to make sure it is 2.
- */
-SET_PROP(ThreeP, NumPhases)
-{
- private:
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- public:
- static const int value = FluidSystem::numPhases;
- static_assert(value == 3,
- "Only fluid systems with 3 phases are supported by the 3p model!");
-};
-
-SET_PROP(ThreeP, NumComponents)
-{
- private:
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- public:
- static const int value = FluidSystem::numComponents;
- static_assert(value == 3,
- "Only fluid systems with 3 components are supported by the 3p model!");
-};
-
-SET_INT_PROP(ThreeP, NumEq, 3); //!< set the number of equations to 2
-
-/*!
- * \brief Set the property for the material parameters by extracting
- * it from the material law.
- */
-SET_TYPE_PROP(ThreeP, MaterialLawParams, typename GET_PROP_TYPE(TypeTag, MaterialLaw)::Params);
-
-//! The local residual function of the conservation equations
-SET_TYPE_PROP(ThreeP, LocalResidual, ImmiscibleLocalResidual<TypeTag>);
-
-//! Enable advection
-SET_BOOL_PROP(ThreeP, EnableAdvection, true);
-
-//! disable molecular diffusion for the 3p model
-SET_BOOL_PROP(ThreeP, EnableMolecularDiffusion, false);
-
-//! Isothermal model by default
-SET_BOOL_PROP(ThreeP, EnableEnergyBalance, false);
-
-//! the Model property
-SET_TYPE_PROP(ThreeP, Model, ThreePModel<TypeTag>);
-
-//! the VolumeVariables property
-SET_TYPE_PROP(ThreeP, VolumeVariables, ThreePVolumeVariables<TypeTag>);
-
-//! The indices required by the isothermal 3p model
-SET_TYPE_PROP(ThreeP, Indices, ThreePIndices<TypeTag,/*PVOffset=*/0>);
-
-//! The spatial parameters to be employed.
-//! Use ImplicitSpatialParams by default.
-SET_TYPE_PROP(ThreeP, SpatialParams, ImplicitSpatialParams<TypeTag>);
-
-SET_PROP(ThreeP, FluidState)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-public:
- typedef ImmiscibleFluidState<Scalar, FluidSystem> type;
-};
-
-// disable velocity output by default
-
-// enable gravity by default
-SET_BOOL_PROP(ThreeP, ProblemEnableGravity, true);
-
-//! Somerton is used as default model to compute the effective thermal heat conductivity
-SET_PROP(ThreePNI, ThermalConductivityModel)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-public:
- typedef ThermalConductivitySomerton<Scalar, Indices> type;
-};
-
-//! temperature is already written by the isothermal model
-SET_BOOL_PROP(ThreePNI, NiOutputLevel, 0);
-
-//////////////////////////////////////////////////////////////////
-// Property values for isothermal model required for the general non-isothermal model
-//////////////////////////////////////////////////////////////////
-
-// set isothermal Model
-SET_TYPE_PROP(ThreePNI, IsothermalModel, ThreePModel<TypeTag>);
-
-//set isothermal VolumeVariables
-SET_TYPE_PROP(ThreePNI, IsothermalVolumeVariables, ThreePVolumeVariables<TypeTag>);
-
-//set isothermal LocalResidual
-SET_TYPE_PROP(ThreePNI, IsothermalLocalResidual, ImmiscibleLocalResidual<TypeTag>);
-
-//set isothermal Indices
-SET_TYPE_PROP(ThreePNI, IsothermalIndices, ThreePIndices<TypeTag,/*PVOffset=*/0>);
-
-//set isothermal NumEq
-SET_INT_PROP(ThreePNI, IsothermalNumEq, 3);
-
-}
-
-}
-
-#endif
diff --git a/dumux/porousmediumflow/3p/implicit/volumevariables.hh b/dumux/porousmediumflow/3p/implicit/volumevariables.hh
index 758b74e1ddb9d08d52a9ccd0ad32dc6581731643..0d65c7e7e34213a94901a43e827eddb1cc3daa27 100644
--- a/dumux/porousmediumflow/3p/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/3p/implicit/volumevariables.hh
@@ -25,10 +25,10 @@
#ifndef DUMUX_3P_VOLUME_VARIABLES_HH
#define DUMUX_3P_VOLUME_VARIABLES_HH
-#include <dumux/implicit/model.hh>
#include <dumux/material/constants.hh>
#include <dumux/material/fluidstates/immiscible.hh>
#include <dumux/discretization/volumevariables.hh>
+#include <dumux/discretization/methods.hh>
#include "properties.hh"
namespace Dumux
@@ -75,7 +75,7 @@ class ThreePVolumeVariables : public ImplicitVolumeVariables<TypeTag>
static const Scalar R; // universal gas constant
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
+ enum { isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box };
enum { dofCodim = isBox ? dim : 0 };
public:
diff --git a/dumux/porousmediumflow/3p/implicit/vtkoutputfields.hh b/dumux/porousmediumflow/3p/implicit/vtkoutputfields.hh
new file mode 100644
index 0000000000000000000000000000000000000000..3a93d766014f1004ebb62c63f6d39639d7db321f
--- /dev/null
+++ b/dumux/porousmediumflow/3p/implicit/vtkoutputfields.hh
@@ -0,0 +1,61 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Adds vtk output fields specific to the twop model
+ */
+#ifndef DUMUX_THREEP_VTK_OUTPUT_FIELDS_HH
+#define DUMUX_THREEP_VTK_OUTPUT_FIELDS_HH
+
+#include <dumux/common/properties.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup ThreeP, InputOutput
+ * \brief Adds vtk output fields specific to the twop model
+ */
+template<class TypeTag>
+class ThreePVtkOutputFields
+{
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+public:
+ template <class VtkOutputModule>
+ static void init(VtkOutputModule& vtk)
+ {
+ // register standardized vtk output fields
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.saturation(Indices::wPhaseIdx); }, "sw");
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.saturation(Indices::nPhaseIdx); },"sn");
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.saturation(Indices::gPhaseIdx); },"sg");
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.pressure(Indices::wPhaseIdx); },"pw");
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.pressure(Indices::nPhaseIdx); },"pn");
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.pressure(Indices::gPhaseIdx); },"pg");
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.density(Indices::wPhaseIdx); },"rhow");
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.density(Indices::nPhaseIdx); },"rhon");
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.density(Indices::gPhaseIdx); },"rhog");
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.porosity(); },"porosity");
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.permeability(); },"permeability");
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/porousmediumflow/3p3c/implicit/properties.hh b/dumux/porousmediumflow/3p3c/implicit/properties.hh
index 84dc9e7986d675f02a753d1ef0a27abd322b573b..3ffcc2e23636f500ad991613ee37cb88b9a3b906 100644
--- a/dumux/porousmediumflow/3p3c/implicit/properties.hh
+++ b/dumux/porousmediumflow/3p3c/implicit/properties.hh
@@ -30,52 +30,23 @@
#ifndef DUMUX_3P3C_PROPERTIES_HH
#define DUMUX_3P3C_PROPERTIES_HH
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/common/basicproperties.hh>
+#include <dumux/linear/linearsolverproperties.hh>
+#include <dumux/porousmediumflow/properties.hh>
#include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
-
namespace Dumux
{
namespace Properties
{
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
-
//! The type tags for the implicit three-phase three-component problems
-NEW_TYPE_TAG(ThreePThreeC);
-NEW_TYPE_TAG(BoxThreePThreeC, INHERITS_FROM(BoxModel, ThreePThreeC));
-NEW_TYPE_TAG(CCThreePThreeC, INHERITS_FROM(CCModel, ThreePThreeC));
+NEW_TYPE_TAG(ThreePThreeC, INHERITS_FROM(PorousMediumFlow, NumericModel, LinearSolverTypeTag));
//! The type tags for the corresponding non-isothermal problems
NEW_TYPE_TAG(ThreePThreeCNI, INHERITS_FROM(ThreePThreeC, NonIsothermal));
-NEW_TYPE_TAG(BoxThreePThreeCNI, INHERITS_FROM(BoxModel, ThreePThreeCNI));
-NEW_TYPE_TAG(CCThreePThreeCNI, INHERITS_FROM(CCModel, ThreePThreeCNI));
-
-//////////////////////////////////////////////////////////////////
-// Property tags
-//////////////////////////////////////////////////////////////////
-
-NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system
-NEW_PROP_TAG(NumComponents); //!< Number of fluid components in the system
-NEW_PROP_TAG(Indices); //!< Enumerations for the model
-NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
-NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
-NEW_PROP_TAG(FluidState); //!< Type of the fluid state to be used
-
-NEW_PROP_TAG(MaterialLaw); //!< The material law which ought to be used (extracted from the spatial parameters)
-NEW_PROP_TAG(MaterialLawParams); //!< The parameters of the material law (extracted from the spatial parameters)
-NEW_PROP_TAG(EffectiveDiffusivityModel); //!< The employed model for the computation of the effective diffusivity
-NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-NEW_PROP_TAG(UseConstraintSolver); //!< Determines whether a constraint solver should be used explicitly
-NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
-NEW_PROP_TAG(TauTortuosity); //!< Tortuosity value (tau) used in macroscopic diffusion
-NEW_PROP_TAG(UseMoles);//!< Defines whether mole (true) or mass (false) fractions are used
-NEW_PROP_TAG(ReplaceCompEqIdx); //!< The index of the total mass balance equation, if one component balance is replaced (ReplaceCompEqIdx < NumComponents)
-}
-}
+} // end namespace Properties
+} // end namespace Dumux
#endif
diff --git a/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh b/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh
index a1ff05ff0ea6efff7926c68a741c350253748bb4..0c8137cb8622de630b7355196703bdda459d3a86 100644
--- a/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/3p3c/implicit/propertydefaults.hh
@@ -158,9 +158,6 @@ SET_PROP(ThreePThreeC, EffectiveDiffusivityModel)
// disable velocity output by default
-// enable gravity by default
-SET_BOOL_PROP(ThreePThreeC, ProblemEnableGravity, true);
-
//! default value for the forchheimer coefficient
// Source: Ward, J.C. 1964 Turbulent flow in porous media. ASCE J. Hydraul. Div 90.
// Actually the Forchheimer coefficient is also a function of the dimensions of the
diff --git a/dumux/porousmediumflow/compositional/localresidual.hh b/dumux/porousmediumflow/compositional/localresidual.hh
index efc771caf9b4da1555e0eaeb46cf52b9d6bebaa6..90613b92b8ef89c5537694bb94095bf4642321c1 100644
--- a/dumux/porousmediumflow/compositional/localresidual.hh
+++ b/dumux/porousmediumflow/compositional/localresidual.hh
@@ -46,9 +46,11 @@ class CompositionalLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidua
using ParentType = typename GET_PROP_TYPE(TypeTag, BaseLocalResidual);
using Implementation = typename GET_PROP_TYPE(TypeTag, LocalResidual);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using ElementFluxVariablesCache = typename GET_PROP_TYPE(TypeTag, ElementFluxVariablesCache);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
@@ -73,6 +75,7 @@ class CompositionalLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidua
static constexpr bool useTotalMoleOrMassBalance = replaceCompEqIdx < numComponents;
public:
+ using ParentType::ParentType;
/*!
* \brief Evaluate the amount of all conservation quantities
@@ -85,10 +88,11 @@ public:
* \param scvIdx The SCV (sub-control-volume) index
* \param usePrevSol Evaluate function with solution of current or previous time step
*/
- PrimaryVariables computeStorage(const SubControlVolume& scv,
- const VolumeVariables& volVars) const
+ ResidualVector computeStorage(const Problem& problem,
+ const SubControlVolume& scv,
+ const VolumeVariables& volVars) const
{
- PrimaryVariables storage(0.0);
+ ResidualVector storage(0.0);
const auto massOrMoleDensity = [](const auto& volVars, const int phaseIdx)
{ return useMoles ? volVars.molarDensity(phaseIdx) : volVars.density(phaseIdx); };
@@ -134,16 +138,17 @@ public:
* \param onBoundary A boolean variable to specify whether the flux variables
* are calculated for interior SCV faces or boundary faces, default=false
*/
- PrimaryVariables computeFlux(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf,
- const ElementFluxVariablesCache& elemFluxVarsCache) const
+ ResidualVector computeFlux(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf,
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
FluxVariables fluxVars;
- fluxVars.init(this->problem(), element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
+ fluxVars.init(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
// get upwind weights into local scope
- PrimaryVariables flux(0.0);
+ ResidualVector flux(0.0);
const auto massOrMoleDensity = [](const auto& volVars, const int phaseIdx)
{ return useMoles ? volVars.molarDensity(phaseIdx) : volVars.density(phaseIdx); };
diff --git a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
index 0d4d67bf09c2e517b543ecb5929af33d4afa4baf..106f0c66f25522943b428aa3c16938aa7e7e9ced 100644
--- a/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
+++ b/dumux/porousmediumflow/compositional/primaryvariableswitch.hh
@@ -64,16 +64,26 @@ class PrimaryVariableSwitch
using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimensionworld>;
using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ using GridVolumeVariables = typename GET_PROP_TYPE(TypeTag, GlobalVolumeVariables);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+
+ using Element = typename GridView::template Codim<0>::Entity;
+
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ enum { dim = GridView::dimension };
public:
- void init(Problem& problem)
+ PrimaryVariableSwitch(const std::size_t& numDofs)
{
- wasSwitched_.resize(problem.model().numDofs(), false);
+ wasSwitched_.resize(numDofs, false);
}
//! If the primary variables were recently switched
@@ -87,23 +97,23 @@ public:
* \param problem The problem
* \param curSol The current solution to be updated / modified
*/
- template<class T = TypeTag>
- typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), bool>::type
- update(Problem& problem, SolutionVector& curSol)
+ bool update(SolutionVector& curSol,
+ GridVariables& gridVariables,
+ const Problem& problem,
+ const FVGridGeometry& fvGridGeometry)
{
bool switched = false;
visited_.assign(wasSwitched_.size(), false);
- for (const auto& element : elements(problem.gridView()))
+ for (const auto& element : elements(fvGridGeometry.gridView()))
{
// make sure FVElementGeometry is bound to the element
- auto fvGeometry = localView(problem.model().fvGridGeometry());
+ auto fvGeometry = localView(fvGridGeometry);
fvGeometry.bindElement(element);
- auto elemVolVars = localView(problem.model().curGlobalVolVars());
+ auto elemVolVars = localView(gridVariables.curGridVolVars());
elemVolVars.bindElement(element, fvGeometry, curSol);
- auto curElemSol = problem.model().elementSolution(element, curSol);
-
+ const ElementSolution curElemSol(element, curSol, fvGridGeometry);
for (auto&& scv : scvs(fvGeometry))
{
auto dofIdxGlobal = scv.dofIndex();
@@ -112,9 +122,9 @@ public:
// Note this implies that volume variables don't differ
// in any sub control volume associated with the dof!
visited_[dofIdxGlobal] = true;
- // Compute temporary volVars on which grounds we decide
+ // Compute volVars on which grounds we decide
// if we need to switch the primary variables
- auto&& volVars = elemVolVars[scv];
+ auto& volVars = getVolVarAccess(gridVariables.curGridVolVars(), elemVolVars, scv);
volVars.update(curElemSol, problem, element, scv);
if (asImp_().update_(curSol[dofIdxGlobal], volVars, dofIdxGlobal, scv.dofPosition()))
@@ -126,55 +136,8 @@ public:
// make sure that if there was a variable switch in an
// other partition we will also set the switch flag for our partition.
- if (problem.gridView().comm().size() > 1)
- switched = problem.gridView().comm().max(switched);
-
- return switched;
- }
-
- template<class T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), bool>::type
- update(Problem& problem, SolutionVector& curSol)
- {
- bool switched = false;
- visited_.assign(wasSwitched_.size(), false);
- for (const auto& element : elements(problem.gridView()))
- {
- // make sure FVElementGeometry is bound to the element
- auto fvGeometry = localView(problem.model().fvGridGeometry());
- fvGeometry.bindElement(element);
-
- const auto eIdx = problem.elementMapper().index(element);
-
- auto curElemSol = problem.model().elementSolution(element, curSol);
-
- auto& curGlobalVolVars = problem.model().nonConstCurGlobalVolVars();
-
- for (auto&& scv : scvs(fvGeometry))
- {
- // Update volVars on which grounds we decide
- // if we need to switch the primary variables
- auto&& volVars = curGlobalVolVars.volVars(eIdx, scv.indexInElement());
- volVars.update(curElemSol, problem, element, scv);
-
- auto dofIdxGlobal = scv.dofIndex();
-
- if (!visited_[dofIdxGlobal])
- {
- // Note this implies that volume variables don't differ
- // in any sub control volume associated with the dof!
- visited_[dofIdxGlobal] = true;
-
- if (asImp_().update_(curSol[dofIdxGlobal], volVars, dofIdxGlobal, scv.dofPosition()))
- switched = true;
- }
- }
- }
-
- // make sure that if there was a variable switch in an
- // other partition we will also set the switch flag for our partition.
- if (problem.gridView().comm().size() > 1)
- switched = problem.gridView().comm().max(switched);
+ if (fvGridGeometry.gridView().comm().size() > 1)
+ switched = fvGridGeometry.gridView().comm().max(switched);
return switched;
}
@@ -202,6 +165,17 @@ protected:
std::vector<bool> wasSwitched_;
std::vector<bool> visited_;
+
+private:
+ template<class T = TypeTag>
+ static typename std::enable_if<!GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return elemVolVars[scv]; }
+
+ template<class T = TypeTag>
+ static typename std::enable_if<GET_PROP_VALUE(T, EnableGlobalVolumeVariablesCache), VolumeVariables&>::type
+ getVolVarAccess(GridVolumeVariables& gridVolVars, ElementVolumeVariables& elemVolVars, const SubControlVolume& scv)
+ { return gridVolVars.volVars(scv); }
};
} // end namespace dumux
diff --git a/dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh b/dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh
new file mode 100644
index 0000000000000000000000000000000000000000..76cb7d9a2688469f1a4334cfff9a293b1ab41431
--- /dev/null
+++ b/dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh
@@ -0,0 +1,199 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Reference implementation of a controller class for the Newton solver.
+ *
+ * Usually this controller should be sufficient.
+ */
+#ifndef DUMUX_PRIVARSWITCH_NEWTON_CONTROLLER_HH
+#define DUMUX_PRIVARSWITCH_NEWTON_CONTROLLER_HH
+
+#include <memory>
+#include <dune/common/hybridutilities.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup Newton
+ * \brief A newton controller that handles primary variable switches
+ */
+template <class TypeTag>
+class PriVarSwitchNewtonController : public NewtonController<TypeTag>
+{
+ using ParentType = NewtonController<TypeTag>;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Communicator = typename GridView::CollectiveCommunication;
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using PrimaryVariableSwitch = typename GET_PROP_TYPE(TypeTag, PrimaryVariableSwitch);
+ using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+
+ static constexpr int numEq = GET_PROP_VALUE(TypeTag, NumEq);
+
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+
+public:
+ /*!
+ * \brief Constructor for stationary problems
+ */
+ PriVarSwitchNewtonController(const Communicator& comm)
+ : ParentType(comm)
+ , switchedInLastIteration_(false)
+ {}
+
+ /*!
+ * \brief Constructor for stationary problems
+ */
+ PriVarSwitchNewtonController(const Communicator& comm, std::shared_ptr<TimeLoop<Scalar>> timeLoop)
+ : ParentType(comm, timeLoop)
+ , switchedInLastIteration_(false)
+ {}
+
+ /*!
+ * \brief Returns true if the error of the solution is below the
+ * tolerance.
+ */
+ bool newtonConverged() const
+ {
+ if (switchedInLastIteration_)
+ return false;
+
+ return ParentType::newtonConverged();
+ }
+
+ /*!
+ * \brief Called before the Newton method is applied to an
+ * non-linear system of equations.
+ *
+ * \param u The initial solution
+ */
+ template<class SolutionVector>
+ void newtonBegin(const SolutionVector &u)
+ {
+ ParentType::newtonBegin(u);
+ priVarSwitch_ = std::make_unique<PrimaryVariableSwitch>(u.size());
+ }
+
+ /*!
+ * \brief Indicates that one Newton iteration was finished.
+ *
+ * \param assembler The jacobian assembler
+ * \param uCurrentIter The solution after the current Newton iteration
+ * \param uLastIter The solution at the beginning of the current Newton iteration
+ */
+ template<class JacobianAssembler, class SolutionVector>
+ void newtonEndStep(JacobianAssembler& assembler,
+ SolutionVector &uCurrentIter,
+ const SolutionVector &uLastIter)
+ {
+ ParentType::newtonEndStep(assembler, uCurrentIter, uLastIter);
+
+ // update the variable switch (returns true if the pri vars at at least one dof were switched)
+ // for disabled grid variable caching
+ const auto& fvGridGeometry = assembler.fvGridGeometry();
+ const auto& problem = assembler.problem();
+ auto& gridVariables = assembler.gridVariables();
+
+ switchedInLastIteration_ = priVarSwitch_->update(uCurrentIter, gridVariables,
+ problem, fvGridGeometry);
+
+ Dune::Hybrid::ifElse(std::integral_constant<bool, GET_PROP_VALUE(TypeTag, EnableGlobalVolumeVariablesCache)>(),
+ [&](auto IF) {
+
+ std::cout << "blub";
+
+ // update the secondary variables if global caching is enabled
+ // \note we only updated if phase presence changed as the volume variables
+ // are already updated once by the switch
+ for (const auto& element : elements(fvGridGeometry.gridView()))
+ {
+ // make sure FVElementGeometry & vol vars are bound to the element
+ auto fvGeometry = localView(fvGridGeometry);
+ fvGeometry.bindElement(element);
+
+ if (switchedInLastIteration_)
+ {
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ const auto dofIdxGlobal = scv.dofIndex();
+ if (priVarSwitch_->wasSwitched(dofIdxGlobal))
+ {
+ const auto eIdx = fvGridGeometry.elementMapper().index(element);
+ const ElementSolution elemSol(element, this->curSol(), fvGridGeometry);
+ this->nonConstCurGlobalVolVars().volVars(eIdx, scv.indexInElement()).update(elemSol,
+ problem,
+ element,
+ scv);
+ }
+ }
+ }
+
+ // handle the boundary volume variables for cell-centered models
+ if(!isBox)
+ {
+ for (auto&& scvf : scvfs(fvGeometry))
+ {
+ // if we are not on a boundary, skip the rest
+ if (!scvf.boundary())
+ continue;
+
+ // check if boundary is a pure dirichlet boundary
+ const auto bcTypes = problem.boundaryTypes(element, scvf);
+ if (bcTypes.hasOnlyDirichlet())
+ {
+ const auto insideScvIdx = scvf.insideScvIdx();
+ const auto& insideScv = fvGeometry.scv(insideScvIdx);
+ const ElementSolution elemSol(problem.dirichlet(element, scvf));
+
+ this->nonConstCurGlobalVolVars().volVars(scvf.outsideScvIdx(), 0/*indexInElement*/).update(elemSol, problem, element, insideScv);
+ }
+ }
+ }
+ }
+ });
+ }
+
+ /*!
+ * \brief Called if the Newton method ended
+ * (not known yet if we failed or succeeded)
+ */
+ void newtonEnd()
+ {
+ ParentType::newtonEnd();
+
+ // in any way, we have to reset the switch flag
+ switchedInLastIteration_ = false;
+ // free some memory
+ priVarSwitch_.release();
+ }
+
+private:
+
+ //! the class handling the primary variable switch
+ std::unique_ptr<PrimaryVariableSwitch> priVarSwitch_;
+ //! if we switched primary variables in the last iteration
+ bool switchedInLastIteration_;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/porousmediumflow/immiscible/localresidual.hh b/dumux/porousmediumflow/immiscible/localresidual.hh
index c8f4361b3d4dba4d9de8804dc9fdc4676a6cd444..a2c295e7603524eb0a19dc193ba686038448d066 100644
--- a/dumux/porousmediumflow/immiscible/localresidual.hh
+++ b/dumux/porousmediumflow/immiscible/localresidual.hh
@@ -19,7 +19,7 @@
/*!
* \file
*
- * \brief Element-wise calculation of the Jacobian matrix for problems
+ * \brief Element-wise calculation of the residual for problems
* using the n-phase immiscible fully implicit models.
*/
#ifndef DUMUX_IMMISCIBLE_LOCAL_RESIDUAL_HH
@@ -30,17 +30,17 @@ namespace Dumux
/*!
* \ingroup OnePModel
* \ingroup ImplicitLocalResidual
- * \brief Element-wise calculation of the Jacobian matrix for problems
+ * \brief Element-wise calculation of the residual for problems
* using the n-phase immiscible fully implicit models.
*/
template<class TypeTag>
class ImmiscibleLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
{
- typedef typename GET_PROP_TYPE(TypeTag, LocalResidual) Implementation;
-
using ParentType = typename GET_PROP_TYPE(TypeTag, BaseLocalResidual);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
@@ -58,6 +58,7 @@ class ImmiscibleLocalResidual : public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
static const int numPhases = GET_PROP_VALUE(TypeTag, NumPhases);
public:
+ using ParentType::ParentType;
/*!
* \brief Evaluate the rate of change of all conservation
@@ -69,11 +70,12 @@ public:
* \note The volVars can be different to allow computing
* the implicit euler time derivative here
*/
- PrimaryVariables computeStorage(const SubControlVolume& scv,
- const VolumeVariables& volVars) const
+ ResidualVector computeStorage(const Problem& problem,
+ const SubControlVolume& scv,
+ const VolumeVariables& volVars) const
{
// partial time derivative of the phase mass
- PrimaryVariables storage;
+ ResidualVector storage;
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
{
auto eqIdx = conti0EqIdx + phaseIdx;
@@ -96,16 +98,17 @@ public:
* \brief Evaluate the mass flux over a face of a sub control volume
* \param scvf The sub control volume face to compute the flux on
*/
- PrimaryVariables computeFlux(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf,
- const ElementFluxVariablesCache& elemFluxVarsCache) const
+ ResidualVector computeFlux(const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf,
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
FluxVariables fluxVars;
- fluxVars.init(this->problem(), element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
+ fluxVars.init(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
- PrimaryVariables flux;
+ ResidualVector flux;
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
{
// the physical quantities for which we perform upwinding
@@ -124,15 +127,8 @@ public:
return flux;
}
-
-private:
- Implementation *asImp_()
- { return static_cast<Implementation *> (this); }
-
- const Implementation *asImp_() const
- { return static_cast<const Implementation *> (this); }
};
-}
+} // end namespace Dumux
#endif
diff --git a/dumux/porousmediumflow/implicit/fluxvariables.hh b/dumux/porousmediumflow/implicit/fluxvariables.hh
index 54b21d7941c4af98638d26a3e2ea89f51bc0f0bd..ea32e2db3b406382849a109c4571155eeab1b15d 100644
--- a/dumux/porousmediumflow/implicit/fluxvariables.hh
+++ b/dumux/porousmediumflow/implicit/fluxvariables.hh
@@ -23,7 +23,6 @@
#ifndef DUMUX_POROUSMEDIUMFLOW_IMPLICIT_FLUXVARIABLES_HH
#define DUMUX_POROUSMEDIUMFLOW_IMPLICIT_FLUXVARIABLES_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/fluxvariablesbase.hh>
#include <dumux/discretization/methods.hh>
diff --git a/dumux/porousmediumflow/implicit/fluxvariablescache.hh b/dumux/porousmediumflow/implicit/fluxvariablescache.hh
index d50b4a8ed87db713057593b2fb3c0d77af8543b7..cd568b12e09fd795907dcc8b6051c7fb9c20eaa0 100644
--- a/dumux/porousmediumflow/implicit/fluxvariablescache.hh
+++ b/dumux/porousmediumflow/implicit/fluxvariablescache.hh
@@ -23,9 +23,9 @@
#ifndef DUMUX_POROUSMEDIUM_IMPLICIT_FLUXVARIABLESCACHE_HH
#define DUMUX_POROUSMEDIUM_IMPLICIT_FLUXVARIABLESCACHE_HH
-#include <dumux/implicit/properties.hh>
#include <dune/localfunctions/lagrange/pqkfactory.hh>
#include <dumux/discretization/methods.hh>
+#include <dumux/discretization/fluxvariablescaching.hh>
namespace Dumux
{
@@ -37,8 +37,6 @@ namespace Properties
{
// forward declaration
NEW_PROP_TAG(NumPhases);
-NEW_PROP_TAG(InteriorBoundaryData);
-NEW_PROP_TAG(EnableInteriorBoundaries);
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -76,12 +74,14 @@ class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethod
using CoordScalar = typename GridView::ctype;
static const int dim = GridView::dimension;
+ static const int dimWorld = GridView::dimensionworld;
using FeCache = Dune::PQkLocalFiniteElementCache<CoordScalar, Scalar, dim, 1>;
using FeLocalBasis = typename FeCache::FiniteElementType::Traits::LocalBasisType;
using ShapeJacobian = typename FeLocalBasis::Traits::JacobianType;
using ShapeValue = typename Dune::FieldVector<Scalar, 1>;
using JacobianInverseTransposed = typename Element::Geometry::JacobianInverseTransposed;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
@@ -98,7 +98,13 @@ public:
const auto ipLocal = geometry.local(scvf.center());
jacInvT_ = geometry.jacobianInverseTransposed(ipLocal);
localBasis.evaluateJacobian(ipLocal, shapeJacobian_);
- localBasis.evaluateFunction(ipLocal, shapeValues_); // do we need the shapeValues for the flux?
+ localBasis.evaluateFunction(ipLocal, shapeValues_); // shape values for rho
+
+ // compute the gradN at for every scv/dof
+ gradN_.resize(fvGeometry.numScv());
+ for (const auto& scv: scvs(fvGeometry))
+ jacInvT_.mv(shapeJacobian_[scv.indexInElement()][0], gradN_[scv.indexInElement()]);
+
}
const std::vector<ShapeJacobian>& shapeJacobian() const
@@ -110,159 +116,66 @@ public:
const JacobianInverseTransposed& jacInvT() const
{ return jacInvT_; }
+ const GlobalPosition& gradN(unsigned int scvIdxInElement) const
+ { return gradN_[scvIdxInElement]; }
+
private:
+ std::vector<GlobalPosition> gradN_;
std::vector<ShapeJacobian> shapeJacobian_;
std::vector<ShapeValue> shapeValues_;
JacobianInverseTransposed jacInvT_;
};
-// forward declaration of the base class of the tpfa flux variables cache
-template<class TypeTag, bool EnableAdvection, bool EnableMolecularDiffusion, bool EnableEnergyBalance>
-class CCTpfaPorousMediumFluxVariablesCache : public GET_PROP_TYPE(TypeTag, AdvectionType)::Cache,
- public GET_PROP_TYPE(TypeTag, MolecularDiffusionType)::Cache,
- public GET_PROP_TYPE(TypeTag, HeatConductionType)::Cache {};
+// the following classes choose the cache type: empty if the law disabled and the law's cache if it's enabled
+// if advections is disabled the advection type is still instatiated if we use std::conditional_t and has to be a full type
+// in order to prevent that instead of std::conditional_t we use this helper type is only dependent on the advection type
+// if advection is enabled otherwise its an empty cache type
+template<class TypeTag, bool EnableAdvection> class AdvectionCacheChooser : public FluxVariablesCaching::EmptyAdvectionCache<TypeTag> {};
+template<class TypeTag> class AdvectionCacheChooser<TypeTag, true> : public GET_PROP_TYPE(TypeTag, AdvectionType)::Cache {};
+template<class TypeTag, bool EnableMolecularDiffusion> class DiffusionCacheChooser : public FluxVariablesCaching::EmptyDiffusionCache<TypeTag> {};
+template<class TypeTag> class DiffusionCacheChooser<TypeTag, true> : public GET_PROP_TYPE(TypeTag, MolecularDiffusionType)::Cache {};
+template<class TypeTag, bool EnableEnergyBalance> class EnergyCacheChooser : public FluxVariablesCaching::EmptyHeatConductionCache<TypeTag> {};
+template<class TypeTag> class EnergyCacheChooser<TypeTag, true> : public GET_PROP_TYPE(TypeTag, HeatConductionType)::Cache {};
+
// specialization for the cell centered tpfa method
template<class TypeTag>
class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethods::CCTpfa>
- : public CCTpfaPorousMediumFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableAdvection),
- GET_PROP_VALUE(TypeTag, EnableMolecularDiffusion),
- GET_PROP_VALUE(TypeTag, EnableEnergyBalance)> {};
-
-// // specialization for the case of pure advection
-// TODO ALL THESE SHOULDNOT BE NECESSARY AND ALWAYS DERIVE FROM ALL CACHES!
-template<class TypeTag>
-class CCTpfaPorousMediumFluxVariablesCache<TypeTag, true, false, false> : public GET_PROP_TYPE(TypeTag, AdvectionType)::Cache,
- public GET_PROP_TYPE(TypeTag, MolecularDiffusionType)::Cache {};
-
-// specialization for the case of advection & diffusion
-template<class TypeTag>
-class CCTpfaPorousMediumFluxVariablesCache<TypeTag, true, true, false> : public GET_PROP_TYPE(TypeTag, AdvectionType)::Cache,
- public GET_PROP_TYPE(TypeTag, MolecularDiffusionType)::Cache {};
-
-// specialization for the case of advection & heat conduction
-template<class TypeTag>
-class CCTpfaPorousMediumFluxVariablesCache<TypeTag, true, false, true> : public GET_PROP_TYPE(TypeTag, AdvectionType)::Cache,
- public GET_PROP_TYPE(TypeTag, MolecularDiffusionType)::Cache,
- public GET_PROP_TYPE(TypeTag, HeatConductionType)::Cache {};
+: public AdvectionCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableAdvection)>
+, public DiffusionCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableMolecularDiffusion)>
+, public EnergyCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>
+{};
-// specialization for the case of advection, diffusion & heat conduction
-template<class TypeTag>
-class CCTpfaPorousMediumFluxVariablesCache<TypeTag, true, true, true> : public GET_PROP_TYPE(TypeTag, AdvectionType)::Cache,
- public GET_PROP_TYPE(TypeTag, MolecularDiffusionType)::Cache,
- public GET_PROP_TYPE(TypeTag, HeatConductionType)::Cache {};
-
-// TODO further specializations
-
-// forward declaration of the base class of the mpfa flux variables cache
-template<class TypeTag, bool EnableAdvection, bool EnableMolecularDiffusion, bool EnableEnergyBalance>
-class CCMpfaPorousMediumFluxVariablesCache;
-
-// specialization of the flux variables cache for the cell centered finite volume mpfa scheme
+//! specialization of the flux variables cache for the cell centered finite volume mpfa scheme
+//! stores data which is commonly used by all the different types of processes
template<class TypeTag>
class PorousMediumFluxVariablesCacheImplementation<TypeTag, DiscretizationMethods::CCMpfa>
- : public CCMpfaPorousMediumFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableAdvection),
- GET_PROP_VALUE(TypeTag, EnableMolecularDiffusion),
- GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>
+: public AdvectionCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableAdvection)>
+, public DiffusionCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableMolecularDiffusion)>
+, public EnergyCacheChooser<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>
{
- using InteriorBoundaryData = typename GET_PROP_TYPE(TypeTag, InteriorBoundaryData);
- using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using ParentType = CCMpfaPorousMediumFluxVariablesCache<TypeTag, GET_PROP_VALUE(TypeTag, EnableAdvection),
- GET_PROP_VALUE(TypeTag, EnableMolecularDiffusion),
- GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>;
-
- static constexpr bool enableInteriorBoundaries = GET_PROP_VALUE(TypeTag, EnableInteriorBoundaries);
-
+ using GridIndexType = typename GET_PROP_TYPE(TypeTag, GridView)::IndexSet::IndexType;
public:
- //! the constructor
- PorousMediumFluxVariablesCacheImplementation()
- : ParentType(),
- isUpdated_(false),
- interiorBoundaryInfoSelf_(false, -1)
- {}
-
//! Returns whether or not this cache has been updated
- bool isUpdated() const
- { return isUpdated_; }
-
- //! Sets the update status from outside. This is used to only update
- //! the cache once after solving the local system. When visiting an scvf
- //! of the same interaction region again, the update is skipped.
- void setUpdateStatus(const bool status)
- {
- isUpdated_ = status;
- }
-
- //! maybe update data on interior Dirichlet boundaries
- template<class InteractionVolume>
- void updateInteriorBoundaryData(const InteractionVolume& iv, const SubControlVolumeFace &scvf)
- {
- if (enableInteriorBoundaries)
- {
- interiorBoundaryData_ = iv.interiorBoundaryData();
-
- // check if the actual scvf is on an interior Dirichlet boundary
- const auto scvfIdx = scvf.index();
- unsigned int indexInData = 0;
- for (auto&& data : interiorBoundaryData_)
- {
- if (data.scvfIndex() == scvfIdx)
- {
- interiorBoundaryInfoSelf_ = std::make_pair(true, indexInData);
- break;
- }
+ bool isUpdated() const { return isUpdated_; }
- indexInData++;
- }
- }
- }
+ //! Sets the update status. When set to true, consecutive updates will be skipped
+ void setUpdateStatus(bool status) { isUpdated_ = status; }
- bool isInteriorBoundary() const
- { return interiorBoundaryInfoSelf_.first; }
+ //! Sets the index of the iv (this scvf is embedded in) in its container
+ void setIvIndexInContainer(GridIndexType ivIndex) { ivIndexInContainer_ = ivIndex; }
- const std::vector<InteriorBoundaryData>& interiorBoundaryData() const
- { return interiorBoundaryData_; }
-
- const InteriorBoundaryData& interiorBoundaryDataSelf() const
- {
- assert(interiorBoundaryInfoSelf_.first && "Trying to obtain interior boundary data on a face that is not marked as such");
- assert(interiorBoundaryInfoSelf_.second != -1 && "The index to the interior boundary data of this face has not been set");
- return interiorBoundaryData_[interiorBoundaryInfoSelf_.second];
- }
+ //! Returns the index of the iv (this scvf is embedded in) in its container
+ GridIndexType ivIndexInContainer() const { return ivIndexInContainer_; }
private:
- // indicates whether or not this cache has been fully updated
- bool isUpdated_;
-
- // if this face is an interior Dirichlet boundary itself, store additional data
- std::pair<bool, unsigned int> interiorBoundaryInfoSelf_;
+ //! indicates if cache has been fully updated
+ bool isUpdated_ = false;
- // contains all the interior Dirichlet boundary data within the stencil of this face
- std::vector<InteriorBoundaryData> interiorBoundaryData_;
+ //! the index of the iv (this scvf is embedded in) in its container
+ GridIndexType ivIndexInContainer_;
};
-// specialization for the case of pure advection
-template<class TypeTag>
-class CCMpfaPorousMediumFluxVariablesCache<TypeTag, true, false, false> : public GET_PROP_TYPE(TypeTag, AdvectionType)::Cache {};
-
-// specialization for the case of advection & diffusion
-template<class TypeTag>
-class CCMpfaPorousMediumFluxVariablesCache<TypeTag, true, true, false> : public GET_PROP_TYPE(TypeTag, AdvectionType)::Cache,
- public GET_PROP_TYPE(TypeTag, MolecularDiffusionType)::Cache {};
-
-// specialization for the case of advection & heat conduction
-template<class TypeTag>
-class CCMpfaPorousMediumFluxVariablesCache<TypeTag, true, false, true> : public GET_PROP_TYPE(TypeTag, AdvectionType)::Cache,
- public GET_PROP_TYPE(TypeTag, HeatConductionType)::Cache {};
-
-// specialization for the case of advection, diffusion & heat conduction
-template<class TypeTag>
-class CCMpfaPorousMediumFluxVariablesCache<TypeTag, true, true, true> : public GET_PROP_TYPE(TypeTag, AdvectionType)::Cache,
- public GET_PROP_TYPE(TypeTag, MolecularDiffusionType)::Cache,
- public GET_PROP_TYPE(TypeTag, HeatConductionType)::Cache {};
-
-// TODO further specializations
-
-} // end namespace
+} // end namespace Dumux
#endif
diff --git a/dumux/porousmediumflow/implicit/problem.hh b/dumux/porousmediumflow/implicit/problem.hh
index 085ab189ce7d04a00334292646a22aec753a85b4..e7696e2617537ab87ba9927a13ae7a2a3b6c6269 100644
--- a/dumux/porousmediumflow/implicit/problem.hh
+++ b/dumux/porousmediumflow/implicit/problem.hh
@@ -23,16 +23,10 @@
#ifndef DUMUX_IMPLICIT_POROUS_MEDIA_PROBLEM_HH
#define DUMUX_IMPLICIT_POROUS_MEDIA_PROBLEM_HH
-#include <dumux/implicit/properties.hh>
#include <dumux/implicit/problem.hh>
namespace Dumux
{
-namespace Properties
-{
-NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters object
-NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
-}
/*!
* \ingroup ImplicitBaseProblems
@@ -61,8 +55,6 @@ class ImplicitPorousMediaProblem : public ImplicitProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
-
public:
/*!
* \brief The constructor
@@ -79,7 +71,7 @@ public:
{
spatialParams_ = std::make_shared<SpatialParams>(asImp_(), gridView);
- if (GET_PARAM_FROM_GROUP(TypeTag, bool, Problem, EnableGravity))
+ if (getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Problem.AddVelocity"))
gravity_[dimWorld-1] = -9.81;
}
diff --git a/dumux/porousmediumflow/implicit/velocityoutput.hh b/dumux/porousmediumflow/implicit/velocityoutput.hh
index 69d526dfa5f450c98a50a00e21ce3e9f3ec37b1c..c68528f7a2d696608e53fb73907a04345972ad71 100644
--- a/dumux/porousmediumflow/implicit/velocityoutput.hh
+++ b/dumux/porousmediumflow/implicit/velocityoutput.hh
@@ -28,17 +28,11 @@
#include <dune/istl/bvector.hh>
#include <dune/geometry/referenceelements.hh>
-#include <dumux/implicit/properties.hh>
#include <dumux/discretization/methods.hh>
namespace Dumux
{
-namespace Properties
-{
- NEW_PROP_TAG(VtkAddVelocity); //!< Returns whether velocity vectors are written into the vtk output
-}
-
/*!
* \brief Velocity output for implicit (porous media) models
*/
@@ -51,16 +45,22 @@ class ImplicitVelocityOutput
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
- using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using ElementSolution = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- static const bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+
static const int dim = GridView::dimension;
static const int dimWorld = GridView::dimensionworld;
+ static const bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
+ static const int dofCodim = isBox ? dim : 0;
+
using Vertex = typename GridView::template Codim<dim>::Entity;
using Element = typename GridView::template Codim<0>::Entity;
using IndexType = typename GridView::IndexSet::IndexType;
@@ -75,22 +75,29 @@ public:
*
* \param problem The problem to be solved
*/
- ImplicitVelocityOutput(const Problem& problem)
+ ImplicitVelocityOutput(const Problem& problem,
+ const FVGridGeometry& fvGridGeometry,
+ const GridVariables& gridVariables,
+ const SolutionVector& sol)
: problem_(problem)
+ , fvGridGeometry_(fvGridGeometry)
+ , gridVariables_(gridVariables)
+ , sol_(sol)
{
// check, if velocity output can be used (works only for cubes so far)
- velocityOutput_ = GET_PARAM_FROM_GROUP(TypeTag, bool, Vtk, AddVelocity);
+ const std::string modelParamGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ velocityOutput_ = getParamFromGroup<bool>(modelParamGroup, "Vtk.AddVelocity");
if (velocityOutput_)
{
// set the number of scvs the vertices are connected to
if (isBox && dim > 1)
{
// resize to the number of vertices of the grid
- cellNum_.assign(problem.gridView().size(dim), 0);
+ cellNum_.assign(fvGridGeometry.gridView().size(dim), 0);
- for (const auto& element : elements(problem.gridView()))
+ for (const auto& element : elements(fvGridGeometry.gridView()))
for (unsigned int vIdx = 0; vIdx < element.subEntities(dim); ++vIdx)
- ++cellNum_[problem.vertexMapper().subIndex(element, vIdx, dim)];
+ ++cellNum_[fvGridGeometry.vertexMapper().subIndex(element, vIdx, dim)];
}
}
}
@@ -113,13 +120,13 @@ public:
// following lines, that call will only be compiled if cell-centered
// actually is used.
template <class T = TypeTag>
- typename std::enable_if<!GET_PROP_VALUE(T, ImplicitIsBox), BoundaryTypes>::type
+ typename std::enable_if<GET_PROP_VALUE(T, DiscretizationMethod) != DiscretizationMethods::Box, BoundaryTypes>::type
problemBoundaryTypes(const Element& element, const SubControlVolumeFace& scvf) const
{ return problem_.boundaryTypes(element, scvf); }
//! we should never call this method for box models
template <class T = TypeTag>
- typename std::enable_if<GET_PROP_VALUE(T, ImplicitIsBox), BoundaryTypes>::type
+ typename std::enable_if<GET_PROP_VALUE(T, DiscretizationMethod) == DiscretizationMethods::Box, BoundaryTypes>::type
problemBoundaryTypes(const Element& element, const SubControlVolumeFace& scvf) const
{ return BoundaryTypes(); }
@@ -138,7 +145,7 @@ public:
const Dune::GeometryType geomType = geometry.type();
// bind the element flux variables cache
- auto elemFluxVarsCache = localView(problem_.model().globalFluxVarsCache());
+ auto elemFluxVarsCache = localView(gridVariables_.gridFluxVarsCache());
elemFluxVarsCache.bind(element, fvGeometry, elemVolVars);
// the upwind term to be used for the volume flux evaluation
@@ -165,10 +172,10 @@ public:
Scalar flux = fluxVars.advectiveFlux(phaseIdx, upwindTerm) / localArea;
flux /= problem_.extrusionFactor(element,
fvGeometry.scv(scvf.insideScvIdx()),
- problem_.model().elementSolution(element, problem_.model().curSol()));
+ ElementSolution(element, sol_, fvGridGeometry_));
tmpVelocity *= flux;
- const int eIdxGlobal = problem_.elementMapper().index(element);
+ const int eIdxGlobal = fvGridGeometry_.elementMapper().index(element);
velocity[eIdxGlobal] = tmpVelocity;
}
return;
@@ -250,7 +257,7 @@ public:
// find the local face indices of the scvfs (for conforming meshes)
std::vector<unsigned int> scvfIndexInInside(element.subEntities(1));
int localScvfIdx = 0;
- for (const auto& intersection : intersections(problem_.gridView(), element))
+ for (const auto& intersection : intersections(fvGridGeometry_.gridView(), element))
{
if (dim < dimWorld) if (handledScvf[intersection.indexInInside()]) continue;
@@ -273,7 +280,7 @@ public:
scvfFluxes[scvfIndexInInside[localScvfIdx]] = fluxVars.advectiveFlux(phaseIdx, upwindTerm);
scvfFluxes[scvfIndexInInside[localScvfIdx]] /= problem_.extrusionFactor(element,
fvGeometry.scv(scvf.insideScvIdx()),
- problem_.model().elementSolution(element, problem_.model().curSol()));
+ ElementSolution(element, sol_, fvGridGeometry_));
}
else
{
@@ -285,7 +292,7 @@ public:
scvfFluxes[scvfIndexInInside[localScvfIdx]] = fluxVars.advectiveFlux(phaseIdx, upwindTerm);
scvfFluxes[scvfIndexInInside[localScvfIdx]] /= problem_.extrusionFactor(element,
fvGeometry.scv(scvf.insideScvIdx()),
- problem_.model().elementSolution(element, problem_.model().curSol()));
+ ElementSolution(element, sol_, fvGridGeometry_));
}
}
@@ -351,7 +358,7 @@ public:
scvVelocity /= geometry.integrationElement(localPos);
- int eIdxGlobal = problem_.elementMapper().index(element);
+ int eIdxGlobal = fvGridGeometry_.elementMapper().index(element);
velocity[eIdxGlobal] = scvVelocity;
@@ -417,6 +424,10 @@ private:
private:
const Problem& problem_;
+ const FVGridGeometry& fvGridGeometry_;
+ const GridVariables& gridVariables_;
+ const SolutionVector& sol_;
+
bool velocityOutput_;
std::vector<int> cellNum_;
};
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/indices.hh b/dumux/porousmediumflow/nonisothermal/implicit/indices.hh
index 2bae7d621239f4452da8c319271eb8e0c8cd0c7e..42ebd4c8c38eb7f2a95b27c98dbf235da7bf5715 100644
--- a/dumux/porousmediumflow/nonisothermal/implicit/indices.hh
+++ b/dumux/porousmediumflow/nonisothermal/implicit/indices.hh
@@ -24,10 +24,9 @@
#ifndef DUMUX_ENERGY_INDICES_HH
#define DUMUX_ENERGY_INDICES_HH
-#include "properties.hh"
-
namespace Dumux
{
+
/*!
* \ingroup NIModel
* \ingroup ImplicitIndices
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh b/dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh
index 12c737ddc8f96551a590a458e9d8e9cef4031d90..7ff72f74799806662235f6dff4f50ba2be8f0594 100644
--- a/dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh
+++ b/dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh
@@ -25,8 +25,6 @@
#ifndef DUMUX_ENERGY_LOCAL_RESIDUAL_HH
#define DUMUX_ENERGY_LOCAL_RESIDUAL_HH
-#include <dumux/implicit/properties.hh>
-
namespace Dumux
{
@@ -52,33 +50,33 @@ template<class TypeTag>
class EnergyLocalResidualImplementation<TypeTag, false>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using RedidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
public:
//! The energy storage in the fluid phase with index phaseIdx
- static void fluidPhaseStorage(RedidualVector& storage,
+ static void fluidPhaseStorage(ResidualVector& storage,
const SubControlVolume& scv,
const VolumeVariables& volVars,
int phaseIdx)
{}
//! The energy storage in the solid matrix
- static void solidPhaseStorage(RedidualVector& storage,
+ static void solidPhaseStorage(ResidualVector& storage,
const SubControlVolume& scv,
const VolumeVariables& volVars)
{}
//! The advective phase energy fluxes
- static void heatConvectionFlux(RedidualVector& flux,
+ static void heatConvectionFlux(ResidualVector& flux,
FluxVariables& fluxVars,
int phaseIdx)
{}
//! The diffusive energy fluxes
- static void heatConductionFlux(RedidualVector& flux,
+ static void heatConductionFlux(ResidualVector& flux,
FluxVariables& fluxVars)
{}
};
@@ -87,7 +85,7 @@ template<class TypeTag>
class EnergyLocalResidualImplementation<TypeTag, true>
{
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- using RedidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using FluxVariables = typename GET_PROP_TYPE(TypeTag, FluxVariables);
@@ -98,7 +96,7 @@ class EnergyLocalResidualImplementation<TypeTag, true>
public:
//! The energy storage in the fluid phase with index phaseIdx
- static void fluidPhaseStorage(RedidualVector& storage,
+ static void fluidPhaseStorage(ResidualVector& storage,
const SubControlVolume& scv,
const VolumeVariables& volVars,
int phaseIdx)
@@ -110,7 +108,7 @@ public:
}
//! The energy storage in the solid matrix
- static void solidPhaseStorage(RedidualVector& storage,
+ static void solidPhaseStorage(ResidualVector& storage,
const SubControlVolume& scv,
const VolumeVariables& volVars)
{
@@ -121,7 +119,7 @@ public:
}
//! The advective phase energy fluxes
- static void heatConvectionFlux(RedidualVector& flux,
+ static void heatConvectionFlux(ResidualVector& flux,
FluxVariables& fluxVars,
int phaseIdx)
{
@@ -132,7 +130,7 @@ public:
}
//! The diffusive energy fluxes
- static void heatConductionFlux(RedidualVector& flux,
+ static void heatConductionFlux(ResidualVector& flux,
FluxVariables& fluxVars)
{
flux[energyEqIdx] += fluxVars.heatConductionFlux();
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/properties.hh b/dumux/porousmediumflow/nonisothermal/implicit/properties.hh
index 23dc38a2c5ee547475c7879fcce47b95a0cfe463..785ea26a9fdd2de5161b67c960d47a4f121e4cd0 100644
--- a/dumux/porousmediumflow/nonisothermal/implicit/properties.hh
+++ b/dumux/porousmediumflow/nonisothermal/implicit/properties.hh
@@ -29,42 +29,27 @@
#ifndef DUMUX_ENERGY_PROPERTIES_HH
#define DUMUX_ENERGY_PROPERTIES_HH
-#include <dumux/implicit/properties.hh>
+#include <dumux/common/properties.hh>
+#include "indices.hh"
+#include "vtkoutputfields.hh"
-namespace Dumux
-{
-// \{
-namespace Properties
-{
+namespace Dumux {
+namespace Properties {
-//////////////////////////////////////////////////////////////////
-// Type tags
-//////////////////////////////////////////////////////////////////
NEW_TYPE_TAG(NonIsothermal);
-//////////////////////////////////////////////////////////////////
-// Property tags required for the non-isothermal models
-//////////////////////////////////////////////////////////////////
+SET_BOOL_PROP(NonIsothermal, EnableEnergyBalance, true);
-//TODO cleanup
+//! add the energy balance
+SET_INT_PROP(NonIsothermal, NumEq, GET_PROP_VALUE(TypeTag, IsothermalNumEq) + 1);
-NEW_PROP_TAG(IsothermalModel);
-NEW_PROP_TAG(IsothermalFluxVariables);
-NEW_PROP_TAG(IsothermalVolumeVariables);
-NEW_PROP_TAG(IsothermalLocalResidual);
-NEW_PROP_TAG(IsothermalIndices);
-NEW_PROP_TAG(IsothermalNumEq);
-NEW_PROP_TAG(HaveVariableFormulation);
-NEW_PROP_TAG(ThermalConductivityModel);
-NEW_PROP_TAG(NiOutputLevel);
+//! indices for non-isothermal models
+SET_TYPE_PROP(NonIsothermal, Indices, EnergyIndices<TypeTag, 0>);
-// forward declaration of other property tags
-NEW_PROP_TAG(Indices);
-NEW_PROP_TAG(NumPhases);
-NEW_PROP_TAG(FluidSystem);
+//! indices for non-isothermal models
+SET_TYPE_PROP(NonIsothermal, VtkOutputFields, EnergyVtkOutputFields<TypeTag>);
-}
-// \}
-}
+} // end namespace Properties
+} // end namespace Dumux
#endif
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh b/dumux/porousmediumflow/nonisothermal/implicit/vtkoutputfields.hh
similarity index 65%
rename from dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh
rename to dumux/porousmediumflow/nonisothermal/implicit/vtkoutputfields.hh
index 8ddead6c481a53b9a9975c2b0aaa10e16af9ca4b..81320642598391d90c8f4cbe56b49b49857ed8d9 100644
--- a/dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/nonisothermal/implicit/vtkoutputfields.hh
@@ -17,38 +17,34 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
/*!
- * \ingroup Properties
- * \ingroup ImplicitProperties
- * \ingroup NIModel
* \file
- *
- * \brief Defines default values for most properties required by the
- * implicit non-isothermal models.
+ * \brief Adds vtk output fields specific to non-isothermal models
*/
-#ifndef DUMUX_ENERGY_PROPERTY_DEFAULTS_HH
-#define DUMUX_ENERGY_PROPERTY_DEFAULTS_HH
+#ifndef DUMUX_ENERGY_OUTPUT_FIELDS_HH
+#define DUMUX_ENERGY_OUTPUT_FIELDS_HH
-#include "indices.hh"
+#include <dumux/common/properties.hh>
namespace Dumux
{
-namespace Properties
+/*!
+ * \ingroup NonIsothermal, InputOutput
+ * \brief Adds vtk output fields specific to non-isothermal models
+ */
+template<class TypeTag>
+class EnergyVtkOutputFields
{
-
-//////////////////////////////////////////////////////////////////
-// Property values
-//////////////////////////////////////////////////////////////////
-
-SET_BOOL_PROP(NonIsothermal, EnableEnergyBalance, true);
-
-//! add the energy balance
-SET_INT_PROP(NonIsothermal, NumEq, GET_PROP_VALUE(TypeTag, IsothermalNumEq) + 1);
-
-//! indices for non-isothermal models
-SET_TYPE_PROP(NonIsothermal, Indices, EnergyIndices<TypeTag, 0>);
-
-} // end namespace Properties
+ using IsothermalVtkOutputFields = typename GET_PROP_TYPE(TypeTag, IsothermalVtkOutputFields);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+public:
+ template <class VtkOutputModule>
+ static void init(VtkOutputModule& vtk)
+ {
+ IsothermalVtkOutputFields::init(vtk);
+ vtk.addVolumeVariable( [](const VolumeVariables& v){ return v.temperature(); }, "temperature");
+ }
+};
} // end namespace Dumux
diff --git a/dumux/porousmediumflow/problem.hh b/dumux/porousmediumflow/problem.hh
new file mode 100644
index 0000000000000000000000000000000000000000..a0ab562956700905566dd16e9358ca83a86ad00d
--- /dev/null
+++ b/dumux/porousmediumflow/problem.hh
@@ -0,0 +1,141 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief Base class for all porous media problems
+ */
+#ifndef DUMUX_POROUS_MEDIUM_FLOW_PROBLEM_HH
+#define DUMUX_POROUS_MEDIUM_FLOW_PROBLEM_HH
+
+#include <dumux/common/fvproblem.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup ImplicitBaseProblems
+ * \brief Base class for all fully implicit porous media problems
+ * TODO: derive from base problem property?
+ */
+template<class TypeTag>
+class PorousMediumFlowProblem : public FVProblem<TypeTag>
+{
+ using ParentType = FVProblem<TypeTag>;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+
+ enum {
+ dim = GridView::dimension,
+ dimWorld = GridView::dimensionworld
+ };
+
+ using CoordScalar = typename GridView::ctype;
+ using GlobalPosition = Dune::FieldVector<CoordScalar, dimWorld>;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+public:
+ /*!
+ * \brief The constructor
+ *
+ * \param fvGridGeometry The finite volume grid geometry
+ */
+ PorousMediumFlowProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
+ , spatialParams_(std::make_shared<SpatialParams>(this->asImp_()))
+ {
+ // TODO: spatial params init?
+ const bool enableGravity = getParamFromGroup<bool>(GET_PROP_VALUE(TypeTag, ModelParameterGroup), "Problem.EnableGravity");
+ if (enableGravity)
+ gravity_[dimWorld-1] = -9.81;
+ }
+
+ /*!
+ * \name Physical parameters for porous media problems
+ */
+ // \{
+
+ /*!
+ * \brief Returns the temperature \f$\mathrm{[K]}\f$ at a given global position.
+ *
+ * This is not specific to the discretization. By default it just
+ * calls temperature().
+ *
+ * \param globalPos The position in global coordinates where the temperature should be specified.
+ */
+ Scalar temperatureAtPos(const GlobalPosition &globalPos) const
+ { return this->asImp_().temperature(); }
+
+ /*!
+ * \brief Returns the temperature \f$\mathrm{[K]}\f$ for an isothermal problem.
+ *
+ * This is not specific to the discretization. By default it just
+ * throws an exception so it must be overloaded by the problem if
+ * no energy equation is used.
+ */
+ Scalar temperature() const
+ {
+ DUNE_THROW(Dune::NotImplemented, "temperature() method not implemented by the user problem");
+ }
+
+ /*!
+ * \brief Returns the acceleration due to gravity \f$\mathrm{[m/s^2]}\f$.
+ *
+ * This is discretization independent interface. By default it
+ * just calls gravity().
+ */
+ const GlobalPosition &gravityAtPos(const GlobalPosition &pos) const
+ { return this->asImp_().gravity(); }
+
+ /*!
+ * \brief Returns the acceleration due to gravity \f$\mathrm{[m/s^2]}\f$.
+ *
+ * This method is used for problems where the gravitational
+ * acceleration does not depend on the spatial position. The
+ * default behaviour is that if the <tt>ProblemEnableGravity</tt>
+ * property is true, \f$\boldsymbol{g} = ( 0,\dots,\ -9.81)^T \f$ holds,
+ * else \f$\boldsymbol{g} = ( 0,\dots, 0)^T \f$.
+ */
+ const GlobalPosition &gravity() const
+ { return gravity_; }
+
+ /*!
+ * \brief Returns the spatial parameters object.
+ */
+ SpatialParams &spatialParams()
+ { return *spatialParams_; }
+
+ /*!
+ * \brief Returns the spatial parameters object.
+ */
+ const SpatialParams &spatialParams() const
+ { return *spatialParams_; }
+
+ // \}
+
+protected:
+ //! The gravity acceleration vector
+ GlobalPosition gravity_;
+
+ // material properties of the porous medium
+ std::shared_ptr<SpatialParams> spatialParams_;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/dumux/porousmediumflow/properties.hh b/dumux/porousmediumflow/properties.hh
new file mode 100644
index 0000000000000000000000000000000000000000..3ec36184ef0598979ad7b4544a3f98348efd8d66
--- /dev/null
+++ b/dumux/porousmediumflow/properties.hh
@@ -0,0 +1,83 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \ingroup Properties
+ * \file
+ *
+ * \brief Defines a type tag and some properties for models using the box scheme.
+ */
+
+#ifndef DUMUX_POROUSMEDIUM_FLOW_PROPERTIES_HH
+#define DUMUX_POROUSMEDIUM_FLOW_PROPERTIES_HH
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+#include <dumux/porousmediumflow/implicit/fluxvariables.hh>
+#include <dumux/porousmediumflow/implicit/fluxvariablescache.hh>
+#include <dumux/porousmediumflow/nonisothermal/implicit/localresidual.hh>
+#include <dumux/porousmediumflow/compositional/primaryvariableswitch.hh>
+#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
+
+#include <dumux/discretization/darcyslaw.hh>
+#include <dumux/discretization/fickslaw.hh>
+#include <dumux/discretization/fourierslaw.hh>
+
+namespace Dumux
+{
+namespace Properties
+{
+//! Type tag for models involving flow in porous media
+NEW_TYPE_TAG(PorousMediumFlow);
+
+//! The flux variables for models involving flow in porous media
+SET_TYPE_PROP(PorousMediumFlow, FluxVariables, PorousMediumFluxVariables<TypeTag>);
+
+//! The flux variables cache class for models involving flow in porous media
+SET_TYPE_PROP(PorousMediumFlow, FluxVariablesCache, PorousMediumFluxVariablesCache<TypeTag>);
+
+//! By default, we use darcy's law for the advective fluxes
+SET_TYPE_PROP(PorousMediumFlow, AdvectionType, DarcysLaw<TypeTag>);
+
+//! By default, we use fick's law for the diffusive fluxes
+SET_TYPE_PROP(PorousMediumFlow, MolecularDiffusionType, FicksLaw<TypeTag>);
+
+//! By default, we use fourier's law as the default for heat conduction fluxes
+SET_TYPE_PROP(PorousMediumFlow, HeatConductionType, FouriersLaw<TypeTag>);
+
+//! By default, parameters are solution-dependent
+SET_BOOL_PROP(PorousMediumFlow, SolutionDependentAdvection, true);
+SET_BOOL_PROP(PorousMediumFlow, SolutionDependentMolecularDiffusion, true);
+SET_BOOL_PROP(PorousMediumFlow, SolutionDependentHeatConduction, true);
+
+//! By default, we evaluate the permeability in the volume
+SET_BOOL_PROP(PorousMediumFlow, EvaluatePermeabilityAtScvfIP, false);
+
+//! The default implementation of the energy balance equation for flow problems in porous media.
+SET_TYPE_PROP(PorousMediumFlow, EnergyLocalResidual, EnergyLocalResidual<TypeTag> );
+
+//! Velocity output
+SET_TYPE_PROP(PorousMediumFlow, VelocityOutput, ImplicitVelocityOutput<TypeTag>);
+
+//! By default, we set an empty primary variables switch
+SET_TYPE_PROP(PorousMediumFlow, PrimaryVariableSwitch, NoPrimaryVariableSwitch<TypeTag>);
+
+} // namespace Properties
+} // namespace Dumux
+
+ #endif
diff --git a/dumux/porousmediumflow/richardsnc/implicit/properties.hh b/dumux/porousmediumflow/richardsnc/implicit/properties.hh
index 386bb184a65203a80cde087bacd68d6b514cfd43..7ba7505c9f41c40213e8e21f19d9d82d3897d8dd 100644
--- a/dumux/porousmediumflow/richardsnc/implicit/properties.hh
+++ b/dumux/porousmediumflow/richardsnc/implicit/properties.hh
@@ -29,9 +29,6 @@
#ifndef DUMUX_RICHARDSNC_PROPERTIES_HH
#define DUMUX_RICHARDSNC_PROPERTIES_HH
-
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
#include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
namespace Dumux
diff --git a/dumux/porousmediumflow/sequential/pressureproperties.hh b/dumux/porousmediumflow/sequential/pressureproperties.hh
index 668ed17b82bded003dcf8e9bea27ce2eb908a163..93d2ec778f199df6be522249e10c530d5ed1b1ae 100644
--- a/dumux/porousmediumflow/sequential/pressureproperties.hh
+++ b/dumux/porousmediumflow/sequential/pressureproperties.hh
@@ -99,15 +99,6 @@ SET_TYPE_PROP(Pressure, PressureSolutionVector, typename GET_PROP(TypeTag, Solut
// use the stabilized BiCG solver preconditioned by the ILU-0 by default
SET_TYPE_PROP(Pressure, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-//! set the default for the reduction of the initial residual
-SET_SCALAR_PROP(Pressure, LinearSolverResidualReduction, 1e-13);
-
-//! set the default number of maximum iterations for the linear solver
-SET_INT_PROP(Pressure, LinearSolverMaxIterations, 500);
-
-//! set the default number of maximum iterations for the linear solver
-SET_INT_PROP(Pressure, LinearSolverBlockSize, 1);
-
SET_TYPE_PROP( Pressure, Velocity, FVVelocityDefault<TypeTag>);
}
diff --git a/dumux/porousmediumflow/tracer/implicit/localresidual.hh b/dumux/porousmediumflow/tracer/implicit/localresidual.hh
index 6fa20ea6113893c3eca186d568e414c960f2b4b3..e0fe3b36b6140fb5db0689fff6abfffeffad3c2d 100644
--- a/dumux/porousmediumflow/tracer/implicit/localresidual.hh
+++ b/dumux/porousmediumflow/tracer/implicit/localresidual.hh
@@ -39,6 +39,7 @@ template<class TypeTag>
class TracerLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
{
using ParentType = typename GET_PROP_TYPE(TypeTag, BaseLocalResidual);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
@@ -59,6 +60,7 @@ class TracerLocalResidual: public GET_PROP_TYPE(TypeTag, BaseLocalResidual)
static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
public:
+ using ParentType::ParentType;
/*!
* \brief Evaluate the amount of all conservation quantities
@@ -71,7 +73,8 @@ public:
* \param volVars The primary and secondary varaibles on the scv
* \param useMoles If mole or mass fractions are used
*/
- PrimaryVariables computeStorage(const SubControlVolume& scv,
+ PrimaryVariables computeStorage(const Problem& problem,
+ const SubControlVolume& scv,
const VolumeVariables& volVars) const
{
PrimaryVariables storage(0.0);
@@ -107,18 +110,20 @@ public:
* \param elemFluxVarsCache The cache related to flux compuation
* \param useMoles If mole or mass fractions are used
*/
- PrimaryVariables computeFlux(const Element& element,
+ PrimaryVariables computeFlux(const Problem& problem,
+ const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolumeFace& scvf,
- const ElementFluxVariablesCache& elemFluxVarsCache)
+ const ElementFluxVariablesCache& elemFluxVarsCache) const
{
FluxVariables fluxVars;
- fluxVars.init(this->problem(), element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
+ fluxVars.init(problem, element, fvGeometry, elemVolVars, scvf, elemFluxVarsCache);
// get upwind weights into local scope
PrimaryVariables flux(0.0);
const auto diffusiveFluxes = fluxVars.molecularDiffusionFlux(0);
+
// formulation with mole balances
if (useMoles)
{
@@ -152,6 +157,163 @@ public:
return flux;
}
+
+ template<class PartialDerivativeMatrix>
+ void addStorageDerivatives(PartialDerivativeMatrix& partialDerivatives,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const VolumeVariables& curVolVars,
+ const SubControlVolume& scv) const
+ {
+ const auto porosity = curVolVars.porosity();
+ const auto rho = useMoles ? curVolVars.molarDensity() : curVolVars.density();
+ const auto d_storage = scv.volume()*porosity*rho/this->timeLoop().timeStepSize();
+
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
+ partialDerivatives[compIdx][compIdx] += d_storage;
+ }
+
+ template<class PartialDerivativeMatrix>
+ void addSourceDerivatives(PartialDerivativeMatrix& partialDerivatives,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const VolumeVariables& curVolVars,
+ const SubControlVolume& scv) const
+ {
+ // TODO maybe forward to the problem? -> necessary for reaction terms
+ }
+
+ template<class PartialDerivativeMatrices, class T = TypeTag>
+ std::enable_if_t<!GET_PROP_VALUE(T, ImplicitIsBox), void>
+ addFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ // advective term: we do the same for all tracer components
+ auto rho = [](const VolumeVariables& volVars)
+ { return useMoles ? volVars.molarDensity() : volVars.density(); };
+
+ // the volume flux
+ const auto volFlux = problem.spatialParams().volumeFlux(element, fvGeometry, curElemVolVars, scvf);
+
+ // the upwind weight
+ static const Scalar upwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
+
+ // get the inside and outside volvars
+ const auto& insideVolVars = curElemVolVars[scvf.insideScvIdx()];
+ const auto& outsideVolVars = curElemVolVars[scvf.outsideScvIdx()];
+
+ const auto insideWeight = std::signbit(volFlux) ? (1.0 - upwindWeight) : upwindWeight;
+ const auto outsideWeight = 1.0 - insideWeight;
+ const auto advDerivII = volFlux*rho(insideVolVars)*insideWeight;
+ const auto advDerivIJ = volFlux*rho(outsideVolVars)*outsideWeight;
+
+ // diffusive term
+ const auto& fluxCache = elemFluxVarsCache[scvf];
+ const auto rhoMolar = 0.5*(insideVolVars.molarDensity() + outsideVolVars.molarDensity());
+
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
+ {
+ // diffusive term
+ const auto diffDeriv = useMoles ? rhoMolar*fluxCache.diffusionTij(/*phaseIdx=*/0, compIdx)
+ : rhoMolar*fluxCache.diffusionTij(/*phaseIdx=*/0, compIdx)*FluidSystem::molarMass(compIdx);
+
+ derivativeMatrices[scvf.insideScvIdx()][compIdx][compIdx] += (advDerivII + diffDeriv);
+ derivativeMatrices[scvf.outsideScvIdx()][compIdx][compIdx] += (advDerivIJ - diffDeriv);
+ }
+ }
+
+ template<class JacobianMatrix, class T = TypeTag>
+ std::enable_if_t<GET_PROP_VALUE(T, ImplicitIsBox), void>
+ addFluxDerivatives(JacobianMatrix& A,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+
+ // advective term: we do the same for all tracer components
+ auto rho = [](const VolumeVariables& volVars)
+ { return useMoles ? volVars.molarDensity() : volVars.density(); };
+
+ // the volume flux
+ const auto volFlux = problem.spatialParams().volumeFlux(element, fvGeometry, curElemVolVars, scvf);
+
+ // the upwind weight
+ static const Scalar upwindWeight = GET_PARAM_FROM_GROUP(TypeTag, Scalar, Implicit, UpwindWeight);
+
+ // get the inside and outside volvars
+ const auto& insideVolVars = curElemVolVars[scvf.insideScvIdx()];
+ const auto& outsideVolVars = curElemVolVars[scvf.outsideScvIdx()];
+
+ const auto insideWeight = std::signbit(volFlux) ? (1.0 - upwindWeight) : upwindWeight;
+ const auto outsideWeight = 1.0 - insideWeight;
+ const auto advDerivII = volFlux*rho(insideVolVars)*insideWeight;
+ const auto advDerivIJ = volFlux*rho(outsideVolVars)*outsideWeight;
+
+ // diffusive term
+ using DiffusionType = typename GET_PROP_TYPE(T, MolecularDiffusionType);
+ const auto ti = DiffusionType::calculateTransmissibilities(problem,
+ element,
+ fvGeometry,
+ curElemVolVars,
+ scvf,
+ elemFluxVarsCache[scvf],
+ /*phaseIdx=*/0);
+ const auto& insideScv = fvGeometry.scv(scvf.insideScvIdx());
+ const auto& outsideScv = fvGeometry.scv(scvf.outsideScvIdx());
+
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
+ {
+ for (const auto& scv : scvs(fvGeometry))
+ {
+ // diffusive term
+ const auto diffDeriv = useMoles ? ti[compIdx][scv.indexInElement()]
+ : ti[compIdx][scv.indexInElement()]*FluidSystem::molarMass(compIdx);
+ A[insideScv.dofIndex()][scv.dofIndex()][compIdx][compIdx] += diffDeriv;
+ A[outsideScv.dofIndex()][scv.dofIndex()][compIdx][compIdx] -= diffDeriv;
+ }
+
+ A[insideScv.dofIndex()][insideScv.dofIndex()][compIdx][compIdx] += advDerivII;
+ A[insideScv.dofIndex()][outsideScv.dofIndex()][compIdx][compIdx] += advDerivIJ;
+ A[outsideScv.dofIndex()][outsideScv.dofIndex()][compIdx][compIdx] -= advDerivII;
+ A[outsideScv.dofIndex()][insideScv.dofIndex()][compIdx][compIdx] -= advDerivIJ;
+ }
+ }
+
+ template<class PartialDerivativeMatrices>
+ void addCCDirichletFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ // do the same as for inner facets
+ addFluxDerivatives(derivativeMatrices, problem, element, fvGeometry,
+ curElemVolVars, elemFluxVarsCache, scvf);
+ }
+
+ template<class PartialDerivativeMatrices>
+ void addRobinFluxDerivatives(PartialDerivativeMatrices& derivativeMatrices,
+ const Problem& problem,
+ const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& curElemVolVars,
+ const ElementFluxVariablesCache& elemFluxVarsCache,
+ const SubControlVolumeFace& scvf) const
+ {
+ // TODO maybe forward to the problem?
+ }
};
} // end namespace Dumux
diff --git a/dumux/porousmediumflow/tracer/implicit/properties.hh b/dumux/porousmediumflow/tracer/implicit/properties.hh
index 9bd1ae8f90a55b0cc71d97dfeb526b5bd50a6568..9f246a360f36d4f3e141bc5d751a3c8b4df2fedc 100644
--- a/dumux/porousmediumflow/tracer/implicit/properties.hh
+++ b/dumux/porousmediumflow/tracer/implicit/properties.hh
@@ -28,9 +28,6 @@
#ifndef DUMUX_TRACER_PROPERTIES_HH
#define DUMUX_TRACER_PROPERTIES_HH
-
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
#include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
namespace Dumux
diff --git a/dumux/porousmediumflow/tracer/implicit/propertydefaults.hh b/dumux/porousmediumflow/tracer/implicit/propertydefaults.hh
index c2565dbeaae2ba38573a6f79a570c2752acea592..2fea066bb887ba52706bc65b7c612a603292caf9 100644
--- a/dumux/porousmediumflow/tracer/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/tracer/implicit/propertydefaults.hh
@@ -33,6 +33,7 @@
#include "volumevariables.hh"
#include "indices.hh"
#include "localresidual.hh"
+#include "vtkoutputfields.hh"
#include <dumux/material/spatialparams/implicit1p.hh>
#include <dumux/discretization/stationaryvelocityfield.hh>
@@ -68,6 +69,9 @@ SET_TYPE_PROP(Tracer, LocalResidual, TracerLocalResidual<TypeTag>);
//! define the model
SET_TYPE_PROP(Tracer, Model, TracerModel<TypeTag>);
+//! Set the default vtk output fields
+SET_TYPE_PROP(Tracer, VtkOutputFields, TracerVtkOutputFields<TypeTag>);
+
//! define the VolumeVariables
SET_TYPE_PROP(Tracer, VolumeVariables, TracerVolumeVariables<TypeTag>);
@@ -79,6 +83,7 @@ SET_BOOL_PROP(Tracer, ProblemEnableGravity, false);
//! Set the indices used by the tracer model
SET_TYPE_PROP(Tracer, Indices, TracerIndices<TypeTag>);
+
//! The spatial parameters to be employed.
//! Use ImplicitSpatialParamsOneP by default.
SET_TYPE_PROP(Tracer, SpatialParams, ImplicitSpatialParamsOneP<TypeTag>);
diff --git a/dumux/porousmediumflow/nonisothermal/implicit/model.hh b/dumux/porousmediumflow/tracer/implicit/vtkoutputfields.hh
similarity index 55%
rename from dumux/porousmediumflow/nonisothermal/implicit/model.hh
rename to dumux/porousmediumflow/tracer/implicit/vtkoutputfields.hh
index 2e9262565ecd9353b25bc1f87b578ebb7e31e87f..208844f41047dc21b10b0be447615c2e34aeb9e8 100644
--- a/dumux/porousmediumflow/nonisothermal/implicit/model.hh
+++ b/dumux/porousmediumflow/tracer/implicit/vtkoutputfields.hh
@@ -18,49 +18,41 @@
*****************************************************************************/
/*!
* \file
- *
- * \brief TODO doc
+ * \brief Adds vtk output fields specific to the onep model
*/
+#ifndef DUMUX_TRACER_VTK_OUTPUT_FIELDS_HH
+#define DUMUX_TRACER_VTK_OUTPUT_FIELDS_HH
-#ifndef DUMUX_POROUSMEDIUMFLOW_NONISOTHERMAL_MODEL_HH
-#define DUMUX_POROUSMEDIUMFLOW_NONISOTHERMAL_MODEL_HH
-
-#include <dumux/porousmediumflow/nonisothermal/implicit/properties.hh>
+#include <dumux/implicit/properties.hh>
namespace Dumux
{
-//! declaration of the implementation
-template<class TypeTag, bool EnableEnergy>
-class NonIsothermalModelImplementation;
-
-template<class TypeTag>
-using NonIsothermalModel = NonIsothermalModelImplementation<TypeTag, GET_PROP_VALUE(TypeTag, EnableEnergyBalance)>;
-
-template<class TypeTag>
-class NonIsothermalModelImplementation<TypeTag, false>
-{
-public:
- template<class VtkOutputModule>
- static void maybeAddTemperature(VtkOutputModule& vtkOutputModule)
- {}
-};
+/*!
+ * \ingroup Tracer, InputOutput
+ * \brief Adds vtk output fields specific to the onep model
+ */
template<class TypeTag>
-class NonIsothermalModelImplementation<TypeTag, true>
+class TracerVtkOutputFields
{
- using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
-
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
public:
- template<class VtkOutputModule>
- static void maybeAddTemperature(VtkOutputModule& vtkOutputModule)
+ template <class VtkOutputModule>
+ static void init(VtkOutputModule& vtk)
{
- // register vtk output field for temperature
- vtkOutputModule.addPrimaryVariable("temperature", Indices::temperatureIdx);
+ // register standardized vtk output fields
+ for (int compIdx = 0; compIdx < FluidSystem::numComponents; ++compIdx)
+ {
+ vtk.addSecondaryVariable("x_" + std::string(FluidSystem::componentName(compIdx)),
+ [compIdx](const VolumeVariables& v){ return v.moleFraction(0, compIdx); });
+ vtk.addSecondaryVariable("X_" + std::string(FluidSystem::componentName(compIdx)),
+ [compIdx](const VolumeVariables& v){ return v.massFraction(0, compIdx); });
+ }
+ vtk.addSecondaryVariable("rho", [](const VolumeVariables& v){ return v.density(); });
}
};
} // end namespace Dumux
-#include <dumux/porousmediumflow/nonisothermal/implicit/propertydefaults.hh>
-
#endif
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index fd9350c01fa87ea13aa70fc72c2cc2438e62a926..25810628f4afa459e88ed327d6975529cd637588 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,9 +1,7 @@
add_subdirectory("common")
add_subdirectory("freeflow")
-add_subdirectory("geomechanics")
add_subdirectory("io")
add_subdirectory("material")
add_subdirectory("mixeddimension")
-add_subdirectory("multidomain")
add_subdirectory("porousmediumflow")
add_subdirectory("discretization")
diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt
index 1fed13a61f8032b1e507dbdebd35ad021245ff5e..c1ef7651ad8095218573c58f6ef335f499db0e9c 100644
--- a/test/common/CMakeLists.txt
+++ b/test/common/CMakeLists.txt
@@ -1,4 +1,5 @@
-add_subdirectory("generalproblem")
-add_subdirectory("propertysystem")
-add_subdirectory("spline")
-add_subdirectory("boundingboxtree")
+add_subdirectory(generalproblem)
+add_subdirectory(propertysystem)
+add_subdirectory(spline)
+add_subdirectory(boundingboxtree)
+add_subdirectory(parameters)
diff --git a/test/common/parameters/CMakeLists.txt b/test/common/parameters/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..45293e09ce14f2e7903a38ea26e52d09ce240d3b
--- /dev/null
+++ b/test/common/parameters/CMakeLists.txt
@@ -0,0 +1,2 @@
+dune_add_test(SOURCES test_loggingparametertree.cc)
+dune_symlink_to_source_files(FILES "params.input")
diff --git a/test/common/parameters/params.input b/test/common/parameters/params.input
new file mode 100644
index 0000000000000000000000000000000000000000..aec220127f90384a1646424d22fc7859d9c25a00
--- /dev/null
+++ b/test/common/parameters/params.input
@@ -0,0 +1,9 @@
+[TimeLoop]
+TEnd = 1e6
+
+[Bulk.TimeLoop]
+TEnd = 1e5
+
+[Grid]
+Cells = 100 100
+Bells = 10 10
diff --git a/test/common/parameters/test_loggingparametertree.cc b/test/common/parameters/test_loggingparametertree.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c16761d5989bc6f4443fc80fe055f8a2220c1e11
--- /dev/null
+++ b/test/common/parameters/test_loggingparametertree.cc
@@ -0,0 +1,77 @@
+#include <config.h>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/exceptions.hh>
+
+#include <dumux/common/parameters.hh>
+
+int main (int argc, char *argv[]) try
+{
+ using namespace Dumux;
+
+ // maybe initialize mpi
+ Dune::MPIHelper::instance(argc, argv);
+
+ // initialize parameter tree
+ Parameters::init(argc, argv, "params.input");
+
+ // use some default parameters
+ bool enableGravity = getParam<bool>("Problem.EnableGravity", false); // used user default
+ if (enableGravity) DUNE_THROW(Dune::InvalidStateException, "Gravity should be false!");
+
+ enableGravity = getParam<bool>("Problem.EnableGravity"); // uses the Dumux default value
+ if (!enableGravity) DUNE_THROW(Dune::InvalidStateException, "Gravity should be true!");
+
+ // use some given parameters
+ const auto DUNE_UNUSED(cells) = getParam<std::array<int, 2>>("Grid.Cells", std::array<int, 2>{{1, 1}});
+ if (cells[0] != 100 || cells[1] != 100) DUNE_THROW(Dune::InvalidStateException, "Cells should be 100 100!");
+
+ auto tEnd = getParam<double>("TimeLoop.TEnd");
+ if (tEnd != 1e6) DUNE_THROW(Dune::InvalidStateException, "TEnd should be 1e6!");
+
+ tEnd = getParam<double>("TimeLoop.TEnd", 1.0);
+ if (tEnd != 1e6) DUNE_THROW(Dune::InvalidStateException, "TEnd should be 1e6!");
+
+ tEnd = getParamFromGroup<double>("Bulk", "TimeLoop.TEnd", 1.0);
+ if (tEnd != 1e5) DUNE_THROW(Dune::InvalidStateException, "TEnd should be 1e5!");
+
+ tEnd = getParamFromGroup<double>("Bulk", "TimeLoop.TEnd");
+ if (tEnd != 1e5) DUNE_THROW(Dune::InvalidStateException, "TEnd should be 1e5!");
+
+ tEnd = getParamFromGroup<double>("Hulk", "TimeLoop.TEnd", 1.0);
+ if (tEnd != 1e6) DUNE_THROW(Dune::InvalidStateException, "TEnd should be 1e6!");
+
+ tEnd = getParamFromGroup<double>("Hulk", "TimeLoop.TEnd");
+ if (tEnd != 1e6) DUNE_THROW(Dune::InvalidStateException, "TEnd should be 1e6!");
+
+ Parameters::print();
+
+ // check the unused keys
+ const auto unused = Parameters::getTree().getUnusedKeys();
+ if (unused.size() != 1)
+ DUNE_THROW(Dune::InvalidStateException, "There should be exactly one unused key!");
+ else if (unused[0] != "Grid.Bells")
+ DUNE_THROW(Dune::InvalidStateException, "Unused key \"Grid.Bells\" not found!");
+
+ return 0;
+}
+// //////////////////////////////////
+// Error handler
+// /////////////////////////////////
+catch (const Dune::RangeError &e) {
+ std::cout << e << std::endl;
+ return 1;
+}
+catch (const Dune::Exception& e) {
+ std::cout << e << std::endl;
+ return 1;
+}
+catch (const std::exception& e) {
+ std::cout << e.what() << std::endl;
+ return 1;
+}
+catch (...) {
+ std::cout << "Unknown exception!" << std::endl;
+ return 1;
+}
diff --git a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc
index 349b045b476f4feb39cfa0b428306367b0dc1b3c..ca43301d6f6050ba6ff2be7a7ad35618024d1c25 100644
--- a/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc
+++ b/test/discretization/cellcentered/tpfa/test_tpfafvgeometry.cc
@@ -36,27 +36,6 @@
namespace Dumux
{
-template<class TypeTag>
-class MockProblem
-{
- using ElementMapper = typename GET_PROP_TYPE(TypeTag, DofMapper);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
-public:
- MockProblem(const GridView& gridView) : mapper_(gridView) {}
-
- const ElementMapper& elementMapper() const
- { return mapper_; }
-
- template<class Element, class Intersection>
- bool isInteriorBoundary(const Element& e, const Intersection& i) const
- { return false; }
-
- std::vector<unsigned int> getAdditionalDofDependencies(unsigned int index) const
- { return std::vector<unsigned int>(); }
-private:
- ElementMapper mapper_;
-};
-
namespace Properties
{
NEW_TYPE_TAG(TestFVGeometry, INHERITS_FROM(CCTpfaModel));
diff --git a/test/freeflow/staggered/CMakeLists.txt b/test/freeflow/staggered/CMakeLists.txt
index 09695bf8135793b06f86419ffac58d292a5a707b..e5afa382befaffb0b0451475ab09f3185bb52862 100644
--- a/test/freeflow/staggered/CMakeLists.txt
+++ b/test/freeflow/staggered/CMakeLists.txt
@@ -1,69 +1,81 @@
add_input_file_links()
-add_dumux_test(test_liddrivencavity test_closedsystem test_closedsystem.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/liddrivencavity-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_liddrivencavity-00002.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_closedsystem test_liddrivencavity.input")
+add_executable(test_stokes_closedsystem EXCLUDE_FROM_ALL test_closedsystem.cc)
-add_dumux_test(test_hydrostaticpressure test_closedsystem test_closedsystem.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokeshydrostaticpressure-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_hydrostaticpressure-00002.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_closedsystem test_hydrostaticpressure.input"
- --zeroThreshold {"velocity_Constant \(m/s\)":1e-16})
+dune_add_test(NAME test_stokes_liddrivencavity
+ TARGET test_stokes_closedsystem
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/liddrivencavity-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_liddrivencavity-00002.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes_closedsystem test_liddrivencavity.input")
-add_dumux_test(test_channel_stokes test_channel_stokes test_channel.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/channel-stokes.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokes-00002.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokes")
+dune_add_test(NAME test_stokes_hydrostaticpressure
+ TARGET test_stokes_closedsystem
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/stokeshydrostaticpressure-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_hydrostaticpressure-00002.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes_closedsystem test_hydrostaticpressure.input"
+ --zeroThreshold {"velocity_Constant \(m/s\)":1e-16})
-add_dumux_test(test_channel_stokesni_convection test_channel_stokesni test_channel.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokesni-convection-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni_convection-00006.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni test_channel_stokesni_convection.input")
+dune_add_test(NAME test_channel_stokes
+ SOURCES test_channel.cc
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/channel-stokes.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokes-00002.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokes")
+
+add_executable(test_channel_stokesni EXCLUDE_FROM_ALL test_channel.cc)
target_compile_definitions(test_channel_stokesni PUBLIC "NONISOTHERMAL=1")
-add_dumux_test(test_channel_stokesni_conduction test_channel_stokesni test_channel.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokesni-conduction-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni_conduction-00004.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni test_channel_stokesni_conduction.input"
- --zeroThreshold {"velocity_H2O \(m/s\)":1e-20})
+dune_add_test(NAME test_channel_stokesni_convection
+ TARGET test_channel_stokesni
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/stokesni-convection-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni_convection-00006.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni test_channel_stokesni_convection.input")
-add_dumux_test(test_channel_navierstokes test_channel_navierstokes test_channel.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/channel-navierstokes-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes-00002.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes")
-target_compile_definitions(test_channel_navierstokes PUBLIC "ENABLE_NAVIERSTOKES=1")
+dune_add_test(NAME test_channel_stokesni_conduction
+ TARGET test_channel_stokesni
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/stokesni-conduction-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni_conduction-00004.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_stokesni test_channel_stokesni_conduction.input"
+ --zeroThreshold {"velocity_H2O \(m/s\)":1e-20})
-add_dumux_test(test_donea test_donea test_donea.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes-donea-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_donea-00002.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_donea")
+dune_add_test(NAME test_channel_navierstokes
+ SOURCES test_channel.cc
+ COMPILE_DEFINITIONS ENABLE_NAVIERSTOKES=1
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/channel-navierstokes-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes-00002.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes")
-add_dumux_test(test_kovasznay test_kovasznay test_kovasznay.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/test_kovasznay-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_kovasznay-00002.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_kovasznay")
+dune_add_test(NAME test_stokes_donea
+ SOURCES test_donea.cc
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/stokes-donea-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_donea-00002.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes_donea")
-#install sources
-install(FILES
-channeltestproblem.hh
-test_channel.cc
-closedsystemtestproblem.hh
-test_closedsystem.cc
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/freeflow/staggered)
+dune_add_test(NAME test_navierstokes_kovasznay
+ SOURCES test_kovasznay.cc
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/test_kovasznay-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_kovasznay-00002.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_navierstokes_kovasznay")
diff --git a/test/freeflow/staggered/channeltestproblem.hh b/test/freeflow/staggered/channeltestproblem.hh
index bdb9399edc0cfe944dc1f5843d8c69011557a3cf..877eab5933b7516102fa529118945d5bba94e175 100644
--- a/test/freeflow/staggered/channeltestproblem.hh
+++ b/test/freeflow/staggered/channeltestproblem.hh
@@ -24,13 +24,15 @@
#ifndef DUMUX_CHANNEL_TEST_PROBLEM_HH
#define DUMUX_CHANNEL_TEST_PROBLEM_HH
-#include <dumux/implicit/staggered/properties.hh>
-#include <dumux/freeflow/staggered/model.hh>
-#include <dumux/implicit/problem.hh>
+#include <dumux/freeflow/staggered/problem.hh>
+#include <dumux/discretization/staggered/properties.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/constant.hh>
+#include <dumux/discretization/staggered/properties.hh>
+#include <dumux/freeflow/staggered/properties.hh>
+
namespace Dumux
{
template <class TypeTag>
@@ -59,7 +61,7 @@ public:
#if NONISOTHERMAL
using type = FluidSystems::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > ;
#else
- using type = FluidSystems::LiquidPhase<Scalar, Dumux::Constant<TypeTag, Scalar> > ;
+ using type = FluidSystems::LiquidPhase<Scalar, Dumux::Components::Constant<1, Scalar> > ;
#endif
};
@@ -74,8 +76,6 @@ SET_BOOL_PROP(ChannelTestProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(ChannelTestProblem, EnableGlobalFluxVariablesCache, true);
SET_BOOL_PROP(ChannelTestProblem, EnableGlobalVolumeVariablesCache, true);
-// Enable gravity
-SET_BOOL_PROP(ChannelTestProblem, ProblemEnableGravity, true);
#if ENABLE_NAVIERSTOKES
SET_BOOL_PROP(ChannelTestProblem, EnableInertiaTerms, true);
@@ -91,13 +91,14 @@ SET_BOOL_PROP(ChannelTestProblem, EnableInertiaTerms, false);
template <class TypeTag>
class ChannelTestProblem : public NavierStokesProblem<TypeTag>
{
- typedef NavierStokesProblem<TypeTag> ParentType;
+ using ParentType = NavierStokesProblem<TypeTag>;
+
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
// Grid and world dimension
dim = GridView::dimension,
@@ -118,11 +119,10 @@ class ChannelTestProblem : public NavierStokesProblem<TypeTag>
};
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
@@ -135,24 +135,13 @@ class ChannelTestProblem : public NavierStokesProblem<TypeTag>
using InitialValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
using SourceValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
+ using TimeLoopPtr = std::shared_ptr<CheckPointTimeLoop<Scalar>>;
+
public:
- ChannelTestProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView), eps_(1e-6)
+ ChannelTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry), eps_(1e-6)
{
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- std::string,
- Problem,
- Name);
-
- inletVelocity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- Scalar,
- Problem,
- InletVelocity);
-
-#if NONISOTHERMAL
- if(inletVelocity_ > eps_)
- this->timeManager().startNextEpisode(200.0);
-#endif
+ inletVelocity_ = getParam<Scalar>("Problem.InletVelocity");
}
/*!
@@ -160,26 +149,6 @@ public:
*/
// \{
- /*!
- * \brief The problem name.
- *
- * This is used as a prefix for files generated by the simulation.
- */
- std::string name() const
- {
- return name_;
- }
-
-#if NONISOTHERMAL
- void episodeEnd()
- {
- if(inletVelocity_ > eps_)
- {
- this->timeManager().startNextEpisode(50.0);
- this->timeManager().setTimeStepSize(10.0);
- }
- }
-#endif
bool shouldWriteRestartFile() const
{
@@ -255,10 +224,8 @@ public:
{
values[velocityXIdx] = inletVelocity_;
#if NONISOTHERMAL
- const Scalar time = this->timeManager().time() + this->timeManager().timeStepSize();
-
// give the system some time so that the pressure can equilibrate, then start the injection of the hot liquid
- if(time > 200.0)
+ if(time() >= 200.0)
values[temperatureIdx] = 293.15;
#endif
}
@@ -293,6 +260,17 @@ public:
}
// \}
+ void setTimeLoop(TimeLoopPtr timeLoop)
+ {
+ timeLoop_ = timeLoop;
+ if(inletVelocity_ > eps_)
+ timeLoop_->setCheckPoint({200.0, 210.0});
+ }
+
+ Scalar time() const
+ {
+ return timeLoop_->time();
+ }
private:
@@ -303,17 +281,17 @@ private:
bool isOutlet(const GlobalPosition& globalPos) const
{
- return globalPos[0] > this->bBoxMax()[0] - eps_;
+ return globalPos[0] > this->fvGridGeometry().bBoxMax()[0] - eps_;
}
bool isWall(const GlobalPosition& globalPos) const
{
- return globalPos[0] > eps_ || globalPos[0] < this->bBoxMax()[0] - eps_;
+ return globalPos[0] > eps_ || globalPos[0] < this->fvGridGeometry().bBoxMax()[0] - eps_;
}
Scalar eps_;
Scalar inletVelocity_;
- std::string name_;
+ TimeLoopPtr timeLoop_;
};
} //end namespace
diff --git a/test/freeflow/staggered/closedsystemtestproblem.hh b/test/freeflow/staggered/closedsystemtestproblem.hh
index 4c0adf6bf36bb22ec2dd39cfbd9d9c29408e50c2..1175196ebc0cb5d8ae5b81b4587125446fefe5a7 100644
--- a/test/freeflow/staggered/closedsystemtestproblem.hh
+++ b/test/freeflow/staggered/closedsystemtestproblem.hh
@@ -24,13 +24,15 @@
#ifndef DUMUX_CLOSEDSYSTEM_TEST_PROBLEM_HH
#define DUMUX_CLOSEDSYSTEM_TEST_PROBLEM_HH
-#include <dumux/implicit/staggered/properties.hh>
-#include <dumux/freeflow/staggered/model.hh>
-#include <dumux/implicit/problem.hh>
+#include <dumux/freeflow/staggered/problem.hh>
+#include <dumux/discretization/staggered/properties.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/constant.hh>
+#include <dumux/discretization/staggered/properties.hh>
+#include <dumux/freeflow/staggered/properties.hh>
+
namespace Dumux
{
template <class TypeTag>
@@ -52,7 +54,7 @@ SET_PROP(ClosedSystemTestProblem, Fluid)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef FluidSystems::LiquidPhase<Scalar, Dumux::Constant<TypeTag, Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Dumux::Components::Constant<1, Scalar> > type;
};
// Set the grid type
@@ -66,9 +68,6 @@ SET_BOOL_PROP(ClosedSystemTestProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(ClosedSystemTestProblem, EnableGlobalFluxVariablesCache, true);
SET_BOOL_PROP(ClosedSystemTestProblem, EnableGlobalVolumeVariablesCache, true);
-
-// Enable gravity
-SET_BOOL_PROP(ClosedSystemTestProblem, ProblemEnableGravity, true);
}
/*!
@@ -78,13 +77,13 @@ SET_BOOL_PROP(ClosedSystemTestProblem, ProblemEnableGravity, true);
template <class TypeTag>
class ClosedSystemTestProblem : public NavierStokesProblem<TypeTag>
{
- typedef NavierStokesProblem<TypeTag> ParentType;
+ using ParentType = NavierStokesProblem<TypeTag>;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
// Grid and world dimension
dim = GridView::dimension,
@@ -100,17 +99,16 @@ class ClosedSystemTestProblem : public NavierStokesProblem<TypeTag>
velocityYIdx = Indices::velocityYIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Intersection = typename GridView::Intersection;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
@@ -118,27 +116,21 @@ class ClosedSystemTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
using InitialValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
using SourceValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
public:
- ClosedSystemTestProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView), eps_(1e-6)
+ ClosedSystemTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry), eps_(1e-6)
{
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- std::string,
- Problem,
- Name);
-
- lidVelocity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- Scalar,
- Problem,
- LidVelocity);
+ lidVelocity_ = getParam<Scalar>("Problem.LidVelocity");
using CellArray = std::array<unsigned int, dimWorld>;
- const CellArray numCells = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- CellArray,
- Grid,
- Cells);
- cellSizeX_ = this->bBoxMax()[0] / numCells[0];
+ const CellArray numCells = getParam<CellArray>("Grid.Cells");
+ cellSizeX_ = this->fvGridGeometry().bBoxMax()[0] / numCells[0];
}
/*!
@@ -146,15 +138,6 @@ public:
*/
// \{
- /*!
- * \brief The problem name.
- *
- * This is used as a prefix for files generated by the simulation.
- */
- std::string name() const
- {
- return name_;
- }
bool shouldWriteRestartFile() const
{
@@ -220,7 +203,7 @@ public:
values[velocityXIdx] = 0.0;
values[velocityYIdx] = 0.0;
- if(globalPos[1] > this->bBoxMax()[1] - eps_)
+ if(globalPos[1] > this->fvGridGeometry().bBoxMax()[1] - eps_)
values[velocityXIdx] = lidVelocity_;
return values;
@@ -253,7 +236,6 @@ private:
Scalar eps_;
Scalar lidVelocity_;
- std::string name_;
Scalar cellSizeX_;
};
} //end namespace
diff --git a/test/freeflow/staggered/doneatestproblem.hh b/test/freeflow/staggered/doneatestproblem.hh
index ba22ea2b507d174444be45c8317a629f537f1e55..cef435bc64d08b537c7c60f48f9270b6f7e858ec 100644
--- a/test/freeflow/staggered/doneatestproblem.hh
+++ b/test/freeflow/staggered/doneatestproblem.hh
@@ -26,13 +26,15 @@
#ifndef DUMUX_DONEA_TEST_PROBLEM_HH
#define DUMUX_DONEA_TEST_PROBLEM_HH
-#include <dumux/implicit/staggered/properties.hh>
-#include <dumux/freeflow/staggered/model.hh>
-#include <dumux/implicit/problem.hh>
+#include <dumux/freeflow/staggered/problem.hh>
+#include <dumux/discretization/staggered/properties.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/constant.hh>
+#include <dumux/discretization/staggered/properties.hh>
+#include <dumux/freeflow/staggered/properties.hh>
+
namespace Dumux
{
@@ -55,7 +57,7 @@ SET_PROP(DoneaTestProblem, Fluid)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef FluidSystems::LiquidPhase<Scalar, Dumux::Constant<TypeTag, Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Dumux::Components::Constant<1, Scalar> > type;
};
// Set the grid type
@@ -69,9 +71,6 @@ SET_BOOL_PROP(DoneaTestProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(DoneaTestProblem, EnableGlobalFluxVariablesCache, true);
SET_BOOL_PROP(DoneaTestProblem, EnableGlobalVolumeVariablesCache, true);
-// Enable gravity
-SET_BOOL_PROP(DoneaTestProblem, ProblemEnableGravity, true);
-
#if ENABLE_NAVIERSTOKES
SET_BOOL_PROP(DoneaTestProblem, EnableInertiaTerms, true);
#else
@@ -87,13 +86,13 @@ SET_BOOL_PROP(DoneaTestProblem, EnableInertiaTerms, false);
template <class TypeTag>
class DoneaTestProblem : public NavierStokesProblem<TypeTag>
{
- typedef NavierStokesProblem<TypeTag> ParentType;
+ using ParentType = NavierStokesProblem<TypeTag>;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
// Grid and world dimension
dim = GridView::dimension,
@@ -109,16 +108,16 @@ class DoneaTestProblem : public NavierStokesProblem<TypeTag>
velocityYIdx = Indices::velocityYIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Intersection = typename GridView::Intersection;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
@@ -126,24 +125,21 @@ class DoneaTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
using InitialValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
using SourceValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
typename DofTypeIndices::CellCenterIdx cellCenterIdx;
typename DofTypeIndices::FaceIdx faceIdx;
public:
- DoneaTestProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView), eps_(1e-6)
+ DoneaTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry), eps_(1e-6)
{
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- std::string,
- Problem,
- Name);
-
- printL2Error_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- bool,
- Problem,
- PrintL2Error);
+ name_ = getParam<std::string>("Problem.Name");
+
+ printL2Error_ = getParam<bool>("Problem.PrintL2Error");
+
+ createAnalyticalSolution_();
}
/*!
@@ -166,13 +162,13 @@ public:
return false;
}
- void postTimeStep() const
+ void postTimeStep(const SolutionVector& curSol) const
{
if(printL2Error_)
{
- const auto l2error = calculateL2Error();
- const int numCellCenterDofs = this->model().numCellCenterDofs();
- const int numFaceDofs = this->model().numFaceDofs();
+ const auto l2error = calculateL2Error(curSol);
+ const int numCellCenterDofs = this->fvGridGeometry().gridView().size(0);
+ const int numFaceDofs = this->fvGridGeometry().gridView().size(1);
std::cout << std::setprecision(8) << "** L2 error (abs/rel) for "
<< std::setw(6) << numCellCenterDofs << " cc dofs and " << numFaceDofs << " face dofs (total: " << numCellCenterDofs + numFaceDofs << "): "
<< std::scientific
@@ -285,56 +281,15 @@ public:
return values;
}
- /*!
- * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
- */
- template<class VtkOutputModule>
- void addVtkOutputFields(VtkOutputModule& outputModule) const
- {
- auto& pressureExact = outputModule.createScalarField("pressureExact", 0);
- auto& velocityExact = outputModule.createVectorField("velocityExact", 0);
-
- auto& scalarFaceVelocityExact = outputModule.createFaceScalarField("scalarFaceVelocityExact");
- auto& vectorFaceVelocityExact = outputModule.createFaceVectorField("vectorFaceVelocityExact");
-
- for (const auto& element : elements(this->gridView()))
- {
- auto fvGeometry = localView(this->model().fvGridGeometry());
- fvGeometry.bindElement(element);
- for (auto&& scv : scvs(fvGeometry))
- {
- auto ccDofIdx = scv.dofIndex();
- auto ccDofPosition = scv.dofPosition();
- auto analyticalSolutionAtCc = analyticalSolution(ccDofPosition);
-
- GlobalPosition velocityVector(0.0);
- for (auto&& scvf : scvfs(fvGeometry))
- {
- auto faceDofIdx = scvf.dofIndex();
- auto faceDofPosition = scvf.center();
- auto dirIdx = scvf.directionIndex();
- auto analyticalSolutionAtFace = analyticalSolution(faceDofPosition);
- scalarFaceVelocityExact[faceDofIdx] = analyticalSolutionAtFace[faceIdx][dirIdx];
-
- GlobalPosition tmp(0.0);
- tmp[dirIdx] = analyticalSolutionAtFace[faceIdx][dirIdx];
- vectorFaceVelocityExact[faceDofIdx] = std::move(tmp);
- }
- pressureExact[ccDofIdx] = analyticalSolutionAtCc[pressureIdx];
- velocityExact[ccDofIdx] = analyticalSolutionAtCc[faceIdx];
- }
- }
- }
-
/*!
* \brief Calculate the L2 error between the analytical solution and the numerical approximation.
*
*/
- auto calculateL2Error() const
+ auto calculateL2Error(const SolutionVector& curSol) const
{
BoundaryValues sumError(0.0), sumReference(0.0), l2NormAbs(0.0), l2NormRel(0.0);
- const int numFaceDofs = this->model().numFaceDofs();
+ const int numFaceDofs = this->fvGridGeometry().gridView().size(1);
std::vector<Scalar> staggeredVolume(numFaceDofs);
std::vector<Scalar> errorVelocity(numFaceDofs);
@@ -343,9 +298,9 @@ public:
Scalar totalVolume = 0.0;
- for (const auto& element : elements(this->gridView()))
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
{
- auto fvGeometry = localView(this->model().fvGridGeometry());
+ auto fvGeometry = localView(this->fvGridGeometry());
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
@@ -354,7 +309,7 @@ public:
const auto dofIdxCellCenter = scv.dofIndex();
const auto& posCellCenter = scv.dofPosition();
const auto analyticalSolutionCellCenter = analyticalSolution(posCellCenter)[cellCenterIdx];
- const auto numericalSolutionCellCenter = this->model().curSol()[cellCenterIdx][dofIdxCellCenter];
+ const auto numericalSolutionCellCenter = curSol[cellCenterIdx][dofIdxCellCenter];
sumError[cellCenterIdx] += squaredDiff_(analyticalSolutionCellCenter, numericalSolutionCellCenter) * scv.volume();
sumReference[cellCenterIdx] += analyticalSolutionCellCenter * analyticalSolutionCellCenter * scv.volume();
totalVolume += scv.volume();
@@ -365,7 +320,7 @@ public:
const int dofIdxFace = scvf.dofIndex();
const int dirIdx = scvf.directionIndex();
const auto analyticalSolutionFace = analyticalSolution(scvf.center())[faceIdx][dirIdx];
- const auto numericalSolutionFace = this->model().curSol()[faceIdx][dofIdxFace][momentumBalanceIdx];
+ const auto numericalSolutionFace = curSol[faceIdx][dofIdxFace][momentumBalanceIdx];
directionIndex[dofIdxFace] = dirIdx;
errorVelocity[dofIdxFace] = squaredDiff_(analyticalSolutionFace, numericalSolutionFace);
velocityReference[dofIdxFace] = squaredDiff_(analyticalSolutionFace, 0.0);
@@ -398,8 +353,67 @@ public:
return std::make_pair(l2NormAbs, l2NormRel);
}
+ /*!
+ * \brief Returns the analytical solution for the pressure
+ */
+ auto& getAnalyticalPressureSolution() const
+ {
+ return analyticalPressure_;
+ }
+
+ /*!
+ * \brief Returns the analytical solution for the velocity
+ */
+ auto& getAnalyticalVelocitySolution() const
+ {
+ return analyticalVelocity_;
+ }
+
+ /*!
+ * \brief Returns the analytical solution for the velocity at the faces
+ */
+ auto& getAnalyticalVelocitySolutionOnFace() const
+ {
+ return analyticalVelocityOnFace_;
+ }
private:
+
+ /*!
+ * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
+ */
+ void createAnalyticalSolution_()
+ {
+ analyticalPressure_.resize(this->fvGridGeometry().numCellCenterDofs());
+ analyticalVelocity_.resize(this->fvGridGeometry().numCellCenterDofs());
+ analyticalVelocityOnFace_.resize(this->fvGridGeometry().numFaceDofs());
+
+
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
+ {
+ auto fvGeometry = localView(this->fvGridGeometry());
+ fvGeometry.bindElement(element);
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ auto ccDofIdx = scv.dofIndex();
+ auto ccDofPosition = scv.dofPosition();
+ auto analyticalSolutionAtCc = analyticalSolution(ccDofPosition);
+
+ // velocities on faces
+ for (auto&& scvf : scvfs(fvGeometry))
+ {
+ const auto faceDofIdx = scvf.dofIndex();
+ const auto faceDofPosition = scvf.center();
+ const auto dirIdx = scvf.directionIndex();
+ const auto analyticalSolutionAtFace = analyticalSolution(faceDofPosition);
+ analyticalVelocityOnFace_[faceDofIdx][dirIdx] = analyticalSolutionAtFace[faceIdx][dirIdx];
+ }
+
+ analyticalPressure_[ccDofIdx] = analyticalSolutionAtCc[pressureIdx];
+ analyticalVelocity_[ccDofIdx] = analyticalSolutionAtCc[faceIdx];
+ }
+ }
+ }
template<class T>
T squaredDiff_(const T& a, const T& b) const
{
@@ -409,6 +423,9 @@ private:
Scalar eps_;
std::string name_;
bool printL2Error_;
+ std::vector<Scalar> analyticalPressure_;
+ std::vector<GlobalPosition> analyticalVelocity_;
+ std::vector<GlobalPosition> analyticalVelocityOnFace_;
};
} //end namespace
diff --git a/test/freeflow/staggered/kovasznaytestproblem.hh b/test/freeflow/staggered/kovasznaytestproblem.hh
index 03f7b6290dfa492da6f16347da31566086722f2c..aeb9379223d02656826e4f78469e1cd6a6cc03b0 100644
--- a/test/freeflow/staggered/kovasznaytestproblem.hh
+++ b/test/freeflow/staggered/kovasznaytestproblem.hh
@@ -24,13 +24,15 @@
#ifndef DUMUX_KOVASZNAY_TEST_PROBLEM_HH
#define DUMUX_KOVASZNAY_TEST_PROBLEM_HH
-#include <dumux/implicit/staggered/properties.hh>
-#include <dumux/freeflow/staggered/model.hh>
-#include <dumux/implicit/problem.hh>
+#include <dumux/freeflow/staggered/problem.hh>
+#include <dumux/discretization/staggered/properties.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/material/components/constant.hh>
+#include <dumux/discretization/staggered/properties.hh>
+#include <dumux/freeflow/staggered/properties.hh>
+
// solve Navier-Stokes equations
#define ENABLE_NAVIERSTOKES 1
@@ -56,7 +58,7 @@ SET_PROP(KovasznayTestProblem, Fluid)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef FluidSystems::LiquidPhase<Scalar, Dumux::Constant<TypeTag, Scalar> > type;
+ typedef FluidSystems::LiquidPhase<Scalar, Dumux::Components::Constant<1, Scalar> > type;
};
// Set the grid type
@@ -70,9 +72,6 @@ SET_BOOL_PROP(KovasznayTestProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(KovasznayTestProblem, EnableGlobalFluxVariablesCache, true);
SET_BOOL_PROP(KovasznayTestProblem, EnableGlobalVolumeVariablesCache, true);
-// Enable gravity
-SET_BOOL_PROP(KovasznayTestProblem, ProblemEnableGravity, true);
-
#if ENABLE_NAVIERSTOKES
SET_BOOL_PROP(KovasznayTestProblem, EnableInertiaTerms, true);
#else
@@ -88,13 +87,13 @@ SET_BOOL_PROP(KovasznayTestProblem, EnableInertiaTerms, false);
template <class TypeTag>
class KovasznayTestProblem : public NavierStokesProblem<TypeTag>
{
- typedef NavierStokesProblem<TypeTag> ParentType;
+ using ParentType = NavierStokesProblem<TypeTag>;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
// Grid and world dimension
dim = GridView::dimension,
@@ -110,16 +109,16 @@ class KovasznayTestProblem : public NavierStokesProblem<TypeTag>
velocityYIdx = Indices::velocityYIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Intersection = typename GridView::Intersection;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
@@ -127,36 +126,29 @@ class KovasznayTestProblem : public NavierStokesProblem<TypeTag>
using BoundaryValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
using InitialValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
using SourceValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
typename DofTypeIndices::CellCenterIdx cellCenterIdx;
typename DofTypeIndices::FaceIdx faceIdx;
public:
- KovasznayTestProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView), eps_(1e-6)
+ KovasznayTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry), eps_(1e-6)
{
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- std::string,
- Problem,
- Name);
+ printL2Error_ = getParam<bool>("Problem.PrintL2Error");
- printL2Error_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- bool,
- Problem,
- PrintL2Error);
-
- kinematicViscosity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, LiquidKinematicViscosity);
+ kinematicViscosity_ = getParam<Scalar>("Component.LiquidKinematicViscosity", 1.0);
Scalar reynoldsNumber = 1.0 / kinematicViscosity_;
lambda_ = 0.5 * reynoldsNumber
- std::sqrt(reynoldsNumber * reynoldsNumber * 0.25 + 4.0 * M_PI * M_PI);
using CellArray = std::array<unsigned int, dimWorld>;
- const CellArray numCells = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- CellArray,
- Grid,
- Cells);
- cellSizeX_ = this->bBoxMax()[0] / numCells[0];
+ const auto numCells = getParam<CellArray>("Grid.Cells");
+
+ cellSizeX_ = this->fvGridGeometry().bBoxMax()[0] / numCells[0];
+
+ createAnalyticalSolution_();
}
/*!
@@ -164,28 +156,18 @@ public:
*/
// \{
- /*!
- * \brief The problem name.
- *
- * This is used as a prefix for files generated by the simulation.
- */
- std::string name() const
- {
- return name_;
- }
-
bool shouldWriteRestartFile() const
{
return false;
}
- void postTimeStep() const
+ void postTimeStep(const SolutionVector& curSol) const
{
if(printL2Error_)
{
- const auto l2error = calculateL2Error();
- const int numCellCenterDofs = this->model().numCellCenterDofs();
- const int numFaceDofs = this->model().numFaceDofs();
+ const auto l2error = calculateL2Error(curSol);
+ const int numCellCenterDofs = this->fvGridGeometry().gridView().size(0);
+ const int numFaceDofs = this->fvGridGeometry().gridView().size(1);
std::cout << std::setprecision(8) << "** L2 error (abs/rel) for "
<< std::setw(6) << numCellCenterDofs << " cc dofs and " << numFaceDofs << " face dofs (total: " << numCellCenterDofs + numFaceDofs << "): "
<< std::scientific
@@ -294,56 +276,16 @@ public:
return values;
}
- /*!
- * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
- */
- template<class VtkOutputModule>
- void addVtkOutputFields(VtkOutputModule& outputModule) const
- {
- auto& pressureExact = outputModule.createScalarField("pressureExact", 0);
- auto& velocityExact = outputModule.createVectorField("velocityExact", 0);
-
- auto& scalarFaceVelocityExact = outputModule.createFaceScalarField("scalarFaceVelocityExact");
- auto& vectorFaceVelocityExact = outputModule.createFaceVectorField("vectorFaceVelocityExact");
-
- for (const auto& element : elements(this->gridView()))
- {
- auto fvGeometry = localView(this->model().fvGridGeometry());
- fvGeometry.bindElement(element);
- for (auto&& scv : scvs(fvGeometry))
- {
- auto ccDofIdx = scv.dofIndex();
- auto ccDofPosition = scv.dofPosition();
- auto analyticalSolutionAtCc = dirichletAtPos(ccDofPosition);
-
- GlobalPosition velocityVector(0.0);
- for (auto&& scvf : scvfs(fvGeometry))
- {
- auto faceDofIdx = scvf.dofIndex();
- auto faceDofPosition = scvf.center();
- auto dirIdx = scvf.directionIndex();
- auto analyticalSolutionAtFace = dirichletAtPos(faceDofPosition);
- scalarFaceVelocityExact[faceDofIdx] = analyticalSolutionAtFace[faceIdx][dirIdx];
-
- GlobalPosition tmp(0.0);
- tmp[dirIdx] = analyticalSolutionAtFace[faceIdx][dirIdx];
- vectorFaceVelocityExact[faceDofIdx] = std::move(tmp);
- }
- pressureExact[ccDofIdx] = analyticalSolutionAtCc[pressureIdx];
- velocityExact[ccDofIdx] = analyticalSolutionAtCc[faceIdx];
- }
- }
- }
/*!
* \brief Calculate the L2 error between the analytical solution and the numerical approximation.
*
*/
- auto calculateL2Error() const
+ auto calculateL2Error(const SolutionVector& curSol) const
{
BoundaryValues sumError(0.0), sumReference(0.0), l2NormAbs(0.0), l2NormRel(0.0);
- const int numFaceDofs = this->model().numFaceDofs();
+ const int numFaceDofs = this->fvGridGeometry().gridView().size(1);
std::vector<Scalar> staggeredVolume(numFaceDofs);
std::vector<Scalar> errorVelocity(numFaceDofs);
@@ -352,9 +294,9 @@ public:
Scalar totalVolume = 0.0;
- for (const auto& element : elements(this->gridView()))
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
{
- auto fvGeometry = localView(this->model().fvGridGeometry());
+ auto fvGeometry = localView(this->fvGridGeometry());
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
@@ -363,7 +305,7 @@ public:
const auto dofIdxCellCenter = scv.dofIndex();
const auto& posCellCenter = scv.dofPosition();
const auto analyticalSolutionCellCenter = dirichletAtPos(posCellCenter)[cellCenterIdx];
- const auto numericalSolutionCellCenter = this->model().curSol()[cellCenterIdx][dofIdxCellCenter];
+ const auto numericalSolutionCellCenter = curSol[cellCenterIdx][dofIdxCellCenter];
sumError[cellCenterIdx] += squaredDiff_(analyticalSolutionCellCenter, numericalSolutionCellCenter) * scv.volume();
sumReference[cellCenterIdx] += analyticalSolutionCellCenter * analyticalSolutionCellCenter * scv.volume();
totalVolume += scv.volume();
@@ -374,7 +316,7 @@ public:
const int dofIdxFace = scvf.dofIndex();
const int dirIdx = scvf.directionIndex();
const auto analyticalSolutionFace = dirichletAtPos(scvf.center())[faceIdx][dirIdx];
- const auto numericalSolutionFace = this->model().curSol()[faceIdx][dofIdxFace][momentumBalanceIdx];
+ const auto numericalSolutionFace = curSol[faceIdx][dofIdxFace][momentumBalanceIdx];
directionIndex[dofIdxFace] = dirIdx;
errorVelocity[dofIdxFace] = squaredDiff_(analyticalSolutionFace, numericalSolutionFace);
velocityReference[dofIdxFace] = squaredDiff_(analyticalSolutionFace, 0.0);
@@ -407,7 +349,67 @@ public:
return std::make_pair(l2NormAbs, l2NormRel);
}
+ /*!
+ * \brief Returns the analytical solution for the pressure
+ */
+ auto& getAnalyticalPressureSolution() const
+ {
+ return analyticalPressure_;
+ }
+
+ /*!
+ * \brief Returns the analytical solution for the velocity
+ */
+ auto& getAnalyticalVelocitySolution() const
+ {
+ return analyticalVelocity_;
+ }
+
+ /*!
+ * \brief Returns the analytical solution for the velocity at the faces
+ */
+ auto& getAnalyticalVelocitySolutionOnFace() const
+ {
+ return analyticalVelocityOnFace_;
+ }
+
private:
+
+ /*!
+ * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
+ */
+ void createAnalyticalSolution_()
+ {
+ analyticalPressure_.resize(this->fvGridGeometry().numCellCenterDofs());
+ analyticalVelocity_.resize(this->fvGridGeometry().numCellCenterDofs());
+ analyticalVelocityOnFace_.resize(this->fvGridGeometry().numFaceDofs());
+
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
+ {
+ auto fvGeometry = localView(this->fvGridGeometry());
+ fvGeometry.bindElement(element);
+ for (auto&& scv : scvs(fvGeometry))
+ {
+ auto ccDofIdx = scv.dofIndex();
+ auto ccDofPosition = scv.dofPosition();
+ auto analyticalSolutionAtCc = analyticalSolution(ccDofPosition);
+
+ // velocities on faces
+ for (auto&& scvf : scvfs(fvGeometry))
+ {
+ const auto faceDofIdx = scvf.dofIndex();
+ const auto faceDofPosition = scvf.center();
+ const auto dirIdx = scvf.directionIndex();
+ const auto analyticalSolutionAtFace = analyticalSolution(faceDofPosition);
+ analyticalVelocityOnFace_[faceDofIdx][dirIdx] = analyticalSolutionAtFace[faceIdx][dirIdx];
+ }
+
+ analyticalPressure_[ccDofIdx] = analyticalSolutionAtCc[pressureIdx];
+ analyticalVelocity_[ccDofIdx] = analyticalSolutionAtCc[faceIdx];
+ }
+ }
+ }
+
template<class T>
T squaredDiff_(const T& a, const T& b) const
{
@@ -416,16 +418,18 @@ private:
bool isLowerLeftCell_(const GlobalPosition& globalPos) const
{
- return globalPos[0] < (this->bBoxMin()[0] + 0.5*cellSizeX_ + eps_);
+ return globalPos[0] < (this->fvGridGeometry().bBoxMin()[0] + 0.5*cellSizeX_ + eps_);
}
Scalar eps_;
Scalar cellSizeX_;
- std::string name_;
Scalar kinematicViscosity_;
Scalar lambda_;
bool printL2Error_;
+ std::vector<Scalar> analyticalPressure_;
+ std::vector<GlobalPosition> analyticalVelocity_;
+ std::vector<GlobalPosition> analyticalVelocityOnFace_;
};
} //end namespace
diff --git a/test/freeflow/staggered/test_channel.cc b/test/freeflow/staggered/test_channel.cc
index 9e6fef38637fbc07d1e08565410264afab838d7a..7abdc98014aab97181f7765f8bea24e453a63171 100644
--- a/test/freeflow/staggered/test_channel.cc
+++ b/test/freeflow/staggered/test_channel.cc
@@ -21,9 +21,36 @@
*
* \brief Channel flow test for the staggered grid (Navier-)Stokes model
*/
-#include <config.h>
+ #include <config.h>
+
+ #include <ctime>
+ #include <iostream>
+
+ #include <dune/common/parallel/mpihelper.hh>
+ #include <dune/common/timer.hh>
+ #include <dune/grid/io/file/dgfparser/dgfexception.hh>
+ #include <dune/grid/io/file/vtk.hh>
+ #include <dune/istl/io.hh>
+
#include "channeltestproblem.hh"
-#include <dumux/common/start.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/staggeredfvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+#include <dumux/implicit/staggered/newtoncontroller.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/staggeredvtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -57,8 +84,178 @@ void usage(const char *progName, const std::string &errorMsg)
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(ChannelTestProblem);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<CheckPointTimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+ problem->setTimeLoop(timeLoop);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+ const auto numDofsCellCenter = leafGridView.size(0);
+ const auto numDofsFace = leafGridView.size(1);
+ SolutionVector x;
+ x[cellCenterIdx].resize(numDofsCellCenter);
+ x[faceIdx].resize(numDofsFace);
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ StaggeredVtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::UMFPackBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>();
+
+ // the non-linear solver
+ using NewtonController = StaggeredNewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(ChannelTestProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/freeflow/staggered/test_channel_navierstokes.input b/test/freeflow/staggered/test_channel_navierstokes.input
index 029488f679174adafb91f730a61db66df2819187..af468071b904a736c15de0204ad2813c55002413 100644
--- a/test/freeflow/staggered/test_channel_navierstokes.input
+++ b/test/freeflow/staggered/test_channel_navierstokes.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 2 # [s]
@@ -17,4 +17,5 @@ MaxSteps = 10
MaxRelativeShift = 1e-5
[Vtk]
+AddVelocity = true
WriteFaceData = false
diff --git a/test/freeflow/staggered/test_channel_stokes.input b/test/freeflow/staggered/test_channel_stokes.input
index 6dad824637992bb6c79ba9354da81bbb4a97a60e..916011989126437567270b98e9597ec0095163ad 100644
--- a/test/freeflow/staggered/test_channel_stokes.input
+++ b/test/freeflow/staggered/test_channel_stokes.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 2 # [s]
@@ -9,7 +9,6 @@ Cells = 100 50
[Problem]
Name = test_channel_stokes # name passed to the output routines
InletVelocity = 1
-LiquidDensity = 1
EnableGravity = false
[ Newton ]
@@ -17,4 +16,5 @@ MaxSteps = 10
MaxRelativeShift = 1e-8
[Vtk]
+AddVelocity = true
WriteFaceData = false
diff --git a/test/freeflow/staggered/test_channel_stokesni_conduction.input b/test/freeflow/staggered/test_channel_stokesni_conduction.input
index dc10ce8083ee6777197c8b6e922ffb697b4f135e..ebc6488b7575d34694ddd7cd38548610b2409494 100644
--- a/test/freeflow/staggered/test_channel_stokesni_conduction.input
+++ b/test/freeflow/staggered/test_channel_stokesni_conduction.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1e7 # [s]
TEnd = 1e8 # [s]
@@ -16,4 +16,5 @@ MaxSteps = 10
MaxRelativeShift = 1e-8
[Vtk]
+AddVelocity = true
WriteFaceData = false
diff --git a/test/freeflow/staggered/test_channel_stokesni_convection.input b/test/freeflow/staggered/test_channel_stokesni_convection.input
index b8021327078eecccfd379462aa10bceb85d3d497..dbaf6ddb5d40950afbfb651c7d8714d52e647f92 100644
--- a/test/freeflow/staggered/test_channel_stokesni_convection.input
+++ b/test/freeflow/staggered/test_channel_stokesni_convection.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 50 # [s]
TEnd = 250 # [s]
@@ -16,4 +16,5 @@ MaxSteps = 10
MaxRelativeShift = 1e-8
[Vtk]
+AddVelocity = true
WriteFaceData = false
diff --git a/test/freeflow/staggered/test_closedsystem.cc b/test/freeflow/staggered/test_closedsystem.cc
index 49a22573a6b194e34a799be9126cd1bad6fe8c76..b1cfa45e039181737563b8974bfbb080d7309312 100644
--- a/test/freeflow/staggered/test_closedsystem.cc
+++ b/test/freeflow/staggered/test_closedsystem.cc
@@ -19,11 +19,38 @@
/*!
* \file
*
- * \brief test for the one-phase CC model
+ * \brief Test for the staggered grid Stokes model in a closed domain
*/
-#include <config.h>
+ #include <config.h>
+
+ #include <ctime>
+ #include <iostream>
+
+ #include <dune/common/parallel/mpihelper.hh>
+ #include <dune/common/timer.hh>
+ #include <dune/grid/io/file/dgfparser/dgfexception.hh>
+ #include <dune/grid/io/file/vtk.hh>
+ #include <dune/istl/io.hh>
+
#include "closedsystemtestproblem.hh"
-#include <dumux/common/start.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/staggeredfvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+#include <dumux/implicit/staggered/newtoncontroller.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/staggeredvtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -57,8 +84,177 @@ void usage(const char *progName, const std::string &errorMsg)
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(ClosedSystemTestProblem);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+ const auto numDofsCellCenter = leafGridView.size(0);
+ const auto numDofsFace = leafGridView.size(1);
+ SolutionVector x;
+ x[cellCenterIdx].resize(numDofsCellCenter);
+ x[faceIdx].resize(numDofsFace);
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ StaggeredVtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::UMFPackBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>();
+
+ // the non-linear solver
+ using NewtonController = StaggeredNewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(ClosedSystemTestProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/freeflow/staggered/test_donea.cc b/test/freeflow/staggered/test_donea.cc
index c471bfe00ffcf174ea5225f00593f1f7a0ee19db..a5dfb91d0ccbff8658f5bb48a21409ffe598b06f 100644
--- a/test/freeflow/staggered/test_donea.cc
+++ b/test/freeflow/staggered/test_donea.cc
@@ -21,9 +21,38 @@
*
* \brief Test for the staggered grid Navier-Stokes model (Kovasznay 1947)
*/
-#include <config.h>
+
+ #include <config.h>
+
+ #include <ctime>
+ #include <iostream>
+
+ #include <dune/common/parallel/mpihelper.hh>
+ #include <dune/common/timer.hh>
+ #include <dune/grid/io/file/dgfparser/dgfexception.hh>
+ #include <dune/grid/io/file/vtk.hh>
+ #include <dune/istl/io.hh>
+
+
#include "doneatestproblem.hh"
-#include <dumux/common/start.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/staggeredfvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+#include <dumux/implicit/staggered/newtoncontroller.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/staggeredvtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -57,8 +86,183 @@ void usage(const char *progName, const std::string &errorMsg)
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(DoneaTestProblem);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+ const auto numDofsCellCenter = leafGridView.size(0);
+ const auto numDofsFace = leafGridView.size(1);
+ SolutionVector x;
+ x[cellCenterIdx].resize(numDofsCellCenter);
+ x[faceIdx].resize(numDofsFace);
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ StaggeredVtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact", 1);
+ vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact", GridView::dimensionworld);
+ vtkWriter.addFaceField(problem->getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact");
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::UMFPackBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>();
+
+ // the non-linear solver
+ using NewtonController = StaggeredNewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ problem->postTimeStep(x);
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(DoneaTestProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/freeflow/staggered/test_hydrostaticpressure.input b/test/freeflow/staggered/test_hydrostaticpressure.input
index 16c989a251993a6134c8652e84328ad5cf262290..a48eb5fb26b694193d612146c8322f686880890b 100644
--- a/test/freeflow/staggered/test_hydrostaticpressure.input
+++ b/test/freeflow/staggered/test_hydrostaticpressure.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 2 # [s]
@@ -9,12 +9,15 @@ Cells = 64 64
[Problem]
Name = test_hydrostaticpressure # name passed to the output routines
LidVelocity = 0
-LiquidDensity = 1000
EnableGravity = true
+[Component]
+LiquidDensity = 1000
+
[ Newton ]
MaxSteps = 10
MaxRelativeShift = 1e-5
[Vtk]
+AddVelocity = true
WriteFaceData = false
diff --git a/test/freeflow/staggered/test_kovasznay.cc b/test/freeflow/staggered/test_kovasznay.cc
index 67d5014aecc205d41e4d4b85be9ba526d8ae57e8..216877cb32a8406dd9663640344c80ac80453aa1 100644
--- a/test/freeflow/staggered/test_kovasznay.cc
+++ b/test/freeflow/staggered/test_kovasznay.cc
@@ -21,9 +21,37 @@
*
* \brief Test for the staggered grid Stokes model (Donea et al., 2003)
*/
-#include <config.h>
+ #include <config.h>
+
+ #include <ctime>
+ #include <iostream>
+
+ #include <dune/common/parallel/mpihelper.hh>
+ #include <dune/common/timer.hh>
+ #include <dune/grid/io/file/dgfparser/dgfexception.hh>
+ #include <dune/grid/io/file/vtk.hh>
+ #include <dune/istl/io.hh>
+
+
#include "kovasznaytestproblem.hh"
-#include <dumux/common/start.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/staggeredfvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+#include <dumux/implicit/staggered/newtoncontroller.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/staggeredvtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -57,8 +85,183 @@ void usage(const char *progName, const std::string &errorMsg)
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(KovasznayTestProblem);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+ const auto numDofsCellCenter = leafGridView.size(0);
+ const auto numDofsFace = leafGridView.size(1);
+ SolutionVector x;
+ x[cellCenterIdx].resize(numDofsCellCenter);
+ x[faceIdx].resize(numDofsFace);
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ StaggeredVtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.addField(problem->getAnalyticalPressureSolution(), "pressureExact", 1);
+ vtkWriter.addField(problem->getAnalyticalVelocitySolution(), "velocityExact", GridView::dimensionworld);
+ vtkWriter.addFaceField(problem->getAnalyticalVelocitySolutionOnFace(), "faceVelocityExact");
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::UMFPackBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>();
+
+ // the non-linear solver
+ using NewtonController = StaggeredNewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ problem->postTimeStep(x);
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(KovasznayTestProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/freeflow/staggered/test_liddrivencavity.input b/test/freeflow/staggered/test_liddrivencavity.input
index 4242e85fd9092d2473266668ea3cfe12b1090885..3f9baeb9cd3c14e16dc91100d5e78c0a6d8f8a57 100644
--- a/test/freeflow/staggered/test_liddrivencavity.input
+++ b/test/freeflow/staggered/test_liddrivencavity.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 2 # [s]
@@ -17,4 +17,5 @@ MaxSteps = 10
MaxRelativeShift = 1e-5
[Vtk]
+AddVelocity = true
WriteFaceData = false
diff --git a/test/freeflow/staggered/test_kovasznay.input b/test/freeflow/staggered/test_navierstokes_kovasznay.input
similarity index 81%
rename from test/freeflow/staggered/test_kovasznay.input
rename to test/freeflow/staggered/test_navierstokes_kovasznay.input
index 02e71ddbcfddbc52a61fc94e1257309e66f6d2d6..1bcc53d179651fdccc276bb87a722200ea1a70ea 100644
--- a/test/freeflow/staggered/test_kovasznay.input
+++ b/test/freeflow/staggered/test_navierstokes_kovasznay.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 2 # [s]
@@ -9,11 +9,17 @@ Cells = 50 50
[Problem]
Name = test_kovasznay # name passed to the output routines
-LiquidDensity = 1
EnableGravity = false
-LiquidKinematicViscosity = 0.025
PrintL2Error = false
+[Component]
+LiquidDensity = 1
+LiquidKinematicViscosity = 0.025
+
[ Newton ]
MaxSteps = 10
MaxRelativeShift = 1e-5
+
+[Vtk]
+WriteFaceData = false
+AddVelocity = true
diff --git a/test/freeflow/staggered/test_donea.input b/test/freeflow/staggered/test_stokes_donea.input
similarity index 74%
rename from test/freeflow/staggered/test_donea.input
rename to test/freeflow/staggered/test_stokes_donea.input
index 59941d981064392712132f82fdbf37cf8aee7950..d58cec3d52810dafda5446a0cef97ff6e0f337d8 100644
--- a/test/freeflow/staggered/test_donea.input
+++ b/test/freeflow/staggered/test_stokes_donea.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 2 # [s]
@@ -8,10 +8,15 @@ Cells = 40 40
[Problem]
Name = test_donea # name passed to the output routines
-LiquidDensity = 1
EnableGravity = false
PrintL2Error = false
+LiquidKinematicViscosity = 1
+LiquidDensity = 1
[ Newton ]
MaxSteps = 10
MaxRelativeShift = 1e-5
+
+[Vtk]
+WriteFaceData = false
+AddVelocity = true
diff --git a/test/freeflow/staggerednc/CMakeLists.txt b/test/freeflow/staggerednc/CMakeLists.txt
index 4c9e540c1ccc78c45f84f2a364d1fa36fbfc4d2a..abc636af5d293de24144a3243635520e7c5d2a5b 100644
--- a/test/freeflow/staggerednc/CMakeLists.txt
+++ b/test/freeflow/staggerednc/CMakeLists.txt
@@ -1,47 +1,52 @@
add_input_file_links()
-add_dumux_test(test_densitydrivenflow test_densitydrivenflow test_densitydrivenflow.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-densitydriven-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_densitydrivenflow-00025.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_densitydrivenflow")
+dune_add_test(NAME test_stokes2c_densitydrivenflow
+ SOURCES test_densitydrivenflow.cc
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-densitydriven-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_densitydrivenflow-00029.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c_densitydrivenflow")
-add_dumux_test(test_purediffusion test_channel test_channel.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-purediffusion.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_purediffusion-00013.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_purediffusion.input"
- --zeroThreshold {"velocity_liquid \(m/s\)":1e-22})
+add_executable(test_stokes2c EXCLUDE_FROM_ALL test_channel.cc)
-add_dumux_test(test_advection test_channel test_channel.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-advection.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_advection-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel test_advection.input")
+dune_add_test(NAME test_stokes2c_purediffusion
+ TARGET test_stokes2c
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-purediffusion.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_purediffusion-00013.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c test_stokes2c_purediffusion.input"
+ --zeroThreshold {"velocity_liquid \(m/s\)":1e-22})
-add_dumux_test(test_stokes2cni_advection test_stokes2cni test_channel.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-advection.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni_advection-00009.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni test_stokes2cni_advection.input")
-target_compile_definitions(test_stokes2cni PUBLIC "NONISOTHERMAL=1")
+dune_add_test(NAME test_stokes2c_advection
+ TARGET test_stokes2c
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-advection.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_advection-00009.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c test_stokes2c_advection.input")
-add_dumux_test(test_stokes2cni_diffusion test_stokes2cni test_channel.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-diffusion.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni_diffusion-00014.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni test_stokes2cni_diffusion.input")
+add_executable(test_stokes2cni EXCLUDE_FROM_ALL test_channel.cc)
+target_compile_definitions(test_stokes2cni PUBLIC "NONISOTHERMAL=1")
+dune_add_test(NAME test_stokes2cni_advection
+ TARGET test_stokes2cni
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-advection.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni_advection-00009.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}//test_stokes2cni test_stokes2cni_advection.input")
-#install sources
-install(FILES
-test_densitydrivenflow.cc
-densityflowproblem.hh
-test_channel.cc
-channeltestproblem.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/freeflow/staggerednc)
+dune_add_test(NAME test_stokes2cni_diffusion
+ TARGET test_stokes2cni
+ CMAKE_GUARD HAVE_UMFPACK
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-diffusion.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni_diffusion-00014.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}//test_stokes2cni test_stokes2cni_diffusion.input")
diff --git a/test/freeflow/staggerednc/channeltestproblem.hh b/test/freeflow/staggerednc/channeltestproblem.hh
index f0dfab82aba0a41e447a483f8d26b251f960679d..b4bc517ad41e7fefb83bf7a4a07b82ff39ea7352 100644
--- a/test/freeflow/staggerednc/channeltestproblem.hh
+++ b/test/freeflow/staggerednc/channeltestproblem.hh
@@ -24,13 +24,13 @@
#ifndef DUMUX_CHANNEL_NC_TEST_PROBLEM_HH
#define DUMUX_CHANNEL_NC_TEST_PROBLEM_HH
-#include <dumux/implicit/staggered/properties.hh>
-#include <dumux/freeflow/staggerednc/model.hh>
-#include <dumux/implicit/problem.hh>
+#include <dumux/freeflow/staggered/problem.hh>
+#include <dumux/discretization/staggered/properties.hh>
#include <dumux/material/components/simpleh2o.hh>
-
#include <dumux/material/fluidsystems/h2oair.hh>
+#include <dumux/freeflow/staggerednc/properties.hh>
+
namespace Dumux
{
template <class TypeTag>
@@ -80,7 +80,6 @@ SET_BOOL_PROP(ChannelNCTestProblem, EnableGlobalFluxVariablesCache, true);
SET_BOOL_PROP(ChannelNCTestProblem, EnableGlobalVolumeVariablesCache, true);
// Enable gravity
-SET_BOOL_PROP(ChannelNCTestProblem, ProblemEnableGravity, true);
SET_BOOL_PROP(ChannelNCTestProblem, UseMoles, true);
// #if ENABLE_NAVIERSTOKES
@@ -97,14 +96,13 @@ SET_BOOL_PROP(ChannelNCTestProblem, EnableInertiaTerms, true);
template <class TypeTag>
class ChannelNCTestProblem : public NavierStokesProblem<TypeTag>
{
- typedef NavierStokesProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ using ParentType = NavierStokesProblem<TypeTag>;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
// Grid and world dimension
dim = GridView::dimension,
@@ -126,17 +124,15 @@ class ChannelNCTestProblem : public NavierStokesProblem<TypeTag>
transportCompIdx = 1/*FluidSystem::wCompIdx*/
};
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
+ using Element = typename GridView::template Codim<0>::Entity;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
@@ -145,20 +141,17 @@ class ChannelNCTestProblem : public NavierStokesProblem<TypeTag>
using InitialValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
using SourceValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
+ using TimeLoopPtr = std::shared_ptr<CheckPointTimeLoop<Scalar>>;
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+
public:
- ChannelNCTestProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ ChannelNCTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry), eps_(1e-6)
{
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- std::string,
- Problem,
- Name);
-
- inletVelocity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- Scalar,
- Problem,
- InletVelocity);
+ inletVelocity_ = getParam<Scalar>("Problem.InletVelocity");
FluidSystem::init();
+ deltaP_.resize(this->fvGridGeometry().numCellCenterDofs());
}
/*!
@@ -166,15 +159,6 @@ public:
*/
// \{
- /*!
- * \brief The problem name.
- *
- * This is used as a prefix for files generated by the simulation.
- */
- std::string name() const
- {
- return name_;
- }
bool shouldWriteRestartFile() const
{
@@ -257,15 +241,16 @@ public:
{
BoundaryValues values = initialAtPos(globalPos);
- const Scalar time = this->timeManager().time() + this->timeManager().timeStepSize();
-
// give the system some time so that the pressure can equilibrate, then start the injection of the tracer
- if(isInlet(globalPos) && time > 20.0)
+ if(isInlet(globalPos))
{
- values[transportCompIdx] = 1e-3;
+ if(time() >= 10.0 || inletVelocity_ < eps_)
+ {
+ values[transportCompIdx] = 1e-3;
#if NONISOTHERMAL
values[temperatureIdx] = 293.15;
#endif
+ }
}
return values;
@@ -293,8 +278,8 @@ public:
#endif
// parabolic velocity profile
- values[velocityXIdx] = inletVelocity_*(globalPos[1] - this->bBoxMin()[1])*(this->bBoxMax()[1] - globalPos[1])
- / (0.25*(this->bBoxMax()[1] - this->bBoxMin()[1])*(this->bBoxMax()[1] - this->bBoxMin()[1]));
+ values[velocityXIdx] = inletVelocity_*(globalPos[1] - this->fvGridGeometry().bBoxMin()[1])*(this->fvGridGeometry().bBoxMax()[1] - globalPos[1])
+ / (0.25*(this->fvGridGeometry().bBoxMax()[1] - this->fvGridGeometry().bBoxMin()[1])*(this->fvGridGeometry().bBoxMax()[1] - this->fvGridGeometry().bBoxMin()[1]));
values[velocityYIdx] = 0.0;
@@ -304,29 +289,39 @@ public:
/*!
* \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
*/
- template<class VtkOutputModule>
- void addVtkOutputFields(VtkOutputModule& outputModule) const
+ void calculateDeltaP(const GridVariables& gridVariables, const SolutionVector& sol)
{
- auto& deltaP = outputModule.createScalarField("deltaP", 0);
-
- for (const auto& element : elements(this->gridView()))
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
{
- auto fvGeometry = localView(this->model().fvGridGeometry());
+ auto fvGeometry = localView(this->fvGridGeometry());
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
{
auto ccDofIdx = scv.dofIndex();
- auto elemVolVars = localView(this->model().curGlobalVolVars());
- elemVolVars.bind(element, fvGeometry, this->model().curSol());
+ auto elemVolVars = localView(gridVariables.curGridVolVars());
+ elemVolVars.bind(element, fvGeometry, sol);
- deltaP[ccDofIdx] = elemVolVars[scv].pressure() - 1.1e5;
+ deltaP_[ccDofIdx] = elemVolVars[scv].pressure() - 1.1e5;
}
}
}
+ auto& getDeltaP() const
+ { return deltaP_; }
+
// \}
+ void setTimeLoop(TimeLoopPtr timeLoop)
+ {
+ timeLoop_ = timeLoop;
+ }
+
+ Scalar time() const
+ {
+ return timeLoop_->time();
+ }
+
private:
bool isInlet(const GlobalPosition& globalPos) const
@@ -336,17 +331,18 @@ private:
bool isOutlet(const GlobalPosition& globalPos) const
{
- return globalPos[0] > this->bBoxMax()[0] - eps_;
+ return globalPos[0] > this->fvGridGeometry().bBoxMax()[0] - eps_;
}
bool isWall(const GlobalPosition& globalPos) const
{
- return globalPos[0] > eps_ || globalPos[0] < this->bBoxMax()[0] - eps_;
+ return globalPos[0] > eps_ || globalPos[0] < this->fvGridGeometry().bBoxMax()[0] - eps_;
}
- const Scalar eps_{1e-6};
+ const Scalar eps_;
Scalar inletVelocity_;
- std::string name_;
+ TimeLoopPtr timeLoop_;
+ std::vector<Scalar> deltaP_;
};
} //end namespace
diff --git a/test/freeflow/staggerednc/densityflowproblem.hh b/test/freeflow/staggerednc/densityflowproblem.hh
index fb43203f87681284fecab3eb66f7054f603b1c84..2125ce387fcdb30133129910627f5e094ed1316e 100644
--- a/test/freeflow/staggerednc/densityflowproblem.hh
+++ b/test/freeflow/staggerednc/densityflowproblem.hh
@@ -24,13 +24,13 @@
#ifndef DUMUX_DENSITY_FLOW_NC_TEST_PROBLEM_HH
#define DUMUX_DENSITY_FLOW_NC_TEST_PROBLEM_HH
-#include <dumux/implicit/staggered/properties.hh>
-#include <dumux/freeflow/staggerednc/model.hh>
-#include <dumux/implicit/problem.hh>
+#include <dumux/freeflow/staggered/problem.hh>
+#include <dumux/discretization/staggered/properties.hh>
#include <dumux/material/components/simpleh2o.hh>
-
#include <dumux/material/fluidsystems/h2oair.hh>
+#include <dumux/freeflow/staggerednc/properties.hh>
+
namespace Dumux
{
template <class TypeTag>
@@ -74,8 +74,6 @@ SET_BOOL_PROP(DensityDrivenFlowProblem, EnableFVGridGeometryCache, true);
SET_BOOL_PROP(DensityDrivenFlowProblem, EnableGlobalFluxVariablesCache, true);
SET_BOOL_PROP(DensityDrivenFlowProblem, EnableGlobalVolumeVariablesCache, true);
-// Enable gravity
-SET_BOOL_PROP(DensityDrivenFlowProblem, ProblemEnableGravity, true);
SET_BOOL_PROP(DensityDrivenFlowProblem, UseMoles, true);
#if ENABLE_NAVIERSTOKES
@@ -92,14 +90,13 @@ SET_BOOL_PROP(DensityDrivenFlowProblem, EnableInertiaTerms, false);
template <class TypeTag>
class DensityDrivenFlowProblem : public NavierStokesProblem<TypeTag>
{
- typedef NavierStokesProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ using ParentType = NavierStokesProblem<TypeTag>;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
// Grid and world dimension
dim = GridView::dimension,
@@ -117,17 +114,13 @@ class DensityDrivenFlowProblem : public NavierStokesProblem<TypeTag>
transportCompIdx = 1/*FluidSystem::wCompIdx*/
};
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
using CellCenterPrimaryVariables = typename GET_PROP_TYPE(TypeTag, CellCenterPrimaryVariables);
using FacePrimaryVariables = typename GET_PROP_TYPE(TypeTag, FacePrimaryVariables);
@@ -136,21 +129,21 @@ class DensityDrivenFlowProblem : public NavierStokesProblem<TypeTag>
using InitialValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
using SourceValues = typename GET_PROP_TYPE(TypeTag, BoundaryValues);
+ using TimeLoopPtr = std::shared_ptr<CheckPointTimeLoop<Scalar>>;
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+
public:
- DensityDrivenFlowProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ DensityDrivenFlowProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry), eps_(1e-6)
{
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- std::string,
- Problem,
- Name);
-
- useWholeLength_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- bool,
- Problem,
- UseWholeLength);
-
+ useWholeLength_ = getParam<bool>("Problem.UseWholeLength");
FluidSystem::init();
+ deltaRho_.resize(this->fvGridGeometry().numCellCenterDofs());
+
+ using CellArray = std::array<unsigned int, dimWorld>;
+ const CellArray numCells = getParam<CellArray>("Grid.Cells");
+ cellSizeX_ = this->fvGridGeometry().bBoxMax()[0] / numCells[0];
}
/*!
@@ -158,16 +151,6 @@ public:
*/
// \{
- /*!
- * \brief The problem name.
- *
- * This is used as a prefix for files generated by the simulation.
- */
- std::string name() const
- {
- return name_;
- }
-
bool shouldWriteRestartFile() const
{
return false;
@@ -211,10 +194,10 @@ public:
values.setOutflow(transportEqIdx);
values.setOutflow(massBalanceIdx);
- if(globalPos[1] < eps_)
+ if(isLowerLeftCell_(globalPos))
values.setDirichletCell(massBalanceIdx);
- if(globalPos[1] > this->bBoxMax()[1] - eps_)
+ if(globalPos[1] > this->fvGridGeometry().bBoxMax()[1] - eps_)
{
if(useWholeLength_)
values.setDirichlet(transportEqIdx);
@@ -270,33 +253,40 @@ public:
/*!
* \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
*/
- template<class VtkOutputModule>
- void addVtkOutputFields(VtkOutputModule& outputModule) const
+ void calculateDeltaRho(const GridVariables& gridVariables, const SolutionVector& sol)
{
- auto& delRho = outputModule.createScalarField("delRho", 0);
-
- for (const auto& element : elements(this->gridView()))
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
{
- auto fvGeometry = localView(this->model().fvGridGeometry());
+ auto fvGeometry = localView(this->fvGridGeometry());
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
{
auto ccDofIdx = scv.dofIndex();
- auto elemVolVars = localView(this->model().curGlobalVolVars());
- elemVolVars.bind(element, fvGeometry, this->model().curSol());
+ auto elemVolVars = localView(gridVariables.curGridVolVars());
+ elemVolVars.bind(element, fvGeometry, sol);
- delRho[ccDofIdx] = elemVolVars[scv].density() - 999.694;
+ deltaRho_[ccDofIdx] = elemVolVars[scv].density() - 999.694;
}
}
}
+ auto& getDeltaRho() const
+ { return deltaRho_; }
+
+
+ bool isLowerLeftCell_(const GlobalPosition& globalPos) const
+ {
+ return globalPos[0] < (0.5*cellSizeX_ + eps_) && globalPos[1] < eps_;
+ }
+
// \}
private:
- const Scalar eps_{1e-6};
- std::string name_;
+ const Scalar eps_;
bool useWholeLength_;
+ std::vector<Scalar> deltaRho_;
+ Scalar cellSizeX_;
};
} //end namespace
diff --git a/test/freeflow/staggerednc/test_channel.cc b/test/freeflow/staggerednc/test_channel.cc
index ab0ed70cf89a1a5a71d0c6cf3fa2aa9ee2819fc7..d52e2bf02554637321655d6893f57f7ebce41e38 100644
--- a/test/freeflow/staggerednc/test_channel.cc
+++ b/test/freeflow/staggerednc/test_channel.cc
@@ -21,9 +21,36 @@
*
* \brief Test for the staggered grid multi-component (Navier-)Stokes model
*/
-#include <config.h>
+ #include <config.h>
+
+ #include <ctime>
+ #include <iostream>
+
+ #include <dune/common/parallel/mpihelper.hh>
+ #include <dune/common/timer.hh>
+ #include <dune/grid/io/file/dgfparser/dgfexception.hh>
+ #include <dune/grid/io/file/vtk.hh>
+ #include <dune/istl/io.hh>
+
#include "channeltestproblem.hh"
-#include <dumux/common/start.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/staggeredfvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+#include <dumux/implicit/staggered/newtoncontroller.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/staggeredvtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -57,8 +84,181 @@ void usage(const char *progName, const std::string &errorMsg)
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(ChannelNCTestProblem);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<CheckPointTimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+ problem->setTimeLoop(timeLoop);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+ const auto numDofsCellCenter = leafGridView.size(0);
+ const auto numDofsFace = leafGridView.size(1);
+ SolutionVector x;
+ x[cellCenterIdx].resize(numDofsCellCenter);
+ x[faceIdx].resize(numDofsFace);
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ StaggeredVtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.addField(problem->getDeltaP(), "deltaP");
+ vtkWriter.write(0.0);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::UMFPackBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>();
+
+ // the non-linear solver
+ using NewtonController = StaggeredNewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ problem->calculateDeltaP(*gridVariables, x);
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(ChannelNCTestProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/freeflow/staggerednc/test_densitydrivenflow.cc b/test/freeflow/staggerednc/test_densitydrivenflow.cc
index cdc785170e9267f585e35b0bd1d49b1cf979a1c1..e01de523114b60d564b2e13fe8922285a09c7d35 100644
--- a/test/freeflow/staggerednc/test_densitydrivenflow.cc
+++ b/test/freeflow/staggerednc/test_densitydrivenflow.cc
@@ -21,9 +21,36 @@
*
* \brief Test for the staggered grid multi-component (Navier-)Stokes model
*/
-#include <config.h>
+ #include <config.h>
+
+ #include <ctime>
+ #include <iostream>
+
+ #include <dune/common/parallel/mpihelper.hh>
+ #include <dune/common/timer.hh>
+ #include <dune/grid/io/file/dgfparser/dgfexception.hh>
+ #include <dune/grid/io/file/vtk.hh>
+ #include <dune/istl/io.hh>
+
#include "densityflowproblem.hh"
-#include <dumux/common/start.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/staggeredfvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+#include <dumux/implicit/staggered/newtoncontroller.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/staggeredvtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -57,8 +84,180 @@ void usage(const char *progName, const std::string &errorMsg)
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(DensityDrivenFlowProblem);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using DofTypeIndices = typename GET_PROP(TypeTag, DofTypeIndices);
+ typename DofTypeIndices::CellCenterIdx cellCenterIdx;
+ typename DofTypeIndices::FaceIdx faceIdx;
+ const auto numDofsCellCenter = leafGridView.size(0);
+ const auto numDofsFace = leafGridView.size(1);
+ SolutionVector x;
+ x[cellCenterIdx].resize(numDofsCellCenter);
+ x[faceIdx].resize(numDofsFace);
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ StaggeredVtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.addField(problem->getDeltaRho(), "deltaRho");
+ vtkWriter.write(0.0);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = StaggeredFVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::UMFPackBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>();
+
+ // the non-linear solver
+ using NewtonController = StaggeredNewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ problem->calculateDeltaRho(*gridVariables, x);
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(DensityDrivenFlowProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/freeflow/staggerednc/test_advection.input b/test/freeflow/staggerednc/test_stokes2c_advection.input
similarity index 89%
rename from test/freeflow/staggerednc/test_advection.input
rename to test/freeflow/staggerednc/test_stokes2c_advection.input
index 082aba44684b6ea6e3a872cc5d8e340e40d5a963..36687b2ce05ab869daa635cf5239d7d8a25af99a 100644
--- a/test/freeflow/staggerednc/test_advection.input
+++ b/test/freeflow/staggerednc/test_stokes2c_advection.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 5 # [s]
TEnd = 400 # [s]
@@ -16,4 +16,5 @@ MaxSteps = 10
MaxRelativeShift = 1e-8
[Vtk]
+AddVelocity = true
WriteFaceData = false
diff --git a/test/freeflow/staggerednc/test_densitydrivenflow.input b/test/freeflow/staggerednc/test_stokes2c_densitydrivenflow.input
similarity index 85%
rename from test/freeflow/staggerednc/test_densitydrivenflow.input
rename to test/freeflow/staggerednc/test_stokes2c_densitydrivenflow.input
index 63bb48f348f55877042f58655a78bb8e54d7c447..c0a7283460e94e13c09a2a5c694e7a353fb36cbb 100644
--- a/test/freeflow/staggerednc/test_densitydrivenflow.input
+++ b/test/freeflow/staggerednc/test_stokes2c_densitydrivenflow.input
@@ -1,7 +1,7 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1e-2 # [s]
# MaxTimeStepSize = 1e1
-TEnd = 1.5e3 # [s]
+TEnd = 5e3 # [s]
[Grid]
UpperRight = 1 1
@@ -17,4 +17,5 @@ MaxSteps = 10
MaxRelativeShift = 1e-8
[Vtk]
+AddVelocity = true
WriteFaceData = false
diff --git a/test/freeflow/staggerednc/test_purediffusion.input b/test/freeflow/staggerednc/test_stokes2c_purediffusion.input
similarity index 90%
rename from test/freeflow/staggerednc/test_purediffusion.input
rename to test/freeflow/staggerednc/test_stokes2c_purediffusion.input
index d93f57399475b65ae5d52fe98bb88d892b248dc0..bb365a1671bd4d476d1cd8a6371e85e9c11fb8d0 100644
--- a/test/freeflow/staggerednc/test_purediffusion.input
+++ b/test/freeflow/staggerednc/test_stokes2c_purediffusion.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1e6 # [s]
TEnd = 1e9 # [s]
@@ -16,4 +16,5 @@ MaxSteps = 10
MaxRelativeShift = 1e-8
[Vtk]
+AddVelocity = true
WriteFaceData = false
diff --git a/test/freeflow/staggerednc/test_stokes2cni_advection.input b/test/freeflow/staggerednc/test_stokes2cni_advection.input
index 2d84bb39d80a0ebf8f4113387979e9ecbfabe0e7..30ce7393b849304801745e0b5a2af7d52089920c 100644
--- a/test/freeflow/staggerednc/test_stokes2cni_advection.input
+++ b/test/freeflow/staggerednc/test_stokes2cni_advection.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 5 # [s]
TEnd = 400 # [s]
@@ -16,4 +16,5 @@ MaxSteps = 10
MaxRelativeShift = 1e-8
[Vtk]
+AddVelocity = true
WriteFaceData = false
diff --git a/test/freeflow/staggerednc/test_stokes2cni_diffusion.input b/test/freeflow/staggerednc/test_stokes2cni_diffusion.input
index 086b1be76d0bfbe0f335673d6c194d8269a1cba7..ec46ddaf8e7b06ac342df09bcfd8991732af21cb 100644
--- a/test/freeflow/staggerednc/test_stokes2cni_diffusion.input
+++ b/test/freeflow/staggerednc/test_stokes2cni_diffusion.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1e6 # [s]
TEnd = 1e9 # [s]
@@ -16,4 +16,5 @@ MaxSteps = 10
MaxRelativeShift = 1e-8
[Vtk]
+AddVelocity = true
WriteFaceData = false
diff --git a/test/geomechanics/CMakeLists.txt b/test/geomechanics/CMakeLists.txt
deleted file mode 100644
index 4b65e11703bf32f11f5226f3e7f424618ff2d475..0000000000000000000000000000000000000000
--- a/test/geomechanics/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-add_subdirectory("el1p2c")
-add_subdirectory("el2p")
-add_subdirectory("elastic")
diff --git a/test/geomechanics/el1p2c/CMakeLists.txt b/test/geomechanics/el1p2c/CMakeLists.txt
deleted file mode 100644
index f1c82c2294c04e492f24755ac99d5a6aa397c7a2..0000000000000000000000000000000000000000
--- a/test/geomechanics/el1p2c/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-add_input_file_links()
-
-add_dumux_test(test_el1p2c test_el1p2c test_el1p2c.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/el1p2c-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/el1p2c-00014.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_el1p2c")
-
-#install sources
-install(FILES
-el1p2cproblem.hh
-el1p2cspatialparams.hh
-test_el1p2c.cc
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/geomechanics/el1p2c)
diff --git a/test/geomechanics/el1p2c/el1p2cproblem.hh b/test/geomechanics/el1p2c/el1p2cproblem.hh
deleted file mode 100644
index cb7d81761ec017b6293cc72cef3a0c07f7bda01c..0000000000000000000000000000000000000000
--- a/test/geomechanics/el1p2c/el1p2cproblem.hh
+++ /dev/null
@@ -1,235 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/**
- * \file
- * \brief Definition of a problem, for the linear elastic 1p2c problem:
- * Component transport of nitrogen dissolved in the water phase with a linear
- * elastic solid matrix.
- */
-#ifndef DUMUX_EL1P2CPROBLEM_HH
-#define DUMUX_EL1P2CPROBLEM_HH
-
-#include <dune/grid/yaspgrid.hh>
-#include <dumux/geomechanics/el1p2c/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-
-#include <dumux/material/fluidsystems/h2on2.hh>
-#include "el1p2cspatialparams.hh"
-#include <dumux/linear/amgbackend.hh>
-
-namespace Dumux
-{
- template<class TypeTag>
- class El1P2CProblem;
-
- namespace Properties
- {
- NEW_TYPE_TAG(El1P2CProblem, INHERITS_FROM(BoxElasticOnePTwoC));
-
- // Set the grid type
- SET_TYPE_PROP(El1P2CProblem, Grid, Dune::YaspGrid<3>);
-
- // Set the problem property
- SET_TYPE_PROP(El1P2CProblem, Problem, El1P2CProblem<TTAG(El1P2CProblem)>);
-
- // Set fluid configuration
- SET_PROP(El1P2CProblem, FluidSystem)
- { private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- public:
- typedef FluidSystems::H2ON2<Scalar, false> type;
- };
-
- // Set the soil properties
- SET_TYPE_PROP(El1P2CProblem, SpatialParams, El1P2CSpatialParams<TypeTag>);
-
- //Define whether mole(true) or mass (false) fractions are used
- SET_BOOL_PROP(El1P2CProblem, UseMoles, false);
-
- // Include stabilization term to prevent pressure oscillations
- SET_BOOL_PROP(El1P2CProblem, ImplicitWithStabilization, true);
-
- // use the algebraic multigrid
- SET_TYPE_PROP(El1P2CProblem, LinearSolver, AMGBackend<TypeTag> );
-}
-
-/*!
- * \ingroup ElOnePTwoCBoxProblems
- * \brief Problem definition for a one-phase two-component transport process
- * in an elastic deformable matrix.
- *
- * The 3D domain given in el1p2c.dgf spans from (0,0,0) to (10,10,10).
- *
- * Dirichlet boundary conditions (p=101300, X=0.0, u=0.0) are applied at all boundaries.
- * In the center of the cube at the location (5,5,5) water with dissolved nitrogen is injected.
- * The injection leads to a pressure build-up which results in solid displacement (ux, uy, uz [m])
- * and effective stress changes.
- *
- */
-template<class TypeTag = TTAG( El1P2CProblem)>
-class El1P2CProblem: public ImplicitPorousMediaProblem<TypeTag>
-{
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum
- {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
- };
-
- enum {
- // balance equation indices
- transportEqIdx = Indices::transportEqIdx
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::Intersection Intersection;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
- public:
- El1P2CProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
- {}
-
- /*!
- * \brief The problem name.
- *
- * This is used as a prefix for files generated by the simulation.
- */
- std::string name() const
- { return "el1p2c";}
-
- /*!
- * \brief Returns the temperature within the domain.
- */
- Scalar temperature() const
- {
- return 273.15 + 10; // in K
- };
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- /*!
- * \brief Specifies which kind of boundary condition should be
- * used for which equation on a given boundary segment.
- *
- * \param values The boundary types for the conservation equations
- * \param vertex The vertex on the boundary for which the
- * conditions needs to be specified
- */
- void boundaryTypes(BoundaryTypes &values, const Vertex &vertex) const
- {
- values.setAllDirichlet();
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a dirichlet
- * control volume.
- *
- * \param values The dirichlet values for the primary variables
- * \param vertex The vertex representing the "half volume on the boundary"
- *
- * For this method, the \a values parameter stores primary variables.
- */
- void dirichlet(PrimaryVariables &values, const Vertex &vertex) const
- {
- values = 0.0;
- values[0] = 101300;
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a neumann
- * boundary segment.
- *
- * For this method, the \a values parameter stores the mass flux
- * in normal direction of each phase. Negative values mean influx.
- */
- void neumann(PrimaryVariables &values,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- const Intersection &intersection,
- int scvIdx,
- int boundaryFaceIdx) const
- {
- values = 0.0;
- }
- // \}
-
- /*!
- * \name Volume terms
- */
- // \{
-
- /*!
- * \brief Evaluate the source term for all phases within a given
- * sub-control-volume.
- *
- * For this method, the \a values parameter stores the rate mass
- * generated or annihilate per volume unit. Positive values mean
- * that mass is created, negative ones mean that it vanishes.
- */
- void sourceAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values = Scalar(0.0);
-
- if(globalPos[0] < 6 + eps_ && globalPos[0] > 4 - eps_
- && globalPos[1] < 6 + eps_ && globalPos[1] > 4 - eps_
- && globalPos[2] < 6 + eps_ && globalPos[2] > 4 - eps_)
- {
- values[0] = 1.e-3;
- values[1] = 1.e-4;
- }
- }
-
- /*!
- * \brief Evaluate the initial value for a control volume.
- *
- * For this method, the \a values parameter stores primary
- * variables.
- */
- void initial(PrimaryVariables &values,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx) const
- {
- values = 0.0;
- values[0] = 101300;
- }
-
- static constexpr Scalar eps_ = 3e-6;
-};
-} //end namespace
-
-#endif
diff --git a/test/geomechanics/el1p2c/el1p2cspatialparams.hh b/test/geomechanics/el1p2c/el1p2cspatialparams.hh
deleted file mode 100644
index ecfdf5bd69398510ce309ee3ceff5450771cca9d..0000000000000000000000000000000000000000
--- a/test/geomechanics/el1p2c/el1p2cspatialparams.hh
+++ /dev/null
@@ -1,216 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief The spatial parameters for the El1P2CProblem which uses the
- * linear elastic one-phase two-component model
- */
-#ifndef DUMUX_ELONEPTWOCSPARAMETERS_HH
-#define DUMUX_ELONEPTWOCSPARAMETERS_HH
-
-#include <dumux/material/spatialparams/implicit1p.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-
-namespace Dumux
-{
-
-//forward declaration
-template<class TypeTag>
-class El1P2CSpatialParams;
-
-namespace Properties
-{
-// The spatial parameters TypeTag
-NEW_TYPE_TAG(El1P2CSpatialParams);
-
-// Set the spatial parameters
-SET_TYPE_PROP(El1P2CSpatialParams, SpatialParams, El1P2CSpatialParams<TypeTag>);
-
-}
-
-/*!
- * \ingroup ElOnePTwoCBoxModel
- * \brief The spatial parameters for the El1P2CProblem which uses the
- * linear elastic one-phase two-component model
- */
-template<class TypeTag>
-class El1P2CSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
-{
- typedef ImplicitSpatialParamsOneP<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename Grid::ctype CoordScalar;
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld,
- };
-
- typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
- typedef Dune::FieldMatrix<Scalar,dim,dim> DimMatrix;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GridView::template Codim<0>::Entity Element;
-
-public:
-
- El1P2CSpatialParams(const GridView &gridView)
- : ParentType(gridView)
- {
- // intrinsic permeabilities [m^2]
- K_ = Scalar(0.0);
- for (int i = 0; i < dim; i++){
- K_[i][i] = 1.E-12; //[m²]
- }
-
- // porosities [-]
- phi_ = 0.2;
-
- // rock density [kg/m^3]
- solidDensity_ = 2650.0;
-
- // Young's modulus [Pa]
- E_ = 6.e9;
- // Poisson's ratio [-]
- nu_ = 0.2;
- // Lame parameters [Pa]
- lambda_ = (E_ * nu_) / ((1 + nu_)*(1 - 2 * nu_));
- mu_ = E_ / (2 * (1 + nu_));
- }
-
- ~El1P2CSpatialParams()
- {}
-
- /*!
- * \brief Apply the intrinsic permeability tensor \f$[m^2]\f$ to a pressure
- * potential gradient.
- *
- * \param element The current finite element
- * \param fvGeometry The current finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume where
- * the porosity needs to be defined
- */
-
- const DimMatrix intrinsicPermeability(const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx) const
- {
- return K_;
- }
-
- /*!
- * \brief Define the porosity \f$[-]\f$ of the soil
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry
- * \param scvIdx The local index of the sub-control volume where
- * the porosity needs to be defined
- */
- double porosity(const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx) const
- {
- return phi_;
- }
-
- /*!
- * \brief Define the porosity \f$[-]\f$ of the soil
- *
- * \param globalPos The global position of the vertex
- */
- double porosity(const GlobalPosition& globalPos) const
- {
- return phi_;
- }
-
- /*!
- * \brief Define the density \f$[kg/m^3]\f$ of the rock
- *
- * \param element The finite element
- * \param scvIdx The local index of the sub-control volume where
- * the porosity needs to be defined
- */
- const Scalar rockDensity(const Element &element,
- int scvIdx) const
- {
- return solidDensity_;
- }
-
- /*!
- * \brief Define the density \f$[kg/m^3]\f$ of the rock
- *
- * \param globalPos The global position of the vertex
- */
- const Scalar rockDensity(const GlobalPosition &globalPos) const
- {
- return solidDensity_;
- }
-
- /*!
- * \brief Define the Lame parameters \f$[Pa]\f$ linear elastic rock
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry
- * \param scvIdx The local index of the sub-control volume where
- * the porosity needs to be defined
- */
- const Dune::FieldVector<Scalar,2> lameParams(const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx) const
- {
- Dune::FieldVector<Scalar, 2> param;
-
- param[0] = lambda_;
- param[1] = mu_;
-
- return param;
- }
-
- /*!
- * \brief Return dispersivity (not needed here
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry
- * \param scvIdx The local index of the sub-control volume where
- */
- Dune::FieldVector<Scalar,dim> dispersivity(const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx) const
- {
- return Dune::FieldVector<Scalar,dim>(0);
- }
-
-private:
- Dune::FieldMatrix<Scalar,dim,dim> K_;
- Scalar layerBottom_;
- Scalar solidDensity_;
- Scalar phi_;
- Scalar lambda_;
- Scalar mu_;
- Scalar E_;
- Scalar nu_;
- static constexpr Scalar eps_ = 3e-6;
- int episode_;
-
-};
-}
-#endif
diff --git a/test/geomechanics/el1p2c/test_el1p2c.cc b/test/geomechanics/el1p2c/test_el1p2c.cc
deleted file mode 100644
index 2956391bfcadcf2e29f5fa8e6b621313e5a13607..0000000000000000000000000000000000000000
--- a/test/geomechanics/el1p2c/test_el1p2c.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Test for the elasticity 1p2c model
- */
-#include <config.h>
-
-#include "el1p2cproblem.hh"
-#include <dune/common/precision.hh>
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n"
- "\t-tEnd The end of the simulation. [s] \n"
- "\t-dtInitial The initial timestep size. [s] \n"
- "\t-gridFile The file name of the file containing the grid \n"
- "\t definition in DGF format\n"
- "\t-FluidSystem.nTemperature Number of tabularization entries [-] \n"
- "\t-FluidSystem.nPressure Number of tabularization entries [-] \n"
- "\t-FluidSystem.pressureLow Low end for tabularization of fluid properties [Pa] \n"
- "\t-FluidSystem.pressureHigh High end for tabularization of fluid properties [Pa] \n"
- "\t-FluidSystem.temperatureLow Low end for tabularization of fluid properties [Pa] \n"
- "\t-FluidSystem.temperatureHigh High end for tabularization of fluid properties [Pa] \n"
- "\t-SimulationControl.name The name of the output files [-] \n"
- "\t-InitialConditions.temperature Initial temperature in the reservoir [K] \n"
- "\t-InitialConditions.depthBOR Depth below ground surface [m] \n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-#include <iostream>
-
-int main(int argc, char** argv)
-{
- Dune::FMatrixPrecision<>::set_singular_limit(1e-22);
- typedef TTAG(El1P2CProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
-
diff --git a/test/geomechanics/el1p2c/test_el1p2c.input b/test/geomechanics/el1p2c/test_el1p2c.input
deleted file mode 100644
index 957c2c07c2c09750fde3a40dd28686477f2d8e76..0000000000000000000000000000000000000000
--- a/test/geomechanics/el1p2c/test_el1p2c.input
+++ /dev/null
@@ -1,10 +0,0 @@
-[TimeManager]
-DtInitial = 10 # [s]
-TEnd = 1e4 # [s]
-
-[Problem]
-EnableGravity = 0
-
-[Grid]
-UpperRight = 10 10 10
-Cells = 4 4 4
diff --git a/test/geomechanics/el2p/CMakeLists.txt b/test/geomechanics/el2p/CMakeLists.txt
deleted file mode 100644
index b25342849f6c580d40a9e9278adce6c5c4627cbd..0000000000000000000000000000000000000000
--- a/test/geomechanics/el2p/CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-add_input_file_links()
-
-add_dumux_test(test_el2p test_el2p test_el2p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/el2p-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/el2p-00047.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_el2p")
-
-if(MPI_FOUND)
- add_dumux_test(test_el2p_parallel test_el2p test_el2p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/el2p-parallel-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/s0004-p0001-el2p-00047.vtu
- --command "${MPIEXEC} -np 4 ${CMAKE_CURRENT_BINARY_DIR}/test_el2p")
-endif()
-
-#install sources
-install(FILES
-el2pco2tables.hh
-el2pproblem.hh
-el2pspatialparams.hh
-test_el2p.cc
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/geomechanics/el2p)
diff --git a/test/geomechanics/el2p/co2values.inc b/test/geomechanics/el2p/co2values.inc
deleted file mode 100644
index f2058b3bc644dd7492f9473917325e1263b71b0a..0000000000000000000000000000000000000000
--- a/test/geomechanics/el2p/co2values.inc
+++ /dev/null
@@ -1,10164 +0,0 @@
-/* Tables for CO2 fluid properties calculated according to Span and
- * Wagner (1996).
- *
- * THIS AN AUTO-GENERATED FILE! DO NOT EDIT IT!
- *
- * Temperature range: 290.000 K to 340.000 K, using 50 sampling points
- * Pressure range: 0.100 MPa to 100.000 MPa, using 495 sampling points
- *
- * Generated using:
- *
- * ./extractproperties 290 340 50 100000 100000000 495
- */
-
-
-struct TabulatedDensityTraits {
- typedef double Scalar;
- static const char *name;
- static const int numTempSteps = 50;
- static constexpr Scalar minTemp = 2.900000000000000e+02;
- static constexpr Scalar maxTemp = 3.400000000000000e+02;
- static const int numPressSteps = 495;
- static constexpr Scalar minPress = 1.000000000000000e+05;
- static constexpr Scalar maxPress = 1.000000000000000e+08;
- static const Scalar vals[numTempSteps][numPressSteps];
-};
-
-const char *TabulatedDensityTraits::name = "density";
-
-const double TabulatedDensityTraits::vals[50][495] =
-{
- {
- 1.835234260814301e+00, 5.609578928931403e+00, 9.472491146796987e+00, 1.342952796406621e+01, 1.748683269778940e+01,
- 2.165122343212360e+01, 2.593029935168559e+01, 3.033256948925443e+01, 3.486760994292403e+01, 3.954625763994803e+01,
- 4.438085158128438e+01, 4.938553658619486e+01, 5.457665050999915e+01, 5.997322476067790e+01, 6.559764140166533e+01,
- 7.147651112068229e+01, 7.764187002663628e+01, 8.413284906382685e+01, 9.099806589488004e+01, 9.829916177747781e+01,
- 1.061162328373974e+02, 1.145565634586313e+02, 1.237695022715711e+02, 1.339737563439795e+02, 1.455127584898394e+02,
- 1.589844988951826e+02, 8.057312521590094e+02, 8.108402128049386e+02, 8.155824061935749e+02, 8.200166853633398e+02,
- 8.241879770295383e+02, 8.281315020569276e+02, 8.318754705301706e+02, 8.354428809226469e+02, 8.388527648456439e+02,
- 8.421210739019541e+02, 8.452613273185401e+02, 8.482850949368766e+02, 8.512023640281901e+02, 8.540218223473987e+02,
- 8.567510796471778e+02, 8.593968432199171e+02, 8.619650585842660e+02, 8.644610233910867e+02, 8.668894805040845e+02,
- 8.692546947083739e+02, 8.715605164189047e+02, 8.738104349713153e+02, 8.760076234940765e+02, 8.781549769239836e+02,
- 8.802551443967211e+02, 8.823105569917930e+02, 8.843234516164474e+02, 8.862958916618035e+02, 8.882297849456814e+02,
- 8.901268993627195e+02, 8.919888765878076e+02, 8.938172441189511e+02, 8.956134258975181e+02, 8.973787517046907e+02,
- 8.991144655010476e+02, 9.008217328500687e+02, 9.025016475448055e+02, 9.041552375390970e+02, 9.057834702699156e+02,
- 9.073872574449897e+02, 9.089674593594800e+02, 9.105248887967268e+02, 9.120603145606618e+02, 9.135744646812399e+02,
- 9.150680293288482e+02, 9.165416634691372e+02, 9.179959892857696e+02, 9.194315983952163e+02, 9.208490538748830e+02,
- 9.222488921232612e+02, 9.236316245687019e+02, 9.249977392414849e+02, 9.263477022222110e+02, 9.276819589781255e+02,
- 9.290009355977048e+02, 9.303050399327539e+02, 9.315946626562807e+02, 9.328701782435495e+02, 9.341319458829880e+02,
- 9.353803103229271e+02, 9.366156026595763e+02, 9.378381410711038e+02, 9.390482315022309e+02, 9.402461683033238e+02,
- 9.414322348276013e+02, 9.426067039897403e+02, 9.437698387888621e+02, 9.449218927986193e+02, 9.460631106268573e+02,
- 9.471937283471134e+02, 9.483139739040206e+02, 9.494240674944979e+02, 9.505242219264712e+02, 9.516146429567032e+02,
- 9.526955296091892e+02, 9.537670744754651e+02, 9.548294639980591e+02, 9.558828787382071e+02, 9.569274936289067e+02,
- 9.579634782142432e+02, 9.589909968759001e+02, 9.600102090476771e+02, 9.610212694187628e+02, 9.620243281264900e+02,
- 9.630195309392095e+02, 9.640070194299014e+02, 9.649869311410847e+02, 9.659593997415453e+02, 9.669245551758751e+02,
- 9.678825238082917e+02, 9.688334285562275e+02, 9.697773890182036e+02, 9.707145215962921e+02, 9.716449395112028e+02,
- 9.725687533307679e+02, 9.734860704338224e+02, 9.743969950250054e+02, 9.753016300145251e+02, 9.762000745312771e+02,
- 9.770924255831059e+02, 9.779787777799568e+02, 9.788592234149448e+02, 9.797338525419511e+02, 9.806027530499352e+02,
- 9.814660107341271e+02, 9.823237093642530e+02, 9.831759307499564e+02, 9.840227548035316e+02, 9.848642596001345e+02,
- 9.857005214355536e+02, 9.865316148816996e+02, 9.873576128398920e+02, 9.881785866078823e+02, 9.889946058643169e+02,
- 9.898057388155626e+02, 9.906120521731956e+02, 9.914136112152587e+02, 9.922104798284086e+02, 9.930027205484934e+02,
- 9.937903945996338e+02, 9.945735619318676e+02, 9.953522812574258e+02, 9.961266100857022e+02, 9.968966047569700e+02,
- 9.976623204748978e+02, 9.984238113379236e+02, 9.991811303695266e+02, 9.999343295474530e+02, 1.000683459831928e+03,
- 1.001428571192907e+03, 1.002169712636404e+03, 1.002906932229925e+03, 1.003640277127055e+03, 1.004369793591230e+03,
- 1.005095527018721e+03, 1.005817521960866e+03, 1.006535822145580e+03, 1.007250470498175e+03, 1.007961509161501e+03,
- 1.008668979515456e+03, 1.009372922195876e+03, 1.010073377112828e+03, 1.010770383440929e+03, 1.011463979747993e+03,
- 1.012154203841599e+03, 1.012841092900622e+03, 1.013524683461510e+03, 1.014205011433457e+03, 1.014882112113123e+03,
- 1.015556020198922e+03, 1.016226769804883e+03, 1.016894394474094e+03, 1.017558927191776e+03, 1.018220400397956e+03,
- 1.018878845999779e+03, 1.019534295383483e+03, 1.020186779426009e+03, 1.020836328506299e+03, 1.021482972516269e+03,
- 1.022126740871482e+03, 1.022767662521513e+03, 1.023405765960037e+03, 1.024041079234638e+03, 1.024673629956348e+03,
- 1.025303445308931e+03, 1.025930552057907e+03, 1.026554976559352e+03, 1.027176744768441e+03, 1.027795882247785e+03,
- 1.028412414175532e+03, 1.029026365353268e+03, 1.029637760213705e+03, 1.030246622828171e+03, 1.030852976913905e+03,
- 1.031456845841177e+03, 1.032058252640206e+03, 1.032657220007922e+03, 1.033253770314546e+03, 1.033847925610010e+03,
- 1.034439707630215e+03, 1.035029137803135e+03, 1.035616237254769e+03, 1.036201026814950e+03, 1.036783527023010e+03,
- 1.037363758133303e+03, 1.037941740120608e+03, 1.038517492685385e+03, 1.039091035258922e+03, 1.039662387008345e+03,
- 1.040231566841521e+03, 1.040798593411839e+03, 1.041363485122881e+03, 1.041926260132986e+03, 1.042486936359705e+03,
- 1.043045531484157e+03, 1.043602062955278e+03, 1.044156547993985e+03, 1.044709003597234e+03, 1.045259446541990e+03,
- 1.045807893389116e+03, 1.046354360487154e+03, 1.046898863976050e+03, 1.047441419790771e+03, 1.047982043137158e+03,
- 1.048520750590008e+03, 1.049057556978554e+03, 1.049592477452577e+03, 1.050125526973861e+03, 1.050656720319375e+03,
- 1.051186072084385e+03, 1.051713596685494e+03, 1.052239308363624e+03, 1.052763221186932e+03, 1.053285349053663e+03,
- 1.053805705694950e+03, 1.054324304677543e+03, 1.054841159406498e+03, 1.055356283127795e+03, 1.055869688930911e+03,
- 1.056381389751341e+03, 1.056891398373054e+03, 1.057399727459368e+03, 1.057906389440393e+03, 1.058411396689484e+03,
- 1.058914761408222e+03, 1.059416495658273e+03, 1.059916611363579e+03, 1.060415120312487e+03, 1.060912034159859e+03,
- 1.061407364429125e+03, 1.061901122514297e+03, 1.062393319681952e+03, 1.062883967073170e+03, 1.063373075705431e+03,
- 1.063860656474490e+03, 1.064346720156203e+03, 1.064831277408315e+03, 1.065314338772233e+03, 1.065795914674746e+03,
- 1.066276015429723e+03, 1.066754651239773e+03, 1.067231832197886e+03, 1.067707568289025e+03, 1.068181869391702e+03,
- 1.068654745279526e+03, 1.069126205622712e+03, 1.069596259989572e+03, 1.070064917847971e+03, 1.070532188566768e+03,
- 1.070998081417217e+03, 1.071462605574353e+03, 1.071925770118348e+03, 1.072387584035845e+03, 1.072848056221268e+03,
- 1.073307195478111e+03, 1.073765010520194e+03, 1.074221509972912e+03, 1.074676702374453e+03, 1.075130596176995e+03,
- 1.075583199747882e+03, 1.076034521370788e+03, 1.076484569246844e+03, 1.076933351495765e+03, 1.077380876156941e+03,
- 1.077827151190523e+03, 1.078272184478479e+03, 1.078715983825642e+03, 1.079158556960731e+03, 1.079599911537362e+03,
- 1.080040055135042e+03, 1.080478995260137e+03, 1.080916739346836e+03, 1.081353294758092e+03, 1.081788668786553e+03,
- 1.082222868655466e+03, 1.082655901519581e+03, 1.083087774466031e+03, 1.083518494515197e+03, 1.083948068621567e+03,
- 1.084376503674573e+03, 1.084803806499416e+03, 1.085229983857882e+03, 1.085655042449142e+03, 1.086078988910534e+03,
- 1.086501829818350e+03, 1.086923571688581e+03, 1.087344220977684e+03, 1.087763784083311e+03, 1.088182267345038e+03,
- 1.088599677045082e+03, 1.089016019409006e+03, 1.089431300606409e+03, 1.089845526751614e+03, 1.090258703904333e+03,
- 1.090670838070339e+03, 1.091081935202107e+03, 1.091492001199465e+03, 1.091901041910219e+03, 1.092309063130781e+03,
- 1.092716070606776e+03, 1.093122070033652e+03, 1.093527067057272e+03, 1.093931067274498e+03, 1.094334076233770e+03,
- 1.094736099435675e+03, 1.095137142333506e+03, 1.095537210333812e+03, 1.095936308796946e+03, 1.096334443037596e+03,
- 1.096731618325315e+03, 1.097127839885041e+03, 1.097523112897609e+03, 1.097917442500254e+03, 1.098310833787116e+03,
- 1.098703291809717e+03, 1.099094821577461e+03, 1.099485428058096e+03, 1.099875116178193e+03, 1.100263890823604e+03,
- 1.100651756839920e+03, 1.101038719032923e+03, 1.101424782169025e+03, 1.101809950975711e+03, 1.102194230141964e+03,
- 1.102577624318695e+03, 1.102960138119160e+03, 1.103341776119374e+03, 1.103722542858518e+03, 1.104102442839342e+03,
- 1.104481480528560e+03, 1.104859660357244e+03, 1.105236986721204e+03, 1.105613463981376e+03, 1.105989096464190e+03,
- 1.106363888461944e+03, 1.106737844233169e+03, 1.107110968002986e+03, 1.107483263963467e+03, 1.107854736273980e+03,
- 1.108225389061534e+03, 1.108595226421131e+03, 1.108964252416087e+03, 1.109332471078374e+03, 1.109699886408947e+03,
- 1.110066502378065e+03, 1.110432322925610e+03, 1.110797351961406e+03, 1.111161593365523e+03, 1.111525050988592e+03,
- 1.111887728652099e+03, 1.112249630148693e+03, 1.112610759242472e+03, 1.112971119669282e+03, 1.113330715136997e+03,
- 1.113689549325811e+03, 1.114047625888510e+03, 1.114404948450754e+03, 1.114761520611348e+03, 1.115117345942512e+03,
- 1.115472427990145e+03, 1.115826770274090e+03, 1.116180376288396e+03, 1.116533249501566e+03, 1.116885393356818e+03,
- 1.117236811272331e+03, 1.117587506641493e+03, 1.117937482833142e+03, 1.118286743191812e+03, 1.118635291037963e+03,
- 1.118983129668223e+03, 1.119330262355614e+03, 1.119676692349785e+03, 1.120022422877237e+03, 1.120367457141543e+03,
- 1.120711798323576e+03, 1.121055449581718e+03, 1.121398414052082e+03, 1.121740694848723e+03, 1.122082295063846e+03,
- 1.122423217768017e+03, 1.122763466010363e+03, 1.123103042818781e+03, 1.123441951200136e+03, 1.123780194140454e+03,
- 1.124117774605124e+03, 1.124454695539091e+03, 1.124790959867040e+03, 1.125126570493593e+03, 1.125461530303489e+03,
- 1.125795842161774e+03, 1.126129508913976e+03, 1.126462533386294e+03, 1.126794918385767e+03, 1.127126666700456e+03,
- 1.127457781099614e+03, 1.127788264333858e+03, 1.128118119135344e+03, 1.128447348217929e+03, 1.128775954277337e+03,
- 1.129103939991326e+03, 1.129431308019851e+03, 1.129758061005218e+03, 1.130084201572249e+03, 1.130409732328438e+03,
- 1.130734655864100e+03, 1.131058974752531e+03, 1.131382691550157e+03, 1.131705808796683e+03, 1.132028329015240e+03,
- 1.132350254712535e+03, 1.132671588378992e+03, 1.132992332488898e+03, 1.133312489500543e+03, 1.133632061856361e+03,
- 1.133951051983064e+03, 1.134269462291790e+03, 1.134587295178222e+03, 1.134904553022739e+03, 1.135221238190536e+03,
- 1.135537353031761e+03, 1.135852899881643e+03, 1.136167881060620e+03, 1.136482298874466e+03, 1.136796155614417e+03,
- 1.137109453557293e+03, 1.137422194965625e+03, 1.137734382087772e+03, 1.138046017158041e+03, 1.138357102396813e+03,
- 1.138667640010648e+03, 1.138977632192414e+03, 1.139287081121394e+03, 1.139595988963404e+03, 1.139904357870902e+03,
- 1.140212189983104e+03, 1.140519487426089e+03, 1.140826252312911e+03, 1.141132486743711e+03, 1.141438192805815e+03,
- 1.141743372573847e+03, 1.142048028109829e+03, 1.142352161463289e+03, 1.142655774671360e+03, 1.142958869758882e+03,
- 1.143261448738503e+03, 1.143563513610779e+03, 1.143865066364272e+03, 1.144166108975644e+03, 1.144466643409758e+03,
- 1.144766671619773e+03, 1.145066195547235e+03, 1.145365217122171e+03, 1.145663738263186e+03, 1.145961760877547e+03,
- 1.146259286861280e+03, 1.146556318099259e+03, 1.146852856465289e+03, 1.147148903822202e+03, 1.147444462021937e+03,
- 1.147739532905633e+03, 1.148034118303705e+03, 1.148328220035938e+03, 1.148621839911566e+03, 1.148914979729352e+03,
- 1.149207641277677e+03, 1.149499826334615e+03, 1.149791536668017e+03, 1.150082774035588e+03, 1.150373540184966e+03
- },
- {
- 1.828683380589245e+00, 5.588805124582649e+00, 9.436062746888222e+00, 1.337584058482143e+01, 1.741408146288414e+01,
- 2.155736944343814e+01, 2.581302892163222e+01, 3.018924417436374e+01, 3.469520476638449e+01, 3.934128397857346e+01,
- 4.413925989468186e+01, 4.910259228876201e+01, 5.424677351983967e+01, 5.958977909685171e+01, 6.515265479137040e+01,
- 7.096029444824089e+01, 7.704248997003444e+01, 8.343537951693025e+01, 9.018349522565444e+01, 9.734274409572528e+01,
- 1.049848997462957e+02, 1.132046588750517e+02, 1.221313122189737e+02, 1.319493489220186e+02, 1.429380971782167e+02,
- 1.555576640070411e+02, 1.706721561780433e+02, 7.982211437667146e+02, 8.036438048727314e+02, 8.086535569475895e+02,
- 8.133200547632711e+02, 8.176956993446213e+02, 8.218210929542049e+02, 8.257284441471988e+02, 8.294437995817869e+02,
- 8.329885648578564e+02, 8.363805743305986e+02, 8.396348638657445e+02, 8.427642417168597e+02, 8.457797185110439e+02,
- 8.486908366287638e+02, 8.515059262973132e+02, 8.542323073531167e+02, 8.568764500922304e+02, 8.594441048807103e+02,
- 8.619404076079566e+02, 8.643699662457168e+02, 8.667369324744245e+02, 8.690450613947987e+02, 8.712977616491039e+02,
- 8.734981377602197e+02, 8.756490261082964e+02, 8.777530256693814e+02, 8.798125244136257e+02, 8.818297220849778e+02,
- 8.838066499470493e+02, 8.857451879717354e+02, 8.876470798615376e+02, 8.895139462280063e+02, 8.913472961937961e+02,
- 8.931485376412846e+02, 8.949189862945489e+02, 8.966598737918844e+02, 8.983723548817457e+02, 9.000575138548760e+02,
- 9.017163703087317e+02, 9.033498843263775e+02, 9.049589611404177e+02, 9.065444553427326e+02, 9.081071746925238e+02,
- 9.096478835681896e+02, 9.111673061026088e+02, 9.126661290363498e+02, 9.141450043189527e+02, 9.156045514847636e+02,
- 9.170453598265432e+02, 9.184679903873466e+02, 9.198729777887499e+02, 9.212608319114429e+02, 9.226320394423759e+02,
- 9.239870653010923e+02, 9.253263539564844e+02, 9.266503306440147e+02, 9.279594024923617e+02, 9.292539595675349e+02,
- 9.305343758416815e+02, 9.318010100930358e+02, 9.330542067428925e+02, 9.342942966348338e+02, 9.355215977609818e+02,
- 9.367364159395744e+02, 9.379390454477641e+02, 9.391297696131770e+02, 9.403088613674381e+02, 9.414765837645930e+02,
- 9.426331904670923e+02, 9.437789262017454e+02, 9.449140271878952e+02, 9.460387215398126e+02, 9.471532296451804e+02,
- 9.482577645213682e+02, 9.493525321510550e+02, 9.504377317986327e+02, 9.515135563087163e+02, 9.525801923879604e+02,
- 9.536378208713191e+02, 9.546866169737561e+02, 9.557267505283824e+02, 9.567583862118763e+02, 9.577816837580202e+02,
- 9.587967981600881e+02, 9.598038798628020e+02, 9.608030749444827e+02, 9.617945252900059e+02, 9.627783687551300e+02,
- 9.637547393237618e+02, 9.647237672579325e+02, 9.656855792374154e+02, 9.666402984940181e+02, 9.675880449397524e+02,
- 9.685289352897444e+02, 9.694630830744395e+02, 9.703905987635075e+02, 9.713115906781729e+02, 9.722261635788810e+02,
- 9.731344198297264e+02, 9.740364592211804e+02, 9.749323790585327e+02, 9.758222742464957e+02, 9.767062373701616e+02,
- 9.775843587725145e+02, 9.784567266286588e+02, 9.793234270169488e+02, 9.801845439871618e+02, 9.810401596258631e+02,
- 9.818903541191155e+02, 9.827352058126463e+02, 9.835747912696086e+02, 9.844091853260452e+02, 9.852384611441706e+02,
- 9.860626902789561e+02, 9.868819426643638e+02, 9.876962867574506e+02, 9.885057895177333e+02, 9.893105164679736e+02,
- 9.901105317363449e+02, 9.909058980970281e+02, 9.916966770093081e+02, 9.924829286552440e+02, 9.932647119759732e+02,
- 9.940420847067021e+02, 9.948151034104534e+02, 9.955838235106127e+02, 9.963482993223303e+02, 9.971085840828285e+02,
- 9.978647299806561e+02, 9.986167881839376e+02, 9.993648088676575e+02, 1.000108841240021e+03, 1.000848933567926e+03,
- 1.001585133201588e+03, 1.002317486598337e+03, 1.003046039345652e+03, 1.003770836183419e+03, 1.004491921025482e+03,
- 1.005209336980497e+03, 1.005923126372111e+03, 1.006633330758504e+03, 1.007339990924650e+03, 1.008043147009128e+03,
- 1.008742838356337e+03, 1.009439103646048e+03, 1.010131980881481e+03, 1.010821507405475e+03, 1.011507719916182e+03,
- 1.012190654482266e+03, 1.012870346557666e+03, 1.013546830995912e+03, 1.014220142064016e+03, 1.014890313455962e+03,
- 1.015557378305799e+03, 1.016221369200345e+03, 1.016882318191552e+03, 1.017540256808481e+03, 1.018195216068968e+03,
- 1.018847226490939e+03, 1.019496318103420e+03, 1.020142520457233e+03, 1.020785862635394e+03, 1.021426373263233e+03,
- 1.022064080518223e+03, 1.022699012139554e+03, 1.023331195437440e+03, 1.023960657302175e+03, 1.024587424212950e+03,
- 1.025211522246435e+03, 1.025832977085130e+03, 1.026451814025501e+03, 1.027068057985897e+03, 1.027681733514267e+03,
- 1.028292864795675e+03, 1.028901475659622e+03, 1.029507589587175e+03, 1.030111229717925e+03, 1.030712418856764e+03,
- 1.031311179480482e+03, 1.031907533744219e+03, 1.032501503487737e+03, 1.033093110241550e+03, 1.033682375232891e+03,
- 1.034269319391548e+03, 1.034853963355539e+03, 1.035436327476670e+03, 1.036016431825942e+03, 1.036594296198835e+03,
- 1.037169940120468e+03, 1.037743382850635e+03, 1.038314643388717e+03, 1.038883740478488e+03, 1.039450692612798e+03,
- 1.040015518038160e+03, 1.040578234759212e+03, 1.041138860543101e+03, 1.041697412923742e+03, 1.042253909205999e+03,
- 1.042808366469755e+03, 1.043360801573908e+03, 1.043911231160257e+03, 1.044459671140823e+03, 1.045006138751312e+03,
- 1.045550649504227e+03, 1.046093219210257e+03, 1.046633863481215e+03, 1.047172597733454e+03, 1.047709437191195e+03,
- 1.048244396889792e+03, 1.048777491678921e+03, 1.049308736225706e+03, 1.049838145017773e+03, 1.050365732366243e+03,
- 1.050891512408660e+03, 1.051415499111858e+03, 1.051937706274765e+03, 1.052458147558803e+03, 1.052976836378867e+03,
- 1.053493786075259e+03, 1.054009009802215e+03, 1.054522520559250e+03, 1.055034331193641e+03, 1.055544454402848e+03,
- 1.056052902736899e+03, 1.056559688600712e+03, 1.057064824256386e+03, 1.057568321825430e+03, 1.058070193290966e+03,
- 1.058570450499871e+03, 1.059069105164894e+03, 1.059566168866707e+03, 1.060061653055947e+03, 1.060555569055196e+03,
- 1.061047928060926e+03, 1.061538741145414e+03, 1.062028019258618e+03, 1.062515773230008e+03, 1.063002013770373e+03,
- 1.063486751473593e+03, 1.063969996818370e+03, 1.064451760169931e+03, 1.064932051781703e+03, 1.065410881796951e+03,
- 1.065888260250382e+03, 1.066364197069735e+03, 1.066838702077322e+03, 1.067311784991557e+03, 1.067783455428442e+03,
- 1.068253722903046e+03, 1.068722596830932e+03, 1.069190086529582e+03, 1.069656201219779e+03, 1.070120950026975e+03,
- 1.070584341982629e+03, 1.071046386025523e+03, 1.071507091003053e+03, 1.071966465672503e+03, 1.072424518702286e+03,
- 1.072881258673175e+03, 1.073336694079504e+03, 1.073790833330351e+03, 1.074243684750704e+03, 1.074695256582598e+03,
- 1.075145556986243e+03, 1.075594594041125e+03, 1.076042375747089e+03, 1.076488910025412e+03, 1.076934204719843e+03,
- 1.077378267597638e+03, 1.077821106350576e+03, 1.078262728595946e+03, 1.078703141877538e+03, 1.079142353666598e+03,
- 1.079580371362778e+03, 1.080017202295067e+03, 1.080452853722710e+03, 1.080887332836107e+03, 1.081320646757696e+03,
- 1.081752802542834e+03, 1.082183807180647e+03, 1.082613667594876e+03, 1.083042390644710e+03, 1.083469983125600e+03,
- 1.083896451770067e+03, 1.084321803248484e+03, 1.084746044169869e+03, 1.085169181082637e+03, 1.085591220475363e+03,
- 1.086012168777522e+03, 1.086432032360218e+03, 1.086850817536905e+03, 1.087268530564092e+03, 1.087685177642048e+03,
- 1.088100764915476e+03, 1.088515298474199e+03, 1.088928784353821e+03, 1.089341228536380e+03, 1.089752636950998e+03,
- 1.090163015474512e+03, 1.090572369932099e+03, 1.090980706097900e+03, 1.091388029695614e+03, 1.091794346399107e+03,
- 1.092199661832995e+03, 1.092603981573223e+03, 1.093007311147641e+03, 1.093409656036562e+03, 1.093811021673319e+03,
- 1.094211413444814e+03, 1.094610836692048e+03, 1.095009296710658e+03, 1.095406798751442e+03, 1.095803348020864e+03,
- 1.096198949681570e+03, 1.096593608852887e+03, 1.096987330611313e+03, 1.097380119991005e+03, 1.097771981984258e+03,
- 1.098162921541974e+03, 1.098552943574133e+03, 1.098942052950247e+03, 1.099330254499813e+03, 1.099717553012760e+03,
- 1.100103953239888e+03, 1.100489459893302e+03, 1.100874077646836e+03, 1.101257811136481e+03, 1.101640664960793e+03,
- 1.102022643681308e+03, 1.102403751822944e+03, 1.102783993874398e+03, 1.103163374288543e+03, 1.103541897482813e+03,
- 1.103919567839582e+03, 1.104296389706549e+03, 1.104672367397103e+03, 1.105047505190694e+03, 1.105421807333193e+03,
- 1.105795278037247e+03, 1.106167921482637e+03, 1.106539741816622e+03, 1.106910743154280e+03, 1.107280929578851e+03,
- 1.107650305142067e+03, 1.108018873864484e+03, 1.108386639735803e+03, 1.108753606715198e+03, 1.109119778731627e+03,
- 1.109485159684143e+03, 1.109849753442208e+03, 1.110213563845994e+03, 1.110576594706682e+03, 1.110938849806763e+03,
- 1.111300332900325e+03, 1.111661047713349e+03, 1.112020997943985e+03, 1.112380187262841e+03, 1.112738619313261e+03,
- 1.113096297711591e+03, 1.113453226047460e+03, 1.113809407884042e+03, 1.114164846758322e+03, 1.114519546181354e+03,
- 1.114873509638523e+03, 1.115226740589795e+03, 1.115579242469970e+03, 1.115931018688930e+03, 1.116282072631883e+03,
- 1.116632407659606e+03, 1.116982027108683e+03, 1.117330934291740e+03, 1.117679132497680e+03, 1.118026624991913e+03,
- 1.118373415016580e+03, 1.118719505790781e+03, 1.119064900510795e+03, 1.119409602350301e+03, 1.119753614460592e+03,
- 1.120096939970790e+03, 1.120439581988057e+03, 1.120781543597804e+03, 1.121122827863898e+03, 1.121463437828862e+03,
- 1.121803376514082e+03, 1.122142646919999e+03, 1.122481252026314e+03, 1.122819194792175e+03, 1.123156478156370e+03,
- 1.123493105037520e+03, 1.123829078334265e+03, 1.124164400925448e+03, 1.124499075670296e+03, 1.124833105408608e+03,
- 1.125166492960927e+03, 1.125499241128718e+03, 1.125831352694548e+03, 1.126162830422249e+03, 1.126493677057098e+03,
- 1.126823895325979e+03, 1.127153487937555e+03, 1.127482457582429e+03, 1.127810806933309e+03, 1.128138538645167e+03,
- 1.128465655355401e+03, 1.128792159683993e+03, 1.129118054233657e+03, 1.129443341590007e+03, 1.129768024321693e+03,
- 1.130092104980567e+03, 1.130415586101818e+03, 1.130738470204128e+03, 1.131060759789817e+03, 1.131382457344983e+03,
- 1.131703565339644e+03, 1.132024086227886e+03, 1.132344022447992e+03, 1.132663376422588e+03, 1.132982150558776e+03,
- 1.133300347248264e+03, 1.133617968867510e+03, 1.133935017777843e+03, 1.134251496325597e+03, 1.134567406842244e+03,
- 1.134882751644515e+03, 1.135197533034530e+03, 1.135511753299921e+03, 1.135825414713956e+03, 1.136138519535663e+03,
- 1.136451070009945e+03, 1.136763068367706e+03, 1.137074516825966e+03, 1.137385417587977e+03, 1.137695772843342e+03,
- 1.138005584768124e+03, 1.138314855524967e+03, 1.138623587263201e+03, 1.138931782118954e+03, 1.139239442215267e+03,
- 1.139546569662197e+03, 1.139853166556923e+03, 1.140159234983861e+03, 1.140464777014760e+03, 1.140769794708809e+03,
- 1.141074290112744e+03, 1.141378265260944e+03, 1.141681722175534e+03, 1.141984662866488e+03, 1.142287089331724e+03,
- 1.142589003557200e+03, 1.142890407517019e+03, 1.143191303173516e+03, 1.143491692477356e+03, 1.143791577367631e+03,
- 1.144090959771948e+03, 1.144389841606525e+03, 1.144688224776278e+03, 1.144986111174916e+03, 1.145283502685024e+03,
- 1.145580401178159e+03, 1.145876808514930e+03, 1.146172726545092e+03, 1.146468157107622e+03, 1.146763102030815e+03,
- 1.147057563132359e+03, 1.147351542219423e+03, 1.147645041088738e+03, 1.147938061526678e+03, 1.148230605309343e+03
- },
- {
- 1.822180000150033e+00, 5.568193484734743e+00, 9.399940228377346e+00, 1.332263784880051e+01, 1.734203609089832e+01,
- 2.146449422213165e+01, 2.569707341230139e+01, 3.004764778659233e+01, 3.452503897594713e+01, 3.913918052511753e+01,
- 4.390132065851967e+01, 4.882427491610381e+01, 5.392274448532730e+01, 5.921372234671126e+01, 6.471701871279591e+01,
- 7.045595148932507e+01, 7.645826972783080e+01, 8.275741375663115e+01, 8.939427493666689e+01, 9.641972006091009e+01,
- 1.038983291003199e+02, 1.119141429750094e+02, 1.205799201082087e+02, 1.300529287014809e+02, 1.405639705789797e+02,
- 1.524763489081062e+02, 1.664242749856375e+02, 1.837226547736785e+02, 7.905659783148591e+02, 7.963288571571167e+02,
- 8.016258669287345e+02, 8.065397207595992e+02, 8.111316653328546e+02, 8.154485634297506e+02, 8.195272099794033e+02,
- 8.233971067983342e+02, 8.270823234756804e+02, 8.306027889411638e+02, 8.339752137707483e+02, 8.372137648285055e+02,
- 8.403305690296386e+02, 8.433360963041742e+02, 8.462394553428804e+02, 8.490486251939167e+02, 8.517706388963175e+02,
- 8.544117307225669e+02, 8.569774554438615e+02, 8.594727858281274e+02, 8.619021930174866e+02, 8.642697133055311e+02,
- 8.665790040119618e+02, 8.688333905433052e+02, 8.710359062727002e+02, 8.731893265268053e+02, 8.752961977043000e+02,
- 8.773588623470667e+02, 8.793794808268979e+02, 8.813600501864229e+02, 8.833024205748435e+02, 8.852083096409599e+02,
- 8.870793151833581e+02, 8.889169263071950e+02, 8.907225332960429e+02, 8.924974363738697e+02, 8.942428535048541e+02,
- 8.959599273561372e+02, 8.976497315299321e+02, 8.993132761558574e+02, 9.009515129213602e+02, 9.025653396071898e+02,
- 9.041556041857089e+02, 9.057231085320379e+02, 9.072686117914826e+02, 9.087928334410300e+02, 9.102964560779484e+02,
- 9.117801279643953e+02, 9.132444653534169e+02, 9.146900546186628e+02, 9.161174542075300e+02, 9.175271964351513e+02,
- 9.189197891346581e+02, 9.202957171774349e+02, 9.216554438755559e+02, 9.229994122772811e+02, 9.243280463653335e+02,
- 9.256417521666436e+02, 9.269409187813638e+02, 9.282259193381593e+02, 9.294971118820656e+02, 9.307548402006024e+02,
- 9.319994345932573e+02, 9.332312125889853e+02, 9.344504796159013e+02, 9.356575296269842e+02, 9.368526456852385e+02,
- 9.380361005114461e+02, 9.392081569973757e+02, 9.403690686870501e+02, 9.415190802284447e+02, 9.426584277977963e+02,
- 9.437873394985048e+02, 9.449060357364435e+02, 9.460147295733635e+02, 9.471136270599005e+02, 9.482029275496139e+02,
- 9.492828239953361e+02, 9.503535032290391e+02, 9.514151462263005e+02, 9.524679283564069e+02, 9.535120196190041e+02,
- 9.545475848681814e+02, 9.555747840247809e+02, 9.565937722776719e+02, 9.576047002746902e+02, 9.586077143038608e+02,
- 9.596029564655915e+02, 9.605905648379299e+02, 9.615706736323517e+02, 9.625434133401455e+02, 9.635089108730801e+02,
- 9.644672896974436e+02, 9.654186699617206e+02, 9.663631685089803e+02, 9.673008989836154e+02, 9.682319728881375e+02,
- 9.691564979480702e+02, 9.700745794339541e+02, 9.709863199501320e+02, 9.718918195270080e+02, 9.727911757092568e+02,
- 9.736844836402300e+02, 9.745718361427258e+02, 9.754533237963335e+02, 9.763290350115171e+02, 9.771990561006030e+02,
- 9.780634713458334e+02, 9.789223630646294e+02, 9.797758116721943e+02, 9.806238957416025e+02, 9.814666920614760e+02,
- 9.823042756913884e+02, 9.831367200150829e+02, 9.839640968064396e+02, 9.847864762179942e+02, 9.856039269214207e+02,
- 9.864165160893125e+02, 9.872243094553173e+02, 9.880273713562742e+02, 9.888257647727938e+02, 9.896195513683438e+02,
- 9.904087915269082e+02, 9.911935443892800e+02, 9.919738678880559e+02, 9.927498187813788e+02, 9.935214526854868e+02,
- 9.942888241061196e+02, 9.950519864688320e+02, 9.958109921482583e+02, 9.965658924963695e+02, 9.973167378697724e+02,
- 9.980635776560821e+02, 9.988064602994071e+02, 9.995454333249908e+02, 1.000280543363030e+03, 1.001011836171717e+03,
- 1.001739356659530e+03, 1.002463148906790e+03, 1.003183256158867e+03, 1.003899720958960e+03, 1.004612584995837e+03,
- 1.005321889239400e+03, 1.006027673929342e+03, 1.006729978592930e+03, 1.007428842062235e+03, 1.008124302490843e+03,
- 1.008816397370048e+03, 1.009505163544563e+03, 1.010190637227751e+03, 1.010872854016404e+03, 1.011551848905081e+03,
- 1.012227656300032e+03, 1.012900310032699e+03, 1.013569843372839e+03, 1.014236289041257e+03, 1.014899679222176e+03,
- 1.015560045575253e+03, 1.016217419247259e+03, 1.016871830883418e+03, 1.017523310638438e+03, 1.018171888187231e+03,
- 1.018817592735335e+03, 1.019460453029050e+03, 1.020100497365295e+03, 1.020737753601199e+03, 1.021372249163429e+03,
- 1.022004011057273e+03, 1.022633065875470e+03, 1.023259439806818e+03, 1.023883158644541e+03, 1.024504247794449e+03,
- 1.025122732282871e+03, 1.025738636764397e+03, 1.026351985529408e+03, 1.026962802511412e+03, 1.027571111294207e+03,
- 1.028176935118842e+03, 1.028780296890419e+03, 1.029381219184711e+03, 1.029979724254625e+03, 1.030575834036496e+03,
- 1.031169570156234e+03, 1.031760953935307e+03, 1.032350006396591e+03, 1.032936748270071e+03, 1.033521199998403e+03,
- 1.034103381742346e+03, 1.034683313386057e+03, 1.035261014542273e+03, 1.035836504557351e+03, 1.036409802516208e+03,
- 1.036980927247133e+03, 1.037549897326487e+03, 1.038116731083305e+03, 1.038681446603779e+03, 1.039244061735637e+03,
- 1.039804594092438e+03, 1.040363061057752e+03, 1.040919479789251e+03, 1.041473866702080e+03, 1.042026239538718e+03,
- 1.042576614298433e+03, 1.043125007274420e+03, 1.043671434553102e+03, 1.044215912017703e+03, 1.044758455351743e+03,
- 1.045299080042458e+03, 1.045837801384147e+03, 1.046374634481443e+03, 1.046909594252516e+03, 1.047442695459020e+03,
- 1.047973952600802e+03, 1.048503380083154e+03, 1.049030992109075e+03, 1.049556802710124e+03, 1.050080825749232e+03,
- 1.050603074923463e+03, 1.051123563766717e+03, 1.051642305652372e+03, 1.052159313795876e+03, 1.052674601257288e+03,
- 1.053188180943759e+03, 1.053700065611974e+03, 1.054210267870531e+03, 1.054718800182291e+03, 1.055225674866658e+03,
- 1.055730904101835e+03, 1.056234499927018e+03, 1.056736474244561e+03, 1.057236838822090e+03, 1.057735605294571e+03,
- 1.058232785166354e+03, 1.058728389813161e+03, 1.059222430484045e+03, 1.059714918303303e+03, 1.060205864272365e+03,
- 1.060695279271633e+03, 1.061183174062295e+03, 1.061669559288101e+03, 1.062154445477101e+03, 1.062637843043361e+03,
- 1.063119762288638e+03, 1.063600213404025e+03, 1.064079206471569e+03, 1.064556751465858e+03, 1.065032858255574e+03,
- 1.065507536605024e+03, 1.065980796175643e+03, 1.066452646527458e+03, 1.066923097120547e+03, 1.067392157316449e+03,
- 1.067859836379561e+03, 1.068326143478513e+03, 1.068791087687505e+03, 1.069254677987635e+03, 1.069716923268193e+03,
- 1.070177832327938e+03, 1.070637413876350e+03, 1.071095676534861e+03, 1.071552628838061e+03, 1.072008279234891e+03,
- 1.072462636089810e+03, 1.072915707683938e+03, 1.073367502216186e+03, 1.073818027804368e+03, 1.074267292486286e+03,
- 1.074715304220799e+03, 1.075162070888886e+03, 1.075607600294667e+03, 1.076051900166433e+03, 1.076494978157637e+03,
- 1.076936841847887e+03, 1.077377498743904e+03, 1.077816956280481e+03, 1.078255221821415e+03, 1.078692302660430e+03,
- 1.079128206022076e+03, 1.079562939062627e+03, 1.079996508870956e+03, 1.080428922469390e+03, 1.080860186814566e+03,
- 1.081290308798258e+03, 1.081719295248205e+03, 1.082147152928912e+03, 1.082573888542449e+03, 1.082999508729231e+03,
- 1.083424020068788e+03, 1.083847429080523e+03, 1.084269742224458e+03, 1.084690965901966e+03, 1.085111106456496e+03,
- 1.085530170174281e+03, 1.085948163285043e+03, 1.086365091962676e+03, 1.086780962325931e+03, 1.087195780439079e+03,
- 1.087609552312570e+03, 1.088022283903688e+03, 1.088433981117175e+03, 1.088844649805875e+03, 1.089254295771340e+03,
- 1.089662924764448e+03, 1.090070542486000e+03, 1.090477154587311e+03, 1.090882766670794e+03, 1.091287384290534e+03,
- 1.091691012952850e+03, 1.092093658116858e+03, 1.092495325195014e+03, 1.092896019553659e+03, 1.093295746513548e+03,
- 1.093694511350380e+03, 1.094092319295310e+03, 1.094489175535462e+03, 1.094885085214431e+03, 1.095280053432778e+03,
- 1.095674085248518e+03, 1.096067185677603e+03, 1.096459359694391e+03, 1.096850612232122e+03, 1.097240948183370e+03,
- 1.097630372400502e+03, 1.098018889696126e+03, 1.098406504843533e+03, 1.098793222577129e+03, 1.099179047592865e+03,
- 1.099563984548667e+03, 1.099948038064845e+03, 1.100331212724507e+03, 1.100713513073968e+03, 1.101094943623147e+03,
- 1.101475508845962e+03, 1.101855213180724e+03, 1.102234061030513e+03, 1.102612056763566e+03, 1.102989204713642e+03,
- 1.103365509180398e+03, 1.103740974429748e+03, 1.104115604694223e+03, 1.104489404173325e+03, 1.104862377033879e+03,
- 1.105234527410372e+03, 1.105605859405297e+03, 1.105976377089489e+03, 1.106346084502451e+03, 1.106714985652688e+03,
- 1.107083084518021e+03, 1.107450385045915e+03, 1.107816891153782e+03, 1.108182606729300e+03, 1.108547535630712e+03,
- 1.108911681687134e+03, 1.109275048698846e+03, 1.109637640437595e+03, 1.109999460646875e+03, 1.110360513042221e+03,
- 1.110720801311489e+03, 1.111080329115138e+03, 1.111439100086500e+03, 1.111797117832057e+03, 1.112154385931709e+03,
- 1.112510907939039e+03, 1.112866687381575e+03, 1.113221727761045e+03, 1.113576032553641e+03, 1.113929605210264e+03,
- 1.114282449156774e+03, 1.114634567794240e+03, 1.114985964499179e+03, 1.115336642623797e+03, 1.115686605496226e+03,
- 1.116035856420761e+03, 1.116384398678086e+03, 1.116732235525506e+03, 1.117079370197172e+03, 1.117425805904302e+03,
- 1.117771545835405e+03, 1.118116593156494e+03, 1.118460951011303e+03, 1.118804622521501e+03, 1.119147610786899e+03,
- 1.119489918885655e+03, 1.119831549874488e+03, 1.120172506788869e+03, 1.120512792643226e+03, 1.120852410431144e+03,
- 1.121191363125556e+03, 1.121529653678938e+03, 1.121867285023497e+03, 1.122204260071363e+03, 1.122540581714773e+03,
- 1.122876252826255e+03, 1.123211276258809e+03, 1.123545654846089e+03, 1.123879391402579e+03, 1.124212488723768e+03,
- 1.124544949586326e+03, 1.124876776748272e+03, 1.125207972949146e+03, 1.125538540910175e+03, 1.125868483334441e+03,
- 1.126197802907042e+03, 1.126526502295257e+03, 1.126854584148701e+03, 1.127182051099490e+03, 1.127508905762392e+03,
- 1.127835150734984e+03, 1.128160788597804e+03, 1.128485821914504e+03, 1.128810253231999e+03, 1.129134085080612e+03,
- 1.129457319974224e+03, 1.129779960410417e+03, 1.130102008870616e+03, 1.130423467820233e+03, 1.130744339708805e+03,
- 1.131064626970130e+03, 1.131384332022411e+03, 1.131703457268384e+03, 1.132022005095453e+03, 1.132339977875828e+03,
- 1.132657377966648e+03, 1.132974207710115e+03, 1.133290469433624e+03, 1.133606165449884e+03, 1.133921298057046e+03,
- 1.134235869538831e+03, 1.134549882164644e+03, 1.134863338189704e+03, 1.135176239855158e+03, 1.135488589388205e+03,
- 1.135800389002206e+03, 1.136111640896809e+03, 1.136422347258058e+03, 1.136732510258509e+03, 1.137042132057339e+03,
- 1.137351214800466e+03, 1.137659760620650e+03, 1.137967771637607e+03, 1.138275249958116e+03, 1.138582197676124e+03,
- 1.138888616872856e+03, 1.139194509616914e+03, 1.139499877964385e+03, 1.139804723958942e+03, 1.140109049631944e+03,
- 1.140412857002538e+03, 1.140716148077759e+03, 1.141018924852627e+03, 1.141321189310241e+03, 1.141622943421884e+03,
- 1.141924189147108e+03, 1.142224928433838e+03, 1.142525163218457e+03, 1.142824895425903e+03, 1.143124126969763e+03,
- 1.143422859752354e+03, 1.143721095664826e+03, 1.144018836587238e+03, 1.144316084388655e+03, 1.144612840927228e+03,
- 1.144909108050290e+03, 1.145204887594427e+03, 1.145500181385576e+03, 1.145794991239102e+03, 1.146089318959881e+03
- },
- {
- 1.815723590293792e+00, 5.547741973301347e+00, 9.364119310022142e+00, 1.326991225326139e+01, 1.727068456341575e+01,
- 2.137257951347054e+01, 2.558240603613146e+01, 2.990774192557961e+01, 3.435705840324101e+01, 3.893987169743523e+01,
- 4.366692914112954e+01, 4.855043988264628e+01, 5.360436398370550e+01, 5.884477899627222e+01, 6.429035094150048e+01,
- 6.996294839781959e+01, 7.588845656148489e+01, 8.209787687672627e+01, 8.862884470900872e+01, 9.552777671822825e+01,
- 1.028529988491558e+02, 1.106794626721360e+02, 1.191061586891296e+02, 1.282683825351360e+02, 1.383593931771599e+02,
- 1.496720644779551e+02, 1.626890437154810e+02, 1.783158872257761e+02, 7.759655938076395e+02, 7.827654443446204e+02,
- 7.888967882177874e+02, 7.945016046424854e+02, 7.996783459859646e+02, 8.044986875149965e+02, 8.090167432063699e+02,
- 8.132745433995641e+02, 8.173054864216909e+02, 8.211366154781526e+02, 8.247901771479186e+02, 8.282847211852928e+02,
- 8.316358968022694e+02, 8.348570419779442e+02, 8.379596279524818e+02, 8.409536001121702e+02, 8.438476432852797e+02,
- 8.466493909304822e+02, 8.493655920326007e+02, 8.520022456754344e+02, 8.545647106009353e+02, 8.570577951904645e+02,
- 8.594858319632351e+02, 8.618527397137098e+02, 8.641620756938623e+02, 8.664170797129203e+02, 8.686207116258228e+02,
- 8.707756833761058e+02, 8.728844865242942e+02, 8.749494160109864e+02, 8.769725907616720e+02, 8.789559716283544e+02,
- 8.809013770741921e+02, 8.828104969364056e+02, 8.846849045456253e+02, 8.865260674336650e+02, 8.883353568241341e+02,
- 8.901140560695940e+02, 8.918633681736341e+02, 8.935844225154053e+02, 8.952782808767492e+02, 8.969459428576579e+02,
- 8.985883507536204e+02, 9.002063939582870e+02, 9.018009129462303e+02, 9.033727028833380e+02, 9.049225169061532e+02,
- 9.064510691062139e+02, 9.079590372508969e+02, 9.094470652684203e+02, 9.109157655212886e+02, 9.123657208895953e+02,
- 9.137974866830930e+02, 9.152115923987628e+02, 9.166085433387542e+02, 9.179888221018713e+02, 9.193528899603913e+02,
- 9.207011881327031e+02, 9.220341389611542e+02, 9.233521470035181e+02, 9.246556000456335e+02, 9.259448700419941e+02,
- 9.272203139904137e+02, 9.284822747462575e+02, 9.297310817812383e+02, 9.309670518912712e+02, 9.321904898574668e+02,
- 9.334016890639774e+02, 9.346009320760390e+02, 9.357884911812955e+02, 9.369646288971685e+02, 9.381295984468353e+02,
- 9.392836442061239e+02, 9.404270021234601e+02, 9.415599001147950e+02, 9.426825584353112e+02, 9.437951900295321e+02,
- 9.448980008613340e+02, 9.459911902252514e+02, 9.470749510403330e+02, 9.481494701277246e+02, 9.492149284730643e+02,
- 9.502715014746709e+02, 9.513193591784631e+02, 9.523586665004456e+02, 9.533895834375616e+02, 9.544122652676351e+02,
- 9.554268627390778e+02, 9.564335222513002e+02, 9.574323860279009e+02, 9.584235922783270e+02, 9.594072753515109e+02,
- 9.603835658829469e+02, 9.613525909347144e+02, 9.623144741288221e+02, 9.632693356567873e+02, 9.642172923682851e+02,
- 9.651584589914841e+02, 9.660929462442829e+02, 9.670208623342101e+02, 9.679423127085462e+02, 9.688574001504629e+02,
- 9.697662248709338e+02, 9.706688845966414e+02, 9.715654746540890e+02, 9.724560880501147e+02, 9.733408155489898e+02,
- 9.742197457462864e+02, 9.750929651396610e+02, 9.759605581967243e+02, 9.768226074201312e+02, 9.776791934100336e+02,
- 9.785303949240247e+02, 9.793762889346899e+02, 9.802169506848896e+02, 9.810524537408476e+02, 9.818828700574539e+02,
- 9.827082699692683e+02, 9.835287223268355e+02, 9.843442944812390e+02, 9.851550523434257e+02, 9.859610604262920e+02,
- 9.867623818852047e+02, 9.875590785570450e+02, 9.883512109978215e+02, 9.891388385189290e+02, 9.899220192221070e+02,
- 9.907008100331568e+02, 9.914752667344615e+02, 9.922454439963763e+02, 9.930113954075197e+02, 9.937731735040229e+02,
- 9.945308297977765e+02, 9.952844148037173e+02, 9.960339780661939e+02, 9.967795681844466e+02, 9.975212328372460e+02,
- 9.982590188067089e+02, 9.989929720013389e+02, 9.997231374517032e+02, 1.000449559440276e+03, 1.001172281357039e+03,
- 1.001891345831880e+03, 1.002606794725588e+03, 1.003318669148805e+03, 1.004027009480390e+03, 1.004731855385216e+03,
- 1.005433245831406e+03, 1.006131219107054e+03, 1.006825812836436e+03, 1.007517063995720e+03, 1.008205008928221e+03,
- 1.008889683359185e+03, 1.009571122410147e+03, 1.010249360612858e+03, 1.010924431922815e+03, 1.011596369732380e+03,
- 1.012265206883538e+03, 1.012930975680285e+03, 1.013593707900647e+03, 1.014253434808380e+03, 1.014910187164329e+03,
- 1.015563995237466e+03, 1.016214888815630e+03, 1.016862897215960e+03, 1.017508049295051e+03, 1.018150373458822e+03,
- 1.018789897672122e+03, 1.019426649468078e+03, 1.020060655957187e+03, 1.020691943836166e+03, 1.021320539396569e+03,
- 1.021946468533175e+03, 1.022569756752160e+03, 1.023190429179046e+03, 1.023808510566456e+03, 1.024424025301656e+03,
- 1.025036997413914e+03, 1.025647450581668e+03, 1.026255408139510e+03, 1.026860893084989e+03, 1.027463928085262e+03,
- 1.028064535483552e+03, 1.028662737305468e+03, 1.029258555265159e+03, 1.029852010771315e+03, 1.030443124933030e+03,
- 1.031031918565510e+03, 1.031618412195654e+03, 1.032202626067499e+03, 1.032784580147528e+03, 1.033364294129856e+03,
- 1.033941787441297e+03, 1.034517079246304e+03, 1.035090188451795e+03, 1.035661133711877e+03, 1.036229933432441e+03,
- 1.036796605775669e+03, 1.037361168664426e+03, 1.037923639278940e+03, 1.038484036074895e+03, 1.039042375791241e+03,
- 1.039598675435571e+03, 1.040152951796690e+03, 1.040705221448446e+03, 1.041255500753481e+03, 1.041803805893988e+03,
- 1.042350152765770e+03, 1.042894557147801e+03, 1.043437034593738e+03, 1.043977600463575e+03, 1.044516269926915e+03,
- 1.045053057966190e+03, 1.045587979379803e+03, 1.046121048785203e+03, 1.046652280621900e+03, 1.047181689154404e+03,
- 1.047709288475126e+03, 1.048235092507188e+03, 1.048759115007203e+03, 1.049281369567976e+03, 1.049801869621161e+03,
- 1.050320628439861e+03, 1.050837659141173e+03, 1.051352974688683e+03, 1.051866587894910e+03, 1.052378511423700e+03,
- 1.052888757792573e+03, 1.053397339375022e+03, 1.053904268402770e+03, 1.054409556967972e+03, 1.054913217025389e+03,
- 1.055415260394507e+03, 1.055915698761615e+03, 1.056414543681852e+03, 1.056911806581207e+03, 1.057407498758476e+03,
- 1.057901631387196e+03, 1.058394215517525e+03, 1.058885262078099e+03, 1.059374781877843e+03, 1.059862785607761e+03,
- 1.060349283842679e+03, 1.060834287042962e+03, 1.061317805556201e+03, 1.061799849618858e+03, 1.062280429357898e+03,
- 1.062759554792371e+03, 1.063237235834981e+03, 1.063713482293618e+03, 1.064188303872861e+03, 1.064661710175463e+03,
- 1.065133710703794e+03, 1.065604314861275e+03, 1.066073531953774e+03, 1.066541371190978e+03, 1.067007841687747e+03,
- 1.067472952465441e+03, 1.067936712453220e+03, 1.068399130489324e+03, 1.068860215322332e+03, 1.069319975612398e+03,
- 1.069778419932462e+03, 1.070235556769443e+03, 1.070691394525415e+03, 1.071145941518753e+03, 1.071599205985269e+03,
- 1.072051196079325e+03, 1.072501919874923e+03, 1.072951385366786e+03, 1.073399600471407e+03, 1.073846573028095e+03,
- 1.074292310799996e+03, 1.074736821475092e+03, 1.075180112667193e+03, 1.075622191916911e+03, 1.076063066692609e+03,
- 1.076502744391344e+03, 1.076941232339790e+03, 1.077378537795149e+03, 1.077814667946042e+03, 1.078249629913391e+03,
- 1.078683430751281e+03, 1.079116077447815e+03, 1.079547576925950e+03, 1.079977936044320e+03, 1.080407161598048e+03,
- 1.080835260319541e+03, 1.081262238879283e+03, 1.081688103886600e+03, 1.082112861890421e+03, 1.082536519380033e+03,
- 1.082959082785813e+03, 1.083380558479953e+03, 1.083800952777175e+03, 1.084220271935437e+03, 1.084638522156621e+03,
- 1.085055709587217e+03, 1.085471840318991e+03, 1.085886920389650e+03, 1.086300955783492e+03, 1.086713952432041e+03,
- 1.087125916214687e+03, 1.087536852959298e+03, 1.087946768442842e+03, 1.088355668391981e+03, 1.088763558483670e+03,
- 1.089170444345742e+03, 1.089576331557482e+03, 1.089981225650196e+03, 1.090385132107770e+03, 1.090788056367222e+03,
- 1.091190003819245e+03, 1.091590979808741e+03, 1.091990989635349e+03, 1.092390038553964e+03, 1.092788131775250e+03,
- 1.093185274466144e+03, 1.093581471750355e+03, 1.093976728708850e+03, 1.094371050380344e+03, 1.094764441761769e+03,
- 1.095156907808748e+03, 1.095548453436057e+03, 1.095939083518081e+03, 1.096328802889263e+03, 1.096717616344550e+03,
- 1.097105528639827e+03, 1.097492544492352e+03, 1.097878668581176e+03, 1.098263905547569e+03, 1.098648259995427e+03,
- 1.099031736491684e+03, 1.099414339566711e+03, 1.099796073714716e+03, 1.100176943394132e+03, 1.100556953028006e+03,
- 1.100936107004374e+03, 1.101314409676644e+03, 1.101691865363960e+03, 1.102068478351571e+03, 1.102444252891188e+03,
- 1.102819193201345e+03, 1.103193303467741e+03, 1.103566587843598e+03, 1.103939050449989e+03, 1.104310695376187e+03,
- 1.104681526679989e+03, 1.105051548388049e+03, 1.105420764496202e+03, 1.105789178969776e+03, 1.106156795743918e+03,
- 1.106523618723899e+03, 1.106889651785421e+03, 1.107254898774922e+03, 1.107619363509876e+03, 1.107983049779086e+03,
- 1.108345961342977e+03, 1.108708101933884e+03, 1.109069475256335e+03, 1.109430084987331e+03, 1.109789934776628e+03,
- 1.110149028247004e+03, 1.110507368994530e+03, 1.110864960588842e+03, 1.111221806573398e+03, 1.111577910465740e+03,
- 1.111933275757751e+03, 1.112287905915909e+03, 1.112641804381536e+03, 1.112994974571046e+03, 1.113347419876188e+03,
- 1.113699143664288e+03, 1.114050149278488e+03, 1.114400440037977e+03, 1.114750019238231e+03, 1.115098890151233e+03,
- 1.115447056025707e+03, 1.115794520087338e+03, 1.116141285538996e+03, 1.116487355560951e+03, 1.116832733311091e+03,
- 1.117177421925135e+03, 1.117521424516844e+03, 1.117864744178228e+03, 1.118207383979752e+03, 1.118549346970541e+03,
- 1.118890636178577e+03, 1.119231254610902e+03, 1.119571205253808e+03, 1.119910491073039e+03, 1.120249115013974e+03,
- 1.120587080001821e+03, 1.120924388941804e+03, 1.121261044719347e+03, 1.121597050200254e+03, 1.121932408230893e+03,
- 1.122267121638373e+03, 1.122601193230722e+03, 1.122934625797059e+03, 1.123267422107765e+03, 1.123599584914659e+03,
- 1.123931116951160e+03, 1.124262020932457e+03, 1.124592299555674e+03, 1.124921955500030e+03, 1.125250991427002e+03,
- 1.125579409980481e+03, 1.125907213786935e+03, 1.126234405455558e+03, 1.126560987578428e+03, 1.126886962730656e+03,
- 1.127212333470539e+03, 1.127537102339705e+03, 1.127861271863266e+03, 1.128184844549954e+03, 1.128507822892274e+03,
- 1.128830209366642e+03, 1.129152006433523e+03, 1.129473216537573e+03, 1.129793842107780e+03, 1.130113885557590e+03,
- 1.130433349285051e+03, 1.130752235672941e+03, 1.131070547088901e+03, 1.131388285885563e+03, 1.131705454400686e+03,
- 1.132022054957269e+03, 1.132338089863695e+03, 1.132653561413839e+03, 1.132968471887203e+03, 1.133282823549032e+03,
- 1.133596618650433e+03, 1.133909859428502e+03, 1.134222548106433e+03, 1.134534686893644e+03, 1.134846277985881e+03,
- 1.135157323565346e+03, 1.135467825800798e+03, 1.135777786847671e+03, 1.136087208848185e+03, 1.136396093931452e+03,
- 1.136704444213590e+03, 1.137012261797824e+03, 1.137319548774596e+03, 1.137626307221670e+03, 1.137932539204235e+03,
- 1.138238246775009e+03, 1.138543431974336e+03, 1.138848096830297e+03, 1.139152243358799e+03, 1.139455873563681e+03,
- 1.139758989436807e+03, 1.140061592958167e+03, 1.140363686095968e+03, 1.140665270806736e+03, 1.140966349035399e+03,
- 1.141266922715392e+03, 1.141566993768738e+03, 1.141866564106147e+03, 1.142165635627104e+03, 1.142464210219955e+03,
- 1.142762289761997e+03, 1.143059876119570e+03, 1.143356971148134e+03, 1.143653576692366e+03, 1.143949694586235e+03
- },
- {
- 1.809313629947665e+00, 5.527448591099636e+00, 9.328595799244161e+00, 1.321765646975879e+01, 1.720001517166403e+01,
- 2.128160758050582e+01, 2.546900083803720e+01, 2.976948949436231e+01, 3.419121088414567e+01, 3.874328495886331e+01,
- 4.343598520541453e+01, 4.828094951183329e+01, 5.329144298328825e+01, 5.848268921223323e+01, 6.387229307058556e+01,
- 6.948078785959135e+01, 7.533235451764996e+01, 8.145578378310805e+01, 8.788578945127421e+01, 9.466484262474484e+01,
- 1.018458031644321e+02, 1.094958156802023e+02, 1.177022989812728e+02, 1.265825861884704e+02, 1.363003535367639e+02,
- 1.470957566237750e+02, 1.593464514463227e+02, 1.737099074333793e+02, 1.915389226689061e+02, 7.675225995554495e+02,
- 7.748212077104222e+02, 7.813507535409474e+02, 7.872845228622162e+02, 7.927398507367348e+02, 7.978006430981470e+02,
- 8.025293654686037e+02, 8.069739893528382e+02, 8.111722806964480e+02, 8.151545814687862e+02, 8.189456867946710e+02,
- 8.225661536781591e+02, 8.260332387054800e+02, 8.293615857322313e+02, 8.325637404541292e+02, 8.356505422583509e+02,
- 8.386314272757180e+02, 8.415146660027340e+02, 8.443075519284051e+02, 8.470165529382887e+02, 8.496474340683425e+02,
- 8.522053579445470e+02, 8.546949676547539e+02, 8.571204556524733e+02, 8.594856214535901e+02, 8.617939202657772e+02,
- 8.640485042248040e+02, 8.662522575594522e+02, 8.684078267369522e+02, 8.705176464327252e+02, 8.725839620060142e+02,
- 8.746088490357226e+02, 8.765942303701324e+02, 8.785418910639560e+02, 8.804534915118968e+02, 8.823305790360133e+02,
- 8.841745981420603e+02, 8.859868996256340e+02, 8.877687486806938e+02, 8.895213321398653e+02, 8.912457649565370e+02,
- 8.929430960228397e+02, 8.946143134040823e+02, 8.962603490590532e+02, 8.978820831060226e+02, 8.994803476863232e+02,
- 9.010559304705299e+02, 9.026095778464775e+02, 9.041419978233812e+02, 9.056538626820836e+02, 9.071458113977808e+02,
- 9.086184518584356e+02, 9.100723628993467e+02, 9.115080961719987e+02, 9.129261778632140e+02, 9.143271102789028e+02,
- 9.157113733050595e+02, 9.170794257573617e+02, 9.184317066294529e+02, 9.197686362489786e+02, 9.210906173494939e+02,
- 9.223980360655230e+02, 9.236912628573501e+02, 9.249706533714403e+02, 9.262365492418428e+02, 9.274892788373954e+02,
- 9.287291579591041e+02, 9.299564904916623e+02, 9.311715690127055e+02, 9.323746753630725e+02, 9.335660811810575e+02,
- 9.347460484033631e+02, 9.359148297352348e+02, 9.370726690920396e+02, 9.382198020143657e+02, 9.393564560585340e+02,
- 9.404828511642746e+02, 9.415992000011463e+02, 9.427057082951852e+02, 9.438025751371298e+02, 9.448899932734539e+02,
- 9.459681493813665e+02, 9.470372243288432e+02, 9.480973934206320e+02, 9.491488266311843e+02, 9.501916888253102e+02,
- 9.512261399673437e+02, 9.522523353195342e+02, 9.532704256311487e+02, 9.542805573190734e+02, 9.552828726359891e+02,
- 9.562775098314069e+02, 9.572646033052281e+02, 9.582442837538858e+02, 9.592166783094843e+02, 9.601819101488558e+02,
- 9.611401005475792e+02, 9.620913663075141e+02, 9.630358215618702e+02, 9.639735774833689e+02, 9.649047423890220e+02,
- 9.658294218402451e+02, 9.667477187385299e+02, 9.676597334169351e+02, 9.685655637275923e+02, 9.694653051254541e+02,
- 9.703590507484719e+02, 9.712468914943806e+02, 9.721289160942781e+02, 9.730052111831420e+02, 9.738758613674498e+02,
- 9.747409492900443e+02, 9.756005556923727e+02, 9.764547594742349e+02, 9.773036377511587e+02, 9.781472659095107e+02,
- 9.789857176741831e+02, 9.798190650992198e+02, 9.806473787094021e+02, 9.814707274840052e+02, 9.822891789183656e+02,
- 9.831027990674879e+02, 9.839116525880347e+02, 9.847158027787654e+02, 9.855153116194912e+02, 9.863102398086253e+02,
- 9.871006467993676e+02, 9.878865908346045e+02, 9.886681289805671e+02, 9.894453171593053e+02, 9.902182101800261e+02,
- 9.909868617693431e+02, 9.917513246004892e+02, 9.925116503215280e+02, 9.932678895826081e+02, 9.940200920623009e+02,
- 9.947683064930551e+02, 9.955125806858125e+02, 9.962529615283617e+02, 9.969894951118794e+02, 9.977222265951764e+02,
- 9.984512003335331e+02, 9.991764598722348e+02, 9.998980479667700e+02, 1.000616006602397e+03, 1.001330377013085e+03,
- 1.002041199699880e+03, 1.002748514448686e+03, 1.003452360347509e+03, 1.004152775803175e+03, 1.004849798557532e+03,
- 1.005543465703172e+03, 1.006233813698678e+03, 1.006920878383415e+03, 1.007604694991892e+03, 1.008285298167690e+03,
- 1.008962721976992e+03, 1.009636999921719e+03, 1.010308164952282e+03, 1.010976249479977e+03, 1.011641285389021e+03,
- 1.012303304048245e+03, 1.012962336322468e+03, 1.013618412583541e+03, 1.014271562721096e+03, 1.014921816152985e+03,
- 1.015569201835444e+03, 1.016213748272970e+03, 1.016855483527943e+03, 1.017494435229970e+03, 1.018130630584994e+03,
- 1.018764096384156e+03, 1.019394859012413e+03, 1.020022944456947e+03, 1.020648378315332e+03, 1.021271185803506e+03,
- 1.021891391763527e+03, 1.022509020671134e+03, 1.023124096643107e+03, 1.023736643444448e+03, 1.024346684495373e+03,
- 1.024954242878135e+03, 1.025559341343668e+03, 1.026162002318071e+03, 1.026762247908929e+03, 1.027360099911479e+03,
- 1.027955579814620e+03, 1.028548708806787e+03, 1.029139507781672e+03, 1.029727997343809e+03, 1.030314197814030e+03,
- 1.030898129234785e+03, 1.031479811375338e+03, 1.032059263736839e+03, 1.032636505557279e+03, 1.033211555816324e+03,
- 1.033784433240043e+03, 1.034355156305520e+03, 1.034923742735057e+03, 1.035490211524955e+03, 1.036054579938216e+03,
- 1.036616865526263e+03, 1.037177085533333e+03, 1.037735257061145e+03, 1.038291396964539e+03, 1.038845521882697e+03,
- 1.039397648242903e+03, 1.039947792264209e+03, 1.040495969961037e+03, 1.041042197146686e+03, 1.041586489436770e+03,
- 1.042128862252588e+03, 1.042669330824406e+03, 1.043207910194682e+03, 1.043744615221219e+03, 1.044279460580244e+03,
- 1.044812460769430e+03, 1.045343630110854e+03, 1.045872982753885e+03, 1.046400532678022e+03, 1.046926293695667e+03,
- 1.047450279454839e+03, 1.047972503441839e+03, 1.048492978983853e+03, 1.049011719251509e+03, 1.049528737261372e+03,
- 1.050044045878402e+03, 1.050557657818351e+03, 1.051069585650117e+03, 1.051579841798048e+03, 1.052088438544207e+03,
- 1.052595388030581e+03, 1.053100702261261e+03, 1.053604393104564e+03, 1.054106472295122e+03, 1.054606951435933e+03,
- 1.055105842000362e+03, 1.055603155334115e+03, 1.056098902657167e+03, 1.056593095065654e+03, 1.057085743533734e+03,
- 1.057576858915406e+03, 1.058066451946302e+03, 1.058554533245436e+03, 1.059041113316928e+03, 1.059526202551693e+03,
- 1.060009811229099e+03, 1.060491949518592e+03, 1.060972627481292e+03, 1.061451855071568e+03, 1.061929642138567e+03,
- 1.062405998427729e+03, 1.062880933582271e+03, 1.063354457144642e+03, 1.063826578557953e+03, 1.064297307167385e+03,
- 1.064766652221563e+03, 1.065234622873911e+03, 1.065701228183989e+03, 1.066166477118793e+03, 1.066630378554043e+03,
- 1.067092941275443e+03, 1.067554173979922e+03, 1.068014085276850e+03, 1.068472683689235e+03, 1.068929977654901e+03,
- 1.069385975527641e+03, 1.069840685578358e+03, 1.070294115996172e+03, 1.070746274889529e+03, 1.071197170287271e+03,
- 1.071646810139702e+03, 1.072095202319626e+03, 1.072542354623377e+03, 1.072988274771826e+03, 1.073432970411367e+03,
- 1.073876449114901e+03, 1.074318718382787e+03, 1.074759785643784e+03, 1.075199658255990e+03, 1.075638343507739e+03,
- 1.076075848618507e+03, 1.076512180739795e+03, 1.076947346955992e+03, 1.077381354285234e+03, 1.077814209680243e+03,
- 1.078245920029154e+03, 1.078676492156329e+03, 1.079105932823158e+03, 1.079534248728846e+03, 1.079961446511191e+03,
- 1.080387532747345e+03, 1.080812513954568e+03, 1.081236396590965e+03, 1.081659187056216e+03, 1.082080891692291e+03,
- 1.082501516784159e+03, 1.082921068560481e+03, 1.083339553194289e+03, 1.083756976803669e+03, 1.084173345452420e+03,
- 1.084588665150703e+03, 1.085002941855689e+03, 1.085416181472193e+03, 1.085828389853295e+03, 1.086239572800955e+03,
- 1.086649736066620e+03, 1.087058885351820e+03, 1.087467026308752e+03, 1.087874164540861e+03, 1.088280305603412e+03,
- 1.088685455004049e+03, 1.089089618203348e+03, 1.089492800615362e+03, 1.089895007608163e+03, 1.090296244504362e+03,
- 1.090696516581641e+03, 1.091095829073259e+03, 1.091494187168565e+03, 1.091891596013490e+03, 1.092288060711050e+03,
- 1.092683586321815e+03, 1.093078177864407e+03, 1.093471840315953e+03, 1.093864578612563e+03, 1.094256397649782e+03,
- 1.094647302283038e+03, 1.095037297328099e+03, 1.095426387561500e+03, 1.095814577720983e+03, 1.096201872505921e+03,
- 1.096588276577740e+03, 1.096973794560334e+03, 1.097358431040471e+03, 1.097742190568208e+03, 1.098125077657272e+03,
- 1.098507096785468e+03, 1.098888252395056e+03, 1.099268548893141e+03, 1.099647990652043e+03, 1.100026582009674e+03,
- 1.100404327269903e+03, 1.100781230702918e+03, 1.101157296545579e+03, 1.101532529001777e+03, 1.101906932242780e+03,
- 1.102280510407570e+03, 1.102653267603189e+03, 1.103025207905066e+03, 1.103396335357352e+03, 1.103766653973245e+03,
- 1.104136167735306e+03, 1.104504880595778e+03, 1.104872796476900e+03, 1.105239919271214e+03, 1.105606252841872e+03,
- 1.105971801022931e+03, 1.106336567619655e+03, 1.106700556408805e+03, 1.107063771138930e+03, 1.107426215530649e+03,
- 1.107787893276936e+03, 1.108148808043397e+03, 1.108508963468545e+03, 1.108868363164069e+03, 1.109227010715106e+03,
- 1.109584909680498e+03, 1.109942063593063e+03, 1.110298475959843e+03, 1.110654150262366e+03, 1.111009089956890e+03,
- 1.111363298474659e+03, 1.111716779222145e+03, 1.112069535581284e+03, 1.112421570909726e+03, 1.112772888541063e+03,
- 1.113123491785067e+03, 1.113473383927915e+03, 1.113822568232424e+03, 1.114171047938268e+03, 1.114518826262206e+03,
- 1.114865906398300e+03, 1.115212291518128e+03, 1.115557984771005e+03, 1.115902989284187e+03, 1.116247308163085e+03,
- 1.116590944491471e+03, 1.116933901331681e+03, 1.117276181724816e+03, 1.117617788690944e+03, 1.117958725229292e+03,
- 1.118298994318447e+03, 1.118638598916542e+03, 1.118977541961450e+03, 1.119315826370972e+03, 1.119653455043017e+03,
- 1.119990430855795e+03, 1.120326756667989e+03, 1.120662435318940e+03, 1.120997469628819e+03, 1.121331862398810e+03,
- 1.121665616411274e+03, 1.121998734429927e+03, 1.122331219200003e+03, 1.122663073448430e+03, 1.122994299883984e+03,
- 1.123324901197463e+03, 1.123654880061838e+03, 1.123984239132422e+03, 1.124312981047025e+03, 1.124641108426106e+03,
- 1.124968623872934e+03, 1.125295529973735e+03, 1.125621829297844e+03, 1.125947524397857e+03, 1.126272617809776e+03,
- 1.126597112053158e+03, 1.126921009631254e+03, 1.127244313031155e+03, 1.127567024723935e+03, 1.127889147164785e+03,
- 1.128210682793157e+03, 1.128531634032897e+03, 1.128852003292382e+03, 1.129171792964650e+03, 1.129491005427537e+03,
- 1.129809643043802e+03, 1.130127708161264e+03, 1.130445203112920e+03, 1.130762130217082e+03, 1.131078491777493e+03,
- 1.131394290083455e+03, 1.131709527409953e+03, 1.132024206017771e+03, 1.132338328153619e+03, 1.132651896050245e+03,
- 1.132964911926553e+03, 1.133277377987726e+03, 1.133589296425330e+03, 1.133900669417437e+03, 1.134211499128733e+03,
- 1.134521787710628e+03, 1.134831537301372e+03, 1.135140750026154e+03, 1.135449427997222e+03, 1.135757573313979e+03,
- 1.136065188063094e+03, 1.136372274318607e+03, 1.136678834142029e+03, 1.136984869582447e+03, 1.137290382676623e+03,
- 1.137595375449096e+03, 1.137899849912283e+03, 1.138203808066571e+03, 1.138507251900421e+03, 1.138810183390460e+03,
- 1.139112604501578e+03, 1.139414517187021e+03, 1.139715923388486e+03, 1.140016825036212e+03, 1.140317224049069e+03,
- 1.140617122334657e+03, 1.140916521789383e+03, 1.141215424298563e+03, 1.141513831736498e+03, 1.141811745966569e+03
- },
- {
- 1.802949606005701e+00, 5.507311374944670e+00, 9.293365589617125e+00, 1.316586333859079e+01, 1.713001650557099e+01,
- 2.119156118394337e+01, 2.535683266000191e+01, 2.963285463893812e+01, 3.402744615770619e+01, 3.854935065135555e+01,
- 4.320839303547432e+01, 4.801567258955310e+01, 5.298380211306726e+01, 5.812720764131053e+01, 6.346250851939712e+01,
- 6.900900574742812e+01, 7.478931871238875e+01, 8.083022921097614e+01, 8.716382137619996e+01, 9.382905453392922e+01,
- 1.008739876810596e+02, 1.083590176604777e+02, 1.163617568119723e+02, 1.249846891547300e+02, 1.343678119517787e+02,
- 1.447108882606782e+02, 1.563160393367302e+02, 1.696792305158197e+02, 1.857235452502538e+02, 2.065973190359904e+02,
- 7.588924632129282e+02, 7.667372959839546e+02, 7.736959082390420e+02, 7.799800450186664e+02, 7.857295505784103e+02,
- 7.910425794825978e+02, 7.959911505257468e+02, 8.006299306308250e+02, 8.050015473097812e+02, 8.091399764521744e+02,
- 8.130727961365870e+02, 8.168227389363965e+02, 8.204087925106738e+02, 8.238469993899859e+02, 8.271510506375374e+02,
- 8.303327347339151e+02, 8.334022825592878e+02, 8.363686363772583e+02, 8.392396622843371e+02, 8.420223199638976e+02,
- 8.447227997542524e+02, 8.473466343835626e+02, 8.498987908489154e+02, 8.523837465723221e+02, 8.548055529885371e+02,
- 8.571678889991530e+02, 8.594741061901954e+02, 8.617272673054086e+02, 8.639301791588259e+02, 8.660854209330131e+02,
- 8.681953686251559e+02, 8.702622162592425e+02, 8.722879943689366e+02, 8.742745861655906e+02, 8.762237417337147e+02,
- 8.781370905381930e+02, 8.800161524804955e+02, 8.818623477029201e+02, 8.836770053085260e+02, 8.854613711386157e+02,
- 8.872166147283491e+02, 8.889438355432820e+02, 8.906440685848814e+02, 8.923182894406451e+02, 8.939674188440410e+02,
- 8.955923268006555e+02, 8.971938363294836e+02, 8.987727268619362e+02, 9.003297373357054e+02, 9.018655690160062e+02,
- 9.033808880726966e+02, 9.048763279383670e+02, 9.063524914694952e+02, 9.078099529302140e+02, 9.092492598159815e+02,
- 9.106709345325212e+02, 9.120754759436692e+02, 9.134633608003226e+02, 9.148350450613303e+02, 9.161909651160622e+02,
- 9.175315389173534e+02, 9.188571670326598e+02, 9.201682336204359e+02, 9.214651073380884e+02, 9.227481421871950e+02,
- 9.240176783011799e+02, 9.252740426800916e+02, 9.265175498767254e+02, 9.277485026379394e+02, 9.289671925046413e+02,
- 9.301739003736291e+02, 9.313688970241847e+02, 9.325524436120440e+02, 9.337247921331768e+02, 9.348861858595600e+02,
- 9.360368597489777e+02, 9.371770408306899e+02, 9.383069485686710e+02, 9.394267952039779e+02, 9.405367860776764e+02,
- 9.416371199356548e+02, 9.427279892165260e+02, 9.438095803237553e+02, 9.448820738830415e+02, 9.459456449859014e+02,
- 9.470004634203566e+02, 9.480466938895268e+02, 9.490844962189408e+02, 9.501140255547201e+02, 9.511354325509520e+02,
- 9.521488635453246e+02, 9.531544607274585e+02, 9.541523622990874e+02, 9.551427026264414e+02, 9.561256123852903e+02,
- 9.571012181150734e+02, 9.580696445046956e+02, 9.590310115059765e+02, 9.599854363440868e+02, 9.609330331826791e+02,
- 9.618739132329370e+02, 9.628081848577186e+02, 9.637359536710719e+02, 9.646573226333633e+02, 9.655723921422441e+02,
- 9.664812601196920e+02, 9.673840220953130e+02, 9.682807712861045e+02, 9.691715986728683e+02, 9.700565930734246e+02,
- 9.709358412128021e+02, 9.718094277905537e+02, 9.726774355453343e+02, 9.735399453168733e+02, 9.743970361054792e+02,
- 9.752487851291779e+02, 9.760952678938256e+02, 9.769365581835999e+02, 9.777727282074155e+02, 9.786038485822751e+02,
- 9.794299883969971e+02, 9.802512152573717e+02, 9.810675953296342e+02, 9.818791933823226e+02, 9.826860728265964e+02,
- 9.834882957550820e+02, 9.842859229793153e+02, 9.850790140658354e+02, 9.858676273709904e+02, 9.866518200745162e+02,
- 9.874316482119319e+02, 9.882071667058043e+02, 9.889784293959354e+02, 9.897454890685133e+02, 9.905083974842631e+02,
- 9.912672054056547e+02, 9.920219625972015e+02, 9.927727179566147e+02, 9.935195193779268e+02, 9.942624138848743e+02,
- 9.950014476259554e+02, 9.957366658966689e+02, 9.964681131610462e+02, 9.971958330724781e+02, 9.979198684939016e+02,
- 9.986402615173321e+02, 9.993570534827937e+02, 1.000070284996659e+03, 1.000779995949418e+03, 1.001486225532911e+03,
- 1.002189012257021e+03, 1.002888393965876e+03, 1.003584407853555e+03, 1.004277090479327e+03, 1.004966477782434e+03,
- 1.005652605096443e+03, 1.006335507163171e+03, 1.007015218146215e+03, 1.007691771644071e+03, 1.008365200702895e+03,
- 1.009035537828892e+03, 1.009702815000345e+03, 1.010367063679318e+03, 1.011028314823017e+03, 1.011686598894844e+03,
- 1.012341945875143e+03, 1.012994385271640e+03, 1.013643946129611e+03, 1.014290657041759e+03, 1.014934546157838e+03,
- 1.015575641194005e+03, 1.016213969441927e+03, 1.016849557777650e+03, 1.017482432670219e+03, 1.018112620190092e+03,
- 1.018740146017314e+03, 1.019365035449492e+03, 1.019987313409552e+03, 1.020607004453313e+03, 1.021224132776846e+03,
- 1.021838722223665e+03, 1.022450796291724e+03, 1.023060378140242e+03, 1.023667490596358e+03, 1.024272156161618e+03,
- 1.024874397018303e+03, 1.025474235035601e+03, 1.026071691775630e+03, 1.026666788499302e+03, 1.027259546172069e+03,
- 1.027849985469504e+03, 1.028438126782765e+03, 1.029023990223924e+03, 1.029607595631170e+03, 1.030188962573883e+03,
- 1.030768110357432e+03, 1.031345058054161e+03, 1.031919823891675e+03, 1.032492427446978e+03, 1.033062886521899e+03,
- 1.033631219173196e+03, 1.034197443221219e+03, 1.034761576254120e+03, 1.035323635631972e+03, 1.035883638490796e+03,
- 1.036441601746496e+03, 1.036997542098705e+03, 1.037551476034553e+03, 1.038103419832342e+03, 1.038653389565144e+03,
- 1.039201401104329e+03, 1.039747470123000e+03, 1.040291612099372e+03, 1.040833842320058e+03, 1.041374175883305e+03,
- 1.041912627702149e+03, 1.042449212507500e+03, 1.042983944851176e+03, 1.043516839108857e+03, 1.044047909482989e+03,
- 1.044577170005622e+03, 1.045104634541187e+03, 1.045630316789226e+03, 1.046154230287051e+03, 1.046676388412360e+03,
- 1.047196804385794e+03, 1.047715491273446e+03, 1.048232461989315e+03, 1.048747729297717e+03, 1.049261305815634e+03,
- 1.049773204015039e+03, 1.050283436225149e+03, 1.050792014634651e+03, 1.051298951293883e+03, 1.051804258116961e+03,
- 1.052307946883877e+03, 1.052810029242546e+03, 1.053310516710824e+03, 1.053809420678476e+03, 1.054306752409115e+03,
- 1.054802523042100e+03, 1.055296743594395e+03, 1.055789424962400e+03, 1.056280577923744e+03, 1.056770213139037e+03,
- 1.057258341153604e+03, 1.057744972399173e+03, 1.058230117195538e+03, 1.058713785752195e+03, 1.059195988169934e+03,
- 1.059676734442420e+03, 1.060156034457731e+03, 1.060633897999872e+03, 1.061110334750267e+03, 1.061585354289214e+03,
- 1.062058966097324e+03, 1.062531179556926e+03, 1.063002003953453e+03, 1.063471448476796e+03, 1.063939522222646e+03,
- 1.064406234193796e+03, 1.064871593301437e+03, 1.065335608366417e+03, 1.065798288120488e+03, 1.066259641207525e+03,
- 1.066719676184731e+03, 1.067178401523808e+03, 1.067635825612126e+03, 1.068091956753855e+03, 1.068546803171089e+03,
- 1.069000373004944e+03, 1.069452674316643e+03, 1.069903715088579e+03, 1.070353503225359e+03, 1.070802046554834e+03,
- 1.071249352829113e+03, 1.071695429725551e+03, 1.072140284847732e+03, 1.072583925726427e+03, 1.073026359820546e+03,
- 1.073467594518060e+03, 1.073907637136922e+03, 1.074346494925965e+03, 1.074784175065788e+03, 1.075220684669628e+03,
- 1.075656030784213e+03, 1.076090220390609e+03, 1.076523260405053e+03, 1.076955157679762e+03, 1.077385919003741e+03,
- 1.077815551103572e+03, 1.078244060644195e+03, 1.078671454229672e+03, 1.079097738403938e+03, 1.079522919651551e+03,
- 1.079947004398415e+03, 1.080369999012502e+03, 1.080791909804562e+03, 1.081212743028816e+03, 1.081632504883647e+03,
- 1.082051201512272e+03, 1.082468839003408e+03, 1.082885423391932e+03, 1.083300960659520e+03, 1.083715456735285e+03,
- 1.084128917496407e+03, 1.084541348768742e+03, 1.084952756327437e+03, 1.085363145897521e+03, 1.085772523154501e+03,
- 1.086180893724939e+03, 1.086588263187025e+03, 1.086994637071140e+03, 1.087400020860410e+03, 1.087804419991256e+03,
- 1.088207839853934e+03, 1.088610285793059e+03, 1.089011763108138e+03, 1.089412277054077e+03, 1.089811832841699e+03,
- 1.090210435638236e+03, 1.090608090567828e+03, 1.091004802712010e+03, 1.091400577110190e+03, 1.091795418760121e+03,
- 1.092189332618373e+03, 1.092582323600786e+03, 1.092974396582928e+03, 1.093365556400538e+03, 1.093755807849973e+03,
- 1.094145155688635e+03, 1.094533604635403e+03, 1.094921159371059e+03, 1.095307824538696e+03, 1.095693604744137e+03,
- 1.096078504556338e+03, 1.096462528507783e+03, 1.096845681094887e+03, 1.097227966778376e+03, 1.097609389983676e+03,
- 1.097989955101289e+03, 1.098369666487170e+03, 1.098748528463087e+03, 1.099126545316992e+03, 1.099503721303377e+03,
- 1.099880060643627e+03, 1.100255567526369e+03, 1.100630246107814e+03, 1.101004100512101e+03, 1.101377134831631e+03,
- 1.101749353127394e+03, 1.102120759429298e+03, 1.102491357736493e+03, 1.102861152017687e+03, 1.103230146211456e+03,
- 1.103598344226563e+03, 1.103965749942251e+03, 1.104332367208558e+03, 1.104698199846603e+03, 1.105063251648889e+03,
- 1.105427526379587e+03, 1.105791027774825e+03, 1.106153759542972e+03, 1.106515725364915e+03, 1.106876928894335e+03,
- 1.107237373757979e+03, 1.107597063555931e+03, 1.107956001861874e+03, 1.108314192223355e+03, 1.108671638162041e+03,
- 1.109028343173977e+03, 1.109384310729836e+03, 1.109739544275169e+03, 1.110094047230654e+03, 1.110447822992332e+03,
- 1.110800874931856e+03, 1.111153206396722e+03, 1.111504820710501e+03, 1.111855721173081e+03, 1.112205911060882e+03,
- 1.112555393627091e+03, 1.112904172101883e+03, 1.113252249692640e+03, 1.113599629584165e+03, 1.113946314938909e+03,
- 1.114292308897169e+03, 1.114637614577305e+03, 1.114982235075949e+03, 1.115326173468208e+03, 1.115669432807862e+03,
- 1.116012016127571e+03, 1.116353926439070e+03, 1.116695166733361e+03, 1.117035739980913e+03, 1.117375649131846e+03,
- 1.117714897116122e+03, 1.118053486843734e+03, 1.118391421204886e+03, 1.118728703070178e+03, 1.119065335290782e+03,
- 1.119401320698627e+03, 1.119736662106566e+03, 1.120071362308555e+03, 1.120405424079827e+03, 1.120738850177054e+03,
- 1.121071643338522e+03, 1.121403806284293e+03, 1.121735341716371e+03, 1.122066252318864e+03, 1.122396540758141e+03,
- 1.122726209682997e+03, 1.123055261724804e+03, 1.123383699497668e+03, 1.123711525598582e+03, 1.124038742607577e+03,
- 1.124365353087877e+03, 1.124691359586036e+03, 1.125016764632096e+03, 1.125341570739725e+03, 1.125665780406363e+03,
- 1.125989396113362e+03, 1.126312420326128e+03, 1.126634855494260e+03, 1.126956704051683e+03, 1.127277968416789e+03,
- 1.127598650992565e+03, 1.127918754166734e+03, 1.128238280311877e+03, 1.128557231785570e+03, 1.128875610930507e+03,
- 1.129193420074632e+03, 1.129510661531258e+03, 1.129827337599201e+03, 1.130143450562893e+03, 1.130459002692509e+03,
- 1.130773996244087e+03, 1.131088433459644e+03, 1.131402316567299e+03, 1.131715647781385e+03, 1.132028429302566e+03,
- 1.132340663317951e+03, 1.132652352001206e+03, 1.132963497512668e+03, 1.133274101999453e+03, 1.133584167595568e+03,
- 1.133893696422015e+03, 1.134202690586904e+03, 1.134511152185552e+03, 1.134819083300596e+03, 1.135126486002089e+03,
- 1.135433362347606e+03, 1.135739714382350e+03, 1.136045544139245e+03, 1.136350853639038e+03, 1.136655644890404e+03,
- 1.136959919890032e+03, 1.137263680622733e+03, 1.137566929061527e+03, 1.137869667167744e+03, 1.138171896891111e+03,
- 1.138473620169852e+03, 1.138774838930776e+03, 1.139075555089366e+03, 1.139375770549873e+03, 1.139675487205403e+03
- },
- {
- 1.796631013169837e+00, 5.487328396771806e+00, 9.258424658445046e+00, 1.311452586346833e+01, 1.706067744330778e+01,
- 2.110242356299819e+01, 2.524587710756039e+01, 2.949780269134198e+01, 3.386571577142732e+01, 3.835800184003740e+01,
- 4.298406088351287e+01, 4.775448395350730e+01, 5.268127099616643e+01, 5.777810232377322e+01, 6.306068074879938e+01,
- 6.854716815554468e+01, 7.425875032730765e+01, 8.022037911258907e+01, 8.646176480327708e+01, 9.301872972748357e+01,
- 9.993509716187536e+01, 1.072653980141988e+02, 1.150788719189642e+02, 1.234656052842210e+02, 1.325463822318869e+02,
- 1.424894055847202e+02, 1.535407933349483e+02, 1.660857969141240e+02, 1.807895760401114e+02, 1.989974918507586e+02,
- 7.401717920801317e+02, 7.500793249395105e+02, 7.585204649240183e+02, 7.659396264169146e+02, 7.725954042471931e+02,
- 7.786542504014960e+02, 7.842307823638457e+02, 7.894078584351200e+02, 7.942476308748182e+02, 7.987980961057967e+02,
- 8.030972021839211e+02, 8.071755429580018e+02, 8.110581913329490e+02, 8.147659855374395e+02, 8.183164553622611e+02,
- 8.217245042128776e+02, 8.250029212073373e+02, 8.281627722876167e+02, 8.312137034770950e+02, 8.341641792094712e+02,
- 8.370216719104498e+02, 8.397928144586180e+02, 8.424835240144104e+02, 8.450991035060649e+02, 8.476443254937265e+02,
- 8.501235019990894e+02, 8.525405430570637e+02, 8.548990061291433e+02, 8.572021380553524e+02, 8.594529108703987e+02,
- 8.616540525406524e+02, 8.638080734705501e+02, 8.659172894648582e+02, 8.679838417056782e+02, 8.700097142021871e+02,
- 8.719967490905418e+02, 8.739466600967640e+02, 8.758610444231897e+02, 8.777413932766761e+02, 8.795891012220454e+02,
- 8.814054745158161e+02, 8.831917385517360e+02, 8.849490445301460e+02, 8.866784754469608e+02, 8.883810514844469e+02,
- 8.900577348745884e+02, 8.917094342961481e+02, 8.933370088584296e+02, 8.949412717177785e+02, 8.965229933669684e+02,
- 8.980829046325614e+02, 8.996216994110034e+02, 9.011400371704607e+02, 9.026385452422234e+02, 9.041178209226665e+02,
- 9.055784334043824e+02, 9.070209255529638e+02, 9.084458155440967e+02, 9.098535983740153e+02, 9.112447472549592e+02,
- 9.126197149060424e+02, 9.139789347488544e+02, 9.153228220161616e+02, 9.166517747812137e+02, 9.179661749144321e+02,
- 9.192663889735641e+02, 9.205527690328311e+02, 9.218256534560314e+02, 9.230853676181207e+02, 9.243322245793570e+02,
- 9.255665257157275e+02, 9.267885613090406e+02, 9.279986110997476e+02, 9.291969448053228e+02, 9.303838226067351e+02,
- 9.315594956053791e+02, 9.327242062525901e+02, 9.338781887537127e+02, 9.350216694485268e+02, 9.361548671696745e+02,
- 9.372779935806146e+02, 9.383912534944999e+02, 9.394948451752596e+02, 9.405889606220869e+02, 9.416737858384084e+02,
- 9.427495010863594e+02, 9.438162811276973e+02, 9.448742954520161e+02, 9.459237084933035e+02, 9.469646798371923e+02,
- 9.479973644149638e+02, 9.490219126872854e+02, 9.500384708197935e+02, 9.510471808500059e+02, 9.520481808460701e+02,
- 9.530416050578235e+02, 9.540275834105041e+02, 9.550062440433321e+02, 9.559777100796402e+02, 9.569421018610075e+02,
- 9.578995365651907e+02, 9.588501283195050e+02, 9.597939883090771e+02, 9.607312248802639e+02, 9.616619436394724e+02,
- 9.625862475476548e+02, 9.635042370106834e+02, 9.644160099658368e+02, 9.653216619645840e+02, 9.662212862518736e+02,
- 9.671149738420843e+02, 9.680028135918342e+02, 9.688848922697742e+02, 9.697612946235356e+02, 9.706321034439705e+02,
- 9.714973996268079e+02, 9.723572622318520e+02, 9.732117685398557e+02, 9.740609941212464e+02, 9.749050128309433e+02,
- 9.757438969475328e+02, 9.765777171612019e+02, 9.774065426360349e+02, 9.782304410549854e+02, 9.790494786631747e+02,
- 9.798637203095852e+02, 9.806732294872294e+02, 9.814780683718535e+02, 9.822782978592437e+02, 9.830739776011977e+02,
- 9.838651660402149e+02, 9.846519204429624e+02, 9.854342969325702e+02, 9.862123505198024e+02, 9.869861351331543e+02,
- 9.877557036479193e+02, 9.885211078897005e+02, 9.892823987615056e+02, 9.900396261173207e+02, 9.907928388911184e+02,
- 9.915420850949547e+02, 9.922874118426738e+02, 9.930288653728448e+02, 9.937664910709550e+02, 9.945003334908885e+02,
- 9.952304363757258e+02, 9.959568426778760e+02, 9.966795945785855e+02, 9.973987335068249e+02, 9.981143001576061e+02,
- 9.988263345097160e+02, 9.995348758429218e+02, 1.000239962754645e+03, 1.000941633176136e+03, 1.001639924388160e+03,
- 1.002334873036211e+03, 1.003026515145289e+03, 1.003714886134223e+03, 1.004400020829592e+03, 1.005081953479223e+03,
- 1.005760717765326e+03, 1.006436346817213e+03, 1.007108873223694e+03, 1.007778329045098e+03, 1.008444745824954e+03,
- 1.009108154601360e+03, 1.009768585918018e+03, 1.010426069834979e+03, 1.011080635939080e+03, 1.011732313354102e+03,
- 1.012381130750651e+03, 1.013027116355767e+03, 1.013670297962285e+03, 1.014310702937932e+03, 1.014948358234196e+03,
- 1.015583290394953e+03, 1.016215525564862e+03, 1.016845089497560e+03, 1.017472007563619e+03, 1.018096304758316e+03,
- 1.018718005709200e+03, 1.019337134683457e+03, 1.019953715595100e+03, 1.020567772011965e+03, 1.021179327162545e+03,
- 1.021788403942639e+03, 1.022395024921848e+03, 1.022999212349903e+03, 1.023600988162836e+03, 1.024200373989013e+03,
- 1.024797391154998e+03, 1.025392060716835e+03, 1.025984403362364e+03, 1.026574439573342e+03, 1.027162189525140e+03,
- 1.027747673118662e+03, 1.028330909985432e+03, 1.028911918978536e+03, 1.029490720216181e+03, 1.030067332054090e+03,
- 1.030641773094760e+03, 1.031214061695008e+03, 1.031784215970373e+03, 1.032352253799441e+03, 1.032918192828060e+03,
- 1.033482050473466e+03, 1.034043843928303e+03, 1.034603590164576e+03, 1.035161305937495e+03, 1.035717007789245e+03,
- 1.036270712052671e+03, 1.036822434854882e+03, 1.037372192120774e+03, 1.037919999576480e+03, 1.038465872752746e+03,
- 1.039009826988230e+03, 1.039551877432732e+03, 1.040092039050360e+03, 1.040630326622623e+03, 1.041166754751459e+03,
- 1.041701337862205e+03, 1.042234090206497e+03, 1.042765025865117e+03, 1.043294158750776e+03, 1.043821502610841e+03,
- 1.044347071030006e+03, 1.044870877432909e+03, 1.045392935086697e+03, 1.045913257103531e+03, 1.046431856443057e+03,
- 1.046948745914806e+03, 1.047463938180563e+03, 1.047977445756686e+03, 1.048489281016364e+03, 1.048999456191854e+03,
- 1.049507983376658e+03, 1.050014874527657e+03, 1.050520141467218e+03, 1.051023795885236e+03, 1.051525849341166e+03,
- 1.052026313265987e+03, 1.052525198964147e+03, 1.053022517615466e+03, 1.053518280277005e+03, 1.054012497884886e+03,
- 1.054505181256102e+03, 1.054996341090269e+03, 1.055485987971360e+03, 1.055974132369405e+03, 1.056460784642148e+03,
- 1.056945955036692e+03, 1.057429653691097e+03, 1.057911890635958e+03, 1.058392675795951e+03, 1.058872018991351e+03,
- 1.059349929939524e+03, 1.059826418256390e+03, 1.060301493457862e+03, 1.060775164961253e+03, 1.061247442086671e+03,
- 1.061718334058370e+03, 1.062187850006103e+03, 1.062655998966417e+03, 1.063122789883960e+03, 1.063588231612743e+03,
- 1.064052332917385e+03, 1.064515102474340e+03, 1.064976548873102e+03, 1.065436680617381e+03, 1.065895506126273e+03,
- 1.066353033735399e+03, 1.066809271698025e+03, 1.067264228186172e+03, 1.067717911291696e+03, 1.068170329027357e+03,
- 1.068621489327864e+03, 1.069071400050914e+03, 1.069520068978199e+03, 1.069967503816405e+03, 1.070413712198193e+03,
- 1.070858701683163e+03, 1.071302479758805e+03, 1.071745053841426e+03, 1.072186431277074e+03, 1.072626619342434e+03,
- 1.073065625245724e+03, 1.073503456127562e+03, 1.073940119061829e+03, 1.074375621056514e+03, 1.074809969054543e+03,
- 1.075243169934604e+03, 1.075675230511948e+03, 1.076106157539184e+03, 1.076535957707060e+03, 1.076964637645228e+03,
- 1.077392203923006e+03, 1.077818663050116e+03, 1.078244021477422e+03, 1.078668285597649e+03, 1.079091461746090e+03,
- 1.079513556201313e+03, 1.079934575185844e+03, 1.080354524866844e+03, 1.080773411356780e+03, 1.081191240714080e+03,
- 1.081608018943784e+03, 1.082023751998174e+03, 1.082438445777411e+03, 1.082852106130149e+03, 1.083264738854143e+03,
- 1.083676349696852e+03, 1.084086944356027e+03, 1.084496528480299e+03, 1.084905107669746e+03, 1.085312687476463e+03,
- 1.085719273405118e+03, 1.086124870913500e+03, 1.086529485413058e+03, 1.086933122269442e+03, 1.087335786803016e+03,
- 1.087737484289386e+03, 1.088138219959905e+03, 1.088537999002176e+03, 1.088936826560549e+03, 1.089334707736612e+03,
- 1.089731647589664e+03, 1.090127651137199e+03, 1.090522723355369e+03, 1.090916869179447e+03, 1.091310093504279e+03,
- 1.091702401184736e+03, 1.092093797036155e+03, 1.092484285834776e+03, 1.092873872318166e+03, 1.093262561185652e+03,
- 1.093650357098734e+03, 1.094037264681495e+03, 1.094423288521012e+03, 1.094808433167758e+03, 1.095192703135990e+03,
- 1.095576102904148e+03, 1.095958636915233e+03, 1.096340309577194e+03, 1.096721125263293e+03, 1.097101088312483e+03,
- 1.097480203029767e+03, 1.097858473686561e+03, 1.098235904521046e+03, 1.098612499738519e+03, 1.098988263511741e+03,
- 1.099363199981273e+03, 1.099737313255815e+03, 1.100110607412540e+03, 1.100483086497415e+03, 1.100854754525534e+03,
- 1.101225615481426e+03, 1.101595673319377e+03, 1.101964931963739e+03, 1.102333395309237e+03, 1.102701067221271e+03,
- 1.103067951536214e+03, 1.103434052061709e+03, 1.103799372576959e+03, 1.104163916833015e+03, 1.104527688553060e+03,
- 1.104890691432686e+03, 1.105252929140176e+03, 1.105614405316774e+03, 1.105975123576955e+03, 1.106335087508691e+03,
- 1.106694300673713e+03, 1.107052766607776e+03, 1.107410488820907e+03, 1.107767470797666e+03, 1.108123715997391e+03,
- 1.108479227854447e+03, 1.108834009778469e+03, 1.109188065154605e+03, 1.109541397343752e+03, 1.109894009682790e+03,
- 1.110245905484817e+03, 1.110597088039378e+03, 1.110947560612690e+03, 1.111297326447863e+03, 1.111646388765130e+03,
- 1.111994750762056e+03, 1.112342415613757e+03, 1.112689386473118e+03, 1.113035666470996e+03, 1.113381258716431e+03,
- 1.113726166296855e+03, 1.114070392278291e+03, 1.114413939705555e+03, 1.114756811602454e+03, 1.115099010971985e+03,
- 1.115440540796522e+03, 1.115781404038017e+03, 1.116121603638181e+03, 1.116461142518673e+03, 1.116800023581290e+03,
- 1.117138249708142e+03, 1.117475823761837e+03, 1.117812748585662e+03, 1.118149027003750e+03, 1.118484661821266e+03,
- 1.118819655824572e+03, 1.119154011781397e+03, 1.119487732441013e+03, 1.119820820534391e+03, 1.120153278774373e+03,
- 1.120485109855836e+03, 1.120816316455843e+03, 1.121146901233814e+03, 1.121476866831678e+03, 1.121806215874025e+03,
- 1.122134950968268e+03, 1.122463074704787e+03, 1.122790589657085e+03, 1.123117498381934e+03, 1.123443803419524e+03,
- 1.123769507293604e+03, 1.124094612511632e+03, 1.124419121564914e+03, 1.124743036928744e+03, 1.125066361062544e+03,
- 1.125389096410004e+03, 1.125711245399210e+03, 1.126032810442791e+03, 1.126353793938042e+03, 1.126674198267061e+03,
- 1.126994025796875e+03, 1.127313278879573e+03, 1.127631959852432e+03, 1.127950071038042e+03, 1.128267614744434e+03,
- 1.128584593265198e+03, 1.128901008879610e+03, 1.129216863852750e+03, 1.129532160435625e+03, 1.129846900865281e+03,
- 1.130161087364927e+03, 1.130474722144045e+03, 1.130787807398510e+03, 1.131100345310699e+03, 1.131412338049602e+03,
- 1.131723787770938e+03, 1.132034696617263e+03, 1.132345066718077e+03, 1.132654900189931e+03, 1.132964199136538e+03,
- 1.133272965648871e+03, 1.133581201805275e+03, 1.133888909671565e+03, 1.134196091301131e+03, 1.134502748735035e+03,
- 1.134808884002117e+03, 1.135114499119086e+03, 1.135419596090628e+03, 1.135724176909494e+03, 1.136028243556601e+03,
- 1.136331798001123e+03, 1.136634842200592e+03, 1.136937378100984e+03, 1.137239407636813e+03, 1.137540932731226e+03
- },
- {
- 1.790357353794845e+00, 5.467497762786267e+00, 9.223769064426595e+00, 1.306363720639769e+01, 1.699198714129444e+01,
- 2.101417841717759e+01, 2.513611051805647e+01, 2.936430011599800e+01, 3.370597299247665e+01, 3.816917416826316e+01,
- 4.276290083525803e+01, 4.749726411510587e+01, 5.238368764053718e+01, 5.743515370830182e+01, 6.266651165759374e+01,
- 6.809486876255168e+01, 7.374009221247701e+01, 7.962546319280096e+01, 8.577854319760696e+01, 9.223234286702719e+01,
- 9.902693266639693e+01, 1.062117171566220e+02, 1.138487387807767e+02, 1.220176409660805e+02, 1.308234309965059e+02,
- 1.404092372126969e+02, 1.509786193955294e+02, 1.628378760678107e+02, 1.764856437045852e+02, 1.928360274620348e+02,
- 2.139463080793848e+02, 7.302618034821361e+02, 7.410913461504847e+02, 7.501805456121971e+02, 7.580916656664427e+02,
- 7.651397216991020e+02, 7.715222822428424e+02, 7.773727951899780e+02, 7.827863008478756e+02, 7.878332439408063e+02,
- 7.925674982878143e+02, 7.970313171255708e+02, 8.012585355114339e+02, 8.052767237662958e+02, 8.091086829823822e+02,
- 8.127735123508019e+02, 8.162873889646755e+02, 8.196641492696912e+02, 8.229157304249655e+02, 8.260525106571039e+02,
- 8.290835754394329e+02, 8.320169283013951e+02, 8.348596596928119e+02, 8.376180836474199e+02, 8.402978494259564e+02,
- 8.429040335026779e+02, 8.454412159527121e+02, 8.479135443448974e+02, 8.503247875409636e+02, 8.526783812758913e+02,
- 8.549774669968315e+02, 8.572249251346024e+02, 8.594234037480176e+02, 8.615753432996540e+02, 8.636829981792456e+02,
- 8.657484554784927e+02, 8.677736514316069e+02, 8.697603858643236e+02, 8.717103349363485e+02, 8.736250624154349e+02,
- 8.755060296830901e+02, 8.773546046406682e+02, 8.791720696587238e+02, 8.809596286912819e+02, 8.827184136587832e+02,
- 8.844494901887210e+02, 8.861538627904781e+02, 8.878324795304097e+02, 8.894862362643362e+02, 8.911159804770925e+02,
- 8.927225147723631e+02, 8.943066000505495e+02, 8.958689584077581e+02, 8.974102757848981e+02, 8.989312043924674e+02,
- 9.004323649335408e+02, 9.019143486449003e+02, 9.033777191739661e+02, 9.048230143071994e+02, 9.062507475639479e+02,
- 9.076614096681658e+02, 9.090554699091354e+02, 9.104333774011220e+02, 9.117955622509065e+02, 9.131424366411856e+02,
- 9.144743958370591e+02, 9.157918191220987e+02, 9.170950706698536e+02, 9.183845003560978e+02, 9.196604445166174e+02,
- 9.209232266548738e+02, 9.221731581035018e+02, 9.234105386432302e+02, 9.246356570824803e+02, 9.258487918006288e+02,
- 9.270502112576454e+02, 9.282401744725927e+02, 9.294189314732459e+02, 9.305867237189240e+02, 9.317437844984292e+02,
- 9.328903393048469e+02, 9.340266061888083e+02, 9.351527960916999e+02, 9.362691131601741e+02, 9.373757550432146e+02,
- 9.384729131729149e+02, 9.395607730300400e+02, 9.406395143953514e+02, 9.417093116488471e+02, 9.427703336898326e+02,
- 9.438227447650812e+02, 9.448667040576076e+02, 9.459023661849387e+02, 9.469298813207234e+02, 9.479493953684940e+02,
- 9.489610501268850e+02, 9.499649830460452e+02, 9.509613286585550e+02, 9.519502173868092e+02, 9.529317759444248e+02,
- 9.539061278109959e+02, 9.548733931988289e+02, 9.558336891707286e+02, 9.567871297524110e+02, 9.577338260398864e+02,
- 9.586738863020373e+02, 9.596074160786783e+02, 9.605345182743234e+02, 9.614552932478944e+02, 9.623698388985713e+02,
- 9.632782507479961e+02, 9.641806220190105e+02, 9.650770437110942e+02, 9.659676046726906e+02, 9.668523916705514e+02,
- 9.677314894562701e+02, 9.686049808301171e+02, 9.694729467023319e+02, 9.703354661519778e+02, 9.711926164977807e+02,
- 9.720444732939287e+02, 9.728911104722634e+02, 9.737326003309943e+02, 9.745690135988144e+02, 9.754004194813895e+02,
- 9.762268857061091e+02, 9.770484785651770e+02, 9.778652629571114e+02, 9.786773024267310e+02, 9.794846592036823e+02,
- 9.802873942395875e+02, 9.810855672438646e+02, 9.818792367182695e+02, 9.826684599902361e+02, 9.834532932450387e+02,
- 9.842337915320074e+02, 9.850100088956282e+02, 9.857819982500629e+02, 9.865498115120344e+02, 9.873134996011172e+02,
- 9.880731124658772e+02, 9.888286991091350e+02, 9.895803076124012e+02, 9.903279851595108e+02, 9.910717780594911e+02,
- 9.918117317686898e+02, 9.925478909121981e+02, 9.932802993045868e+02, 9.940089999699928e+02, 9.947340351615723e+02,
- 9.954554463803464e+02, 9.961732743934667e+02, 9.968875592519179e+02, 9.975983403076767e+02, 9.983056562303527e+02,
- 9.990095450233284e+02, 9.997100440394133e+02, 1.000407189996031e+03, 1.001101018989964e+03, 1.001791566511654e+03,
- 1.002478867459093e+03, 1.003162956151312e+03, 1.003843866341474e+03, 1.004521631229599e+03, 1.005196283474917e+03,
- 1.005867855207884e+03, 1.006536378041849e+03, 1.007201883084401e+03, 1.007864400948400e+03, 1.008523961762696e+03,
- 1.009180595182565e+03, 1.009834330399854e+03, 1.010485196152846e+03, 1.011133220735871e+03, 1.011778432008645e+03,
- 1.012420857405373e+03, 1.013060523943599e+03, 1.013697458232832e+03, 1.014331686482940e+03, 1.014963234512328e+03,
- 1.015592127755902e+03, 1.016218391272830e+03, 1.016842049754101e+03, 1.017463127529896e+03, 1.018081648576763e+03,
- 1.018697636524627e+03, 1.019311114663605e+03, 1.019922105975289e+03, 1.020530633039634e+03, 1.021136718192396e+03,
- 1.021740383429396e+03, 1.022341650438311e+03, 1.022940540604567e+03, 1.023537075017060e+03, 1.024131274473767e+03,
- 1.024723159487196e+03, 1.025312749791936e+03, 1.025900066323758e+03, 1.026485128289402e+03, 1.027067955111608e+03,
- 1.027648565953093e+03, 1.028226979721287e+03, 1.028803215072960e+03, 1.029377290418742e+03, 1.029949223927543e+03,
- 1.030519033530871e+03, 1.031086736927049e+03, 1.031652351585345e+03, 1.032215894749997e+03, 1.032777383444166e+03,
- 1.033336834473779e+03, 1.033894264431311e+03, 1.034449689699462e+03, 1.035003126454771e+03, 1.035554590671138e+03,
- 1.036104098123281e+03, 1.036651664390109e+03, 1.037197304858029e+03, 1.037741034724177e+03, 1.038282868999588e+03,
- 1.038822822512289e+03, 1.039360909910335e+03, 1.039897145664776e+03, 1.040431544072569e+03, 1.040964119259417e+03,
- 1.041494885182564e+03, 1.042023855633519e+03, 1.042551044240739e+03, 1.043076464472239e+03, 1.043600129638164e+03,
- 1.044122052893302e+03, 1.044642247239548e+03, 1.045160725528320e+03, 1.045677500462920e+03, 1.046192584600859e+03,
- 1.046705990356126e+03, 1.047217730001419e+03, 1.047727815670324e+03, 1.048236259359465e+03, 1.048743072930597e+03,
- 1.049248268112667e+03, 1.049751856503834e+03, 1.050253849573450e+03, 1.050754258664002e+03, 1.051253094993018e+03,
- 1.051750369654932e+03, 1.052246093622927e+03, 1.052740277750724e+03, 1.053232932774356e+03, 1.053724069313894e+03,
- 1.054213697875153e+03, 1.054701828851355e+03, 1.055188472524773e+03, 1.055673639068333e+03, 1.056157338547196e+03,
- 1.056639580920305e+03, 1.057120376041908e+03, 1.057599733663053e+03, 1.058077663433050e+03, 1.058554174900918e+03,
- 1.059029277516793e+03, 1.059502980633321e+03, 1.059975293507021e+03, 1.060446225299628e+03, 1.060915785079410e+03,
- 1.061383981822455e+03, 1.061850824413952e+03, 1.062316321649432e+03, 1.062780482235999e+03, 1.063243314793537e+03,
- 1.063704827855890e+03, 1.064165029872032e+03, 1.064623929207211e+03, 1.065081534144072e+03, 1.065537852883764e+03,
- 1.065992893547030e+03, 1.066446664175273e+03, 1.066899172731608e+03, 1.067350427101897e+03, 1.067800435095764e+03,
- 1.068249204447593e+03, 1.068696742817513e+03, 1.069143057792367e+03, 1.069588156886656e+03, 1.070032047543480e+03,
- 1.070474737135455e+03, 1.070916232965619e+03, 1.071356542268319e+03, 1.071795672210094e+03, 1.072233629890530e+03,
- 1.072670422343110e+03, 1.073106056536046e+03, 1.073540539373108e+03, 1.073973877694419e+03, 1.074406078277264e+03,
- 1.074837147836860e+03, 1.075267093027134e+03, 1.075695920441482e+03, 1.076123636613508e+03, 1.076550248017765e+03,
- 1.076975761070477e+03, 1.077400182130250e+03, 1.077823517498771e+03, 1.078245773421506e+03, 1.078666956088371e+03,
- 1.079087071634404e+03, 1.079506126140427e+03, 1.079924125633694e+03, 1.080341076088528e+03, 1.080756983426951e+03,
- 1.081171853519309e+03, 1.081585692184875e+03, 1.081998505192460e+03, 1.082410298260998e+03, 1.082821077060134e+03,
- 1.083230847210798e+03, 1.083639614285773e+03, 1.084047383810253e+03, 1.084454161262393e+03, 1.084859952073853e+03,
- 1.085264761630331e+03, 1.085668595272089e+03, 1.086071458294474e+03, 1.086473355948429e+03, 1.086874293440996e+03,
- 1.087274275935815e+03, 1.087673308553613e+03, 1.088071396372686e+03, 1.088468544429375e+03, 1.088864757718539e+03,
- 1.089260041194012e+03, 1.089654399769063e+03, 1.090047838316847e+03, 1.090440361670842e+03, 1.090831974625293e+03,
- 1.091222681935642e+03, 1.091612488318949e+03, 1.092001398454316e+03, 1.092389416983299e+03, 1.092776548510313e+03,
- 1.093162797603041e+03, 1.093548168792823e+03, 1.093932666575053e+03, 1.094316295409562e+03, 1.094699059720999e+03,
- 1.095080963899212e+03, 1.095462012299608e+03, 1.095842209243526e+03, 1.096221559018600e+03, 1.096600065879108e+03,
- 1.096977734046326e+03, 1.097354567708876e+03, 1.097730571023067e+03, 1.098105748113230e+03, 1.098480103072056e+03,
- 1.098853639960917e+03, 1.099226362810201e+03, 1.099598275619620e+03, 1.099969382358533e+03, 1.100339686966257e+03,
- 1.100709193352375e+03, 1.101077905397037e+03, 1.101445826951261e+03, 1.101812961837230e+03, 1.102179313848584e+03,
- 1.102544886750708e+03, 1.102909684281015e+03, 1.103273710149231e+03, 1.103636968037667e+03, 1.103999461601501e+03,
- 1.104361194469039e+03, 1.104722170241989e+03, 1.105082392495725e+03, 1.105441864779543e+03, 1.105800590616919e+03,
- 1.106158573505769e+03, 1.106515816918693e+03, 1.106872324303225e+03, 1.107228099082079e+03, 1.107583144653390e+03,
- 1.107937464390952e+03, 1.108291061644456e+03, 1.108643939739718e+03, 1.108996101978918e+03, 1.109347551640815e+03,
- 1.109698291980983e+03, 1.110048326232028e+03, 1.110397657603806e+03, 1.110746289283641e+03, 1.111094224436538e+03,
- 1.111441466205398e+03, 1.111788017711221e+03, 1.112133882053316e+03, 1.112479062309505e+03, 1.112823561536323e+03,
- 1.113167382769219e+03, 1.113510529022749e+03, 1.113853003290775e+03, 1.114194808546654e+03, 1.114535947743431e+03,
- 1.114876423814021e+03, 1.115216239671401e+03, 1.115555398208788e+03, 1.115893902299828e+03, 1.116231754798761e+03,
- 1.116568958540616e+03, 1.116905516341370e+03, 1.117241430998131e+03, 1.117576705289306e+03, 1.117911341974766e+03,
- 1.118245343796024e+03, 1.118578713476387e+03, 1.118911453721128e+03, 1.119243567217644e+03, 1.119575056635620e+03,
- 1.119905924627179e+03, 1.120236173827044e+03, 1.120565806852696e+03, 1.120894826304516e+03, 1.121223234765943e+03,
- 1.121551034803622e+03, 1.121878228967553e+03, 1.122204819791235e+03, 1.122530809791809e+03, 1.122856201470205e+03,
- 1.123180997311279e+03, 1.123505199783954e+03, 1.123828811341361e+03, 1.124151834420970e+03, 1.124474271444731e+03,
- 1.124796124819201e+03, 1.125117396935685e+03, 1.125438090170358e+03, 1.125758206884398e+03, 1.126077749424117e+03,
- 1.126396720121081e+03, 1.126715121292240e+03, 1.127032955240053e+03, 1.127350224252604e+03, 1.127666930603730e+03,
- 1.127983076553138e+03, 1.128298664346525e+03, 1.128613696215691e+03, 1.128928174378662e+03, 1.129242101039801e+03,
- 1.129555478389921e+03, 1.129868308606400e+03, 1.130180593853290e+03, 1.130492336281429e+03, 1.130803538028552e+03,
- 1.131114201219392e+03, 1.131424327965794e+03, 1.131733920366817e+03, 1.132042980508841e+03, 1.132351510465665e+03,
- 1.132659512298619e+03, 1.132966988056656e+03, 1.133273939776459e+03, 1.133580369482533e+03, 1.133886279187314e+03,
- 1.134191670891256e+03, 1.134496546582933e+03, 1.134800908239132e+03, 1.135104757824952e+03, 1.135408097293888e+03
- },
- {
- 1.784128137737149e+00, 5.447817612638968e+00, 9.189394945402508e+00, 1.301319068276671e+01, 1.692393502464531e+01,
- 2.092680988894299e+01, 2.502750993056841e+01, 2.923231445913096e+01, 3.354817272437052e+01, 3.798280572234996e+01,
- 4.254482859230704e+01, 4.724389891085903e+01, 5.209089788109560e+01, 5.709815375699551e+01, 6.227972013831053e+01,
- 6.765172647978235e+01, 7.323282500898418e+01, 7.904476841139990e+01, 8.511316805641117e+01, 9.146850649594452e+01,
- 9.814751624617556e+01, 1.051950999732374e+02, 1.126670750756091e+02, 1.206342179476226e+02, 1.291884430403934e+02,
- 1.384526672002441e+02, 1.485974351486633e+02, 1.598709471374148e+02, 1.726584929797579e+02, 1.876161751446942e+02,
- 2.060368813032386e+02, 2.312793329273013e+02, 7.200888616262192e+02, 7.319416134778551e+02, 7.417307879594317e+02,
- 7.501642780614142e+02, 7.576240206252805e+02, 7.643434817359722e+02, 7.704773843907412e+02, 7.761343065469871e+02,
- 7.813937843614359e+02, 7.863160631987325e+02, 7.909480194802480e+02, 7.953269411402308e+02, 7.994830410066404e+02,
- 8.034411851215641e+02, 8.072221156180166e+02, 8.108433374080104e+02, 8.143197749061239e+02, 8.176642675658613e+02,
- 8.208879499877705e+02, 8.240005477818443e+02, 8.270106108907581e+02, 8.299256997745460e+02, 8.327525355724613e+02,
- 8.354971223904631e+02, 8.381648477726766e+02, 8.407605659196262e+02, 8.432886671306239e+02, 8.457531361495375e+02,
- 8.481576014990246e+02, 8.505053774411418e+02, 8.527994998621625e+02, 8.550427571182039e+02, 8.572377166759447e+02,
- 8.593867482245221e+02, 8.614920438101761e+02, 8.635556354463706e+02, 8.655794105731588e+02, 8.675651256760794e+02,
- 8.695144183234750e+02, 8.714288178393106e+02, 8.733097547943360e+02, 8.751585694703192e+02, 8.769765194287359e+02,
- 8.787647862960223e+02, 8.805244818613579e+02, 8.822566535693835e+02, 8.839622894789543e+02, 8.856423227493690e+02,
- 8.872976357074052e+02, 8.889290635415546e+02, 8.905373976639439e+02, 8.921233887753576e+02, 8.936877496644477e+02,
- 8.952311577684477e+02, 8.967542575194909e+02, 8.982576624978193e+02, 8.997419574107325e+02, 9.012076999140090e+02,
- 9.026554222906925e+02, 9.040856330004789e+02, 9.054988181115656e+02, 9.068954426255369e+02, 9.082759517047912e+02,
- 9.096407718110082e+02, 9.109903117623311e+02, 9.123249637161641e+02, 9.136451040837921e+02, 9.149510943824620e+02,
- 9.162432820300033e+02, 9.175220010866001e+02, 9.187875729479002e+02, 9.200403069932519e+02, 9.212805011925426e+02,
- 9.225084426747677e+02, 9.237244082612212e+02, 9.249286649659293e+02, 9.261214704657061e+02, 9.273030735420581e+02,
- 9.284737144969288e+02, 9.296336255441300e+02, 9.307830311781685e+02, 9.319221485220141e+02, 9.330511876552470e+02,
- 9.341703519239090e+02, 9.352798382332741e+02, 9.363798373246618e+02, 9.374705340373368e+02, 9.385521075564899e+02,
- 9.396247316496685e+02, 9.406885748901230e+02, 9.417438008662858e+02, 9.427905683819802e+02, 9.438290316466404e+02,
- 9.448593404560210e+02, 9.458816403639780e+02, 9.468960723858989e+02, 9.479027746519915e+02, 9.489018809258141e+02,
- 9.498935211838592e+02, 9.508778220623093e+02, 9.518549068255717e+02, 9.528248954885123e+02, 9.537879049331106e+02,
- 9.547440490198381e+02, 9.556934386940462e+02, 9.566361820876405e+02, 9.575723846162803e+02, 9.585021490723520e+02,
- 9.594255757139236e+02, 9.603427623499022e+02, 9.612538044215743e+02, 9.621587950807351e+02, 9.630578252645477e+02,
- 9.639509837673334e+02, 9.648383573094060e+02, 9.657200306031317e+02, 9.665960864163213e+02, 9.674666056330983e+02,
- 9.683316673267390e+02, 9.691913487569939e+02, 9.700457255145186e+02, 9.708948715109354e+02, 9.717388590446338e+02,
- 9.725777588487991e+02, 9.734116401376341e+02, 9.742405706508556e+02, 9.750646166965395e+02, 9.758838431923991e+02,
- 9.766983137055551e+02, 9.775080904908605e+02, 9.783132345278646e+02, 9.791138055564476e+02, 9.799098620861873e+02,
- 9.807014615313764e+02, 9.814886600874603e+02, 9.822715128676456e+02, 9.830500739058070e+02, 9.838243961853209e+02,
- 9.845945316669249e+02, 9.853605313156449e+02, 9.861224451268215e+02, 9.868803221512757e+02, 9.876342105196538e+02,
- 9.883841574659692e+02, 9.891302093503849e+02, 9.898724116812695e+02, 9.906108091365363e+02, 9.913454455843183e+02,
- 9.920763641029797e+02, 9.928036070005131e+02, 9.935272158333223e+02, 9.942472314244318e+02, 9.949636938811367e+02,
- 9.956766426121142e+02, 9.963861163440135e+02, 9.970921531375549e+02, 9.977947904031398e+02, 9.984940649159996e+02,
- 9.991900128308988e+02, 9.998826696964089e+02, 1.000572070468760e+03, 1.001258249525296e+03, 1.001941240677548e+03,
- 1.002621077183915e+03, 1.003297791762012e+03, 1.003971416600645e+03, 1.004641983371458e+03, 1.005309523240265e+03,
- 1.005974066878053e+03, 1.006635644471682e+03, 1.007294285734312e+03, 1.007950019915519e+03, 1.008602875811152e+03,
- 1.009252881772924e+03, 1.009900065717742e+03, 1.010544455136793e+03, 1.011186077104385e+03, 1.011824958286555e+03,
- 1.012461124949463e+03, 1.013094602967549e+03, 1.013725417856360e+03, 1.014353594679698e+03, 1.014979158209842e+03,
- 1.015602132831909e+03, 1.016222542577097e+03, 1.016840411129675e+03, 1.017455761833805e+03, 1.018068617700189e+03,
- 1.018679001412550e+03, 1.019286935333965e+03, 1.019892441513025e+03, 1.020495541689863e+03, 1.021096257302017e+03,
- 1.021694609490174e+03, 1.022290618605680e+03, 1.022884306190824e+03, 1.023475692047790e+03, 1.024064796184456e+03,
- 1.024651638338515e+03, 1.025236237982444e+03, 1.025818614328341e+03, 1.026398786332672e+03, 1.026976772700895e+03,
- 1.027552591891977e+03, 1.028126262122814e+03, 1.028697801372552e+03, 1.029267227386802e+03, 1.029834557681768e+03,
- 1.030399809548277e+03, 1.030963000055726e+03, 1.031524146055935e+03, 1.032083264186918e+03, 1.032640370876573e+03,
- 1.033195482346286e+03, 1.033748614614463e+03, 1.034299783499981e+03, 1.034849004625567e+03, 1.035396293421104e+03,
- 1.035941665126865e+03, 1.036485134796682e+03, 1.037026717301045e+03, 1.037566427330134e+03, 1.038104279396792e+03,
- 1.038640287839435e+03, 1.039174466824897e+03, 1.039706830351226e+03, 1.040237392250406e+03, 1.040766166191043e+03,
- 1.041293165680983e+03, 1.041818404069879e+03, 1.042341894551710e+03, 1.042863650167243e+03, 1.043383683806456e+03,
- 1.043902008210899e+03, 1.044418635976019e+03, 1.044933579553434e+03, 1.045446851253166e+03, 1.045958463245821e+03,
- 1.046468427564742e+03, 1.046976756108102e+03, 1.047483460640973e+03, 1.047988552797341e+03, 1.048492044082094e+03,
- 1.048993945872964e+03, 1.049494269422437e+03, 1.049993025859621e+03, 1.050490226192086e+03, 1.050985881307662e+03,
- 1.051480001976210e+03, 1.051972598851356e+03, 1.052463682472191e+03, 1.052953263264945e+03, 1.053441351544627e+03,
- 1.053927957516632e+03, 1.054413091278326e+03, 1.054896762820594e+03, 1.055378982029364e+03, 1.055859758687105e+03,
- 1.056339102474295e+03, 1.056817022970862e+03, 1.057293529657602e+03, 1.057768631917573e+03, 1.058242339037457e+03,
- 1.058714660208906e+03, 1.059185604529861e+03, 1.059655181005845e+03, 1.060123398551241e+03, 1.060590265990537e+03,
- 1.061055792059562e+03, 1.061519985406689e+03, 1.061982854594023e+03, 1.062444408098570e+03, 1.062904654313384e+03,
- 1.063363601548691e+03, 1.063821258032999e+03, 1.064277631914190e+03, 1.064732731260588e+03, 1.065186564062014e+03,
- 1.065639138230818e+03, 1.066090461602903e+03, 1.066540541938721e+03, 1.066989386924262e+03, 1.067437004172018e+03,
- 1.067883401221942e+03, 1.068328585542379e+03, 1.068772564530987e+03, 1.069215345515651e+03, 1.069656935755370e+03,
- 1.070097342441133e+03, 1.070536572696785e+03, 1.070974633579879e+03, 1.071411532082505e+03, 1.071847275132121e+03,
- 1.072281869592356e+03, 1.072715322263809e+03, 1.073147639884838e+03, 1.073578829132322e+03, 1.074008896622430e+03,
- 1.074437848911365e+03, 1.074865692496099e+03, 1.075292433815101e+03, 1.075718079249051e+03, 1.076142635121538e+03,
- 1.076566107699755e+03, 1.076988503195182e+03, 1.077409827764257e+03, 1.077830087509029e+03, 1.078249288477820e+03,
- 1.078667436665857e+03, 1.079084538015909e+03, 1.079500598418906e+03, 1.079915623714548e+03, 1.080329619691918e+03,
- 1.080742592090066e+03, 1.081154546598599e+03, 1.081565488858260e+03, 1.081975424461492e+03, 1.082384358953001e+03,
- 1.082792297830305e+03, 1.083199246544282e+03, 1.083605210499701e+03, 1.084010195055753e+03, 1.084414205526572e+03,
- 1.084817247181745e+03, 1.085219325246821e+03, 1.085620444903805e+03, 1.086020611291653e+03, 1.086419829506756e+03,
- 1.086818104603414e+03, 1.087215441594308e+03, 1.087611845450968e+03, 1.088007321104226e+03, 1.088401873444665e+03,
- 1.088795507323069e+03, 1.089188227550859e+03, 1.089580038900524e+03, 1.089970946106050e+03, 1.090360953863338e+03,
- 1.090750066830622e+03, 1.091138289628873e+03, 1.091525626842205e+03, 1.091912083018278e+03, 1.092297662668679e+03,
- 1.092682370269317e+03, 1.093066210260806e+03, 1.093449187048839e+03, 1.093831305004556e+03, 1.094212568464917e+03,
- 1.094592981733060e+03, 1.094972549078660e+03, 1.095351274738278e+03, 1.095729162915713e+03, 1.096106217782341e+03,
- 1.096482443477453e+03, 1.096857844108594e+03, 1.097232423751885e+03, 1.097606186452356e+03, 1.097979136224260e+03,
- 1.098351277051396e+03, 1.098722612887414e+03, 1.099093147656131e+03, 1.099462885251834e+03, 1.099831829539575e+03,
- 1.100199984355476e+03, 1.100567353507016e+03, 1.100933940773324e+03, 1.101299749905461e+03, 1.101664784626704e+03,
- 1.102029048632827e+03, 1.102392545592369e+03, 1.102755279146912e+03, 1.103117252911347e+03, 1.103478470474136e+03,
- 1.103838935397577e+03, 1.104198651218061e+03, 1.104557621446323e+03, 1.104915849567700e+03, 1.105273339042375e+03,
- 1.105630093305625e+03, 1.105986115768062e+03, 1.106341409815873e+03, 1.106695978811056e+03, 1.107049826091654e+03,
- 1.107402954971986e+03, 1.107755368742877e+03, 1.108107070671879e+03, 1.108458064003496e+03, 1.108808351959404e+03,
- 1.109157937738667e+03, 1.109506824517953e+03, 1.109855015451747e+03, 1.110202513672557e+03, 1.110549322291121e+03,
- 1.110895444396617e+03, 1.111240883056861e+03, 1.111585641318505e+03, 1.111929722207238e+03, 1.112273128727979e+03,
- 1.112615863865072e+03, 1.112957930582473e+03, 1.113299331823941e+03, 1.113640070513224e+03, 1.113980149554240e+03,
- 1.114319571831264e+03, 1.114658340209101e+03, 1.114996457533270e+03, 1.115333926630176e+03, 1.115670750307285e+03,
- 1.116006931353293e+03, 1.116342472538301e+03, 1.116677376613975e+03, 1.117011646313720e+03, 1.117345284352836e+03,
- 1.117678293428688e+03, 1.118010676220859e+03, 1.118342435391312e+03, 1.118673573584549e+03, 1.119004093427758e+03,
- 1.119333997530976e+03, 1.119663288487232e+03, 1.119991968872704e+03, 1.120320041246860e+03, 1.120647508152609e+03,
- 1.120974372116445e+03, 1.121300635648589e+03, 1.121626301243133e+03, 1.121951371378179e+03, 1.122275848515974e+03,
- 1.122599735103053e+03, 1.122923033570371e+03, 1.123245746333438e+03, 1.123567875792452e+03, 1.123889424332428e+03,
- 1.124210394323332e+03, 1.124530788120205e+03, 1.124850608063291e+03, 1.125169856478166e+03, 1.125488535675858e+03,
- 1.125806647952973e+03, 1.126124195591812e+03, 1.126441180860500e+03, 1.126757606013095e+03, 1.127073473289713e+03,
- 1.127388784916641e+03, 1.127703543106456e+03, 1.128017750058133e+03, 1.128331407957165e+03, 1.128644518975668e+03,
- 1.128957085272498e+03, 1.129269108993355e+03, 1.129580592270896e+03, 1.129891537224836e+03, 1.130201945962063e+03,
- 1.130511820576733e+03, 1.130821163150383e+03, 1.131129975752025e+03, 1.131438260438257e+03, 1.131746019253355e+03,
- 1.132053254229379e+03, 1.132359967386269e+03, 1.132666160731942e+03, 1.132971836262391e+03, 1.133276995961780e+03
- },
- {
- 1.777942882207403e+00, 5.428286118627769e+00, 9.155298516182892e+00, 1.296317975662621e+01, 1.685651077803315e+01,
- 2.084030254720316e+01, 2.492005305740344e+01, 2.910181430103813e+01, 3.339227142875285e+01, 3.779883690523879e+01,
- 4.232976326997334e+01, 4.699427918056829e+01, 5.180275486819037e+01, 5.676690513079360e+01, 6.190004077364777e+01,
- 6.721738334843764e+01, 7.273646371845251e+01, 7.847763330418658e+01, 8.446472933224382e+01, 9.072595451342302e+01,
- 9.729506160539736e+01, 1.042129819138394e+02, 1.115301180882636e+02, 1.193096629063413e+02, 1.276325624730369e+02,
- 1.366052347071769e+02, 1.463721586349016e+02, 1.571376706598486e+02, 1.692067228189007e+02, 1.830694491768787e+02,
- 1.996049724878702e+02, 2.207063241773465e+02, 2.524278211101979e+02, 7.096716840971882e+02, 7.226492715339948e+02,
- 7.331882281860643e+02, 7.421722825213556e+02, 7.500611850142686e+02, 7.571291082619841e+02, 7.635544529417624e+02,
- 7.694606415023716e+02, 7.749370585385019e+02, 7.800507815198040e+02, 7.848536016447434e+02, 7.893864506222692e+02,
- 7.936823124330288e+02, 7.977682070170428e+02, 8.016665823966003e+02, 8.053963168147152e+02, 8.089734562261336e+02,
- 8.124117676132771e+02, 8.157231612600975e+02, 8.189180179407922e+02, 8.220054458949400e+02, 8.249934851330432e+02,
- 8.278892716677619e+02, 8.306991708587942e+02, 8.334288866718384e+02, 8.360835519521438e+02, 8.386678035849758e+02,
- 8.411858455159708e+02, 8.436415019376071e+02, 8.460382624479404e+02, 8.483793206087560e+02, 8.506676070401645e+02,
- 8.529058179644718e+02, 8.550964399375410e+02, 8.572417713685800e+02, 8.593439413207194e+02, 8.614049259981246e+02,
- 8.634265632559305e+02, 8.654105654131376e+02, 8.673585306030536e+02, 8.692719528585650e+02, 8.711522310989980e+02,
- 8.730006771600173e+02, 8.748185229870820e+02, 8.766069270955352e+02, 8.783669803857833e+02, 8.800997113897441e+02,
- 8.818060910144083e+02, 8.834870368395551e+02, 8.851434170192563e+02, 8.867760538304046e+02, 8.883857269060986e+02,
- 8.899731761870339e+02, 8.915391046200399e+02, 8.930841806294267e+02, 8.946090403838235e+02, 8.961142898785605e+02,
- 8.976005068513920e+02, 8.990682425473867e+02, 9.005180233470616e+02, 9.019503522703350e+02, 9.033657103675461e+02,
- 9.047645580075896e+02, 9.061473360722172e+02, 9.075144670646124e+02, 9.088663561395472e+02, 9.102033920617129e+02,
- 9.115259480981804e+02, 9.128343828503545e+02, 9.141290410303254e+02, 9.154102541860049e+02, 9.166783413790927e+02,
- 9.179336098195122e+02, 9.191763554596314e+02, 9.204068635513248e+02, 9.216254091686242e+02, 9.228322576984983e+02,
- 9.240276653020718e+02, 9.252118793484140e+02, 9.263851388228243e+02, 9.275476747114228e+02, 9.286997103636656e+02,
- 9.298414618343114e+02, 9.309731382062203e+02, 9.320949418952661e+02, 9.332070689385558e+02, 9.343097092670259e+02,
- 9.354030469637378e+02, 9.364872605103276e+02, 9.375625230177343e+02, 9.386290024446749e+02, 9.396868618058702e+02,
- 9.407362593697205e+02, 9.417773488460484e+02, 9.428102795645153e+02, 9.438351961172967e+02, 9.448522402661330e+02,
- 9.458615491235938e+02, 9.468632559468410e+02, 9.478574905439639e+02, 9.488443792459143e+02, 9.498240450332399e+02,
- 9.507966076570144e+02, 9.517621837542692e+02, 9.527208869582295e+02, 9.536728280036399e+02, 9.546181148274395e+02,
- 9.555568526650261e+02, 9.564891441423515e+02, 9.574150893640609e+02, 9.583347859978765e+02, 9.592483293554245e+02,
- 9.601558124696753e+02, 9.610573261691827e+02, 9.619529591492633e+02, 9.628427980402820e+02, 9.637269274731779e+02,
- 9.646054301423646e+02, 9.654783868804550e+02, 9.663458766576407e+02, 9.672079767275955e+02, 9.680647626194268e+02,
- 9.689163082050466e+02, 9.697626857487487e+02, 9.706039659549119e+02, 9.714402180139184e+02, 9.722715096463558e+02,
- 9.730979071455962e+02, 9.739194754188125e+02, 9.747362780265086e+02, 9.755483772206161e+02, 9.763558339579681e+02,
- 9.771587080304907e+02, 9.779570579546129e+02, 9.787509411026307e+02, 9.795404137094653e+02, 9.803255309034216e+02,
- 9.811063467358766e+02, 9.818829142099742e+02, 9.826552853083444e+02, 9.834235110199006e+02, 9.841876413657428e+02,
- 9.849477254242078e+02, 9.857038113550988e+02, 9.864559464231262e+02, 9.872041770205939e+02, 9.879485486893531e+02,
- 9.886891061420606e+02, 9.894258932827657e+02, 9.901589532268429e+02, 9.908883283203124e+02, 9.916140601585514e+02,
- 9.923361896044388e+02, 9.930547568059385e+02, 9.937698012131472e+02, 9.944813615948332e+02, 9.951894760544748e+02,
- 9.958941820458206e+02, 9.965955163879903e+02, 9.972935152801330e+02, 9.979882143156491e+02, 9.986796484960095e+02,
- 9.993678522441672e+02, 1.000052859417588e+03, 1.000734703320910e+03, 1.001413416718240e+03, 1.002089031845109e+03,
- 1.002761580420088e+03, 1.003431093656084e+03, 1.004097602271324e+03, 1.004761136500026e+03, 1.005421726102801e+03,
- 1.006079400376743e+03, 1.006734188165275e+03, 1.007386117867710e+03, 1.008035217472528e+03, 1.008681514469466e+03,
- 1.009325036005542e+03, 1.009965808794324e+03, 1.010603859149435e+03, 1.011239212992712e+03, 1.011871895862145e+03,
- 1.012501932919615e+03, 1.013129348958434e+03, 1.013754168410695e+03, 1.014376415354436e+03, 1.014996113520620e+03,
- 1.015613286299949e+03, 1.016227956749501e+03, 1.016840147599204e+03, 1.017449881258157e+03, 1.018057179820787e+03,
- 1.018662065072866e+03, 1.019264557999529e+03, 1.019864680764712e+03, 1.020462453782305e+03, 1.021057897660723e+03,
- 1.021651032727688e+03, 1.022241879035425e+03, 1.022830456365744e+03, 1.023416784234998e+03, 1.024000881898927e+03,
- 1.024582768357391e+03, 1.025162462358997e+03, 1.025739982405610e+03, 1.026315346756777e+03, 1.026888573434035e+03,
- 1.027459680225132e+03, 1.028028684688151e+03, 1.028595604155538e+03, 1.029160455738047e+03, 1.029723256328592e+03,
- 1.030284022606017e+03, 1.030842771038786e+03, 1.031399517888584e+03, 1.031954279213851e+03, 1.032507070873229e+03,
- 1.033057908528944e+03, 1.033606807650110e+03, 1.034153783515965e+03, 1.034698851219034e+03, 1.035242025668234e+03,
- 1.035783321591905e+03, 1.036322753540784e+03, 1.036860335890911e+03, 1.037396082846479e+03, 1.037930008442627e+03,
- 1.038462126548168e+03, 1.038992450868272e+03, 1.039520994947081e+03, 1.040047772170283e+03, 1.040572795767632e+03,
- 1.041096078815404e+03, 1.041617634238829e+03, 1.042137474814450e+03, 1.042655613172446e+03, 1.043172061798913e+03,
- 1.043686833038091e+03, 1.044199939094555e+03, 1.044711392035356e+03, 1.045221203792131e+03, 1.045729386163157e+03,
- 1.046235950815384e+03, 1.046740909286409e+03, 1.047244272986430e+03, 1.047746053200152e+03, 1.048246261088658e+03,
- 1.048744907691252e+03, 1.049242003927258e+03, 1.049737560597788e+03, 1.050231588387485e+03, 1.050724097866218e+03,
- 1.051215099490763e+03, 1.051704603606440e+03, 1.052192620448723e+03, 1.052679160144829e+03, 1.053164232715262e+03,
- 1.053647848075348e+03, 1.054130016036725e+03, 1.054610746308815e+03, 1.055090048500273e+03, 1.055567932120400e+03,
- 1.056044406580535e+03, 1.056519481195431e+03, 1.056993165184593e+03, 1.057465467673600e+03, 1.057936397695404e+03,
- 1.058405964191603e+03, 1.058874176013695e+03, 1.059341041924306e+03, 1.059806570598407e+03, 1.060270770624492e+03,
- 1.060733650505758e+03, 1.061195218661244e+03, 1.061655483426965e+03, 1.062114453057023e+03, 1.062572135724692e+03,
- 1.063028539523498e+03, 1.063483672468268e+03, 1.063937542496171e+03, 1.064390157467737e+03, 1.064841525167856e+03,
- 1.065291653306770e+03, 1.065740549521041e+03, 1.066188221374503e+03, 1.066634676359205e+03, 1.067079921896327e+03,
- 1.067523965337096e+03, 1.067966813963675e+03, 1.068408474990045e+03, 1.068848955562866e+03, 1.069288262762332e+03,
- 1.069726403603005e+03, 1.070163385034644e+03, 1.070599213943009e+03, 1.071033897150667e+03, 1.071467441417772e+03,
- 1.071899853442841e+03, 1.072331139863515e+03, 1.072761307257309e+03, 1.073190362142344e+03, 1.073618310978083e+03,
- 1.074045160166040e+03, 1.074470916050483e+03, 1.074895584919132e+03, 1.075319173003837e+03, 1.075741686481254e+03,
- 1.076163131473502e+03, 1.076583514048823e+03, 1.077002840222214e+03, 1.077421115956070e+03, 1.077838347160799e+03,
- 1.078254539695439e+03, 1.078669699368262e+03, 1.079083831937369e+03, 1.079496943111278e+03, 1.079909038549503e+03,
- 1.080320123863119e+03, 1.080730204615328e+03, 1.081139286322009e+03, 1.081547374452265e+03, 1.081954474428958e+03,
- 1.082360591629241e+03, 1.082765731385075e+03, 1.083169898983749e+03, 1.083573099668381e+03, 1.083975338638420e+03,
- 1.084376621050140e+03, 1.084776952017122e+03, 1.085176336610734e+03, 1.085574779860603e+03, 1.085972286755080e+03,
- 1.086368862241697e+03, 1.086764511227619e+03, 1.087159238580091e+03, 1.087553049126880e+03, 1.087945947656701e+03,
- 1.088337938919651e+03, 1.088729027627629e+03, 1.089119218454750e+03, 1.089508516037755e+03, 1.089896924976418e+03,
- 1.090284449833941e+03, 1.090671095137351e+03, 1.091056865377887e+03, 1.091441765011380e+03, 1.091825798458633e+03,
- 1.092208970105797e+03, 1.092591284304729e+03, 1.092972745373368e+03, 1.093353357596077e+03, 1.093733125224011e+03,
- 1.094112052475457e+03, 1.094490143536176e+03, 1.094867402559750e+03, 1.095243833667910e+03, 1.095619440950870e+03,
- 1.095994228467651e+03, 1.096368200246402e+03, 1.096741360284721e+03, 1.097113712549966e+03, 1.097485260979566e+03,
- 1.097856009481321e+03, 1.098225961933712e+03, 1.098595122186194e+03, 1.098963494059487e+03, 1.099331081345872e+03,
- 1.099697887809473e+03, 1.100063917186542e+03, 1.100429173185736e+03, 1.100793659488396e+03, 1.101157379748814e+03,
- 1.101520337594509e+03, 1.101882536626483e+03, 1.102243980419490e+03, 1.102604672522295e+03, 1.102964616457924e+03,
- 1.103323815723922e+03, 1.103682273792599e+03, 1.104039994111277e+03, 1.104396980102533e+03, 1.104753235164441e+03,
- 1.105108762670805e+03, 1.105463565971398e+03, 1.105817648392191e+03, 1.106171013235582e+03, 1.106523663780621e+03,
- 1.106875603283234e+03, 1.107226834976447e+03, 1.107577362070595e+03, 1.107927187753547e+03, 1.108276315190911e+03,
- 1.108624747526250e+03, 1.108972487881286e+03, 1.109319539356105e+03, 1.109665905029361e+03, 1.110011587958477e+03,
- 1.110356591179841e+03, 1.110700917709003e+03, 1.111044570540868e+03, 1.111387552649885e+03, 1.111729866990241e+03,
- 1.112071516496042e+03, 1.112412504081501e+03, 1.112752832641118e+03, 1.113092505049863e+03, 1.113431524163351e+03,
- 1.113769892818020e+03, 1.114107613831306e+03, 1.114444690001811e+03, 1.114781124109479e+03, 1.115116918915760e+03,
- 1.115452077163775e+03, 1.115786601578486e+03, 1.116120494866853e+03, 1.116453759717999e+03, 1.116786398803366e+03,
- 1.117118414776870e+03, 1.117449810275063e+03, 1.117780587917282e+03, 1.118110750305801e+03, 1.118440300025982e+03,
- 1.118769239646425e+03, 1.119097571719110e+03, 1.119425298779547e+03, 1.119752423346922e+03, 1.120078947924231e+03,
- 1.120404874998424e+03, 1.120730207040550e+03, 1.121054946505884e+03, 1.121379095834071e+03, 1.121702657449260e+03,
- 1.122025633760229e+03, 1.122348027160527e+03, 1.122669840028599e+03, 1.122991074727914e+03, 1.123311733607095e+03,
- 1.123631819000043e+03, 1.123951333226063e+03, 1.124270278589986e+03, 1.124588657382294e+03, 1.124906471879236e+03,
- 1.125223724342952e+03, 1.125540417021587e+03, 1.125856552149412e+03, 1.126172131946940e+03, 1.126487158621032e+03,
- 1.126801634365023e+03, 1.127115561358826e+03, 1.127428941769042e+03, 1.127741777749076e+03, 1.128054071439240e+03,
- 1.128365824966863e+03, 1.128677040446400e+03, 1.128987719979529e+03, 1.129297865655265e+03, 1.129607479550057e+03,
- 1.129916563727892e+03, 1.130225120240397e+03, 1.130533151126935e+03, 1.130840658414709e+03, 1.131147644118858e+03
- },
- {
- 1.771801111626728e+00, 5.408901484923344e+00, 9.121476066451514e+00, 1.291359803615823e+01, 1.678970433662002e+01,
- 2.075464137159469e+01, 2.481371825706919e+01, 2.897276921103781e+01, 3.323822705190988e+01, 3.761721031840201e+01,
- 4.211762720935092e+01, 4.674830046990809e+01, 5.151911859788451e+01, 5.644122044680288e+01, 6.152722265739238e+01,
- 6.679150265444119e+01, 7.225055465861996e+01, 7.792344300089340e+01, 8.383238714214187e+01, 9.000352808704336e+01,
- 9.646794954273483e+01, 1.032630647978712e+02, 1.104345419839553e+02, 1.180390451331968e+02, 1.261482535560900e+02,
- 1.348549656702011e+02, 1.442827669485019e+02, 1.546021584874622e+02, 1.660592868291566e+02, 1.790317125507279e+02,
- 1.941502756754422e+02, 2.126167593331151e+02, 2.373242298827303e+02, 6.790990805784359e+02, 6.990439746187120e+02,
- 7.132408968104803e+02, 7.245741000619931e+02, 7.341331202663666e+02, 7.424658821163131e+02, 7.498917242735298e+02,
- 7.566149138725791e+02, 7.627748917365442e+02, 7.684715623158573e+02, 7.737792385156214e+02, 7.787548782005300e+02,
- 7.834432192595070e+02, 7.878801244004337e+02, 7.920948404151090e+02, 7.961115717486267e+02, 7.999506056694154e+02,
- 8.036291353555642e+02, 8.071618741305355e+02, 8.105615219833329e+02, 8.138391254847097e+02, 8.170043593718502e+02,
- 8.200657496380406e+02, 8.230308522984219e+02, 8.259063981222356e+02, 8.286984109160156e+02, 8.314123050240743e+02,
- 8.340529663327881e+02, 8.366248200586494e+02, 8.391318878566138e+02, 8.415778362296207e+02, 8.439660178003273e+02,
- 8.462995066857416e+02, 8.485811289685522e+02, 8.508134890671312e+02, 8.529989926558003e+02, 8.551398666682575e+02,
- 8.572381768225777e+02, 8.592958430305513e+02, 8.613146529931701e+02, 8.632962742345866e+02, 8.652422647865478e+02,
- 8.671540827022187e+02, 8.690330945510473e+02, 8.708805830237172e+02, 8.726977537574534e+02, 8.744857414762191e+02,
- 8.762456155271670e+02, 8.779783848835721e+02, 8.796850026750907e+02, 8.813663702981922e+02, 8.830233411528241e+02,
- 8.846567240455281e+02, 8.862672862942777e+02, 8.878557565659829e+02, 8.894228274739279e+02, 8.909691579592047e+02,
- 8.924953754774178e+02, 8.940020780095288e+02, 8.954898359136141e+02, 8.969591936324366e+02, 8.984106712701592e+02,
- 8.998447660500830e+02, 9.012619536640591e+02, 9.026626895231302e+02, 9.040474099179680e+02, 9.054165330968451e+02,
- 9.067704602680852e+02, 9.081095765332699e+02, 9.094342517569078e+02, 9.107448413776698e+02, 9.120416871658814e+02,
- 9.133251179314966e+02, 9.145954501863957e+02, 9.158529887645146e+02, 9.170980274030040e+02, 9.183308492873228e+02,
- 9.195517275629348e+02, 9.207609258160411e+02, 9.219586985255834e+02, 9.231452914885525e+02, 9.243209422204930e+02,
- 9.254858803329189e+02, 9.266403278892276e+02, 9.277844997405751e+02, 9.289186038430523e+02, 9.300428415574124e+02,
- 9.311574079325186e+02, 9.322624919918668e+02, 9.333582770165865e+02, 9.344449403845443e+02, 9.355226547729601e+02,
- 9.365915873116835e+02, 9.376519003462569e+02, 9.387037515176697e+02, 9.397472935317431e+02, 9.407826758109278e+02,
- 9.418100425329635e+02, 9.428295345782803e+02, 9.438412884988237e+02, 9.448454372864090e+02, 9.458421103496291e+02,
- 9.468314336451442e+02, 9.478135298029185e+02, 9.487885182457411e+02, 9.497565153033485e+02, 9.507176343214282e+02,
- 9.516719857657965e+02, 9.526196773219916e+02, 9.535608139905302e+02, 9.544954981780566e+02, 9.554238297845867e+02,
- 9.563459062870621e+02, 9.572618228193930e+02, 9.581716722491592e+02, 9.590755452511598e+02, 9.599735303779391e+02,
- 9.608657141274616e+02, 9.617521810080628e+02, 9.626330136149566e+02, 9.635082926321674e+02, 9.643780969791766e+02,
- 9.652425038052833e+02, 9.661015885584299e+02, 9.669554250363400e+02, 9.678040854357109e+02, 9.686476403995623e+02,
- 9.694861590628082e+02, 9.703197090961445e+02, 9.711483567483240e+02, 9.719721668636655e+02, 9.727912030158814e+02,
- 9.736055274014063e+02, 9.744152009741101e+02, 9.752202834554552e+02, 9.760208333684687e+02, 9.768169080705235e+02,
- 9.776085637849973e+02, 9.783958556318310e+02, 9.791788376570553e+02, 9.799575628613162e+02, 9.807320832274394e+02,
- 9.815024497470724e+02, 9.822687124464576e+02, 9.830309204113394e+02, 9.837891218110746e+02, 9.845433639219486e+02,
- 9.852936931497472e+02, 9.860401550516077e+02, 9.867827943571684e+02, 9.875216549890590e+02, 9.882567800827469e+02,
- 9.889882120057603e+02, 9.897159923763240e+02, 9.904401620814223e+02, 9.911607612943016e+02, 9.918778294914567e+02,
- 9.925914054690934e+02, 9.933015273591072e+02, 9.940082326445777e+02, 9.947115581748164e+02, 9.954115401799626e+02,
- 9.961082142851604e+02, 9.968016155243211e+02, 9.974917783534928e+02, 9.981787366638397e+02, 9.988625237942637e+02,
- 9.995431725436562e+02, 1.000220715182818e+03, 1.000895183466035e+03, 1.001566608642215e+03, 1.002235021489557e+03,
- 1.002900452231473e+03, 1.003562930690106e+03, 1.004222486200002e+03, 1.004879147642291e+03, 1.005532943454227e+03,
- 1.006183901638476e+03, 1.006832049772157e+03, 1.007477415015652e+03, 1.008120024121167e+03, 1.008759903441093e+03,
- 1.009397078936133e+03, 1.010031576183225e+03, 1.010663420383267e+03, 1.011292636368639e+03, 1.011919248610536e+03,
- 1.012543281226116e+03, 1.013164757985470e+03, 1.013783702318420e+03, 1.014400137321142e+03, 1.015014085762630e+03,
- 1.015625570091009e+03, 1.016234611942555e+03, 1.016841234118341e+03, 1.017445457660516e+03, 1.018047303793743e+03,
- 1.018646793451118e+03, 1.019243947279612e+03, 1.019838785645393e+03, 1.020431328639023e+03, 1.021021596080522e+03,
- 1.021609607524326e+03, 1.022195382264124e+03, 1.022778939337584e+03, 1.023360297530976e+03, 1.023939475383681e+03,
- 1.024516491192598e+03, 1.025091363016462e+03, 1.025664108680056e+03, 1.026234745778325e+03, 1.026803291680410e+03,
- 1.027369763533580e+03, 1.027934178267091e+03, 1.028496552595945e+03, 1.029056903024578e+03, 1.029615245850462e+03,
- 1.030171597167635e+03, 1.030725972870146e+03, 1.031278388655435e+03, 1.031828860027634e+03, 1.032377402300801e+03,
- 1.032924030602084e+03, 1.033468759874825e+03, 1.034011604881587e+03, 1.034552580207124e+03, 1.035091700261296e+03,
- 1.035628979281908e+03, 1.036164431337509e+03, 1.036698070330114e+03, 1.037229909997889e+03, 1.037759963917769e+03,
- 1.038288245508027e+03, 1.038814768030793e+03, 1.039339544594516e+03, 1.039862588156388e+03, 1.040383911524707e+03,
- 1.040903527361202e+03, 1.041421448183311e+03, 1.041937686366410e+03, 1.042452254146001e+03, 1.042965163619862e+03,
- 1.043476426750141e+03, 1.043986055365432e+03, 1.044494061162788e+03, 1.045000455709710e+03, 1.045505250446093e+03,
- 1.046008456686137e+03, 1.046510085620221e+03, 1.047010148316737e+03, 1.047508655723899e+03, 1.048005618671511e+03,
- 1.048501047872703e+03, 1.048994953925638e+03, 1.049487347315184e+03, 1.049978238414558e+03, 1.050467637486936e+03,
- 1.050955554687039e+03, 1.051442000062686e+03, 1.051926983556318e+03, 1.052410515006500e+03, 1.052892604149392e+03,
- 1.053373260620192e+03, 1.053852493954556e+03, 1.054330313589995e+03, 1.054806728867242e+03, 1.055281749031599e+03,
- 1.055755383234255e+03, 1.056227640533590e+03, 1.056698529896449e+03, 1.057168060199391e+03, 1.057636240229930e+03,
- 1.058103078687739e+03, 1.058568584185842e+03, 1.059032765251785e+03, 1.059495630328782e+03, 1.059957187776852e+03,
- 1.060417445873921e+03, 1.060876412816922e+03, 1.061334096722866e+03, 1.061790505629894e+03, 1.062245647498324e+03,
- 1.062699530211666e+03, 1.063152161577624e+03, 1.063603549329089e+03, 1.064053701125109e+03, 1.064502624551842e+03,
- 1.064950327123498e+03, 1.065396816283258e+03, 1.065842099404196e+03, 1.066286183790159e+03, 1.066729076676654e+03,
- 1.067170785231719e+03, 1.067611316556764e+03, 1.068050677687419e+03, 1.068488875594355e+03, 1.068925917184100e+03,
- 1.069361809299832e+03, 1.069796558722173e+03, 1.070230172169958e+03, 1.070662656300998e+03, 1.071094017712838e+03,
- 1.071524262943482e+03, 1.071953398472135e+03, 1.072381430719909e+03, 1.072808366050532e+03, 1.073234210771042e+03,
- 1.073658971132471e+03, 1.074082653330519e+03, 1.074505263506214e+03, 1.074926807746568e+03, 1.075347292085221e+03,
- 1.075766722503071e+03, 1.076185104928901e+03, 1.076602445239992e+03, 1.077018749262731e+03, 1.077434022773205e+03,
- 1.077848271497789e+03, 1.078261501113727e+03, 1.078673717249700e+03, 1.079084925486391e+03, 1.079495131357036e+03,
- 1.079904340347974e+03, 1.080312557899180e+03, 1.080719789404799e+03, 1.081126040213666e+03, 1.081531315629825e+03,
- 1.081935620913029e+03, 1.082338961279250e+03, 1.082741341901165e+03, 1.083142767908646e+03, 1.083543244389236e+03,
- 1.083942776388627e+03, 1.084341368911118e+03, 1.084739026920082e+03, 1.085135755338417e+03, 1.085531559048986e+03,
- 1.085926442895068e+03, 1.086320411680785e+03, 1.086713470171532e+03, 1.087105623094399e+03, 1.087496875138590e+03,
- 1.087887230955830e+03, 1.088276695160772e+03, 1.088665272331399e+03, 1.089052967009414e+03, 1.089439783700630e+03,
- 1.089825726875358e+03, 1.090210800968778e+03, 1.090595010381318e+03, 1.090978359479020e+03, 1.091360852593906e+03,
- 1.091742494024332e+03, 1.092123288035345e+03, 1.092503238859034e+03, 1.092882350694867e+03, 1.093260627710039e+03,
- 1.093638074039806e+03, 1.094014693787813e+03, 1.094390491026420e+03, 1.094765469797029e+03, 1.095139634110401e+03,
- 1.095512987946968e+03, 1.095885535257143e+03, 1.096257279961631e+03, 1.096628225951723e+03, 1.096998377089602e+03,
- 1.097367737208635e+03, 1.097736310113662e+03, 1.098104099581282e+03, 1.098471109360141e+03, 1.098837343171211e+03,
- 1.099202804708059e+03, 1.099567497637131e+03, 1.099931425598013e+03, 1.100294592203699e+03, 1.100657001040857e+03,
- 1.101018655670083e+03, 1.101379559626161e+03, 1.101739716418315e+03, 1.102099129530458e+03, 1.102457802421442e+03,
- 1.102815738525296e+03, 1.103172941251472e+03, 1.103529413985079e+03, 1.103885160087122e+03, 1.104240182894731e+03,
- 1.104594485721391e+03, 1.104948071857168e+03, 1.105300944568934e+03, 1.105653107100586e+03, 1.106004562673268e+03,
- 1.106355314485581e+03, 1.106705365713804e+03, 1.107054719512095e+03, 1.107403379012709e+03, 1.107751347326196e+03,
- 1.108098627541609e+03, 1.108445222726702e+03, 1.108791135928129e+03, 1.109136370171643e+03, 1.109480928462285e+03,
- 1.109824813784579e+03, 1.110168029102720e+03, 1.110510577360762e+03, 1.110852461482803e+03, 1.111193684373166e+03,
- 1.111534248916581e+03, 1.111874157978364e+03, 1.112213414404594e+03, 1.112552021022286e+03, 1.112889980639564e+03,
- 1.113227296045831e+03, 1.113563970011941e+03, 1.113900005290360e+03, 1.114235404615337e+03, 1.114570170703063e+03,
- 1.114904306251831e+03, 1.115237813942200e+03, 1.115570696437150e+03, 1.115902956382237e+03, 1.116234596405746e+03,
- 1.116565619118849e+03, 1.116896027115748e+03, 1.117225822973829e+03, 1.117555009253810e+03, 1.117883588499881e+03,
- 1.118211563239854e+03, 1.118538935985304e+03, 1.118865709231705e+03, 1.119191885458579e+03, 1.119517467129624e+03,
- 1.119842456692857e+03, 1.120166856580745e+03, 1.120490669210342e+03, 1.120813896983419e+03, 1.121136542286592e+03,
- 1.121458607491454e+03, 1.121780094954707e+03, 1.122101007018277e+03, 1.122421346009452e+03, 1.122741114240996e+03,
- 1.123060314011276e+03, 1.123378947604382e+03, 1.123697017290246e+03, 1.124014525324763e+03, 1.124331473949905e+03,
- 1.124647865393841e+03, 1.124963701871047e+03, 1.125278985582424e+03, 1.125593718715407e+03, 1.125907903444080e+03,
- 1.126221541929281e+03, 1.126534636318718e+03, 1.126847188747070e+03, 1.127159201336095e+03, 1.127470676194743e+03,
- 1.127781615419247e+03, 1.128092021093240e+03, 1.128401895287850e+03, 1.128711240061801e+03, 1.129020057461517e+03
- },
- {
- 1.765702357486508e+00, 5.389661946818883e+00, 9.087923958744215e+00, 1.286443926932324e+01, 1.672350587905711e+01,
- 2.066981173750811e+01, 2.470848450863655e+01, 2.884514970492415e+01, 3.308599895569249e+01, 3.743787065137631e+01,
- 4.190834580243521e+01, 4.650586275524100e+01, 5.123985548004623e+01, 5.612092160006851e+01, 6.116102832581466e+01,
- 6.637376723440282e+01, 7.177467275366800e+01, 7.738162483897882e+01, 8.321536455901604e+01, 8.930016358013921e+01,
- 9.566470725896033e+01, 1.023432803279684e+02, 1.093773912504896e+02, 1.168180495422962e+02, 1.247290451947226e+02,
- 1.331918217234719e+02, 1.423129937120476e+02, 1.522364820667242e+02, 1.631642395930380e+02, 1.753942930035297e+02,
- 1.893976008030213e+02, 2.059958320166604e+02, 2.268683638713153e+02, 2.566877827685357e+02, 6.657348335675499e+02,
- 6.882593411716831e+02, 7.037519829070548e+02, 7.159142689887299e+02, 7.260669078413629e+02, 7.348544721213481e+02,
- 7.426450564595893e+02, 7.496705428778206e+02, 7.560873241776071e+02, 7.620063565085974e+02, 7.675095059169084e+02,
- 7.726590936660893e+02, 7.775037891000143e+02, 7.820824152228369e+02, 7.864264997652492e+02, 7.905620400127840e+02,
- 7.945107571081365e+02, 7.982910086129102e+02, 8.019184661776384e+02, 8.054066279635822e+02, 8.087672123905104e+02,
- 8.120104650755843e+02, 8.151454012141174e+02, 8.181799992276768e+02, 8.211213571240439e+02, 8.239758199715358e+02,
- 8.267490847429744e+02, 8.294462872454400e+02, 8.320720747334213e+02, 8.346306669795197e+02, 8.371259079633298e+02,
- 8.395613098770218e+02, 8.419400907943767e+02, 8.442652070797992e+02, 8.465393814042484e+02, 8.487651270712353e+02,
- 8.509447692268653e+02, 8.530804634254803e+02, 8.551742119404449e+02, 8.572278781437549e+02, 8.592431992247024e+02,
- 8.612217974744126e+02, 8.631651903274104e+02, 8.650747993221071e+02, 8.669519581178356e+02, 8.687979196858935e+02,
- 8.706138627752572e+02, 8.724008977394850e+02, 8.741600717994739e+02, 8.758923738066792e+02, 8.775987385628994e+02,
- 8.792800507454641e+02, 8.809371484804838e+02, 8.825708266015088e+02, 8.841818396263707e+02, 8.857709044810675e+02,
- 8.873387029961377e+02, 8.888858841980227e+02, 8.904130664153558e+02, 8.919208392178958e+02, 8.934097652038317e+02,
- 8.948803816495448e+02, 8.963332020343382e+02, 8.977687174513835e+02, 8.991873979149517e+02, 9.005896935729575e+02,
- 9.019760358329646e+02, 9.033468384089679e+02, 9.047024982955678e+02, 9.060433966755218e+02, 9.073698997660726e+02,
- 9.086823596089600e+02, 9.099811148085612e+02, 9.112664912222203e+02, 9.125388026064298e+02, 9.137983512222229e+02,
- 9.150454284028478e+02, 9.162803150865042e+02, 9.175032823167087e+02, 9.187145917126239e+02, 9.199144959114957e+02,
- 9.211032389851783e+02, 9.222810568325339e+02, 9.234481775493903e+02, 9.246048217775789e+02, 9.257512030344448e+02,
- 9.268875280241688e+02, 9.280139969338380e+02, 9.291308037468331e+02, 9.302381365023493e+02, 9.313361775101475e+02,
- 9.324251024720592e+02, 9.335050843913014e+02, 9.345762890072989e+02, 9.356388779685202e+02, 9.366930077175784e+02,
- 9.377388313003887e+02, 9.387764968654792e+02, 9.398061482324952e+02, 9.408279254173508e+02, 9.418419646036090e+02,
- 9.428483982850051e+02, 9.438473554013084e+02, 9.448389614679015e+02, 9.458233386994166e+02, 9.468006061277582e+02,
- 9.477708797148288e+02, 9.487342724602156e+02, 9.496908945041387e+02, 9.506408532258896e+02, 9.515842533380059e+02,
- 9.525211969763980e+02, 9.534517837866473e+02, 9.543761110066566e+02, 9.552942735458462e+02, 9.562063640610698e+02,
- 9.571124730294106e+02, 9.580126888180064e+02, 9.589070977510640e+02, 9.597957841880535e+02, 9.606788305286661e+02,
- 9.615563173594923e+02, 9.624283234513010e+02, 9.632949258291949e+02, 9.641561998253210e+02, 9.650122191295596e+02,
- 9.658630558383145e+02, 9.667087805014545e+02, 9.675494621444456e+02, 9.683851684058957e+02, 9.692159654358052e+02,
- 9.700419180336551e+02, 9.708630896624533e+02, 9.716795424862976e+02, 9.724913374066075e+02, 9.732985340970758e+02,
- 9.741011910374009e+02, 9.748993655458424e+02, 9.756931138106639e+02, 9.764824909204870e+02, 9.772675508936252e+02,
- 9.780483467064215e+02, 9.788249303206427e+02, 9.795973527099569e+02, 9.803656638855416e+02, 9.811299129208498e+02,
- 9.818901479755725e+02, 9.826464163188222e+02, 9.833987643515771e+02, 9.841472376284079e+02, 9.848918808785148e+02,
- 9.856327380261031e+02, 9.863698522101281e+02, 9.871032658034179e+02, 9.878330204312124e+02, 9.885591569891362e+02,
- 9.892817156606191e+02, 9.900007359337934e+02, 9.907162566178868e+02, 9.914283158591165e+02, 9.921369511561256e+02,
- 9.928421993749504e+02, 9.935440967635629e+02, 9.942426789659795e+02, 9.949379810359708e+02, 9.956300374737550e+02,
- 9.963188821442528e+02, 9.970045484334307e+02, 9.976870691634412e+02, 9.983664766290776e+02, 9.990428026093043e+02,
- 9.997160783784818e+02, 1.000386334717270e+03, 1.001053601923241e+03, 1.001717909821200e+03, 1.002379287773227e+03,
- 1.003037764688450e+03, 1.003693369032555e+03, 1.004346128837043e+03, 1.004996071708246e+03, 1.005643224836102e+03,
- 1.006287615002699e+03, 1.006929268590605e+03, 1.007568211590975e+03, 1.008204469611451e+03, 1.008838067883864e+03,
- 1.009469031271737e+03, 1.010097384277595e+03, 1.010723151050100e+03, 1.011346355391004e+03, 1.011967020761919e+03,
- 1.012585170290937e+03, 1.013200826283163e+03, 1.013814012192650e+03, 1.014424749706681e+03, 1.015033060682181e+03,
- 1.015638966673264e+03, 1.016242488936933e+03, 1.016843648438651e+03, 1.017442465857774e+03, 1.018038961592864e+03,
- 1.018633155766866e+03, 1.019225068232176e+03, 1.019814718575582e+03, 1.020402126123095e+03, 1.020987309944665e+03,
- 1.021570288858797e+03, 1.022151081437053e+03, 1.022729706008457e+03, 1.023306180663797e+03, 1.023880523259837e+03,
- 1.024452751423422e+03, 1.025022882555510e+03, 1.025590933835098e+03, 1.026156922223070e+03, 1.026720864465959e+03,
- 1.027282777099628e+03, 1.027842676452866e+03, 1.028400578650915e+03, 1.028956499618910e+03, 1.029510455085259e+03,
- 1.030062460584935e+03, 1.030612531462715e+03, 1.031160682876334e+03, 1.031706929799587e+03, 1.032251287025353e+03,
- 1.032793769168571e+03, 1.033334390669139e+03, 1.033873165794763e+03, 1.034410108643744e+03, 1.034945233147708e+03,
- 1.035478553074279e+03, 1.036010082029706e+03, 1.036539833461422e+03, 1.037067820660562e+03, 1.037594056764433e+03,
- 1.038118554758925e+03, 1.038641327480881e+03, 1.039162387620419e+03, 1.039681747723207e+03, 1.040199420192692e+03,
- 1.040715417292290e+03, 1.041229751147530e+03, 1.041742433748159e+03, 1.042253476950198e+03, 1.042762892477976e+03,
- 1.043270691926105e+03, 1.043776886761429e+03, 1.044281488324937e+03, 1.044784507833632e+03, 1.045285956382374e+03,
- 1.045785844945678e+03, 1.046284184379490e+03, 1.046780985422919e+03, 1.047276258699946e+03, 1.047770014721098e+03,
- 1.048262263885085e+03, 1.048753016480419e+03, 1.049242282686996e+03, 1.049730072577648e+03, 1.050216396119671e+03,
- 1.050701263176326e+03, 1.051184683508307e+03, 1.051666666775190e+03, 1.052147222536853e+03, 1.052626360254866e+03,
- 1.053104089293869e+03, 1.053580418922910e+03, 1.054055358316774e+03, 1.054528916557277e+03, 1.055001102634547e+03,
- 1.055471925448275e+03, 1.055941393808947e+03, 1.056409516439063e+03, 1.056876301974317e+03, 1.057341758964776e+03,
- 1.057805895876025e+03, 1.058268721090303e+03, 1.058730242907608e+03, 1.059190469546797e+03, 1.059649409146657e+03,
- 1.060107069766959e+03, 1.060563459389507e+03, 1.061018585919145e+03, 1.061472457184778e+03, 1.061925080940348e+03,
- 1.062376464865811e+03, 1.062826616568093e+03, 1.063275543582030e+03, 1.063723253371294e+03, 1.064169753329302e+03,
- 1.064615050780116e+03, 1.065059152979313e+03, 1.065502067114867e+03, 1.065943800307990e+03, 1.066384359613976e+03,
- 1.066823752023031e+03, 1.067261984461078e+03, 1.067699063790565e+03, 1.068134996811247e+03, 1.068569790260965e+03,
- 1.069003450816408e+03, 1.069435985093864e+03, 1.069867399649961e+03, 1.070297700982392e+03, 1.070726895530638e+03,
- 1.071154989676667e+03, 1.071581989745634e+03, 1.072007902006566e+03, 1.072432732673032e+03, 1.072856487903811e+03,
- 1.073279173803544e+03, 1.073700796423377e+03, 1.074121361761601e+03, 1.074540875764267e+03, 1.074959344325813e+03,
- 1.075376773289662e+03, 1.075793168448820e+03, 1.076208535546474e+03, 1.076622880276557e+03, 1.077036208284332e+03,
- 1.077448525166948e+03, 1.077859836473999e+03, 1.078270147708066e+03, 1.078679464325262e+03, 1.079087791735757e+03,
- 1.079495135304305e+03, 1.079901500350758e+03, 1.080306892150577e+03, 1.080711315935330e+03, 1.081114776893189e+03,
- 1.081517280169412e+03, 1.081918830866830e+03, 1.082319434046317e+03, 1.082719094727254e+03, 1.083117817887993e+03,
- 1.083515608466311e+03, 1.083912471359853e+03, 1.084308411426577e+03, 1.084703433485190e+03, 1.085097542315570e+03,
- 1.085490742659200e+03, 1.085883039219575e+03, 1.086274436662619e+03, 1.086664939617090e+03, 1.087054552674979e+03,
- 1.087443280391907e+03, 1.087831127287514e+03, 1.088218097845843e+03, 1.088604196515718e+03, 1.088989427711119e+03,
- 1.089373795811552e+03, 1.089757305162413e+03, 1.090139960075345e+03, 1.090521764828594e+03, 1.090902723667361e+03,
- 1.091282840804143e+03, 1.091662120419076e+03, 1.092040566660270e+03, 1.092418183644144e+03, 1.092794975455747e+03,
- 1.093170946149090e+03, 1.093546099747456e+03, 1.093920440243720e+03, 1.094293971600657e+03, 1.094666697751255e+03,
- 1.095038622599006e+03, 1.095409750018220e+03, 1.095780083854305e+03, 1.096149627924070e+03, 1.096518386016003e+03,
- 1.096886361890567e+03, 1.097253559280467e+03, 1.097619981890937e+03, 1.097985633400008e+03, 1.098350517458779e+03,
- 1.098714637691686e+03, 1.099077997696761e+03, 1.099440601045895e+03, 1.099802451285096e+03, 1.100163551934738e+03,
- 1.100523906489813e+03, 1.100883518420183e+03, 1.101242391170818e+03, 1.101600528162040e+03, 1.101957932789761e+03,
- 1.102314608425719e+03, 1.102670558417710e+03, 1.103025786089820e+03, 1.103380294742647e+03, 1.103734087653529e+03,
- 1.104087168076765e+03, 1.104439539243832e+03, 1.104791204363608e+03, 1.105142166622572e+03, 1.105492429185034e+03,
- 1.105841995193324e+03, 1.106190867768011e+03, 1.106539050008105e+03, 1.106886544991253e+03, 1.107233355773944e+03,
- 1.107579485391700e+03, 1.107924936859278e+03, 1.108269713170852e+03, 1.108613817300210e+03, 1.108957252200941e+03,
- 1.109300020806618e+03, 1.109642126030981e+03, 1.109983570768121e+03, 1.110324357892655e+03, 1.110664490259911e+03,
- 1.111003970706092e+03, 1.111342802048455e+03, 1.111680987085484e+03, 1.112018528597054e+03, 1.112355429344604e+03,
- 1.112691692071294e+03, 1.113027319502177e+03, 1.113362314344354e+03, 1.113696679287140e+03, 1.114030417002214e+03,
- 1.114363530143784e+03, 1.114696021348733e+03, 1.115027893236779e+03, 1.115359148410621e+03, 1.115689789456089e+03,
- 1.116019818942296e+03, 1.116349239421776e+03, 1.116678053430638e+03, 1.117006263488702e+03, 1.117333872099640e+03,
- 1.117660881751122e+03, 1.117987294914949e+03, 1.118313114047190e+03, 1.118638341588318e+03, 1.118962979963346e+03,
- 1.119287031581954e+03, 1.119610498838628e+03, 1.119933384112781e+03, 1.120255689768887e+03, 1.120577418156602e+03,
- 1.120898571610897e+03, 1.121219152452176e+03, 1.121539162986400e+03, 1.121858605505211e+03, 1.122177482286048e+03,
- 1.122495795592270e+03, 1.122813547673270e+03, 1.123130740764595e+03, 1.123447377088057e+03, 1.123763458851849e+03,
- 1.124078988250660e+03, 1.124393967465783e+03, 1.124708398665227e+03, 1.125022284003825e+03, 1.125335625623345e+03,
- 1.125648425652594e+03, 1.125960686207525e+03, 1.126272409391344e+03, 1.126583597294608e+03, 1.126894251995334e+03
- },
- {
- 1.759646158211660e+00, 5.370565770002817e+00, 9.054638626498587e+00, 1.281569733967865e+01, 1.665790581740634e+01,
- 2.058579940182043e+01, 2.460433138741275e+01, 2.871892720476968e+01, 3.293554785254310e+01, 3.726076457835308e+01,
- 4.170184732924816e+01, 4.626687018872866e+01, 5.096483794068550e+01, 5.580583914322148e+01, 6.080123278735140e+01,
- 6.596387794984686e+01, 7.130841911586724e+01, 7.685164448919579e+01, 8.261294131869165e+01, 8.861488215460238e+01,
- 9.488399081522013e+01, 1.014517597285052e+02, 1.083560264678084e+02, 1.156428761296669e+02, 1.233693352196309e+02,
- 1.316072958010345e+02, 1.404494259939426e+02, 1.500184349630939e+02, 1.604823233088471e+02, 1.720810686740695e+02,
- 1.851771671167039e+02, 2.003621789601490e+02, 2.187189666985901e+02, 2.426508419360667e+02, 2.803010943326496e+02,
- 6.521432030130227e+02, 6.773955906748673e+02, 6.942281826309576e+02, 7.072395941741053e+02, 7.179964778999516e+02,
- 7.272449221464342e+02, 7.354038623248191e+02, 7.427338327295237e+02, 7.494087450072469e+02, 7.555509362957072e+02,
- 7.612500250349448e+02, 7.665738197891652e+02, 7.715749997715916e+02, 7.762953984136125e+02, 7.807688565518455e+02,
- 7.850231848983857e+02, 7.890815515171732e+02, 7.929634864662104e+02, 7.966856246034820e+02, 8.002622650324795e+02,
- 8.037057994263012e+02, 8.070270448166268e+02, 8.102355055958851e+02, 8.133395822671257e+02, 8.163467395763330e+02,
- 8.192636432722026e+02, 8.220962723538220e+02, 8.248500119632056e+02, 8.275297308455099e+02, 8.301398463938243e+02,
- 8.326843796224881e+02, 8.351670019072745e+02, 8.375910749469544e+02, 8.399596851065272e+02, 8.422756730748409e+02,
- 8.445416595916769e+02, 8.467600678598029e+02, 8.489331431467650e+02, 8.510629699929400e+02, 8.531514873714069e+02,
- 8.552005020878375e+02, 8.572117006619923e+02, 8.591866598942639e+02, 8.611268562893375e+02, 8.630336744831631e+02,
- 8.649084147978710e+02, 8.667523000313754e+02, 8.685664815733354e+02, 8.703520449265328e+02, 8.721100147020211e+02,
- 8.738413591473761e+02, 8.755469942596723e+02, 8.772277875282222e+02, 8.788845613465312e+02, 8.805180961280278e+02,
- 8.821291331560270e+02, 8.837183771947377e+02, 8.852864988850330e+02, 8.868341369459806e+02, 8.883619002007856e+02,
- 8.898703694437141e+02, 8.913600991627886e+02, 8.928316191314481e+02, 8.942854358809769e+02, 8.957220340642893e+02,
- 8.971418777205638e+02, 8.985454114492746e+02, 8.999330615013115e+02, 9.013052367941365e+02, 9.026623298572396e+02,
- 9.040047177135785e+02, 9.053327627021454e+02, 9.066468132463145e+02, 9.079472045722283e+02, 9.092342593810729e+02,
- 9.105082884787515e+02, 9.117695913661706e+02, 9.130184567930663e+02, 9.142551632780351e+02, 9.154799795972381e+02,
- 9.166931652440088e+02, 9.178949708614282e+02, 9.190856386497608e+02, 9.202654027504898e+02, 9.214344896085451e+02,
- 9.225931183142071e+02, 9.237415009260393e+02, 9.248798427857232e+02, 9.260083428457867e+02, 9.271271939069900e+02,
- 9.282365821330408e+02, 9.293366895111005e+02, 9.304276914712948e+02, 9.315097585395249e+02, 9.325830562427560e+02,
- 9.336477453075646e+02, 9.347039816933990e+02, 9.357519174120829e+02, 9.367916997110556e+02, 9.378234719137031e+02,
- 9.388473733992719e+02, 9.398635397502477e+02, 9.408721028928101e+02, 9.418731912307652e+02, 9.428669297733190e+02,
- 9.438534402570187e+02, 9.448328412622016e+02, 9.458052483242184e+02, 9.467707740397436e+02, 9.477295281684092e+02,
- 9.486816177300161e+02, 9.496271470975585e+02, 9.505662180862711e+02, 9.514989300388995e+02, 9.524253799074057e+02,
- 9.533456623312541e+02, 9.542598697124838e+02, 9.551680922876994e+02, 9.560704181971550e+02, 9.569669335645297e+02,
- 9.578577225053638e+02, 9.587428672730945e+02, 9.596224482597302e+02, 9.604965440672154e+02, 9.613652315617187e+02,
- 9.622285859258320e+02, 9.630866806859478e+02, 9.639395878536747e+02, 9.647873778300585e+02, 9.656301195471383e+02,
- 9.664678804864158e+02, 9.673007267204332e+02, 9.681287229528490e+02, 9.689519325570748e+02, 9.697704176135335e+02,
- 9.705842389455950e+02, 9.713934561542610e+02, 9.721981276516268e+02, 9.729983106931969e+02, 9.737940614090808e+02,
- 9.745854348341367e+02, 9.753724849370809e+02, 9.761552646486322e+02, 9.769338258887051e+02, 9.777082195927159e+02,
- 9.784784957370053e+02, 9.792447033634509e+02, 9.800068906032614e+02, 9.807651047000217e+02, 9.815193920319878e+02,
- 9.822697981336784e+02, 9.830163677167866e+02, 9.837591446904313e+02, 9.844981721807825e+02, 9.852334925500778e+02,
- 9.859651474150523e+02, 9.866931776648082e+02, 9.874176234781436e+02, 9.881385243403543e+02, 9.888559190595411e+02,
- 9.895698458049823e+02, 9.902803420311240e+02, 9.909874446312518e+02, 9.916911898582445e+02, 9.923916133623536e+02,
- 9.930887502048440e+02, 9.937826348712426e+02, 9.944733012842100e+02, 9.951607828160458e+02, 9.958451123008458e+02,
- 9.965263220463163e+02, 9.972044438452614e+02, 9.978795089867530e+02, 9.985515482669938e+02, 9.992205919998831e+02,
- 9.998866700272974e+02, 1.000549811729091e+03, 1.001210046032833e+03, 1.001867401423278e+03, 1.002521905951592e+03,
- 1.003173587244331e+03, 1.003822472512187e+03, 1.004468588558502e+03, 1.005111961787565e+03, 1.005752618212693e+03,
- 1.006390583464110e+03, 1.007025882796613e+03, 1.007658541097059e+03, 1.008288582891650e+03, 1.008916032353042e+03,
- 1.009540913307279e+03, 1.010163248746308e+03, 1.010783062793383e+03, 1.011400377798094e+03, 1.012015216265965e+03,
- 1.012627600388076e+03, 1.013237552047042e+03, 1.013845092822834e+03, 1.014450243998473e+03, 1.015053026565585e+03,
- 1.015653461229820e+03, 1.016251568416150e+03, 1.016847368274035e+03, 1.017440880682481e+03, 1.018032125254966e+03,
- 1.018621121344263e+03, 1.019207888047146e+03, 1.019792444208994e+03, 1.020374808428283e+03, 1.020954999060983e+03,
- 1.021533034224857e+03, 1.022108931803652e+03, 1.022682709451210e+03, 1.023254384595482e+03, 1.023823974442452e+03,
- 1.024391495979979e+03, 1.024956965981550e+03, 1.025520401009952e+03, 1.026081817420870e+03, 1.026641231366401e+03,
- 1.027198658798495e+03, 1.027754115472322e+03, 1.028307616949568e+03, 1.028859178601660e+03, 1.029408815612924e+03,
- 1.029956542983678e+03, 1.030502375533256e+03, 1.031046327902974e+03, 1.031588414559030e+03, 1.032128649795349e+03,
- 1.032667047736366e+03, 1.033203622339754e+03, 1.033738387399096e+03, 1.034271356546497e+03, 1.034802543255161e+03,
- 1.035331960841891e+03, 1.035859622469561e+03, 1.036385541149525e+03, 1.036909729743988e+03, 1.037432200968318e+03,
- 1.037952967393328e+03, 1.038472041447499e+03, 1.038989435419170e+03, 1.039505161458676e+03, 1.040019231580459e+03,
- 1.040531657665118e+03, 1.041042451461438e+03, 1.041551624588375e+03, 1.042059188536994e+03, 1.042565154672386e+03,
- 1.043069534235533e+03, 1.043572338345153e+03, 1.044073577999494e+03, 1.044573264078114e+03, 1.045071407343609e+03,
- 1.045568018443322e+03, 1.046063107911014e+03, 1.046556686168508e+03, 1.047048763527302e+03, 1.047539350190146e+03,
- 1.048028456252607e+03, 1.048516091704585e+03, 1.049002266431817e+03, 1.049486990217349e+03, 1.049970272742979e+03,
- 1.050452123590679e+03, 1.050932552243991e+03, 1.051411568089392e+03, 1.051889180417645e+03, 1.052365398425121e+03,
- 1.052840231215094e+03, 1.053313687799024e+03, 1.053785777097807e+03, 1.054256507943009e+03, 1.054725889078079e+03,
- 1.055193929159539e+03, 1.055660636758157e+03, 1.056126020360091e+03, 1.056590088368028e+03, 1.057052849102293e+03,
- 1.057514310801942e+03, 1.057974481625836e+03, 1.058433369653702e+03, 1.058890982887167e+03, 1.059347329250789e+03,
- 1.059802416593049e+03, 1.060256252687354e+03, 1.060708845233000e+03, 1.061160201856131e+03, 1.061610330110684e+03,
- 1.062059237479308e+03, 1.062506931374281e+03, 1.062953419138403e+03, 1.063398708045876e+03, 1.063842805303175e+03,
- 1.064285718049902e+03, 1.064727453359622e+03, 1.065168018240692e+03, 1.065607419637079e+03, 1.066045664429151e+03,
- 1.066482759434476e+03, 1.066918711408590e+03, 1.067353527045765e+03, 1.067787212979760e+03, 1.068219775784563e+03,
- 1.068651221975115e+03, 1.069081558008032e+03, 1.069510790282313e+03, 1.069938925140029e+03, 1.070365968867016e+03,
- 1.070791927693547e+03, 1.071216807794993e+03, 1.071640615292483e+03, 1.072063356253546e+03, 1.072485036692747e+03,
- 1.072905662572310e+03, 1.073325239802738e+03, 1.073743774243420e+03, 1.074161271703223e+03, 1.074577737941090e+03,
- 1.074993178666615e+03, 1.075407599540614e+03, 1.075821006175694e+03, 1.076233404136806e+03, 1.076644798941787e+03,
- 1.077055196061911e+03, 1.077464600922410e+03, 1.077873018903002e+03, 1.078280455338409e+03, 1.078686915518864e+03,
- 1.079092404690613e+03, 1.079496928056411e+03, 1.079900490776007e+03, 1.080303097966628e+03, 1.080704754703452e+03,
- 1.081105466020072e+03, 1.081505236908963e+03, 1.081904072321930e+03, 1.082301977170561e+03, 1.082698956326665e+03,
- 1.083095014622709e+03, 1.083490156852249e+03, 1.083884387770352e+03, 1.084277712094014e+03, 1.084670134502574e+03,
- 1.085061659638117e+03, 1.085452292105878e+03, 1.085842036474636e+03, 1.086230897277108e+03, 1.086618879010324e+03,
- 1.087005986136021e+03, 1.087392223081004e+03, 1.087777594237526e+03, 1.088162103963646e+03, 1.088545756583591e+03,
- 1.088928556388114e+03, 1.089310507634837e+03, 1.089691614548607e+03, 1.090071881321828e+03, 1.090451312114800e+03,
- 1.090829911056058e+03, 1.091207682242688e+03, 1.091584629740662e+03, 1.091960757585150e+03, 1.092336069780840e+03,
- 1.092710570302246e+03, 1.093084263094017e+03, 1.093457152071240e+03, 1.093829241119741e+03, 1.094200534096374e+03,
- 1.094571034829324e+03, 1.094940747118387e+03, 1.095309674735252e+03, 1.095677821423793e+03, 1.096045190900337e+03,
- 1.096411786853939e+03, 1.096777612946656e+03, 1.097142672813812e+03, 1.097506970064262e+03, 1.097870508280650e+03,
- 1.098233291019672e+03, 1.098595321812324e+03, 1.098956604164155e+03, 1.099317141555519e+03, 1.099676937441811e+03,
- 1.100035995253718e+03, 1.100394318397450e+03, 1.100751910254982e+03, 1.101108774184284e+03, 1.101464913519551e+03,
- 1.101820331571432e+03, 1.102175031627253e+03, 1.102529016951240e+03, 1.102882290784740e+03, 1.103234856346432e+03,
- 1.103586716832549e+03, 1.103937875417083e+03, 1.104288335251999e+03, 1.104638099467435e+03, 1.104987171171915e+03,
- 1.105335553452542e+03, 1.105683249375205e+03, 1.106030261984769e+03, 1.106376594305275e+03, 1.106722249340130e+03,
- 1.107067230072298e+03, 1.107411539464488e+03, 1.107755180459337e+03, 1.108098155979600e+03, 1.108440468928325e+03,
- 1.108782122189035e+03, 1.109123118625908e+03, 1.109463461083946e+03, 1.109803152389156e+03, 1.110142195348716e+03,
- 1.110480592751145e+03, 1.110818347366473e+03, 1.111155461946404e+03, 1.111491939224482e+03, 1.111827781916253e+03,
- 1.112162992719419e+03, 1.112497574314006e+03, 1.112831529362514e+03, 1.113164860510074e+03, 1.113497570384599e+03,
- 1.113829661596938e+03, 1.114161136741025e+03, 1.114491998394025e+03, 1.114822249116483e+03, 1.115151891452468e+03,
- 1.115480927929715e+03, 1.115809361059768e+03, 1.116137193338120e+03, 1.116464427244349e+03, 1.116791065242261e+03,
- 1.117117109780018e+03, 1.117442563290278e+03, 1.117767428190324e+03, 1.118091706882198e+03, 1.118415401752829e+03,
- 1.118738515174161e+03, 1.119061049503283e+03, 1.119383007082549e+03, 1.119704390239710e+03, 1.120025201288030e+03,
- 1.120345442526411e+03, 1.120665116239516e+03, 1.120984224697879e+03, 1.121302770158035e+03, 1.121620754862628e+03,
- 1.121938181040530e+03, 1.122255050906953e+03, 1.122571366663565e+03, 1.122887130498598e+03, 1.123202344586965e+03,
- 1.123517011090360e+03, 1.123831132157377e+03, 1.124144709923608e+03, 1.124457746511756e+03, 1.124770244031736e+03
- },
- {
- 1.753632059027257e+00, 5.351611249853827e+00, 9.021616572172205e+00, 1.276736626236109e+01, 1.659289479091158e+01,
- 2.050259048929611e+01, 2.450123904184888e+01, 2.859407400092714e+01, 3.278683574434611e+01, 3.708584066130366e+01,
- 4.149806280600863e+01, 4.603123086199034e+01, 5.069394405535617e+01, 5.549581171820162e+01, 6.044762263993844e+01,
- 6.556155231000896e+01, 7.085141888160165e+01, 7.633300252250081e+01, 8.202444830548500e+01, 8.794678077534249e+01,
- 9.412457017812932e+01, 1.005868083036480e+02, 1.073680797959698e+02, 1.145101593176195e+02, 1.220642382367975e+02,
- 1.300941094622738e+02, 1.386808606837394e+02, 1.479300398863622e+02, 1.579830709310434e+02, 1.690364189581546e+02,
- 1.813759695763958e+02, 1.954442865028346e+02, 2.119888768230097e+02, 2.324524257796423e+02, 2.603609700682213e+02,
- 3.116771334582932e+02, 6.386030708148930e+02, 6.665563778439038e+02, 6.847257296140039e+02, 6.985860417609099e+02,
- 7.099473628294924e+02, 7.196567259417725e+02, 7.281838190360186e+02, 7.358178700043339e+02, 7.427503751731374e+02,
- 7.491151117352788e+02, 7.550094956065492e+02, 7.605068542592787e+02, 7.656638975064167e+02, 7.705254818183772e+02,
- 7.751277679663959e+02, 7.795003829431066e+02, 7.836679419482515e+02, 7.876511460754599e+02, 7.914675909164964e+02,
- 7.951323735037114e+02, 7.986585555167862e+02, 8.020575221271434e+02, 8.053392637507428e+02, 8.085125999770248e+02,
- 8.115853595155569e+02, 8.145645262595193e+02, 8.174563589398913e+02, 8.202664899737809e+02, 8.230000077588272e+02,
- 8.256615256760184e+02, 8.282552403299479e+02, 8.307849810058602e+02, 8.332542519064704e+02, 8.356662684131053e+02,
- 8.380239883698166e+02, 8.403301391977044e+02, 8.425872414963723e+02, 8.447976296705856e+02, 8.469634700254746e+02,
- 8.490867766976762e+02, 8.511694257284902e+02, 8.532131675352989e+02, 8.552196379968784e+02, 8.571903683347796e+02,
- 8.591267939454285e+02, 8.610302623147174e+02, 8.629020401277968e+02, 8.647433196708668e+02, 8.665552246083355e+02,
- 8.683388152074178e+02, 8.700950930726908e+02, 8.718250054449436e+02, 8.735294491117633e+02, 8.752092739713160e+02,
- 8.768652862857123e+02, 8.784982516559255e+02, 8.801088977464705e+02, 8.816979167847256e+02, 8.832659678569759e+02,
- 8.848136790207039e+02, 8.863416492505769e+02, 8.878504502335792e+02, 8.893406280271724e+02, 8.908127045928305e+02,
- 8.922671792160527e+02, 8.937045298227987e+02, 8.951252142013041e+02, 8.965296711373209e+02, 8.979183214700641e+02,
- 8.992915690754153e+02, 9.006498017823341e+02, 9.019933922278510e+02, 9.033226986555213e+02, 9.046380656617835e+02,
- 9.059398248942426e+02, 9.072282957055584e+02, 9.085037857662970e+02, 9.097665916397833e+02, 9.110169993217721e+02,
- 9.122552847474846e+02, 9.134817142683553e+02, 9.146965451006433e+02, 9.159000257478770e+02, 9.170923963989522e+02,
- 9.182738893035482e+02, 9.194447291263971e+02, 9.206051332822632e+02, 9.217553122788474e+02, 9.228954700299744e+02,
- 9.240258040974796e+02, 9.251465049820799e+02, 9.262577594469818e+02, 9.273597470304893e+02, 9.284526423554121e+02,
- 9.295366148982515e+02, 9.306118290247582e+02, 9.316784448830105e+02, 9.327366175121228e+02, 9.337864977591189e+02,
- 9.348282322542124e+02, 9.358619635718649e+02, 9.368878303827341e+02, 9.379059675987268e+02, 9.389165065112981e+02,
- 9.399195749233554e+02, 9.409152972751333e+02, 9.419037947643586e+02, 9.428851854610300e+02, 9.438595844170812e+02,
- 9.448271037712186e+02, 9.457878528491826e+02, 9.467419382596580e+02, 9.476894639860843e+02, 9.486305314745557e+02,
- 9.495652397180191e+02, 9.504936853369553e+02, 9.514159626567191e+02, 9.523321637817081e+02, 9.532423786665071e+02,
- 9.541466951971628e+02, 9.550451992034878e+02, 9.559379746038603e+02, 9.568251034096951e+02, 9.577066657979311e+02,
- 9.585827401443596e+02, 9.594534031691488e+02, 9.603187298481192e+02, 9.611787935579329e+02, 9.620336660995737e+02,
- 9.628834177444229e+02, 9.637281172786235e+02, 9.645678320458335e+02, 9.654026279884105e+02, 9.662325696871295e+02,
- 9.670577203994600e+02, 9.678781420965014e+02, 9.686938954986042e+02, 9.695050401097511e+02, 9.703116342507434e+02,
- 9.711137350912416e+02, 9.719113986807114e+02, 9.727046799783175e+02, 9.734936328818109e+02, 9.742783102554459e+02,
- 9.750587639569708e+02, 9.758350448637287e+02, 9.766072028979000e+02, 9.773752870509237e+02, 9.781393454071313e+02,
- 9.788994251666194e+02, 9.796555726673946e+02, 9.804078334068175e+02, 9.811562520623668e+02, 9.819008725117627e+02,
- 9.826417378523621e+02, 9.833788904423287e+02, 9.841123718297326e+02, 9.848422229053390e+02, 9.855684838287985e+02,
- 9.862911940683814e+02, 9.870103924171941e+02, 9.877261170088946e+02, 9.884384053329567e+02, 9.891472942494853e+02,
- 9.898528200035945e+02, 9.905550182393827e+02, 9.912539240134882e+02, 9.919495718082746e+02, 9.926419955446316e+02,
- 9.933312285944187e+02, 9.940173037925571e+02, 9.947002534487890e+02, 9.953801093591056e+02, 9.960569028168641e+02,
- 9.967306646236001e+02, 9.974014250995418e+02, 9.980692140938463e+02, 9.987340609945511e+02, 9.993959947382724e+02,
- 1.000055043819631e+03, 1.000711236300439e+03, 1.001364599818641e+03, 1.002015161597022e+03, 1.002662948451693e+03,
- 1.003307986800343e+03, 1.003950302670301e+03, 1.004589921706371e+03, 1.005226869178483e+03, 1.005861169989137e+03,
- 1.006492848680676e+03, 1.007121928950236e+03, 1.007748435606874e+03, 1.008372391679970e+03, 1.008993820340296e+03,
- 1.009612744432160e+03, 1.010229186479661e+03, 1.010843168692785e+03, 1.011454712973359e+03, 1.012063840920867e+03,
- 1.012670573838113e+03, 1.013274932736767e+03, 1.013876938342763e+03, 1.014476611101586e+03, 1.015073971183421e+03,
- 1.015669038488196e+03, 1.016261832650493e+03, 1.016852373044363e+03, 1.017440678788015e+03, 1.018026768748407e+03,
- 1.018610661545733e+03, 1.019192375557802e+03, 1.019771928924326e+03, 1.020349339551111e+03, 1.020924625114144e+03,
- 1.021497803063608e+03, 1.022068890627795e+03, 1.022637904816936e+03, 1.023204862426947e+03, 1.023769780043096e+03,
- 1.024332674043592e+03, 1.024893560603091e+03, 1.025452455696129e+03, 1.026009375100485e+03, 1.026564334400469e+03,
- 1.027117348990143e+03, 1.027668434076471e+03, 1.028217604682404e+03, 1.028764875649907e+03, 1.029310261642910e+03,
- 1.029853777150212e+03, 1.030395436488316e+03, 1.030935253804208e+03, 1.031473243078081e+03, 1.032009418126004e+03,
- 1.032543792602533e+03, 1.033076380003277e+03, 1.033607193667400e+03, 1.034136246780087e+03, 1.034663552374956e+03,
- 1.035189123336412e+03, 1.035712972401975e+03, 1.036235112164542e+03, 1.036755555074618e+03, 1.037274313442498e+03,
- 1.037791399440410e+03, 1.038306825104610e+03, 1.038820602337447e+03, 1.039332742909376e+03, 1.039843258460950e+03,
- 1.040352160504749e+03, 1.040859460427299e+03, 1.041365169490941e+03, 1.041869298835661e+03, 1.042371859480896e+03,
- 1.042872862327304e+03, 1.043372318158495e+03, 1.043870237642736e+03, 1.044366631334623e+03, 1.044861509676724e+03,
- 1.045354883001187e+03, 1.045846761531325e+03, 1.046337155383168e+03, 1.046826074566989e+03, 1.047313528988799e+03,
- 1.047799528451826e+03, 1.048284082657950e+03, 1.048767201209131e+03, 1.049248893608798e+03, 1.049729169263219e+03,
- 1.050208037482848e+03, 1.050685507483649e+03, 1.051161588388389e+03, 1.051636289227921e+03, 1.052109618942435e+03,
- 1.052581586382688e+03, 1.053052200311223e+03, 1.053521469403553e+03, 1.053989402249334e+03, 1.054456007353518e+03,
- 1.054921293137477e+03, 1.055385267940125e+03, 1.055847940019002e+03, 1.056309317551357e+03, 1.056769408635199e+03,
- 1.057228221290339e+03, 1.057685763459414e+03, 1.058142043008888e+03, 1.058597067730047e+03, 1.059050845339965e+03,
- 1.059503383482467e+03, 1.059954689729066e+03, 1.060404771579892e+03, 1.060853636464597e+03, 1.061301291743262e+03,
- 1.061747744707268e+03, 1.062193002580169e+03, 1.062637072518547e+03, 1.063079961612850e+03, 1.063521676888219e+03,
- 1.063962225305304e+03, 1.064401613761064e+03, 1.064839849089555e+03, 1.065276938062706e+03, 1.065712887391088e+03,
- 1.066147703724660e+03, 1.066581393653511e+03, 1.067013963708593e+03, 1.067445420362435e+03, 1.067875770029855e+03,
- 1.068305019068647e+03, 1.068733173780279e+03, 1.069160240410558e+03, 1.069586225150301e+03, 1.070011134135987e+03,
- 1.070434973450403e+03, 1.070857749123280e+03, 1.071279467131918e+03, 1.071700133401804e+03, 1.072119753807221e+03,
- 1.072538334171840e+03, 1.072955880269318e+03, 1.073372397823873e+03, 1.073787892510859e+03, 1.074202369957330e+03,
- 1.074615835742597e+03, 1.075028295398773e+03, 1.075439754411317e+03, 1.075850218219560e+03, 1.076259692217236e+03,
- 1.076668181752997e+03, 1.077075692130918e+03, 1.077482228611007e+03, 1.077887796409695e+03, 1.078292400700325e+03,
- 1.078696046613633e+03, 1.079098739238223e+03, 1.079500483621037e+03, 1.079901284767813e+03, 1.080301147643541e+03,
- 1.080700077172909e+03, 1.081098078240752e+03, 1.081495155692479e+03, 1.081891314334514e+03, 1.082286558934707e+03,
- 1.082680894222765e+03, 1.083074324890655e+03, 1.083466855593020e+03, 1.083858490947570e+03, 1.084249235535485e+03,
- 1.084639093901809e+03, 1.085028070555825e+03, 1.085416169971442e+03, 1.085803396587572e+03, 1.086189754808492e+03,
- 1.086575249004219e+03, 1.086959883510863e+03, 1.087343662630987e+03, 1.087726590633953e+03, 1.088108671756273e+03,
- 1.088489910201951e+03, 1.088870310142812e+03, 1.089249875718847e+03, 1.089628611038532e+03, 1.090006520179154e+03,
- 1.090383607187136e+03, 1.090759876078346e+03, 1.091135330838414e+03, 1.091509975423035e+03, 1.091883813758277e+03,
- 1.092256849740879e+03, 1.092629087238547e+03, 1.093000530090247e+03, 1.093371182106492e+03, 1.093741047069628e+03,
- 1.094110128734119e+03, 1.094478430826816e+03, 1.094845957047239e+03, 1.095212711067846e+03, 1.095578696534298e+03,
- 1.095943917065727e+03, 1.096308376254993e+03, 1.096672077668944e+03, 1.097035024848671e+03, 1.097397221309757e+03,
- 1.097758670542528e+03, 1.098119376012294e+03, 1.098479341159596e+03, 1.098838569400443e+03, 1.099197064126546e+03,
- 1.099554828705558e+03, 1.099911866481296e+03, 1.100268180773975e+03, 1.100623774880433e+03, 1.100978652074349e+03,
- 1.101332815606467e+03, 1.101686268704810e+03, 1.102039014574898e+03, 1.102391056399957e+03, 1.102742397341128e+03,
- 1.103093040537676e+03, 1.103442989107197e+03, 1.103792246145811e+03, 1.104140814728373e+03, 1.104488697908661e+03,
- 1.104835898719577e+03, 1.105182420173338e+03, 1.105528265261666e+03, 1.105873436955976e+03, 1.106217938207564e+03,
- 1.106561771947788e+03, 1.106904941088254e+03, 1.107247448520993e+03, 1.107589297118637e+03, 1.107930489734602e+03,
- 1.108271029203252e+03, 1.108610918340075e+03, 1.108950159941858e+03, 1.109288756786845e+03, 1.109626711634912e+03,
- 1.109964027227723e+03, 1.110300706288900e+03, 1.110636751524177e+03, 1.110972165621562e+03, 1.111306951251493e+03,
- 1.111641111066993e+03, 1.111974647703826e+03, 1.112307563780643e+03, 1.112639861899135e+03, 1.112971544644184e+03,
- 1.113302614584007e+03, 1.113633074270297e+03, 1.113962926238377e+03, 1.114292173007331e+03, 1.114620817080152e+03,
- 1.114948860943875e+03, 1.115276307069720e+03, 1.115603157913223e+03, 1.115929415914373e+03, 1.116255083497746e+03,
- 1.116580163072632e+03, 1.116904657033169e+03, 1.117228567758473e+03, 1.117551897612758e+03, 1.117874648945472e+03,
- 1.118196824091413e+03, 1.118518425370856e+03, 1.118839455089676e+03, 1.119159915539468e+03, 1.119479808997663e+03,
- 1.119799137727651e+03, 1.120117903978895e+03, 1.120436109987049e+03, 1.120753757974069e+03, 1.121070850148330e+03,
- 1.121387388704735e+03, 1.121703375824828e+03, 1.122018813676902e+03, 1.122333704416111e+03, 1.122648050184574e+03
- },
- {
- 1.747659611828432e+00, 5.332796710757316e+00, 8.988854365426702e+00, 1.271944018022531e+01, 1.652846365830920e+01,
- 2.042017147962093e+01, 2.439918817160943e+01, 2.847056321609146e+01, 3.263982586484059e+01, 3.691304925915928e+01,
- 4.129692584347427e+01, 4.579885658673009e+01, 5.042705721077700e+01, 5.519068553491932e+01, 6.009999526667289e+01,
- 6.516652322615323e+01, 7.040331927021967e+01, 7.582523135901660e+01, 8.144926270278546e+01, 8.729502439391121e+01,
- 9.338531640325664e+01, 9.974688397997900e+01, 1.064114181348679e+02, 1.134169027960040e+02, 1.208094658721784e+02,
- 1.286459824127509e+02, 1.369978348839282e+02, 1.459565187114674e+02, 1.556423164104066e+02, 1.662183418837789e+02,
- 1.779145902065660e+02, 1.910721712494387e+02, 2.062327457882489e+02, 2.243449823849654e+02, 2.473478699672924e+02,
- 2.805378733710326e+02, 3.634431299908570e+02, 6.254813035599956e+02, 6.558679856765530e+02, 6.753104092363635e+02,
- 6.899943310095643e+02, 7.019476466818353e+02, 7.121108106526021e+02, 7.210014384109655e+02, 7.289362466235776e+02,
- 7.361237580825117e+02, 7.427089142383425e+02, 7.487967838920495e+02, 7.544661326581772e+02, 7.597776524296729e+02,
- 7.647791910872882e+02, 7.695092069231373e+02, 7.739991260895454e+02, 7.782749970528438e+02, 7.823586802266300e+02,
- 7.862687217988788e+02, 7.900210078085244e+02, 7.936292620355629e+02, 7.971054307583348e+02, 8.004599841533063e+02,
- 8.037021553197851e+02, 8.068401319696053e+02, 8.098812117310740e+02, 8.128319291524118e+02, 8.156981604537586e+02,
- 8.184852106082401e+02, 8.211978862596457e+02, 8.238405571905341e+02, 8.264172084609129e+02, 8.289314848886924e+02,
- 8.313867292004430e+02, 8.337860149168040e+02, 8.361321748316263e+02, 8.384278257829619e+02, 8.406753902869854e+02,
- 8.428771155047946e+02, 8.450350899311030e+02, 8.471512581285355e+02, 8.492274337783032e+02, 8.512653112748696e+02,
- 8.532664760567646e+02, 8.552324138365216e+02, 8.571645188684962e+02, 8.590641013732004e+02, 8.609323942199201e+02,
- 8.627705589552579e+02, 8.645796912533052e+02, 8.663608258530688e+02, 8.681149410401933e+02, 8.698429627227040e+02,
- 8.715457681442740e+02, 8.732241892731309e+02, 8.748790159000977e+02, 8.765109984753029e+02, 8.781208507096248e+02,
- 8.797092519639431e+02, 8.812768494466768e+02, 8.828242602377982e+02, 8.843520731555307e+02, 8.858608504802064e+02,
- 8.873511295482033e+02, 8.888234242275646e+02, 8.902782262856737e+02, 8.917160066583574e+02, 8.931372166288119e+02,
- 8.945422889239351e+02, 8.959316387349368e+02, 8.973056646684030e+02, 8.986647496334409e+02, 9.000092616699892e+02,
- 9.013395547229183e+02, 9.026559693661341e+02, 9.039588334805021e+02, 9.052484628890929e+02, 9.065251619529363e+02,
- 9.077892241301959e+02, 9.090409325014242e+02, 9.102805602633513e+02, 9.115083711934362e+02, 9.127246200872452e+02,
- 9.139295531705343e+02, 9.151234084877879e+02, 9.163064162688016e+02, 9.174787992800113e+02, 9.186407731912891e+02,
- 9.197925468609363e+02, 9.209343226041448e+02, 9.220662951928475e+02, 9.231886562624145e+02, 9.243015894078225e+02,
- 9.254052733423142e+02, 9.264998814856765e+02, 9.275855820127574e+02, 9.286625387274997e+02, 9.297309102172569e+02,
- 9.307908507470315e+02, 9.318425102480171e+02, 9.328860344864579e+02, 9.339215652153523e+02, 9.349492403273919e+02,
- 9.359691939968451e+02, 9.369815568155962e+02, 9.379864559229345e+02, 9.389840151294509e+02, 9.399743550353364e+02,
- 9.409575931434247e+02, 9.419338439672164e+02, 9.429032191341721e+02, 9.438658274845296e+02, 9.448217751658639e+02,
- 9.457711657236084e+02, 9.467141001877502e+02, 9.476506771559013e+02, 9.485809928729084e+02, 9.495051413071852e+02,
- 9.504232142376935e+02, 9.513353012678147e+02, 9.522414899794773e+02, 9.531418659385832e+02, 9.540365127503031e+02,
- 9.549255122090501e+02, 9.558089442179278e+02, 9.566868869378121e+02, 9.575594168164913e+02, 9.584266086397703e+02,
- 9.592885355806404e+02, 9.601452692466164e+02, 9.609968797253258e+02, 9.618434356284154e+02, 9.626850041338678e+02,
- 9.635216510267758e+02, 9.643534407386575e+02, 9.651804363853771e+02, 9.660026998037097e+02, 9.668202915866395e+02,
- 9.676332711174156e+02, 9.684416966024349e+02, 9.692456251029969e+02, 9.700451125659748e+02, 9.708402138534479e+02,
- 9.716309827713388e+02, 9.724174720970976e+02, 9.731997336064671e+02, 9.739778180993665e+02, 9.747517754249311e+02,
- 9.755216545057431e+02, 9.762875033834615e+02, 9.770493691516285e+02, 9.778072981142626e+02, 9.785613357148328e+02,
- 9.793115265802675e+02, 9.800579145409317e+02, 9.808005426499802e+02, 9.815394532021168e+02, 9.822746877517856e+02,
- 9.830062871308031e+02, 9.837342914654657e+02, 9.844587401931408e+02, 9.851796720783643e+02, 9.858971252284682e+02,
- 9.866111371087369e+02, 9.873217445571381e+02, 9.880289837986073e+02, 9.887328904589375e+02, 9.894334995782599e+02,
- 9.901308456241450e+02, 9.908249625043327e+02, 9.915158835791032e+02, 9.922036416733027e+02, 9.928882690880357e+02,
- 9.935697976120324e+02, 9.942482585327026e+02, 9.949236826468950e+02, 9.955961002713553e+02, 9.962655412529051e+02,
- 9.969320349783549e+02, 9.975956103841360e+02, 9.982562959656997e+02, 9.989141197866451e+02, 9.995691094876255e+02,
- 1.000221292295012e+03, 1.000870695029337e+03, 1.001517344113522e+03, 1.002161265580885e+03, 1.002802485082955e+03,
- 1.003441027897081e+03, 1.004076918444280e+03, 1.004710182236384e+03, 1.005340843000363e+03, 1.005968924589208e+03,
- 1.006594450517019e+03, 1.007217443965552e+03, 1.007837927790598e+03, 1.008455924528217e+03, 1.009071456400806e+03,
- 1.009684545323041e+03, 1.010295212907659e+03, 1.010903480471109e+03, 1.011509369039075e+03, 1.012112899351861e+03,
- 1.012714091869649e+03, 1.013312966777644e+03, 1.013909543991088e+03, 1.014503843160166e+03, 1.015095883674795e+03,
- 1.015685684669307e+03, 1.016273265027023e+03, 1.016858643384723e+03, 1.017441838137019e+03, 1.018022867440622e+03,
- 1.018601749218526e+03, 1.019178501164087e+03, 1.019753140745019e+03, 1.020325685207299e+03, 1.020896151578988e+03,
- 1.021464556673968e+03, 1.022030917095601e+03, 1.022595249240300e+03, 1.023157569301035e+03, 1.023717893270757e+03,
- 1.024276236945749e+03, 1.024832615928908e+03, 1.025387045632961e+03, 1.025939541283600e+03, 1.026490117922575e+03,
- 1.027038790410696e+03, 1.027585573430793e+03, 1.028130481490604e+03, 1.028673528925609e+03, 1.029214729901804e+03,
- 1.029754098418416e+03, 1.030291648310568e+03, 1.030827393251892e+03, 1.031361346757073e+03, 1.031893522184370e+03,
- 1.032423932738057e+03, 1.032952591470840e+03, 1.033479511286210e+03, 1.034004704940759e+03, 1.034528185046445e+03,
- 1.035049964072816e+03, 1.035570054349190e+03, 1.036088468066793e+03, 1.036605217280855e+03, 1.037120313912667e+03,
- 1.037633769751596e+03, 1.038145596457066e+03, 1.038655805560498e+03, 1.039164408467214e+03, 1.039671416458309e+03,
- 1.040176840692478e+03, 1.040680692207821e+03, 1.041182981923609e+03, 1.041683720642014e+03, 1.042182919049811e+03,
- 1.042680587720051e+03, 1.043176737113700e+03, 1.043671377581246e+03, 1.044164519364280e+03, 1.044656172597053e+03,
- 1.045146347307991e+03, 1.045635053421203e+03, 1.046122300757940e+03, 1.046608099038045e+03, 1.047092457881370e+03,
- 1.047575386809171e+03, 1.048056895245471e+03, 1.048536992518409e+03, 1.049015687861563e+03, 1.049492990415244e+03,
- 1.049968909227770e+03, 1.050443453256728e+03, 1.050916631370197e+03, 1.051388452347965e+03, 1.051858924882712e+03,
- 1.052328057581192e+03, 1.052795858965370e+03, 1.053262337473561e+03, 1.053727501461539e+03, 1.054191359203629e+03,
- 1.054653918893783e+03, 1.055115188646638e+03, 1.055575176498552e+03, 1.056033890408628e+03, 1.056491338259721e+03,
- 1.056947527859422e+03, 1.057402466941035e+03, 1.057856163164531e+03, 1.058308624117491e+03, 1.058759857316028e+03,
- 1.059209870205704e+03, 1.059658670162422e+03, 1.060106264493307e+03, 1.060552660437576e+03, 1.060997865167394e+03,
- 1.061441885788709e+03, 1.061884729342082e+03, 1.062326402803503e+03, 1.062766913085188e+03, 1.063206267036371e+03,
- 1.063644471444081e+03, 1.064081533033901e+03, 1.064517458470727e+03, 1.064952254359505e+03, 1.065385927245962e+03,
- 1.065818483617323e+03, 1.066249929903019e+03, 1.066680272475383e+03, 1.067109517650337e+03, 1.067537671688066e+03,
- 1.067964740793685e+03, 1.068390731117890e+03, 1.068815648757612e+03, 1.069239499756640e+03, 1.069662290106263e+03,
- 1.070084025745870e+03, 1.070504712563573e+03, 1.070924356396794e+03, 1.071342963032864e+03, 1.071760538209597e+03,
- 1.072177087615869e+03, 1.072592616892178e+03, 1.073007131631203e+03, 1.073420637378350e+03, 1.073833139632294e+03,
- 1.074244643845510e+03, 1.074655155424799e+03, 1.075064679731805e+03, 1.075473222083526e+03, 1.075880787752812e+03,
- 1.076287381968866e+03, 1.076693009917733e+03, 1.077097676742774e+03, 1.077501387545147e+03, 1.077904147384277e+03,
- 1.078305961278312e+03, 1.078706834204580e+03, 1.079106771100040e+03, 1.079505776861723e+03, 1.079903856347168e+03,
- 1.080301014374853e+03, 1.080697255724619e+03, 1.081092585138091e+03, 1.081487007319088e+03, 1.081880526934031e+03,
- 1.082273148612348e+03, 1.082664876946866e+03, 1.083055716494205e+03, 1.083445671775160e+03, 1.083834747275089e+03,
- 1.084222947444279e+03, 1.084610276698325e+03, 1.084996739418489e+03, 1.085382339952067e+03, 1.085767082612738e+03,
- 1.086150971680919e+03, 1.086534011404113e+03, 1.086916205997249e+03, 1.087297559643018e+03, 1.087678076492209e+03,
- 1.088057760664037e+03, 1.088436616246467e+03, 1.088814647296535e+03, 1.089191857840661e+03, 1.089568251874967e+03,
- 1.089943833365582e+03, 1.090318606248944e+03, 1.090692574432102e+03, 1.091065741793015e+03, 1.091438112180840e+03,
- 1.091809689416227e+03, 1.092180477291597e+03, 1.092550479571428e+03, 1.092919699992533e+03, 1.093288142264335e+03,
- 1.093655810069135e+03, 1.094022707062386e+03, 1.094388836872949e+03, 1.094754203103362e+03, 1.095118809330094e+03,
- 1.095482659103801e+03, 1.095845755949578e+03, 1.096208103367205e+03, 1.096569704831395e+03, 1.096930563792039e+03,
- 1.097290683674438e+03, 1.097650067879546e+03, 1.098008719784203e+03, 1.098366642741364e+03, 1.098723840080329e+03,
- 1.099080315106964e+03, 1.099436071103932e+03, 1.099791111330906e+03, 1.100145439024789e+03, 1.100499057399926e+03,
- 1.100851969648323e+03, 1.101204178939849e+03, 1.101555688422449e+03, 1.101906501222346e+03, 1.102256620444243e+03,
- 1.102606049171524e+03, 1.102954790466453e+03, 1.103302847370368e+03, 1.103650222903874e+03, 1.103996920067033e+03,
- 1.104342941839554e+03, 1.104688291180981e+03, 1.105032971030872e+03, 1.105376984308989e+03, 1.105720333915469e+03,
- 1.106063022731012e+03, 1.106405053617048e+03, 1.106746429415915e+03, 1.107087152951033e+03, 1.107427227027069e+03,
- 1.107766654430111e+03, 1.108105437927829e+03, 1.108443580269642e+03, 1.108781084186880e+03, 1.109117952392945e+03,
- 1.109454187583471e+03, 1.109789792436477e+03, 1.110124769612528e+03, 1.110459121754883e+03, 1.110792851489652e+03,
- 1.111125961425942e+03, 1.111458454156009e+03, 1.111790332255404e+03, 1.112121598283115e+03, 1.112452254781717e+03,
- 1.112782304277510e+03, 1.113111749280658e+03, 1.113440592285333e+03, 1.113768835769849e+03, 1.114096482196800e+03,
- 1.114423534013193e+03, 1.114749993650584e+03, 1.115075863525204e+03, 1.115401146038096e+03, 1.115725843575240e+03,
- 1.116049958507683e+03, 1.116373493191661e+03, 1.116696449968729e+03, 1.117018831165881e+03, 1.117340639095673e+03,
- 1.117661876056345e+03, 1.117982544331941e+03, 1.118302646192424e+03, 1.118622183893796e+03, 1.118941159678214e+03,
- 1.119259575774104e+03, 1.119577434396275e+03, 1.119894737746028e+03, 1.120211488011274e+03, 1.120527687366639e+03
- },
- {
- 1.741728375053458e+00, 5.314120505442629e+00, 8.956348641374943e+00, 1.267191336013246e+01, 1.646460349081462e+01,
- 2.033852919503409e+01, 2.429816000673557e+01, 2.834836877129105e+01, 3.249448262535235e+01, 3.674234244260142e+01,
- 4.109837251465464e+01, 4.556966269090073e+01, 5.016406579211682e+01, 5.489031389229089e+01, 5.975815810161417e+01,
- 6.477853788260066e+01, 6.996378783864957e+01, 7.532789254890626e+01, 8.088680371411394e+01, 8.665883912927421e+01,
- 9.266519059747959e+01, 9.893057910144233e+01, 1.054841124082500e+02, 1.123604262449665e+02, 1.196012312063083e+02,
- 1.272574543105828e+02, 1.353922762488972e+02, 1.440855617316300e+02, 1.534405381457939e+02, 1.635942678381166e+02,
- 1.747348740534539e+02, 1.871316179325121e+02, 2.011915983867612e+02, 2.175781987103068e+02, 2.374973861173002e+02,
- 2.635667035564218e+02, 3.038625501683057e+02, 4.806304025070923e+02, 6.131723778719374e+02, 6.454701148335959e+02,
- 6.660547262802207e+02, 6.815089489761624e+02, 6.940276068532737e+02, 7.046293961685642e+02, 7.138739965734985e+02,
- 7.221030065846167e+02, 7.295407056919635e+02, 7.363425377636316e+02, 7.426208595427353e+02, 7.484596629644274e+02,
- 7.539234927497058e+02, 7.590631052379453e+02, 7.639192002267218e+02, 7.685249632733555e+02, 7.729078465586872e+02,
- 7.770908469404263e+02, 7.810934428761366e+02, 7.849322943381262e+02, 7.886217745492073e+02, 7.921743801041504e+02,
- 7.956010516391838e+02, 7.989114276830152e+02, 8.021140478894411e+02, 8.052165174275424e+02, 8.082256412118306e+02,
- 8.111475344578669e+02, 8.139877144666757e+02, 8.167511773867494e+02, 8.194424628496680e+02, 8.220657087382966e+02,
- 8.246246978656754e+02, 8.271228979759559e+02, 8.295634961966523e+02, 8.319494288523848e+02, 8.342834073789102e+02,
- 8.365679409410235e+02, 8.388053562504845e+02, 8.409978149942418e+02, 8.431473292140034e+02, 8.452557749221926e+02,
- 8.473249041936463e+02, 8.493563559349898e+02, 8.513516655028074e+02, 8.533122733162317e+02, 8.552395325883064e+02,
- 8.571347162828195e+02, 8.589990233883600e+02, 8.608335845888713e+02, 8.626394673993490e+02, 8.644176808263342e+02,
- 8.661691796052137e+02, 8.678948680597363e+02, 8.695956036235987e+02, 8.712722000590633e+02, 8.729254304034292e+02,
- 8.745560296705727e+02, 8.761646973316132e+02, 8.777520995960749e+02, 8.793188715124946e+02, 8.808656189054011e+02,
- 8.823929201637125e+02, 8.839013278940520e+02, 8.853913704510389e+02, 8.868635533553864e+02, 8.883183606095422e+02,
- 8.897562559196253e+02, 8.911776838315599e+02, 8.925830707885331e+02, 8.939728261162403e+02, 8.953473429417327e+02,
- 8.967069990511936e+02, 8.980521576914280e+02, 8.993831683194544e+02, 9.007003673041785e+02, 9.020040785837764e+02,
- 9.032946142821023e+02, 9.045722752871517e+02, 9.058373517943470e+02, 9.070901238171846e+02, 9.083308616675691e+02,
- 9.095598264079747e+02, 9.107772702773855e+02, 9.119834370928327e+02, 9.131785626282600e+02, 9.143628749923389e+02,
- 9.155365949915390e+02, 9.166999364072961e+02, 9.178531054145200e+02, 9.189963036028357e+02, 9.201297249554855e+02,
- 9.212535579329505e+02, 9.223679853250901e+02, 9.234731843063030e+02, 9.245693273755169e+02, 9.256565814516307e+02,
- 9.267351088350003e+02, 9.278050671981740e+02, 9.288666097645535e+02, 9.299198854784083e+02, 9.309650391644586e+02,
- 9.320022116905931e+02, 9.330315401030213e+02, 9.340531577737681e+02, 9.350671945326457e+02, 9.360737767948482e+02,
- 9.370730276827787e+02, 9.380650671424290e+02, 9.390500120545896e+02, 9.400279763411705e+02, 9.409990710669023e+02,
- 9.419634045366276e+02, 9.429210823884479e+02, 9.438722076829066e+02, 9.448168809884298e+02, 9.457552004632045e+02,
- 9.466872619336696e+02, 9.476131589828589e+02, 9.485329829691095e+02, 9.494468231559957e+02, 9.503547668108941e+02,
- 9.512568991482393e+02, 9.521533034828481e+02, 9.530440612654538e+02, 9.539292521394221e+02, 9.548089539953043e+02,
- 9.556832430233076e+02, 9.565521937637889e+02, 9.574158791558600e+02, 9.582743705841818e+02, 9.591277379240380e+02,
- 9.599760495847627e+02, 9.608193725515824e+02, 9.616577724259658e+02, 9.624913134645150e+02, 9.633200586164890e+02,
- 9.641440695600016e+02, 9.649634067369532e+02, 9.657781293867525e+02, 9.665882955788774e+02, 9.673939622443171e+02,
- 9.681951852059568e+02, 9.689920192079277e+02, 9.697845179654694e+02, 9.705727341052842e+02, 9.713567193244319e+02,
- 9.721365243265187e+02, 9.729121988692063e+02, 9.736837917882301e+02, 9.744513510206435e+02, 9.752149236273314e+02,
- 9.759745558148001e+02, 9.767302929562892e+02, 9.774821796122226e+02, 9.782302595500222e+02, 9.789745757633123e+02,
- 9.797151704905398e+02, 9.804520852330219e+02, 9.811853607724502e+02, 9.819150371878738e+02, 9.826411538721660e+02,
- 9.833637495480133e+02, 9.840828622834288e+02, 9.847985295068046e+02, 9.855107880215390e+02, 9.862196740202365e+02,
- 9.869252230984887e+02, 9.876274702682779e+02, 9.883264499709927e+02, 9.890221960900720e+02, 9.897147419633058e+02,
- 9.904041203947791e+02, 9.910903636664981e+02, 9.917735035496863e+02, 9.924535713157782e+02, 9.931305977471071e+02,
- 9.938046131473103e+02, 9.944756473514484e+02, 9.951437297358600e+02, 9.958088892277484e+02, 9.964711543145172e+02,
- 9.971305530528612e+02, 9.977871130776194e+02, 9.984408616103930e+02, 9.990918254679525e+02, 9.997400310704139e+02,
- 1.000385504449214e+03, 1.001028270768264e+03, 1.001668356259532e+03, 1.002305785365685e+03, 1.002940582639218e+03,
- 1.003572772280899e+03, 1.004202378146612e+03, 1.004829423754034e+03, 1.005453932289148e+03, 1.006075926612605e+03,
- 1.006695429265915e+03, 1.007312462477507e+03, 1.007927048168629e+03, 1.008539207959121e+03, 1.009148963173035e+03,
- 1.009756334844137e+03, 1.010361343721271e+03, 1.010964010273598e+03, 1.011564354695719e+03, 1.012162396912674e+03,
- 1.012758156584824e+03, 1.013351653112629e+03, 1.013942905641308e+03, 1.014531933065403e+03, 1.015118754033228e+03,
- 1.015703386951228e+03, 1.016285849988238e+03, 1.016866161079643e+03, 1.017444337931450e+03, 1.018020398024269e+03,
- 1.018594358617210e+03, 1.019166236751682e+03, 1.019736049255131e+03, 1.020303812744677e+03, 1.020869543630685e+03,
- 1.021433258120248e+03, 1.021994972220614e+03, 1.022554701742518e+03, 1.023112462303462e+03, 1.023668269330912e+03,
- 1.024222138065443e+03, 1.024774083563798e+03, 1.025324120701907e+03, 1.025872264177823e+03, 1.026418528514611e+03,
- 1.026962928063174e+03, 1.027505477005013e+03, 1.028046189354948e+03, 1.028585078963766e+03, 1.029122159520832e+03,
- 1.029657444556629e+03, 1.030190947445270e+03, 1.030722681406938e+03, 1.031252659510292e+03, 1.031780894674819e+03,
- 1.032307399673146e+03, 1.032832187133298e+03, 1.033355269540918e+03, 1.033876659241445e+03, 1.034396368442244e+03,
- 1.034914409214702e+03, 1.035430793496276e+03, 1.035945533092514e+03, 1.036458639679021e+03, 1.036970124803404e+03,
- 1.037479999887169e+03, 1.037988276227589e+03, 1.038494964999534e+03, 1.039000077257265e+03, 1.039503623936201e+03,
- 1.040005615854651e+03, 1.040506063715504e+03, 1.041004978107911e+03, 1.041502369508906e+03, 1.041998248285028e+03,
- 1.042492624693890e+03, 1.042985508885734e+03, 1.043476910904948e+03, 1.043966840691568e+03, 1.044455308082740e+03,
- 1.044942322814165e+03, 1.045427894521512e+03, 1.045912032741818e+03, 1.046394746914845e+03, 1.046876046384427e+03,
- 1.047355940399794e+03, 1.047834438116863e+03, 1.048311548599515e+03, 1.048787280820845e+03, 1.049261643664399e+03,
- 1.049734645925376e+03, 1.050206296311824e+03, 1.050676603445800e+03, 1.051145575864533e+03, 1.051613222021539e+03,
- 1.052079550287742e+03, 1.052544568952562e+03, 1.053008286224988e+03, 1.053470710234637e+03, 1.053931849032793e+03,
- 1.054391710593423e+03, 1.054850302814187e+03, 1.055307633517424e+03, 1.055763710451126e+03, 1.056218541289889e+03,
- 1.056672133635860e+03, 1.057124495019657e+03, 1.057575632901285e+03, 1.058025554671027e+03, 1.058474267650325e+03,
- 1.058921779092654e+03, 1.059368096184368e+03, 1.059813226045545e+03, 1.060257175730812e+03, 1.060699952230158e+03,
- 1.061141562469739e+03, 1.061582013312661e+03, 1.062021311559758e+03, 1.062459463950361e+03, 1.062896477163044e+03,
- 1.063332357816365e+03, 1.063767112469602e+03, 1.064200747623464e+03, 1.064633269720801e+03, 1.065064685147300e+03,
- 1.065495000232172e+03, 1.065924221248826e+03, 1.066352354415535e+03, 1.066779405896089e+03, 1.067205381800444e+03,
- 1.067630288185358e+03, 1.068054131055012e+03, 1.068476916361633e+03, 1.068898650006097e+03, 1.069319337838532e+03,
- 1.069738985658905e+03, 1.070157599217608e+03, 1.070575184216022e+03, 1.070991746307093e+03, 1.071407291095879e+03,
- 1.071821824140102e+03, 1.072235350950690e+03, 1.072647876992308e+03, 1.073059407683880e+03, 1.073469948399113e+03,
- 1.073879504467001e+03, 1.074288081172331e+03, 1.074695683756178e+03, 1.075102317416393e+03, 1.075507987308087e+03,
- 1.075912698544102e+03, 1.076316456195482e+03, 1.076719265291938e+03, 1.077121130822294e+03, 1.077522057734948e+03,
- 1.077922050938306e+03, 1.078321115301219e+03, 1.078719255653420e+03, 1.079116476785945e+03, 1.079512783451548e+03,
- 1.079908180365124e+03, 1.080302672204105e+03, 1.080696263608872e+03, 1.081088959183145e+03, 1.081480763494379e+03,
- 1.081871681074147e+03, 1.082261716418521e+03, 1.082650873988450e+03, 1.083039158210128e+03, 1.083426573475361e+03,
- 1.083813124141929e+03, 1.084198814533941e+03, 1.084583648942186e+03, 1.084967631624481e+03, 1.085350766806012e+03,
- 1.085733058679675e+03, 1.086114511406403e+03, 1.086495129115504e+03, 1.086874915904976e+03, 1.087253875841836e+03,
- 1.087632012962432e+03, 1.088009331272756e+03, 1.088385834748754e+03, 1.088761527336627e+03, 1.089136412953134e+03,
- 1.089510495485892e+03, 1.089883778793660e+03, 1.090256266706638e+03, 1.090627963026745e+03, 1.090998871527907e+03,
- 1.091368995956330e+03, 1.091738340030778e+03, 1.092106907442846e+03, 1.092474701857224e+03, 1.092841726911966e+03,
- 1.093207986218746e+03, 1.093573483363123e+03, 1.093938221904792e+03, 1.094302205377836e+03, 1.094665437290975e+03,
- 1.095027921127815e+03, 1.095389660347085e+03, 1.095750658382883e+03, 1.096110918644908e+03, 1.096470444518696e+03,
- 1.096829239365852e+03, 1.097187306524278e+03, 1.097544649308396e+03, 1.097901271009378e+03, 1.098257174895356e+03,
- 1.098612364211650e+03, 1.098966842180976e+03, 1.099320612003661e+03, 1.099673676857855e+03, 1.100026039899735e+03,
- 1.100377704263711e+03, 1.100728673062631e+03, 1.101078949387977e+03, 1.101428536310069e+03, 1.101777436878256e+03,
- 1.102125654121109e+03, 1.102473191046615e+03, 1.102820050642365e+03, 1.103166235875740e+03, 1.103511749694095e+03,
- 1.103856595024944e+03, 1.104200774776138e+03, 1.104544291836043e+03, 1.104887149073719e+03, 1.105229349339090e+03,
- 1.105570895463123e+03, 1.105911790257989e+03, 1.106252036517241e+03, 1.106591637015973e+03, 1.106930594510988e+03,
- 1.107268911740961e+03, 1.107606591426598e+03, 1.107943636270799e+03, 1.108280048958810e+03, 1.108615832158383e+03,
- 1.108950988519927e+03, 1.109285520676661e+03, 1.109619431244767e+03, 1.109952722823535e+03, 1.110285397995512e+03,
- 1.110617459326649e+03, 1.110948909366440e+03, 1.111279750648072e+03, 1.111609985688559e+03, 1.111939616988886e+03,
- 1.112268647034142e+03, 1.112597078293662e+03, 1.112924913221158e+03, 1.113252154254852e+03, 1.113578803817613e+03,
- 1.113904864317081e+03, 1.114230338145799e+03, 1.114555227681343e+03, 1.114879535286443e+03, 1.115203263309116e+03,
- 1.115526414082779e+03, 1.115848989926385e+03, 1.116170993144529e+03, 1.116492426027580e+03, 1.116813290851795e+03,
- 1.117133589879434e+03, 1.117453325358881e+03, 1.117772499524756e+03, 1.118091114598027e+03, 1.118409172786127e+03
- },
- {
- 1.735837913559893e+00, 5.295581014340208e+00, 8.924096098888631e+00, 1.262478018938092e+01, 1.640130556540408e+01,
- 2.025765078852565e+01, 2.419813628783695e+01, 2.822746535368524e+01, 3.235077156361812e+01, 3.657367391405241e+01,
- 4.090234123116258e+01, 4.534356782910446e+01, 4.990486289364432e+01, 5.459455673758011e+01, 5.942192795850151e+01,
- 6.439735671155678e+01, 6.953251090847398e+01, 7.484057434255196e+01, 8.033652877552350e+01, 8.603750629589238e+01,
- 9.196323436981072e+01, 9.813660489791276e+01, 1.045844117797398e+02, 1.113383214654397e+02, 1.184361719611295e+02,
- 1.259237451073973e+02, 1.338572379802315e+02, 1.423067966738733e+02, 1.513617192838598e+02, 1.611383841755784e+02,
- 1.717928398483338e+02, 1.835418296940128e+02, 1.967001891142653e+02, 2.117530193151645e+02, 2.295111982984277e+02,
- 2.515038588019423e+02, 2.812505498218775e+02, 3.309214294202027e+02, 5.100142118739390e+02, 6.020082486345009e+02,
- 6.355017484186912e+02, 6.570334868721310e+02, 6.731765246809979e+02, 6.862190992384614e+02, 6.972357686759511e+02,
- 7.068194539833491e+02, 7.153326151035200e+02, 7.230132781254056e+02, 7.300263148682412e+02, 7.364907643227039e+02,
- 7.424954872795790e+02, 7.481086612208386e+02, 7.533838098374637e+02, 7.583637802524823e+02, 7.630834520335953e+02,
- 7.675716338960540e+02, 7.718524238553307e+02, 7.759462053729383e+02, 7.798703906784768e+02, 7.836399847869445e+02,
- 7.872680199519266e+02, 7.907658949046414e+02, 7.941436430428625e+02, 7.974101468557177e+02, 8.005733111409419e+02,
- 8.036402042647568e+02, 8.066171743675550e+02, 8.095099457291507e+02, 8.123236992754389e+02, 8.150631402990271e+02,
- 8.177325557877964e+02, 8.203358632435270e+02, 8.228766524828380e+02, 8.253582216130106e+02, 8.277836081428915e+02,
- 8.301556160073644e+02, 8.324768391407692e+02, 8.347496821210597e+02, 8.369763783156757e+02, 8.391590058871892e+02,
- 8.412995019576051e+02, 8.433996751821597e+02, 8.454612169440793e+02, 8.474857113493312e+02, 8.494746441736520e+02,
- 8.514294108918184e+02, 8.533513239005702e+02, 8.552416190309926e+02, 8.571014614330519e+02, 8.589319509038697e+02,
- 8.607341267219387e+02, 8.625089720414350e+02, 8.642574178939892e+02, 8.659803468393386e+02, 8.676785963013074e+02,
- 8.693529616211820e+02, 8.710041988567580e+02, 8.726330273521309e+02, 8.742401321003996e+02, 8.758261659190346e+02,
- 8.773917514554531e+02, 8.789374830384695e+02, 8.804639283896364e+02, 8.819716302069999e+02, 8.834611076325217e+02,
- 8.849328576132688e+02, 8.863873561654751e+02, 8.878250595496645e+02, 8.892464053642402e+02, 8.906518135642360e+02,
- 8.920416874112860e+02, 8.934164143603108e+02, 8.947763668879142e+02, 8.961219032670190e+02, 8.974533682918814e+02,
- 8.987710939572432e+02, 9.000754000950585e+02, 9.013665949719456e+02, 9.026449758502187e+02, 9.039108295151425e+02,
- 9.051644327708202e+02, 9.064060529069206e+02, 9.076359481382912e+02, 9.088543680193105e+02, 9.100615538379757e+02,
- 9.112577390224913e+02, 9.124431494748175e+02, 9.136180038712724e+02, 9.147825127921666e+02, 9.159368828249632e+02,
- 9.170813121346795e+02, 9.182159933893699e+02, 9.193411134339563e+02, 9.204568533616368e+02, 9.215633894226800e+02,
- 9.226608921844527e+02, 9.237495274588575e+02, 9.248294563089856e+02, 9.259008352330949e+02, 9.269638163396667e+02,
- 9.280185475140697e+02, 9.290651725772965e+02, 9.301038314328325e+02, 9.311346602273072e+02, 9.321577914649645e+02,
- 9.331733541534124e+02, 9.341814739255290e+02, 9.351822731591581e+02, 9.361758710914785e+02, 9.371623839283320e+02,
- 9.381419249487801e+02, 9.391146046051258e+02, 9.400805306186502e+02, 9.410398080712745e+02, 9.419925394933560e+02,
- 9.429388249478163e+02, 9.438787621244096e+02, 9.448124463400762e+02, 9.457399707851794e+02, 9.466614264040561e+02,
- 9.475769020681855e+02, 9.484864846188768e+02, 9.493902589303054e+02, 9.502883079700738e+02, 9.511807128574313e+02,
- 9.520675529192539e+02, 9.529489057438869e+02, 9.538248472329501e+02, 9.546954516512000e+02, 9.555607916745333e+02,
- 9.564209384362135e+02, 9.572759615714075e+02, 9.581259292600938e+02, 9.589709082684271e+02, 9.598109639886212e+02,
- 9.606461604773988e+02, 9.614765604931064e+02, 9.623022255315057e+02, 9.631232158811730e+02, 9.639395905723921e+02,
- 9.647514075378135e+02, 9.655587235567416e+02, 9.663615943072250e+02, 9.671600743951209e+02, 9.679542173821836e+02,
- 9.687440758132281e+02, 9.695297012423988e+02, 9.703111442585837e+02, 9.710884545099998e+02, 9.718616807279972e+02,
- 9.726308707500885e+02, 9.733960715422606e+02, 9.741573292205712e+02, 9.749146890720803e+02, 9.756681955751193e+02,
- 9.764178924189415e+02, 9.771638225227659e+02, 9.779060280542383e+02, 9.786445504473381e+02, 9.793794304197394e+02,
- 9.801107079896592e+02, 9.808384224921977e+02, 9.815626125952022e+02, 9.822833163146593e+02, 9.830005710296455e+02,
- 9.837144134968345e+02, 9.844248798645972e+02, 9.851320056866873e+02, 9.858358259355476e+02, 9.865363750152289e+02,
- 9.872336867739593e+02, 9.879277945163450e+02, 9.886187310152491e+02, 9.893065285233321e+02, 9.899912187842764e+02,
- 9.906728330437061e+02, 9.913514020598141e+02, 9.920269561136940e+02, 9.926995250194029e+02, 9.933691381337501e+02,
- 9.940358243658309e+02, 9.946996121863040e+02, 9.953605296364301e+02, 9.960186043368725e+02, 9.966738634962704e+02,
- 9.973263339195898e+02, 9.979760415329843e+02, 9.986230133062957e+02, 9.992672744162968e+02, 9.999088501325956e+02,
- 1.000547765359803e+03, 1.001184044644693e+03, 1.001817712183193e+03, 1.002448791827186e+03, 1.003077307091166e+03,
- 1.003703281158710e+03, 1.004326736888804e+03, 1.004947696822024e+03, 1.005566183186544e+03, 1.006182217904030e+03,
- 1.006795822595366e+03, 1.007407018586267e+03, 1.008015826912743e+03, 1.008622268326447e+03, 1.009226363299890e+03,
- 1.009828132031539e+03, 1.010427594450798e+03, 1.011024770222868e+03, 1.011619678753507e+03, 1.012212339193671e+03,
- 1.012802770444055e+03, 1.013390991159534e+03, 1.013977019753496e+03, 1.014560874402090e+03, 1.015142573048368e+03,
- 1.015722133406342e+03, 1.016299572964955e+03, 1.016874908991953e+03, 1.017448158537686e+03, 1.018019338438818e+03,
- 1.018588465321960e+03, 1.019155555607226e+03, 1.019720625511709e+03, 1.020283691052888e+03, 1.020844768051955e+03,
- 1.021403872137085e+03, 1.021961018746621e+03, 1.022516223132208e+03, 1.023069500361847e+03, 1.023620865322900e+03,
- 1.024170332725021e+03, 1.024717917103034e+03, 1.025263632819749e+03, 1.025807494068725e+03, 1.026349514876966e+03,
- 1.026889709107579e+03, 1.027428090462364e+03, 1.027964672484360e+03, 1.028499468560335e+03, 1.029032491923236e+03,
- 1.029563755654579e+03, 1.030093272686799e+03, 1.030621055805550e+03, 1.031147117651967e+03, 1.031671470724877e+03,
- 1.032194127382965e+03, 1.032715099846912e+03, 1.033234400201475e+03, 1.033752040397540e+03, 1.034268032254126e+03,
- 1.034782387460360e+03, 1.035295117577413e+03, 1.035806234040387e+03, 1.036315748160189e+03, 1.036823671125349e+03,
- 1.037330014003820e+03, 1.037834787744733e+03, 1.038338003180125e+03, 1.038839671026638e+03, 1.039339801887178e+03,
- 1.039838406252557e+03, 1.040335494503091e+03, 1.040831076910179e+03, 1.041325163637850e+03, 1.041817764744282e+03,
- 1.042308890183292e+03, 1.042798549805809e+03, 1.043286753361306e+03, 1.043773510499218e+03, 1.044258830770332e+03,
- 1.044742723628151e+03, 1.045225198430236e+03, 1.045706264439521e+03, 1.046185930825613e+03, 1.046664206666061e+03,
- 1.047141100947607e+03, 1.047616622567420e+03, 1.048090780334295e+03, 1.048563582969851e+03, 1.049035039109690e+03,
- 1.049505157304552e+03, 1.049973946021437e+03, 1.050441413644720e+03, 1.050907568477237e+03, 1.051372418741365e+03,
- 1.051835972580068e+03, 1.052298238057940e+03, 1.052759223162226e+03, 1.053218935803823e+03, 1.053677383818267e+03,
- 1.054134574966707e+03, 1.054590516936859e+03, 1.055045217343945e+03, 1.055498683731616e+03, 1.055950923572867e+03,
- 1.056401944270928e+03, 1.056851753160145e+03, 1.057300357506849e+03, 1.057747764510206e+03, 1.058193981303061e+03,
- 1.058639014952760e+03, 1.059082872461965e+03, 1.059525560769454e+03, 1.059967086750912e+03, 1.060407457219703e+03,
- 1.060846678927633e+03, 1.061284758565709e+03, 1.061721702764871e+03, 1.062157518096725e+03, 1.062592211074262e+03,
- 1.063025788152562e+03, 1.063458255729493e+03, 1.063889620146392e+03, 1.064319887688746e+03, 1.064749064586854e+03,
- 1.065177157016481e+03, 1.065604171099506e+03, 1.066030112904555e+03, 1.066454988447630e+03, 1.066878803692722e+03,
- 1.067301564552422e+03, 1.067723276888521e+03, 1.068143946512593e+03, 1.068563579186586e+03, 1.068982180623386e+03,
- 1.069399756487388e+03, 1.069816312395050e+03, 1.070231853915440e+03, 1.070646386570776e+03, 1.071059915836964e+03,
- 1.071472447144116e+03, 1.071883985877072e+03, 1.072294537375908e+03, 1.072704106936438e+03, 1.073112699810715e+03,
- 1.073520321207513e+03, 1.073926976292812e+03, 1.074332670190274e+03, 1.074737407981708e+03, 1.075141194707537e+03,
- 1.075544035367250e+03, 1.075945934919850e+03, 1.076346898284299e+03, 1.076746930339957e+03, 1.077146035927007e+03,
- 1.077544219846886e+03, 1.077941486862699e+03, 1.078337841699637e+03, 1.078733289045380e+03, 1.079127833550503e+03,
- 1.079521479828871e+03, 1.079914232458032e+03, 1.080306095979601e+03, 1.080697074899643e+03, 1.081087173689047e+03,
- 1.081476396783897e+03, 1.081864748585842e+03, 1.082252233462451e+03, 1.082638855747574e+03, 1.083024619741692e+03,
- 1.083409529712262e+03, 1.083793589894065e+03, 1.084176804489538e+03, 1.084559177669110e+03, 1.084940713571533e+03,
- 1.085321416304204e+03, 1.085701289943489e+03, 1.086080338535034e+03, 1.086458566094086e+03, 1.086835976605794e+03,
- 1.087212574025517e+03, 1.087588362279127e+03, 1.087963345263298e+03, 1.088337526845809e+03, 1.088710910865828e+03,
- 1.089083501134197e+03, 1.089455301433717e+03, 1.089826315519426e+03, 1.090196547118871e+03, 1.090565999932386e+03,
- 1.090934677633354e+03, 1.091302583868476e+03, 1.091669722258031e+03, 1.092036096396133e+03, 1.092401709850993e+03,
- 1.092766566165162e+03, 1.093130668855785e+03, 1.093494021414847e+03, 1.093856627309417e+03, 1.094218489981885e+03,
- 1.094579612850199e+03, 1.094939999308105e+03, 1.095299652725370e+03, 1.095658576448017e+03, 1.096016773798552e+03,
- 1.096374248076177e+03, 1.096731002557025e+03, 1.097087040494367e+03, 1.097442365118829e+03, 1.097796979638612e+03,
- 1.098150887239692e+03, 1.098504091086035e+03, 1.098856594319800e+03, 1.099208400061540e+03, 1.099559511410407e+03,
- 1.099909931444346e+03, 1.100259663220292e+03, 1.100608709774366e+03, 1.100957074122061e+03, 1.101304759258439e+03,
- 1.101651768158310e+03, 1.101998103776420e+03, 1.102343769047636e+03, 1.102688766887124e+03, 1.103033100190526e+03,
- 1.103376771834139e+03, 1.103719784675092e+03, 1.104062141551511e+03, 1.104403845282695e+03, 1.104744898669286e+03,
- 1.105085304493430e+03, 1.105425065518947e+03, 1.105764184491489e+03, 1.106102664138708e+03, 1.106440507170407e+03,
- 1.106777716278707e+03, 1.107114294138193e+03, 1.107450243406075e+03, 1.107785566722338e+03, 1.108120266709894e+03,
- 1.108454345974728e+03, 1.108787807106047e+03, 1.109120652676429e+03, 1.109452885241960e+03, 1.109784507342385e+03,
- 1.110115521501244e+03, 1.110445930226010e+03, 1.110775736008231e+03, 1.111104941323667e+03, 1.111433548632419e+03,
- 1.111761560379071e+03, 1.112088978992814e+03, 1.112415806887583e+03, 1.112742046462181e+03, 1.113067700100414e+03,
- 1.113392770171211e+03, 1.113717259028751e+03, 1.114041169012587e+03, 1.114364502447773e+03, 1.114687261644978e+03,
- 1.115009448900610e+03, 1.115331066496936e+03, 1.115652116702196e+03, 1.115972601770723e+03, 1.116292523943053e+03
- },
- {
- 1.729987798503735e+00, 5.277176644957937e+00, 8.892093498963909e+00, 1.257803517227251e+01, 1.633856135837603e+01,
- 2.017752373256750e+01, 2.409909924725054e+01, 2.810782838605187e+01, 3.220865929548985e+01, 3.640699893248600e+01,
- 4.070877262753024e+01, 4.512049380604636e+01, 4.964934605066946e+01, 5.430328026041363e+01, 5.909113041600263e+01,
- 6.402275246044820e+01, 6.910919214531842e+01, 7.436288951368294e+01, 7.979793019277135e+01, 8.543035715503558e+01,
- 9.127856153448559e+01, 9.736377816618179e+01, 1.037107218728110e+02, 1.103484159667842e+02, 1.173112879739240e+02,
- 1.246406443345001e+02, 1.323866948189132e+02, 1.406113948172294e+02, 1.493925412037841e+02, 1.588298554555800e+02,
- 1.690543470897725e+02, 1.802433578359926e+02, 1.926460376153335e+02, 2.066294323280396e+02, 2.227693243337327e+02,
- 2.420513223806203e+02, 2.663967261038890e+02, 3.004476502118789e+02, 3.612309549606103e+02, 5.162696131556235e+02,
- 5.921725351639860e+02, 6.260848581913968e+02, 6.483185367389125e+02, 6.650437401642084e+02, 6.785546980380566e+02,
- 6.899539398096650e+02, 6.998563350682621e+02, 7.086399265549450e+02, 7.165537811293974e+02, 7.237707183754324e+02,
- 7.304156081528985e+02, 7.365816694719249e+02, 7.423403946816956e+02, 7.477478699062126e+02, 7.528489529788644e+02,
- 7.576801233401310e+02, 7.622714792349831e+02, 7.666481706239285e+02, 7.708314487370909e+02, 7.748394491065400e+02,
- 7.786877854653192e+02, 7.823900069416261e+02, 7.859579547901691e+02, 7.894020441731222e+02, 7.927314892487836e+02,
- 7.959544848328245e+02, 7.990783544035663e+02, 8.021096717418175e+02, 8.050543617094013e+02, 8.079177843677430e+02,
- 8.107048056764739e+02, 8.134198572946201e+02, 8.160669874660477e+02, 8.186499045590722e+02, 8.211720145137850e+02,
- 8.236364532055111e+02, 8.260461145412792e+02, 8.284036749554347e+02, 8.307116148509739e+02, 8.329722374377254e+02,
- 8.351876853417804e+02, 8.373599552985770e+02, 8.394909111915425e+02, 8.415822956569857e+02, 8.436357404419522e+02,
- 8.456527756737316e+02, 8.476348381764261e+02, 8.495832789505403e+02, 8.514993699152963e+02, 8.533843099996720e+02,
- 8.552392306565937e+02, 8.570652008649099e+02, 8.588632316754167e+02, 8.606342803500913e+02, 8.623792541375768e+02,
- 8.640990137226939e+02, 8.657943763832820e+02, 8.674661188836877e+02, 8.691149801308950e+02, 8.707416636163031e+02,
- 8.723468396635835e+02, 8.739311475008485e+02, 8.754951971733232e+02, 8.770395713110673e+02, 8.785648267646992e+02,
- 8.800714961207979e+02, 8.815600891074301e+02, 8.830310938992222e+02, 8.844849783304775e+02, 8.859221910239813e+02,
- 8.873431624424367e+02, 8.887483058688059e+02, 8.901380183212249e+02, 8.915126814076832e+02, 8.928726621251351e+02,
- 8.942183136073414e+02, 8.955499758253191e+02, 8.968679762439594e+02, 8.981726304380697e+02, 8.994642426707915e+02,
- 9.007431064371407e+02, 9.020095049751377e+02, 9.032637117468370e+02, 9.045059908913431e+02, 9.057365976517779e+02,
- 9.069557787946167e+02, 9.081637730196155e+02, 9.093608112776520e+02, 9.105471162808049e+02, 9.117229053658149e+02,
- 9.128883877536636e+02, 9.140437665207562e+02, 9.151892385115142e+02, 9.163249944207338e+02, 9.174512197596982e+02,
- 9.185680939748288e+02, 9.196757914329157e+02, 9.207744814330799e+02, 9.218643284057571e+02, 9.229454921019188e+02,
- 9.240181277731066e+02, 9.250823863428059e+02, 9.261384145696577e+02, 9.271863552029715e+02, 9.282263471309723e+02,
- 9.292585255144724e+02, 9.302830219508370e+02, 9.312999645615596e+02, 9.323094781412798e+02, 9.333116842690903e+02,
- 9.343067014208377e+02, 9.352946450765091e+02, 9.362756278229543e+02, 9.372497594521883e+02, 9.382171470555043e+02,
- 9.391778951136087e+02, 9.401321055624318e+02, 9.410798779724076e+02, 9.420213094474316e+02, 9.429564948685339e+02,
- 9.438855268896654e+02, 9.448084960219194e+02, 9.457254907008424e+02, 9.466365973510838e+02, 9.475419004485043e+02,
- 9.484414825798843e+02, 9.493354245003172e+02, 9.502238051884161e+02, 9.511067018994206e+02, 9.519841902163067e+02,
- 9.528563440989864e+02, 9.537232359316856e+02, 9.545849365685738e+02, 9.554415153777362e+02, 9.562930403037972e+02,
- 9.571395778266740e+02, 9.579811931258456e+02, 9.588179500339024e+02, 9.596499110946406e+02, 9.604771375984412e+02,
- 9.612996896164336e+02, 9.621176260334804e+02, 9.629310045800337e+02, 9.637398818629138e+02, 9.645443133950563e+02,
- 9.653443536242587e+02, 9.661400559609735e+02, 9.669314728051951e+02, 9.677186555724530e+02, 9.685016547189689e+02,
- 9.692805197660039e+02, 9.700552993234161e+02, 9.708260411124787e+02, 9.715927919879688e+02, 9.723555979595656e+02,
- 9.731145042125839e+02, 9.738695551280575e+02, 9.746207943022090e+02, 9.753682645653272e+02, 9.761120080000634e+02,
- 9.768520659591791e+02, 9.775884790827620e+02, 9.783212873149287e+02, 9.790505299200282e+02, 9.797762454983759e+02,
- 9.804984720015181e+02, 9.812172467470630e+02, 9.819326064330751e+02, 9.826445871520592e+02, 9.833532244045465e+02,
- 9.840585531122922e+02, 9.847606076311060e+02, 9.854594217633158e+02, 9.861550287698922e+02, 9.868474613822298e+02,
- 9.875367518136103e+02, 9.882229317703485e+02, 9.889060324626345e+02, 9.895860846150863e+02, 9.902631184770133e+02,
- 9.909371638324116e+02, 9.916082500096861e+02, 9.922764058911229e+02, 9.929416599221087e+02, 9.936040401201109e+02,
- 9.942635740834181e+02, 9.949202885200956e+02, 9.955742111559719e+02, 9.962253679206392e+02, 9.968737848187271e+02,
- 9.975194874761673e+02, 9.981625011476799e+02, 9.988028507240801e+02, 9.994405607393959e+02, 1.000075655377819e+03,
- 1.000708158480468e+03, 1.001338093552008e+03, 1.001965483767091e+03, 1.002590351976648e+03, 1.003212720714026e+03,
- 1.003832612200987e+03, 1.004450048353548e+03, 1.005065050787696e+03, 1.005677640824963e+03, 1.006287839497871e+03,
- 1.006895667555242e+03, 1.007501145467402e+03, 1.008104293431246e+03, 1.008705131375198e+03, 1.009303678964049e+03,
- 1.009899955603696e+03, 1.010493980445760e+03, 1.011085772392110e+03, 1.011675350099280e+03, 1.012262731982790e+03,
- 1.012847936221368e+03, 1.013430980761083e+03, 1.014011883319378e+03, 1.014590661389030e+03, 1.015167332242000e+03,
- 1.015741912933229e+03, 1.016314420304323e+03, 1.016884870987178e+03, 1.017453281407520e+03, 1.018019667788370e+03,
- 1.018584046153435e+03, 1.019146432330428e+03, 1.019706841954321e+03, 1.020265290470521e+03, 1.020821793137992e+03,
- 1.021376365032301e+03, 1.021929021048609e+03, 1.022479775904595e+03, 1.023028644143322e+03, 1.023575640136048e+03,
- 1.024120778084973e+03, 1.024664072025936e+03, 1.025205535831053e+03, 1.025745183211310e+03, 1.026283027719094e+03,
- 1.026819082750682e+03, 1.027353361548673e+03, 1.027885877204382e+03, 1.028416642660178e+03, 1.028945670711780e+03,
- 1.029472974010509e+03, 1.029998565065496e+03, 1.030522456245841e+03, 1.031044659782745e+03, 1.031565187771585e+03,
- 1.032084052173961e+03, 1.032601264819699e+03, 1.033116837408813e+03, 1.033630781513440e+03, 1.034143108579730e+03,
- 1.034653829929702e+03, 1.035162956763068e+03, 1.035670500159023e+03, 1.036176471077996e+03, 1.036680880363383e+03,
- 1.037183738743229e+03, 1.037685056831894e+03, 1.038184845131685e+03, 1.038683114034453e+03, 1.039179873823169e+03,
- 1.039675134673468e+03, 1.040168906655163e+03, 1.040661199733738e+03, 1.041152023771807e+03, 1.041641388530554e+03,
- 1.042129303671145e+03, 1.042615778756112e+03, 1.043100823250718e+03, 1.043584446524297e+03, 1.044066657851565e+03,
- 1.044547466413917e+03, 1.045026881300698e+03, 1.045504911510448e+03, 1.045981565952133e+03, 1.046456853446347e+03,
- 1.046930782726503e+03, 1.047403362439996e+03, 1.047874601149348e+03, 1.048344507333339e+03, 1.048813089388111e+03,
- 1.049280355628256e+03, 1.049746314287894e+03, 1.050210973521722e+03, 1.050674341406049e+03, 1.051136425939817e+03,
- 1.051597235045605e+03, 1.052056776570611e+03, 1.052515058287626e+03, 1.052972087895985e+03, 1.053427873022508e+03,
- 1.053882421222423e+03, 1.054335739980272e+03, 1.054787836710811e+03, 1.055238718759883e+03, 1.055688393405289e+03,
- 1.056136867857640e+03, 1.056584149261193e+03, 1.057030244694678e+03, 1.057475161172111e+03, 1.057918905643591e+03,
- 1.058361484996094e+03, 1.058802906054240e+03, 1.059243175581061e+03, 1.059682300278753e+03, 1.060120286789413e+03,
- 1.060557141695768e+03, 1.060992871521894e+03, 1.061427482733920e+03, 1.061860981740727e+03, 1.062293374894628e+03,
- 1.062724668492051e+03, 1.063154868774192e+03, 1.063583981927680e+03, 1.064012014085218e+03, 1.064438971326218e+03,
- 1.064864859677425e+03, 1.065289685113539e+03, 1.065713453557817e+03, 1.066136170882673e+03, 1.066557842910270e+03,
- 1.066978475413099e+03, 1.067398074114552e+03, 1.067816644689485e+03, 1.068234192764777e+03, 1.068650723919877e+03,
- 1.069066243687342e+03, 1.069480757553372e+03, 1.069894270958335e+03, 1.070306789297283e+03, 1.070718317920461e+03,
- 1.071128862133811e+03, 1.071538427199471e+03, 1.071947018336256e+03, 1.072354640720148e+03, 1.072761299484763e+03,
- 1.073166999721826e+03, 1.073571746481630e+03, 1.073975544773492e+03, 1.074378399566200e+03, 1.074780315788459e+03,
- 1.075181298329326e+03, 1.075581352038644e+03, 1.075980481727458e+03, 1.076378692168447e+03, 1.076775988096327e+03,
- 1.077172374208261e+03, 1.077567855164267e+03, 1.077962435587609e+03, 1.078356120065188e+03, 1.078748913147930e+03,
- 1.079140819351172e+03, 1.079531843155028e+03, 1.079921989004767e+03, 1.080311261311179e+03, 1.080699664450932e+03,
- 1.081087202766931e+03, 1.081473880568672e+03, 1.081859702132583e+03, 1.082244671702374e+03, 1.082628793489369e+03,
- 1.083012071672843e+03, 1.083394510400350e+03, 1.083776113788047e+03, 1.084156885921022e+03, 1.084536830853599e+03,
- 1.084915952609658e+03, 1.085294255182946e+03, 1.085671742537374e+03, 1.086048418607325e+03, 1.086424287297948e+03,
- 1.086799352485451e+03, 1.087173618017390e+03, 1.087547087712958e+03, 1.087919765363263e+03, 1.088291654731611e+03,
- 1.088662759553780e+03, 1.089033083538289e+03, 1.089402630366668e+03, 1.089771403693729e+03, 1.090139407147816e+03,
- 1.090506644331076e+03, 1.090873118819706e+03, 1.091238834164209e+03, 1.091603793889640e+03, 1.091968001495859e+03,
- 1.092331460457767e+03, 1.092694174225547e+03, 1.093056146224907e+03, 1.093417379857309e+03, 1.093777878500203e+03,
- 1.094137645507253e+03, 1.094496684208567e+03, 1.094854997910918e+03, 1.095212589897967e+03, 1.095569463430474e+03,
- 1.095925621746526e+03, 1.096281068061738e+03, 1.096635805569468e+03, 1.096989837441028e+03, 1.097343166825883e+03,
- 1.097695796851861e+03, 1.098047730625347e+03, 1.098398971231488e+03, 1.098749521734382e+03, 1.099099385177278e+03,
- 1.099448564582765e+03, 1.099797062952959e+03, 1.100144883269694e+03, 1.100492028494705e+03, 1.100838501569811e+03,
- 1.101184305417096e+03, 1.101529442939087e+03, 1.101873917018932e+03, 1.102217730520571e+03, 1.102560886288916e+03,
- 1.102903387150015e+03, 1.103245235911220e+03, 1.103586435361361e+03, 1.103926988270905e+03, 1.104266897392118e+03,
- 1.104606165459235e+03, 1.104944795188609e+03, 1.105282789278875e+03, 1.105620150411105e+03, 1.105956881248958e+03,
- 1.106292984438842e+03, 1.106628462610054e+03, 1.106963318374937e+03, 1.107297554329023e+03, 1.107631173051182e+03,
- 1.107964177103764e+03, 1.108296569032744e+03, 1.108628351367862e+03, 1.108959526622761e+03, 1.109290097295127e+03,
- 1.109620065866830e+03, 1.109949434804048e+03, 1.110278206557414e+03, 1.110606383562136e+03, 1.110933968238138e+03,
- 1.111260962990184e+03, 1.111587370208006e+03, 1.111913192266436e+03, 1.112238431525521e+03, 1.112563090330661e+03,
- 1.112887171012720e+03, 1.113210675888151e+03, 1.113533607259121e+03, 1.113855967413623e+03, 1.114177758625597e+03
- },
- {
- 1.724177607221449e+00, 5.258905831275927e+00, 8.860337663142060e+00, 1.253167292680827e+01, 1.627636253917708e+01,
- 2.009813580834798e+01, 2.400103159110743e+01, 2.798943399785579e+01, 3.206811346932145e+01, 3.624227424270572e+01,
- 4.051760945287175e+01, 4.490036541196314e+01, 4.939741699090426e+01, 5.401635651821972e+01, 5.876559925383609e+01,
- 6.365450934186509e+01, 6.869355127308582e+01, 7.389447340430785e+01, 7.927053214699430e+01, 8.483676828602360e+01,
- 9.061035087293615e+01, 9.661100979294302e+01, 1.028615862655192e+02, 1.093887425288526e+02, 1.162238899299942e+02,
- 1.234044221798127e+02, 1.309753837965445e+02, 1.389917734912682e+02, 1.475217988763447e+02, 1.566515994762434e+02,
- 1.664923173697331e+02, 1.771910790955370e+02, 1.889488241183972e+02, 2.020508626887966e+02, 2.169229498084117e+02,
- 2.342436868767631e+02, 2.551982372448252e+02, 2.821549324703853e+02, 3.209675047633074e+02, 3.919221786670004e+02,
- 5.184272067239912e+02, 5.836658560802897e+02, 6.173091909882341e+02, 6.399735114456919e+02, 6.571550568790155e+02,
- 6.710666529292480e+02, 6.828081805101423e+02, 6.930035376700025e+02, 7.020401216729900e+02, 7.101747576190517e+02,
- 7.175863713563465e+02, 7.244045807229529e+02, 7.307263013153953e+02, 7.366259224560539e+02, 7.421618206241862e+02,
- 7.473806820419481e+02, 7.523204603713392e+02, 7.570124543686647e+02, 7.614828011413581e+02, 7.657535712626618e+02,
- 7.698435864576226e+02, 7.737690400660512e+02, 7.775439747617047e+02, 7.811806552692163e+02, 7.846898626938856e+02,
- 7.880811295383260e+02, 7.913629292786241e+02, 7.945428307271575e+02, 7.976276248166075e+02, 8.006234295707101e+02,
- 8.035357776630965e+02, 8.063696899581158e+02, 8.091297376755082e+02, 8.118200952535929e+02, 8.144445855538760e+02,
- 8.170067187182026e+02, 8.195097257326148e+02, 8.219565875513210e+02, 8.243500604762708e+02, 8.266926983625890e+02,
- 8.289868721202847e+02, 8.312347869023604e+02, 8.334384973046190e+02, 8.355999208497817e+02, 8.377208499853966e+02,
- 8.398029627896574e+02, 8.418478325499909e+02, 8.438569363549906e+02, 8.458316628200873e+02, 8.477733190503367e+02,
- 8.496831369295379e+02, 8.515622788128086e+02, 8.534118426895717e+02, 8.552328668752580e+02, 8.570263342825923e+02,
- 8.587931763170346e+02, 8.605342764354701e+02, 8.622504734025682e+02, 8.639425642751854e+02, 8.656113071416445e+02,
- 8.672574236396879e+02, 8.688816012742527e+02, 8.704844955538578e+02, 8.720667319623858e+02, 8.736289077812486e+02,
- 8.751715937753507e+02, 8.766953357548773e+02, 8.782006560237181e+02, 8.796880547242600e+02, 8.811580110872936e+02,
- 8.826109845949660e+02, 8.840474160639189e+02, 8.854677286550893e+02, 8.868723288160541e+02, 8.882616071612294e+02,
- 8.896359392947901e+02, 8.909956865807030e+02, 8.923411968639108e+02, 8.936728051463143e+02, 8.949908342209253e+02,
- 8.962955952672421e+02, 8.975873884106571e+02, 8.988665032484708e+02, 9.001332193448752e+02, 9.013878066970701e+02,
- 9.026305261771399e+02, 9.038616299823610e+02, 9.050813620151689e+02, 9.062899582222592e+02, 9.074876458097262e+02,
- 9.086746472148859e+02, 9.098511759256014e+02, 9.110174393107435e+02, 9.121736381670224e+02, 9.133199677407387e+02,
- 9.144566168112475e+02, 9.155837687319673e+02, 9.167016014496818e+02, 9.178102877196520e+02, 9.189099953100404e+02,
- 9.200008871962954e+02, 9.210831217460756e+02, 9.221568528952577e+02, 9.232222303155525e+02, 9.242793995741872e+02,
- 9.253285022861224e+02, 9.263696762591992e+02, 9.274030556326250e+02, 9.284287709964906e+02, 9.294469495660329e+02,
- 9.304577152336431e+02, 9.314611887276992e+02, 9.324574877123223e+02, 9.334467268927605e+02, 9.344290181162299e+02,
- 9.354044704485505e+02, 9.363731903477366e+02, 9.373352816414369e+02, 9.382908456426690e+02, 9.392399812922021e+02,
- 9.401827851800224e+02, 9.411193516347457e+02, 9.420497727954605e+02, 9.429741386807171e+02, 9.438925372547682e+02,
- 9.448050544912268e+02, 9.457117744342272e+02, 9.466127792572285e+02, 9.475081493195665e+02, 9.483979632208486e+02,
- 9.492822978730152e+02, 9.501612284707600e+02, 9.510348286617098e+02, 9.519031705108405e+02, 9.527663245663803e+02,
- 9.536243599031882e+02, 9.544773441645783e+02, 9.553253436026272e+02, 9.561684231170760e+02, 9.570066462928437e+02,
- 9.578400754362324e+02, 9.586687716098837e+02, 9.594927946665150e+02, 9.603122032815165e+02, 9.611270549844294e+02,
- 9.619374061893682e+02, 9.627433122244217e+02, 9.635448273600771e+02, 9.643420048367042e+02, 9.651348968911395e+02,
- 9.659235547823995e+02, 9.667080288165719e+02, 9.674883683708958e+02, 9.682646219170832e+02, 9.690368370438912e+02,
- 9.698050604789933e+02, 9.705693381101605e+02, 9.713297150057866e+02, 9.720862354347767e+02, 9.728389428858333e+02,
- 9.735878800861434e+02, 9.743330890195092e+02, 9.750746109439337e+02, 9.758124864086719e+02, 9.765467552707837e+02,
- 9.772774567111965e+02, 9.780046292502950e+02, 9.787283107630587e+02, 9.794485384937562e+02, 9.801653490702272e+02,
- 9.808787785177429e+02, 9.815888622724799e+02, 9.822956351946131e+02, 9.829991315810388e+02, 9.836993851777419e+02,
- 9.843964291918219e+02, 9.850902963031853e+02, 9.857810186759200e+02, 9.864686279693533e+02, 9.871531553488197e+02,
- 9.878346314961286e+02, 9.885130866197565e+02, 9.891885504647679e+02, 9.898610523224714e+02, 9.905306210398235e+02,
- 9.911972850285814e+02, 9.918610717986995e+02, 9.925220098504748e+02, 9.931801258853162e+02, 9.938354466610925e+02,
- 9.944879985428198e+02, 9.951378075104983e+02, 9.957848991667454e+02, 9.964292987442375e+02, 9.970710311129698e+02,
- 9.977101207873319e+02, 9.983465919330096e+02, 9.989804683737216e+02, 9.996117735977843e+02, 1.000240530764525e+03,
- 1.000866762710533e+03, 1.001490491955765e+03, 1.002111740709504e+03, 1.002730530876176e+03, 1.003346884061024e+03,
- 1.003960821575660e+03, 1.004572364443475e+03, 1.005181533404929e+03, 1.005788348922717e+03, 1.006392831186818e+03,
- 1.006995000119420e+03, 1.007594875379746e+03, 1.008192476368753e+03, 1.008787822233744e+03, 1.009380931872860e+03,
- 1.009971823939477e+03, 1.010560516846510e+03, 1.011147028770611e+03, 1.011731377656284e+03, 1.012313581219905e+03,
- 1.012893656953653e+03, 1.013471622129358e+03, 1.014047493802263e+03, 1.014621288814708e+03, 1.015193023799732e+03,
- 1.015762715184597e+03, 1.016330379194244e+03, 1.016896031854665e+03, 1.017459688996213e+03, 1.018021366256837e+03,
- 1.018581079085253e+03, 1.019138842744046e+03, 1.019694672312710e+03, 1.020248582690624e+03, 1.020800588599966e+03,
- 1.021350704588570e+03, 1.021898945032725e+03, 1.022445324139910e+03, 1.022989855951485e+03, 1.023532554345321e+03,
- 1.024073433038378e+03, 1.024612505589231e+03, 1.025149785400549e+03, 1.025685285721524e+03, 1.026219019650251e+03,
- 1.026751000136059e+03, 1.027281239981802e+03, 1.027809751846104e+03, 1.028336548245557e+03, 1.028861641556877e+03,
- 1.029385044019027e+03, 1.029906767735287e+03, 1.030426824675294e+03, 1.030945226677040e+03, 1.031461985448828e+03,
- 1.031977112571203e+03, 1.032490619498831e+03, 1.033002517562357e+03, 1.033512817970222e+03, 1.034021531810445e+03,
- 1.034528670052375e+03, 1.035034243548411e+03, 1.035538263035687e+03, 1.036040739137734e+03, 1.036541682366103e+03,
- 1.037041103121961e+03, 1.037539011697663e+03, 1.038035418278290e+03, 1.038530332943166e+03, 1.039023765667337e+03,
- 1.039515726323036e+03, 1.040006224681118e+03, 1.040495270412463e+03, 1.040982873089366e+03, 1.041469042186889e+03,
- 1.041953787084207e+03, 1.042437117065912e+03, 1.042919041323309e+03, 1.043399568955680e+03, 1.043878708971534e+03,
- 1.044356470289827e+03, 1.044832861741173e+03, 1.045307892069019e+03, 1.045781569930818e+03, 1.046253903899164e+03,
- 1.046724902462922e+03, 1.047194574028337e+03, 1.047662926920110e+03, 1.048129969382483e+03, 1.048595709580277e+03,
- 1.049060155599936e+03, 1.049523315450537e+03, 1.049985197064798e+03, 1.050445808300057e+03, 1.050905156939244e+03,
- 1.051363250691829e+03, 1.051820097194765e+03, 1.052275704013408e+03, 1.052730078642422e+03, 1.053183228506675e+03,
- 1.053635160962118e+03, 1.054085883296646e+03, 1.054535402730954e+03, 1.054983726419372e+03, 1.055430861450688e+03,
- 1.055876814848962e+03, 1.056321593574326e+03, 1.056765204523766e+03, 1.057207654531901e+03, 1.057648950371741e+03,
- 1.058089098755441e+03, 1.058528106335040e+03, 1.058965979703185e+03, 1.059402725393850e+03, 1.059838349883043e+03,
- 1.060272859589498e+03, 1.060706260875362e+03, 1.061138560046870e+03, 1.061569763355000e+03, 1.061999876996143e+03,
- 1.062428907112733e+03, 1.062856859793888e+03, 1.063283741076036e+03, 1.063709556943528e+03, 1.064134313329248e+03,
- 1.064558016115208e+03, 1.064980671133139e+03, 1.065402284165072e+03, 1.065822860943910e+03, 1.066242407153991e+03,
- 1.066660928431646e+03, 1.067078430365742e+03, 1.067494918498227e+03, 1.067910398324660e+03, 1.068324875294737e+03,
- 1.068738354812805e+03, 1.069150842238371e+03, 1.069562342886613e+03, 1.069972862028864e+03, 1.070382404893107e+03,
- 1.070790976664457e+03, 1.071198582485631e+03, 1.071605227457420e+03, 1.072010916639152e+03, 1.072415655049142e+03,
- 1.072819447665145e+03, 1.073222299424799e+03, 1.073624215226058e+03, 1.074025199927627e+03, 1.074425258349384e+03,
- 1.074824395272798e+03, 1.075222615441349e+03, 1.075619923560924e+03, 1.076016324300231e+03, 1.076411822291189e+03,
- 1.076806422129322e+03, 1.077200128374141e+03, 1.077592945549533e+03, 1.077984878144128e+03, 1.078375930611676e+03,
- 1.078766107371411e+03, 1.079155412808413e+03, 1.079543851273960e+03, 1.079931427085887e+03, 1.080318144528930e+03,
- 1.080704007855064e+03, 1.081089021283850e+03, 1.081473189002759e+03, 1.081856515167509e+03, 1.082239003902387e+03,
- 1.082620659300570e+03, 1.083001485424443e+03, 1.083381486305908e+03, 1.083760665946698e+03, 1.084139028318678e+03,
- 1.084516577364148e+03, 1.084893316996139e+03, 1.085269251098705e+03, 1.085644383527218e+03, 1.086018718108645e+03,
- 1.086392258641840e+03, 1.086765008897817e+03, 1.087136972620025e+03, 1.087508153524625e+03, 1.087878555300752e+03,
- 1.088248181610785e+03, 1.088617036090608e+03, 1.088985122349867e+03, 1.089352443972228e+03, 1.089719004515626e+03,
- 1.090084807512518e+03, 1.090449856470128e+03, 1.090814154870689e+03, 1.091177706171684e+03, 1.091540513806086e+03,
- 1.091902581182585e+03, 1.092263911685830e+03, 1.092624508676652e+03, 1.092984375492289e+03, 1.093343515446612e+03,
- 1.093701931830346e+03, 1.094059627911288e+03, 1.094416606934521e+03, 1.094772872122629e+03, 1.095128426675905e+03,
- 1.095483273772561e+03, 1.095837416568937e+03, 1.096190858199694e+03, 1.096543601778027e+03, 1.096895650395853e+03,
- 1.097247007124016e+03, 1.097597675012475e+03, 1.097947657090496e+03, 1.098296956366845e+03, 1.098645575829973e+03,
- 1.098993518448198e+03, 1.099340787169895e+03, 1.099687384923671e+03, 1.100033314618545e+03, 1.100378579144127e+03,
- 1.100723181370791e+03, 1.101067124149846e+03, 1.101410410313713e+03, 1.101753042676085e+03, 1.102095024032103e+03,
- 1.102436357158513e+03, 1.102777044813835e+03, 1.103117089738523e+03, 1.103456494655122e+03, 1.103795262268432e+03,
- 1.104133395265655e+03, 1.104470896316559e+03, 1.104807768073623e+03, 1.105144013172193e+03, 1.105479634230630e+03,
- 1.105814633850455e+03, 1.106149014616499e+03, 1.106482779097044e+03, 1.106815929843972e+03, 1.107148469392896e+03,
- 1.107480400263312e+03, 1.107811724958724e+03, 1.108142445966796e+03, 1.108472565759473e+03, 1.108802086793123e+03,
- 1.109131011508671e+03, 1.109459342331721e+03, 1.109787081672695e+03, 1.110114231926957e+03, 1.110440795474940e+03,
- 1.110766774682273e+03, 1.111092171899902e+03, 1.111416989464216e+03, 1.111741229697170e+03, 1.112064894906400e+03
- },
- {
- 1.718406923114809e+00, 5.240767033159015e+00, 8.828825471983114e+00, 1.248568818150631e+01, 1.621470096447989e+01,
- 2.001947509547979e+01, 2.390391648225298e+01, 2.787225899779568e+01, 3.192910272285310e+01, 3.607945800876551e+01,
- 4.032879646932415e+01, 4.468311026904425e+01, 4.914898140355030e+01, 5.373366309017691e+01, 5.844517593474124e+01,
- 6.329242225740104e+01, 6.828532290783726e+01, 7.343498216466951e+01, 7.875388802112305e+01, 8.425615749093714e+01,
- 8.995783979536608e+01, 9.587729482010461e+01, 1.020356706820475e+02, 1.084575135907632e+02, 1.151715569759070e+02,
- 1.222117576042095e+02, 1.296186783544368e+02, 1.374413677639701e+02, 1.457399681374091e+02, 1.545894215994743e+02,
- 1.640848812172308e+02, 1.743498671237687e+02, 1.855490304211856e+02, 1.979090495992078e+02, 2.117547819581072e+02,
- 2.275762716213535e+02, 2.461644006818375e+02, 2.689190114261615e+02, 2.986624001146608e+02, 3.421980287380287e+02,
- 4.186777734027267e+02, 5.192134842987455e+02, 5.763565617925024e+02, 6.092222884746629e+02, 6.320492607895654e+02,
- 6.495505020552895e+02, 6.637857442096046e+02, 6.758224351786511e+02, 6.862800495921764e+02, 6.955485847092559e+02,
- 7.038889461518424e+02, 7.114840431826537e+02, 7.184669616425634e+02, 7.249375146936663e+02, 7.309724749288646e+02,
- 7.366321700669014e+02, 7.419648852427513e+02, 7.470098893016935e+02, 7.517995686737640e+02, 7.563609656772105e+02,
- 7.607169093561110e+02, 7.648868613858691e+02, 7.688875588242120e+02, 7.727335094695972e+02, 7.764373785863763e+02,
- 7.800102944077117e+02, 7.834620921082176e+02, 7.868015105972935e+02, 7.900363527304963e+02, 7.931736168602163e+02,
- 7.962196057139950e+02, 7.991800171753340e+02, 8.020600204966447e+02, 8.048643206927186e+02, 8.075972132734560e+02,
- 8.102626310252716e+02, 8.128641842053075e+02, 8.154051952449413e+02, 8.178887288500393e+02, 8.203176182208819e+02,
- 8.226944879843317e+02, 8.250217743267884e+02, 8.273017427329352e+02, 8.295365036678136e+02, 8.317280264849423e+02,
- 8.338781517983768e+02, 8.359886025198126e+02, 8.380609937314889e+02, 8.400968415403897e+02, 8.420975710383215e+02,
- 8.440645234747960e+02, 8.459989627349313e+02, 8.479020812021121e+02, 8.497750050745487e+02, 8.516187991959774e+02,
- 8.534344714530104e+02, 8.552229767851366e+02, 8.569852208477251e+02, 8.587220633635452e+02, 8.604343211941149e+02,
- 8.621227711585591e+02, 8.637881526245330e+02, 8.654311698929700e+02, 8.670524943960550e+02, 8.686527667257141e+02,
- 8.702325985080503e+02, 8.717925741375593e+02, 8.733332523835138e+02, 8.748551678796484e+02, 8.763588325071744e+02,
- 8.778447366801300e+02, 8.793133505412345e+02, 8.807651250755957e+02, 8.822004931489518e+02, 8.836198704764809e+02,
- 8.850236565276763e+02, 8.864122353722657e+02, 8.877859764717284e+02, 8.891452354205337e+02, 8.904903546408869e+02,
- 8.918216640344341e+02, 8.931394815940719e+02, 8.944441139787563e+02, 8.957358570539652e+02, 8.970149964002333e+02,
- 8.982818077920128e+02, 8.995365576649733e+02, 9.007795035712406e+02, 9.020108945408000e+02, 9.032309706500641e+02,
- 9.044399658630562e+02, 9.056381053993970e+02, 9.068256076974752e+02, 9.080026841753119e+02, 9.091695403057676e+02,
- 9.103263746719786e+02, 9.114733800615838e+02, 9.126107434956288e+02, 9.137386464609658e+02, 9.148572651309939e+02,
- 9.159667705754155e+02, 9.170673289596691e+02, 9.181591017346472e+02, 9.192422458172404e+02, 9.203169137622697e+02,
- 9.213832539262610e+02, 9.224414106235482e+02, 9.234915242751167e+02, 9.245337315505997e+02, 9.255681655037984e+02,
- 9.265949557020715e+02, 9.276142283499431e+02, 9.286261063839487e+02, 9.296307096745774e+02, 9.306281549870963e+02,
- 9.316185562451434e+02, 9.326020244899806e+02, 9.335786680702919e+02, 9.345485926571274e+02, 9.355119014153091e+02,
- 9.364686950289400e+02, 9.374190717961898e+02, 9.383631277059671e+02, 9.393009565114967e+02, 9.402326498009472e+02,
- 9.411582970652634e+02, 9.420779857825684e+02, 9.429918014026908e+02, 9.438998275262078e+02, 9.448021458818893e+02,
- 9.456988364027837e+02, 9.465899772797897e+02, 9.474756450132043e+02, 9.483559144623600e+02, 9.492308588934238e+02,
- 9.501005500254456e+02, 9.509650580747282e+02, 9.518244517975965e+02, 9.526787985316355e+02, 9.535281642354561e+02,
- 9.543726135270612e+02, 9.552122097208660e+02, 9.560470148634237e+02, 9.568770897679279e+02, 9.577024940475225e+02,
- 9.585232861474816e+02, 9.593395233762975e+02, 9.601512619357308e+02, 9.609585569498543e+02, 9.617614624931321e+02,
- 9.625600316175868e+02, 9.633543163790670e+02, 9.641443678626716e+02, 9.649302362073503e+02, 9.657119706297218e+02,
- 9.664896194471281e+02, 9.672632300999705e+02, 9.680328491733388e+02, 9.687985224179652e+02, 9.695602947705386e+02,
- 9.703182103733859e+02, 9.710723125935554e+02, 9.718226440413216e+02, 9.725692465881324e+02, 9.733121613840173e+02,
- 9.740514288744760e+02, 9.747870888168753e+02, 9.755191802963519e+02, 9.762477417412591e+02, 9.769728109381642e+02,
- 9.776944250464115e+02, 9.784126206122677e+02, 9.791274335826631e+02, 9.798388993185488e+02, 9.805470526078697e+02,
- 9.812519276781815e+02, 9.819535582089133e+02, 9.826519773432908e+02, 9.833472176999337e+02, 9.840393113841307e+02,
- 9.847282899988186e+02, 9.854141846552534e+02, 9.860970259834019e+02, 9.867768441420511e+02, 9.874536688286535e+02,
- 9.881275292889098e+02, 9.887984538549454e+02, 9.894664718203564e+02, 9.901316106776505e+02, 9.907938979564340e+02,
- 9.914533607788575e+02, 9.921100258678019e+02, 9.927639195548612e+02, 9.934150677881162e+02, 9.940634961397175e+02,
- 9.947092298132806e+02, 9.953522936510910e+02, 9.959927121411376e+02, 9.966305094239693e+02, 9.972657092993850e+02,
- 9.978983352329592e+02, 9.985284103624138e+02, 9.991559575038298e+02, 9.997809991577180e+02, 1.000403557514937e+03,
- 1.001023654462475e+03, 1.001641311589099e+03, 1.002256550190862e+03, 1.002869391276488e+03, 1.003479855572632e+03,
- 1.004087963529015e+03, 1.004693735323443e+03, 1.005297190866709e+03, 1.005898349807391e+03, 1.006497231536523e+03,
- 1.007093855192186e+03, 1.007688239663971e+03, 1.008280403597362e+03, 1.008870365398008e+03, 1.009458143235906e+03,
- 1.010043755049494e+03, 1.010627218549649e+03, 1.011208551223598e+03, 1.011787770338753e+03, 1.012364892946449e+03,
- 1.012939935885614e+03, 1.013512915786350e+03, 1.014083849073446e+03, 1.014652751969814e+03, 1.015219640499848e+03,
- 1.015784530492720e+03, 1.016347437585596e+03, 1.016908377226798e+03, 1.017467364678891e+03, 1.018024415021711e+03,
- 1.018579543155325e+03, 1.019132763802938e+03, 1.019684091513733e+03, 1.020233540665662e+03, 1.020781125468173e+03,
- 1.021326859964880e+03, 1.021870758036196e+03, 1.022412833401887e+03, 1.022953099623602e+03, 1.023491570107335e+03,
- 1.024028258105845e+03, 1.024563176721026e+03, 1.025096338906237e+03, 1.025627757468580e+03, 1.026157445071130e+03,
- 1.026685414235138e+03, 1.027211677342175e+03, 1.027736246636241e+03, 1.028259134225837e+03, 1.028780352085995e+03,
- 1.029299912060266e+03, 1.029817825862676e+03, 1.030334105079645e+03, 1.030848761171865e+03, 1.031361805476149e+03,
- 1.031873249207243e+03, 1.032383103459600e+03, 1.032891379209134e+03, 1.033398087314928e+03, 1.033903238520918e+03,
- 1.034406843457547e+03, 1.034908912643384e+03, 1.035409456486719e+03, 1.035908485287129e+03, 1.036406009237007e+03,
- 1.036902038423081e+03, 1.037396582827888e+03, 1.037889652331234e+03, 1.038381256711622e+03, 1.038871405647659e+03,
- 1.039360108719433e+03, 1.039847375409873e+03, 1.040333215106082e+03, 1.040817637100642e+03, 1.041300650592905e+03,
- 1.041782264690258e+03, 1.042262488409365e+03, 1.042741330677388e+03, 1.043218800333192e+03, 1.043694906128524e+03,
- 1.044169656729171e+03, 1.044643060716108e+03, 1.045115126586613e+03, 1.045585862755378e+03, 1.046055277555589e+03,
- 1.046523379239995e+03, 1.046990175981959e+03, 1.047455675876487e+03, 1.047919886941249e+03, 1.048382817117571e+03,
- 1.048844474271423e+03, 1.049304866194383e+03, 1.049764000604589e+03, 1.050221885147674e+03, 1.050678527397687e+03,
- 1.051133934858000e+03, 1.051588114962196e+03, 1.052041075074950e+03, 1.052492822492892e+03, 1.052943364445452e+03,
- 1.053392708095702e+03, 1.053840860541176e+03, 1.054287828814685e+03, 1.054733619885104e+03, 1.055178240658170e+03,
- 1.055621697977247e+03, 1.056063998624089e+03, 1.056505149319591e+03, 1.056945156724525e+03, 1.057384027440269e+03,
- 1.057821768009519e+03, 1.058258384916997e+03, 1.058693884590144e+03, 1.059128273399803e+03, 1.059561557660893e+03,
- 1.059993743633072e+03, 1.060424837521390e+03, 1.060854845476932e+03, 1.061283773597456e+03, 1.061711627928011e+03,
- 1.062138414461555e+03, 1.062564139139566e+03, 1.062988807852633e+03, 1.063412426441046e+03, 1.063835000695380e+03,
- 1.064256536357061e+03, 1.064677039118935e+03, 1.065096514625817e+03, 1.065514968475047e+03, 1.065932406217018e+03,
- 1.066348833355717e+03, 1.066764255349247e+03, 1.067178677610339e+03, 1.067592105506868e+03, 1.068004544362348e+03,
- 1.068415999456435e+03, 1.068826476025407e+03, 1.069235979262650e+03, 1.069644514319134e+03, 1.070052086303874e+03,
- 1.070458700284398e+03, 1.070864361287199e+03, 1.071269074298184e+03, 1.071672844263116e+03, 1.072075676088054e+03,
- 1.072477574639776e+03, 1.072878544746210e+03, 1.073278591196852e+03, 1.073677718743174e+03, 1.074075932099041e+03,
- 1.074473235941101e+03, 1.074869634909194e+03, 1.075265133606730e+03, 1.075659736601088e+03, 1.076053448423987e+03,
- 1.076446273571869e+03, 1.076838216506263e+03, 1.077229281654156e+03, 1.077619473408353e+03, 1.078008796127830e+03,
- 1.078397254138092e+03, 1.078784851731512e+03, 1.079171593167680e+03, 1.079557482673740e+03, 1.079942524444719e+03,
- 1.080326722643862e+03, 1.080710081402954e+03, 1.081092604822640e+03, 1.081474296972747e+03, 1.081855161892588e+03,
- 1.082235203591280e+03, 1.082614426048041e+03, 1.082992833212498e+03, 1.083370429004975e+03, 1.083747217316796e+03,
- 1.084123202010569e+03, 1.084498386920473e+03, 1.084872775852538e+03, 1.085246372584932e+03, 1.085619180868226e+03,
- 1.085991204425672e+03, 1.086362446953471e+03, 1.086732912121036e+03, 1.087102603571256e+03, 1.087471524920756e+03,
- 1.087839679760148e+03, 1.088207071654287e+03, 1.088573704142520e+03, 1.088939580738932e+03, 1.089304704932588e+03,
- 1.089669080187775e+03, 1.090032709944240e+03, 1.090395597617421e+03, 1.090757746598684e+03, 1.091119160255546e+03,
- 1.091479841931908e+03, 1.091839794948272e+03, 1.092199022601967e+03, 1.092557528167362e+03, 1.092915314896089e+03,
- 1.093272386017248e+03, 1.093628744737624e+03, 1.093984394241891e+03, 1.094339337692820e+03, 1.094693578231480e+03,
- 1.095047118977443e+03, 1.095399963028976e+03, 1.095752113463244e+03, 1.096103573336501e+03, 1.096454345684280e+03,
- 1.096804433521585e+03, 1.097153839843079e+03, 1.097502567623266e+03, 1.097850619816676e+03, 1.098197999358044e+03,
- 1.098544709162495e+03, 1.098890752125713e+03, 1.099236131124120e+03, 1.099580849015048e+03, 1.099924908636910e+03,
- 1.100268312809370e+03, 1.100611064333508e+03, 1.100953165991986e+03, 1.101294620549213e+03, 1.101635430751504e+03,
- 1.101975599327242e+03, 1.102315128987034e+03, 1.102654022423869e+03, 1.102992282313270e+03, 1.103329911313450e+03,
- 1.103666912065460e+03, 1.104003287193341e+03, 1.104339039304270e+03, 1.104674170988708e+03, 1.105008684820542e+03,
- 1.105342583357230e+03, 1.105675869139941e+03, 1.106008544693698e+03, 1.106340612527513e+03, 1.106672075134523e+03,
- 1.107002934992131e+03, 1.107333194562136e+03, 1.107662856290864e+03, 1.107991922609303e+03, 1.108320395933230e+03,
- 1.108648278663341e+03, 1.108975573185377e+03, 1.109302281870251e+03, 1.109628407074169e+03, 1.109953951138758e+03
- },
- {
- 1.712675335538445e+00, 5.222758735786230e+00, 8.797553863589767e+00, 1.244007577233650e+01, 1.615356867249690e+01,
- 1.994152996215746e+01, 2.380773752396502e+01, 2.775628084773391e+01, 3.179159664242141e+01, 3.591850975123064e+01,
- 4.014228035674451e+01, 4.446865868794910e+01, 4.890394872458076e+01, 5.345508275705683e+01, 5.812970912782430e+01,
- 6.293629608771477e+01, 6.788425549805939e+01, 7.298409116511574e+01, 7.824757800632342e+01, 8.368798016009754e+01,
- 8.932031876998963e+01, 9.516170380836566e+01, 1.012317494193090e+02, 1.075530995693270e+02, 1.141521014154579e+02,
- 1.210596795208874e+02, 1.283124877935041e+02, 1.359544527275868e+02, 1.440388795114474e+02, 1.526313876065373e+02,
- 1.618141012194774e+02, 1.716917986133276e+02, 1.824012299994901e+02, 1.941257808817179e+02, 2.071196142014119e+02,
- 2.217496577111946e+02, 2.385737133999050e+02, 2.584983711241987e+02, 2.831320115323077e+02, 3.156613539521880e+02,
- 3.630997947696408e+02, 4.387201470067590e+02, 5.193997927095683e+02, 5.700674942917902e+02, 6.018293272836941e+02,
- 6.245805890730010e+02, 6.422636824229876e+02, 6.567401056986423e+02, 6.690196329287630e+02, 6.797045608102532e+02,
- 6.891806976958900e+02, 6.977091813482980e+02, 7.054746088152863e+02, 7.126121099819999e+02, 7.192234846177296e+02,
- 7.253872905920645e+02, 7.311654052676587e+02, 7.366074372433183e+02, 7.417537777641725e+02, 7.466377633090615e+02,
- 7.512872412110819e+02, 7.557257246007633e+02, 7.599732588038790e+02, 7.640470811684424e+02, 7.679621304996114e+02,
- 7.717314453258698e+02, 7.753664788443277e+02, 7.788773506194008e+02, 7.822730497076756e+02, 7.855616000714081e+02,
- 7.887501964175663e+02, 7.918453166247580e+02, 7.948528154727840e+02, 7.977780033167251e+02, 8.006257125439880e+02,
- 8.034003540453530e+02, 8.061059654676167e+02, 8.087462526588188e+02, 8.113246254404582e+02, 8.138442286248874e+02,
- 8.163079690258187e+02, 8.187185390749378e+02, 8.210784375499093e+02, 8.233899878325590e+02, 8.256553540461488e+02,
- 8.278765553638865e+02, 8.300554787344498e+02, 8.321938902321788e+02, 8.342934452082037e+02, 8.363556973926898e+02,
- 8.383821070766481e+02, 8.403740484836482e+02, 8.423328164264431e+02, 8.442596323306939e+02, 8.461556496970516e+02,
- 8.480219590635993e+02, 8.498595925227540e+02, 8.516695278399659e+02, 8.534526922157512e+02, 8.552099657275926e+02,
- 8.569421844839227e+02, 8.586501435186699e+02, 8.603345994515994e+02, 8.619962729368405e+02, 8.636358509195394e+02,
- 8.652539887184092e+02, 8.668513119500343e+02, 8.684284183091568e+02, 8.699858792176612e+02, 8.715242413537122e+02,
- 8.730440280713271e+02, 8.745457407196646e+02, 8.760298598703952e+02, 8.774968464607156e+02, 8.789471428588715e+02,
- 8.803811738583802e+02, 8.817993476066031e+02, 8.832020564727824e+02, 8.845896778602109e+02, 8.859625749667878e+02,
- 8.873210974978335e+02, 8.886655823347053e+02, 8.899963541624625e+02, 8.913137260595406e+02, 8.926180000521576e+02,
- 8.939094676359464e+02, 8.951884102700761e+02, 8.964550998760453e+02, 8.977097992609447e+02, 8.989527625011211e+02,
- 9.001842341993906e+02, 9.014044534939202e+02, 9.026136499068726e+02, 9.038120460155968e+02, 9.049998580281922e+02,
- 9.061772948189647e+02, 9.073445590728072e+02, 9.085018473261725e+02, 9.096493502180132e+02, 9.107872527279699e+02,
- 9.119157344025870e+02, 9.130349695702655e+02, 9.141451275456224e+02, 9.152463728238687e+02, 9.163388652657990e+02,
- 9.174227602739202e+02, 9.184982089602306e+02, 9.195653583061151e+02, 9.206243513148017e+02, 9.216753271567909e+02,
- 9.227184213086423e+02, 9.237537656854752e+02, 9.247814887675341e+02, 9.258017157026450e+02, 9.268145684972330e+02,
- 9.278201659773041e+02, 9.288186241039492e+02, 9.298100558652801e+02, 9.307945715071588e+02, 9.317722785465197e+02,
- 9.327432819375863e+02, 9.337076841042539e+02, 9.346655850543116e+02, 9.356170823814016e+02, 9.365622714567338e+02,
- 9.375012454225092e+02, 9.384340952813180e+02, 9.393609099627874e+02, 9.402817763876185e+02, 9.411967795291333e+02,
- 9.421060024724591e+02, 9.430095264714533e+02, 9.439074310034625e+02, 9.447997938220271e+02, 9.456866910076274e+02,
- 9.465681970165350e+02, 9.474443847278808e+02, 9.483153254890052e+02, 9.491810891591648e+02, 9.500417441516666e+02,
- 9.508973574745092e+02, 9.517479947695753e+02, 9.525937203504535e+02, 9.534345972389403e+02, 9.542706872002765e+02,
- 9.551020507771748e+02, 9.559287473226848e+02, 9.567508350319436e+02, 9.575683709728590e+02, 9.583814111157720e+02,
- 9.591900103621242e+02, 9.599942225721925e+02, 9.607941005919104e+02, 9.615896962788179e+02, 9.623810605271743e+02,
- 9.631682432922674e+02, 9.639512936139485e+02, 9.647302596394202e+02, 9.655051886453098e+02, 9.662761270590582e+02,
- 9.670431204796354e+02, 9.678062136976312e+02, 9.685654507147171e+02, 9.693208747625278e+02, 9.700725283209664e+02,
- 9.708204531359596e+02, 9.715646902366883e+02, 9.723052799523023e+02, 9.730422619281425e+02, 9.737756751414947e+02,
- 9.745055579168771e+02, 9.752319479408895e+02, 9.759548822766388e+02, 9.766743973777446e+02, 9.773905291019540e+02,
- 9.781033127243716e+02, 9.788127829503142e+02, 9.795189739278103e+02, 9.802219192597557e+02, 9.809216520157245e+02,
- 9.816182047434692e+02, 9.823116094800976e+02, 9.830018977629552e+02, 9.836891006402027e+02, 9.843732486811276e+02,
- 9.850543719861636e+02, 9.857324997301691e+02, 9.864076620192152e+02, 9.870798871564469e+02, 9.877492034619880e+02,
- 9.884156388334329e+02, 9.890792207544056e+02, 9.897399763028955e+02, 9.903979321593806e+02, 9.910531146147526e+02,
- 9.917055495780313e+02, 9.923552625838938e+02, 9.930022788000127e+02, 9.936466230342138e+02, 9.942883197414577e+02,
- 9.949273930306473e+02, 9.955638666712741e+02, 9.961977640998971e+02, 9.968291084264720e+02, 9.974579224405243e+02,
- 9.980842286171717e+02, 9.987080491230149e+02, 9.993294058218755e+02, 9.999483202804053e+02, 1.000564813773567e+03,
- 1.001178907289983e+03, 1.001790621537157e+03, 1.002399976946587e+03, 1.003006993678746e+03, 1.003611691627963e+03,
- 1.004214090427181e+03, 1.004814209452614e+03, 1.005412067828300e+03, 1.006007684430549e+03, 1.006601077892290e+03,
- 1.007192266607331e+03, 1.007781268734510e+03, 1.008368102201768e+03, 1.008952784710129e+03, 1.009535333737585e+03,
- 1.010115766542914e+03, 1.010694100169399e+03, 1.011270351448472e+03, 1.011844537003293e+03, 1.012416673252227e+03,
- 1.012986776412273e+03, 1.013554862502403e+03, 1.014120947346844e+03, 1.014685046578279e+03, 1.015247175640991e+03,
- 1.015807349793940e+03, 1.016365584113770e+03, 1.016921893497761e+03, 1.017476292666722e+03, 1.018028796167818e+03,
- 1.018579418377346e+03, 1.019128173503453e+03, 1.019675075588796e+03, 1.020220138513155e+03, 1.020763375995990e+03,
- 1.021304801598949e+03, 1.021844428728322e+03, 1.022382270637454e+03, 1.022918340429106e+03, 1.023452651057772e+03,
- 1.023985215331948e+03, 1.024516045916358e+03, 1.025045155334144e+03, 1.025572555969002e+03, 1.026098260067288e+03,
- 1.026622279740074e+03, 1.027144626965177e+03, 1.027665313589140e+03, 1.028184351329176e+03, 1.028701751775082e+03,
- 1.029217526391114e+03, 1.029731686517826e+03, 1.030244243373875e+03, 1.030755208057793e+03, 1.031264591549733e+03,
- 1.031772404713167e+03, 1.032278658296573e+03, 1.032783362935077e+03, 1.033286529152070e+03, 1.033788167360795e+03,
- 1.034288287865912e+03, 1.034786900865022e+03, 1.035284016450175e+03, 1.035779644609348e+03, 1.036273795227896e+03,
- 1.036766478089976e+03, 1.037257702879952e+03, 1.037747479183767e+03, 1.038235816490297e+03, 1.038722724192684e+03,
- 1.039208211589634e+03, 1.039692287886709e+03, 1.040174962197581e+03, 1.040656243545280e+03, 1.041136140863407e+03,
- 1.041614662997331e+03, 1.042091818705376e+03, 1.042567616659966e+03, 1.043042065448778e+03, 1.043515173575847e+03,
- 1.043986949462681e+03, 1.044457401449333e+03, 1.044926537795470e+03, 1.045394366681425e+03, 1.045860896209214e+03,
- 1.046326134403564e+03, 1.046790089212900e+03, 1.047252768510330e+03, 1.047714180094606e+03, 1.048174331691075e+03,
- 1.048633230952615e+03, 1.049090885460548e+03, 1.049547302725549e+03, 1.050002490188534e+03, 1.050456455221534e+03,
- 1.050909205128560e+03, 1.051360747146445e+03, 1.051811088445688e+03, 1.052260236131266e+03, 1.052708197243449e+03,
- 1.053154978758595e+03, 1.053600587589930e+03, 1.054045030588326e+03, 1.054488314543058e+03, 1.054930446182548e+03,
- 1.055371432175109e+03, 1.055811279129667e+03, 1.056249993596473e+03, 1.056687582067810e+03, 1.057124050978687e+03,
- 1.057559406707517e+03, 1.057993655576793e+03, 1.058426803853748e+03, 1.058858857751009e+03, 1.059289823427238e+03,
- 1.059719706987767e+03, 1.060148514485220e+03, 1.060576251920127e+03, 1.061002925241532e+03, 1.061428540347589e+03,
- 1.061853103086146e+03, 1.062276619255330e+03, 1.062699094604114e+03, 1.063120534832882e+03, 1.063540945593982e+03,
- 1.063960332492272e+03, 1.064378701085663e+03, 1.064796056885643e+03, 1.065212405357807e+03, 1.065627751922368e+03,
- 1.066042101954670e+03, 1.066455460785689e+03, 1.066867833702521e+03, 1.067279225948879e+03, 1.067689642725569e+03,
- 1.068099089190961e+03, 1.068507570461461e+03, 1.068915091611974e+03, 1.069321657676349e+03, 1.069727273647838e+03,
- 1.070131944479532e+03, 1.070535675084797e+03, 1.070938470337707e+03, 1.071340335073464e+03, 1.071741274088823e+03,
- 1.072141292142498e+03, 1.072540393955573e+03, 1.072938584211901e+03, 1.073335867558503e+03, 1.073732248605957e+03,
- 1.074127731928787e+03, 1.074522322065838e+03, 1.074916023520655e+03, 1.075308840761855e+03, 1.075700778223489e+03,
- 1.076091840305406e+03, 1.076482031373605e+03, 1.076871355760593e+03, 1.077259817765725e+03, 1.077647421655550e+03,
- 1.078034171664147e+03, 1.078420071993462e+03, 1.078805126813632e+03, 1.079189340263314e+03, 1.079572716450004e+03,
- 1.079955259450353e+03, 1.080336973310481e+03, 1.080717862046285e+03, 1.081097929643742e+03, 1.081477180059215e+03,
- 1.081855617219742e+03, 1.082233245023336e+03, 1.082610067339270e+03, 1.082986088008369e+03, 1.083361310843283e+03,
- 1.083735739628774e+03, 1.084109378121988e+03, 1.084482230052726e+03, 1.084854299123712e+03, 1.085225589010865e+03,
- 1.085596103363551e+03, 1.085965845804849e+03, 1.086334819931802e+03, 1.086703029315672e+03, 1.087070477502188e+03,
- 1.087437168011795e+03, 1.087803104339893e+03, 1.088168289957079e+03, 1.088532728309386e+03, 1.088896422818519e+03,
- 1.089259376882078e+03, 1.089621593873799e+03, 1.089983077143772e+03, 1.090343830018666e+03, 1.090703855801952e+03,
- 1.091063157774121e+03, 1.091421739192896e+03, 1.091779603293450e+03, 1.092136753288614e+03, 1.092493192369085e+03,
- 1.092848923703632e+03, 1.093203950439301e+03, 1.093558275701612e+03, 1.093911902594761e+03, 1.094264834201818e+03,
- 1.094617073584913e+03, 1.094968623785438e+03, 1.095319487824226e+03, 1.095669668701750e+03, 1.096019169398296e+03,
- 1.096367992874157e+03, 1.096716142069808e+03, 1.097063619906082e+03, 1.097410429284356e+03, 1.097756573086719e+03,
- 1.098102054176146e+03, 1.098446875396671e+03, 1.098791039573552e+03, 1.099134549513445e+03, 1.099477408004561e+03,
- 1.099819617816838e+03, 1.100161181702092e+03, 1.100502102394190e+03, 1.100842382609194e+03, 1.101182025045530e+03,
- 1.101521032384133e+03, 1.101859407288606e+03, 1.102197152405367e+03, 1.102534270363800e+03, 1.102870763776404e+03,
- 1.103206635238940e+03, 1.103541887330570e+03, 1.103876522614008e+03, 1.104210543635654e+03, 1.104543952925741e+03,
- 1.104876752998468e+03, 1.105208946352140e+03, 1.105540535469301e+03, 1.105871522816871e+03, 1.106201910846278e+03,
- 1.106531701993585e+03, 1.106860898679629e+03, 1.107189503310138e+03, 1.107517518275866e+03, 1.107844945952718e+03
- },
- {
- 1.706982439690026e+00, 5.204879449096566e+00, 8.766519832179346e+00, 1.239483063976562e+01, 1.609295787751917e+01,
- 1.986428905573338e+01, 2.371247874442809e+01, 2.764147763791471e+01, 3.165556572433693e+01, 3.575939028800079e+01,
- 3.995800962318453e+01, 4.425694353360376e+01, 4.866223193683066e+01, 5.318050320461273e+01, 5.781905426929794e+01,
- 6.258594504203600e+01, 6.749011035972119e+01, 7.254149355988751e+01, 7.775120695363478e+01, 8.313172603690775e+01,
- 8.869712641006537e+01, 9.446337529902878e+01, 1.004486936369112e+02, 1.066740103996810e+02, 1.131635391035187e+02,
- 1.199455183361314e+02, 1.270531759454070e+02, 1.345260034016678e+02, 1.424114683610503e+02, 1.507673598036600e+02,
- 1.596650675874954e+02, 1.691942804521954e+02, 1.794699039020866e+02, 1.906425774264511e+02, 2.029152725545038e+02,
- 2.165706694921852e+02, 2.320187413920738e+02, 2.498847408293602e+02, 2.711837125474593e+02, 2.976905494763279e+02,
- 3.327336737839258e+02, 3.825490824225566e+02, 4.527336942181644e+02, 5.192832595818398e+02, 5.646313621552536e+02,
- 5.951031618208031e+02, 6.175851052568865e+02, 6.353202051936323e+02, 6.499540835627256e+02, 6.624209247312421e+02,
- 6.732949751300063e+02, 6.829515411152710e+02, 6.916482191071054e+02, 6.995689527055550e+02, 7.068494157229791e+02,
- 7.135924078570960e+02, 7.198776089530932e+02, 7.257679914953125e+02, 7.313141705612921e+02, 7.365574349852416e+02,
- 7.415319092093157e+02, 7.462661267898687e+02, 7.507841964414731e+02, 7.551066801110832e+02, 7.592512638330609e+02,
- 7.632332770441791e+02, 7.670660994468998e+02, 7.707614833092550e+02, 7.743298113926828e+02, 7.777803053233439e+02,
- 7.811211954123314e+02, 7.843598601932335e+02, 7.875029419550948e+02, 7.905564430846578e+02, 7.935258069432332e+02,
- 7.964159861862997e+02, 7.992315008144877e+02, 8.019764877711466e+02, 8.046547435367000e+02, 8.072697608864146e+02,
- 8.098247607563333e+02, 8.123227199872172e+02, 8.147663955775240e+02, 8.171583459657004e+02, 8.195009497729275e+02,
- 8.217964223655861e+02, 8.240468305381578e+02, 8.262541055695501e+02, 8.284200548665399e+02, 8.305463723756865e+02,
- 8.326346479181877e+02, 8.346863755798056e+02, 8.367029612692426e+02, 8.386857295426870e+02, 8.406359297789393e+02,
- 8.425547417783506e+02, 8.444432808492462e+02, 8.463026024373886e+02, 8.481337063470924e+02, 8.499375405966072e+02,
- 8.517150049452766e+02, 8.534669541255241e+02, 8.551942008088823e+02, 8.568975183319500e+02, 8.585776432052448e+02,
- 8.602352774253964e+02, 8.618710906088929e+02, 8.634857219636693e+02, 8.650797821130784e+02, 8.666538547853268e+02,
- 8.682084983800847e+02, 8.697442474228184e+02, 8.712616139163629e+02, 8.727610885982999e+02, 8.742431421119039e+02,
- 8.757082260976700e+02, 8.771567742117907e+02, 8.785892030773540e+02, 8.800059131735208e+02, 8.814072896674488e+02,
- 8.827937031933297e+02, 8.841655105825072e+02, 8.855230555483071e+02, 8.868666693289067e+02, 8.881966712912699e+02,
- 8.895133694989522e+02, 8.908170612463805e+02, 8.921080335803023e+02, 8.933865637986997e+02, 8.946529198581728e+02,
- 8.959073599673829e+02, 8.971501355426025e+02, 8.983814885101035e+02, 8.996016531627201e+02, 9.008108569691789e+02,
- 9.020093195983928e+02, 9.031972541105308e+02, 9.043748670127230e+02, 9.055423585298234e+02, 9.066999228612643e+02,
- 9.078477484248564e+02, 9.089860180883130e+02, 9.101149093892451e+02, 9.112345947442931e+02, 9.123452416480455e+02,
- 9.134470128623316e+02, 9.145400665964378e+02, 9.156245566787727e+02, 9.167006327204609e+02, 9.177684402713088e+02,
- 9.188281209685779e+02, 9.198798126596431e+02, 9.209236496163513e+02, 9.219597625437120e+02, 9.229882787858735e+02,
- 9.240093224233061e+02, 9.250230143858660e+02, 9.260294725609529e+02, 9.270288118795812e+02, 9.280211444761034e+02,
- 9.290065797055061e+02, 9.299852242775123e+02, 9.309571823350673e+02, 9.319225555379239e+02, 9.328814431428191e+02,
- 9.338339420804016e+02, 9.347801470290685e+02, 9.357201504858704e+02, 9.366540428346059e+02, 9.375819124112560e+02,
- 9.385038455668653e+02, 9.394199267280120e+02, 9.403302384549519e+02, 9.412348614975612e+02, 9.421338748491696e+02,
- 9.430273557983868e+02, 9.439153799790002e+02, 9.447980214180383e+02, 9.456753525820820e+02, 9.465474444218916e+02,
- 9.474143664154307e+02, 9.482761866093555e+02, 9.491329716590262e+02, 9.499847868671227e+02, 9.508316962208958e+02,
- 9.516737624281376e+02, 9.525110469519125e+02, 9.533436100440917e+02, 9.541715107777630e+02, 9.549948070785333e+02,
- 9.558135557547994e+02, 9.566278125269963e+02, 9.574376320558924e+02, 9.582430679699542e+02, 9.590441728918111e+02,
- 9.598409984638831e+02, 9.606335953731647e+02, 9.614220133752316e+02, 9.622063013174841e+02, 9.629865071616542e+02,
- 9.637626780056170e+02, 9.645348601045131e+02, 9.653030988912325e+02, 9.660674389962587e+02, 9.668279242669157e+02,
- 9.675845977860297e+02, 9.683375018900271e+02, 9.690866781864975e+02, 9.698321675712286e+02, 9.705740102447439e+02,
- 9.713122457283520e+02, 9.720469128797278e+02, 9.727780499080446e+02, 9.735056943886680e+02, 9.742298832774327e+02,
- 9.749506529245079e+02, 9.756680390878787e+02, 9.763820769464386e+02, 9.770928011127232e+02, 9.778002456452909e+02,
- 9.785044440607552e+02, 9.792054293454939e+02, 9.799032339670341e+02, 9.805978898851318e+02, 9.812894285625475e+02,
- 9.819778809755398e+02, 9.826632771625274e+02, 9.833456480615515e+02, 9.840250228061794e+02, 9.847014305260876e+02,
- 9.853748999128763e+02, 9.860454592290093e+02, 9.867131363165253e+02, 9.873779586055219e+02, 9.880399531224249e+02,
- 9.886991464980497e+02, 9.893555649754571e+02, 9.900092344176110e+02, 9.906601803148484e+02, 9.913084277921610e+02,
- 9.919540016162982e+02, 9.925969262026956e+02, 9.932372256222337e+02, 9.938749236078313e+02, 9.945100435608836e+02,
- 9.951426085575382e+02, 9.957726413548297e+02, 9.964001643966610e+02, 9.970251998196441e+02, 9.976477694588075e+02,
- 9.982678948531662e+02, 9.988855972511591e+02, 9.995008976159669e+02, 1.000113816630704e+03, 1.000724374703486e+03,
- 1.001332591972389e+03, 1.001938488310294e+03, 1.002542083329615e+03, 1.003143396386932e+03, 1.003742446587508e+03,
- 1.004339252789716e+03, 1.004933833609359e+03, 1.005526207423897e+03, 1.006116392376585e+03, 1.006704406380514e+03,
- 1.007290267122572e+03, 1.007873992067305e+03, 1.008455598460713e+03, 1.009035103333946e+03, 1.009612523506939e+03,
- 1.010187875591949e+03, 1.010761175997042e+03, 1.011332440929477e+03, 1.011901686399046e+03, 1.012468928221326e+03,
- 1.013034182020875e+03, 1.013597463234348e+03, 1.014158787113568e+03, 1.014718168728510e+03, 1.015275622970246e+03,
- 1.015831164553820e+03, 1.016384808021057e+03, 1.016936567743336e+03, 1.017486457924282e+03, 1.018034492602426e+03,
- 1.018580685653798e+03, 1.019125050794473e+03, 1.019667601583069e+03, 1.020208351423194e+03, 1.020747313565839e+03,
- 1.021284501111738e+03, 1.021819927013665e+03, 1.022353604078702e+03, 1.022885544970454e+03, 1.023415762211224e+03,
- 1.023944268184148e+03, 1.024471075135282e+03, 1.024996195175665e+03, 1.025519640283322e+03, 1.026041422305249e+03,
- 1.026561552959349e+03, 1.027080043836331e+03, 1.027596906401586e+03, 1.028112151997010e+03, 1.028625791842814e+03,
- 1.029137837039279e+03, 1.029648298568498e+03, 1.030157187296074e+03, 1.030664513972790e+03, 1.031170289236258e+03,
- 1.031674523612515e+03, 1.032177227517622e+03, 1.032678411259207e+03, 1.033178085037995e+03, 1.033676258949307e+03,
- 1.034172942984533e+03, 1.034668147032576e+03, 1.035161880881278e+03, 1.035654154218813e+03, 1.036144976635058e+03,
- 1.036634357622947e+03, 1.037122306579787e+03, 1.037608832808569e+03, 1.038093945519241e+03, 1.038577653829971e+03,
- 1.039059966768379e+03, 1.039540893272755e+03, 1.040020442193252e+03, 1.040498622293062e+03, 1.040975442249571e+03,
- 1.041450910655492e+03, 1.041925036019986e+03, 1.042397826769755e+03, 1.042869291250125e+03, 1.043339437726109e+03,
- 1.043808274383445e+03, 1.044275809329632e+03, 1.044742050594935e+03, 1.045207006133381e+03, 1.045670683823736e+03,
- 1.046133091470467e+03, 1.046594236804689e+03, 1.047054127485100e+03, 1.047512771098892e+03, 1.047970175162653e+03,
- 1.048426347123258e+03, 1.048881294358743e+03, 1.049335024179161e+03, 1.049787543827430e+03, 1.050238860480164e+03,
- 1.050688981248499e+03, 1.051137913178890e+03, 1.051585663253916e+03, 1.052032238393054e+03, 1.052477645453453e+03,
- 1.052921891230693e+03, 1.053364982459529e+03, 1.053806925814628e+03, 1.054247727911293e+03, 1.054687395306176e+03,
- 1.055125934497977e+03, 1.055563351928143e+03, 1.055999653981541e+03, 1.056434846987135e+03, 1.056868937218642e+03,
- 1.057301930895191e+03, 1.057733834181952e+03, 1.058164653190784e+03, 1.058594393980841e+03, 1.059023062559199e+03,
- 1.059450664881452e+03, 1.059877206852310e+03, 1.060302694326190e+03, 1.060727133107789e+03, 1.061150528952654e+03,
- 1.061572887567748e+03, 1.061994214612001e+03, 1.062414515696856e+03, 1.062833796386807e+03, 1.063252062199930e+03,
- 1.063669318608405e+03, 1.064085571039030e+03, 1.064500824873734e+03, 1.064915085450069e+03, 1.065328358061712e+03,
- 1.065740647958950e+03, 1.066151960349158e+03, 1.066562300397274e+03, 1.066971673226261e+03, 1.067380083917578e+03,
- 1.067787537511623e+03, 1.068194039008187e+03, 1.068599593366892e+03, 1.069004205507632e+03, 1.069407880310994e+03,
- 1.069810622618690e+03, 1.070212437233971e+03, 1.070613328922038e+03, 1.071013302410453e+03, 1.071412362389535e+03,
- 1.071810513512763e+03, 1.072207760397157e+03, 1.072604107623671e+03, 1.072999559737573e+03, 1.073394121248815e+03,
- 1.073787796632406e+03, 1.074180590328780e+03, 1.074572506744153e+03, 1.074963550250877e+03, 1.075353725187798e+03,
- 1.075743035860598e+03, 1.076131486542134e+03, 1.076519081472782e+03, 1.076905824860766e+03, 1.077291720882491e+03,
- 1.077676773682859e+03, 1.078060987375600e+03, 1.078444366043583e+03, 1.078826913739127e+03, 1.079208634484314e+03,
- 1.079589532271288e+03, 1.079969611062561e+03, 1.080348874791304e+03, 1.080727327361647e+03, 1.081104972648962e+03,
- 1.081481814500151e+03, 1.081857856733929e+03, 1.082233103141103e+03, 1.082607557484846e+03, 1.082981223500967e+03,
- 1.083354104898183e+03, 1.083726205358381e+03, 1.084097528536883e+03, 1.084468078062701e+03, 1.084837857538796e+03,
- 1.085206870542326e+03, 1.085575120624899e+03, 1.085942611312818e+03, 1.086309346107324e+03, 1.086675328484834e+03,
- 1.087040561897186e+03, 1.087405049771861e+03, 1.087768795512228e+03, 1.088131802497762e+03, 1.088494074084279e+03,
- 1.088855613604152e+03, 1.089216424366537e+03, 1.089576509657588e+03, 1.089935872740675e+03, 1.090294516856597e+03,
- 1.090652445223789e+03, 1.091009661038535e+03, 1.091366167475169e+03, 1.091721967686284e+03, 1.092077064802926e+03,
- 1.092431461934798e+03, 1.092785162170454e+03, 1.093138168577493e+03, 1.093490484202752e+03, 1.093842112072491e+03,
- 1.094193055192589e+03, 1.094543316548719e+03, 1.094892899106541e+03, 1.095241805811874e+03, 1.095590039590880e+03,
- 1.095937603350243e+03, 1.096284499977336e+03, 1.096630732340402e+03, 1.096976303288721e+03, 1.097321215652780e+03,
- 1.097665472244440e+03, 1.098009075857100e+03, 1.098352029265862e+03, 1.098694335227694e+03, 1.099035996481586e+03,
- 1.099377015748711e+03, 1.099717395732581e+03, 1.100057139119199e+03, 1.100396248577216e+03, 1.100734726758080e+03,
- 1.101072576296184e+03, 1.101409799809015e+03, 1.101746399897304e+03, 1.102082379145165e+03, 1.102417740120240e+03,
- 1.102752485373843e+03, 1.103086617441097e+03, 1.103420138841074e+03, 1.103753052076931e+03, 1.104085359636047e+03,
- 1.104417063990157e+03, 1.104748167595481e+03, 1.105078672892863e+03, 1.105408582307893e+03, 1.105737898251039e+03
- },
- {
- 1.701327836502977e+00, 5.187127707250382e+00, 8.735720426701583e+00, 1.234994782590756e+01, 1.603286096466714e+01,
- 1.978774129369198e+01, 2.361812458190755e+01, 2.752782806339939e+01, 3.152098133827312e+01, 3.560206167844039e+01,
- 3.977593452070744e+01, 4.404790009953199e+01, 4.842374738364011e+01, 5.290981674840159e+01, 5.751307315705955e+01,
- 6.224119206111897e+01, 6.710266079595324e+01, 7.210689898546795e+01, 7.726440244090649e+01, 8.258691632997444e+01,
- 8.808764512678607e+01, 9.378150920915934e+01, 9.968546120920612e+01, 1.058188797355665e+02, 1.122040644603731e+02,
- 1.188668657084663e+02, 1.258374950243349e+02, 1.331515830049667e+02, 1.408515807410208e+02, 1.489886475694715e+02,
- 1.576252421656347e+02, 1.668387539244906e+02, 1.767267151062088e+02, 1.874144872361744e+02, 1.990669545897159e+02,
- 2.119069636425941e+02, 2.262456271356261e+02, 2.425345158662039e+02, 2.614601708477834e+02, 2.841228511001287e+02,
- 3.123746038530018e+02, 3.493576202596086e+02, 3.997084275440957e+02, 4.626191634283791e+02, 5.190024315484657e+02,
- 5.599075654482891e+02, 5.889986693742287e+02, 6.110646418198917e+02, 6.287367696935403e+02, 6.434472352531000e+02,
- 6.560448981495030e+02, 6.670678455246683e+02, 6.768755073299975e+02, 6.857184821750345e+02, 6.937778073465753e+02,
- 7.011882010870085e+02, 7.080524450950211e+02, 7.144506382039817e+02, 7.204463550842873e+02, 7.260908667529653e+02,
- 7.314261069723473e+02, 7.364868035972308e+02, 7.413020397950220e+02, 7.458964173631274e+02, 7.502909369023287e+02,
- 7.545036730020707e+02, 7.585502987081253e+02, 7.624444976159841e+02, 7.661982911057671e+02, 7.698223007448239e+02,
- 7.733259606217954e+02, 7.767176906254692e+02, 7.800050389739955e+02, 7.831948003216836e+02, 7.862931143091749e+02,
- 7.893055483321292e+02, 7.922371674818974e+02, 7.950925939869804e+02, 7.978760580052717e+02, 8.005914412470909e+02,
- 8.032423146209715e+02, 8.058319708683612e+02, 8.083634529750733e+02, 8.108395790057026e+02, 8.132629638939771e+02,
- 8.156360386309052e+02, 8.179610672189534e+02, 8.202401617005615e+02, 8.224752955203562e+02, 8.246683154401624e+02,
- 8.268209521927222e+02, 8.289348300325100e+02, 8.310114753190240e+02, 8.330523242488189e+02, 8.350587298363627e+02,
- 8.370319682302461e+02, 8.389732444397332e+02, 8.408836975368953e+02, 8.427644053912055e+02, 8.446163889863672e+02,
- 8.464406163630313e+02, 8.482380062257537e+02, 8.500094312480638e+02, 8.517557211055109e+02, 8.534776652631912e+02,
- 8.551760155412460e+02, 8.568514884792471e+02, 8.585047675181091e+02, 8.601365050161681e+02, 8.617473241143273e+02,
- 8.633378204636166e+02, 8.649085638271683e+02, 8.664600995673795e+02, 8.679929500279947e+02, 8.695076158198748e+02,
- 8.710045770183787e+02, 8.724842942795411e+02, 8.739472098815423e+02, 8.753937486973883e+02, 8.768243191041540e+02,
- 8.782393138336980e+02, 8.796391107692721e+02, 8.810240736921211e+02, 8.823945529817590e+02, 8.837508862733328e+02,
- 8.850933990751721e+02, 8.864224053493855e+02, 8.877382080626762e+02, 8.890410997373772e+02, 8.903313629150749e+02,
- 8.916092705908313e+02, 8.928750854663742e+02, 8.941290641725873e+02, 8.953714527081162e+02, 8.966024903439828e+02,
- 8.978224080627094e+02, 8.990314297922922e+02, 9.002297724794651e+02, 9.014176463816445e+02, 9.025952553437096e+02,
- 9.037627970605681e+02, 9.049204633263552e+02, 9.060684402710929e+02, 9.072069085855439e+02, 9.083360437349637e+02,
- 9.094560161623995e+02, 9.105669914821467e+02, 9.116691306639239e+02, 9.127625902082999e+02, 9.138475223138629e+02,
- 9.149240750181168e+02, 9.159923924249415e+02, 9.170526147340364e+02, 9.181048784581939e+02, 9.191493165536472e+02,
- 9.201860584722825e+02, 9.212152303953943e+02, 9.222369552726326e+02, 9.232513529643164e+02, 9.242585402964522e+02,
- 9.252586312400136e+02, 9.262517368879238e+02, 9.272379658190715e+02, 9.282174238134052e+02, 9.291902141789587e+02,
- 9.301564377750888e+02, 9.311161930910263e+02, 9.320695763212575e+02, 9.330166814379140e+02, 9.339576002602892e+02,
- 9.348924225216299e+02, 9.358212359333323e+02, 9.367441262466511e+02, 9.376611773120527e+02, 9.385724711363046e+02,
- 9.394780879374191e+02, 9.403781061975334e+02, 9.412726027138319e+02, 9.421616526475857e+02, 9.430453295714024e+02,
- 9.439237055147578e+02, 9.447968510078904e+02, 9.456648351241183e+02, 9.465277255206655e+02, 9.473855884780347e+02,
- 9.482384889380161e+02, 9.490864905403654e+02, 9.499296556582216e+02, 9.507680454323153e+02, 9.516017198040034e+02,
- 9.524307375472010e+02, 9.532551562992309e+02, 9.540750325906574e+02, 9.548904218741235e+02, 9.557013785522491e+02,
- 9.565079560046145e+02, 9.573102066138733e+02, 9.581081817910198e+02, 9.589019319998558e+02, 9.596915067806773e+02,
- 9.604769547732135e+02, 9.612583237388484e+02, 9.620356605821514e+02, 9.628090113717418e+02, 9.635784213605098e+02,
- 9.643439350052274e+02, 9.651055959855547e+02, 9.658634472224833e+02, 9.666175308962196e+02, 9.673678884635414e+02,
- 9.681145606746391e+02, 9.688575875894618e+02, 9.695970085935872e+02, 9.703328624136285e+02, 9.710651871322024e+02,
- 9.717940202024602e+02, 9.725193984622102e+02, 9.732413581476430e+02, 9.739599349066590e+02, 9.746751638118344e+02,
- 9.753870793730216e+02, 9.760957155496022e+02, 9.768011057624008e+02, 9.775032829052752e+02, 9.782022793563918e+02,
- 9.788981269891957e+02, 9.795908571830869e+02, 9.802805003588244e+02, 9.809670878694548e+02, 9.816506492171322e+02,
- 9.823312139062522e+02, 9.830088109964415e+02, 9.836834691116541e+02, 9.843552164490300e+02, 9.850240807875289e+02,
- 9.856900894963418e+02, 9.863532695430914e+02, 9.870136475018203e+02, 9.876712495607818e+02, 9.883261015300391e+02,
- 9.889782288488632e+02, 9.896276565929655e+02, 9.902744094815398e+02, 9.909185118841327e+02, 9.915599878273507e+02,
- 9.921988610014075e+02, 9.928351547665022e+02, 9.934688921590562e+02, 9.941000958977963e+02, 9.947287883896912e+02,
- 9.953549917357553e+02, 9.959787277367058e+02, 9.966000178984963e+02, 9.972188834377183e+02, 9.978353452868749e+02,
- 9.984494240995392e+02, 9.990611402553898e+02, 9.996705138651309e+02, 1.000277564775305e+03, 1.000882312572994e+03,
- 1.001484776590413e+03, 1.002084975909403e+03, 1.002682929365831e+03, 1.003278655553872e+03, 1.003872172830225e+03,
- 1.004463499318209e+03, 1.005052652911789e+03, 1.005639651279504e+03, 1.006224511868317e+03, 1.006807251907374e+03,
- 1.007387888411688e+03, 1.007966438185745e+03, 1.008542917827028e+03, 1.009117343729473e+03, 1.009689732086847e+03,
- 1.010260098896057e+03, 1.010828459960393e+03, 1.011394830892695e+03, 1.011959227118467e+03, 1.012521663878912e+03,
- 1.013082156233921e+03, 1.013640719064988e+03, 1.014197367078069e+03, 1.014752114806389e+03, 1.015304976613185e+03,
- 1.015855966694397e+03, 1.016405099081304e+03, 1.016952387643114e+03, 1.017497846089490e+03, 1.018041487973038e+03,
- 1.018583326691741e+03, 1.019123375491345e+03, 1.019661647467698e+03, 1.020198155569050e+03, 1.020732912598298e+03,
- 1.021265931215197e+03, 1.021797223938523e+03, 1.022326803148196e+03, 1.022854681087370e+03, 1.023380869864465e+03,
- 1.023905381455184e+03, 1.024428227704472e+03, 1.024949420328452e+03, 1.025468970916318e+03, 1.025986890932196e+03,
- 1.026503191716965e+03, 1.027017884490054e+03, 1.027530980351199e+03, 1.028042490282168e+03, 1.028552425148458e+03,
- 1.029060795700958e+03, 1.029567612577586e+03, 1.030072886304890e+03, 1.030576627299629e+03, 1.031078845870318e+03,
- 1.031579552218747e+03, 1.032078756441481e+03, 1.032576468531319e+03, 1.033072698378742e+03, 1.033567455773325e+03,
- 1.034060750405132e+03, 1.034552591866079e+03, 1.035042989651282e+03, 1.035531953160374e+03, 1.036019491698803e+03,
- 1.036505614479110e+03, 1.036990330622179e+03, 1.037473649158474e+03, 1.037955579029243e+03, 1.038436129087717e+03,
- 1.038915308100276e+03, 1.039393124747600e+03, 1.039869587625803e+03, 1.040344705247547e+03, 1.040818486043134e+03,
- 1.041290938361583e+03, 1.041762070471690e+03, 1.042231890563068e+03, 1.042700406747172e+03, 1.043167627058310e+03,
- 1.043633559454625e+03, 1.044098211819082e+03, 1.044561591960417e+03, 1.045023707614090e+03, 1.045484566443205e+03,
- 1.045944176039432e+03, 1.046402543923902e+03, 1.046859677548092e+03, 1.047315584294699e+03, 1.047770271478494e+03,
- 1.048223746347172e+03, 1.048676016082173e+03, 1.049127087799510e+03, 1.049576968550566e+03, 1.050025665322892e+03,
- 1.050473185040986e+03, 1.050919534567059e+03, 1.051364720701794e+03, 1.051808750185089e+03, 1.052251629696795e+03,
- 1.052693365857431e+03, 1.053133965228900e+03, 1.053573434315194e+03, 1.054011779563072e+03, 1.054449007362754e+03,
- 1.054885124048579e+03, 1.055320135899672e+03, 1.055754049140589e+03, 1.056186869941961e+03, 1.056618604421122e+03,
- 1.057049258642732e+03, 1.057478838619389e+03, 1.057907350312229e+03, 1.058334799631529e+03, 1.058761192437281e+03,
- 1.059186534539780e+03, 1.059610831700188e+03, 1.060034089631093e+03, 1.060456313997067e+03, 1.060877510415205e+03,
- 1.061297684455668e+03, 1.061716841642206e+03, 1.062134987452685e+03, 1.062552127319600e+03, 1.062968266630581e+03,
- 1.063383410728892e+03, 1.063797564913928e+03, 1.064210734441697e+03, 1.064622924525304e+03, 1.065034140335417e+03,
- 1.065444387000740e+03, 1.065853669608466e+03, 1.066261993204738e+03, 1.066669362795089e+03, 1.067075783344887e+03,
- 1.067481259779768e+03, 1.067885796986065e+03, 1.068289399811234e+03, 1.068692073064268e+03, 1.069093821516109e+03,
- 1.069494649900055e+03, 1.069894562912165e+03, 1.070293565211645e+03, 1.070691661421246e+03, 1.071088856127645e+03,
- 1.071485153881828e+03, 1.071880559199461e+03, 1.072275076561263e+03, 1.072668710413367e+03, 1.073061465167684e+03,
- 1.073453345202258e+03, 1.073844354861613e+03, 1.074234498457104e+03, 1.074623780267255e+03, 1.075012204538099e+03,
- 1.075399775483509e+03, 1.075786497285526e+03, 1.076172374094687e+03, 1.076557410030338e+03, 1.076941609180960e+03,
- 1.077324975604473e+03, 1.077707513328548e+03, 1.078089226350907e+03, 1.078470118639630e+03, 1.078850194133447e+03,
- 1.079229456742029e+03, 1.079607910346284e+03, 1.079985558798636e+03, 1.080362405923308e+03, 1.080738455516602e+03,
- 1.081113711347177e+03, 1.081488177156312e+03, 1.081861856658182e+03, 1.082234753540122e+03, 1.082606871462881e+03,
- 1.082978214060892e+03, 1.083348784942518e+03, 1.083718587690310e+03, 1.084087625861250e+03, 1.084455902987005e+03,
- 1.084823422574163e+03, 1.085190188104475e+03, 1.085556203035095e+03, 1.085921470798811e+03, 1.086285994804281e+03,
- 1.086649778436254e+03, 1.087012825055804e+03, 1.087375138000549e+03, 1.087736720584873e+03, 1.088097576100145e+03,
- 1.088457707814933e+03, 1.088817118975216e+03, 1.089175812804598e+03, 1.089533792504512e+03, 1.089891061254430e+03,
- 1.090247622212062e+03, 1.090603478513558e+03, 1.090958633273710e+03, 1.091313089586142e+03, 1.091666850523507e+03,
- 1.092019919137682e+03, 1.092372298459953e+03, 1.092723991501200e+03, 1.093075001252091e+03, 1.093425330683257e+03,
- 1.093774982745476e+03, 1.094123960369851e+03, 1.094472266467990e+03, 1.094819903932174e+03, 1.095166875635538e+03,
- 1.095513184432238e+03, 1.095858833157617e+03, 1.096203824628380e+03, 1.096548161642749e+03, 1.096891846980637e+03,
- 1.097234883403802e+03, 1.097577273656010e+03, 1.097919020463193e+03, 1.098260126533604e+03, 1.098600594557973e+03,
- 1.098940427209657e+03, 1.099279627144797e+03, 1.099618197002460e+03, 1.099956139404794e+03, 1.100293456957170e+03,
- 1.100630152248326e+03, 1.100966227850514e+03, 1.101301686319640e+03, 1.101636530195400e+03, 1.101970762001426e+03,
- 1.102304384245417e+03, 1.102637399419276e+03, 1.102969809999248e+03, 1.103301618446044e+03, 1.103632827204983e+03
- },
- {
- 1.695711132541665e+00, 5.169502068105792e+00, 8.705152749500085e+00, 1.230542247177328e+01, 1.597327048484206e+01,
- 1.971187585499763e+01, 2.352465987058886e+01, 2.741531140162334e+01, 3.138781569255044e+01, 3.544648717056794e+01,
- 3.959600696611827e+01, 4.384146599005007e+01, 4.818841459491445e+01, 5.264292007814160e+01, 5.721163357593682e+01,
- 6.190186826833237e+01, 6.672169129242103e+01, 7.168003237839037e+01, 7.678681302928516e+01, 8.205310112817115e+01,
- 8.749129727073989e+01, 9.311536102342789e+01, 9.894108789365166e+01, 1.049864513584716e+02, 1.112720292605887e+02,
- 1.178215408958522e+02, 1.246625311840786e+02, 1.318272530016802e+02, 1.393538205879198e+02, 1.472877398353921e+02,
- 1.556839727413676e+02, 1.646097737306582e+02, 1.741486677059257e+02, 1.844061596504859e+02, 1.955181456972497e+02,
- 2.076636730356485e+02, 2.210849438825634e+02, 2.361198209224099e+02, 2.532565976401486e+02, 2.732289087040577e+02,
- 2.971789813982052e+02, 3.269031922800188e+02, 3.650322311623864e+02, 4.142009499469160e+02, 4.698271564680101e+02,
- 5.186309476880714e+02, 5.557814208416860e+02, 5.834644733129585e+02, 6.050087019311810e+02, 6.225211677402108e+02,
- 6.372336209146072e+02, 6.499068546065467e+02, 6.610377823738783e+02, 6.709658533800509e+02, 6.799317375956360e+02,
- 6.881115284591516e+02, 6.956375682249187e+02, 7.026116203264099e+02, 7.091134903285229e+02, 7.152068424667145e+02,
- 7.209432309557436e+02, 7.263649607054124e+02, 7.315071598328765e+02, 7.363993087965247e+02, 7.410663870356079e+02,
- 7.455297453398658e+02, 7.498077782862603e+02, 7.539164487643644e+02, 7.578697016076385e+02, 7.616797930690470e+02,
- 7.653575557183276e+02, 7.689126132729967e+02, 7.723535562425830e+02, 7.756880866277469e+02, 7.789231379782973e+02,
- 7.820649756756142e+02, 7.851192812266344e+02, 7.880912235406990e+02, 7.909855195380402e+02, 7.938064859598354e+02,
- 7.965580838786511e+02, 7.992439571183776e+02, 8.018674655650359e+02, 8.044317141697045e+02, 8.069395783014129e+02,
- 8.093937259929750e+02, 8.117966375303057e+02, 8.141506227607966e+02, 8.164578364354094e+02, 8.187202918492341e+02,
- 8.209398730042476e+02, 8.231183454841437e+02, 8.252573662029628e+02, 8.273584921658759e+02, 8.294231883608237e+02,
- 8.314528348832738e+02, 8.334487333824658e+02, 8.354121129057428e+02, 8.373441352075896e+02, 8.392458995814777e+02,
- 8.411184472653340e+02, 8.429627654651878e+02, 8.447797910361982e+02, 8.465704138555853e+02, 8.483354799179921e+02,
- 8.500757941803026e+02, 8.517921231799100e+02, 8.534851974477687e+02, 8.551557137352509e+02, 8.568043370717960e+02,
- 8.584317026685483e+02, 8.600384176816070e+02, 8.616250628471247e+02, 8.631921939992578e+02, 8.647403434808853e+02,
- 8.662700214560488e+02, 8.677817171321915e+02, 8.692758998995320e+02, 8.707530203942000e+02, 8.722135114911633e+02,
- 8.736577892324195e+02, 8.750862536954406e+02, 8.764992898064137e+02, 8.778972681024233e+02, 8.792805454463598e+02,
- 8.806494656980187e+02, 8.820043603445672e+02, 8.833455490936443e+02, 8.846733404549861e+02, 8.859880322793142e+02,
- 8.872899122161672e+02, 8.885792572938176e+02, 8.898563371392983e+02, 8.911214108107777e+02, 8.923747299391065e+02,
- 8.936165373545099e+02, 8.948470683594414e+02, 8.960665508223896e+02, 8.972752054924123e+02, 8.984732462971723e+02,
- 8.996608806254877e+02, 9.008383095953712e+02, 9.020057283084232e+02, 9.031633260914097e+02, 9.043112867257938e+02,
- 9.054497886659241e+02, 9.065790052465525e+02, 9.076991048803005e+02, 9.088102512456417e+02, 9.099126034483309e+02,
- 9.110063162820918e+02, 9.120915402074814e+02, 9.131684216942315e+02, 9.142371032741326e+02, 9.152977237016515e+02,
- 9.163504180888943e+02, 9.173953180345451e+02, 9.184325517471128e+02, 9.194622441750939e+02, 9.204845170692113e+02,
- 9.214994891680186e+02, 9.225072762479319e+02, 9.235079912358328e+02, 9.245017443038309e+02, 9.254886428707931e+02,
- 9.264687920358982e+02, 9.274422941574855e+02, 9.284092492601213e+02, 9.293697550320032e+02, 9.303239068987839e+02,
- 9.312717980944751e+02, 9.322135197295638e+02, 9.331491608564795e+02, 9.340788085325224e+02, 9.350025478803846e+02,
- 9.359204621463656e+02, 9.368326327563889e+02, 9.377391393699221e+02, 9.386400599318875e+02, 9.395354707226609e+02,
- 9.404254464062367e+02, 9.413100600766415e+02, 9.421893833026792e+02, 9.430634861710643e+02, 9.439324373280252e+02,
- 9.447963040194437e+02, 9.456551521295818e+02, 9.465090462184637e+02, 9.473580495579686e+02, 9.482022241666808e+02,
- 9.490416308435608e+02, 9.498763292004702e+02, 9.507063776936101e+02, 9.515318336539071e+02, 9.523527533163978e+02,
- 9.531691918486441e+02, 9.539812033782204e+02, 9.547888410193083e+02, 9.555921568984403e+02, 9.563912021794107e+02,
- 9.571860270874022e+02, 9.579766809323464e+02, 9.587632121315513e+02, 9.595456682316270e+02, 9.603240959297292e+02,
- 9.610985410941496e+02, 9.618690487842795e+02, 9.626356632699636e+02, 9.633984280502710e+02, 9.641573858717037e+02,
- 9.649125787458639e+02, 9.656640479665962e+02, 9.664118341266226e+02, 9.671559771336980e+02, 9.678965162262915e+02,
- 9.686334899888121e+02, 9.693669363664043e+02, 9.700968926793173e+02, 9.708233956368614e+02, 9.715464813509849e+02,
- 9.722661853494533e+02, 9.729825425886767e+02, 9.736955874661678e+02, 9.744053538326694e+02, 9.751118750039421e+02,
- 9.758151837722326e+02, 9.765153124174313e+02, 9.772122922484200e+02, 9.779061554726052e+02, 9.785969324458869e+02,
- 9.792846535044539e+02, 9.799693485236187e+02, 9.806510469273098e+02, 9.813297776973244e+02, 9.820055693823306e+02,
- 9.826784501066537e+02, 9.833484475788223e+02, 9.840155890999044e+02, 9.846799015716364e+02, 9.853414115043340e+02,
- 9.860001450246206e+02, 9.866561278829528e+02, 9.873093854609615e+02, 9.879599427786171e+02, 9.886078245012093e+02,
- 9.892530549461674e+02, 9.898956580897056e+02, 9.905356575733180e+02, 9.911730767101044e+02, 9.918079384909574e+02,
- 9.924402655905958e+02, 9.930700803734561e+02, 9.936974048994481e+02, 9.943222609295706e+02, 9.949446699314011e+02,
- 9.955646530844557e+02, 9.961822312854268e+02, 9.967974251532983e+02, 9.974102550343471e+02, 9.980207410070251e+02,
- 9.986289028867407e+02, 9.992347602305218e+02, 9.998383323415804e+02, 1.000439638273776e+03, 1.001038696835974e+03,
- 1.001635526596316e+03, 1.002230145886390e+03, 1.002822572805312e+03, 1.003412825223715e+03, 1.004000920787660e+03,
- 1.004586876922452e+03, 1.005170710836384e+03, 1.005752439524390e+03, 1.006332079771632e+03, 1.006909648157001e+03,
- 1.007485161056551e+03, 1.008058634646857e+03, 1.008630084908304e+03, 1.009199527628309e+03, 1.009766978404472e+03,
- 1.010332452647668e+03, 1.010895965585067e+03, 1.011457532263107e+03, 1.012017167550385e+03, 1.012574886140511e+03,
- 1.013130702554887e+03, 1.013684631145446e+03, 1.014236686097320e+03, 1.014786881431468e+03, 1.015335231007246e+03,
- 1.015881748524922e+03, 1.016426447528154e+03, 1.016969341406405e+03, 1.017510443397322e+03, 1.018049766589063e+03,
- 1.018587323922579e+03, 1.019123128193855e+03, 1.019657192056105e+03, 1.020189528021928e+03, 1.020720148465422e+03,
- 1.021249065624252e+03, 1.021776291601691e+03, 1.022301838368611e+03, 1.022825717765442e+03, 1.023347941504097e+03,
- 1.023868521169855e+03, 1.024387468223213e+03, 1.024904794001701e+03, 1.025420509721672e+03, 1.025934626480047e+03,
- 1.026447155256033e+03, 1.026958106912819e+03, 1.027467492199223e+03, 1.027975321751329e+03, 1.028481606094078e+03,
- 1.028986355642842e+03, 1.029489580704962e+03, 1.029991291481268e+03, 1.030491498067562e+03, 1.030990210456079e+03,
- 1.031487438536925e+03, 1.031983192099488e+03, 1.032477480833822e+03, 1.032970314332010e+03, 1.033461702089503e+03,
- 1.033951653506433e+03, 1.034440177888910e+03, 1.034927284450288e+03, 1.035412982312416e+03, 1.035897280506870e+03,
- 1.036380187976151e+03, 1.036861713574879e+03, 1.037341866070959e+03, 1.037820654146723e+03, 1.038298086400066e+03,
- 1.038774171345547e+03, 1.039248917415488e+03, 1.039722332961040e+03, 1.040194426253243e+03, 1.040665205484062e+03,
- 1.041134678767408e+03, 1.041602854140143e+03, 1.042069739563069e+03, 1.042535342921895e+03, 1.042999672028204e+03,
- 1.043462734620383e+03, 1.043924538364555e+03, 1.044385090855490e+03, 1.044844399617498e+03, 1.045302472105318e+03,
- 1.045759315704982e+03, 1.046214937734670e+03, 1.046669345445553e+03, 1.047122546022623e+03, 1.047574546585505e+03,
- 1.048025354189261e+03, 1.048474975825184e+03, 1.048923418421570e+03, 1.049370688844487e+03, 1.049816793898535e+03,
- 1.050261740327579e+03, 1.050705534815487e+03, 1.051148183986850e+03, 1.051589694407690e+03, 1.052030072586161e+03,
- 1.052469324973235e+03, 1.052907457963381e+03, 1.053344477895237e+03, 1.053780391052259e+03, 1.054215203663380e+03,
- 1.054648921903639e+03, 1.055081551894817e+03, 1.055513099706054e+03, 1.055943571354461e+03, 1.056372972805722e+03,
- 1.056801309974683e+03, 1.057228588725945e+03, 1.057654814874433e+03, 1.058079994185967e+03, 1.058504132377818e+03,
- 1.058927235119267e+03, 1.059349308032140e+03, 1.059770356691349e+03, 1.060190386625420e+03, 1.060609403317013e+03,
- 1.061027412203433e+03, 1.061444418677143e+03, 1.061860428086255e+03, 1.062275445735026e+03, 1.062689476884344e+03,
- 1.063102526752207e+03, 1.063514600514191e+03, 1.063925703303917e+03, 1.064335840213512e+03, 1.064745016294059e+03,
- 1.065153236556044e+03, 1.065560505969798e+03, 1.065966829465928e+03, 1.066372211935745e+03, 1.066776658231692e+03,
- 1.067180173167754e+03, 1.067582761519875e+03, 1.067984428026355e+03, 1.068385177388263e+03, 1.068785014269820e+03,
- 1.069183943298793e+03, 1.069581969066881e+03, 1.069979096130091e+03, 1.070375329009117e+03, 1.070770672189700e+03,
- 1.071165130123005e+03, 1.071558707225969e+03, 1.071951407881662e+03, 1.072343236439640e+03, 1.072734197216281e+03,
- 1.073124294495135e+03, 1.073513532527257e+03, 1.073901915531544e+03, 1.074289447695052e+03, 1.074676133173335e+03,
- 1.075061976090752e+03, 1.075446980540791e+03, 1.075831150586375e+03, 1.076214490260175e+03, 1.076597003564909e+03,
- 1.076978694473645e+03, 1.077359566930097e+03, 1.077739624848914e+03, 1.078118872115977e+03, 1.078497312588673e+03,
- 1.078874950096186e+03, 1.079251788439769e+03, 1.079627831393025e+03, 1.080003082702171e+03, 1.080377546086311e+03,
- 1.080751225237698e+03, 1.081124123821999e+03, 1.081496245478547e+03, 1.081867593820604e+03, 1.082238172435603e+03,
- 1.082607984885408e+03, 1.082977034706552e+03, 1.083345325410480e+03, 1.083712860483795e+03, 1.084079643388487e+03,
- 1.084445677562175e+03, 1.084810966418333e+03, 1.085175513346519e+03, 1.085539321712604e+03, 1.085902394858992e+03,
- 1.086264736104844e+03, 1.086626348746291e+03, 1.086987236056655e+03, 1.087347401286657e+03, 1.087706847664631e+03,
- 1.088065578396730e+03, 1.088423596667129e+03, 1.088780905638237e+03, 1.089137508450885e+03, 1.089493408224535e+03,
- 1.089848608057471e+03, 1.090203111026992e+03, 1.090556920189609e+03, 1.090910038581227e+03, 1.091262469217339e+03,
- 1.091614215093206e+03, 1.091965279184043e+03, 1.092315664445199e+03, 1.092665373812333e+03, 1.093014410201598e+03,
- 1.093362776509808e+03, 1.093710475614615e+03, 1.094057510374679e+03, 1.094403883629838e+03, 1.094749598201271e+03,
- 1.095094656891670e+03, 1.095439062485395e+03, 1.095782817748647e+03, 1.096125925429613e+03, 1.096468388258637e+03,
- 1.096810208948370e+03, 1.097151390193925e+03, 1.097491934673031e+03, 1.097831845046184e+03, 1.098171123956794e+03,
- 1.098509774031338e+03, 1.098847797879502e+03, 1.099185198094325e+03, 1.099521977252347e+03, 1.099858137913746e+03,
- 1.100193682622480e+03, 1.100528613906425e+03, 1.100862934277512e+03, 1.101196646231863e+03, 1.101529752249924e+03
- },
- {
- 1.690131939898974e+00, 5.152001112709456e+00, 8.674813955015532e+00, 1.226124981461546e+01, 1.591417914986750e+01,
- 1.963668217179535e+01, 2.343206982703837e+01, 2.730390749101703e+01, 3.125604180116054e+01, 3.529263115111956e+01,
- 3.941818046631221e+01, 4.363758100966886e+01, 4.795615612458268e+01, 5.237971401989712e+01, 5.691460895076552e+01,
- 6.156781246417466e+01, 6.634699678053494e+01, 7.126063289933454e+01, 7.631810668701573e+01, 8.152985708076284e+01,
- 8.690754169669940e+01, 9.246423666879565e+01, 9.821467961378384e+01, 1.041755674318307e+02, 1.103659245265286e+02,
- 1.168075624274771e+02, 1.235256594284283e+02, 1.305494997939439e+02, 1.379134280427216e+02, 1.456580973274988e+02,
- 1.538321268885547e+02, 1.624943380742478e+02, 1.717168253768943e+02, 1.815892582531720e+02, 1.922250401578343e+02,
- 2.037703417960356e+02, 2.164177021222105e+02, 2.304270785193995e+02, 2.461592901764700e+02, 2.641300805879214e+02,
- 2.850964107418214e+02, 3.101799717211657e+02, 3.409736548969248e+02, 3.793824898474268e+02, 4.261102089091421e+02,
- 4.752652883616822e+02, 5.182114258754896e+02, 5.521593470000446e+02, 5.784493653129069e+02, 5.993985668649067e+02,
- 6.166731954557937e+02, 6.313215351685931e+02, 6.440182586085167e+02, 6.552169068387960e+02, 6.652342394730263e+02,
- 6.742987340508510e+02, 6.825798220517142e+02, 6.902061999802468e+02, 6.972776788360705e+02, 7.038730818275233e+02,
- 7.100556519141209e+02, 7.158768455762931e+02, 7.213790529802878e+02, 7.265975864479087e+02, 7.315621592200939e+02,
- 7.362980021109655e+02, 7.408267183535357e+02, 7.451669461617387e+02, 7.493348780681995e+02, 7.533446722156823e+02,
- 7.572087811932321e+02, 7.609382172780954e+02, 7.645427681499677e+02, 7.680311736825195e+02, 7.714112718873763e+02,
- 7.746901202163567e+02, 7.778740970321857e+02, 7.809689870063454e+02, 7.839800534032121e+02, 7.869120995969929e+02,
- 7.897695216947362e+02, 7.925563537706171e+02, 7.952763069283519e+02, 7.979328031813230e+02, 8.005290049596456e+02,
- 8.030678409095393e+02, 8.055520285348899e+02, 8.079840941376840e+02, 8.103663904384260e+02, 8.127011121960192e+02,
- 8.149903100960938e+02, 8.172359031352386e+02, 8.194396896941922e+02, 8.216033574645631e+02, 8.237284923698193e+02,
- 8.258165866013933e+02, 8.278690458739832e+02, 8.298871959900061e+02, 8.318722887912186e+02, 8.338255075652997e+02,
- 8.357479719665854e+02, 8.376407425026725e+02, 8.395048246322823e+02, 8.413411725142679e+02, 8.431506924429477e+02,
- 8.449342460008262e+02, 8.466926529562199e+02, 8.484266939302232e+02, 8.501371128547245e+02, 8.518246192408427e+02,
- 8.534898902750745e+02, 8.551335727586222e+02, 8.567562849037706e+02, 8.583586179997729e+02, 8.599411379594346e+02,
- 8.615043867565091e+02, 8.630488837629958e+02, 8.645751269945878e+02, 8.660835942717107e+02, 8.675747443029234e+02,
- 8.690490176967993e+02, 8.705068379078755e+02, 8.719486121217354e+02, 8.733747320838593e+02, 8.747855748764581e+02,
- 8.761815036471406e+02, 8.775628682929586e+02, 8.789300061030413e+02, 8.802832423714614e+02, 8.816228910004085e+02,
- 8.829492550039706e+02, 8.842626263456424e+02, 8.855632883979944e+02, 8.868515138391421e+02, 8.881275672328157e+02,
- 8.893917038056961e+02, 8.906441707549988e+02, 8.918852073659282e+02, 8.931150453502828e+02, 8.943339091671161e+02,
- 8.955420163265693e+02, 8.967395776779415e+02, 8.979267976829403e+02, 8.991038746750312e+02, 9.002710011057284e+02,
- 9.014283637785874e+02, 9.025761440716465e+02, 9.037145181658020e+02, 9.048436571609809e+02, 9.059637274405205e+02,
- 9.070748906780128e+02, 9.081773041008283e+02, 9.092711206375960e+02, 9.103564890763546e+02, 9.114335542154540e+02,
- 9.125024570076025e+02, 9.135633346974382e+02, 9.146163209529599e+02, 9.156615460033247e+02, 9.166991367090226e+02,
- 9.177292167536762e+02, 9.187519067013025e+02, 9.197673241151266e+02, 9.207755836583865e+02, 9.217767971909003e+02,
- 9.227710738616150e+02, 9.237585201973407e+02, 9.247392400705616e+02, 9.257133352372955e+02, 9.266809047494962e+02,
- 9.276420454626177e+02, 9.285968520025368e+02, 9.295454168349535e+02, 9.304878303320908e+02, 9.314241808368083e+02,
- 9.323545547242582e+02, 9.332790364611913e+02, 9.341977086630224e+02, 9.351106521487533e+02, 9.360179459938528e+02,
- 9.369196675811820e+02, 9.378158926500569e+02, 9.387066953435173e+02, 9.395921482538955e+02, 9.404723224667505e+02,
- 9.413472876032326e+02, 9.422171118609590e+02, 9.430818620534494e+02, 9.439416036481923e+02, 9.447964008033925e+02,
- 9.456463164034590e+02, 9.464914120932821e+02, 9.473317483113483e+02, 9.481673843217471e+02, 9.489983782451051e+02,
- 9.498247870884959e+02, 9.506466667743651e+02, 9.514640721685088e+02, 9.522770571071477e+02, 9.530856744231203e+02,
- 9.538899759712411e+02, 9.546900126528569e+02, 9.554858344396097e+02, 9.562774903964784e+02, 9.570650287040760e+02,
- 9.578484966802713e+02, 9.586279408011427e+02, 9.594034067212805e+02, 9.601749392934879e+02, 9.609425825878723e+02,
- 9.617063799103717e+02, 9.624663738207230e+02, 9.632226061499032e+02, 9.639751180170521e+02, 9.647239498458974e+02,
- 9.654691413807117e+02, 9.662107317017977e+02, 9.669487592405272e+02, 9.676832617939629e+02, 9.684142765390496e+02,
- 9.691418400464154e+02, 9.698659882937795e+02, 9.705867566789893e+02, 9.713041800326916e+02, 9.720182926306620e+02,
- 9.727291282057857e+02, 9.734367199597197e+02, 9.741411001104157e+02, 9.748423017394050e+02, 9.755403560762239e+02,
- 9.762352943080411e+02, 9.769271471445544e+02, 9.776159448279004e+02, 9.783017171423077e+02, 9.789844934234968e+02,
- 9.796643025678306e+02, 9.803411730412412e+02, 9.810151328879151e+02, 9.816862097387669e+02, 9.823544308196924e+02,
- 9.830198229596134e+02, 9.836824125983277e+02, 9.843422257941513e+02, 9.849992882313833e+02, 9.856536252275781e+02,
- 9.863052617406437e+02, 9.869542223757600e+02, 9.876005313921409e+02, 9.882442127096178e+02, 9.888852899150797e+02,
- 9.895237862687454e+02, 9.901597247102978e+02, 9.907931278648645e+02, 9.914240180488631e+02, 9.920524172757071e+02,
- 9.926783472613760e+02, 9.933018294298624e+02, 9.939228849184869e+02, 9.945415345830950e+02, 9.951577990031310e+02,
- 9.957716984866036e+02, 9.963832530749271e+02, 9.969924825476676e+02, 9.975994064271717e+02, 9.982040439830967e+02,
- 9.988064142368384e+02, 9.994065359658624e+02, 1.000004427707938e+03, 1.000600107765284e+03, 1.001193594208615e+03,
- 1.001784904881110e+03, 1.002374057402287e+03, 1.002961069171802e+03, 1.003545957373157e+03, 1.004128738977341e+03,
- 1.004709430746381e+03, 1.005288049236826e+03, 1.005864610803158e+03, 1.006439131601127e+03, 1.007011627591017e+03,
- 1.007582114540852e+03, 1.008150608029521e+03, 1.008717123449859e+03, 1.009281676011641e+03, 1.009844280744535e+03,
- 1.010404952500986e+03, 1.010963705959040e+03, 1.011520555625120e+03, 1.012075515836733e+03, 1.012628600765135e+03,
- 1.013179824417941e+03, 1.013729200641672e+03, 1.014276743124273e+03, 1.014822465397554e+03, 1.015366380839614e+03,
- 1.015908502677191e+03, 1.016448843987983e+03, 1.016987417702917e+03, 1.017524236608378e+03, 1.018059313348391e+03,
- 1.018592660426766e+03, 1.019124290209200e+03, 1.019654214925340e+03, 1.020182446670805e+03, 1.020708997409171e+03,
- 1.021233878973925e+03, 1.021757103070370e+03, 1.022278681277505e+03, 1.022798625049869e+03, 1.023316945719348e+03,
- 1.023833654496948e+03, 1.024348762474540e+03, 1.024862280626570e+03, 1.025374219811740e+03, 1.025884590774656e+03,
- 1.026393404147450e+03, 1.026900670451371e+03, 1.027406400098344e+03, 1.027910603392510e+03, 1.028413290531730e+03,
- 1.028914471609068e+03, 1.029414156614246e+03, 1.029912355435072e+03, 1.030409077858845e+03, 1.030904333573739e+03,
- 1.031398132170153e+03, 1.031890483142048e+03, 1.032381395888255e+03, 1.032870879713769e+03, 1.033358943831002e+03,
- 1.033845597361038e+03, 1.034330849334855e+03, 1.034814708694520e+03, 1.035297184294378e+03, 1.035778284902212e+03,
- 1.036258019200388e+03, 1.036736395786972e+03, 1.037213423176846e+03, 1.037689109802785e+03, 1.038163464016532e+03,
- 1.038636494089848e+03, 1.039108208215545e+03, 1.039578614508504e+03, 1.040047721006677e+03, 1.040515535672073e+03,
- 1.040982066391722e+03, 1.041447320978633e+03, 1.041911307172727e+03, 1.042374032641770e+03, 1.042835504982267e+03,
- 1.043295731720368e+03, 1.043754720312740e+03, 1.044212478147439e+03, 1.044669012544757e+03, 1.045124330758065e+03,
- 1.045578439974636e+03, 1.046031347316459e+03, 1.046483059841040e+03, 1.046933584542191e+03, 1.047382928350801e+03,
- 1.047831098135608e+03, 1.048278100703944e+03, 1.048723942802479e+03, 1.049168631117951e+03, 1.049612172277885e+03,
- 1.050054572851295e+03, 1.050495839349392e+03, 1.050935978226259e+03, 1.051374995879535e+03, 1.051812898651077e+03,
- 1.052249692827621e+03, 1.052685384641421e+03, 1.053119980270894e+03, 1.053553485841241e+03, 1.053985907425073e+03,
- 1.054417251043011e+03, 1.054847522664294e+03, 1.055276728207368e+03, 1.055704873540470e+03, 1.056131964482198e+03,
- 1.056558006802086e+03, 1.056983006221156e+03, 1.057406968412469e+03, 1.057829899001669e+03, 1.058251803567517e+03,
- 1.058672687642418e+03, 1.059092556712942e+03, 1.059511416220333e+03, 1.059929271561019e+03, 1.060346128087103e+03,
- 1.060761991106862e+03, 1.061176865885225e+03, 1.061590757644256e+03, 1.062003671563618e+03, 1.062415612781042e+03,
- 1.062826586392785e+03, 1.063236597454080e+03, 1.063645650979582e+03, 1.064053751943806e+03, 1.064460905281564e+03,
- 1.064867115888388e+03, 1.065272388620953e+03, 1.065676728297497e+03, 1.066080139698224e+03, 1.066482627565716e+03,
- 1.066884196605328e+03, 1.067284851485583e+03, 1.067684596838560e+03, 1.068083437260282e+03, 1.068481377311088e+03,
- 1.068878421516012e+03, 1.069274574365149e+03, 1.069669840314018e+03, 1.070064223783925e+03, 1.070457729162312e+03,
- 1.070850360803110e+03, 1.071242123027086e+03, 1.071633020122177e+03, 1.072023056343833e+03, 1.072412235915348e+03,
- 1.072800563028182e+03, 1.073188041842291e+03, 1.073574676486445e+03, 1.073960471058540e+03, 1.074345429625912e+03,
- 1.074729556225645e+03, 1.075112854864871e+03, 1.075495329521074e+03, 1.075876984142383e+03, 1.076257822647861e+03,
- 1.076637848927802e+03, 1.077017066844009e+03, 1.077395480230078e+03, 1.077773092891671e+03, 1.078149908606800e+03,
- 1.078525931126088e+03, 1.078901164173043e+03, 1.079275611444319e+03, 1.079649276609980e+03, 1.080022163313753e+03,
- 1.080394275173289e+03, 1.080765615780409e+03, 1.081136188701357e+03, 1.081505997477043e+03, 1.081875045623287e+03,
- 1.082243336631055e+03, 1.082610873966701e+03, 1.082977661072200e+03, 1.083343701365375e+03, 1.083708998240129e+03,
- 1.084073555066671e+03, 1.084437375191738e+03, 1.084800461938812e+03, 1.085162818608345e+03, 1.085524448477969e+03,
- 1.085885354802708e+03, 1.086245540815193e+03, 1.086605009725864e+03, 1.086963764723181e+03, 1.087321808973820e+03,
- 1.087679145622881e+03, 1.088035777794081e+03, 1.088391708589951e+03, 1.088746941092032e+03, 1.089101478361063e+03,
- 1.089455323437174e+03, 1.089808479340068e+03, 1.090160949069212e+03, 1.090512735604015e+03, 1.090863841904011e+03,
- 1.091214270909037e+03, 1.091564025539410e+03, 1.091913108696102e+03, 1.092261523260912e+03, 1.092609272096636e+03,
- 1.092956358047240e+03, 1.093302783938019e+03, 1.093648552575773e+03, 1.093993666748961e+03, 1.094338129227864e+03,
- 1.094681942764750e+03, 1.095025110094028e+03, 1.095367633932400e+03, 1.095709516979028e+03, 1.096050761915673e+03,
- 1.096391371406852e+03, 1.096731348099989e+03, 1.097070694625559e+03, 1.097409413597241e+03, 1.097747507612053e+03,
- 1.098084979250501e+03, 1.098421831076722e+03, 1.098758065638617e+03, 1.099093685467999e+03, 1.099428693080720e+03
- },
- {
- 1.684589876096183e+00, 5.134623444801206e+00, 8.644701248528763e+00, 1.221742518536346e+01, 1.585557982781074e+01,
- 1.956214992144462e+01, 2.334034003724983e+01, 2.719359671061860e+01, 3.112563345243778e+01, 3.514045909824269e+01,
- 3.924241004780310e+01, 4.343618705924819e+01, 4.772689739846900e+01, 5.212010331456826e+01, 5.662187802476661e+01,
- 6.123887066003188e+01, 6.597838196157477e+01, 7.084845295200104e+01, 7.585796936130193e+01, 8.101678531012098e+01,
- 8.633587069644658e+01, 9.182748797676904e+01, 9.750540569034629e+01, 1.033851583047392e+02, 1.094843649918390e+02,
- 1.158231241117939e+02, 1.224245059846260e+02, 1.293151747130096e+02, 1.365261815248629e+02, 1.440939891279538e+02,
- 1.520618114757994e+02, 1.604813914457569e+02, 1.694153957811522e+02, 1.789406969298481e+02, 1.891529533922825e+02,
- 2.001731303231682e+02, 2.121569787678100e+02, 2.253091094784071e+02, 2.399042806332380e+02, 2.563199069489737e+02,
- 2.750848906514070e+02, 2.969464643434261e+02, 3.229328546014849e+02, 3.543135002347355e+02, 3.921984303662318e+02,
- 4.357954965530827e+02, 4.794760769313771e+02, 5.177697286478743e+02, 5.489643463397512e+02, 5.739046476783535e+02,
- 5.942107806959839e+02, 6.111861736320782e+02, 6.257137360062679e+02, 6.383864584105582e+02, 6.496144309200059e+02,
- 6.596903126634091e+02, 6.688288403183509e+02, 6.771914504920924e+02, 6.849021304867700e+02, 6.920579131978129e+02,
- 6.987360045555276e+02, 7.049987392826839e+02, 7.108971024544342e+02, 7.164732821146056e+02, 7.217625530157500e+02,
- 7.267946892799907e+02, 7.315950391502690e+02, 7.361853533032552e+02, 7.405844307313296e+02, 7.448086277502506e+02,
- 7.488722630600873e+02, 7.527879429923678e+02, 7.565668248545514e+02, 7.602188318175716e+02, 7.637528295455235e+02,
- 7.671767723779275e+02, 7.704978250985494e+02, 7.737224649905829e+02, 7.768565678669058e+02, 7.799054809912981e+02,
- 7.828740852113311e+02, 7.857668481617866e+02, 7.885878700366836e+02, 7.913409231442565e+02, 7.940294862347829e+02,
- 7.966567744124723e+02, 7.992257652996431e+02, 8.017392220063643e+02, 8.041997133656263e+02, 8.066096318184653e+02,
- 8.089712092716463e+02, 8.112865311997843e+02, 8.135575492219598e+02, 8.157860923482889e+02, 8.179738770630884e+02,
- 8.201225163872826e+02, 8.222335280425472e+02, 8.243083418227402e+02, 8.263483062638770e+02, 8.283546946917834e+02,
- 8.303287107162738e+02, 8.322714932318737e+02, 8.341841209776308e+02, 8.360676167020694e+02, 8.379229509737970e+02,
- 8.397510456734774e+02, 8.415527771987121e+02, 8.433289794097793e+02, 8.450804463410321e+02, 8.468079347000117e+02,
- 8.485121661739475e+02, 8.501938295611975e+02, 8.518535827433419e+02, 8.534920545120224e+02, 8.551098462631638e+02,
- 8.567075335699684e+02, 8.582856676449268e+02, 8.598447767001035e+02, 8.613853672140527e+02, 8.629079251129451e+02,
- 8.644129168727630e+02, 8.659007905487929e+02, 8.673719767380859e+02, 8.688268894800329e+02, 8.702659270997666e+02,
- 8.716894729986619e+02, 8.730978963958710e+02, 8.744915530244571e+02, 8.758707857872104e+02, 8.772359254027382e+02,
- 8.785872909790230e+02, 8.799251905292153e+02, 8.812499204903831e+02, 8.825617691737974e+02, 8.838610141888793e+02,
- 8.851479237217959e+02, 8.864227573981522e+02, 8.876857664272856e+02, 8.889371939664886e+02, 8.901772754657344e+02,
- 8.914062389941362e+02, 8.926243055492864e+02, 8.938316893505429e+02, 8.950285981340314e+02, 8.962152333484170e+02,
- 8.973917905098475e+02, 8.985584593521199e+02, 8.997154241422596e+02, 9.008628637868802e+02, 9.020009521115427e+02,
- 9.031298580368335e+02, 9.042497457642121e+02, 9.053607749531097e+02, 9.064631008897612e+02, 9.075568746482314e+02,
- 9.086422432440575e+02, 9.097193497809211e+02, 9.107883335907148e+02, 9.118493303793343e+02, 9.129024723054712e+02,
- 9.139478881785345e+02, 9.149857035238078e+02, 9.160160407077366e+02, 9.170390190450848e+02, 9.180547549015631e+02,
- 9.190633617921410e+02, 9.200649504752701e+02, 9.210596290432129e+02, 9.220475030086723e+02, 9.230286753879057e+02,
- 9.240032466293453e+02, 9.249713152792960e+02, 9.259329771938454e+02, 9.268883261699159e+02, 9.278374538763933e+02,
- 9.287804499193890e+02, 9.297174019049930e+02, 9.306483954996364e+02, 9.315735144881706e+02, 9.324928408297652e+02,
- 9.334064547117257e+02, 9.343144346013202e+02, 9.352168572957044e+02, 9.361137979700289e+02, 9.370053302238076e+02,
- 9.378915261256235e+02, 9.387724562562358e+02, 9.396481897501715e+02, 9.405187943358525e+02, 9.413843363743207e+02,
- 9.422448808966292e+02, 9.431004916399451e+02, 9.439512310824186e+02, 9.447971604768776e+02, 9.456383398833782e+02,
- 9.464748282006801e+02, 9.473066831966643e+02, 9.481339615377598e+02, 9.489567188173994e+02, 9.497750095835534e+02,
- 9.505888873653729e+02, 9.513984046989838e+02, 9.522036131524463e+02, 9.530045633499398e+02, 9.538013049951750e+02,
- 9.545938868940796e+02, 9.553823569767833e+02, 9.561667623189153e+02, 9.569471491622583e+02, 9.577235629347687e+02,
- 9.584960482699935e+02, 9.592646490259001e+02, 9.600294083031490e+02, 9.607903684628182e+02, 9.615475711436073e+02,
- 9.623010572785382e+02, 9.630508671111684e+02, 9.637970402113316e+02, 9.645396154904287e+02, 9.652786312162823e+02,
- 9.660141250275622e+02, 9.667461339478107e+02, 9.674746943990689e+02, 9.681998422151235e+02, 9.689216126543840e+02,
- 9.696400404124089e+02, 9.703551596340848e+02, 9.710670034675431e+02, 9.717756058884139e+02, 9.724809990199130e+02,
- 9.731832149195326e+02, 9.738822851502115e+02, 9.745782407906777e+02, 9.752711124455146e+02, 9.759609302549654e+02,
- 9.766477239044779e+02, 9.773315226340073e+02, 9.780123552470733e+02, 9.786902501195906e+02, 9.793652352084652e+02,
- 9.800373380599841e+02, 9.807065858179810e+02, 9.813730052318080e+02, 9.820366226640986e+02, 9.826974640983457e+02,
- 9.833555551462856e+02, 9.840109210551049e+02, 9.846635867144691e+02, 9.853135766633815e+02, 9.859609150968735e+02,
- 9.866056258725354e+02, 9.872477325168935e+02, 9.878872582316283e+02, 9.885242258996508e+02, 9.891586580910354e+02,
- 9.897905770688074e+02, 9.904200047946043e+02, 9.910469629341965e+02, 9.916714728628884e+02, 9.922935556707881e+02,
- 9.929132321679594e+02, 9.935305228894589e+02, 9.941454481002537e+02, 9.947580278000313e+02, 9.953682817279006e+02,
- 9.959762293669889e+02, 9.965818899489327e+02, 9.971852824582737e+02, 9.977864256367553e+02, 9.983853379875262e+02,
- 9.989820377792507e+02, 9.995765430501272e+02, 1.000168871611829e+03, 1.000759041053347e+03, 1.001347068744763e+03,
- 1.001932971840932e+03, 1.002516767285092e+03, 1.003098471812395e+03, 1.003678101953367e+03, 1.004255674037291e+03,
- 1.004831204195519e+03, 1.005404708364725e+03, 1.005976202290074e+03, 1.006545701528342e+03, 1.007113221450961e+03,
- 1.007678777247006e+03, 1.008242383926125e+03, 1.008804056321399e+03, 1.009363809092156e+03, 1.009921656726721e+03,
- 1.010477613545117e+03, 1.011031693701704e+03, 1.011583911187772e+03, 1.012134279834085e+03, 1.012682813313365e+03,
- 1.013229525142738e+03, 1.013774428686129e+03, 1.014317537156603e+03, 1.014858863618676e+03, 1.015398420990564e+03,
- 1.015936222046406e+03, 1.016472279418429e+03, 1.017006605599084e+03, 1.017539212943131e+03, 1.018070113669699e+03,
- 1.018599319864290e+03, 1.019126843480757e+03, 1.019652696343243e+03, 1.020176890148081e+03, 1.020699436465666e+03,
- 1.021220346742280e+03, 1.021739632301895e+03, 1.022257304347940e+03, 1.022773373965033e+03, 1.023287852120684e+03,
- 1.023800749666965e+03, 1.024312077342156e+03, 1.024821845772351e+03, 1.025330065473049e+03, 1.025836746850699e+03,
- 1.026341900204236e+03, 1.026845535726580e+03, 1.027347663506106e+03, 1.027848293528097e+03, 1.028347435676165e+03,
- 1.028845099733650e+03, 1.029341295384991e+03, 1.029836032217081e+03, 1.030329319720592e+03, 1.030821167291279e+03,
- 1.031311584231259e+03, 1.031800579750278e+03, 1.032288162966943e+03, 1.032774342909945e+03, 1.033259128519254e+03,
- 1.033742528647294e+03, 1.034224552060104e+03, 1.034705207438477e+03, 1.035184503379074e+03, 1.035662448395531e+03,
- 1.036139050919536e+03, 1.036614319301901e+03, 1.037088261813600e+03, 1.037560886646808e+03, 1.038032201915910e+03,
- 1.038502215658500e+03, 1.038970935836358e+03, 1.039438370336422e+03, 1.039904526971732e+03, 1.040369413482369e+03,
- 1.040833037536369e+03, 1.041295406730634e+03, 1.041756528591820e+03, 1.042216410577212e+03, 1.042675060075591e+03,
- 1.043132484408079e+03, 1.043588690828979e+03, 1.044043686526595e+03, 1.044497478624044e+03, 1.044950074180053e+03,
- 1.045401480189745e+03, 1.045851703585412e+03, 1.046300751237279e+03, 1.046748629954246e+03, 1.047195346484639e+03,
- 1.047640907516926e+03, 1.048085319680438e+03, 1.048528589546077e+03, 1.048970723627006e+03, 1.049411728379334e+03,
- 1.049851610202797e+03, 1.050290375441412e+03, 1.050728030384140e+03, 1.051164581265525e+03, 1.051600034266332e+03,
- 1.052034395514174e+03, 1.052467671084123e+03, 1.052899866999326e+03, 1.053330989231598e+03, 1.053761043702010e+03,
- 1.054190036281479e+03, 1.054617972791334e+03, 1.055044859003884e+03, 1.055470700642972e+03, 1.055895503384528e+03,
- 1.056319272857105e+03, 1.056742014642421e+03, 1.057163734275872e+03, 1.057584437247062e+03, 1.058004129000308e+03,
- 1.058422814935143e+03, 1.058840500406820e+03, 1.059257190726793e+03, 1.059672891163203e+03, 1.060087606941359e+03,
- 1.060501343244201e+03, 1.060914105212768e+03, 1.061325897946650e+03, 1.061736726504447e+03, 1.062146595904203e+03,
- 1.062555511123850e+03, 1.062963477101644e+03, 1.063370498736583e+03, 1.063776580888834e+03, 1.064181728380144e+03,
- 1.064585945994256e+03, 1.064989238477305e+03, 1.065391610538221e+03, 1.065793066849122e+03, 1.066193612045702e+03,
- 1.066593250727612e+03, 1.066991987458842e+03, 1.067389826768086e+03, 1.067786773149122e+03, 1.068182831061161e+03,
- 1.068578004929219e+03, 1.068972299144459e+03, 1.069365718064548e+03, 1.069758266013999e+03, 1.070149947284508e+03,
- 1.070540766135296e+03, 1.070930726793435e+03, 1.071319833454178e+03, 1.071708090281278e+03, 1.072095501407315e+03,
- 1.072482070934001e+03, 1.072867802932496e+03, 1.073252701443716e+03, 1.073636770478632e+03, 1.074020014018571e+03,
- 1.074402436015512e+03, 1.074784040392378e+03, 1.075164831043320e+03, 1.075544811834008e+03, 1.075923986601905e+03,
- 1.076302359156550e+03, 1.076679933279828e+03, 1.077056712726244e+03, 1.077432701223185e+03, 1.077807902471190e+03,
- 1.078182320144208e+03, 1.078555957889855e+03, 1.078928819329667e+03, 1.079300908059358e+03, 1.079672227649058e+03,
- 1.080042781643566e+03, 1.080412573562592e+03, 1.080781606900991e+03, 1.081149885129005e+03, 1.081517411692495e+03,
- 1.081884190013169e+03, 1.082250223488814e+03, 1.082615515493521e+03, 1.082980069377904e+03, 1.083343888469326e+03,
- 1.083706976072111e+03, 1.084069335467761e+03, 1.084430969915172e+03, 1.084791882650836e+03, 1.085152076889057e+03,
- 1.085511555822150e+03, 1.085870322620646e+03, 1.086228380433494e+03, 1.086585732388255e+03, 1.086942381591301e+03,
- 1.087298331128007e+03, 1.087653584062943e+03, 1.088008143440064e+03, 1.088362012282893e+03, 1.088715193594710e+03,
- 1.089067690358734e+03, 1.089419505538300e+03, 1.089770642077043e+03, 1.090121102899069e+03, 1.090470890909136e+03,
- 1.090820008992818e+03, 1.091168460016686e+03, 1.091516246828466e+03, 1.091863372257215e+03, 1.092209839113481e+03,
- 1.092555650189465e+03, 1.092900808259188e+03, 1.093245316078645e+03, 1.093589176385966e+03, 1.093932391901570e+03,
- 1.094274965328322e+03, 1.094616899351681e+03, 1.094958196639858e+03, 1.095298859843957e+03, 1.095638891598131e+03,
- 1.095978294519722e+03, 1.096317071209408e+03, 1.096655224251346e+03, 1.096992756213313e+03, 1.097329669646845e+03
- },
- {
- 1.679084563985100e+00, 5.117367690331974e+00, 8.614811884941995e+00, 1.217394400614413e+01, 1.579746553847521e+01,
- 1.948826901886792e+01, 2.324945644424241e+01, 2.708435996061811e+01, 3.099656517926189e+01, 3.498993753667488e+01,
- 3.906865219020937e+01, 4.323722803824555e+01, 4.750056657188576e+01, 5.186399641122657e+01, 5.633332456097250e+01,
- 6.091489564746058e+01, 6.561566068561775e+01, 7.044325728668551e+01, 7.540610368151138e+01, 8.051350952911534e+01,
- 8.577580725260144e+01, 9.120450865313958e+01, 9.681249288249617e+01, 1.026142336236032e+02, 1.086260757050611e+02,
- 1.148665746009020e+02, 1.213569166928603e+02, 1.281214443164529e+02, 1.351883182468730e+02, 1.425903625976265e+02,
- 1.503661547106761e+02, 1.585614489806806e+02, 1.672310616039167e+02, 1.764414020199941e+02, 1.862739256129695e+02,
- 1.968299201159714e+02, 2.082372522304059e+02, 2.206600300599506e+02, 2.343126189686662e+02, 2.494800481376020e+02,
- 2.665471471210185e+02, 2.860368591769922e+02, 3.086476598022702e+02, 3.352470378890575e+02, 3.667184898728173e+02,
- 4.034302019761506e+02, 4.436840495290930e+02, 4.828043863600190e+02, 5.173218306534949e+02, 5.461325244918834e+02,
- 5.697845782353147e+02, 5.894194808125527e+02, 6.060486293135843e+02, 6.204080912844086e+02, 6.330147249855786e+02,
- 6.442364316006459e+02, 6.543413955583908e+02, 6.635297318669200e+02, 6.719539523383113e+02, 6.797325100743038e+02,
- 6.869589737404660e+02, 6.937083771356913e+02, 7.000417039430411e+02, 7.060091167141471e+02, 7.116523237379535e+02,
- 7.170063427976754e+02, 7.221008353338827e+02, 7.269611293967031e+02, 7.316090136125198e+02, 7.360633602623528e+02,
- 7.403406191834141e+02, 7.444552128853792e+02, 7.484198553242701e+02, 7.522458111100781e+02, 7.559431078274869e+02,
- 7.595207111493315e+02, 7.629866702004593e+02, 7.663482389662516e+02, 7.696119782829827e+02, 7.727838419885646e+02,
- 7.758692500755108e+02, 7.788731511173030e+02, 7.818000757943818e+02, 7.846541829966546e+02, 7.874392997035394e+02,
- 7.901589556233262e+02, 7.928164133985636e+02, 7.954146950434806e+02, 7.979566051659459e+02, 8.004447514343113e+02,
- 8.028815626744403e+02, 8.052693049207089e+02, 8.076100956942284e+02, 8.099059167397443e+02, 8.121586254180593e+02,
- 8.143699649219637e+02, 8.165415734595497e+02, 8.186749925285476e+02, 8.207716743883062e+02, 8.228329888216040e+02,
- 8.248602292663010e+02, 8.268546183864286e+02, 8.288173131434575e+02, 8.307494094208791e+02, 8.326519462487257e+02,
- 8.345259096690377e+02, 8.363722362784098e+02, 8.381918164795829e+02, 8.399854974703695e+02, 8.417540859950255e+02,
- 8.434983508804312e+02, 8.452190253769800e+02, 8.469168093219768e+02, 8.485923711414624e+02, 8.502463497047327e+02,
- 8.518793560443705e+02, 8.534919749533215e+02, 8.550847664693979e+02, 8.566582672565996e+02, 8.582129918917102e+02,
- 8.597494340638575e+02, 8.612680676939926e+02, 8.627693479805944e+02, 8.642537123773511e+02, 8.657215815080436e+02,
- 8.671733600233930e+02, 8.686094374042211e+02, 8.700301887149011e+02, 8.714359753108031e+02, 8.728271455206218e+02,
- 8.742040352930763e+02, 8.755669687490644e+02, 8.769162579628290e+02, 8.782522056614722e+02, 8.795751037129814e+02,
- 8.808852338400092e+02, 8.821828686431986e+02, 8.834682717755907e+02, 8.847416983340750e+02, 8.860033952465466e+02,
- 8.872536015537802e+02, 8.884925488460642e+02, 8.897204615066454e+02, 8.909375570280404e+02, 8.921440462949257e+02,
- 8.933401338361774e+02, 8.945260181471640e+02, 8.957018918287741e+02, 8.968679418881885e+02, 8.980243499398767e+02,
- 8.991712924140395e+02, 9.003089407550449e+02, 9.014374616104370e+02, 9.025570170110424e+02, 9.036677645426691e+02,
- 9.047698575098748e+02, 9.058634450922251e+02, 9.069486724934593e+02, 9.080256810956407e+02, 9.090946085472709e+02,
- 9.101555889672725e+02, 9.112087530187201e+02, 9.122542280408531e+02, 9.132921381629269e+02, 9.143226044131994e+02,
- 9.153457448233032e+02, 9.163616745282349e+02, 9.173705058621753e+02, 9.183723484503630e+02, 9.193673092971877e+02,
- 9.203554928707214e+02, 9.213370011838296e+02, 9.223119338720491e+02, 9.232803880768708e+02, 9.242424592653632e+02,
- 9.251982402036659e+02, 9.261478217370591e+02, 9.270912926793359e+02, 9.280287398741875e+02, 9.289602482542538e+02,
- 9.298859008979701e+02, 9.308057790842830e+02, 9.317199623453529e+02, 9.326285285173150e+02, 9.335315537891915e+02,
- 9.344291127500371e+02, 9.353212784343904e+02, 9.362081223661039e+02, 9.370897146006262e+02, 9.379661237657922e+02,
- 9.388374171012030e+02, 9.397036604962263e+02, 9.405649185267015e+02, 9.414212544903884e+02, 9.422727304412118e+02,
- 9.431194072223562e+02, 9.439613444982500e+02, 9.447986007854927e+02, 9.456312334827561e+02, 9.464592988997088e+02,
- 9.472828522850048e+02, 9.481019478533526e+02, 9.489166388117352e+02, 9.497269773847740e+02, 9.505330148393053e+02,
- 9.513348015081729e+02, 9.521323868132803e+02, 9.529258192879273e+02, 9.537151465984556e+02, 9.545004155652317e+02,
- 9.552816721829879e+02, 9.560589616405510e+02, 9.568323283399742e+02, 9.576018159150980e+02, 9.583674672495599e+02,
- 9.591293244942696e+02, 9.598874290843773e+02, 9.606418217557369e+02, 9.613925425609050e+02, 9.621396308846637e+02,
- 9.628831254591140e+02, 9.636230643783256e+02, 9.643594851125823e+02, 9.650924245222213e+02, 9.658219188710854e+02,
- 9.665480038396048e+02, 9.672707145375109e+02, 9.679900850643627e+02, 9.687061503100548e+02, 9.694189433116408e+02,
- 9.701284970164181e+02, 9.708348438595533e+02, 9.715380157748735e+02, 9.722380442053579e+02, 9.729349601133633e+02,
- 9.736287939905765e+02, 9.743195758677061e+02, 9.750073353239212e+02, 9.756921014960520e+02, 9.763739030875469e+02,
- 9.770527683772069e+02, 9.777287252276927e+02, 9.784018010938198e+02, 9.790720230306449e+02, 9.797394177013491e+02,
- 9.804040113849231e+02, 9.810658299836688e+02, 9.817248990305063e+02, 9.823812436961105e+02, 9.830348887958706e+02,
- 9.836858587966775e+02, 9.843341778235549e+02, 9.849798696661255e+02, 9.856229577849217e+02, 9.862634653175534e+02,
- 9.869014150847245e+02, 9.875368295961058e+02, 9.881697310560779e+02, 9.888001413693349e+02, 9.894280821463594e+02,
- 9.900535747087699e+02, 9.906766400945518e+02, 9.912972990631572e+02, 9.919155721005027e+02, 9.925314794238435e+02,
- 9.931450409865411e+02, 9.937562764827295e+02, 9.943652053518646e+02, 9.949718467831901e+02, 9.955762197200879e+02,
- 9.961783428643428e+02, 9.967782346803128e+02, 9.973759133990065e+02, 9.979713970220711e+02, 9.985647033256992e+02,
- 9.991558498644453e+02, 9.997448539749670e+02, 1.000331732779681e+03, 1.000916503190347e+03, 1.001499181911571e+03,
- 1.002079785444236e+03, 1.002658330088868e+03, 1.003234831948919e+03, 1.003809306933994e+03, 1.004381770763006e+03,
- 1.004952238967264e+03, 1.005520726893504e+03, 1.006087249706854e+03, 1.006651822393737e+03, 1.007214459764724e+03,
- 1.007775176457317e+03, 1.008333986938690e+03, 1.008890905508362e+03, 1.009445946300829e+03, 1.009999123288136e+03,
- 1.010550450282399e+03, 1.011099940938282e+03, 1.011647608755426e+03, 1.012193467080821e+03, 1.012737529111141e+03,
- 1.013279807895039e+03, 1.013820316335379e+03, 1.014359067191448e+03, 1.014896073081107e+03, 1.015431346482917e+03,
- 1.015964899738208e+03, 1.016496745053129e+03, 1.017026894500637e+03, 1.017555360022470e+03, 1.018082153431070e+03,
- 1.018607286411476e+03, 1.019130770523178e+03, 1.019652617201941e+03, 1.020172837761595e+03, 1.020691443395788e+03,
- 1.021208445179715e+03, 1.021723854071806e+03, 1.022237680915397e+03, 1.022749936440350e+03, 1.023260631264671e+03,
- 1.023769775896076e+03, 1.024277380733538e+03, 1.024783456068814e+03, 1.025288012087930e+03, 1.025791058872652e+03,
- 1.026292606401927e+03, 1.026792664553298e+03, 1.027291243104294e+03, 1.027788351733803e+03, 1.028284000023409e+03,
- 1.028778197458716e+03, 1.029270953430647e+03, 1.029762277236718e+03, 1.030252178082294e+03, 1.030740665081820e+03,
- 1.031227747260036e+03, 1.031713433553166e+03, 1.032197732810095e+03, 1.032680653793514e+03, 1.033162205181059e+03,
- 1.033642395566425e+03, 1.034121233460457e+03, 1.034598727292236e+03, 1.035074885410132e+03, 1.035549716082853e+03,
- 1.036023227500467e+03, 1.036495427775412e+03, 1.036966324943491e+03, 1.037435926964846e+03, 1.037904241724923e+03,
- 1.038371277035416e+03, 1.038837040635197e+03, 1.039301540191234e+03, 1.039764783299491e+03, 1.040226777485816e+03,
- 1.040687530206816e+03, 1.041147048850713e+03, 1.041605340738193e+03, 1.042062413123237e+03, 1.042518273193944e+03,
- 1.042972928073337e+03, 1.043426384820154e+03, 1.043878650429639e+03, 1.044329731834304e+03, 1.044779635904694e+03,
- 1.045228369450130e+03, 1.045675939219449e+03, 1.046122351901727e+03, 1.046567614126990e+03, 1.047011732466922e+03,
- 1.047454713435555e+03, 1.047896563489952e+03, 1.048337289030879e+03, 1.048776896403466e+03, 1.049215391897860e+03,
- 1.049652781749869e+03, 1.050089072141592e+03, 1.050524269202047e+03, 1.050958379007783e+03, 1.051391407583485e+03,
- 1.051823360902575e+03, 1.052254244887795e+03, 1.052684065411791e+03, 1.053112828297685e+03, 1.053540539319633e+03,
- 1.053967204203384e+03, 1.054392828626830e+03, 1.054817418220539e+03, 1.055240978568292e+03, 1.055663515207606e+03,
- 1.056085033630247e+03, 1.056505539282748e+03, 1.056925037566902e+03, 1.057343533840265e+03, 1.057761033416641e+03,
- 1.058177541566565e+03, 1.058593063517773e+03, 1.059007604455682e+03, 1.059421169523839e+03, 1.059833763824386e+03,
- 1.060245392418506e+03, 1.060656060326864e+03, 1.061065772530050e+03, 1.061474533969005e+03, 1.061882349545449e+03,
- 1.062289224122301e+03, 1.062695162524093e+03, 1.063100169537376e+03, 1.063504249911126e+03, 1.063907408357142e+03,
- 1.064309649550435e+03, 1.064710978129619e+03, 1.065111398697290e+03, 1.065510915820407e+03, 1.065909534030656e+03,
- 1.066307257824827e+03, 1.066704091665172e+03, 1.067100039979759e+03, 1.067495107162831e+03, 1.067889297575151e+03,
- 1.068282615544346e+03, 1.068675065365247e+03, 1.069066651300224e+03, 1.069457377579517e+03, 1.069847248401563e+03,
- 1.070236267933314e+03, 1.070624440310562e+03, 1.071011769638246e+03, 1.071398259990770e+03, 1.071783915412304e+03,
- 1.072168739917084e+03, 1.072552737489717e+03, 1.072935912085474e+03, 1.073318267630576e+03, 1.073699808022488e+03,
- 1.074080537130199e+03, 1.074460458794505e+03, 1.074839576828284e+03, 1.075217895016769e+03, 1.075595417117819e+03,
- 1.075972146862189e+03, 1.076348087953786e+03, 1.076723244069937e+03, 1.077097618861641e+03, 1.077471215953827e+03,
- 1.077844038945599e+03, 1.078216091410492e+03, 1.078587376896708e+03, 1.078957898927366e+03, 1.079327661000736e+03,
- 1.079696666590477e+03, 1.080064919145868e+03, 1.080432422092042e+03, 1.080799178830214e+03, 1.081165192737900e+03,
- 1.081530467169147e+03, 1.081895005454749e+03, 1.082258810902464e+03, 1.082621886797230e+03, 1.082984236401377e+03,
- 1.083345862954834e+03, 1.083706769675342e+03, 1.084066959758653e+03, 1.084426436378734e+03, 1.084785202687970e+03,
- 1.085143261817358e+03, 1.085500616876705e+03, 1.085857270954819e+03, 1.086213227119702e+03, 1.086568488418740e+03,
- 1.086923057878884e+03, 1.087276938506842e+03, 1.087630133289256e+03, 1.087982645192885e+03, 1.088334477164781e+03,
- 1.088685632132470e+03, 1.089036113004120e+03, 1.089385922668721e+03, 1.089735063996246e+03, 1.090083539837828e+03,
- 1.090431353025924e+03, 1.090778506374477e+03, 1.091125002679083e+03, 1.091470844717149e+03, 1.091816035248055e+03,
- 1.092160577013310e+03, 1.092504472736710e+03, 1.092847725124487e+03, 1.093190336865470e+03, 1.093532310631226e+03,
- 1.093873649076219e+03, 1.094214354837949e+03, 1.094554430537105e+03, 1.094893878777704e+03, 1.095232702147236e+03
- },
- {
- 1.673615631652367e+00, 5.100232496994529e+00, 8.585143167596573e+00, 1.213080178788456e+01, 1.573982944905514e+01,
- 1.941502960919761e+01, 2.315940533617886e+01, 2.697617864377811e+01, 3.086881223069592e+01, 3.484103399522613e+01,
- 3.889686476338296e+01, 4.304064975271849e+01, 4.727709439597760e+01, 5.161130527425928e+01, 5.604883706457151e+01,
- 6.059574659971076e+01, 6.525865537987170e+01, 7.004482217971119e+01, 7.496222777918376e+01, 8.001967433911553e+01,
- 8.522690257331237e+01, 9.059473068761783e+01, 9.613522012398771e+01, 1.018618745531270e+02, 1.077898804254272e+02,
- 1.139363998909067e+02, 1.203209302832266e+02, 1.269657489895802e+02, 1.338964689212766e+02, 1.411427387512712e+02,
- 1.487391345934120e+02, 1.567263081667201e+02, 1.651524821308342e+02, 1.740754219211079e+02, 1.835650695507206e+02,
- 1.937071085469176e+02, 2.046078527222149e+02, 2.164010298114432e+02, 2.292572708091434e+02, 2.433973730215468e+02,
- 2.591104351218403e+02, 2.767768533729572e+02, 2.968911416023128e+02, 3.200644958600786e+02, 3.469581056702304e+02,
- 3.780662069098050e+02, 4.131544259375623e+02, 4.501589759889115e+02, 4.854809564717429e+02, 5.168775367264767e+02,
- 5.436105120138599e+02, 5.660463392733305e+02, 5.849977351631270e+02, 6.012457833108062e+02, 6.153984641577770e+02,
- 6.279025816130405e+02, 6.390858496421730e+02, 6.491923246025837e+02, 6.584071681852563e+02, 6.668734116291002e+02,
- 6.747033924144378e+02, 6.819866843082134e+02, 6.887956918662392e+02, 6.951896651569709e+02, 7.012176290490410e+02,
- 7.069205548384122e+02, 7.123329945002185e+02, 7.174843277196649e+02, 7.223997255952428e+02, 7.271009040160731e+02,
- 7.316067188031077e+02, 7.359336403376559e+02, 7.400961353810745e+02, 7.441069766956197e+02, 7.479774959814326e+02,
- 7.517177919353654e+02, 7.553369025030277e+02, 7.588429483566073e+02, 7.622432530949842e+02, 7.655444444942792e+02,
- 7.687525402407281e+02, 7.718730208846887e+02, 7.749108922147910e+02, 7.778707388279871e+02, 7.807567703372573e+02,
- 7.835728613936560e+02, 7.863225864878170e+02, 7.890092503262979e+02, 7.916359144412576e+02, 7.942054205810565e+02,
- 7.967204113391160e+02, 7.991833484045217e+02, 8.015965287572770e+02, 8.039620990811133e+02, 8.062820686253878e+02,
- 8.085583207132092e+02, 8.107926230642346e+02, 8.129866370765432e+02, 8.151419261918138e+02, 8.172599634509778e+02,
- 8.193421383331279e+02, 8.213897629582203e+02, 8.234040777236710e+02, 8.253862564360669e+02, 8.273374109915660e+02,
- 8.292585956520061e+02, 8.311508109580949e+02, 8.330150073161584e+02, 8.348520882906993e+02, 8.366629136313459e+02,
- 8.384483020595458e+02, 8.402090338375829e+02, 8.419458531400453e+02, 8.436594702457065e+02, 8.453505635659200e+02,
- 8.470197815239436e+02, 8.486677442981497e+02, 8.502950454407821e+02, 8.519022533827566e+02, 8.534899128339918e+02,
- 8.550585460878441e+02, 8.566086542373978e+02, 8.581407183106562e+02, 8.596552003310263e+02, 8.611525443088863e+02,
- 8.626331771695482e+02, 8.640975096224271e+02, 8.655459369758006e+02, 8.669788399012181e+02, 8.683965851579242e+02,
- 8.697995263006654e+02, 8.711880042872436e+02, 8.725623480598837e+02, 8.739228737326574e+02, 8.752698897821840e+02,
- 8.766036914695439e+02, 8.779245649456832e+02, 8.792327868060138e+02, 8.805286246092503e+02, 8.818123372079549e+02,
- 8.830841751415347e+02, 8.843443809920942e+02, 8.855931897214570e+02, 8.868308289905473e+02, 8.880575194466729e+02,
- 8.892734750743184e+02, 8.904789033703723e+02, 8.916740056696143e+02, 8.928589773737293e+02, 8.940340081852256e+02,
- 8.951992823299231e+02, 8.963549787686694e+02, 8.975012713989053e+02, 8.986383292466519e+02, 8.997663166494663e+02,
- 9.008853934308564e+02, 9.019957150666422e+02, 9.030974328436967e+02, 9.041906940228366e+02, 9.052756419369372e+02,
- 9.063524162009863e+02, 9.074211527950249e+02, 9.084819842031837e+02, 9.095350395345524e+02, 9.105804446388482e+02,
- 9.116183222171460e+02, 9.126487919279143e+02, 9.136719704886019e+02, 9.146879717729946e+02, 9.156969069045473e+02,
- 9.166988843458975e+02, 9.176940099847405e+02, 9.186823872162388e+02, 9.196641170221438e+02, 9.206392980467753e+02,
- 9.216080266700110e+02, 9.225703968384395e+02, 9.235265010674913e+02, 9.244764291347796e+02, 9.254202690372359e+02,
- 9.263581068321042e+02, 9.272900266946918e+02, 9.282161109739566e+02, 9.291364402460490e+02, 9.300510933658766e+02,
- 9.309601475167966e+02, 9.318636782585093e+02, 9.327617595732276e+02, 9.336544639102054e+02, 9.345418622286834e+02,
- 9.354240240393324e+02, 9.363010174442438e+02, 9.371729091755415e+02, 9.380397646326570e+02, 9.389016479183390e+02,
- 9.397586218734367e+02, 9.406107481105117e+02, 9.414580870463275e+02, 9.423006979332575e+02, 9.431386388896545e+02,
- 9.439719669292310e+02, 9.448007379894754e+02, 9.456250069591533e+02, 9.464448277049265e+02, 9.472602530971161e+02,
- 9.480713350346565e+02, 9.488781244692590e+02, 9.496806714288192e+02, 9.504790250400986e+02, 9.512732335507013e+02,
- 9.520633443503843e+02, 9.528494039917063e+02, 9.536314582100631e+02, 9.544095519431072e+02, 9.551837293495976e+02,
- 9.559540338276796e+02, 9.567205080326316e+02, 9.574831938940843e+02, 9.582421326327395e+02, 9.589973647766088e+02,
- 9.597489301767738e+02, 9.604968680227013e+02, 9.612412168571220e+02, 9.619820145904822e+02, 9.627192985149982e+02,
- 9.634531053183042e+02, 9.641834710967307e+02, 9.649104309226109e+02, 9.656340206204286e+02, 9.663542741613314e+02,
- 9.670712254020125e+02, 9.677849076689600e+02, 9.684953537697046e+02, 9.692025960037630e+02, 9.699066661732902e+02,
- 9.706075955934529e+02, 9.713054151025248e+02, 9.720001550717252e+02, 9.726918454147949e+02, 9.733805155973273e+02,
- 9.740661946458622e+02, 9.747489111567396e+02, 9.754286933047375e+02, 9.761055688514820e+02, 9.767795651536537e+02,
- 9.774507091709819e+02, 9.781190274740439e+02, 9.787845462518701e+02, 9.794472913193581e+02, 9.801072881245144e+02,
- 9.807645617555058e+02, 9.814191369475516e+02, 9.820710380896451e+02, 9.827202892311087e+02, 9.833669140880008e+02,
- 9.840109360493661e+02, 9.846523781833370e+02, 9.852912632430938e+02, 9.859276136726818e+02, 9.865614516126986e+02,
- 9.871927989058436e+02, 9.878216771023401e+02, 9.884481074652404e+02, 9.890721109755966e+02, 9.896937083375262e+02,
- 9.903129199831549e+02, 9.909297660774517e+02, 9.915442665229559e+02, 9.921564409643939e+02, 9.927663087932015e+02,
- 9.933738891519391e+02, 9.939792009386118e+02, 9.945822628108972e+02, 9.951830931902778e+02, 9.957817102660856e+02,
- 9.963781319994604e+02, 9.969723761272185e+02, 9.975644601656429e+02, 9.981544014141946e+02, 9.987422169591355e+02,
- 9.993279236770863e+02, 9.999115382385040e+02, 1.000493077111084e+03, 1.001072556563100e+03, 1.001649992666663e+03,
- 1.002225401300922e+03, 1.002798798155201e+03, 1.003370198732055e+03, 1.003939618350286e+03, 1.004507072147883e+03,
- 1.005072575084908e+03, 1.005636141946320e+03, 1.006197787344750e+03, 1.006757525723212e+03, 1.007315371357762e+03,
- 1.007871338360115e+03, 1.008425440680192e+03, 1.008977692108633e+03, 1.009528106279249e+03, 1.010076696671441e+03,
- 1.010623476612552e+03, 1.011168459280195e+03, 1.011711657704517e+03, 1.012253084770436e+03, 1.012792753219823e+03,
- 1.013330675653649e+03, 1.013866864534091e+03, 1.014401332186598e+03, 1.014934090801911e+03, 1.015465152438062e+03,
- 1.015994529022317e+03, 1.016522232353094e+03, 1.017048274101847e+03, 1.017572665814904e+03, 1.018095418915286e+03,
- 1.018616544704480e+03, 1.019136054364189e+03, 1.019653958958044e+03, 1.020170269433291e+03, 1.020684996622439e+03,
- 1.021198151244890e+03, 1.021709743908528e+03, 1.022219785111291e+03, 1.022728285242706e+03, 1.023235254585400e+03,
- 1.023740703316590e+03, 1.024244641509535e+03, 1.024747079134977e+03, 1.025248026062542e+03, 1.025747492062131e+03,
- 1.026245486805278e+03, 1.026742019866482e+03, 1.027237100724532e+03, 1.027730738763787e+03, 1.028222943275453e+03,
- 1.028713723458831e+03, 1.029203088422538e+03, 1.029691047185722e+03, 1.030177608679241e+03, 1.030662781746834e+03,
- 1.031146575146264e+03, 1.031628997550452e+03, 1.032110057548579e+03, 1.032589763647182e+03, 1.033068124271227e+03,
- 1.033545147765161e+03, 1.034020842393955e+03, 1.034495216344121e+03, 1.034968277724723e+03, 1.035440034568355e+03,
- 1.035910494832128e+03, 1.036379666398617e+03, 1.036847557076804e+03, 1.037314174603010e+03, 1.037779526641802e+03,
- 1.038243620786894e+03, 1.038706464562030e+03, 1.039168065421852e+03, 1.039628430752759e+03, 1.040087567873747e+03,
- 1.040545484037242e+03, 1.041002186429911e+03, 1.041457682173476e+03, 1.041911978325495e+03, 1.042365081880147e+03,
- 1.042816999769004e+03, 1.043267738861776e+03, 1.043717305967065e+03, 1.044165707833096e+03, 1.044612951148436e+03,
- 1.045059042542709e+03, 1.045503988587294e+03, 1.045947795796016e+03, 1.046390470625830e+03, 1.046832019477481e+03,
- 1.047272448696172e+03, 1.047711764572213e+03, 1.048149973341657e+03, 1.048587081186938e+03, 1.049023094237483e+03,
- 1.049458018570336e+03, 1.049891860210754e+03, 1.050324625132803e+03, 1.050756319259949e+03, 1.051186948465630e+03,
- 1.051616518573828e+03, 1.052045035359635e+03, 1.052472504549797e+03, 1.052898931823268e+03, 1.053324322811745e+03,
- 1.053748683100195e+03, 1.054172018227384e+03, 1.054594333686387e+03, 1.055015634925098e+03, 1.055435927346733e+03,
- 1.055855216310321e+03, 1.056273507131190e+03, 1.056690805081454e+03, 1.057107115390479e+03, 1.057522443245355e+03,
- 1.057936793791355e+03, 1.058350172132389e+03, 1.058762583331454e+03, 1.059174032411075e+03, 1.059584524353741e+03,
- 1.059994064102334e+03, 1.060402656560558e+03, 1.060810306593351e+03, 1.061217019027303e+03, 1.061622798651063e+03,
- 1.062027650215736e+03, 1.062431578435289e+03, 1.062834587986932e+03, 1.063236683511512e+03, 1.063637869613891e+03,
- 1.064038150863321e+03, 1.064437531793817e+03, 1.064836016904523e+03, 1.065233610660074e+03, 1.065630317490951e+03,
- 1.066026141793833e+03, 1.066421087931947e+03, 1.066815160235409e+03, 1.067208363001563e+03, 1.067600700495317e+03,
- 1.067992176949468e+03, 1.068382796565036e+03, 1.068772563511576e+03, 1.069161481927504e+03, 1.069549555920403e+03,
- 1.069936789567341e+03, 1.070323186915167e+03, 1.070708751980820e+03, 1.071093488751624e+03, 1.071477401185583e+03,
- 1.071860493211671e+03, 1.072242768730119e+03, 1.072624231612698e+03, 1.073004885703000e+03, 1.073384734816713e+03,
- 1.073763782741894e+03, 1.074142033239242e+03, 1.074519490042358e+03, 1.074896156858013e+03, 1.075272037366407e+03,
- 1.075647135221424e+03, 1.076021454050886e+03, 1.076394997456805e+03, 1.076767769015629e+03, 1.077139772278486e+03,
- 1.077511010771428e+03, 1.077881487995665e+03, 1.078251207427808e+03, 1.078620172520095e+03, 1.078988386700622e+03,
- 1.079355853373574e+03, 1.079722575919450e+03, 1.080088557695280e+03, 1.080453802034848e+03, 1.080818312248908e+03,
- 1.081182091625401e+03, 1.081545143429662e+03, 1.081907470904633e+03, 1.082269077271067e+03, 1.082629965727737e+03,
- 1.082990139451633e+03, 1.083349601598165e+03, 1.083708355301360e+03, 1.084066403674056e+03, 1.084423749808097e+03,
- 1.084780396774521e+03, 1.085136347623752e+03, 1.085491605385783e+03, 1.085846173070363e+03, 1.086200053667176e+03,
- 1.086553250146028e+03, 1.086905765457016e+03, 1.087257602530708e+03, 1.087608764278322e+03, 1.087959253591891e+03,
- 1.088309073344436e+03, 1.088658226390136e+03, 1.089006715564491e+03, 1.089354543684490e+03, 1.089701713548772e+03,
- 1.090048227937788e+03, 1.090394089613958e+03, 1.090739301321832e+03, 1.091083865788241e+03, 1.091427785722459e+03,
- 1.091771063816344e+03, 1.092113702744501e+03, 1.092455705164420e+03, 1.092797073716631e+03, 1.093137811024847e+03
- },
- {
- 1.668182712325880e+00, 5.083216533766599e+00, 8.555692447125841e+00, 1.208799412799323e+01, 1.568266486994490e+01,
- 1.934242206070560e+01, 2.307017333497581e+01, 2.686903464767809e+01, 3.074235054497155e+01, 3.469371696641610e+01,
- 3.872700696793549e+01, 4.284639982860940e+01, 4.705641409230098e+01, 5.136194520291266e+01, 5.576830852463120e+01,
- 6.028128870240695e+01, 6.490719652166233e+01, 6.965293468095099e+01, 7.452607421216132e+01, 7.953494368779620e+01,
- 8.468873387343675e+01, 8.999762114609547e+01, 9.547291385795513e+01, 1.011272269424982e+02, 1.069746915274289e+02,
- 1.130312082610935e+02, 1.193147556521225e+02, 1.258457682145443e+02, 1.326476039578195e+02, 1.397471272901478e+02,
- 1.471754423256751e+02, 1.549688244573096e+02, 1.631699154274261e+02, 1.718292727310304e+02, 1.810073999567000e+02,
- 1.907774359581414e+02, 2.012287527402889e+02, 2.124718094085293e+02, 2.246447288492400e+02, 2.379221683549627e+02,
- 2.525270003753703e+02, 2.687446419316576e+02, 2.869372931284125e+02, 3.075481066308228e+02, 3.310706996580825e+02,
- 3.579435652080397e+02, 3.883121462093201e+02, 4.215238284953771e+02, 4.555279307247923e+02, 4.876651563594154e+02,
- 5.164426910670059e+02, 5.413535376764013e+02, 5.626500576215921e+02, 5.809183040439510e+02, 5.967606990560154e+02,
- 6.106756461454477e+02, 6.230463357191056e+02, 6.341626972276912e+02, 6.442454550442459e+02, 6.534648889994785e+02,
- 6.619543058227705e+02, 6.698195699540971e+02, 6.771458848208119e+02, 6.840026739914225e+02, 6.904471416320400e+02,
- 6.965269057254214e+02, 7.022819726067435e+02, 7.077462375747225e+02, 7.129486399215863e+02, 7.179140625443347e+02,
- 7.226640402730902e+02, 7.272173231449782e+02, 7.315903283922414e+02, 7.357975061348660e+02, 7.398516375011080e+02,
- 7.437640793657954e+02, 7.475449665741361e+02, 7.512033800545935e+02, 7.547474873757853e+02, 7.581846609012180e+02,
- 7.615215776234169e+02, 7.647643039316523e+02, 7.679183679237967e+02, 7.709888213686797e+02, 7.739802930277550e+02,
- 7.768970347294933e+02, 7.797429613382978e+02, 7.825216855579220e+02, 7.852365483467332e+02, 7.878906455903597e+02,
- 7.904868515701587e+02, 7.930278396783063e+02, 7.955161007584619e+02, 7.979539593917996e+02, 8.003435883991639e+02,
- 8.026870217895328e+02, 8.049861663510345e+02, 8.072428120524808e+02, 8.094586413995829e+02, 8.116352378700024e+02,
- 8.137740935344991e+02, 8.158766159570574e+02, 8.179441344547420e+02, 8.199779057875996e+02, 8.219791193400365e+02,
- 8.239489018475141e+02, 8.258883217157726e+02, 8.277983929742144e+02, 8.296800789001110e+02, 8.315342953461037e+02,
- 8.333619137997511e+02, 8.351637642006582e+02, 8.369406375379378e+02, 8.386932882482582e+02, 8.404224364326030e+02,
- 8.421287699079530e+02, 8.438129461084283e+02, 8.454755938489557e+02, 8.471173149632248e+02, 8.487386858265032e+02,
- 8.503402587729122e+02, 8.519225634157708e+02, 8.534861078788783e+02, 8.550313799458054e+02, 8.565588481336624e+02,
- 8.580689626972016e+02, 8.595621565685893e+02, 8.610388462377263e+02, 8.624994325775473e+02, 8.639443016201526e+02,
- 8.653738253133904e+02, 8.667883621986056e+02, 8.681882580266343e+02, 8.695738452316884e+02, 8.709454472923242e+02,
- 8.723033743554900e+02, 8.736479266627032e+02, 8.749793943604534e+02, 8.762980579512406e+02, 8.776041887197485e+02,
- 8.788980491357863e+02, 8.801798932354758e+02, 8.814499669660343e+02, 8.827085085932194e+02, 8.839557489244029e+02,
- 8.851919116845341e+02, 8.864172137898596e+02, 8.876318656244979e+02, 8.888360713031209e+02, 8.900300289205550e+02,
- 8.912139307890737e+02, 8.923879636641094e+02, 8.935523089590399e+02, 8.947071429496949e+02, 8.958526369691415e+02,
- 8.969889575933131e+02, 8.981162668179900e+02, 8.992347222398400e+02, 9.003444771672727e+02, 9.014456808515951e+02,
- 9.025384785808067e+02, 9.036230118335800e+02, 9.046994184133729e+02, 9.057678325766703e+02, 9.068283851556562e+02,
- 9.078812036756035e+02, 9.089264124672532e+02, 9.099641327744389e+02, 9.109944828571865e+02, 9.120175780905352e+02,
- 9.130335310592596e+02, 9.140424516487291e+02, 9.150444471320684e+02, 9.160396222538076e+02, 9.170280793101871e+02,
- 9.180099182262807e+02, 9.189852366300804e+02, 9.199541299236945e+02, 9.209166913517822e+02, 9.218730117731233e+02,
- 9.228231808763356e+02, 9.237672855475414e+02, 9.247054110351000e+02, 9.256376407349743e+02, 9.265640562450633e+02,
- 9.274847374175532e+02, 9.283997624093519e+02, 9.293092077306970e+02, 9.302131482920266e+02, 9.311116574491691e+02,
- 9.320048070469352e+02, 9.328926674611828e+02, 9.337753076394066e+02, 9.346527951399227e+02, 9.355251961697090e+02,
- 9.363925756209485e+02, 9.372549971063306e+02, 9.381125229931682e+02, 9.389652144363687e+02, 9.398131314103097e+02,
- 9.406563327396632e+02, 9.414948761292097e+02, 9.423288181926763e+02, 9.431582144806479e+02, 9.439831195075773e+02,
- 9.448035867779338e+02, 9.456196688115244e+02, 9.464314171680126e+02, 9.472388824706708e+02, 9.480421144293994e+02,
- 9.488411618630254e+02, 9.496360727209208e+02, 9.504268941039642e+02, 9.512136722848599e+02, 9.519964527278480e+02,
- 9.527752801078274e+02, 9.535501983289025e+02, 9.543212505423870e+02, 9.550884791642775e+02, 9.558519258922140e+02,
- 9.566116317219497e+02, 9.573676369633447e+02, 9.581199812559023e+02, 9.588687035838581e+02, 9.596138422908484e+02,
- 9.603554350941554e+02, 9.610935190985632e+02, 9.618281308098192e+02, 9.625593056898016e+02, 9.632870799817310e+02,
- 9.640114880321544e+02, 9.647325640780517e+02, 9.654503418193457e+02, 9.661648544302977e+02, 9.668761345706173e+02,
- 9.675842143962568e+02, 9.682891255699351e+02, 9.689908992713786e+02, 9.696895662072899e+02, 9.703851566210674e+02,
- 9.710777003022617e+02, 9.717672265957996e+02, 9.724537644109599e+02, 9.731373422301353e+02, 9.738179881173561e+02,
- 9.744957297266113e+02, 9.751705943099560e+02, 9.758426087254170e+02, 9.765117994447050e+02, 9.771781925607316e+02,
- 9.778418137949450e+02, 9.785026885044873e+02, 9.791608416891761e+02, 9.798162979983175e+02, 9.804690817373554e+02,
- 9.811192168743635e+02, 9.817667270463796e+02, 9.824116355655933e+02, 9.830539654253823e+02, 9.836937393062154e+02,
- 9.843309795814112e+02, 9.849657083227652e+02, 9.855979473060464e+02, 9.862277180163691e+02, 9.868550416534379e+02,
- 9.874799391366799e+02, 9.881024311102548e+02, 9.887225379479519e+02, 9.893402797579812e+02, 9.899556763876565e+02,
- 9.905687474279696e+02, 9.911795122180707e+02, 9.917879898496445e+02, 9.923941991711908e+02, 9.929981587922149e+02,
- 9.935998870873266e+02, 9.941994022002451e+02, 9.947967220477238e+02, 9.953918643233901e+02, 9.959848465014985e+02,
- 9.965756858406124e+02, 9.971643993871987e+02, 9.977510039791533e+02, 9.983355162492506e+02, 9.989179526285219e+02,
- 9.994983293495612e+02, 1.000076662449766e+03, 1.000652967774507e+03, 1.001227260980241e+03, 1.001799557537546e+03,
- 1.002369872734115e+03, 1.002938221677668e+03, 1.003504619298817e+03, 1.004069080353876e+03, 1.004631619427607e+03,
- 1.005192250935914e+03, 1.005750989128486e+03, 1.006307848091387e+03, 1.006862841749593e+03, 1.007415983869480e+03,
- 1.007967288061268e+03, 1.008516767781408e+03, 1.009064436334935e+03, 1.009610306877767e+03, 1.010154392418960e+03,
- 1.010696705822927e+03, 1.011237259811606e+03, 1.011776066966595e+03, 1.012313139731239e+03, 1.012848490412685e+03,
- 1.013382131183896e+03, 1.013914074085620e+03, 1.014444331028337e+03, 1.014972913794161e+03, 1.015499834038703e+03,
- 1.016025103292910e+03, 1.016548732964863e+03, 1.017070734341547e+03, 1.017591118590586e+03, 1.018109896761941e+03,
- 1.018627079789595e+03, 1.019142678493187e+03, 1.019656703579632e+03, 1.020169165644700e+03, 1.020680075174583e+03,
- 1.021189442547417e+03, 1.021697278034786e+03, 1.022203591803202e+03, 1.022708393915553e+03, 1.023211694332531e+03,
- 1.023713502914030e+03, 1.024213829420523e+03, 1.024712683514419e+03, 1.025210074761387e+03, 1.025706012631668e+03,
- 1.026200506501357e+03, 1.026693565653667e+03, 1.027185199280168e+03, 1.027675416482014e+03, 1.028164226271137e+03,
- 1.028651637571431e+03, 1.029137659219910e+03, 1.029622299967850e+03, 1.030105568481914e+03, 1.030587473345251e+03,
- 1.031068023058587e+03, 1.031547226041287e+03, 1.032025090632412e+03, 1.032501625091747e+03, 1.032976837600822e+03,
- 1.033450736263908e+03, 1.033923329109004e+03, 1.034394624088804e+03, 1.034864629081653e+03, 1.035333351892477e+03,
- 1.035800800253718e+03, 1.036266981826228e+03, 1.036731904200175e+03, 1.037195574895916e+03, 1.037658001364863e+03,
- 1.038119190990340e+03, 1.038579151088417e+03, 1.039037888908741e+03, 1.039495411635344e+03, 1.039951726387450e+03,
- 1.040406840220256e+03, 1.040860760125719e+03, 1.041313493033306e+03, 1.041765045810765e+03, 1.042215425264847e+03,
- 1.042664638142054e+03, 1.043112691129346e+03, 1.043559590854856e+03, 1.044005343888584e+03, 1.044449956743088e+03,
- 1.044893435874159e+03, 1.045335787681486e+03, 1.045777018509322e+03, 1.046217134647118e+03, 1.046656142330175e+03,
- 1.047094047740262e+03, 1.047530857006242e+03, 1.047966576204680e+03, 1.048401211360444e+03, 1.048834768447299e+03,
- 1.049267253388493e+03, 1.049698672057330e+03, 1.050129030277738e+03, 1.050558333824830e+03, 1.050986588425456e+03,
- 1.051413799758744e+03, 1.051839973456639e+03, 1.052265115104430e+03, 1.052689230241271e+03, 1.053112324360695e+03,
- 1.053534402911119e+03, 1.053955471296347e+03, 1.054375534876059e+03, 1.054794598966296e+03, 1.055212668839945e+03,
- 1.055629749727203e+03, 1.056045846816047e+03, 1.056460965252694e+03, 1.056875110142053e+03, 1.057288286548173e+03,
- 1.057700499494679e+03, 1.058111753965216e+03, 1.058522054903866e+03, 1.058931407215583e+03, 1.059339815766603e+03,
- 1.059747285384857e+03, 1.060153820860379e+03, 1.060559426945707e+03, 1.060964108356276e+03, 1.061367869770811e+03,
- 1.061770715831710e+03, 1.062172651145426e+03, 1.062573680282842e+03, 1.062973807779640e+03, 1.063373038136663e+03,
- 1.063771375820286e+03, 1.064168825262758e+03, 1.064565390862565e+03, 1.064961076984770e+03, 1.065355887961357e+03,
- 1.065749828091568e+03, 1.066142901642239e+03, 1.066535112848127e+03, 1.066926465912233e+03, 1.067316965006128e+03,
- 1.067706614270265e+03, 1.068095417814295e+03, 1.068483379717373e+03, 1.068870504028464e+03, 1.069256794766645e+03,
- 1.069642255921402e+03, 1.070026891452923e+03, 1.070410705292386e+03, 1.070793701342248e+03, 1.071175883476528e+03,
- 1.071557255541084e+03, 1.071937821353890e+03, 1.072317584705308e+03, 1.072696549358358e+03, 1.073074719048982e+03,
- 1.073452097486309e+03, 1.073828688352910e+03, 1.074204495305060e+03, 1.074579521972985e+03, 1.074953771961116e+03,
- 1.075327248848335e+03, 1.075699956188219e+03, 1.076071897509279e+03, 1.076443076315201e+03, 1.076813496085082e+03,
- 1.077183160273655e+03, 1.077552072311532e+03, 1.077920235605417e+03, 1.078287653538340e+03, 1.078654329469874e+03,
- 1.079020266736357e+03, 1.079385468651104e+03, 1.079749938504627e+03, 1.080113679564842e+03, 1.080476695077278e+03,
- 1.080838988265288e+03, 1.081200562330246e+03, 1.081561420451756e+03, 1.081921565787846e+03, 1.082281001475169e+03,
- 1.082639730629197e+03, 1.082997756344410e+03, 1.083355081694491e+03, 1.083711709732514e+03, 1.084067643491126e+03,
- 1.084422885982737e+03, 1.084777440199697e+03, 1.085131309114477e+03, 1.085484495679849e+03, 1.085837002829061e+03,
- 1.086188833476008e+03, 1.086539990515408e+03, 1.086890476822968e+03, 1.087240295255559e+03, 1.087589448651372e+03,
- 1.087937939830091e+03, 1.088285771593053e+03, 1.088632946723407e+03, 1.088979467986275e+03, 1.089325338128909e+03,
- 1.089670559880845e+03, 1.090015135954058e+03, 1.090359069043117e+03, 1.090702361825329e+03, 1.091045016960894e+03
- },
- {
- 1.662785444283274e+00, 5.066318490465886e+00, 8.526457120341686e+00, 1.204551670811607e+01, 1.562596525069569e+01,
- 1.927043695800166e+01, 2.298174738537926e+01, 2.676291032773751e+01, 3.061715672373820e+01, 3.454795586812902e+01,
- 3.855903927893006e+01, 4.265442762994337e+01, 4.683846123494560e+01, 5.111583466246233e+01, 5.549163617317745e+01,
- 5.997139281112727e+01, 6.456112215166463e+01, 6.926739192263408e+01, 7.409738898175982e+01, 7.905899946871237e+01,
- 8.416090237268692e+01, 8.941267929683735e+01, 9.482494388924303e+01, 1.004094953004241e+02, 1.061795011819311e+02,
- 1.121497172507210e+02, 1.183367524335940e+02, 1.247593912470329e+02, 1.314389886005692e+02, 1.383999569732515e+02,
- 1.456703724017827e+02, 1.532827344039421e+02, 1.612749275133984e+02, 1.696914482261421e+02, 1.785849848097789e+02,
- 1.880184686481310e+02, 1.980677580197992e+02, 2.088251684080960e+02, 2.204041216064836e+02, 2.329452218933596e+02,
- 2.466239943734372e+02, 2.616600925535158e+02, 2.783263785088730e+02, 2.969526035624883e+02, 3.179109061955500e+02,
- 3.415608448598726e+02, 3.681280253077286e+02, 3.974761217113130e+02, 4.287200525195435e+02, 4.600275675453333e+02,
- 4.894700664198596e+02, 5.160205745384360e+02, 5.393239487757140e+02, 5.595589253948581e+02, 5.771541639214389e+02,
- 5.925751210689214e+02, 6.062282050467753e+02, 6.184397025118914e+02, 6.294644208487762e+02, 6.395008189642899e+02,
- 6.487046368706452e+02, 6.571994489651838e+02, 6.650844767033462e+02, 6.724403188476194e+02, 6.793331692128666e+02,
- 6.858179473261063e+02, 6.919406466351687e+02, 6.977401159798742e+02, 7.032494269235847e+02, 7.084969352863206e+02,
- 7.135071143097177e+02, 7.183012152847796e+02, 7.228977963222952e+02, 7.273131492454626e+02, 7.315616469587544e+02,
- 7.356560281543291e+02, 7.396076322150732e+02, 7.434265942223789e+02, 7.471220077755929e+02, 7.507020616697857e+02,
- 7.541741552133650e+02, 7.575449959936257e+02, 7.608206831430587e+02, 7.640067785683910e+02, 7.671083681389897e+02,
- 7.701301144622637e+02, 7.730763025793530e+02, 7.759508796783745e+02, 7.787574897321915e+02, 7.814995038135701e+02,
- 7.841800467151461e+02, 7.868020203991708e+02, 7.893681247179504e+02, 7.918808757765548e+02, 7.943426222522144e+02,
- 7.967555599372084e+02, 7.991217447325205e+02, 8.014431042864308e+02, 8.037214484445143e+02, 8.059584786541318e+02,
- 8.081557964468551e+02, 8.103149111055591e+02, 8.124372466087799e+02, 8.145241479328605e+02, 8.165768867821188e+02,
- 8.185966668084445e+02, 8.205846283741338e+02, 8.225418529052864e+02, 8.244693668773891e+02, 8.263681454698913e+02,
- 8.282391159222873e+02, 8.300831606205741e+02, 8.319011199397105e+02, 8.336937948649056e+02, 8.354619494120991e+02,
- 8.372063128658339e+02, 8.389275818508129e+02, 8.406264222517649e+02, 8.423034709947531e+02, 8.439593377017471e+02,
- 8.455946062291247e+02, 8.472098360997240e+02, 8.488055638371529e+02, 8.503823042102409e+02, 8.519405513947823e+02,
- 8.534807800590653e+02, 8.550034463790967e+02, 8.565089889888985e+02, 8.579978298707844e+02, 8.594703752055366e+02,
- 8.609270161132278e+02, 8.623681294986486e+02, 8.637940786462705e+02, 8.652052129198639e+02, 8.666018715869498e+02,
- 8.679843802326020e+02, 8.693530537890008e+02, 8.707081964754541e+02, 8.720501022819271e+02, 8.733790554256601e+02,
- 8.746953307826664e+02, 8.759991942806482e+02, 8.772909033466925e+02, 8.785707071779773e+02, 8.798388471526157e+02,
- 8.810955571411087e+02, 8.823410638174324e+02, 8.835755869541908e+02, 8.847993397028057e+02, 8.860125288596407e+02,
- 8.872153551188858e+02, 8.884080133129976e+02, 8.895906926414024e+02, 8.907635768881565e+02, 8.919268446291800e+02,
- 8.930806694296663e+02, 8.942252200322159e+02, 8.953606605479592e+02, 8.964871505794214e+02, 8.976048454581148e+02,
- 8.987138963494418e+02, 8.998144504146917e+02, 9.009066509532813e+02, 9.019906375387152e+02, 9.030665461485912e+02,
- 9.041345092889754e+02, 9.051946561134126e+02, 9.062471125368713e+02, 9.072920013448579e+02, 9.083294422979642e+02,
- 9.093595522320539e+02, 9.103824451543222e+02, 9.113982323354187e+02, 9.124070223978315e+02, 9.134089214007139e+02,
- 9.144040329213170e+02, 9.153924581331944e+02, 9.163742958813375e+02, 9.173496427543690e+02, 9.183185931539490e+02,
- 9.192812393615096e+02, 9.202376712475143e+02, 9.211879777240174e+02, 9.221322447881853e+02, 9.230705568043090e+02,
- 9.240029963945464e+02, 9.249296443856355e+02, 9.258505798860584e+02, 9.267658803353349e+02, 9.276756215515571e+02,
- 9.285798777772184e+02, 9.294787217234283e+02, 9.303722246125662e+02, 9.312604562194492e+02, 9.321434849110733e+02,
- 9.330213776849857e+02, 9.338942002063461e+02, 9.347620168437304e+02, 9.356248907037256e+02, 9.364828836643719e+02,
- 9.373360564074843e+02, 9.381844684499147e+02, 9.390281781737835e+02, 9.398672428557313e+02, 9.407017186952154e+02,
- 9.415316608419054e+02, 9.423571234222001e+02, 9.431781595648989e+02, 9.439948214260718e+02, 9.448071602131448e+02,
- 9.456152262082365e+02, 9.464190687907732e+02, 9.472187364594137e+02, 9.480142768532950e+02, 9.488057367726428e+02,
- 9.495931621987530e+02, 9.503765983133844e+02, 9.511560895175602e+02, 9.519316794498278e+02, 9.527034110039673e+02,
- 9.534713263461944e+02, 9.542354669318569e+02, 9.549958735216468e+02, 9.557525861973551e+02, 9.565056443771709e+02,
- 9.572550868305443e+02, 9.580009516926386e+02, 9.587432764783669e+02, 9.594820976447431e+02, 9.602174523902477e+02,
- 9.609493760167423e+02, 9.616779036909298e+02, 9.624030700238587e+02, 9.631249090828023e+02, 9.638434544028186e+02,
- 9.645587389980027e+02, 9.652707953724364e+02, 9.659796555308470e+02, 9.666853509889930e+02, 9.673879127837642e+02,
- 9.680873714830353e+02, 9.687837571952474e+02, 9.694770995787584e+02, 9.701674278509388e+02, 9.708547707970492e+02,
- 9.715391567788814e+02, 9.722206137431920e+02, 9.728991692299129e+02, 9.735748503801683e+02, 9.742476839440840e+02,
- 9.749176962884101e+02, 9.755849134039497e+02, 9.762493609128161e+02, 9.769110640754994e+02, 9.775700477977771e+02,
- 9.782263366374477e+02, 9.788799548109075e+02, 9.795309261995704e+02, 9.801792743561349e+02, 9.808250225107039e+02,
- 9.814681935767575e+02, 9.821088101569940e+02, 9.827468945490263e+02, 9.833824687509523e+02, 9.840155544667956e+02,
- 9.846461731118195e+02, 9.852743458177252e+02, 9.859000934377253e+02, 9.865234365515067e+02, 9.871443954700831e+02,
- 9.877629902405351e+02, 9.883792406506498e+02, 9.889931662334513e+02, 9.896047862716362e+02, 9.902141198019134e+02,
- 9.908211856192407e+02, 9.914260022809773e+02, 9.920285881109459e+02, 9.926289612033999e+02, 9.932271394269170e+02,
- 9.938231404281977e+02, 9.944169816357929e+02, 9.950086802637458e+02, 9.955982533151612e+02, 9.961857175856977e+02,
- 9.967710896669904e+02, 9.973543859499950e+02, 9.979356226282715e+02, 9.985148157011945e+02, 9.990919809771023e+02,
- 9.996671340763730e+02, 1.000240290434449e+03, 1.000811465304796e+03, 1.001380673761794e+03, 1.001947930703585e+03,
- 1.002513250854854e+03, 1.003076648769557e+03, 1.003638138833595e+03, 1.004197735267433e+03, 1.004755452128675e+03,
- 1.005311303314576e+03, 1.005865302564520e+03, 1.006417463462436e+03, 1.006967799439178e+03, 1.007516323774849e+03,
- 1.008063049601091e+03, 1.008607989903327e+03, 1.009151157522952e+03, 1.009692565159498e+03, 1.010232225372750e+03,
- 1.010770150584813e+03, 1.011306353082164e+03, 1.011840845017637e+03, 1.012373638412398e+03, 1.012904745157861e+03,
- 1.013434177017585e+03, 1.013961945629128e+03, 1.014488062505868e+03, 1.015012539038792e+03, 1.015535386498254e+03,
- 1.016056616035698e+03, 1.016576238685349e+03, 1.017094265365881e+03, 1.017610706882048e+03, 1.018125573926286e+03,
- 1.018638877080294e+03, 1.019150626816575e+03, 1.019660833499964e+03, 1.020169507389114e+03, 1.020676658637972e+03,
- 1.021182297297215e+03, 1.021686433315670e+03, 1.022189076541708e+03, 1.022690236724608e+03, 1.023189923515907e+03,
- 1.023688146470721e+03, 1.024184915049042e+03, 1.024680238617021e+03, 1.025174126448217e+03, 1.025666587724839e+03,
- 1.026157631538955e+03, 1.026647266893688e+03, 1.027135502704388e+03, 1.027622347799790e+03, 1.028107810923146e+03,
- 1.028591900733340e+03, 1.029074625805991e+03, 1.029555994634531e+03, 1.030036015631265e+03, 1.030514697128419e+03,
- 1.030992047379169e+03, 1.031468074558646e+03, 1.031942786764942e+03, 1.032416192020080e+03, 1.032888298270982e+03,
- 1.033359113390417e+03, 1.033828645177932e+03, 1.034296901360772e+03, 1.034763889594786e+03, 1.035229617465311e+03,
- 1.035694092488053e+03, 1.036157322109947e+03, 1.036619313710004e+03, 1.037080074600150e+03, 1.037539612026046e+03,
- 1.037997933167895e+03, 1.038455045141246e+03, 1.038910954997775e+03, 1.039365669726056e+03, 1.039819196252326e+03,
- 1.040271541441235e+03, 1.040722712096580e+03, 1.041172714962036e+03, 1.041621556721873e+03, 1.042069244001657e+03,
- 1.042515783368948e+03, 1.042961181333987e+03, 1.043405444350365e+03, 1.043848578815691e+03, 1.044290591072247e+03,
- 1.044731487407629e+03, 1.045171274055389e+03, 1.045609957195655e+03, 1.046047542955753e+03, 1.046484037410811e+03,
- 1.046919446584360e+03, 1.047353776448927e+03, 1.047787032926613e+03, 1.048219221889671e+03, 1.048650349161067e+03,
- 1.049080420515042e+03, 1.049509441677656e+03, 1.049937418327338e+03, 1.050364356095413e+03, 1.050790260566630e+03,
- 1.051215137279682e+03, 1.051638991727720e+03, 1.052061829358853e+03, 1.052483655576651e+03, 1.052904475740630e+03,
- 1.053324295166741e+03, 1.053743119127844e+03, 1.054160952854180e+03, 1.054577801533836e+03, 1.054993670313201e+03,
- 1.055408564297418e+03, 1.055822488550831e+03, 1.056235448097422e+03, 1.056647447921247e+03, 1.057058492966861e+03,
- 1.057468588139742e+03, 1.057877738306706e+03, 1.058285948296316e+03, 1.058693222899293e+03, 1.059099566868906e+03,
- 1.059504984921376e+03, 1.059909481736260e+03, 1.060313061956834e+03, 1.060715730190478e+03, 1.061117491009040e+03,
- 1.061518348949217e+03, 1.061918308512909e+03, 1.062317374167585e+03, 1.062715550346634e+03, 1.063112841449718e+03,
- 1.063509251843115e+03, 1.063904785860062e+03, 1.064299447801093e+03, 1.064693241934367e+03, 1.065086172496003e+03,
- 1.065478243690397e+03, 1.065869459690546e+03, 1.066259824638365e+03, 1.066649342644995e+03, 1.067038017791113e+03,
- 1.067425854127240e+03, 1.067812855674030e+03, 1.068199026422581e+03, 1.068584370334718e+03, 1.068968891343285e+03,
- 1.069352593352429e+03, 1.069735480237885e+03, 1.070117555847253e+03, 1.070498824000273e+03, 1.070879288489097e+03,
- 1.071258953078555e+03, 1.071637821506426e+03, 1.072015897483694e+03, 1.072393184694808e+03, 1.072769686797941e+03,
- 1.073145407425237e+03, 1.073520350183067e+03, 1.073894518652266e+03, 1.074267916388387e+03, 1.074640546921935e+03,
- 1.075012413758606e+03, 1.075383520379522e+03, 1.075753870241462e+03, 1.076123466777094e+03, 1.076492313395198e+03,
- 1.076860413480894e+03, 1.077227770395858e+03, 1.077594387478546e+03, 1.077960268044405e+03, 1.078325415386091e+03,
- 1.078689832773678e+03, 1.079053523454863e+03, 1.079416490655182e+03, 1.079778737578203e+03, 1.080140267405733e+03,
- 1.080501083298016e+03, 1.080861188393930e+03, 1.081220585811182e+03, 1.081579278646498e+03, 1.081937269975817e+03,
- 1.082294562854473e+03, 1.082651160317389e+03, 1.083007065379254e+03, 1.083362281034707e+03, 1.083716810258516e+03,
- 1.084070656005757e+03, 1.084423821211988e+03, 1.084776308793422e+03, 1.085128121647102e+03, 1.085479262651067e+03,
- 1.085829734664521e+03, 1.086179540528002e+03, 1.086528683063539e+03, 1.086877165074823e+03, 1.087224989347362e+03,
- 1.087572158648639e+03, 1.087918675728274e+03, 1.088264543318174e+03, 1.088609764132691e+03, 1.088954340868772e+03
- },
- {
- 1.657423470762399e+00, 5.049537077316662e+00, 8.497434629153549e+00, 1.200336529196450e+01, 1.556972417611308e+01,
- 1.919906509548751e+01, 2.289411474448173e+01, 2.665778849097334e+01, 3.049320800750469e+01, 3.440372100715838e+01,
- 3.839292339253142e+01, 4.246468418159368e+01, 4.662317363964976e+01, 5.087289512600361e+01, 5.521872126049115e+01,
- 5.966593513301427e+01, 6.422027742408970e+01, 6.888800048318136e+01, 7.367593063332492e+01, 7.859154024697706e+01,
- 8.364303148531157e+01, 8.883943402905548e+01, 9.419071968585185e+01, 9.970793746522810e+01, 1.054033736225023e+02,
- 1.112907423475791e+02, 1.173854143024987e+02, 1.237046922110570e+02, 1.302681453365109e+02, 1.370980181701960e+02,
- 1.442197333167614e+02, 1.516625146411848e+02, 1.594601654068900e+02, 1.676520467490652e+02, 1.762843171472753e+02,
- 1.854115127251714e+02, 1.950985728620002e+02, 2.054234442374652e+02, 2.164804232290925e+02, 2.283844023493868e+02,
- 2.412761180057306e+02, 2.553282189422756e+02, 2.707511710949400e+02, 2.877960521981647e+02, 3.067473260290460e+02,
- 3.278930746210862e+02, 3.514573139615774e+02, 3.774805213279125e+02, 4.056235634670236e+02, 4.349220627977069e+02,
- 4.638376043336086e+02, 4.909778029302194e+02, 5.156128208370592e+02, 5.374900380075599e+02, 5.567393314224253e+02,
- 5.736789540717705e+02, 5.886700995785080e+02, 6.020431932347769e+02, 6.140744261627023e+02, 6.249863489173473e+02,
- 6.349563987376971e+02, 6.441262928118897e+02, 6.526100312485005e+02, 6.605001670087231e+02, 6.678725778555537e+02,
- 6.747900715549679e+02, 6.813051147090678e+02, 6.874619110908517e+02, 6.932979978913578e+02, 6.988454834034114e+02,
- 7.041320162413801e+02, 7.091815518340220e+02, 7.140149643503389e+02, 7.186505395834267e+02, 7.231043752268330e+02,
- 7.273907084081595e+02, 7.315221855625718e+02, 7.355100862165280e+02, 7.393645096460252e+02, 7.430945314194940e+02,
- 7.467083353546159e+02, 7.502133252845963e+02, 7.536162201532588e+02, 7.569231352750637e+02, 7.601396520592122e+02,
- 7.632708780718303e+02, 7.663214989713700e+02, 7.692958235807309e+02, 7.721978231405870e+02, 7.750311656109291e+02,
- 7.777992457434424e+02, 7.805052115292199e+02, 7.831519875293510e+02, 7.857422955160976e+02, 7.882786727862167e+02,
- 7.907634884531967e+02, 7.931989579794381e+02, 7.955871561712584e+02, 7.979300288275585e+02, 8.002294032060760e+02,
- 8.024869974484383e+02, 8.047044290859803e+02, 8.068832227320144e+02, 8.090248170523188e+02, 8.111305710937897e+02,
- 8.132017700410435e+02, 8.152396304620567e+02, 8.172453050964447e+02, 8.192198872335243e+02, 8.211644147217080e+02,
- 8.230798736459509e+02, 8.249672017057486e+02, 8.268272913225335e+02, 8.286609925021056e+02, 8.304691154749422e+02,
- 8.322524331347677e+02, 8.340116832936268e+02, 8.357475707697721e+02, 8.374607693230379e+02, 8.391519234508684e+02,
- 8.408216500568528e+02, 8.424705400024823e+02, 8.440991595517719e+02, 8.457080517175026e+02, 8.472977375169925e+02,
- 8.488687171445857e+02, 8.504214710818547e+02, 8.519564610635081e+02, 8.534741311271208e+02, 8.549749084507609e+02,
- 8.564592042220539e+02, 8.579274144569387e+02, 8.593799204914729e+02, 8.608170899657522e+02, 8.622392779603696e+02,
- 8.636468263415748e+02, 8.650400653283855e+02, 8.664193137785302e+02, 8.677848797063552e+02, 8.691370607560954e+02,
- 8.704761447272120e+02, 8.718024099129160e+02, 8.731161255795884e+02, 8.744175523400195e+02, 8.757069425230140e+02,
- 8.769845405235162e+02, 8.782505831344679e+02, 8.795052998615274e+02, 8.807489132217020e+02, 8.819816390268481e+02,
- 8.832036866529661e+02, 8.844152592961203e+02, 8.856165542157693e+02, 8.868077629662498e+02, 8.879890716170794e+02,
- 8.891606609627329e+02, 8.903227067224802e+02, 8.914753797420593e+02, 8.926188461292420e+02, 8.937532674980077e+02,
- 8.948788010852005e+02, 8.959955999208933e+02, 8.971038129791373e+02, 8.982035853220044e+02, 8.992950582372722e+02,
- 9.003783693700922e+02, 9.014536528489484e+02, 9.025210394062046e+02, 9.035806564935068e+02, 9.046326283923112e+02,
- 9.056770763197810e+02, 9.067141185302746e+02, 9.077438704126522e+02, 9.087664445836001e+02, 9.097819509771696e+02,
- 9.107904969307117e+02, 9.117921872673778e+02, 9.127871243753557e+02, 9.137754082839839e+02, 9.147571367369065e+02,
- 9.157324052623892e+02, 9.167013072409375e+02, 9.176639336012166e+02, 9.186203743294221e+02, 9.195707164022095e+02,
- 9.205150452353458e+02, 9.214534444342855e+02, 9.223859957080783e+02, 9.233127791264648e+02, 9.242338730359029e+02,
- 9.251493541405104e+02, 9.260592975485152e+02, 9.269637768170538e+02, 9.278628639953979e+02, 9.287566296666712e+02,
- 9.296451429881213e+02, 9.305284717300067e+02, 9.314066823131501e+02, 9.322798398452230e+02, 9.331480081558054e+02,
- 9.340112498302677e+02, 9.348696262425347e+02, 9.357231975867555e+02, 9.365720229079475e+02, 9.374161601316324e+02,
- 9.382556660925172e+02, 9.390905965622505e+02, 9.399210062762943e+02, 9.407469489599429e+02, 9.415684773535182e+02,
- 9.423856432367808e+02, 9.431984974525752e+02, 9.440070899297499e+02, 9.448114697053677e+02, 9.456116849462403e+02,
- 9.464077829698108e+02, 9.471998102644027e+02, 9.479878125088636e+02, 9.487718345916251e+02, 9.495519206291987e+02,
- 9.503281139841209e+02, 9.511004572823856e+02, 9.518689924303560e+02, 9.526337606312005e+02, 9.533948024008459e+02,
- 9.541521575834819e+02, 9.549058653666243e+02, 9.556559642957492e+02, 9.564024918439596e+02, 9.571454861850673e+02,
- 9.578849835961259e+02, 9.586210201928192e+02, 9.593536315160916e+02, 9.600828525445128e+02, 9.608087177063184e+02,
- 9.615312608911204e+02, 9.622505154612994e+02, 9.629665142631059e+02, 9.636792896374531e+02, 9.643888734304354e+02,
- 9.650952970035667e+02, 9.657985912437528e+02, 9.664987865730061e+02, 9.671959129579080e+02, 9.678899999188305e+02,
- 9.685810765389203e+02, 9.692691714728594e+02, 9.699543129553988e+02, 9.706365288096802e+02, 9.713158464553557e+02,
- 9.719922929164934e+02, 9.726658948293009e+02, 9.733366784496488e+02, 9.740046696604169e+02, 9.746698939786559e+02,
- 9.753323765625830e+02, 9.759921422184012e+02, 9.766492154069613e+02, 9.773036202502601e+02, 9.779553805377880e+02,
- 9.786045197327275e+02, 9.792510609780004e+02, 9.798950271021811e+02, 9.805364406252662e+02, 9.811753237643157e+02,
- 9.818116984389587e+02, 9.824455862767768e+02, 9.830770086185663e+02, 9.837059865234744e+02, 9.843325407740265e+02,
- 9.849566918810351e+02, 9.855784600884040e+02, 9.861978653778194e+02, 9.868149274733399e+02, 9.874296658458909e+02,
- 9.880420997176469e+02, 9.886522480663333e+02, 9.892601296294213e+02, 9.898657629082415e+02, 9.904691661720050e+02,
- 9.910703574617349e+02, 9.916693545941234e+02, 9.922661751652940e+02, 9.928608365544940e+02, 9.934533559277064e+02,
- 9.940437502411846e+02, 9.946320362449128e+02, 9.952182304859980e+02, 9.958023493119881e+02, 9.963844088741217e+02,
- 9.969644251305157e+02, 9.975424138492805e+02, 9.981183906115775e+02, 9.986923708146151e+02, 9.992643696745761e+02,
- 9.998344022294964e+02, 1.000402483342084e+03, 1.000968627702471e+03, 1.001532849830930e+03, 1.002095164080517e+03,
- 1.002655584639680e+03, 1.003214125534801e+03, 1.003770800632699e+03, 1.004325623643084e+03, 1.004878608120952e+03,
- 1.005429767468950e+03, 1.005979114939684e+03, 1.006526663637989e+03, 1.007072426523149e+03, 1.007616416411086e+03,
- 1.008158645976494e+03, 1.008699127754945e+03, 1.009237874144948e+03, 1.009774897409971e+03, 1.010310209680429e+03,
- 1.010843822955631e+03, 1.011375749105690e+03, 1.011905999873407e+03, 1.012434586876105e+03, 1.012961521607448e+03,
- 1.013486815439208e+03, 1.014010479623018e+03, 1.014532525292080e+03, 1.015052963462845e+03, 1.015571805036671e+03,
- 1.016089060801444e+03, 1.016604741433167e+03, 1.017118857497532e+03, 1.017631419451451e+03, 1.018142437644575e+03,
- 1.018651922320774e+03, 1.019159883619593e+03, 1.019666331577690e+03, 1.020171276130244e+03, 1.020674727112337e+03,
- 1.021176694260315e+03, 1.021677187213127e+03, 1.022176215513636e+03, 1.022673788609915e+03, 1.023169915856512e+03,
- 1.023664606515704e+03, 1.024157869758724e+03, 1.024649714666961e+03, 1.025140150233158e+03, 1.025629185362569e+03,
- 1.026116828874116e+03, 1.026603089501508e+03, 1.027087975894361e+03, 1.027571496619283e+03, 1.028053660160953e+03,
- 1.028534474923173e+03, 1.029013949229912e+03, 1.029492091326325e+03, 1.029968909379763e+03, 1.030444411480760e+03,
- 1.030918605644008e+03, 1.031391499809316e+03, 1.031863101842554e+03, 1.032333419536578e+03, 1.032802460612150e+03,
- 1.033270232718831e+03, 1.033736743435871e+03, 1.034202000273075e+03, 1.034666010671667e+03, 1.035128782005129e+03,
- 1.035590321580037e+03, 1.036050636636875e+03, 1.036509734350845e+03, 1.036967621832657e+03, 1.037424306129313e+03,
- 1.037879794224873e+03, 1.038334093041219e+03, 1.038787209438795e+03, 1.039239150217344e+03, 1.039689922116633e+03,
- 1.040139531817166e+03, 1.040587985940884e+03, 1.041035291051861e+03, 1.041481453656980e+03, 1.041926480206611e+03,
- 1.042370377095267e+03, 1.042813150662260e+03, 1.043254807192340e+03, 1.043695352916330e+03, 1.044134794011750e+03,
- 1.044573136603427e+03, 1.045010386764108e+03, 1.045446550515051e+03, 1.045881633826615e+03, 1.046315642618842e+03,
- 1.046748582762024e+03, 1.047180460077270e+03, 1.047611280337061e+03, 1.048041049265794e+03, 1.048469772540328e+03,
- 1.048897455790508e+03, 1.049324104599697e+03, 1.049749724505289e+03, 1.050174320999219e+03, 1.050597899528467e+03,
- 1.051020465495555e+03, 1.051442024259032e+03, 1.051862581133960e+03, 1.052282141392389e+03, 1.052700710263823e+03,
- 1.053118292935686e+03, 1.053534894553776e+03, 1.053950520222718e+03, 1.054365175006403e+03, 1.054778863928429e+03,
- 1.055191591972534e+03, 1.055603364083019e+03, 1.056014185165172e+03, 1.056424060085678e+03, 1.056832993673034e+03,
- 1.057240990717946e+03, 1.057648055973735e+03, 1.058054194156722e+03, 1.058459409946624e+03, 1.058863707986929e+03,
- 1.059267092885280e+03, 1.059669569213845e+03, 1.060071141509683e+03, 1.060471814275112e+03, 1.060871591978064e+03,
- 1.061270479052438e+03, 1.061668479898450e+03, 1.062065598882981e+03, 1.062461840339913e+03, 1.062857208570464e+03,
- 1.063251707843526e+03, 1.063645342395984e+03, 1.064038116433045e+03, 1.064430034128556e+03, 1.064821099625316e+03,
- 1.065211317035392e+03, 1.065600690440421e+03, 1.065989223891917e+03, 1.066376921411567e+03, 1.066763786991532e+03,
- 1.067149824594732e+03, 1.067535038155140e+03, 1.067919431578067e+03, 1.068303008740437e+03, 1.068685773491071e+03,
- 1.069067729650959e+03, 1.069448881013533e+03, 1.069829231344930e+03, 1.070208784384262e+03, 1.070587543843874e+03,
- 1.070965513409601e+03, 1.071342696741028e+03, 1.071719097471735e+03, 1.072094719209552e+03, 1.072469565536800e+03,
- 1.072843640010537e+03, 1.073216946162796e+03, 1.073589487500823e+03, 1.073961267507311e+03, 1.074332289640633e+03,
- 1.074702557335067e+03, 1.075072074001026e+03, 1.075440843025279e+03, 1.075808867771171e+03, 1.076176151578846e+03,
- 1.076542697765454e+03, 1.076908509625374e+03, 1.077273590430415e+03, 1.077637943430034e+03, 1.078001571851531e+03,
- 1.078364478900262e+03, 1.078726667759834e+03, 1.079088141592306e+03, 1.079448903538383e+03, 1.079808956717615e+03,
- 1.080168304228584e+03, 1.080526949149096e+03, 1.080884894536367e+03, 1.081242143427212e+03, 1.081598698838225e+03,
- 1.081954563765959e+03, 1.082309741187112e+03, 1.082664234058696e+03, 1.083018045318217e+03, 1.083371177883846e+03,
- 1.083723634654594e+03, 1.084075418510477e+03, 1.084426532312687e+03, 1.084776978903753e+03, 1.085126761107711e+03,
- 1.085475881730263e+03, 1.085824343558936e+03, 1.086172149363240e+03, 1.086519301894830e+03, 1.086865803887656e+03
- },
- {
- 1.652096439873750e+00, 5.032871024527506e+00, 8.468622459518722e+00, 1.196153572321244e+01, 1.551393536248930e+01,
- 1.912829747105484e+01, 2.280726297165876e+01, 2.655365238045323e+01, 3.037048225220274e+01, 3.426098354452937e+01,
- 3.822862217541912e+01, 4.227712209630362e+01, 4.641049125940103e+01, 5.063305092605955e+01, 5.494946884517064e+01,
- 5.936479693074915e+01, 6.388451418981302e+01, 6.851457580133867e+01, 7.326146943136465e+01, 7.813228009744758e+01,
- 8.313476517934279e+01, 8.827744152828708e+01, 9.356968707148640e+01, 9.902185987460365e+01, 1.046454383384918e+02,
- 1.104531871220309e+02, 1.164593545561302e+02, 1.226799088284039e+02, 1.291328221810247e+02, 1.358384149193552e+02,
- 1.428197743825596e+02, 1.501032682819882e+02, 1.577191778084571e+02, 1.657024828710831e+02, 1.740938417649326e+02,
- 1.829408192501253e+02, 1.922994312523421e+02, 2.022360892859257e+02, 2.128300384194763e+02, 2.241763758255666e+02,
- 2.363896797013342e+02, 2.496080936011804e+02, 2.639972312771770e+02, 2.797521707613611e+02, 2.970936473525697e+02,
- 3.162513003841974e+02, 3.374243836492060e+02, 3.607121422223092e+02, 3.860073514855675e+02, 4.128461899423477e+02,
- 4.402903973852090e+02, 4.670946741274838e+02, 4.922492099165984e+02, 5.152200266245918e+02, 5.358250874478673e+02,
- 5.541609248253175e+02, 5.704673782724831e+02, 5.850264859638997e+02, 5.981067183508241e+02, 6.099408401442627e+02,
- 6.207221584107874e+02, 6.306084671975489e+02, 6.397280962290524e+02, 6.481857419236404e+02, 6.560673676215927e+02,
- 6.634441054982408e+02, 6.703752980046930e+02, 6.769108530209844e+02, 6.830930688698866e+02, 6.889580550849555e+02,
- 6.945368460535261e+02, 6.998562809451250e+02, 7.049397049152390e+02, 7.098075326772631e+02, 7.144777052125239e+02,
- 7.189660627765412e+02, 7.232866517571474e+02, 7.274519788066276e+02, 7.314732226039408e+02, 7.353604113116226e+02,
- 7.391225720641861e+02, 7.427678575096478e+02, 7.463036534149842e+02, 7.497366705621406e+02, 7.530730235474047e+02,
- 7.563182986124857e+02, 7.594776122505723e+02, 7.625556620221869e+02, 7.655567707673116e+02, 7.684849251990516e+02,
- 7.713438097002926e+02, 7.741368360108105e+02, 7.768671693822390e+02, 7.795377516875271e+02, 7.821513218963557e+02,
- 7.847104342656039e+02, 7.872174745418516e+02, 7.896746744294588e+02, 7.920841245412174e+02, 7.944477860178722e+02,
- 7.967675009769063e+02, 7.990450019290174e+02, 8.012819202821386e+02, 8.034797940369983e+02, 8.056400747646900e+02,
- 8.077641339451900e+02, 8.098532687358153e+02, 8.119087072301046e+02, 8.139316132602512e+02, 8.159230907898666e+02,
- 8.178841879383390e+02, 8.198159006733085e+02, 8.217191762035832e+02, 8.235949161012237e+02, 8.254439791783526e+02,
- 8.272671841414594e+02, 8.290653120435522e+02, 8.308391085523442e+02, 8.325892860507995e+02, 8.343165255846800e+02,
- 8.360214786702658e+02, 8.377047689741113e+02, 8.393669938755477e+02, 8.410087259354059e+02, 8.426305141957923e+02,
- 8.442328855314387e+02, 8.458163457725352e+02, 8.473813808240394e+02, 8.489284576987884e+02, 8.504580254848300e+02,
- 8.519705162566730e+02, 8.534663459557022e+02, 8.549459149548675e+02, 8.564096096708429e+02, 8.578578008991959e+02,
- 8.592908486902878e+02, 8.607090986541162e+02, 8.621128848630274e+02, 8.635025298879713e+02, 8.648783453808608e+02,
- 8.662406324766706e+02, 8.675896823221416e+02, 8.689257765003501e+02, 8.702491874474130e+02, 8.715601788468199e+02,
- 8.728590060028000e+02, 8.741459161940489e+02, 8.754211490090329e+02, 8.766849366640063e+02, 8.779375043047910e+02,
- 8.791790702933034e+02, 8.804098464797387e+02, 8.816300384612560e+02, 8.828398458279665e+02, 8.840394623969505e+02,
- 8.852290764350006e+02, 8.864088708706759e+02, 8.875790235072744e+02, 8.887397071712445e+02, 8.898910899636775e+02,
- 8.910333353890702e+02, 8.921666025344841e+02, 8.932910462291961e+02, 8.944068171971852e+02, 8.955140622028508e+02,
- 8.966129241903088e+02, 8.977035424165992e+02, 8.987860525791339e+02, 8.998605869376617e+02, 9.009272744310479e+02,
- 9.019862407891181e+02, 9.030376086398167e+02, 9.040814976119188e+02, 9.051180244335058e+02, 9.061473030264160e+02,
- 9.071694445968697e+02, 9.081845577224461e+02, 9.091927484355928e+02, 9.101941203038222e+02, 9.111887745067667e+02,
- 9.121768099102239e+02, 9.131583231373426e+02, 9.141334082821173e+02, 9.151021583662155e+02, 9.160646633574829e+02,
- 9.170210115674410e+02, 9.179712893822975e+02, 9.189155813194797e+02, 9.198539700820970e+02, 9.207865366557684e+02,
- 9.217133601855456e+02, 9.226345182797976e+02, 9.235500868905899e+02, 9.244601403998831e+02, 9.253647516633024e+02,
- 9.262639920523799e+02, 9.271579314953303e+02, 9.280466385164284e+02, 9.289301802740381e+02, 9.298086225973503e+02,
- 9.306820300218852e+02, 9.315504658238034e+02, 9.324139920530815e+02, 9.332726695655846e+02, 9.341265580540945e+02,
- 9.349757160783208e+02, 9.358202010939443e+02, 9.366600694807271e+02, 9.374953765697187e+02, 9.383261766696088e+02,
- 9.391525230922382e+02, 9.399744681773186e+02, 9.407920633163791e+02, 9.416053589759721e+02, 9.424144047201685e+02,
- 9.432192492323627e+02, 9.440199403364160e+02, 9.448165250171666e+02, 9.456090494403159e+02, 9.463975589717353e+02,
- 9.471820981961888e+02, 9.479627109355087e+02, 9.487394402662444e+02, 9.495123285367930e+02, 9.502814173840351e+02,
- 9.510467477494929e+02, 9.518083598950296e+02, 9.525662934181009e+02, 9.533205868288503e+02, 9.540712792965418e+02,
- 9.548184080932908e+02, 9.555620103030329e+02, 9.563021224153808e+02, 9.570387803384972e+02, 9.577720194116247e+02,
- 9.585018744172670e+02, 9.592283795930475e+02, 9.599515686432499e+02, 9.606714747500500e+02, 9.613881305844471e+02,
- 9.621015683169123e+02, 9.628118196277538e+02, 9.635189157172142e+02, 9.642228873153035e+02, 9.649237646913801e+02,
- 9.656215776634871e+02, 9.663163556074466e+02, 9.670081274657283e+02, 9.676969217560876e+02, 9.683827665799946e+02,
- 9.690656896308450e+02, 9.697457182019726e+02, 9.704228791944591e+02, 9.710971991247571e+02, 9.717687041321205e+02,
- 9.724374199858588e+02, 9.731033720924131e+02, 9.737665855022634e+02, 9.744270849166667e+02, 9.750848946942421e+02,
- 9.757400388573859e+02, 9.763925410985523e+02, 9.770424247863742e+02, 9.776897129716417e+02, 9.783344283931493e+02,
- 9.789765934833983e+02, 9.796162303741759e+02, 9.802533609019980e+02, 9.808880066134359e+02, 9.815201887703174e+02,
- 9.821499283548104e+02, 9.827772460743937e+02, 9.834021623667153e+02, 9.840246974043434e+02, 9.846448710994108e+02,
- 9.852627031081570e+02, 9.858782128353732e+02, 9.864914194387443e+02, 9.871023418331016e+02, 9.877109986945836e+02,
- 9.883174084647004e+02, 9.889215893543162e+02, 9.895235593475496e+02, 9.901233362055824e+02, 9.907209374703955e+02,
- 9.913163804684195e+02, 9.919096823141147e+02, 9.925008599134715e+02, 9.930899299674409e+02, 9.936769089752927e+02,
- 9.942618132379026e+02, 9.948446588609759e+02, 9.954254617582027e+02, 9.960042376543474e+02, 9.965810020882788e+02,
- 9.971557704159360e+02, 9.977285578132373e+02, 9.982993792789289e+02, 9.988682496373772e+02, 9.994351835413070e+02,
- 1.000000195474483e+03, 1.000563299754339e+03, 1.001124510534563e+03, 1.001683841807614e+03, 1.002241307407211e+03,
- 1.002796921010759e+03, 1.003350696141736e+03, 1.003902646172026e+03, 1.004452784324219e+03, 1.005001123673857e+03,
- 1.005547677151639e+03, 1.006092457545594e+03, 1.006635477503195e+03, 1.007176749533455e+03, 1.007716286008962e+03,
- 1.008254099167893e+03, 1.008790201115985e+03, 1.009324603828464e+03, 1.009857319151950e+03, 1.010388358806313e+03,
- 1.010917734386509e+03, 1.011445457364375e+03, 1.011971539090390e+03, 1.012495990795410e+03, 1.013018823592369e+03,
- 1.013540048477946e+03, 1.014059676334208e+03, 1.014577717930223e+03, 1.015094183923640e+03, 1.015609084862246e+03,
- 1.016122431185492e+03, 1.016634233225995e+03, 1.017144501211011e+03, 1.017653245263888e+03, 1.018160475405487e+03,
- 1.018666201555579e+03, 1.019170433534226e+03, 1.019673181063128e+03, 1.020174453766955e+03, 1.020674261174652e+03,
- 1.021172612720720e+03, 1.021669517746484e+03, 1.022164985501327e+03, 1.022659025143918e+03, 1.023151645743406e+03,
- 1.023642856280601e+03, 1.024132665649136e+03, 1.024621082656606e+03, 1.025108116025692e+03, 1.025593774395263e+03,
- 1.026078066321465e+03, 1.026561000278784e+03, 1.027042584661101e+03, 1.027522827782725e+03, 1.028001737879406e+03,
- 1.028479323109342e+03, 1.028955591554158e+03, 1.029430551219880e+03, 1.029904210037883e+03, 1.030376575865831e+03,
- 1.030847656488605e+03, 1.031317459619203e+03, 1.031785992899645e+03, 1.032253263901844e+03, 1.032719280128478e+03,
- 1.033184049013844e+03, 1.033647577924695e+03, 1.034109874161068e+03, 1.034570944957099e+03, 1.035030797481827e+03,
- 1.035489438839975e+03, 1.035946876072742e+03, 1.036403116158554e+03, 1.036858166013826e+03, 1.037312032493704e+03,
- 1.037764722392795e+03, 1.038216242445887e+03, 1.038666599328660e+03, 1.039115799658386e+03, 1.039563849994614e+03,
- 1.040010756839852e+03, 1.040456526640236e+03, 1.040901165786183e+03, 1.041344680613046e+03, 1.041787077401751e+03,
- 1.042228362379426e+03, 1.042668541720024e+03, 1.043107621544933e+03, 1.043545607923580e+03, 1.043982506874025e+03,
- 1.044418324363545e+03, 1.044853066309217e+03, 1.045286738578478e+03, 1.045719346989694e+03, 1.046150897312712e+03,
- 1.046581395269398e+03, 1.047010846534183e+03, 1.047439256734588e+03, 1.047866631451749e+03, 1.048292976220930e+03,
- 1.048718296532031e+03, 1.049142597830090e+03, 1.049565885515778e+03, 1.049988164945883e+03, 1.050409441433790e+03,
- 1.050829720249960e+03, 1.051249006622392e+03, 1.051667305737083e+03, 1.052084622738488e+03, 1.052500962729965e+03,
- 1.052916330774214e+03, 1.053330731893720e+03, 1.053744171071179e+03, 1.054156653249923e+03, 1.054568183334339e+03,
- 1.054978766190283e+03, 1.055388406645487e+03, 1.055797109489963e+03, 1.056204879476396e+03, 1.056611721320540e+03,
- 1.057017639701602e+03, 1.057422639262625e+03, 1.057826724610863e+03, 1.058229900318154e+03, 1.058632170921284e+03,
- 1.059033540922353e+03, 1.059434014789127e+03, 1.059833596955397e+03, 1.060232291821322e+03, 1.060630103753772e+03,
- 1.061027037086672e+03, 1.061423096121333e+03, 1.061818285126783e+03, 1.062212608340093e+03, 1.062606069966700e+03,
- 1.062998674180728e+03, 1.063390425125294e+03, 1.063781326912825e+03, 1.064171383625364e+03, 1.064560599314867e+03,
- 1.064948978003506e+03, 1.065336523683965e+03, 1.065723240319727e+03, 1.066109131845363e+03, 1.066494202166817e+03,
- 1.066878455161686e+03, 1.067261894679498e+03, 1.067644524541981e+03, 1.068026348543342e+03, 1.068407370450524e+03,
- 1.068787594003476e+03, 1.069167022915412e+03, 1.069545660873069e+03, 1.069923511536961e+03, 1.070300578541625e+03,
- 1.070676865495879e+03, 1.071052375983059e+03, 1.071427113561264e+03, 1.071801081763598e+03, 1.072174284098399e+03,
- 1.072546724049483e+03, 1.072918405076364e+03, 1.073289330614492e+03, 1.073659504075469e+03, 1.074028928847282e+03,
- 1.074397608294513e+03, 1.074765545758564e+03, 1.075132744557870e+03, 1.075499207988109e+03, 1.075864939322415e+03,
- 1.076229941811585e+03, 1.076594218684283e+03, 1.076957773147245e+03, 1.077320608385477e+03, 1.077682727562455e+03,
- 1.078044133820320e+03, 1.078404830280074e+03, 1.078764820041767e+03, 1.079124106184690e+03, 1.079482691767562e+03,
- 1.079840579828712e+03, 1.080197773386266e+03, 1.080554275438326e+03, 1.080910088963146e+03, 1.081265216919315e+03,
- 1.081619662245927e+03, 1.081973427862753e+03, 1.082326516670419e+03, 1.082678931550568e+03, 1.083030675366027e+03,
- 1.083381750960980e+03, 1.083732161161123e+03, 1.084081908773830e+03, 1.084430996588312e+03, 1.084779427375776e+03
- },
- {
- 1.646804004514797e+00, 5.016319081879893e+00, 8.440018140422868e+00, 1.192002392345982e+01, 1.545859265396476e+01,
- 1.905812528001615e+01, 2.272117991890445e+01, 2.645048566040808e+01, 3.024895790681146e+01, 3.411971546249124e+01,
- 3.806609961679484e+01, 4.209169550567520e+01, 4.620035608606441e+01, 5.039622911526828e+01, 5.468378759780491e+01,
- 5.906786424682467e+01, 6.355369061001664e+01, 6.814694163502959e+01, 7.285378660253787e+01, 7.768094754314541e+01,
- 8.263576648642751e+01, 8.772628317802811e+01, 9.296132525986556e+01, 9.835061335470628e+01, 1.039048840629563e+02,
- 1.096360345877065e+02, 1.155572936069114e+02, 1.216834241576590e+02, 1.280309657606011e+02, 1.346185248841550e+02,
- 1.414671252588024e+02, 1.486006325223964e+02, 1.560462718295994e+02, 1.638352615849790e+02, 1.720035928869929e+02,
- 1.805929912880687e+02, 1.896521054763882e+02, 1.992379746744002e+02, 2.094178291614382e+02, 2.202712671724931e+02,
- 2.318928057125752e+02, 2.443946774927823e+02, 2.579094491025991e+02, 2.725913978735832e+02, 2.886143688154175e+02,
- 3.061619461424255e+02, 3.254039763062883e+02, 3.464539575859157e+02, 3.693050135083856e+02, 3.937427798015276e+02,
- 4.192459411145724e+02, 4.449620507530544e+02, 4.699036010421152e+02, 4.933301773184851e+02, 5.148421584316058e+02,
- 5.343065731831970e+02, 5.517965786086828e+02, 5.674955406529259e+02, 5.816253441373789e+02, 5.944044014990226e+02,
- 6.060283432852376e+02, 6.166643132385445e+02, 6.264519478319164e+02, 6.355069137597706e+02, 6.439249528249073e+02,
- 6.517855907916872e+02, 6.591552571638922e+02, 6.660898099766143e+02, 6.726365443808180e+02, 6.788357807440697e+02,
- 6.847221201832236e+02, 6.903254406371726e+02, 6.956716915450230e+02, 7.007835321798788e+02, 7.056808481837988e+02,
- 7.103811726734629e+02, 7.149000320498624e+02, 7.192512319389838e+02, 7.234470951540312e+02, 7.274986609111080e+02,
- 7.314158525243961e+02, 7.352076192840093e+02, 7.388820570547531e+02, 7.424465112352814e+02, 7.459076650175994e+02,
- 7.492716153376853e+02, 7.525439384731700e+02, 7.557297468971908e+02, 7.588337387187835e+02, 7.618602408148247e+02,
- 7.648132465751703e+02, 7.676964490327559e+02, 7.705132700272369e+02, 7.732668859491198e+02, 7.759602505271577e+02,
- 7.785961150517412e+02, 7.811770463686231e+02, 7.837054429283994e+02, 7.861835491361448e+02, 7.886134682109773e+02,
- 7.909971737361614e+02, 7.933365200556250e+02, 7.956332516517617e+02, 7.978890116215098e+02, 8.001053493524628e+02,
- 8.022837274876920e+02, 8.044255282567856e+02, 8.065320592409498e+02, 8.086045586317700e+02, 8.106442000360064e+02,
- 8.126520968726455e+02, 8.146293064030084e+02, 8.165768334300448e+02, 8.184956336988811e+02, 8.203866170270754e+02,
- 8.222506501899877e+02, 8.240885595838485e+02, 8.259011336867948e+02, 8.276891253359490e+02, 8.294532538368039e+02,
- 8.311942069327112e+02, 8.329126425672165e+02, 8.346091906548049e+02, 8.362844545953019e+02, 8.379390127511178e+02,
- 8.395734198110205e+02, 8.411882080627743e+02, 8.427838885818177e+02, 8.443609523425350e+02, 8.459198712580622e+02,
- 8.474610991560314e+02, 8.489850727187079e+02, 8.504922121255664e+02, 8.519829226809379e+02, 8.534575933975203e+02,
- 8.549166013732496e+02, 8.563603088184450e+02, 8.577890655925956e+02, 8.592032094366634e+02, 8.606030664465405e+02,
- 8.619889516584957e+02, 8.633611695318770e+02, 8.647200144192469e+02, 8.660657710107943e+02, 8.673987147546802e+02,
- 8.687191122548511e+02, 8.700272216477595e+02, 8.713232929592931e+02, 8.726075684431588e+02, 8.738802829018520e+02,
- 8.751416639912708e+02, 8.763919325099599e+02, 8.776313026739008e+02, 8.788599823777040e+02, 8.800781734429949e+02,
- 8.812860718547388e+02, 8.824838679974301e+02, 8.836717468232011e+02, 8.848498881270534e+02, 8.860184666926204e+02,
- 8.871776524902875e+02, 8.883276108542034e+02, 8.894685026512298e+02, 8.906004844422574e+02, 8.917237086363082e+02,
- 8.928383236377908e+02, 8.939444739872854e+02, 8.950423004961806e+02, 8.961319403754925e+02, 8.972135273591583e+02,
- 8.982871918220809e+02, 8.993530608931997e+02, 9.004112585638321e+02, 9.014619057915135e+02, 9.025051205995679e+02,
- 9.035410181726160e+02, 9.045697109482059e+02, 9.055913087047729e+02, 9.066059186460856e+02, 9.076136454823534e+02,
- 9.086145915081547e+02, 9.096088566773228e+02, 9.105965383335844e+02, 9.115777326172528e+02, 9.125525325660242e+02,
- 9.135210294636927e+02, 9.144833125869078e+02, 9.154394692645612e+02, 9.163895849349808e+02, 9.173337432010239e+02,
- 9.182720258831694e+02, 9.192045130706874e+02, 9.201312832253735e+02, 9.210524130158691e+02, 9.219679776771923e+02,
- 9.228780508499373e+02, 9.237827046733211e+02, 9.246820098264426e+02, 9.255760355681211e+02, 9.264648497753766e+02,
- 9.273485189806050e+02, 9.282271084074981e+02, 9.291006820057654e+02, 9.299693024846999e+02, 9.308330313456353e+02,
- 9.316919289133407e+02, 9.325460543663939e+02, 9.333954657665646e+02, 9.342402200872626e+02, 9.350803732410731e+02,
- 9.359159801064155e+02, 9.367470945533653e+02, 9.375737694686694e+02, 9.383960567799743e+02, 9.392140074793155e+02,
- 9.400276716458767e+02, 9.408370984680575e+02, 9.416423362648728e+02, 9.424434325067028e+02, 9.432404338354244e+02,
- 9.440333860839401e+02, 9.448223342951316e+02, 9.456073227402525e+02, 9.463883949367870e+02, 9.471655936657826e+02,
- 9.479389609886898e+02, 9.487085382637127e+02, 9.494743661616933e+02, 9.502364846815464e+02, 9.509949327157373e+02,
- 9.517497498436816e+02, 9.525009737060269e+02, 9.532486417598161e+02, 9.539927908610852e+02, 9.547334572778940e+02,
- 9.554706767030005e+02, 9.562044842661913e+02, 9.569349145462811e+02, 9.576620015827887e+02, 9.583857788873024e+02,
- 9.591062794545442e+02, 9.598235357731414e+02, 9.605375798361166e+02, 9.612484431511034e+02, 9.619561567502983e+02,
- 9.626607512001543e+02, 9.633622566108254e+02, 9.640607026453708e+02, 9.647561185287276e+02, 9.654485330564527e+02,
- 9.661379746032480e+02, 9.668244711312701e+02, 9.675080501982371e+02, 9.681887389653286e+02, 9.688665642049009e+02,
- 9.695415523080035e+02, 9.702137292917178e+02, 9.708831208063165e+02, 9.715497521422510e+02, 9.722136482369724e+02,
- 9.728748336815860e+02, 9.735333327273496e+02, 9.741891692920218e+02, 9.748423669660541e+02, 9.754929490186448e+02,
- 9.761409384036452e+02, 9.767863577653372e+02, 9.774292294440703e+02, 9.780695754817716e+02, 9.787074176273321e+02,
- 9.793427773418692e+02, 9.799756758038667e+02, 9.806061339142061e+02, 9.812341723010791e+02, 9.818598113247934e+02,
- 9.824830710824690e+02, 9.831039714126380e+02, 9.837225318997325e+02, 9.843387718784833e+02, 9.849527104382169e+02,
- 9.855643664270656e+02, 9.861737584560769e+02, 9.867809049032466e+02, 9.873858239174551e+02, 9.879885334223258e+02,
- 9.885890511200010e+02, 9.891873944948353e+02, 9.897835808170140e+02, 9.903776271460949e+02, 9.909695503344778e+02,
- 9.915593670307987e+02, 9.921470936832562e+02, 9.927327465428700e+02, 9.933163416666705e+02, 9.938978949208271e+02,
- 9.944774219837074e+02, 9.950549383488811e+02, 9.956304593280566e+02, 9.962040000539648e+02, 9.967755754831825e+02,
- 9.973452003988975e+02, 9.979128894136260e+02, 9.984786569718671e+02, 9.990425173527137e+02, 9.996044846724062e+02,
- 1.000164572886840e+03, 1.000722795794023e+03, 1.001279167036487e+03, 1.001833700103649e+03, 1.002386408334133e+03,
- 1.002937304918042e+03, 1.003486402899195e+03, 1.004033715177305e+03, 1.004579254510138e+03, 1.005123033515614e+03,
- 1.005665064673878e+03, 1.006205360329328e+03, 1.006743932692608e+03, 1.007280793842560e+03, 1.007815955728149e+03,
- 1.008349430170343e+03, 1.008881228863962e+03, 1.009411363379494e+03, 1.009939845164880e+03, 1.010466685547264e+03,
- 1.010991895734711e+03, 1.011515486817896e+03, 1.012037469771762e+03, 1.012557855457149e+03, 1.013076654622396e+03,
- 1.013593877904909e+03, 1.014109535832706e+03, 1.014623638825936e+03, 1.015136197198367e+03, 1.015647221158853e+03,
- 1.016156720812769e+03, 1.016664706163430e+03, 1.017171187113478e+03, 1.017676173466251e+03, 1.018179674927121e+03,
- 1.018681701104817e+03, 1.019182261512724e+03, 1.019681365570154e+03, 1.020179022603606e+03, 1.020675241847992e+03,
- 1.021170032447857e+03, 1.021663403458565e+03, 1.022155363847475e+03, 1.022645922495092e+03, 1.023135088196202e+03,
- 1.023622869660989e+03, 1.024109275516128e+03, 1.024594314305867e+03, 1.025077994493090e+03, 1.025560324460356e+03,
- 1.026041312510932e+03, 1.026520966869804e+03, 1.026999295684665e+03, 1.027476307026904e+03, 1.027952008892560e+03,
- 1.028426409203275e+03, 1.028899515807226e+03, 1.029371336480042e+03, 1.029841878925711e+03, 1.030311150777464e+03,
- 1.030779159598658e+03, 1.031245912883629e+03, 1.031711418058549e+03, 1.032175682482260e+03, 1.032638713447091e+03,
- 1.033100518179673e+03, 1.033561103841736e+03, 1.034020477530894e+03, 1.034478646281419e+03, 1.034935617065000e+03,
- 1.035391396791496e+03, 1.035845992309674e+03, 1.036299410407937e+03, 1.036751657815041e+03, 1.037202741200799e+03,
- 1.037652667176781e+03, 1.038101442296994e+03, 1.038549073058560e+03, 1.038995565902381e+03, 1.039440927213798e+03,
- 1.039885163323226e+03, 1.040328280506803e+03, 1.040770284987010e+03, 1.041211182933287e+03, 1.041650980462651e+03,
- 1.042089683640286e+03, 1.042527298480141e+03, 1.042963830945510e+03, 1.043399286949609e+03, 1.043833672356140e+03,
- 1.044266992979852e+03, 1.044699254587089e+03, 1.045130462896334e+03, 1.045560623578745e+03, 1.045989742258681e+03,
- 1.046417824514222e+03, 1.046844875877683e+03, 1.047270901836120e+03, 1.047695907831827e+03, 1.048119899262829e+03,
- 1.048542881483368e+03, 1.048964859804377e+03, 1.049385839493957e+03, 1.049805825777841e+03, 1.050224823839849e+03,
- 1.050642838822346e+03, 1.051059875826684e+03, 1.051475939913648e+03, 1.051891036103883e+03, 1.052305169378329e+03,
- 1.052718344678642e+03, 1.053130566907609e+03, 1.053541840929562e+03, 1.053952171570787e+03, 1.054361563619915e+03,
- 1.054770021828331e+03, 1.055177550910552e+03, 1.055584155544619e+03, 1.055989840372476e+03, 1.056394610000345e+03,
- 1.056798468999093e+03, 1.057201421904601e+03, 1.057603473218125e+03, 1.058004627406649e+03, 1.058404888903238e+03,
- 1.058804262107383e+03, 1.059202751385350e+03, 1.059600361070507e+03, 1.059997095463665e+03, 1.060392958833408e+03,
- 1.060787955416415e+03, 1.061182089417779e+03, 1.061575365011332e+03, 1.061967786339950e+03, 1.062359357515864e+03,
- 1.062750082620970e+03, 1.063139965707123e+03, 1.063529010796439e+03, 1.063917221881591e+03, 1.064304602926092e+03,
- 1.064691157864587e+03, 1.065076890603137e+03, 1.065461805019495e+03, 1.065845904963384e+03, 1.066229194256769e+03,
- 1.066611676694127e+03, 1.066993356042714e+03, 1.067374236042826e+03, 1.067754320408060e+03, 1.068133612825570e+03,
- 1.068512116956323e+03, 1.068889836435342e+03, 1.069266774871964e+03, 1.069642935850075e+03, 1.070018322928358e+03,
- 1.070392939640528e+03, 1.070766789495569e+03, 1.071139875977967e+03, 1.071512202547940e+03, 1.071883772641665e+03,
- 1.072254589671505e+03, 1.072624657026229e+03, 1.072993978071231e+03, 1.073362556148749e+03, 1.073730394578081e+03,
- 1.074097496655790e+03, 1.074463865655923e+03, 1.074829504830210e+03, 1.075194417408273e+03, 1.075558606597828e+03,
- 1.075922075584884e+03, 1.076284827533940e+03, 1.076646865588183e+03, 1.077008192869679e+03, 1.077368812479564e+03,
- 1.077728727498237e+03, 1.078087940985538e+03, 1.078446455980942e+03, 1.078804275503735e+03, 1.079161402553199e+03,
- 1.079517840108787e+03, 1.079873591130300e+03, 1.080228658558064e+03, 1.080583045313098e+03, 1.080936754297290e+03,
- 1.081289788393562e+03, 1.081642150466036e+03, 1.081993843360204e+03, 1.082344869903084e+03, 1.082695232903389e+03
- },
- {
- 1.641545822286156e+00, 4.999880018327272e+00, 8.411619242889715e+00, 1.187882589026007e+01, 1.540369001901346e+01,
- 1.898853990925839e+01, 2.263585372154738e+01, 2.634827240197066e+01, 3.012861399198462e+01, 3.397988953308428e+01,
- 3.790532078281978e+01, 4.190835999487108e+01, 4.599271205761170e+01, 5.016235933548257e+01, 5.442158961719478e+01,
- 5.877502764647108e+01, 6.322767079744707e+01, 6.778492956144153e+01, 7.245267363879633e+01, 7.723728458441862e+01,
- 8.214571614529440e+01, 8.718556366136127e+01, 9.236514418862832e+01, 9.769358936068470e+01, 1.031809534451528e+02,
- 1.088383396080199e+02, 1.146780480865521e+02, 1.207137508404187e+02, 1.269606983389971e+02, 1.334359655113111e+02,
- 1.401587456014531e+02, 1.471507028391218e+02, 1.544363973481677e+02, 1.620437993332573e+02, 1.700049128175133e+02,
- 1.783565340195675e+02, 1.871411733779020e+02, 1.964081732404687e+02, 2.062150519215208e+02, 2.166290929776892e+02,
- 2.277291628578838e+02, 2.396076535175831e+02, 2.523722569681631e+02, 2.661468944817087e+02, 2.810704156117251e+02,
- 2.972905755928289e+02, 3.149495897578689e+02, 3.341573782327267e+02, 3.549507001925180e+02, 3.772389717259235e+02,
- 4.007394125349128e+02, 4.249239093619440e+02, 4.490509083062803e+02, 4.723453195970624e+02, 4.942558699603841e+02,
- 5.144788216070358e+02, 5.329154983298815e+02, 5.496222576192470e+02, 5.647411910597727e+02, 5.784482909707456e+02,
- 5.909217477220002e+02, 6.023257909249654e+02, 6.128044484472574e+02, 6.224807591867245e+02, 6.314585231989860e+02,
- 6.398249360096561e+02, 6.476532901178217e+02, 6.550054036540012e+02, 6.619336759200048e+02, 6.684827758562391e+02,
- 6.746910090357620e+02, 6.805914179588561e+02, 6.862126671308919e+02, 6.915797568934601e+02, 6.967146018224493e+02,
- 7.016365021236676e+02, 7.063625302863079e+02, 7.109078503130132e+02, 7.152859829830710e+02, 7.195090276276256e+02,
- 7.235878486151807e+02, 7.275322330014602e+02, 7.313510244609587e+02, 7.350522375881433e+02, 7.386431558584225e+02,
- 7.421304159159433e+02, 7.455200803648130e+02, 7.488177008510653e+02, 7.520283729114692e+02, 7.551567838144010e+02,
- 7.582072544146272e+02, 7.611837758778158e+02, 7.640900419943398e+02, 7.669294776895948e+02, 7.697052642449300e+02,
- 7.724203616658549e+02, 7.750775285695104e+02, 7.776793399092269e+02, 7.802282028084039e+02, 7.827263707375814e+02,
- 7.851759562361012e+02, 7.875789423522093e+02, 7.899371929520854e+02, 7.922524620283386e+02, 7.945264021214750e+02,
- 7.967605719532766e+02, 7.989564433585087e+02, 8.011154075906269e+02, 8.032387810678512e+02, 8.053278106179820e+02,
- 8.073836782733931e+02, 8.094075056615820e+02, 8.114003580314744e+02, 8.133632479510565e+02, 8.152971387079843e+02,
- 8.172029474412727e+02, 8.190815480291776e+02, 8.209337737683512e+02, 8.227604197869783e+02, 8.245622454059094e+02,
- 8.263399761987361e+02, 8.280943059670794e+02, 8.298258985622178e+02, 8.315353895786739e+02, 8.332233879303830e+02,
- 8.348904773190678e+02, 8.365372176035079e+02, 8.381641460776041e+02, 8.397717786644175e+02, 8.413606110326961e+02,
- 8.429311196425364e+02, 8.444837625239854e+02, 8.460189811148646e+02, 8.475371996763955e+02, 8.490388263320942e+02,
- 8.505242559249107e+02, 8.519938679020921e+02, 8.534480285168719e+02, 8.548870911731289e+02, 8.563113970064727e+02,
- 8.577212754467519e+02, 8.591170447488425e+02, 8.604990124938395e+02, 8.618674760625838e+02, 8.632227230833454e+02,
- 8.645650318553185e+02, 8.658946717494624e+02, 8.672119035881454e+02, 8.685169800048852e+02, 8.698101457854394e+02,
- 8.710916381913755e+02, 8.723616872671978e+02, 8.736205161319988e+02, 8.748683412565722e+02, 8.761053727268414e+02,
- 8.773318144943913e+02, 8.785478646254028e+02, 8.797537154843254e+02, 8.809495540167533e+02, 8.821355619095939e+02,
- 8.833119157992081e+02, 8.844787874586625e+02, 8.856363439763849e+02, 8.867847479266962e+02, 8.879241575326531e+02,
- 8.890547268216172e+02, 8.901766057739248e+02, 8.912899404650345e+02, 8.923948732014733e+02, 8.934915426509244e+02,
- 8.945800839667296e+02, 8.956606289071174e+02, 8.967333059493967e+02, 8.977982403993923e+02, 8.988555544963317e+02,
- 8.999053675134359e+02, 9.009477958543915e+02, 9.019829531459380e+02, 9.030109503267239e+02, 9.040318957326369e+02,
- 9.050458951787521e+02, 9.060530520380792e+02, 9.070534673172351e+02, 9.080472393736943e+02, 9.090344653790543e+02,
- 9.100152393378851e+02, 9.109896534915122e+02, 9.119577980520153e+02, 9.129197612622517e+02, 9.138756294536686e+02,
- 9.148254871019922e+02, 9.157694168808944e+02, 9.167074997137198e+02, 9.176398148233588e+02, 9.185664397803456e+02,
- 9.194874506153352e+02, 9.204029216045631e+02, 9.213129256947879e+02, 9.222175342951655e+02, 9.231168173788642e+02,
- 9.240108435219752e+02, 9.248996799410976e+02, 9.257833925296583e+02, 9.266620458930216e+02, 9.275357033824275e+02,
- 9.284044271278135e+02, 9.292682780695595e+02, 9.301273159891967e+02, 9.309815995391306e+02, 9.318311862713981e+02,
- 9.326761326655188e+02, 9.335164941554494e+02, 9.343523251557009e+02, 9.351836790866301e+02, 9.360106083989483e+02,
- 9.368331645974692e+02, 9.376513982641286e+02, 9.384653590803030e+02, 9.392750958484462e+02, 9.400806565130780e+02,
- 9.408820881811437e+02, 9.416794371417622e+02, 9.424727488853952e+02, 9.432620681224507e+02, 9.440474388013373e+02,
- 9.448289041260051e+02, 9.456065065729655e+02, 9.463802879078319e+02, 9.471502892013847e+02, 9.479165504028038e+02,
- 9.486791121052397e+02, 9.494380129630648e+02, 9.501932914194809e+02, 9.509449852966433e+02, 9.516931318092085e+02,
- 9.524377675775137e+02, 9.531789286403939e+02, 9.539166504676535e+02, 9.546509679722024e+02, 9.553819155218606e+02,
- 9.561095269508569e+02, 9.568338355710156e+02, 9.575548741826512e+02, 9.582726750851784e+02, 9.589872700874409e+02,
- 9.596986905177769e+02, 9.604069672338205e+02, 9.611121306320589e+02, 9.618142106571339e+02, 9.625132368109195e+02,
- 9.632092381613597e+02, 9.639022433510931e+02, 9.645922806058539e+02, 9.652793777426706e+02, 9.659635621778574e+02,
- 9.666448609348088e+02, 9.673233006516095e+02, 9.679989075884511e+02, 9.686717076348715e+02, 9.693417263168222e+02,
- 9.700089888035637e+02, 9.706735199143966e+02, 9.713353441252335e+02, 9.719944855750120e+02, 9.726509680719666e+02,
- 9.733048150997381e+02, 9.739560498233569e+02, 9.746046950950757e+02, 9.752507734600745e+02, 9.758943071620320e+02,
- 9.765353181485692e+02, 9.771738280765697e+02, 9.778098583173830e+02, 9.784434299619028e+02, 9.790745638255396e+02,
- 9.797032804530778e+02, 9.803296001234264e+02, 9.809535428542629e+02, 9.815751284065794e+02, 9.821943762891233e+02,
- 9.828113057627448e+02, 9.834259358446511e+02, 9.840382853125641e+02, 9.846483727087925e+02, 9.852562163442174e+02,
- 9.858618343021892e+02, 9.864652444423447e+02, 9.870664644043424e+02, 9.876655116115198e+02, 9.882624032744740e+02,
- 9.888571563945669e+02, 9.894497877673596e+02, 9.900403139859741e+02, 9.906287514443842e+02, 9.912151163406444e+02,
- 9.917994246800475e+02, 9.923816922782206e+02, 9.929619347641589e+02, 9.935401675831945e+02, 9.941164059999136e+02,
- 9.946906651010058e+02, 9.952629597980647e+02, 9.958333048303281e+02, 9.964017147673666e+02, 9.969682040117191e+02,
- 9.975327868014735e+02, 9.980954772128055e+02, 9.986562891624563e+02, 9.992152364101735e+02, 9.997723325610980e+02,
- 1.000327591068107e+03, 1.000881025234116e+03, 1.001432648214327e+03, 1.001982473018450e+03, 1.002530512512866e+03,
- 1.003076779422760e+03, 1.003621286334210e+03, 1.004164045696240e+03, 1.004705069822828e+03, 1.005244370894888e+03,
- 1.005781960962207e+03, 1.006317851945343e+03, 1.006852055637504e+03, 1.007384583706375e+03, 1.007915447695923e+03,
- 1.008444659028165e+03, 1.008972229004907e+03, 1.009498168809444e+03, 1.010022489508244e+03, 1.010545202052590e+03,
- 1.011066317280194e+03, 1.011585845916788e+03, 1.012103798577682e+03, 1.012620185769299e+03, 1.013135017890681e+03,
- 1.013648305234964e+03, 1.014160057990838e+03, 1.014670286243971e+03, 1.015178999978416e+03, 1.015686209077993e+03,
- 1.016191923327638e+03, 1.016696152414746e+03, 1.017198905930475e+03, 1.017700193371036e+03, 1.018200024138964e+03,
- 1.018698407544358e+03, 1.019195352806108e+03, 1.019690869053101e+03, 1.020184965325401e+03, 1.020677650575421e+03,
- 1.021168933669061e+03, 1.021658823386836e+03, 1.022147328424991e+03, 1.022634457396583e+03, 1.023120218832555e+03,
- 1.023604621182795e+03, 1.024087672817169e+03, 1.024569382026547e+03, 1.025049757023801e+03, 1.025528805944802e+03,
- 1.026006536849385e+03, 1.026482957722313e+03, 1.026958076474214e+03, 1.027431900942513e+03, 1.027904438892341e+03,
- 1.028375698017435e+03, 1.028845685941022e+03, 1.029314410216690e+03, 1.029781878329248e+03, 1.030248097695563e+03,
- 1.030713075665396e+03, 1.031176819522218e+03, 1.031639336484019e+03, 1.032100633704095e+03, 1.032560718271835e+03,
- 1.033019597213485e+03, 1.033477277492909e+03, 1.033933766012336e+03, 1.034389069613090e+03, 1.034843195076320e+03,
- 1.035296149123708e+03, 1.035747938418174e+03, 1.036198569564569e+03, 1.036648049110352e+03, 1.037096383546266e+03,
- 1.037543579307000e+03, 1.037989642771839e+03, 1.038434580265304e+03, 1.038878398057794e+03, 1.039321102366197e+03,
- 1.039762699354520e+03, 1.040203195134480e+03, 1.040642595766113e+03, 1.041080907258355e+03, 1.041518135569626e+03,
- 1.041954286608401e+03, 1.042389366233777e+03, 1.042823380256020e+03, 1.043256334437123e+03, 1.043688234491339e+03,
- 1.044119086085722e+03, 1.044548894840638e+03, 1.044977666330298e+03, 1.045405406083259e+03, 1.045832119582933e+03,
- 1.046257812268076e+03, 1.046682489533287e+03, 1.047106156729485e+03, 1.047528819164386e+03, 1.047950482102972e+03,
- 1.048371150767956e+03, 1.048790830340241e+03, 1.049209525959365e+03, 1.049627242723949e+03, 1.050043985692137e+03,
- 1.050459759882025e+03, 1.050874570272090e+03, 1.051288421801613e+03, 1.051701319371092e+03, 1.052113267842649e+03,
- 1.052524272040443e+03, 1.052934336751062e+03, 1.053343466723918e+03, 1.053751666671638e+03, 1.054158941270447e+03,
- 1.054565295160547e+03, 1.054970732946485e+03, 1.055375259197531e+03, 1.055778878448036e+03, 1.056181595197791e+03,
- 1.056583413912384e+03, 1.056984339023551e+03, 1.057384374929517e+03, 1.057783525995339e+03, 1.058181796553247e+03,
- 1.058579190902970e+03, 1.058975713312067e+03, 1.059371368016252e+03, 1.059766159219712e+03, 1.060160091095424e+03,
- 1.060553167785468e+03, 1.060945393401330e+03, 1.061336772024212e+03, 1.061727307705332e+03, 1.062117004466214e+03,
- 1.062505866298989e+03, 1.062893897166678e+03, 1.063281101003484e+03, 1.063667481715066e+03, 1.064053043178824e+03,
- 1.064437789244173e+03, 1.064821723732816e+03, 1.065204850439006e+03, 1.065587173129819e+03, 1.065968695545414e+03,
- 1.066349421399289e+03, 1.066729354378539e+03, 1.067108498144111e+03, 1.067486856331047e+03, 1.067864432548738e+03,
- 1.068241230381164e+03, 1.068617253387133e+03, 1.068992505100524e+03, 1.069366989030517e+03, 1.069740708661828e+03,
- 1.070113667454938e+03, 1.070485868846321e+03, 1.070857316248666e+03, 1.071228013051099e+03, 1.071597962619403e+03,
- 1.071967168296235e+03, 1.072335633401338e+03, 1.072703361231751e+03, 1.073070355062025e+03, 1.073436618144418e+03,
- 1.073802153709113e+03, 1.074166964964406e+03, 1.074531055096917e+03, 1.074894427271779e+03, 1.075257084632836e+03,
- 1.075619030302839e+03, 1.075980267383629e+03, 1.076340798956334e+03, 1.076700628081546e+03, 1.077059757799515e+03,
- 1.077418191130321e+03, 1.077775931074063e+03, 1.078132980611031e+03, 1.078489342701885e+03, 1.078845020287827e+03,
- 1.079200016290774e+03, 1.079554333613528e+03, 1.079907975139945e+03, 1.080260943735102e+03, 1.080613242245458e+03
- },
- {
- 1.636321555409574e+00, 4.983552621604361e+00, 8.383423379019025e+00, 1.183793769520928e+01, 1.534922154704764e+01,
- 1.891953293160990e+01, 2.255127278932934e+01, 2.624699706950945e+01, 3.000943007962818e+01, 3.384147928819196e+01,
- 3.774625177333762e+01, 4.172707254078666e+01, 4.578750497057986e+01, 4.993137369466555e+01, 5.416279025816367e+01,
- 5.848618197772019e+01, 6.290632448296122e+01, 6.742837851431160e+01, 7.205793165573591e+01, 7.680104580834062e+01,
- 8.166431136557188e+01, 8.665490923932418e+01, 9.178068211685715e+01, 9.705021661099435e+01, 1.024729383149062e+02,
- 1.080592221983403e+02, 1.138205213159369e+02, 1.197695174481967e+02, 1.259202981063218e+02, 1.322885653285323e+02,
- 1.388918829200495e+02, 1.457499703002495e+02, 1.528850527902900e+02, 1.603222806057511e+02, 1.680902306635819e+02,
- 1.762215082050187e+02, 1.847534669906989e+02, 1.937290674890092e+02, 2.031978894498185e+02, 2.132173042642609e+02,
- 2.238537849178170e+02, 2.351842705975085e+02, 2.472973787535842e+02, 2.602940185353457e+02, 2.742865351018919e+02,
- 2.893948536475739e+02, 3.057373096671192e+02, 3.234134928248470e+02, 3.424774251920342e+02, 3.629017161221860e+02,
- 3.845350832597644e+02, 4.070596755962426e+02, 4.299739836610856e+02, 4.526504666687800e+02, 4.744827346466215e+02,
- 4.950536236487504e+02, 5.141294349119217e+02, 5.316358268514845e+02, 5.476168135823842e+02, 5.621838704821239e+02,
- 5.754777644347949e+02, 5.876444446925653e+02, 5.988218104377670e+02, 6.091336915475293e+02, 6.186881214594833e+02,
- 6.275778859451830e+02, 6.358820906969598e+02, 6.436680390626007e+02, 6.509930643093096e+02, 6.579061652962190e+02,
- 6.644494016770454e+02, 6.706590553145638e+02, 6.765665849479208e+02, 6.821994066013164e+02, 6.875815309190266e+02,
- 6.927340846855093e+02, 6.976757392280379e+02, 7.024230640908584e+02, 7.069908206508895e+02, 7.113922072868319e+02,
- 7.156390652685259e+02, 7.197420526105188e+02, 7.237107916345984e+02, 7.275539948210796e+02, 7.312795726227969e+02,
- 7.348947262089670e+02, 7.384060275516626e+02, 7.418194888299029e+02, 7.451406227781079e+02, 7.483744953267067e+02,
- 7.515257716574445e+02, 7.545987566129119e+02, 7.575974302500607e+02, 7.605254792042584e+02, 7.633863244284751e+02,
- 7.661831457875005e+02, 7.689189039162765e+02, 7.715963596921847e+02, 7.742180916212276e+02, 7.767865113959501e+02,
- 7.793038778473295e+02, 7.817723094826206e+02, 7.841937957754135e+02, 7.865702073522011e+02, 7.889033052009938e+02,
- 7.911947490114106e+02, 7.934461047418691e+02, 7.956588514975848e+02, 7.978343877928285e+02, 7.999740372620169e+02,
- 8.020790538765076e+02, 8.041506267173190e+02, 8.061898843481590e+02, 8.081978988281152e+02, 8.101756894112032e+02,
- 8.121242258890844e+02, 8.140444317941756e+02, 8.159371872313753e+02, 8.178033315557316e+02, 8.196436658365124e+02,
- 8.214589551388193e+02, 8.232499306387003e+02, 8.250172915860578e+02, 8.267617071282964e+02, 8.284838180063574e+02,
- 8.301842381336540e+02, 8.318635560674803e+02, 8.335223363815040e+02, 8.351611209472012e+02, 8.367804301313571e+02,
- 8.383807639163457e+02, 8.399626027552322e+02, 8.415264094344899e+02, 8.430726286227779e+02, 8.446016879914871e+02,
- 8.461140008945813e+02, 8.476099645625778e+02, 8.490899622619694e+02, 8.505543636589949e+02, 8.520035254558539e+02,
- 8.534377919903737e+02, 8.548574958015797e+02, 8.562629581634851e+02, 8.576544895891752e+02, 8.590323903071661e+02,
- 8.603969507118237e+02, 8.617484517895052e+02, 8.630871655219820e+02, 8.644133552685647e+02, 8.657272761282549e+02,
- 8.670291752831649e+02, 8.683192923243446e+02, 8.695978595610771e+02, 8.708651023146402e+02, 8.721212391974517e+02,
- 8.733664823894746e+02, 8.746010378453773e+02, 8.758251056045920e+02, 8.770388799720795e+02, 8.782425497485523e+02,
- 8.794362984380803e+02, 8.806203044460127e+02, 8.817947412677627e+02, 8.829597776689399e+02, 8.841155778573111e+02,
- 8.852623016470160e+02, 8.864001046154657e+02, 8.875291382532969e+02, 8.886495501077505e+02, 8.897614839198187e+02,
- 8.908650797554765e+02, 8.919604741313043e+02, 8.930478001347813e+02, 8.941271875395212e+02, 8.951987629157020e+02,
- 8.962626497359248e+02, 8.973189684767266e+02, 8.983678367159673e+02, 8.994093692262679e+02, 9.004436780647233e+02,
- 9.014708726590293e+02, 9.024910598902239e+02, 9.035043441721842e+02, 9.045108271857929e+02, 9.055106092934665e+02,
- 9.065037876384692e+02, 9.074904575012828e+02, 9.084707120491204e+02, 9.094446423988951e+02, 9.104123376778349e+02,
- 9.113738850818708e+02, 9.123293699318859e+02, 9.132788757279192e+02, 9.142224842014155e+02, 9.151602753656035e+02,
- 9.160923275640820e+02, 9.170187175176911e+02, 9.179395203697389e+02, 9.188548098091928e+02, 9.197646578003956e+02,
- 9.206691350841061e+02, 9.215683109152513e+02, 9.224622531749989e+02, 9.233510284074597e+02, 9.242347018551573e+02,
- 9.251133374933231e+02, 9.259869980630592e+02, 9.268557451034184e+02, 9.277196389824353e+02, 9.285787389271579e+02,
- 9.294331030527137e+02, 9.302827883904490e+02, 9.311278509151732e+02, 9.319683455715478e+02, 9.328043262996501e+02,
- 9.336358460597396e+02, 9.344629568562578e+02, 9.352857097610953e+02, 9.361041549361461e+02, 9.369183416551751e+02,
- 9.377283183250330e+02, 9.385341325062295e+02, 9.393358309328966e+02, 9.401334595321604e+02, 9.409270634429453e+02,
- 9.417166870342201e+02, 9.425023739227290e+02, 9.432841669901933e+02, 9.440621084000300e+02, 9.448362391784113e+02,
- 9.456066009518092e+02, 9.463732334075459e+02, 9.471361759936597e+02, 9.478954675166191e+02, 9.486511461554048e+02,
- 9.494032494752064e+02, 9.501518144407406e+02, 9.508968774292088e+02, 9.516384742429025e+02, 9.523766401214669e+02,
- 9.531114097538400e+02, 9.538428172898680e+02, 9.545708963516159e+02, 9.552956800443811e+02, 9.560172009674117e+02,
- 9.567354912243540e+02, 9.574505824334220e+02, 9.581625057373068e+02, 9.588712918128319e+02, 9.595769708803628e+02,
- 9.602795727129742e+02, 9.609791266453883e+02, 9.616756615826897e+02, 9.623692060088173e+02, 9.630597879948523e+02,
- 9.637474352070925e+02, 9.644321749149360e+02, 9.651140339985651e+02, 9.657930389564484e+02, 9.664692159126581e+02,
- 9.671425906240088e+02, 9.678131884870297e+02, 9.684810345447688e+02, 9.691461534934315e+02, 9.698085696888667e+02,
- 9.704683071528997e+02, 9.711253895795156e+02, 9.717798403408964e+02, 9.724316824933244e+02, 9.730809387829433e+02,
- 9.737276316513902e+02, 9.743717832412982e+02, 9.750134154016712e+02, 9.756525496931426e+02, 9.762892073931122e+02,
- 9.769234095007649e+02, 9.775551767419835e+02, 9.781845295741483e+02, 9.788114881908315e+02, 9.794360725263899e+02,
- 9.800583022604533e+02, 9.806781968223169e+02, 9.812957753952431e+02, 9.819110569206596e+02, 9.825240601022774e+02,
- 9.831348034101169e+02, 9.837433050844445e+02, 9.843495831396326e+02, 9.849536553679326e+02, 9.855555393431715e+02,
- 9.861552524243671e+02, 9.867528117592748e+02, 9.873482342878541e+02, 9.879415367456654e+02, 9.885327356671992e+02,
- 9.891218473891332e+02, 9.897088880535276e+02, 9.902938736109502e+02, 9.908768198235430e+02, 9.914577422680217e+02,
- 9.920366563386251e+02, 9.926135772499890e+02, 9.931885200399809e+02, 9.937614995724656e+02, 9.943325305400240e+02,
- 9.949016274666118e+02, 9.954688047101735e+02, 9.960340764651982e+02, 9.965974567652329e+02, 9.971589594853396e+02,
- 9.977185983445129e+02, 9.982763869080444e+02, 9.988323385898477e+02, 9.993864666547344e+02, 9.999387842206485e+02,
- 1.000489304260862e+03, 1.001038039606124e+03, 1.001585002946774e+03, 1.002130206834810e+03, 1.002673663685926e+03,
- 1.003215385781506e+03, 1.003755385270584e+03, 1.004293674171764e+03, 1.004830264375112e+03, 1.005365167644006e+03,
- 1.005898395616959e+03, 1.006429959809402e+03, 1.006959871615441e+03, 1.007488142309582e+03, 1.008014783048420e+03,
- 1.008539804872302e+03, 1.009063218706961e+03, 1.009585035365121e+03, 1.010105265548069e+03, 1.010623919847205e+03,
- 1.011141008745563e+03, 1.011656542619306e+03, 1.012170531739194e+03, 1.012682986272025e+03, 1.013193916282057e+03,
- 1.013703331732399e+03, 1.014211242486383e+03, 1.014717658308909e+03, 1.015222588867769e+03, 1.015726043734949e+03,
- 1.016228032387908e+03, 1.016728564210839e+03, 1.017227648495900e+03, 1.017725294444433e+03, 1.018221511168164e+03,
- 1.018716307690371e+03, 1.019209692947048e+03, 1.019701675788039e+03, 1.020192264978160e+03, 1.020681469198294e+03,
- 1.021169297046481e+03, 1.021655757038979e+03, 1.022140857611312e+03, 1.022624607119304e+03, 1.023107013840087e+03,
- 1.023588085973111e+03, 1.024067831641112e+03, 1.024546258891090e+03, 1.025023375695257e+03, 1.025499189951970e+03,
- 1.025973709486657e+03, 1.026446942052721e+03, 1.026918895332436e+03, 1.027389576937825e+03, 1.027858994411524e+03,
- 1.028327155227632e+03, 1.028794066792556e+03, 1.029259736445833e+03, 1.029724171460943e+03, 1.030187379046110e+03,
- 1.030649366345090e+03, 1.031110140437951e+03, 1.031569708341832e+03, 1.032028077011703e+03, 1.032485253341101e+03,
- 1.032941244162863e+03, 1.033396056249847e+03, 1.033849696315638e+03, 1.034302171015253e+03, 1.034753486945818e+03,
- 1.035203650647260e+03, 1.035652668602962e+03, 1.036100547240429e+03, 1.036547292931935e+03, 1.036992911995161e+03,
- 1.037437410693827e+03, 1.037880795238309e+03, 1.038323071786253e+03, 1.038764246443178e+03, 1.039204325263070e+03,
- 1.039643314248970e+03, 1.040081219353542e+03, 1.040518046479657e+03, 1.040953801480941e+03, 1.041388490162334e+03,
- 1.041822118280633e+03, 1.042254691545033e+03, 1.042686215617654e+03, 1.043116696114063e+03, 1.043546138603792e+03,
- 1.043974548610844e+03, 1.044401931614195e+03, 1.044828293048288e+03, 1.045253638303521e+03, 1.045677972726724e+03,
- 1.046101301621639e+03, 1.046523630249382e+03, 1.046944963828909e+03, 1.047365307537466e+03, 1.047784666511041e+03,
- 1.048203045844805e+03, 1.048620450593552e+03, 1.049036885772122e+03, 1.049452356355837e+03, 1.049866867280911e+03,
- 1.050280423444867e+03, 1.050693029706948e+03, 1.051104690888515e+03, 1.051515411773446e+03, 1.051925197108533e+03,
- 1.052334051603859e+03, 1.052741979933191e+03, 1.053148986734351e+03, 1.053555076609588e+03, 1.053960254125947e+03,
- 1.054364523815630e+03, 1.054767890176356e+03, 1.055170357671712e+03, 1.055571930731501e+03, 1.055972613752091e+03,
- 1.056372411096747e+03, 1.056771327095974e+03, 1.057169366047843e+03, 1.057566532218322e+03, 1.057962829841591e+03,
- 1.058358263120372e+03, 1.058752836226236e+03, 1.059146553299913e+03, 1.059539418451604e+03, 1.059931435761282e+03,
- 1.060322609278987e+03, 1.060712943025128e+03, 1.061102440990771e+03, 1.061491107137928e+03, 1.061878945399841e+03,
- 1.062265959681263e+03, 1.062652153858741e+03, 1.063037531780880e+03, 1.063422097268623e+03, 1.063805854115514e+03,
- 1.064188806087965e+03, 1.064570956925514e+03, 1.064952310341087e+03, 1.065332870021248e+03, 1.065712639626457e+03,
- 1.066091622791312e+03, 1.066469823124801e+03, 1.066847244210539e+03, 1.067223889607016e+03, 1.067599762847823e+03,
- 1.067974867441897e+03, 1.068349206873746e+03, 1.068722784603682e+03, 1.069095604068042e+03, 1.069467668679417e+03,
- 1.069838981826869e+03, 1.070209546876152e+03, 1.070579367169923e+03, 1.070948446027964e+03, 1.071316786747383e+03,
- 1.071684392602827e+03, 1.072051266846688e+03, 1.072417412709308e+03, 1.072782833399175e+03, 1.073147532103128e+03,
- 1.073511511986548e+03, 1.073874776193556e+03, 1.074237327847206e+03, 1.074599170049671e+03, 1.074960305882433e+03,
- 1.075320738406469e+03, 1.075680470662436e+03, 1.076039505670848e+03, 1.076397846432261e+03, 1.076755495927444e+03,
- 1.077112457117562e+03, 1.077468732944345e+03, 1.077824326330259e+03, 1.078179240178678e+03, 1.078533477374050e+03
- },
- {
- 1.631130870647663e+00, 4.967335697846337e+00, 8.355428201051920e+00, 1.179735548209492e+01, 1.529518144513699e+01,
- 1.885109610041185e+01, 2.246742579783084e+01, 2.614664450752904e+01, 2.989138627337871e+01, 3.370445899099646e+01,
- 3.758885968074793e+01, 4.154779145347638e+01, 4.558468239740215e+01, 4.970320665104162e+01, 5.390730797007718e+01,
- 5.820122614724887e+01, 6.258952670522854e+01, 6.707713435515440e+01, 7.166937080059350e+01, 7.637199757137154e+01,
- 8.119126469773332e+01, 8.613396618764941e+01, 9.120750345452899e+01, 9.641995806652928e+01, 1.017801754609591e+02,
- 1.072978615984323e+02, 1.129836949379619e+02, 1.188494565990323e+02, 1.249081821847323e+02, 1.311743394531514e+02,
- 1.376640368972039e+02, 1.443952693362520e+02, 1.513882077107492e+02, 1.586655418931304e+02, 1.662528862820932e+02,
- 1.741792596234446e+02, 1.824776509965670e+02, 1.911856833428515e+02, 2.003463823113282e+02, 2.100090486124786e+02,
- 2.202302108249118e+02, 2.310745923583578e+02, 2.426159429593629e+02, 2.549374325018774e+02, 2.681310429917555e+02,
- 2.822949921364836e+02, 2.975277230596889e+02, 3.139166595237057e+02, 3.315203066483657e+02, 3.503437616590377e+02,
- 3.703095248053883e+02, 3.912269701653681e+02, 4.127692113786606e+02, 4.344799780507998e+02, 4.558371382996464e+02,
- 4.763656915678565e+02, 4.957449683054553e+02, 5.137933407030494e+02, 5.304540060356871e+02, 5.457617345962274e+02,
- 5.598049630345824e+02, 5.726972170863443e+02, 5.845585978375243e+02, 5.955050519612537e+02, 6.056429226685869e+02,
- 6.150668155391909e+02, 6.238593908115648e+02, 6.320921599762961e+02, 6.398267138031158e+02, 6.471160542783726e+02,
- 6.540058621935638e+02, 6.605356272444029e+02, 6.667396197439807e+02, 6.726477091456883e+02, 6.782860458469881e+02,
- 6.836776261634247e+02, 6.888427599250385e+02, 6.937994580465897e+02, 6.985637548041587e+02, 7.031499769739535e+02,
- 7.075709696965918e+02, 7.118382869975297e+02, 7.159623533161169e+02, 7.199526011310603e+02, 7.238175887675933e+02,
- 7.275651016807977e+02, 7.312022398862998e+02, 7.347354937172738e+02, 7.381708096962001e+02, 7.415136479983754e+02,
- 7.447690327340238e+02, 7.479415960737239e+02, 7.510356170772685e+02, 7.540550559512781e+02, 7.570035843497110e+02,
- 7.598846122392866e+02, 7.627013117750271e+02, 7.654566385668305e+02, 7.681533506639315e+02, 7.707940255384761e+02,
- 7.733810753108160e+02, 7.759167604262835e+02, 7.784032019652893e+02, 7.808423927446690e+02, 7.832362073477811e+02,
- 7.855864112033083e+02, 7.878946688176231e+02, 7.901625512525573e+02, 7.923915429292088e+02, 7.945830478286586e+02,
- 7.967383951520670e+02, 7.988588445072033e+02, 8.009455905976047e+02, 8.029997676416401e+02, 8.050224533106621e+02,
- 8.070146724101023e+02, 8.089774002567585e+02, 8.109115657924010e+02, 8.128180544579269e+02, 8.146977108497100e+02,
- 8.165513411775747e+02, 8.183797155418272e+02, 8.201835700450439e+02, 8.219636087527201e+02, 8.237205055155413e+02,
- 8.254549056647719e+02, 8.271674275911796e+02, 8.288586642169236e+02, 8.305291843689592e+02, 8.321795340617242e+02,
- 8.338102374694304e+02, 8.354217989970376e+02, 8.370147028839252e+02, 8.385894152171879e+02, 8.401463839206352e+02,
- 8.416860415010921e+02, 8.432088036577754e+02, 8.447150712625717e+02, 8.462052308202092e+02, 8.476796551461289e+02,
- 8.491387040051010e+02, 8.505827247132548e+02, 8.520120527060046e+02, 8.534270120741578e+02, 8.548279160702842e+02,
- 8.562150675873195e+02, 8.575887596111780e+02, 8.589492756490559e+02, 8.602968901349500e+02, 8.616318688138389e+02,
- 8.629544691058381e+02, 8.642649404515655e+02, 8.655635246398665e+02, 8.668504561189568e+02, 8.681259622919694e+02,
- 8.693902638080673e+02, 8.706435747875114e+02, 8.718861031405305e+02, 8.731180507646376e+02, 8.743396137863605e+02,
- 8.755509827805862e+02, 8.767523429796058e+02, 8.779438744724457e+02, 8.791257523949978e+02, 8.802981471114610e+02,
- 8.814612243875750e+02, 8.826151455560622e+02, 8.837600676747097e+02, 8.848961436774732e+02, 8.860235225189696e+02,
- 8.871423493126939e+02, 8.882527654632906e+02, 8.893549087931857e+02, 8.904489136638458e+02, 8.915349110919593e+02,
- 8.926130288607712e+02, 8.936833916268249e+02, 8.947461210223232e+02, 8.958013357533365e+02, 8.968491516940431e+02,
- 8.978896819772016e+02, 8.989230370810319e+02, 8.999493249126697e+02, 9.009686508883663e+02, 9.019811176539306e+02,
- 9.029868265567371e+02, 9.039858756615349e+02, 9.049783611627917e+02, 9.059643771211463e+02, 9.069440155269380e+02,
- 9.079173663613799e+02, 9.088845176554819e+02, 9.098455555468198e+02, 9.108005643342393e+02, 9.117496265305956e+02,
- 9.126928229136012e+02, 9.136302325748665e+02, 9.145619329672173e+02, 9.154879999503469e+02, 9.164085078348834e+02,
- 9.173235294249357e+02, 9.182331361541183e+02, 9.191373977519952e+02, 9.200363828328292e+02, 9.209301585717945e+02,
- 9.218187908295280e+02, 9.227023441867568e+02, 9.235808819777858e+02, 9.244544663228887e+02, 9.253231581596475e+02,
- 9.261870172732766e+02, 9.270461023259735e+02, 9.279004708853400e+02, 9.287501794518929e+02, 9.295952834857173e+02,
- 9.304358374322829e+02, 9.312718947474571e+02, 9.321035079217420e+02, 9.329307285037806e+02, 9.337536071231277e+02,
- 9.345721935123461e+02, 9.353865365284263e+02, 9.361966841735713e+02, 9.370026836153597e+02, 9.378045812063141e+02,
- 9.386024225028901e+02, 9.393962522839169e+02, 9.401861145684949e+02, 9.409720526333816e+02, 9.417541086019405e+02,
- 9.425323251535135e+02, 9.433067430275131e+02, 9.440774026954267e+02, 9.448443439661633e+02, 9.456076060006856e+02,
- 9.463672273262407e+02, 9.471232458501930e+02, 9.478756988734796e+02, 9.486246231036985e+02, 9.493700546678463e+02,
- 9.501120291247033e+02, 9.508505814768961e+02, 9.515857461826326e+02, 9.523175571671277e+02, 9.530460478337279e+02,
- 9.537712510747438e+02, 9.544931992819988e+02, 9.552119243571067e+02, 9.559274577214813e+02, 9.566398303260908e+02,
- 9.573490726609622e+02, 9.580552147644469e+02, 9.587582862322449e+02, 9.594583162262122e+02, 9.601553334829408e+02,
- 9.608493663221262e+02, 9.615404426547317e+02, 9.622285899909459e+02, 9.629138354479524e+02, 9.635962057575007e+02,
- 9.642757272733037e+02, 9.649524259782502e+02, 9.656263274914447e+02, 9.662974570750830e+02, 9.669658396411576e+02,
- 9.676314997580146e+02, 9.682944616567447e+02, 9.689547492374326e+02, 9.696123860752580e+02, 9.702673954264560e+02,
- 9.709198002341392e+02, 9.715696231339832e+02, 9.722168864597902e+02, 9.728616122489176e+02, 9.735038222475868e+02,
- 9.741435379160746e+02, 9.747807804337846e+02, 9.754155707042077e+02, 9.760479293597699e+02, 9.766778767665779e+02,
- 9.773054330290521e+02, 9.779306179944670e+02, 9.785534512573864e+02, 9.791739521640051e+02, 9.797921398163938e+02,
- 9.804080330766574e+02, 9.810216505709997e+02, 9.816330106937036e+02, 9.822421316110272e+02, 9.828490312650148e+02,
- 9.834537273772324e+02, 9.840562374524200e+02, 9.846565787820692e+02, 9.852547684479304e+02, 9.858508233254410e+02,
- 9.864447600870869e+02, 9.870365952056961e+02, 9.876263449576604e+02, 9.882140254260974e+02, 9.887996525039442e+02,
- 9.893832418969896e+02, 9.899648091268474e+02, 9.905443695338682e+02, 9.911219382799927e+02, 9.916975303515532e+02,
- 9.922711605620118e+02, 9.928428435546513e+02, 9.934125938052125e+02, 9.939804256244779e+02, 9.945463531608049e+02,
- 9.951103904026131e+02, 9.956725511808220e+02, 9.962328491712400e+02, 9.967912978969121e+02, 9.973479107304189e+02,
- 9.979027008961335e+02, 9.984556814724369e+02, 9.990068653938905e+02, 9.995562654533667e+02, 1.000103894304143e+03,
- 1.000649764461954e+03, 1.001193888307008e+03, 1.001736278085964e+03, 1.002276945913874e+03, 1.002815903776089e+03,
- 1.003353163530133e+03, 1.003888736907535e+03, 1.004422635515640e+03, 1.004954870839376e+03, 1.005485454242995e+03,
- 1.006014396971783e+03, 1.006541710153739e+03, 1.007067404801221e+03, 1.007591491812567e+03, 1.008113981973685e+03,
- 1.008634885959619e+03, 1.009154214336083e+03, 1.009671977560964e+03, 1.010188185985815e+03, 1.010702849857304e+03,
- 1.011215979318653e+03, 1.011727584411034e+03, 1.012237675074967e+03, 1.012746261151666e+03, 1.013253352384384e+03,
- 1.013758958419725e+03, 1.014263088808931e+03, 1.014765753009161e+03, 1.015266960384731e+03, 1.015766720208347e+03,
- 1.016265041662309e+03, 1.016761933839703e+03, 1.017257405745564e+03, 1.017751466298026e+03, 1.018244124329454e+03,
- 1.018735388587552e+03, 1.019225267736457e+03, 1.019713770357817e+03, 1.020200904951844e+03, 1.020686679938359e+03,
- 1.021171103657815e+03, 1.021654184372303e+03, 1.022135930266547e+03, 1.022616349448876e+03, 1.023095449952186e+03,
- 1.023573239734888e+03, 1.024049726681832e+03, 1.024524918605230e+03, 1.024998823245549e+03, 1.025471448272407e+03,
- 1.025942801285441e+03, 1.026412889815165e+03, 1.026881721323824e+03, 1.027349303206223e+03, 1.027815642790544e+03,
- 1.028280747339162e+03, 1.028744624049436e+03, 1.029207280054493e+03, 1.029668722424001e+03, 1.030128958164931e+03,
- 1.030587994222302e+03, 1.031045837479918e+03, 1.031502494761100e+03, 1.031957972829397e+03, 1.032412278389293e+03,
- 1.032865418086899e+03, 1.033317398510640e+03, 1.033768226191929e+03, 1.034217907605828e+03, 1.034666449171707e+03,
- 1.035113857253887e+03, 1.035560138162273e+03, 1.036005298152986e+03, 1.036449343428975e+03, 1.036892280140627e+03,
- 1.037334114386369e+03, 1.037774852213254e+03, 1.038214499617550e+03, 1.038653062545309e+03, 1.039090546892934e+03,
- 1.039526958507739e+03, 1.039962303188498e+03, 1.040396586685989e+03, 1.040829814703524e+03, 1.041261992897481e+03,
- 1.041693126877825e+03, 1.042123222208615e+03, 1.042552284408513e+03, 1.042980318951285e+03, 1.043407331266288e+03,
- 1.043833326738957e+03, 1.044258310711283e+03, 1.044682288482287e+03, 1.045105265308481e+03, 1.045527246404331e+03,
- 1.045948236942705e+03, 1.046368242055325e+03, 1.046787266833205e+03, 1.047205316327085e+03, 1.047622395547859e+03,
- 1.048038509467003e+03, 1.048453663016985e+03, 1.048867861091683e+03, 1.049281108546789e+03, 1.049693410200208e+03,
- 1.050104770832460e+03, 1.050515195187061e+03, 1.050924687970918e+03, 1.051333253854703e+03, 1.051740897473232e+03,
- 1.052147623425830e+03, 1.052553436276706e+03, 1.052958340555304e+03, 1.053362340756665e+03, 1.053765441341777e+03,
- 1.054167646737925e+03, 1.054568961339028e+03, 1.054969389505982e+03, 1.055368935566991e+03, 1.055767603817902e+03,
- 1.056165398522522e+03, 1.056562323912948e+03, 1.056958384189879e+03, 1.057353583522932e+03, 1.057747926050951e+03,
- 1.058141415882310e+03, 1.058534057095220e+03, 1.058925853738022e+03, 1.059316809829484e+03, 1.059706929359093e+03,
- 1.060096216287336e+03, 1.060484674545993e+03, 1.060872308038408e+03, 1.061259120639771e+03, 1.061645116197390e+03,
- 1.062030298530959e+03, 1.062414671432829e+03, 1.062798238668267e+03, 1.063181003975719e+03, 1.063562971067066e+03,
- 1.063944143627875e+03, 1.064324525317658e+03, 1.064704119770112e+03, 1.065082930593368e+03, 1.065460961370229e+03,
- 1.065838215658418e+03, 1.066214696990800e+03, 1.066590408875633e+03, 1.066965354796783e+03, 1.067339538213961e+03,
- 1.067712962562947e+03, 1.068085631255809e+03, 1.068457547681130e+03, 1.068828715204218e+03, 1.069199137167326e+03,
- 1.069568816889863e+03, 1.069937757668603e+03, 1.070305962777895e+03, 1.070673435469866e+03, 1.071040178974625e+03,
- 1.071406196500464e+03, 1.071771491234055e+03, 1.072136066340647e+03, 1.072499924964259e+03, 1.072863070227872e+03,
- 1.073225505233618e+03, 1.073587233062969e+03, 1.073948256776919e+03, 1.074308579416169e+03, 1.074668204001309e+03,
- 1.075027133532994e+03, 1.075385370992125e+03, 1.075742919340017e+03, 1.076099781518583e+03, 1.076455960450494e+03
- },
- {
- 1.625973439225363e+00, 4.951228071217685e+00, 8.327631400462709e+00, 1.175707546510210e+01, 1.524156403483817e+01,
- 1.878322134428581e+01, 2.238430168022795e+01, 2.604719992811030e+01, 2.977446318993707e+01, 3.356880360876121e+01,
- 3.743311255090531e+01, 4.137047632063350e+01, 4.538419360829555e+01, 4.947779490398870e+01, 5.365506414529690e+01,
- 5.792006291075690e+01, 6.227715752168302e+01, 6.673104947546332e+01, 7.128680970537111e+01, 7.594991724769784e+01,
- 8.072630299946265e+01, 8.562239937274342e+01, 9.064519679876483e+01, 9.580230821181669e+01, 1.011020428556167e+02,
- 1.065534910103649e+02, 1.121666215453041e+02, 1.179523945725535e+02, 1.239228919089327e+02, 1.300914685845693e+02,
- 1.364729292343458e+02, 1.430837339276030e+02, 1.499422386751387e+02, 1.570689769230090e+02, 1.644869887301490e+02,
- 1.722222052377329e+02, 1.803038958249792e+02, 1.887651841931468e+02, 1.976436360182238e+02, 2.069819127243081e+02,
- 2.168284695761764e+02, 2.272382451105752e+02, 2.382732319290451e+02, 2.500027189386574e+02, 2.625028294481518e+02,
- 2.758547289880024e+02, 2.901405587865544e+02, 3.054358907477387e+02, 3.217976012803613e+02, 3.392468794319454e+02,
- 3.577484993166742e+02, 3.771887353505552e+02, 3.973558723007633e+02, 4.179323622840564e+02, 4.385149431936200e+02,
- 4.586733875184417e+02, 4.780341134823276e+02, 4.963470660973189e+02, 5.134698715363832e+02, 5.293585620859758e+02,
- 5.440408738074391e+02, 5.575876710092773e+02, 5.700912374600881e+02, 5.816509066060081e+02, 5.923643834410220e+02,
- 6.023229799081640e+02, 6.116093933590104e+02, 6.202970608160458e+02, 6.284504244601005e+02, 6.361256661517834e+02,
- 6.433716323809634e+02, 6.502307869397517e+02, 6.567401056480180e+02, 6.629318751151840e+02, 6.688343848707927e+02,
- 6.744725165645788e+02, 6.798682405337863e+02, 6.850410322570893e+02, 6.900082211438844e+02, 6.947852829636615e+02,
- 6.993860856825850e+02, 7.038230969001155e+02, 7.081075596368794e+02, 7.122496419809714e+02, 7.162585650633010e+02,
- 7.201427129872501e+02, 7.239097276570254e+02, 7.275665909044651e+02, 7.311196958791775e+02, 7.345749093195884e+02,
- 7.379376260439720e+02, 7.412128167763241e+02, 7.444050702403241e+02, 7.475186303065996e+02, 7.505574288571228e+02,
- 7.535251149303625e+02, 7.564250806276467e+02, 7.592604841917704e+02, 7.620342706106155e+02, 7.647491900494916e+02,
- 7.674078143743619e+02, 7.700125519928242e+02, 7.725656612097099e+02, 7.750692622684028e+02, 7.775253482270549e+02,
- 7.799357947998642e+02, 7.823023692773869e+02, 7.846267386257271e+02, 7.869104768639445e+02, 7.891550717261435e+02,
- 7.913619308557757e+02, 7.935323873491661e+02, 7.956677048866478e+02, 7.977690824230866e+02, 7.998376584923832e+02,
- 8.018745151631148e+02, 8.038806816784489e+02, 8.058571378098459e+02, 8.078048169509658e+02, 8.097246089753834e+02,
- 8.116173628792919e+02, 8.134838892282057e+02, 8.153249624247305e+02, 8.171413228128118e+02, 8.189336786323078e+02,
- 8.207027078364252e+02, 8.224490597833361e+02, 8.241733568122372e+02, 8.258761957131269e+02, 8.275581490987634e+02,
- 8.292197664741115e+02, 8.308615763099114e+02, 8.324840858751994e+02, 8.340877831235260e+02, 8.356731374822681e+02,
- 8.372405997381867e+02, 8.387906062845365e+02, 8.403235756730642e+02, 8.418399118257541e+02, 8.433400042205504e+02,
- 8.448242285707026e+02, 8.462929474649101e+02, 8.477465109709460e+02, 8.491852572051992e+02, 8.506095128704175e+02,
- 8.520195937637382e+02, 8.534158052569452e+02, 8.547984427507345e+02, 8.561677921046673e+02, 8.575241300443167e+02,
- 8.588677245470609e+02, 8.601988352078281e+02, 8.615177135860281e+02, 8.628246035348154e+02, 8.641197415243234e+02,
- 8.654033568951722e+02, 8.666756722079590e+02, 8.679369034656168e+02, 8.691872603807584e+02, 8.704269466188398e+02,
- 8.716561600297132e+02, 8.728750928682517e+02, 8.740839320046384e+02, 8.752828591248966e+02, 8.764720509221985e+02,
- 8.776516792794530e+02, 8.788219114436370e+02, 8.799829101923203e+02, 8.811348339927904e+02, 8.822778371541739e+02,
- 8.834120699729035e+02, 8.845376788719007e+02, 8.856548065337662e+02, 8.867635920283091e+02, 8.878641709346816e+02,
- 8.889566754583967e+02, 8.900412345434870e+02, 8.911179739800366e+02, 8.921870165073099e+02, 8.932484819127050e+02,
- 8.943024871267174e+02, 8.953491463141096e+02, 8.963885709614693e+02, 8.974208699613249e+02, 8.984461493492639e+02,
- 8.994645137286557e+02, 9.004760643649764e+02, 9.014809005521709e+02, 9.024791193643673e+02, 9.034708157224215e+02,
- 9.044560824579713e+02, 9.054350103751245e+02, 9.064076883098762e+02, 9.073742031873559e+02, 9.083346400769981e+02,
- 9.092890822457344e+02, 9.102376112092740e+02, 9.111803067815764e+02, 9.121172471225706e+02, 9.130485087842126e+02,
- 9.139741667549367e+02, 9.148942945025784e+02, 9.158089640158194e+02, 9.167182458442309e+02, 9.176222092493930e+02,
- 9.185209217998924e+02, 9.194144500603396e+02, 9.203028591979720e+02, 9.211862131218529e+02, 9.220645745155603e+02,
- 9.229380048688065e+02, 9.238065645080447e+02, 9.246703126260886e+02, 9.255293073107922e+02, 9.263836055728193e+02,
- 9.272332633725400e+02, 9.280783356460865e+02, 9.289188763306017e+02, 9.297549383887037e+02, 9.305865738322035e+02,
- 9.314138337451005e+02, 9.322367683058776e+02, 9.330554268091284e+02, 9.338698576865340e+02, 9.346801085272192e+02,
- 9.354862260975052e+02, 9.362882563600789e+02, 9.370862444926086e+02, 9.378802349058121e+02, 9.386702712610099e+02,
- 9.394563960479059e+02, 9.402386523390528e+02, 9.410170812272436e+02, 9.417917235418729e+02, 9.425626194434625e+02,
- 9.433298084384401e+02, 9.440933293934993e+02, 9.448532205495702e+02, 9.456095195354053e+02, 9.463622633807910e+02,
- 9.471114885294083e+02, 9.478572308513428e+02, 9.485995256552559e+02, 9.493384077002397e+02, 9.500739112073520e+02,
- 9.508060698708459e+02, 9.515349168691116e+02, 9.522604848753233e+02, 9.529828060678212e+02, 9.537019121402145e+02,
- 9.544178343112313e+02, 9.551306033343176e+02, 9.558402495069893e+02, 9.565468026799490e+02, 9.572502922659741e+02,
- 9.579507472485835e+02, 9.586481961904872e+02, 9.593426672418266e+02, 9.600341881482135e+02, 9.607227862585714e+02,
- 9.614084885327853e+02, 9.620913215491659e+02, 9.627713115117352e+02, 9.634484842573366e+02, 9.641228652625722e+02,
- 9.647944796505797e+02, 9.654633521976484e+02, 9.661295073396752e+02, 9.667929691784741e+02, 9.674537614879357e+02,
- 9.681119077200474e+02, 9.687674310107701e+02, 9.694203541857823e+02, 9.700706997660935e+02, 9.707184899735284e+02,
- 9.713637467360879e+02, 9.720064916931893e+02, 9.726467462007874e+02, 9.732845313363824e+02, 9.739198679039184e+02,
- 9.745527764385690e+02, 9.751832772114216e+02, 9.758113902340592e+02, 9.764371352630359e+02, 9.770605318042644e+02,
- 9.776815991173020e+02, 9.783003562195454e+02, 9.789168218903404e+02, 9.795310146749956e+02, 9.801429528887186e+02,
- 9.807526546204648e+02, 9.813601377367041e+02, 9.819654198851151e+02, 9.825685184981934e+02, 9.831694507967932e+02,
- 9.837682337935880e+02, 9.843648842964659e+02, 9.849594189118529e+02, 9.855518540479696e+02, 9.861422059180178e+02,
- 9.867304905433083e+02, 9.873167237563214e+02, 9.879009212037065e+02, 9.884830983492253e+02, 9.890632704766301e+02,
- 9.896414526924921e+02, 9.902176599289677e+02, 9.907919069465133e+02, 9.913642083365481e+02, 9.919345785240610e+02,
- 9.925030317701737e+02, 9.930695821746451e+02, 9.936342436783344e+02, 9.941970300656149e+02, 9.947579549667414e+02,
- 9.953170318601717e+02, 9.958742740748480e+02, 9.964296947924270e+02, 9.969833070494781e+02, 9.975351237396335e+02,
- 9.980851576157005e+02, 9.986334212917346e+02, 9.991799272450734e+02, 9.997246878183328e+02, 1.000267715221371e+03,
- 1.000809021533205e+03, 1.001348618703910e+03, 1.001886518556466e+03, 1.002422732788582e+03, 1.002957272974485e+03,
- 1.003490150566676e+03, 1.004021376897653e+03, 1.004550963181610e+03, 1.005078920516094e+03, 1.005605259883647e+03,
- 1.006129992153407e+03, 1.006653128082684e+03, 1.007174678318518e+03, 1.007694653399193e+03, 1.008213063755738e+03,
- 1.008729919713396e+03, 1.009245231493072e+03, 1.009759009212751e+03, 1.010271262888891e+03, 1.010782002437803e+03,
- 1.011291237676992e+03, 1.011798978326490e+03, 1.012305234010151e+03, 1.012810014256944e+03, 1.013313328502201e+03,
- 1.013815186088866e+03, 1.014315596268709e+03, 1.014814568203524e+03, 1.015312110966309e+03, 1.015808233542426e+03,
- 1.016302944830737e+03, 1.016796253644730e+03, 1.017288168713620e+03, 1.017778698683432e+03, 1.018267852118076e+03,
- 1.018755637500387e+03, 1.019242063233167e+03, 1.019727137640198e+03, 1.020210868967241e+03, 1.020693265383029e+03,
- 1.021174334980222e+03, 1.021654085776376e+03, 1.022132525714870e+03, 1.022609662665838e+03, 1.023085504427073e+03,
- 1.023560058724924e+03, 1.024033333215179e+03, 1.024505335483930e+03, 1.024976073048429e+03, 1.025445553357930e+03,
- 1.025913783794513e+03, 1.026380771673906e+03, 1.026846524246280e+03, 1.027311048697047e+03, 1.027774352147636e+03,
- 1.028236441656258e+03, 1.028697324218664e+03, 1.029157006768890e+03, 1.029615496179987e+03, 1.030072799264745e+03,
- 1.030528922776404e+03, 1.030983873409352e+03, 1.031437657799822e+03, 1.031890282526565e+03, 1.032341754111523e+03,
- 1.032792079020491e+03, 1.033241263663766e+03, 1.033689314396787e+03, 1.034136237520769e+03, 1.034582039283325e+03,
- 1.035026725879079e+03, 1.035470303450273e+03, 1.035912778087360e+03, 1.036354155829595e+03, 1.036794442665612e+03,
- 1.037233644533996e+03, 1.037671767323848e+03, 1.038108816875333e+03, 1.038544798980236e+03, 1.038979719382496e+03,
- 1.039413583778740e+03, 1.039846397818808e+03, 1.040278167106266e+03, 1.040708897198922e+03, 1.041138593609324e+03,
- 1.041567261805260e+03, 1.041994907210242e+03, 1.042421535203998e+03, 1.042847151122932e+03, 1.043271760260611e+03,
- 1.043695367868216e+03, 1.044117979155001e+03, 1.044539599288748e+03, 1.044960233396206e+03, 1.045379886563531e+03,
- 1.045798563836721e+03, 1.046216270222039e+03, 1.046633010686437e+03, 1.047048790157968e+03, 1.047463613526200e+03,
- 1.047877485642618e+03, 1.048290411321022e+03, 1.048702395337924e+03, 1.049113442432935e+03, 1.049523557309149e+03,
- 1.049932744633518e+03, 1.050341009037234e+03, 1.050748355116088e+03, 1.051154787430841e+03, 1.051560310507581e+03,
- 1.051964928838076e+03, 1.052368646880127e+03, 1.052771469057913e+03, 1.053173399762330e+03, 1.053574443351330e+03,
- 1.053974604150253e+03, 1.054373886452156e+03, 1.054772294518135e+03, 1.055169832577648e+03, 1.055566504828829e+03,
- 1.055962315438800e+03, 1.056357268543982e+03, 1.056751368250395e+03, 1.057144618633962e+03, 1.057537023740805e+03,
- 1.057928587587538e+03, 1.058319314161555e+03, 1.058709207421317e+03, 1.059098271296637e+03, 1.059486509688957e+03,
- 1.059873926471618e+03, 1.060260525490143e+03, 1.060646310562499e+03, 1.061031285479362e+03, 1.061415454004383e+03,
- 1.061798819874446e+03, 1.062181386799921e+03, 1.062563158464921e+03, 1.062944138527553e+03, 1.063324330620160e+03,
- 1.063703738349567e+03, 1.064082365297324e+03, 1.064460215019945e+03, 1.064837291049138e+03, 1.065213596892044e+03,
- 1.065589136031462e+03, 1.065963911926080e+03, 1.066337928010696e+03, 1.066711187696445e+03, 1.067083694371013e+03,
- 1.067455451398855e+03, 1.067826462121415e+03, 1.068196729857326e+03, 1.068566257902631e+03, 1.068935049530986e+03,
- 1.069303107993862e+03, 1.069670436520749e+03, 1.070037038319355e+03, 1.070402916575809e+03, 1.070768074454846e+03,
- 1.071132515100011e+03, 1.071496241633841e+03, 1.071859257158060e+03, 1.072221564753763e+03, 1.072583167481601e+03,
- 1.072944068381963e+03, 1.073304270475156e+03, 1.073663776761586e+03, 1.074022590221931e+03, 1.074380713817318e+03
- },
- {
- 1.620848936753066e+00, 4.935228583550389e+00, 8.300030707076402e+00, 1.171709392707541e+01, 1.518836374913062e+01,
- 1.871590076208974e+01, 2.230188961936628e+01, 2.594864889886510e+01, 2.965864194121459e+01, 3.343448878686937e+01,
- 3.727897934592865e+01, 4.119508795493709e+01, 4.518598949740952e+01, 4.925507729121367e+01, 5.340598297683524e+01,
- 5.764259867678165e+01, 6.196910173898235e+01, 6.638998242723474e+01, 7.091007498100971e+01, 7.553459253703589e+01,
- 8.026916648816157e+01, 8.511989095353523e+01, 9.009337315132396e+01, 9.519679060419058e+01, 1.004379562731712e+02,
- 1.058253929116471e+02, 1.113684181632188e+02, 1.170772422001330e+02, 1.229630800222116e+02, 1.290382808967398e+02,
- 1.353164778542149e+02, 1.418127606064600e+02, 1.485438757722105e+02, 1.555284586294496e+02, 1.627873013628229e+02,
- 1.703436623161261e+02, 1.782236208846160e+02, 1.864564809400714e+02, 1.950752224500993e+02, 2.041169942389969e+02,
- 2.136236282285973e+02, 2.236421327521966e+02, 2.342250828472979e+02, 2.454307585800896e+02, 2.573227751583028e+02,
- 2.699687894170550e+02, 2.834376631440833e+02, 2.977942765144460e+02, 3.130911777265707e+02, 3.293566697348208e+02,
- 3.465798633427407e+02, 3.646943083392327e+02, 3.835626829742848e+02, 4.029666254213375e+02, 4.226094630999311e+02,
- 4.421416642360157e+02, 4.612104314307370e+02, 4.795202806976055e+02, 4.968737496209401e+02, 5.131583877240438e+02,
- 5.283397590990214e+02, 5.424401761586306e+02, 5.555169332327893e+02, 5.676456074053872e+02, 5.789087865094215e+02,
- 5.893890371863562e+02, 5.991648173894827e+02, 6.083083432875633e+02, 6.168847211842633e+02, 6.249518663954692e+02,
- 6.325608772058000e+02, 6.397566392219376e+02, 6.465785157324087e+02, 6.530610378874974e+02, 6.592345482984250e+02,
- 6.651257771128552e+02, 6.707583448087533e+02, 6.761531942769012e+02, 6.813289587877930e+02, 6.863022739184385e+02,
- 6.910880415878354e+02, 6.956996537196150e+02, 7.001491821303083e+02, 7.044475402618115e+02, 7.086046214540452e+02,
- 7.126294176397256e+02, 7.165301216517752e+02, 7.203142157604775e+02, 7.239885485886716e+02, 7.275594021731486e+02,
- 7.310325506332634e+02, 7.344133116596848e+02, 7.377065918353636e+02, 7.409169266376642e+02, 7.440485158372975e+02,
- 7.471052549003243e+02, 7.500907629090867e+02, 7.530084074428576e+02, 7.558613267962634e+02, 7.586524498608362e+02,
- 7.613845139505887e+02, 7.640600808148095e+02, 7.666815510491718e+02, 7.692511770888723e+02, 7.717710749439772e+02,
- 7.742432348170324e+02, 7.766695307358410e+02, 7.790517292461931e+02, 7.813914974186607e+02, 7.836904100366434e+02,
- 7.859499562038882e+02, 7.881715453694252e+02, 7.903565128387630e+02, 7.925061248223080e+02, 7.946215830662848e+02,
- 7.967040291064206e+02, 7.987545481802582e+02, 8.007741728301245e+02, 8.027638862253451e+02, 8.047246252293208e+02,
- 8.066572832344082e+02, 8.085627127852100e+02, 8.104417280087951e+02, 8.122951068685155e+02, 8.141235932564598e+02,
- 8.159278989380982e+02, 8.177087053613967e+02, 8.194666653414931e+02, 8.212024046309981e+02, 8.229165231459532e+02,
- 8.246095973206293e+02, 8.262821798663839e+02, 8.279348020428189e+02, 8.295679744801349e+02, 8.311821882230347e+02,
- 8.327779147517457e+02, 8.343556100746659e+02, 8.359157116034420e+02, 8.374586412556158e+02, 8.389848057206984e+02,
- 8.404945971819797e+02, 8.419883939964108e+02, 8.434665613354201e+02, 8.449294517893188e+02, 8.463774059377192e+02,
- 8.478107528882337e+02, 8.492298107855171e+02, 8.506348872925889e+02, 8.520262800462037e+02, 8.534042770879330e+02,
- 8.547691572724640e+02, 8.561211906545612e+02, 8.574606388559835e+02, 8.587877554245182e+02, 8.601027861195010e+02,
- 8.614059692949570e+02, 8.626975361501617e+02, 8.639777110254048e+02, 8.652467116716127e+02, 8.665047495069116e+02,
- 8.677520298608734e+02, 8.689887522071641e+02, 8.702151103852151e+02, 8.714312928115514e+02, 8.726374826813426e+02,
- 8.738338581606982e+02, 8.750205925702270e+02, 8.761978545603164e+02, 8.773658082785840e+02, 8.785246135299009e+02,
- 8.796744259293894e+02, 8.808153970487551e+02, 8.819476745562929e+02, 8.830714023508942e+02, 8.841867206903669e+02,
- 8.852937663143308e+02, 8.863926725619925e+02, 8.874835694850228e+02, 8.885665839557942e+02, 8.896418397712009e+02,
- 8.907094577522724e+02, 8.917695558397869e+02, 8.928222491860720e+02, 8.938676502431692e+02, 8.949058685161777e+02,
- 8.959370119431150e+02, 8.969611850644552e+02, 8.979784903458731e+02, 8.989890279447760e+02, 8.999928957799535e+02,
- 9.009901895986162e+02, 9.019810030409359e+02, 9.029654277021991e+02, 9.039435531926756e+02, 9.049154671953114e+02,
- 9.058812555213252e+02, 9.068410021638131e+02, 9.077947893494375e+02, 9.087426975882862e+02, 9.096848057219744e+02,
- 9.106211909700705e+02, 9.115519289749066e+02, 9.124770938448454e+02, 9.133967581960686e+02, 9.143109931929419e+02,
- 9.152198685870198e+02, 9.161234527547359e+02, 9.170218128660439e+02, 9.179150143991395e+02, 9.188031219432462e+02,
- 9.196861987268978e+02, 9.205643067741087e+02, 9.214375069352359e+02, 9.223058589168551e+02, 9.231694213106803e+02,
- 9.240282516215780e+02, 9.248824062946912e+02, 9.257319407417220e+02, 9.265769093663979e+02, 9.274173655891514e+02,
- 9.282533618710429e+02, 9.290849497369579e+02, 9.299121797980986e+02, 9.307351017737985e+02, 9.315537645126901e+02,
- 9.323682160132339e+02, 9.331785034436512e+02, 9.339846731612633e+02, 9.347867707312711e+02, 9.355848409449856e+02,
- 9.363789274057426e+02, 9.371690742543248e+02, 9.379553236512069e+02, 9.387377174642152e+02, 9.395162968709109e+02,
- 9.402911023739275e+02, 9.410621738158778e+02, 9.418295503938481e+02, 9.425932706734911e+02, 9.433533726027382e+02,
- 9.441098935251321e+02, 9.448628701928025e+02, 9.456123387790880e+02, 9.463583348908271e+02, 9.471008935803110e+02,
- 9.478400493569292e+02, 9.485758361985032e+02, 9.493082875623265e+02, 9.500374363959106e+02, 9.507633151474583e+02,
- 9.514859557760666e+02, 9.522053897616616e+02, 9.529216481146882e+02, 9.536347613855485e+02, 9.543447596738000e+02,
- 9.550516726371314e+02, 9.557555295001027e+02, 9.564563590626752e+02, 9.571541897085316e+02, 9.578490494131858e+02,
- 9.585409657518949e+02, 9.592299659073846e+02, 9.599160766773791e+02, 9.605993244819567e+02, 9.612797353707208e+02,
- 9.619573350298108e+02, 9.626321487887308e+02, 9.633042016270340e+02, 9.639735181808379e+02, 9.646401227491887e+02,
- 9.653040393002834e+02, 9.659652914775413e+02, 9.666239026055359e+02, 9.672798956957946e+02, 9.679332934524627e+02,
- 9.685841182778382e+02, 9.692323922777837e+02, 9.698781372670126e+02, 9.705213747742600e+02, 9.711621260473397e+02,
- 9.718004120580810e+02, 9.724362535071650e+02, 9.730696708288498e+02, 9.737006841955937e+02, 9.743293135225758e+02,
- 9.749555784721197e+02, 9.755794984580218e+02, 9.762010926497876e+02, 9.768203799767712e+02, 9.774373791322359e+02,
- 9.780521085773194e+02, 9.786645865449219e+02, 9.792748310435097e+02, 9.798828598608349e+02, 9.804886905675891e+02,
- 9.810923405209656e+02, 9.816938268681623e+02, 9.822931665498029e+02, 9.828903763032919e+02, 9.834854726660992e+02,
- 9.840784719789808e+02, 9.846693903891330e+02, 9.852582438532791e+02, 9.858450481407000e+02, 9.864298188362020e+02,
- 9.870125713430239e+02, 9.875933208856877e+02, 9.881720825127951e+02, 9.887488710997621e+02, 9.893237013515100e+02,
- 9.898965878050967e+02, 9.904675448322986e+02, 9.910365866421428e+02, 9.916037272833898e+02, 9.921689806469722e+02,
- 9.927323604683797e+02, 9.932938803300071e+02, 9.938535536634487e+02, 9.944113937517601e+02, 9.949674137316645e+02,
- 9.955216265957309e+02, 9.960740451945018e+02, 9.966246822385856e+02, 9.971735503007096e+02, 9.977206618177354e+02,
- 9.982660290926367e+02, 9.988096642964397e+02, 9.993515794701325e+02, 9.998917865265337e+02, 1.000430297252131e+03,
- 1.000967123308886e+03, 1.001502276236009e+03, 1.002035767451696e+03, 1.002567608254837e+03, 1.003097809826700e+03,
- 1.003626383232577e+03, 1.004153339423405e+03, 1.004678689237357e+03, 1.005202443401407e+03, 1.005724612532867e+03,
- 1.006245207140895e+03, 1.006764237627980e+03, 1.007281714291401e+03, 1.007797647324659e+03, 1.008312046818886e+03,
- 1.008824922764227e+03, 1.009336285051207e+03, 1.009846143472061e+03, 1.010354507722058e+03, 1.010861387400784e+03,
- 1.011366792013422e+03, 1.011870730972000e+03, 1.012373213596618e+03, 1.012874249116658e+03, 1.013373846671975e+03,
- 1.013872015314063e+03, 1.014368764007209e+03, 1.014864101629621e+03, 1.015358036974542e+03, 1.015850578751346e+03,
- 1.016341735586613e+03, 1.016831516025192e+03, 1.017319928531238e+03, 1.017806981489242e+03, 1.018292683205041e+03,
- 1.018777041906811e+03, 1.019260065746040e+03, 1.019741762798496e+03, 1.020222141065173e+03, 1.020701208473218e+03,
- 1.021178972876856e+03, 1.021655442058287e+03, 1.022130623728579e+03, 1.022604525528540e+03, 1.023077155029582e+03,
- 1.023548519734571e+03, 1.024018627078656e+03, 1.024487484430099e+03, 1.024955099091080e+03, 1.025421478298498e+03,
- 1.025886629224754e+03, 1.026350558978525e+03, 1.026813274605529e+03, 1.027274783089270e+03, 1.027735091351785e+03,
- 1.028194206254364e+03, 1.028652134598274e+03, 1.029108883125460e+03, 1.029564458519248e+03, 1.030018867405024e+03,
- 1.030472116350916e+03, 1.030924211868456e+03, 1.031375160413238e+03, 1.031824968385564e+03, 1.032273642131082e+03,
- 1.032721187941415e+03, 1.033167612054775e+03, 1.033612920656582e+03, 1.034057119880056e+03, 1.034500215806816e+03,
- 1.034942214467461e+03, 1.035383121842148e+03, 1.035822943861158e+03, 1.036261686405458e+03, 1.036699355307250e+03,
- 1.037135956350518e+03, 1.037571495271561e+03, 1.038005977759525e+03, 1.038439409456925e+03, 1.038871795960154e+03,
- 1.039303142819998e+03, 1.039733455542129e+03, 1.040162739587604e+03, 1.040591000373348e+03, 1.041018243272633e+03,
- 1.041444473615556e+03, 1.041869696689502e+03, 1.042293917739604e+03, 1.042717141969199e+03, 1.043139374540277e+03,
- 1.043560620573922e+03, 1.043980885150745e+03, 1.044400173311321e+03, 1.044818490056606e+03, 1.045235840348364e+03,
- 1.045652229109571e+03, 1.046067661224832e+03, 1.046482141540777e+03, 1.046895674866461e+03, 1.047308265973754e+03,
- 1.047719919597730e+03, 1.048130640437049e+03, 1.048540433154330e+03, 1.048949302376528e+03, 1.049357252695296e+03,
- 1.049764288667352e+03, 1.050170414814831e+03, 1.050575635625646e+03, 1.050979955553827e+03, 1.051383379019873e+03,
- 1.051785910411087e+03, 1.052187554081913e+03, 1.052588314354267e+03, 1.052988195517863e+03, 1.053387201830538e+03,
- 1.053785337518567e+03, 1.054182606776982e+03, 1.054579013769878e+03, 1.054974562630723e+03, 1.055369257462663e+03,
- 1.055763102338814e+03, 1.056156101302566e+03, 1.056548258367869e+03, 1.056939577519524e+03, 1.057330062713466e+03,
- 1.057719717877048e+03, 1.058108546909316e+03, 1.058496553681284e+03, 1.058883742036206e+03, 1.059270115789844e+03,
- 1.059655678730732e+03, 1.060040434620434e+03, 1.060424387193809e+03, 1.060807540159262e+03, 1.061189897198995e+03,
- 1.061571461969256e+03, 1.061952238100592e+03, 1.062332229198080e+03, 1.062711438841577e+03, 1.063089870585955e+03,
- 1.063467527961331e+03, 1.063844414473308e+03, 1.064220533603192e+03, 1.064595888808230e+03, 1.064970483521826e+03,
- 1.065344321153765e+03, 1.065717405090431e+03, 1.066089738695025e+03, 1.066461325307774e+03, 1.066832168246146e+03,
- 1.067202270805059e+03, 1.067571636257081e+03, 1.067940267852643e+03, 1.068308168820231e+03, 1.068675342366595e+03,
- 1.069041791676938e+03, 1.069407519915112e+03, 1.069772530223816e+03, 1.070136825724778e+03, 1.070500409518949e+03,
- 1.070863284686689e+03, 1.071225454287946e+03, 1.071586921362443e+03, 1.071947688929855e+03, 1.072307759989989e+03
- },
- {
- 1.615757043151384e+00, 4.919336093991256e+00, 8.272623888211152e+00, 1.167740721783438e+01, 1.513557512945477e+01,
- 1.864912661805476e+01, 2.222017904013851e+01, 2.585097733138200e+01, 2.954390411725166e+01, 3.330149082405237e+01,
- 3.712642990881345e+01, 4.102158834409587e+01, 4.499002251296600e+01, 4.903499469178811e+01, 5.315999132456096e+01,
- 5.736874332292112e+01, 6.166524866144297e+01, 6.605379757941017e+01, 7.053900074892233e+01, 7.512582082633573e+01,
- 7.981960787115480e+01, 8.462613919539291e+01, 8.955166429912856e+01, 9.460295565705862e+01, 9.978736624851852e+01,
- 1.051128948731146e+02, 1.105882604681423e+02, 1.162229868452826e+02, 1.220274994936320e+02, 1.280132363590890e+02,
- 1.341927747835987e+02, 1.405799771024913e+02, 1.471901576941339e+02, 1.540402744077797e+02, 1.611491477415076e+02,
- 1.685377105018571e+02, 1.762292905373475e+02, 1.842499274060468e+02, 1.926287209665018e+02, 2.013982043766385e+02,
- 2.105947242359111e+02, 2.202587938352933e+02, 2.304353574074489e+02, 2.411738576822195e+02, 2.525279280967997e+02,
- 2.645544278756954e+02, 2.773114057107167e+02, 2.908544474779291e+02, 3.052308229801761e+02, 3.204710449699036e+02,
- 3.365780113374675e+02, 3.535147143693846e+02, 3.711922320247274e+02, 3.894603709695303e+02, 4.081046788308992e+02,
- 4.268554863558474e+02, 4.454136997589636e+02, 4.634904607963329e+02, 4.808505267267443e+02, 4.973362818450526e+02,
- 5.128582959566850e+02, 5.273893122278919e+02, 5.409474164303459e+02, 5.535793060935699e+02, 5.653473069800194e+02,
- 5.763204430042323e+02, 5.865687140943421e+02, 5.961596231450080e+02, 6.051562163459928e+02, 6.136161309523297e+02,
- 6.215913027134243e+02, 6.291280870241724e+02, 6.362676188998807e+02, 6.430462908610360e+02, 6.494962694997337e+02,
- 6.556460025112683e+02, 6.615206897470903e+02, 6.671427061961165e+02, 6.725319736450790e+02, 6.777062827972877e+02,
- 6.826815701681464e+02, 6.874721550805364e+02, 6.920909422020129e+02, 6.965495947168915e+02, 7.008586826670111e+02,
- 7.050278103750109e+02, 7.090657262643466e+02, 7.129804178496217e+02, 7.167791942032893e+02, 7.204687578106142e+02,
- 7.240552673979945e+02, 7.275443930512389e+02, 7.309413647209471e+02, 7.342510150330475e+02, 7.374778171761586e+02,
- 7.406259185175164e+02, 7.436991705005121e+02, 7.467011552952616e+02, 7.496352096057559e+02, 7.525044459804451e+02,
- 7.553117719253901e+02, 7.580599070788847e+02, 7.607513986722605e+02, 7.633886354825434e+02, 7.659738603861072e+02,
- 7.685091818188504e+02, 7.709965840619284e+02, 7.734379366294296e+02, 7.758350027933806e+02, 7.781894473463234e+02,
- 7.805028436801531e+02, 7.827766802508248e+02, 7.850123664905783e+02, 7.872112382224024e+02, 7.893745626253748e+02,
- 7.915035427941468e+02, 7.935993219311690e+02, 7.956629872061058e+02, 7.976955733132280e+02, 7.996980657543686e+02,
- 8.016714038721561e+02, 8.036164836557334e+02, 8.055341603389129e+02, 8.074252508087429e+02, 8.092905358406890e+02,
- 8.111307621750468e+02, 8.129466444478094e+02, 8.147388669879607e+02, 8.165080854805358e+02, 8.182549283658212e+02,
- 8.199799990897835e+02, 8.216838761830353e+02, 8.233671154662934e+02, 8.250302509790408e+02, 8.266737960907303e+02,
- 8.282982436239139e+02, 8.299040698739161e+02, 8.314917317021913e+02, 8.330616695958535e+02, 8.346143080013690e+02,
- 8.361500560904877e+02, 8.376693084814068e+02, 8.391724459182391e+02, 8.406598359116263e+02, 8.421318333431141e+02,
- 8.435887810357018e+02, 8.450310102927923e+02, 8.464588414076087e+02, 8.478725841449746e+02, 8.492725381972357e+02,
- 8.506589936159464e+02, 8.520322312208459e+02, 8.533925229875272e+02, 8.547401324250848e+02, 8.560753148840023e+02,
- 8.573983179506893e+02, 8.587093817186270e+02, 8.600087390986270e+02, 8.612966161031444e+02, 8.625732321167511e+02,
- 8.638388001535483e+02, 8.650935271022676e+02, 8.663376139597582e+02, 8.675712560535009e+02, 8.687946432537692e+02,
- 8.700079601759970e+02, 8.712113863738873e+02, 8.724050965237706e+02, 8.735892606006687e+02, 8.747640440465165e+02,
- 8.759296079309464e+02, 8.770861091050239e+02, 8.782337003483110e+02, 8.793725305095842e+02, 8.805027446415353e+02,
- 8.816244841297727e+02, 8.827378868163868e+02, 8.838430871183655e+02, 8.849402161411131e+02, 8.860294017873001e+02,
- 8.871107688612921e+02, 8.881844391693440e+02, 8.892505316157917e+02, 8.903091622954025e+02, 8.913604445820937e+02,
- 8.924044888683477e+02, 8.934414040026518e+02, 8.944712953750238e+02, 8.954942662958812e+02, 8.965104177493051e+02,
- 8.975198484631609e+02, 8.985226549765766e+02, 8.995189317049256e+02, 9.005087710024010e+02, 9.014922632222997e+02,
- 9.024694967751132e+02, 9.034405581845183e+02, 9.044055321413558e+02, 9.053645015556949e+02, 9.063175476070439e+02,
- 9.072647497928065e+02, 9.082061859750435e+02, 9.091419324256115e+02, 9.100720638697564e+02, 9.109966535282041e+02,
- 9.119157731578365e+02, 9.128294930909843e+02, 9.137378822734094e+02, 9.146410083010202e+02, 9.155389374553804e+02,
- 9.164317348924103e+02, 9.173194640673752e+02, 9.182021876658870e+02, 9.190799670445051e+02, 9.199528624063502e+02,
- 9.208209328302552e+02, 9.216842362989962e+02, 9.225428297266387e+02, 9.233967689850296e+02, 9.242461089294657e+02,
- 9.250909034235755e+02, 9.259312053634353e+02, 9.267670667009550e+02, 9.275985384665518e+02, 9.284256707911489e+02,
- 9.292485129275088e+02, 9.300671132709406e+02, 9.308815193793907e+02, 9.316917779929463e+02, 9.324979350527693e+02,
- 9.333000352951548e+02, 9.340981239479325e+02, 9.348922442575717e+02, 9.356824391481642e+02, 9.364687508316812e+02,
- 9.372512208238793e+02, 9.380298899597701e+02, 9.388047984086496e+02, 9.395759856887180e+02, 9.403434906812947e+02,
- 9.411073516446444e+02, 9.418676062274233e+02, 9.426242914817694e+02, 9.433774438760315e+02, 9.441270993071626e+02,
- 9.448732931127799e+02, 9.456160600829098e+02, 9.463554344714177e+02, 9.470914500071434e+02, 9.478241399047442e+02,
- 9.485535368752546e+02, 9.492796731363785e+02, 9.500025804225138e+02, 9.507222899945215e+02, 9.514388326492491e+02,
- 9.521522387288111e+02, 9.528625381296363e+02, 9.535697603112930e+02, 9.542739343050878e+02, 9.549750887224592e+02,
- 9.556732517631586e+02, 9.563684512232367e+02, 9.570607145028262e+02, 9.577500686137488e+02, 9.584365401869275e+02,
- 9.591201554796268e+02, 9.598009403825176e+02, 9.604789204265761e+02, 9.611541207898167e+02, 9.618265663038724e+02,
- 9.624962814604114e+02, 9.631632904174154e+02, 9.638276170053026e+02, 9.644892847329154e+02, 9.651483167933701e+02,
- 9.658047360697682e+02, 9.664585651407826e+02, 9.671098262861188e+02, 9.677585414918435e+02, 9.684047324556068e+02,
- 9.690484205917356e+02, 9.696896270362240e+02, 9.703283726516057e+02, 9.709646780317222e+02, 9.715985635063892e+02,
- 9.722300491459520e+02, 9.728591547657562e+02, 9.734858999305076e+02, 9.741103039585470e+02, 9.747323859260308e+02,
- 9.753521646710202e+02, 9.759696587974895e+02, 9.765848866792413e+02, 9.771978664637485e+02, 9.778086160759062e+02,
- 9.784171532217139e+02, 9.790234953918762e+02, 9.796276598653282e+02, 9.802296637126941e+02, 9.808295237996678e+02,
- 9.814272567903288e+02, 9.820228791503901e+02, 9.826164071503781e+02, 9.832078568687509e+02, 9.837972441949536e+02,
- 9.843845848324112e+02, 9.849698943014623e+02, 9.855531879422352e+02, 9.861344809174681e+02, 9.867137882152697e+02,
- 9.872911246518307e+02, 9.878665048740820e+02, 9.884399433622956e+02, 9.890114544326415e+02, 9.895810522396927e+02,
- 9.901487507788828e+02, 9.907145638889131e+02, 9.912785052541219e+02, 9.918405884068001e+02, 9.924008267294671e+02,
- 9.929592334571056e+02, 9.935158216793498e+02, 9.940706043426380e+02, 9.946235942523199e+02, 9.951748040747298e+02,
- 9.957242463392175e+02, 9.962719334401447e+02, 9.968178776388423e+02, 9.973620910655358e+02, 9.979045857212309e+02,
- 9.984453734795683e+02, 9.989844660886428e+02, 9.995218751727945e+02, 1.000057612234360e+03, 1.000591688655399e+03,
- 1.001124115699390e+03, 1.001654904512887e+03, 1.002184066127163e+03, 1.002711611459808e+03, 1.003237551316311e+03,
- 1.003761896391609e+03, 1.004284657271607e+03, 1.004805844434680e+03, 1.005325468253138e+03, 1.005843538994676e+03,
- 1.006360066823792e+03, 1.006875061803187e+03, 1.007388533895130e+03, 1.007900492962818e+03, 1.008410948771694e+03,
- 1.008919910990753e+03, 1.009427389193830e+03, 1.009933392860853e+03, 1.010437931379089e+03, 1.010941014044359e+03,
- 1.011442650062240e+03, 1.011942848549244e+03, 1.012441618533976e+03, 1.012938968958280e+03, 1.013434908678353e+03,
- 1.013929446465857e+03, 1.014422591009003e+03, 1.014914350913618e+03, 1.015404734704197e+03, 1.015893750824939e+03,
- 1.016381407640763e+03, 1.016867713438312e+03, 1.017352676426939e+03, 1.017836304739675e+03, 1.018318606434184e+03,
- 1.018799589493705e+03, 1.019279261827979e+03, 1.019757631274155e+03, 1.020234705597686e+03, 1.020710492493221e+03,
- 1.021184999585462e+03, 1.021658234430027e+03, 1.022130204514289e+03, 1.022600917258210e+03, 1.023070380015152e+03,
- 1.023538600072686e+03, 1.024005584653381e+03, 1.024471340915585e+03, 1.024935875954197e+03, 1.025399196801419e+03,
- 1.025861310427502e+03, 1.026322223741483e+03, 1.026781943591909e+03, 1.027240476767545e+03, 1.027697829998079e+03,
- 1.028154009954817e+03, 1.028609023251358e+03, 1.029062876444269e+03, 1.029515576033750e+03, 1.029967128464278e+03,
- 1.030417540125257e+03, 1.030866817351651e+03, 1.031314966424600e+03, 1.031761993572045e+03, 1.032207904969331e+03,
- 1.032652706739800e+03, 1.033096404955387e+03, 1.033539005637198e+03, 1.033980514756081e+03, 1.034420938233191e+03,
- 1.034860281940547e+03, 1.035298551701583e+03, 1.035735753291683e+03, 1.036171892438719e+03, 1.036606974823578e+03,
- 1.037041006080674e+03, 1.037473991798465e+03, 1.037905937519957e+03, 1.038336848743198e+03, 1.038766730921772e+03,
- 1.039195589465281e+03, 1.039623429739822e+03, 1.040050257068458e+03, 1.040476076731684e+03, 1.040900893967881e+03,
- 1.041324713973771e+03, 1.041747541904863e+03, 1.042169382875889e+03, 1.042590241961242e+03, 1.043010124195401e+03,
- 1.043429034573356e+03, 1.043846978051022e+03, 1.044263959545652e+03, 1.044679983936240e+03, 1.045095056063926e+03,
- 1.045509180732387e+03, 1.045922362708229e+03, 1.046334606721369e+03, 1.046745917465421e+03, 1.047156299598064e+03,
- 1.047565757741415e+03, 1.047974296482393e+03, 1.048381920373083e+03, 1.048788633931089e+03, 1.049194441639882e+03,
- 1.049599347949156e+03, 1.050003357275160e+03, 1.050406474001043e+03, 1.050808702477185e+03, 1.051210047021528e+03,
- 1.051610511919898e+03, 1.052010101426330e+03, 1.052408819763383e+03, 1.052806671122454e+03, 1.053203659664088e+03,
- 1.053599789518283e+03, 1.053995064784789e+03, 1.054389489533409e+03, 1.054783067804292e+03, 1.055175803608227e+03,
- 1.055567700926922e+03, 1.055958763713297e+03, 1.056348995891755e+03, 1.056738401358466e+03, 1.057126983981635e+03,
- 1.057514747601778e+03, 1.057901696031980e+03, 1.058287833058165e+03, 1.058673162439355e+03, 1.059057687907924e+03,
- 1.059441413169859e+03, 1.059824341905001e+03, 1.060206477767301e+03, 1.060587824385061e+03, 1.060968385361180e+03,
- 1.061348164273388e+03, 1.061727164674485e+03, 1.062105390092576e+03, 1.062482844031298e+03, 1.062859529970055e+03,
- 1.063235451364234e+03, 1.063610611645436e+03, 1.063985014221692e+03, 1.064358662477681e+03, 1.064731559774949e+03,
- 1.065103709452115e+03, 1.065475114825086e+03, 1.065845779187264e+03, 1.066215705809750e+03, 1.066584897941550e+03,
- 1.066953358809772e+03, 1.067321091619826e+03, 1.067688099555620e+03, 1.068054385779757e+03, 1.068419953433720e+03,
- 1.068784805638070e+03, 1.069148945492624e+03, 1.069512376076649e+03, 1.069875100449041e+03, 1.070237121648506e+03
- },
- {
- 1.610697442577510e+00, 4.903549478658079e+00, 8.245408747844817e+00, 1.163801175254094e+01, 1.508319282284877e+01,
- 1.858289133709568e+01, 2.213915960215248e+01, 2.575417147014038e+01, 2.943023176987094e+01, 3.316978664874592e+01,
- 3.697543492974637e+01, 4.084994060342820e+01, 4.479624659113986e+01, 4.881748993465342e+01, 5.291701858935200e+01,
- 5.709841002354852e+01, 6.136549185601923e+01, 6.572236479811461e+01, 7.017342820667466e+01, 7.472340860036557e+01,
- 7.937739154605902e+01, 8.414085738472809e+01, 8.901972133942827e+01, 9.402037863272018e+01, 9.914975533918313e+01,
- 1.044153658115471e+02, 1.098253776484418e+02, 1.153886853179847e+02, 1.211149937144604e+02, 1.270149131019182e+02,
- 1.331000670885156e+02, 1.393832154457452e+02, 1.458783937771211e+02, 1.526010720120452e+02, 1.595683339618665e+02,
- 1.667990794519584e+02, 1.743142502716199e+02, 1.821370795578401e+02, 1.902933617420495e+02, 1.988117357042016e+02,
- 2.077239662126373e+02, 2.170651962412189e+02, 2.268741226192148e+02, 2.371930158451470e+02, 2.480674570761040e+02,
- 2.595455972336568e+02, 2.716766560773950e+02, 2.845082896605491e+02, 2.980824105635198e+02, 3.124291347173287e+02,
- 3.275588480012951e+02, 3.434529376757280e+02, 3.600543386612206e+02, 3.772595060419802e+02, 3.949139162536301e+02,
- 4.128140808070176e+02, 4.307195921739076e+02, 4.483765898646657e+02, 4.655484240687682e+02, 4.820465145965424e+02,
- 4.977439194845015e+02, 5.125690559751139e+02, 5.265001471534738e+02, 5.395519565379368e+02, 5.517628242213549e+02,
- 5.631844797424508e+02, 5.738749047621270e+02, 5.838936514487648e+02, 5.932989031880794e+02, 6.021457194439770e+02,
- 6.104850826451282e+02, 6.183634887813306e+02, 6.258228993153875e+02, 6.329009210788863e+02, 6.396311168856421e+02,
- 6.460433783306570e+02, 6.521643151226725e+02, 6.580176327224319e+02, 6.636244825750649e+02, 6.690037776815769e+02,
- 6.741724716091783e+02, 6.791458021789933e+02, 6.839375027149711e+02, 6.885599844310451e+02, 6.930244936563697e+02,
- 6.973412474060748e+02, 7.015195504605161e+02, 7.055678967181557e+02, 7.094940571920871e+02, 7.133051566564239e+02,
- 7.170077406286476e+02, 7.206078340998757e+02, 7.241109931946288e+02, 7.275223507499642e+02, 7.308466566454683e+02,
- 7.340883135849771e+02, 7.372514089232122e+02, 7.403397430415600e+02, 7.433568547034546e+02, 7.463060437584390e+02,
- 7.491903915126002e+02, 7.520127790488488e+02, 7.547759036804896e+02, 7.574822938837559e+02, 7.601343227019938e+02,
- 7.627342199227980e+02, 7.652840831082639e+02, 7.677858876099492e+02, 7.702414956757037e+02, 7.726526647429083e+02,
- 7.750210550016774e+02, 7.773482363019995e+02, 7.796356944703973e+02, 7.818848370944032e+02, 7.840969988266345e+02,
- 7.862734462546724e+02, 7.884153823779069e+02, 7.905239507281659e+02, 7.926002391670385e+02, 7.946452833893834e+02,
- 7.966600701594963e+02, 7.986455403036861e+02, 8.006025914806480e+02, 8.025320807488862e+02, 8.044348269485395e+02,
- 8.063116129133111e+02, 8.081631875149062e+02, 8.099902676244833e+02, 8.117935395989933e+02, 8.135736619078110e+02,
- 8.153312652510281e+02, 8.170669549976416e+02, 8.187813122991482e+02, 8.204748953342056e+02, 8.221482404899774e+02,
- 8.238018625686799e+02, 8.254362588109536e+02, 8.270519061087633e+02, 8.286492640839131e+02, 8.302287754773371e+02,
- 8.317908669606904e+02, 8.333359499002377e+02, 8.348644210763281e+02, 8.363766633615044e+02, 8.378730463600191e+02,
- 8.393539270113737e+02, 8.408196501602304e+02, 8.422705490949148e+02, 8.437069460565539e+02, 8.451291527207101e+02,
- 8.465374706532871e+02, 8.479321917423023e+02, 8.493135986172363e+02, 8.506819649950484e+02, 8.520375561128980e+02,
- 8.533806290329396e+02, 8.547114329854858e+02, 8.560302096841253e+02, 8.573371936252652e+02, 8.586326123729903e+02,
- 8.599166868300970e+02, 8.611896314960926e+02, 8.624516547129000e+02, 8.637029588989500e+02, 8.649437407723151e+02,
- 8.661741915634993e+02, 8.673944972184246e+02, 8.686048385921730e+02, 8.698053916339645e+02, 8.709963275638511e+02,
- 8.721778130415464e+02, 8.733500103278320e+02, 8.745130774388934e+02, 8.756671682939833e+02, 8.768124328567271e+02,
- 8.779490172704089e+02, 8.790770639875394e+02, 8.801967118939870e+02, 8.813080964279413e+02, 8.824113496939747e+02,
- 8.835066005724229e+02, 8.845939748243269e+02, 8.856735951921464e+02, 8.867455814964367e+02, 8.878100507286950e+02,
- 8.888671168067108e+02, 8.899168919686682e+02, 8.909594849317889e+02, 8.919950022290789e+02, 8.930235479771251e+02,
- 8.940452239493728e+02, 8.950601296466557e+02, 8.960683623650775e+02, 8.970700172613833e+02, 8.980651874159154e+02,
- 8.990539638932692e+02, 9.000364358007436e+02, 9.010126903446859e+02, 9.019828128848144e+02, 9.029468869866125e+02,
- 9.039049944718712e+02, 9.048572154674589e+02, 9.058036284523888e+02, 9.067443103032673e+02, 9.076793363381687e+02,
- 9.086087803590221e+02, 9.095327146925562e+02, 9.104512102298654e+02, 9.113643364646571e+02, 9.122721615302223e+02,
- 9.131747522351869e+02, 9.140721740980963e+02, 9.149644913808620e+02, 9.158517673002627e+02, 9.167340633530608e+02,
- 9.176114403906271e+02, 9.184839579618484e+02, 9.193516745108120e+02, 9.202146474043493e+02, 9.210729329587259e+02,
- 9.219265864654994e+02, 9.227756622165890e+02, 9.236202135285705e+02, 9.244602927662397e+02, 9.252959513654574e+02,
- 9.261272398553122e+02, 9.269542078796233e+02, 9.277769042177987e+02, 9.285953768050865e+02, 9.294096727522256e+02,
- 9.302198379476583e+02, 9.310259187249777e+02, 9.318279594348181e+02, 9.326260040752500e+02, 9.334200959098980e+02,
- 9.342102774844387e+02, 9.349965906426395e+02, 9.357790765419435e+02, 9.365577756686235e+02, 9.373327278525167e+02,
- 9.381039722813504e+02, 9.388715475146812e+02, 9.396354914974517e+02, 9.403958415731793e+02, 9.411526344967915e+02,
- 9.419059064471207e+02, 9.426556930390587e+02, 9.434020293353982e+02, 9.441449498583573e+02, 9.448844886008010e+02,
- 9.456206790371755e+02, 9.463535541341556e+02, 9.470831463610174e+02, 9.478094876997471e+02, 9.485326096548903e+02,
- 9.492525432631536e+02, 9.499693191027595e+02, 9.506829673025720e+02, 9.513935175509899e+02, 9.521009991046210e+02,
- 9.528054407967423e+02, 9.535068710455505e+02, 9.542053178622106e+02, 9.549008088587109e+02, 9.555933712555266e+02,
- 9.562830318890941e+02, 9.569698172191148e+02, 9.576537533356772e+02, 9.583348659662119e+02, 9.590131804822832e+02,
- 9.596887219062227e+02, 9.603615149176002e+02, 9.610315838595540e+02, 9.616989527449664e+02, 9.623636452625005e+02,
- 9.630256847824971e+02, 9.636850943627395e+02, 9.643418967540808e+02, 9.649961144059515e+02, 9.656477694717382e+02,
- 9.662968838140432e+02, 9.669434790098247e+02, 9.675875763554262e+02, 9.682291968714941e+02, 9.688683613077814e+02,
- 9.695050901478561e+02, 9.701394036136949e+02, 9.707713216701906e+02, 9.714008640295493e+02, 9.720280501556010e+02,
- 9.726528992680146e+02, 9.732754303464239e+02, 9.738956621344677e+02, 9.745136131437390e+02, 9.751293016576567e+02,
- 9.757427457352542e+02, 9.763539632148893e+02, 9.769629717178741e+02, 9.775697886520348e+02, 9.781744312151937e+02,
- 9.787769163985827e+02, 9.793772609901849e+02, 9.799754815780113e+02, 9.805715945533065e+02, 9.811656161136934e+02,
- 9.817575622662554e+02, 9.823474488305520e+02, 9.829352914415803e+02, 9.835211055526730e+02, 9.841049064383440e+02,
- 9.846867091970722e+02, 9.852665287540324e+02, 9.858443798637818e+02, 9.864202771128774e+02, 9.869942349224575e+02,
- 9.875662675507676e+02, 9.881363890956369e+02, 9.887046134969077e+02, 9.892709545388237e+02, 9.898354258523635e+02,
- 9.903980409175399e+02, 9.909588130656483e+02, 9.915177554814779e+02, 9.920748812054777e+02, 9.926302031358866e+02,
- 9.931837340308194e+02, 9.937354865103184e+02, 9.942854730583634e+02, 9.948337060248488e+02, 9.953801976275215e+02,
- 9.959249599538830e+02, 9.964680049630637e+02, 9.970093444876539e+02, 9.975489902355069e+02, 9.980869537915132e+02,
- 9.986232466193321e+02, 9.991578800631078e+02, 9.996908653491403e+02, 1.000222213587537e+03, 1.000751935773830e+03,
- 1.001280042790569e+03, 1.001806545408879e+03, 1.002331454290002e+03, 1.002854779986804e+03, 1.003376532945255e+03,
- 1.003896723505892e+03, 1.004415361905246e+03, 1.004932458277254e+03, 1.005448022654639e+03, 1.005962064970279e+03,
- 1.006474595058531e+03, 1.006985622656560e+03, 1.007495157405624e+03, 1.008003208852345e+03, 1.008509786449966e+03,
- 1.009014899559571e+03, 1.009518557451303e+03, 1.010020769305546e+03, 1.010521544214100e+03, 1.011020891181327e+03,
- 1.011518819125287e+03, 1.012015336878846e+03, 1.012510453190778e+03, 1.013004176726836e+03, 1.013496516070814e+03,
- 1.013987479725595e+03, 1.014477076114169e+03, 1.014965313580649e+03, 1.015452200391265e+03, 1.015937744735339e+03,
- 1.016421954726247e+03, 1.016904838402375e+03, 1.017386403728042e+03, 1.017866658594422e+03, 1.018345610820448e+03,
- 1.018823268153706e+03, 1.019299638271301e+03, 1.019774728780731e+03, 1.020248547220726e+03, 1.020721101062092e+03,
- 1.021192397708532e+03, 1.021662444497455e+03, 1.022131248700777e+03, 1.022598817525707e+03, 1.023065158115520e+03,
- 1.023530277550322e+03, 1.023994182847803e+03, 1.024456880963973e+03, 1.024918378793893e+03, 1.025378683172397e+03,
- 1.025837800874793e+03, 1.026295738617566e+03, 1.026752503059064e+03, 1.027208100800174e+03, 1.027662538384988e+03,
- 1.028115822301461e+03, 1.028567958982063e+03, 1.029018954804410e+03, 1.029468816091899e+03, 1.029917549114327e+03,
- 1.030365160088498e+03, 1.030811655178832e+03, 1.031257040497953e+03, 1.031701322107280e+03, 1.032144506017597e+03,
- 1.032586598189631e+03, 1.033027604534600e+03, 1.033467530914782e+03, 1.033906383144046e+03, 1.034344166988398e+03,
- 1.034780888166508e+03, 1.035216552350232e+03, 1.035651165165129e+03, 1.036084732190970e+03, 1.036517258962237e+03,
- 1.036948750968618e+03, 1.037379213655496e+03, 1.037808652424430e+03, 1.038237072633625e+03, 1.038664479598408e+03,
- 1.039090878591679e+03, 1.039516274844378e+03, 1.039940673545925e+03, 1.040364079844670e+03, 1.040786498848320e+03,
- 1.041207935624384e+03, 1.041628395200590e+03, 1.042047882565305e+03, 1.042466402667951e+03, 1.042883960419417e+03,
- 1.043300560692456e+03, 1.043716208322090e+03, 1.044130908105996e+03, 1.044544664804899e+03, 1.044957483142956e+03,
- 1.045369367808126e+03, 1.045780323452552e+03, 1.046190354692923e+03, 1.046599466110840e+03, 1.047007662253173e+03,
- 1.047414947632418e+03, 1.047821326727042e+03, 1.048226803981831e+03, 1.048631383808231e+03, 1.049035070584684e+03,
- 1.049437868656956e+03, 1.049839782338473e+03, 1.050240815910636e+03, 1.050640973623147e+03, 1.051040259694321e+03,
- 1.051438678311400e+03, 1.051836233630858e+03, 1.052232929778709e+03, 1.052628770850803e+03, 1.053023760913126e+03,
- 1.053417904002089e+03, 1.053811204124823e+03, 1.054203665259456e+03, 1.054595291355405e+03, 1.054986086333648e+03,
- 1.055376054087001e+03, 1.055765198480388e+03, 1.056153523351118e+03, 1.056541032509139e+03, 1.056927729737308e+03,
- 1.057313618791645e+03, 1.057698703401594e+03, 1.058082987270273e+03, 1.058466474074723e+03, 1.058849167466157e+03,
- 1.059231071070204e+03, 1.059612188487147e+03, 1.059992523292165e+03, 1.060372079035565e+03, 1.060750859243017e+03,
- 1.061128867415784e+03, 1.061506107030949e+03, 1.061882581541635e+03, 1.062258294377234e+03, 1.062633248943624e+03,
- 1.063007448623381e+03, 1.063380896776000e+03, 1.063753596738104e+03, 1.064125551823652e+03, 1.064496765324148e+03,
- 1.064867240508845e+03, 1.065236980624946e+03, 1.065605988897805e+03, 1.065974268531127e+03, 1.066341822707158e+03,
- 1.066708654586883e+03, 1.067074767310214e+03, 1.067440163996181e+03, 1.067804847743117e+03, 1.068168821628846e+03
- },
- {
- 1.605669823353134e+00, 4.887867630304428e+00, 8.218383125804937e+00, 1.159890401011700e+01, 1.503121157918038e+01,
- 1.851718750028839e+01, 2.205882119267759e+01, 2.565821788187181e+01, 2.931760739702934e+01, 3.303935379651526e+01,
- 3.682596591402834e+01, 4.068010893083034e+01, 4.460461709344727e+01, 4.860250771223694e+01, 5.267699659464430e+01,
- 5.683151508817478e+01, 6.106972893255507e+01, 6.539555914872776e+01, 6.981320522483185e+01, 7.432717089681583e+01,
- 7.894229286456221e+01, 8.366377283418973e+01, 8.849721333441663e+01, 9.344865782042096e+01, 9.852463565329666e+01,
- 1.037322126279063e+02, 1.090790478164440e+02, 1.145734575997143e+02, 1.202244878707237e+02, 1.260419955124846e+02,
- 1.320367403660498e+02, 1.382204890099228e+02, 1.446061317386038e+02, 1.512078140499233e+02, 1.580410840594883e+02,
- 1.651230565322458e+02, 1.724725938912733e+02, 1.801105030880418e+02, 1.880597450985593e+02, 1.963456501675738e+02,
- 2.049961260272469e+02, 2.140418369374194e+02, 2.235163167674769e+02, 2.334559570606615e+02, 2.438997782390563e+02,
- 2.548888464008248e+02, 2.664651401422082e+02, 2.786696106667553e+02, 2.915391407018962e+02, 3.051021448685386e+02,
- 3.193727326210963e+02, 3.343437077562862e+02, 3.499791347999910e+02, 3.662076004877592e+02, 3.829175720014302e+02,
- 3.999565694264590e+02, 4.171362560603423e+02, 4.342452248604133e+02, 4.510690402572959e+02, 4.674134446607954e+02,
- 4.831262065231460e+02, 4.981043356019574e+02, 5.122901800610585e+02, 5.256661989957748e+02, 5.382445262860832e+02,
- 5.500568527973991e+02, 5.611463706331847e+02, 5.715620246391835e+02, 5.813546602760324e+02, 5.905745374716764e+02,
- 5.992697814605892e+02, 6.074854751891735e+02, 6.152631964174527e+02, 6.226408626271120e+02, 6.296527829143362e+02,
- 6.363298406764490e+02, 6.426997503128161e+02, 6.487873473313274e+02, 6.546148844570736e+02, 6.602023165854421e+02,
- 6.655675649188255e+02, 6.707267557950020e+02, 6.756944330631530e+02, 6.804837448773271e+02, 6.851066068677974e+02,
- 6.895738441358277e+02, 6.938953146279739e+02, 6.980800163416018e+02, 7.021361805989355e+02, 7.060713533684518e+02,
- 7.098924663488227e+02, 7.136058992829632e+02, 7.172175347480105e+02, 7.207328064744303e+02, 7.241567420832922e+02,
- 7.274940009926140e+02, 7.307489081282357e+02, 7.339254839786103e+02, 7.370274714617123e+02, 7.400583599435797e+02,
- 7.430214068815426e+02, 7.459196571988948e+02, 7.487559607830663e+02, 7.515329882686060e+02, 7.542532453050587e+02,
- 7.569190854761033e+02, 7.595327220157749e+02, 7.620962384498720e+02, 7.646115982753871e+02, 7.670806537775291e+02,
- 7.695051540724131e+02, 7.718867524534282e+02, 7.742270131105380e+02, 7.765274172840511e+02, 7.787893689076820e+02,
- 7.810141997897572e+02, 7.832031743762049e+02, 7.853574941343443e+02, 7.874783015923980e+02, 7.895666840660721e+02,
- 7.916236771002962e+02, 7.936502676514156e+02, 7.956473970325732e+02, 7.976159636427892e+02, 7.995568254982255e+02,
- 8.014708025716370e+02, 8.033586790204898e+02, 8.052212049181708e+02, 8.070590991545316e+02, 8.088730496939537e+02,
- 8.106637162525672e+02, 8.124317315775143e+02, 8.141777028925910e+02, 8.159022132206309e+02, 8.176058226372169e+02,
- 8.192890685421007e+02, 8.209524697613439e+02, 8.225965237822701e+02, 8.242217099121948e+02, 8.258284897112140e+02,
- 8.274173078508367e+02, 8.289885929219038e+02, 8.305427581953069e+02, 8.320802023387411e+02, 8.336013100924797e+02,
- 8.351064529069271e+02, 8.365959895444772e+02, 8.380702666480348e+02, 8.395296192783657e+02, 8.409743714222923e+02,
- 8.424048364735755e+02, 8.438213176986069e+02, 8.452241086250737e+02, 8.466134935167036e+02, 8.479897477156883e+02,
- 8.493531380222898e+02, 8.507039230441012e+02, 8.520423535277954e+02, 8.533686726743642e+02, 8.546831164388492e+02,
- 8.559859138154376e+02, 8.572772871087780e+02, 8.585574521922958e+02, 8.598266187542411e+02, 8.610849905321597e+02,
- 8.623327655364229e+02, 8.635701362634294e+02, 8.647972898990241e+02, 8.660144085126815e+02, 8.672216692429366e+02,
- 8.684192444745304e+02, 8.696073020077149e+02, 8.707860052201124e+02, 8.719555132215301e+02, 8.731159810020848e+02,
- 8.742675595739787e+02, 8.754103961072481e+02, 8.765446340597939e+02, 8.776704133019696e+02, 8.787878702359980e+02,
- 8.798971379104784e+02, 8.809983461302104e+02, 8.820916215615717e+02, 8.831770878336579e+02, 8.842548656353828e+02,
- 8.853250724863024e+02, 8.863878240897880e+02, 8.874432325614940e+02, 8.884914077263389e+02, 8.895324569003653e+02,
- 8.905664849672836e+02, 8.915935944521304e+02, 8.926138855921502e+02, 8.936274564050342e+02, 8.946344027546345e+02,
- 8.956348184142572e+02, 8.966287951276482e+02, 8.976164226677646e+02, 8.985977888934340e+02, 8.995729798039833e+02,
- 9.005420795919340e+02, 9.015051706938358e+02, 9.024623338393218e+02, 9.034136480984558e+02, 9.043591909274495e+02,
- 9.052990382128045e+02, 9.062332643139567e+02, 9.071619421044729e+02, 9.080851430118654e+02, 9.090029370560742e+02,
- 9.099153928866748e+02, 9.108225778188563e+02, 9.117245578682275e+02, 9.126213977844828e+02, 9.135131610839844e+02,
- 9.143999100812979e+02, 9.152817061263306e+02, 9.161586088188410e+02, 9.170306772429992e+02, 9.178979692019748e+02,
- 9.187605414404562e+02, 9.196184496706940e+02, 9.204717485977303e+02, 9.213204919438731e+02, 9.221647324724156e+02,
- 9.230045220106432e+02, 9.238399114721532e+02, 9.246709508785065e+02, 9.254976893802343e+02, 9.263201752772343e+02,
- 9.271384560385616e+02, 9.279525778938620e+02, 9.287625875442660e+02, 9.295685296699563e+02, 9.303704486033191e+02,
- 9.311683879366112e+02, 9.319623905385814e+02, 9.327524985706244e+02, 9.335387535024815e+02, 9.343211961275064e+02,
- 9.350998665775095e+02, 9.358748043371911e+02, 9.366460482581823e+02, 9.374136365727041e+02, 9.381776069068578e+02,
- 9.389379962935527e+02, 9.396948411850971e+02, 9.404481774654479e+02, 9.411980404621356e+02, 9.419444649578811e+02,
- 9.426874852019023e+02, 9.434271349209306e+02, 9.441634473299397e+02, 9.448964551426001e+02, 9.456261905814636e+02,
- 9.463526853878881e+02, 9.470759708317152e+02, 9.477960777206969e+02, 9.485130364096916e+02, 9.492268768096262e+02,
- 9.499376283962382e+02, 9.506453202186012e+02, 9.513499809074406e+02, 9.520516386832450e+02, 9.527503213641830e+02,
- 9.534460563738236e+02, 9.541388707486756e+02, 9.548287911455425e+02, 9.555158438487026e+02, 9.562000547769226e+02,
- 9.568814494902967e+02, 9.575600531969362e+02, 9.582358907594919e+02, 9.589089867015308e+02, 9.595793652137660e+02,
- 9.602470501601371e+02, 9.609120650837559e+02, 9.615744332127146e+02, 9.622341774657619e+02, 9.628913204578516e+02,
- 9.635458845055643e+02, 9.641978916324084e+02, 9.648473635740046e+02, 9.654943217831518e+02, 9.661387874347845e+02,
- 9.667807814308172e+02, 9.674203244048875e+02, 9.680574367269902e+02, 9.686921385080152e+02, 9.693244496041854e+02,
- 9.699543896213996e+02, 9.705819779194813e+02, 9.712072336163390e+02, 9.718301755920337e+02, 9.724508224927682e+02,
- 9.730691927347849e+02, 9.736853045081830e+02, 9.742991757806606e+02, 9.749108243011768e+02, 9.755202676035342e+02,
- 9.761275230098929e+02, 9.767326076342101e+02, 9.773355383856089e+02, 9.779363319716812e+02, 9.785350049017186e+02,
- 9.791315734898849e+02, 9.797260538583190e+02, 9.803184619401787e+02, 9.809088134826242e+02, 9.814971240497391e+02,
- 9.820834090253984e+02, 9.826676836160774e+02, 9.832499628536052e+02, 9.838302615978636e+02, 9.844085945394397e+02,
- 9.849849762022176e+02, 9.855594209459283e+02, 9.861319429686456e+02, 9.867025563092379e+02, 9.872712748497686e+02,
- 9.878381123178582e+02, 9.884030822889927e+02, 9.889661981887958e+02, 9.895274732952570e+02, 9.900869207409135e+02,
- 9.906445535149984e+02, 9.912003844655435e+02, 9.917544263014474e+02, 9.923066915945014e+02, 9.928571927813817e+02,
- 9.934059421656049e+02, 9.939529519194448e+02, 9.944982340858193e+02, 9.950418005801389e+02, 9.955836631921239e+02,
- 9.961238335875905e+02, 9.966623233102014e+02, 9.971991437831883e+02, 9.977343063110435e+02, 9.982678220811795e+02,
- 9.987997021655617e+02, 9.993299575223127e+02, 9.998585989972859e+02, 1.000385637325615e+03, 1.000911083133234e+03,
- 1.001434946938375e+03, 1.001957239153030e+03, 1.002477970084403e+03, 1.002997149936326e+03, 1.003514788810653e+03,
- 1.004030896708633e+03, 1.004545483532260e+03, 1.005058559085592e+03, 1.005570133076062e+03, 1.006080215115755e+03,
- 1.006588814722671e+03, 1.007095941321960e+03, 1.007601604247145e+03, 1.008105812741319e+03, 1.008608575958322e+03,
- 1.009109902963904e+03, 1.009609802736866e+03, 1.010108284170173e+03, 1.010605356072073e+03, 1.011101027167171e+03,
- 1.011595306097500e+03, 1.012088201423577e+03, 1.012579721625433e+03, 1.013069875103632e+03, 1.013558670180275e+03,
- 1.014046115099983e+03, 1.014532218030868e+03, 1.015016987065489e+03, 1.015500430221795e+03, 1.015982555444044e+03,
- 1.016463370603719e+03, 1.016942883500423e+03, 1.017421101862762e+03, 1.017898033349216e+03, 1.018373685548992e+03,
- 1.018848065982871e+03, 1.019321182104033e+03, 1.019793041298877e+03, 1.020263650887828e+03, 1.020733018126124e+03,
- 1.021201150204604e+03, 1.021668054250469e+03, 1.022133737328048e+03, 1.022598206439535e+03, 1.023061468525732e+03,
- 1.023523530466768e+03, 1.023984399082815e+03, 1.024444081134790e+03, 1.024902583325046e+03, 1.025359912298056e+03,
- 1.025816074641084e+03, 1.026271076884852e+03, 1.026724925504186e+03, 1.027177626918661e+03, 1.027629187493239e+03,
- 1.028079613538891e+03, 1.028528911313214e+03, 1.028977087021037e+03, 1.029424146815018e+03, 1.029870096796239e+03,
- 1.030314943014782e+03, 1.030758691470306e+03, 1.031201348112609e+03, 1.031642918842190e+03, 1.032083409510792e+03,
- 1.032522825921949e+03, 1.032961173831518e+03, 1.033398458948207e+03, 1.033834686934091e+03, 1.034269863405127e+03,
- 1.034703993931661e+03, 1.035137084038923e+03, 1.035569139207516e+03, 1.036000164873909e+03, 1.036430166430907e+03,
- 1.036859149228125e+03, 1.037287118572454e+03, 1.037714079728521e+03, 1.038140037919137e+03, 1.038564998325751e+03,
- 1.038988966088881e+03, 1.039411946308557e+03, 1.039833944044745e+03, 1.040254964317772e+03, 1.040675012108745e+03,
- 1.041094092359959e+03, 1.041512209975308e+03, 1.041929369820681e+03, 1.042345576724364e+03, 1.042760835477427e+03,
- 1.043175150834111e+03, 1.043588527512208e+03, 1.044000970193434e+03, 1.044412483523806e+03, 1.044823072114006e+03,
- 1.045232740539736e+03, 1.045641493342085e+03, 1.046049335027873e+03, 1.046456270070004e+03, 1.046862302907804e+03,
- 1.047267437947363e+03, 1.047671679561872e+03, 1.048075032091949e+03, 1.048477499845964e+03, 1.048879087100368e+03,
- 1.049279798100004e+03, 1.049679637058425e+03, 1.050078608158202e+03, 1.050476715551231e+03, 1.050873963359038e+03,
- 1.051270355673071e+03, 1.051665896555003e+03, 1.052060590037017e+03, 1.052454440122099e+03, 1.052847450784318e+03,
- 1.053239625969109e+03, 1.053630969593549e+03, 1.054021485546634e+03, 1.054411177689545e+03, 1.054800049855920e+03,
- 1.055188105852115e+03, 1.055575349457466e+03, 1.055961784424547e+03, 1.056347414479426e+03, 1.056732243321913e+03,
- 1.057116274625814e+03, 1.057499512039170e+03, 1.057881959184508e+03, 1.058263619659074e+03, 1.058644497035072e+03,
- 1.059024594859903e+03, 1.059403916656388e+03, 1.059782465923003e+03, 1.060160246134107e+03, 1.060537260740157e+03,
- 1.060913513167938e+03, 1.061289006820776e+03, 1.061663745078756e+03, 1.062037731298935e+03, 1.062410968815551e+03,
- 1.062783460940235e+03, 1.063155210962215e+03, 1.063526222148519e+03, 1.063896497744179e+03, 1.064266040972425e+03,
- 1.064634855034891e+03, 1.065002943111797e+03, 1.065370308362154e+03, 1.065736953923946e+03, 1.066102882914319e+03
- },
- {
- 1.600673877893881e+00, 4.872289457992808e+00, 8.191544896981389e+00, 1.156008053171050e+01, 1.497962624847038e+01,
- 1.845200784050755e+01, 2.197915391985768e+01, 2.556310344534813e+01, 2.920601392783513e+01, 3.291017038849445e+01,
- 3.667799515151816e+01, 4.051205856399421e+01, 4.441509074742689e+01, 4.838999449884643e+01, 5.243985947486874e+01,
- 5.656797780968805e+01, 6.077786133814143e+01, 6.507326061804227e+01, 6.945818597235247e+01, 7.393693080190052e+01,
- 7.851409745374505e+01, 8.319462596944014e+01, 8.798382608188123e+01, 9.288741287955702e+01, 9.791154661323756e+01,
- 1.030628771823966e+02, 1.083485939069246e+02, 1.137764812622403e+02, 1.193549813313108e+02, 1.250932638003910e+02,
- 1.310013043898163e+02, 1.370899726541367e+02, 1.433711301084431e+02, 1.498577394763309e+02, 1.565639859232567e+02,
- 1.635054104007839e+02, 1.706990549020494e+02, 1.781636181124228e+02, 1.859196181513966e+02, 1.939895561475054e+02,
- 2.023980697750917e+02, 2.111720587785721e+02, 2.203407537617498e+02, 2.299356836072472e+02, 2.399904740647999e+02,
- 2.505403788641760e+02, 2.616214055389658e+02, 2.732688562232061e+02, 2.855150741709673e+02, 2.983861998048989e+02,
- 3.118978387462570e+02, 3.260497627111027e+02, 3.408200848188007e+02, 3.561596801196350e+02, 3.719878532770248e+02,
- 3.881903927885553e+02, 4.046212862854804e+02, 4.211093720121100e+02, 4.374705042037953e+02, 4.535239947733870e+02,
- 4.691099481042837e+02, 4.841046071842668e+02, 4.984239401556423e+02, 5.120212285525325e+02, 5.248822446856329e+02,
- 5.370170290324281e+02, 5.484519413683976e+02, 5.592232471073957e+02, 5.693724565892829e+02, 5.789431382512739e+02,
- 5.879788129254729e+02, 5.965215973695510e+02, 6.046113650976735e+02, 6.122852704152540e+02, 6.195775309520702e+02,
- 6.265193921950486e+02, 6.331392152217692e+02, 6.394626419944071e+02, 6.455128036700897e+02, 6.513105469533044e+02,
- 6.568746614724208e+02, 6.622220974212332e+02, 6.673681673528906e+02, 6.723267292705438e+02, 6.771103503092094e+02,
- 6.817304516259289e+02, 6.861974358525339e+02, 6.905207988090764e+02, 6.947092272697320e+02, 6.987706845181892e+02,
- 7.027124852950792e+02, 7.065413615702281e+02, 7.102635203947260e+02, 7.138846949173737e+02, 7.174101894949725e+02,
- 7.208449196892221e+02, 7.241934478326393e+02, 7.274600146908635e+02, 7.306485678301034e+02, 7.337627869460871e+02,
- 7.368061066364043e+02, 7.397817368741731e+02, 7.426926814576128e+02, 7.455417546660348e+02, 7.483315963226559e+02,
- 7.510646854390889e+02, 7.537433525945389e+02, 7.563697911840337e+02, 7.589460676539283e+02, 7.614741308289995e+02,
- 7.639558204234067e+02, 7.663928748172580e+02, 7.687869381714158e+02, 7.711395669450872e+02, 7.734522358737482e+02,
- 7.757263434587464e+02, 7.779632170144700e+02, 7.801641173141345e+02, 7.823302428710089e+02, 7.844627338880895e+02,
- 7.865626759058979e+02, 7.886311031751015e+02, 7.906690017779850e+02, 7.926773125204697e+02, 7.946569336045125e+02,
- 7.966087231579979e+02, 7.985335014868883e+02, 8.004320530580526e+02, 8.023051293658378e+02, 8.041534494425604e+02,
- 8.059777025379900e+02, 8.077785495152222e+02, 8.095566243730638e+02, 8.113125356489910e+02, 8.130468677466434e+02,
- 8.147601812527661e+02, 8.164530171949145e+02, 8.181258941972563e+02, 8.197793117829382e+02, 8.214137508374163e+02,
- 8.230296745153051e+02, 8.246275290934483e+02, 8.262077447739408e+02, 8.277707364405562e+02, 8.293169043717387e+02,
- 8.308466349130939e+02, 8.323603011120639e+02, 8.338582633173033e+02, 8.353408697450330e+02, 8.368084570145320e+02,
- 8.382613506547265e+02, 8.396998655930229e+02, 8.411243065711606e+02, 8.425349686347456e+02, 8.439321375005985e+02,
- 8.453160899543411e+02, 8.466870942177657e+02, 8.480454102976852e+02, 8.493912903173612e+02, 8.507249788315302e+02,
- 8.520467131259866e+02, 8.533567235026111e+02, 8.546552335506756e+02, 8.559424604052024e+02, 8.572186149931121e+02,
- 8.584839022678253e+02, 8.597385214329677e+02, 8.609826661557739e+02, 8.622165247707422e+02, 8.634402804740731e+02,
- 8.646541115093714e+02, 8.658581913450901e+02, 8.670526888441429e+02, 8.682377684260786e+02, 8.694135902222304e+02,
- 8.705803102241732e+02, 8.717380804258448e+02, 8.728870489596433e+02, 8.740273602268060e+02, 8.751591550223518e+02,
- 8.762825706548505e+02, 8.773977410612857e+02, 8.785047969172267e+02, 8.796038657425629e+02, 8.806950720029870e+02,
- 8.817785372074432e+02, 8.828543796647216e+02, 8.839227158945416e+02, 8.849836587710563e+02, 8.860373188763321e+02,
- 8.870838042686590e+02, 8.881232205594230e+02, 8.891556709870721e+02, 8.901812564883081e+02, 8.912000757666339e+02,
- 8.922122253583631e+02, 8.932177996962040e+02, 8.942168911705393e+02, 8.952095901884716e+02, 8.961959852307637e+02,
- 8.971761629067378e+02, 8.981502080072337e+02, 8.991182035557000e+02, 9.000802308575065e+02, 9.010363695475377e+02,
- 9.019866976361519e+02, 9.029312915535620e+02, 9.038702261927106e+02, 9.048035749506926e+02, 9.057314097687919e+02,
- 9.066538011711793e+02, 9.075708183023327e+02, 9.084825289632222e+02, 9.093889996463128e+02, 9.102902955694339e+02,
- 9.111864807085479e+02, 9.120776178294782e+02, 9.129637685186152e+02, 9.138449932126604e+02, 9.147213514644056e+02,
- 9.155929010352610e+02, 9.164596993069983e+02, 9.173218023967496e+02, 9.181792654072908e+02, 9.190321424516630e+02,
- 9.198804866770461e+02, 9.207243502879165e+02, 9.215637845685040e+02, 9.223988399045877e+02, 9.232295658046394e+02,
- 9.240560109203503e+02, 9.248782226463812e+02, 9.256962488017166e+02, 9.265101351829005e+02, 9.273199272080388e+02,
- 9.281256695324784e+02, 9.289274060660290e+02, 9.297251799896961e+02, 9.305190337719444e+02, 9.313090091845048e+02,
- 9.320951473177487e+02, 9.328774885956299e+02, 9.336560727902195e+02, 9.344309390358462e+02, 9.352021258428481e+02,
- 9.359696711109536e+02, 9.367336121423084e+02, 9.374939856541450e+02, 9.382508277911246e+02, 9.390041741373456e+02,
- 9.397540597280417e+02, 9.405005190609709e+02, 9.412435861075080e+02, 9.419832943234536e+02, 9.427196766595602e+02,
- 9.434527655717927e+02, 9.441825930313258e+02, 9.449091905342858e+02, 9.456325891112526e+02, 9.463528193365185e+02,
- 9.470699113371176e+02, 9.477838948016289e+02, 9.484947989887687e+02, 9.492026527357632e+02, 9.499074844665211e+02,
- 9.506093221996088e+02, 9.513081935560275e+02, 9.520041257668074e+02, 9.526971456804200e+02, 9.533872797700083e+02,
- 9.540745541404534e+02, 9.547589945352646e+02, 9.554406263433192e+02, 9.561194746054321e+02, 9.567955640207838e+02,
- 9.574689189531922e+02, 9.581395634372408e+02, 9.588075211842702e+02, 9.594728155882271e+02, 9.601354697313860e+02,
- 9.607955063899370e+02, 9.614529480394498e+02, 9.621078168602146e+02, 9.627601347424667e+02, 9.634099232914867e+02,
- 9.640572038326013e+02, 9.647019974160596e+02, 9.653443248218135e+02, 9.659842065641892e+02, 9.666216628964572e+02,
- 9.672567138153032e+02, 9.678893790652056e+02, 9.685196781427185e+02, 9.691476303006579e+02, 9.697732545522077e+02,
- 9.703965696749329e+02, 9.710175942147083e+02, 9.716363464895719e+02, 9.722528445934850e+02, 9.728671064000290e+02,
- 9.734791495660131e+02, 9.740889915350170e+02, 9.746966495408541e+02, 9.753021406109682e+02, 9.759054815697610e+02,
- 9.765066890418481e+02, 9.771057794552543e+02, 9.777027690445431e+02, 9.782976738538813e+02, 9.788905097400459e+02,
- 9.794812923753695e+02, 9.800700372506280e+02, 9.806567596778713e+02, 9.812414747931987e+02, 9.818241975594810e+02,
- 9.824049427690265e+02, 9.829837250461998e+02, 9.835605588499885e+02, 9.841354584765166e+02, 9.847084380615185e+02,
- 9.852795115827556e+02, 9.858486928623967e+02, 9.864159955693455e+02, 9.869814332215291e+02, 9.875450191881425e+02,
- 9.881067666918501e+02, 9.886666888109472e+02, 9.892247984814813e+02, 9.897811084993347e+02, 9.903356315222662e+02,
- 9.908883800719206e+02, 9.914393665357948e+02, 9.919886031691757e+02, 9.925361020970344e+02, 9.930818753158945e+02,
- 9.936259346956613e+02, 9.941682919814209e+02, 9.947089587952057e+02, 9.952479466377291e+02, 9.957852668900900e+02,
- 9.963209308154461e+02, 9.968549495606594e+02, 9.973873341579094e+02, 9.979180955262852e+02, 9.984472444733395e+02,
- 9.989747916966264e+02, 9.995007477852057e+02, 1.000025123221121e+03, 1.000547928380860e+03, 1.001069173536780e+03,
- 1.001588868858515e+03, 1.002107024414358e+03, 1.002623650172623e+03, 1.003138756002973e+03, 1.003652351677741e+03,
- 1.004164446873214e+03, 1.004675051170912e+03, 1.005184174058825e+03, 1.005691824932656e+03, 1.006198013097011e+03,
- 1.006702747766603e+03, 1.007206038067409e+03, 1.007707893037828e+03, 1.008208321629805e+03, 1.008707332709944e+03,
- 1.009204935060610e+03, 1.009701137380993e+03, 1.010195948288180e+03, 1.010689376318187e+03, 1.011181429926993e+03,
- 1.011672117491544e+03, 1.012161447310748e+03, 1.012649427606455e+03, 1.013136066524416e+03, 1.013621372135234e+03,
- 1.014105352435292e+03, 1.014588015347675e+03, 1.015069368723072e+03, 1.015549420340664e+03, 1.016028177909004e+03,
- 1.016505649066875e+03, 1.016981841384145e+03, 1.017456762362595e+03, 1.017930419436750e+03, 1.018402819974687e+03,
- 1.018873971278832e+03, 1.019343880586751e+03, 1.019812555071920e+03, 1.020280001844491e+03, 1.020746227952044e+03,
- 1.021211240380326e+03, 1.021675046053981e+03, 1.022137651837270e+03, 1.022599064534776e+03, 1.023059290892105e+03,
- 1.023518337596572e+03, 1.023976211277878e+03, 1.024432918508777e+03, 1.024888465805737e+03, 1.025342859629584e+03,
- 1.025796106386143e+03, 1.026248212426865e+03, 1.026699184049455e+03, 1.027149027498473e+03, 1.027597748965944e+03,
- 1.028045354591953e+03, 1.028491850465225e+03, 1.028937242623708e+03, 1.029381537055141e+03, 1.029824739697611e+03,
- 1.030266856440116e+03, 1.030707893123102e+03, 1.031147855539002e+03, 1.031586749432774e+03, 1.032024580502415e+03,
- 1.032461354399483e+03, 1.032897076729603e+03, 1.033331753052972e+03, 1.033765388884848e+03, 1.034197989696046e+03,
- 1.034629560913415e+03, 1.035060107920312e+03, 1.035489636057074e+03, 1.035918150621477e+03, 1.036345656869195e+03,
- 1.036772160014249e+03, 1.037197665229448e+03, 1.037622177646830e+03, 1.038045702358093e+03, 1.038468244415022e+03,
- 1.038889808829909e+03, 1.039310400575967e+03, 1.039730024587741e+03, 1.040148685761514e+03, 1.040566388955699e+03,
- 1.040983138991242e+03, 1.041398940652004e+03, 1.041813798685145e+03, 1.042227717801507e+03, 1.042640702675980e+03,
- 1.043052757947880e+03, 1.043463888221304e+03, 1.043874098065496e+03, 1.044283392015197e+03, 1.044691774571000e+03,
- 1.045099250199691e+03, 1.045505823334592e+03, 1.045911498375901e+03, 1.046316279691020e+03, 1.046720171614884e+03,
- 1.047123178450291e+03, 1.047525304468216e+03, 1.047926553908129e+03, 1.048326930978310e+03, 1.048726439856153e+03,
- 1.049125084688477e+03, 1.049522869591819e+03, 1.049919798652737e+03, 1.050315875928101e+03, 1.050711105445386e+03,
- 1.051105491202952e+03, 1.051499037170334e+03, 1.051891747288515e+03, 1.052283625470211e+03, 1.052674675600129e+03,
- 1.053064901535252e+03, 1.053454307105095e+03, 1.053842896111973e+03, 1.054230672331256e+03, 1.054617639511630e+03,
- 1.055003801375349e+03, 1.055389161618486e+03, 1.055773723911176e+03, 1.056157491897869e+03, 1.056540469197565e+03,
- 1.056922659404055e+03, 1.057304066086157e+03, 1.057684692787948e+03, 1.058064543028999e+03, 1.058443620304596e+03,
- 1.058821928085971e+03, 1.059199469820521e+03, 1.059576248932028e+03, 1.059952268820881e+03, 1.060327532864284e+03,
- 1.060702044416472e+03, 1.061075806808923e+03, 1.061448823350563e+03, 1.061821097327968e+03, 1.062192632005575e+03,
- 1.062563430625875e+03, 1.062933496409615e+03, 1.063302832555991e+03, 1.063671442242848e+03, 1.064039328626863e+03
- },
- {
- 1.595709302640228e+00, 4.856813886775951e+00, 8.164891970561007e+00, 1.152153791920827e+01, 1.492843177830413e+01,
- 1.838734523821821e+01, 2.190014810617901e+01, 2.546881534157714e+01, 2.909543470819773e+01, 3.278221511078738e+01,
- 3.653149568751348e+01, 4.034575573974432e+01, 4.422762559041229e+01, 4.817989847353483e+01, 5.220554357030817e+01,
- 5.630772032176301e+01, 6.048979416451574e+01, 6.475535385491405e+01, 6.910823056814422e+01, 7.355251898292674e+01,
- 7.809260058957254e+01, 8.273316948969334e+01, 8.747926098998163e+01, 9.233628333035450e+01, 9.731005292835992e+01,
- 1.024068335667766e+02, 1.076333799989482e+02, 1.129969864953987e+02, 1.185055409023956e+02, 1.241675848249737e+02,
- 1.299923805757274e+02, 1.359899855361507e+02, 1.421713345425990e+02, 1.485483308257602e+02, 1.551339457195563e+02,
- 1.619423272923900e+02, 1.689889169717427e+02, 1.762905726855827e+02, 1.838656952450432e+02, 1.917343523823323e+02,
- 1.999183912226977e+02, 2.084415245487316e+02, 2.173293682363127e+02, 2.266093957332074e+02, 2.363107593301718e+02,
- 2.464639063893740e+02, 2.570998919043063e+02, 2.682492598796894e+02, 2.799403439369311e+02, 2.921968401371762e+02,
- 3.050345594050117e+02, 3.184574001461299e+02, 3.324527972109175e+02, 3.469871565783442e+02, 3.620019936136122e+02,
- 3.774116014486150e+02, 3.931031093698759e+02, 4.089397727427756e+02, 4.247681092801149e+02, 4.404287490225789e+02,
- 4.557695665001704e+02, 4.706585291223366e+02, 4.849943382989120e+02, 4.987081257340663e+02, 5.117618034895091e+02,
- 5.241437636122085e+02, 5.358623719232884e+02, 5.469396847057156e+02, 5.574063117404789e+02, 5.672976159116278e+02,
- 5.766510639037273e+02, 5.855044383221468e+02, 5.938946549549984e+02, 6.018570004672415e+02, 6.094246678144391e+02,
- 6.166285072465697e+02, 6.234969341412941e+02, 6.300559484851705e+02, 6.363292300309122e+02, 6.423382806835624e+02,
- 6.481025923654390e+02, 6.536398245187390e+02, 6.589659803735536e+02, 6.640955750557204e+02, 6.690417915720543e+02,
- 6.738166228161149e+02, 6.784309991505237e+02, 6.828949020082013e+02, 6.872174644617972e+02, 6.914070599570844e+02,
- 6.954713804830158e+02, 6.994175054243825e+02, 7.032519622582432e+02, 7.069807801501717e+02, 7.106095373324916e+02,
- 7.141434031889142e+02, 7.175871755888297e+02, 7.209453141923213e+02, 7.242219701934794e+02, 7.274210129527905e+02,
- 7.305460538983200e+02, 7.336004680221200e+02, 7.365874132532493e+02, 7.395098479507313e+02, 7.423705467275038e+02,
- 7.451721147891359e+02, 7.479170009477911e+02, 7.506075094520711e+02, 7.532458107563453e+02, 7.558339513385225e+02,
- 7.583738626625250e+02, 7.608673693707754e+02, 7.633161967824044e+02, 7.657219777645493e+02, 7.680862590367718e+02,
- 7.704105069622128e+02, 7.726961128734113e+02, 7.749443979757124e+02, 7.771566178667837e+02, 7.793339667068045e+02,
- 7.814775810704342e+02, 7.835885435085497e+02, 7.856678858351249e+02, 7.877165922223251e+02, 7.897356019708664e+02,
- 7.917258121828538e+02, 7.936880799743612e+02, 7.956232256579143e+02, 7.975320334460025e+02, 7.994152543993692e+02,
- 8.012736080127635e+02, 8.031077839474428e+02, 8.049184436295798e+02, 8.067062217365991e+02, 8.084717270610208e+02,
- 8.102155455417020e+02, 8.119382393793163e+02, 8.136403493826051e+02, 8.153223957934309e+02, 8.169848793039328e+02,
- 8.186282820125210e+02, 8.202530683229816e+02, 8.218596857906824e+02, 8.234485659194984e+02, 8.250201249128290e+02,
- 8.265747643817979e+02, 8.281128720134932e+02, 8.296348222018977e+02, 8.311409766439360e+02, 8.326316849029167e+02,
- 8.341072849508272e+02, 8.355681036340466e+02, 8.370144572105565e+02, 8.384466517613272e+02, 8.398649836297868e+02,
- 8.412697398285535e+02, 8.426611984253805e+02, 8.440396289095677e+02, 8.454052925399943e+02, 8.467584426758527e+02,
- 8.480993250911035e+02, 8.494281782735848e+02, 8.507452337096588e+02, 8.520507161552212e+02, 8.533448438938324e+02,
- 8.546278289827019e+02, 8.558998774871922e+02, 8.571611897044683e+02, 8.584119603768938e+02, 8.596523788957201e+02,
- 8.608826294955924e+02, 8.621028914403524e+02, 8.633133392006132e+02, 8.645141426235119e+02, 8.657054670950674e+02,
- 8.668874736955156e+02, 8.680603193479675e+02, 8.692241569607576e+02, 8.703791355637630e+02, 8.715254004390301e+02,
- 8.726630932459548e+02, 8.737923521413189e+02, 8.749133118943970e+02, 8.760261039974046e+02, 8.771308567714917e+02,
- 8.782276954684938e+02, 8.793167420426571e+02, 8.803981165223779e+02, 8.814719352212855e+02, 8.825383120535087e+02,
- 8.835973583157204e+02, 8.846491827673116e+02, 8.856938917075279e+02, 8.867315890496978e+02, 8.877623763926839e+02,
- 8.887863530896823e+02, 8.898036163144866e+02, 8.908142611253234e+02, 8.918183805263718e+02, 8.928160655270561e+02,
- 8.938074051992198e+02, 8.947924867322592e+02, 8.957713954863118e+02, 8.967442150435753e+02, 8.977110272578381e+02,
- 8.986719123022921e+02, 8.996269487157045e+02, 9.005762134470098e+02, 9.015197818983848e+02, 9.024577279668788e+02,
- 9.033901240846424e+02, 9.043170412578206e+02, 9.052385491041597e+02, 9.061547158893777e+02, 9.070656085623502e+02,
- 9.079712927891528e+02, 9.088718329860058e+02, 9.097672923511708e+02, 9.106577328958216e+02, 9.115432154739489e+02,
- 9.124237998113216e+02, 9.132995445335405e+02, 9.141705074636201e+02, 9.150367445805314e+02, 9.158983116262885e+02,
- 9.167552630894709e+02, 9.176076524863394e+02, 9.184555323841272e+02, 9.192989544236332e+02, 9.201379693411430e+02,
- 9.209726269896996e+02, 9.218029759471386e+02, 9.226290651681265e+02, 9.234509415827619e+02, 9.242686517116628e+02,
- 9.250822412896144e+02, 9.258917552834062e+02, 9.266972379091561e+02, 9.274987326491500e+02, 9.282962822682071e+02,
- 9.290899288295868e+02, 9.298797137104588e+02, 9.306656776169417e+02, 9.314478605987302e+02, 9.322263020633260e+02,
- 9.330010407898794e+02, 9.337721149426559e+02, 9.345395620841475e+02, 9.353034191878263e+02, 9.360637226505673e+02,
- 9.368205083047328e+02, 9.375738114299530e+02, 9.383236667645861e+02, 9.390701085168865e+02, 9.398131703758852e+02,
- 9.405528855219897e+02, 9.412892866373060e+02, 9.420224059157105e+02, 9.427522750726558e+02, 9.434789253547336e+02,
- 9.442023875490023e+02, 9.449226919920723e+02, 9.456398685789744e+02, 9.463539467718047e+02, 9.470649556081619e+02,
- 9.477729237093710e+02, 9.484778792885160e+02, 9.491798501582706e+02, 9.498788637385433e+02, 9.505749470639431e+02,
- 9.512681267910592e+02, 9.519584292055766e+02, 9.526458802292167e+02, 9.533305054265203e+02, 9.540123300114678e+02,
- 9.546913788539478e+02, 9.553676764860767e+02, 9.560412471083696e+02, 9.567121145957710e+02, 9.573803025035500e+02,
- 9.580458340730587e+02, 9.587087322373615e+02, 9.593690196267388e+02, 9.600267185740636e+02, 9.606818511200631e+02,
- 9.613344390184600e+02, 9.619845037410025e+02, 9.626320664823819e+02, 9.632771481650425e+02, 9.639197694438877e+02,
- 9.645599507108841e+02, 9.651977120995646e+02, 9.658330734894372e+02, 9.664660545102952e+02, 9.670966745464406e+02,
- 9.677249527408138e+02, 9.683509079990381e+02, 9.689745589933784e+02, 9.695959241666185e+02, 9.702150217358525e+02,
- 9.708318696962056e+02, 9.714464858244702e+02, 9.720588876826722e+02, 9.726690926215606e+02, 9.732771177840297e+02,
- 9.738829801084678e+02, 9.744866963320416e+02, 9.750882829939101e+02, 9.756877564383792e+02, 9.762851328179897e+02,
- 9.768804280965441e+02, 9.774736580520739e+02, 9.780648382797503e+02, 9.786539841947319e+02, 9.792411110349657e+02,
- 9.798262338639221e+02, 9.804093675732880e+02, 9.809905268855995e+02, 9.815697263568292e+02, 9.821469803789180e+02,
- 9.827223031822667e+02, 9.832957088381727e+02, 9.838672112612237e+02, 9.844368242116445e+02, 9.850045612976051e+02,
- 9.855704359774749e+02, 9.861344615620483e+02, 9.866966512167148e+02, 9.872570179636015e+02, 9.878155746836675e+02,
- 9.883723341187633e+02, 9.889273088736512e+02, 9.894805114179915e+02, 9.900319540882876e+02, 9.905816490898015e+02,
- 9.911296084984303e+02, 9.916758442625513e+02, 9.922203682048339e+02, 9.927631920240181e+02, 9.933043272966615e+02,
- 9.938437854788580e+02, 9.943815779079193e+02, 9.949177158040395e+02, 9.954522102719139e+02, 9.959850723023426e+02,
- 9.965163127738030e+02, 9.970459424539910e+02, 9.975739720013382e+02, 9.981004119665076e+02, 9.986252727938534e+02,
- 9.991485648228664e+02, 9.996702982895864e+02, 1.000190483327999e+03, 1.000709129971398e+03, 1.001226248153737e+03,
- 1.001741847710947e+03, 1.002255938382244e+03, 1.002768529811399e+03, 1.003279631548004e+03, 1.003789253048705e+03,
- 1.004297403678420e+03, 1.004804092711533e+03, 1.005309329333077e+03, 1.005813122639883e+03, 1.006315481641727e+03,
- 1.006816415262446e+03, 1.007315932341043e+03, 1.007814041632769e+03, 1.008310751810190e+03, 1.008806071464241e+03,
- 1.009300009105255e+03, 1.009792573163982e+03, 1.010283771992589e+03, 1.010773613865645e+03, 1.011262106981093e+03,
- 1.011749259461198e+03, 1.012235079353495e+03, 1.012719574631705e+03, 1.013202753196650e+03, 1.013684622877149e+03,
- 1.014165191430901e+03, 1.014644466545350e+03, 1.015122455838543e+03, 1.015599166859976e+03, 1.016074607091416e+03,
- 1.016548783947722e+03, 1.017021704777650e+03, 1.017493376864645e+03, 1.017963807427620e+03, 1.018433003621725e+03,
- 1.018900972539108e+03, 1.019367721209653e+03, 1.019833256601725e+03, 1.020297585622884e+03, 1.020760715120604e+03,
- 1.021222651882977e+03, 1.021683402639400e+03, 1.022142974061261e+03, 1.022601372762611e+03, 1.023058605300824e+03,
- 1.023514678177255e+03, 1.023969597837878e+03, 1.024423370673923e+03, 1.024876003022501e+03, 1.025327501167219e+03,
- 1.025777871338787e+03, 1.026227119715619e+03, 1.026675252424421e+03, 1.027122275540774e+03, 1.027568195089704e+03,
- 1.028013017046254e+03, 1.028456747336035e+03, 1.028899391835780e+03, 1.029340956373883e+03, 1.029781446730936e+03,
- 1.030220868640255e+03, 1.030659227788398e+03, 1.031096529815682e+03, 1.031532780316682e+03, 1.031967984840736e+03,
- 1.032402148892435e+03, 1.032835277932104e+03, 1.033267377376285e+03, 1.033698452598208e+03, 1.034128508928253e+03,
- 1.034557551654417e+03, 1.034985586022758e+03, 1.035412617237847e+03, 1.035838650463211e+03, 1.036263690821762e+03,
- 1.036687743396232e+03, 1.037110813229593e+03, 1.037532905325477e+03, 1.037954024648587e+03, 1.038374176125106e+03,
- 1.038793364643097e+03, 1.039211595052900e+03, 1.039628872167524e+03, 1.040045200763032e+03, 1.040460585578922e+03,
- 1.040875031318505e+03, 1.041288542649276e+03, 1.041701124203278e+03, 1.042112780577468e+03, 1.042523516334069e+03,
- 1.042933336000929e+03, 1.043342244071863e+03, 1.043750245007001e+03, 1.044157343233127e+03, 1.044563543144010e+03,
- 1.044968849100740e+03, 1.045373265432053e+03, 1.045776796434652e+03, 1.046179446373528e+03, 1.046581219482270e+03,
- 1.046982119963385e+03, 1.047382151988592e+03, 1.047781319699137e+03, 1.048179627206084e+03, 1.048577078590614e+03,
- 1.048973677904318e+03, 1.049369429169483e+03, 1.049764336379377e+03, 1.050158403498531e+03, 1.050551634463018e+03,
- 1.050944033180727e+03, 1.051335603531630e+03, 1.051726349368059e+03, 1.052116274514961e+03, 1.052505382770165e+03,
- 1.052893677904641e+03, 1.053281163662751e+03, 1.053667843762506e+03, 1.054053721895811e+03, 1.054438801728715e+03,
- 1.054823086901652e+03, 1.055206581029681e+03, 1.055589287702728e+03, 1.055971210485816e+03, 1.056352352919297e+03,
- 1.056732718519085e+03, 1.057112310776883e+03, 1.057491133160401e+03, 1.057869189113585e+03, 1.058246482056828e+03,
- 1.058623015387197e+03, 1.058998792478636e+03, 1.059373816682182e+03, 1.059748091326178e+03, 1.060121619716471e+03,
- 1.060494405136624e+03, 1.060866450848113e+03, 1.061237760090529e+03, 1.061608336081776e+03, 1.061978182018264e+03
- },
- {
- 1.590775797989868e+00, 4.841439857386024e+00, 8.138422289283511e+00, 1.148327283379414e+01, 1.487762321132809e+01,
- 1.832319271741514e+01, 2.182179428218253e+01, 2.537534104438713e+01, 2.898585348707979e+01, 3.265546719478144e+01,
- 3.638644129499104e+01, 4.018116765537270e+01, 4.404218091620867e+01, 4.797216944715024e+01, 5.197398732794256e+01,
- 5.605066746479068e+01, 6.020543596753251e+01, 6.444172792795690e+01, 6.876320475662958e+01, 7.317377325463342e+01,
- 7.767760661784858e+01, 8.227916759491065e+01, 8.698323404583635e+01, 9.179492717643278e+01, 9.671974275374629e+01,
- 1.017635856394122e+02, 1.069328080098329e+02, 1.122342516629748e+02, 1.176752948383596e+02, 1.232639039959707e+02,
- 1.290086910034682e+02, 1.349189761615905e+02, 1.410048574386107e+02, 1.472772861827061e+02, 1.537481492621997e+02,
- 1.604303575424629e+02, 1.673379395667849e+02, 1.744861389290379e+02, 1.818915122445750e+02, 1.895720227874620e+02,
- 1.975471219848891e+02, 2.058378067949774e+02, 2.144666350152773e+02, 2.234576721508899e+02, 2.328363319395768e+02,
- 2.426290574875140e+02, 2.528627714142019e+02, 2.635640033689535e+02, 2.747575871189896e+02, 2.864648178781462e+02,
- 2.987009906364933e+02, 3.114723212194401e+02, 3.247723931612198e+02, 3.385784576457237e+02, 3.528480901600623e+02,
- 3.675168177491881e+02, 3.824973533563559e+02, 3.976810296939481e+02, 4.129419038772709e+02, 4.281436894955336e+02,
- 4.431490357881232e+02, 4.578298267454189e+02, 4.720766523123063e+02, 4.858060864527883e+02, 4.989614578796762e+02,
- 5.115115417280101e+02, 5.234468220718380e+02, 5.347743192711546e+02, 5.455125944366981e+02, 5.556876127924778e+02,
- 5.653296294493555e+02, 5.744709774147913e+02, 5.831445452652404e+02, 5.913827480523142e+02, 5.992168417011177e+02,
- 6.066764837689020e+02, 6.137894733758559e+02, 6.205816247437457e+02, 6.270767393802674e+02, 6.332966488439331e+02,
- 6.392613051901221e+02, 6.449889007820358e+02, 6.504960033786695e+02, 6.557976961894350e+02, 6.609077157814268e+02,
- 6.658385832808182e+02, 6.706017262456724e+02, 6.752075899788937e+02, 6.796657379970636e+02, 6.839849419755249e+02,
- 6.881732618439526e+02, 6.922381168917284e+02, 6.961863487591235e+02, 7.000242773171320e+02, 7.037577501520395e+02,
- 7.073921865321875e+02, 7.109326165071435e+02, 7.143837157552346e+02, 7.177498367103948e+02, 7.210350364285954e+02,
- 7.242431015916368e+02, 7.273775709917111e+02, 7.304417557932320e+02, 7.334387578284357e+02, 7.363714861489957e+02,
- 7.392426720268566e+02, 7.420548825726902e+02, 7.448105331192367e+02, 7.475118984987000e+02, 7.501611233278751e+02,
- 7.527602314012830e+02, 7.553111342810698e+02, 7.578156391623824e+02, 7.602754560842205e+02, 7.626922045481290e+02,
- 7.650674196004096e+02, 7.674025574276706e+02, 7.696990005103153e+02, 7.719580623740279e+02, 7.741809919752333e+02,
- 7.763689777529127e+02, 7.785231513670483e+02, 7.806445912044121e+02, 7.827343255369617e+02, 7.847933355425706e+02,
- 7.868225578357116e+02, 7.888228879823545e+02, 7.907951814297506e+02, 7.927402567466538e+02, 7.946588974356774e+02,
- 7.965518538726897e+02, 7.984198451296132e+02, 8.002635606498286e+02, 8.020836618194184e+02, 8.038807828505893e+02,
- 8.056555340863973e+02, 8.074085008987636e+02, 8.091402462665031e+02, 8.108513116180351e+02, 8.125422179016226e+02,
- 8.142134665911244e+02, 8.158655406317687e+02, 8.174989053301597e+02, 8.191140091923161e+02, 8.207112847133204e+02,
- 8.222911491218227e+02, 8.238540050824254e+02, 8.254002413587356e+02, 8.269302334396534e+02, 8.284443441407135e+02,
- 8.299429241250706e+02, 8.314263124930418e+02, 8.328948372423005e+02, 8.343488157534864e+02, 8.357885552403309e+02,
- 8.372143531764796e+02, 8.386264977004295e+02, 8.400252679998886e+02, 8.414109346767875e+02, 8.427837600940925e+02,
- 8.441439987054739e+02, 8.454918973688262e+02, 8.468276956445792e+02, 8.481516260796527e+02, 8.494639144778721e+02,
- 8.507647801576080e+02, 8.520544361973365e+02, 8.533330896698035e+02, 8.546009418653933e+02, 8.558581885053072e+02,
- 8.571050199450860e+02, 8.583416213689929e+02, 8.595681729757445e+02, 8.607848501560395e+02, 8.619918236623108e+02,
- 8.631892597711040e+02, 8.643773204384592e+02, 8.655561634486495e+02, 8.667259425566152e+02, 8.678868076244030e+02,
- 8.690389047519114e+02, 8.701823764022232e+02, 8.713173615217836e+02, 8.724439956556837e+02, 8.735624110582747e+02,
- 8.746727367993417e+02, 8.757750985504935e+02, 8.768696199199105e+02, 8.779564207277658e+02, 8.790356182855759e+02,
- 8.801073271915184e+02, 8.811716594140022e+02, 8.822287243720489e+02, 8.832786290126365e+02, 8.843214778851341e+02,
- 8.853573732129622e+02, 8.863864149625981e+02, 8.874087009100447e+02, 8.884243267048734e+02, 8.894333859319422e+02,
- 8.904359701708938e+02, 8.914321690535271e+02, 8.924220703191264e+02, 8.934057598678496e+02, 8.943833218122311e+02,
- 8.953548385269085e+02, 8.963203906966220e+02, 8.972800573625652e+02, 8.982339159671624e+02, 8.991820423973228e+02,
- 9.001245110262406e+02, 9.010613947538021e+02, 9.019927650456430e+02, 9.029186919709249e+02, 9.038392442388673e+02,
- 9.047544892340927e+02, 9.056644930508290e+02, 9.065693205260044e+02, 9.074690352712965e+02, 9.083636997041527e+02,
- 9.092533750778371e+02, 9.101381215105350e+02, 9.110179980135462e+02, 9.118930625186111e+02, 9.127633719043896e+02,
- 9.136289823291213e+02, 9.144899480426020e+02, 9.153463232076422e+02, 9.161981607396305e+02, 9.170455126216995e+02,
- 9.178884299267644e+02, 9.187269624337927e+02, 9.195611602507894e+02, 9.203910714584085e+02, 9.212167436963884e+02,
- 9.220382237951221e+02, 9.228555577941218e+02, 9.236687909599489e+02, 9.244779678036406e+02, 9.252831320976436e+02,
- 9.260843268922756e+02, 9.268815945317228e+02, 9.276749766696003e+02, 9.284645142840762e+02, 9.292502476925912e+02,
- 9.300322165661672e+02, 9.308104599433328e+02, 9.315850162436741e+02, 9.323559232810177e+02, 9.331232182762704e+02,
- 9.338869378699070e+02, 9.346471181341384e+02, 9.354037945847548e+02, 9.361570021926635e+02, 9.369067753951234e+02,
- 9.376531481066917e+02, 9.383961537298883e+02, 9.391358251655892e+02, 9.398721948231537e+02, 9.406052946302951e+02,
- 9.413351560427047e+02, 9.420618100534371e+02, 9.427852872020519e+02, 9.435056175835421e+02, 9.442228308570335e+02,
- 9.449369562542718e+02, 9.456480225879067e+02, 9.463560582595671e+02, 9.470610912677513e+02, 9.477631492155159e+02,
- 9.484622593179929e+02, 9.491584484097159e+02, 9.498517429517813e+02, 9.505421690388373e+02, 9.512297524059069e+02,
- 9.519145184350560e+02, 9.525964921619041e+02, 9.532756982819809e+02, 9.539521611569448e+02, 9.546259048206495e+02,
- 9.552969529850809e+02, 9.559653290461495e+02, 9.566310560893639e+02, 9.572941568953643e+02, 9.579546539453412e+02,
- 9.586125694263288e+02, 9.592679252363828e+02, 9.599207429896419e+02, 9.605710440212796e+02, 9.612188493923499e+02,
- 9.618641798945193e+02, 9.625070560547082e+02, 9.631474981396190e+02, 9.637855261601784e+02, 9.644211598758777e+02,
- 9.650544187990212e+02, 9.656853221988872e+02, 9.663138891057997e+02, 9.669401383151129e+02, 9.675640883911165e+02,
- 9.681857576708522e+02, 9.688051642678610e+02, 9.694223260758431e+02, 9.700372607722486e+02, 9.706499858217942e+02,
- 9.712605184799052e+02, 9.718688757960883e+02, 9.724750746172397e+02, 9.730791315908817e+02, 9.736810631683372e+02,
- 9.742808856078399e+02, 9.748786149775830e+02, 9.754742671587055e+02, 9.760678578482245e+02, 9.766594025619027e+02,
- 9.772489166370660e+02, 9.778364152353637e+02, 9.784219133454732e+02, 9.790054257857552e+02, 9.795869672068584e+02,
- 9.801665520942703e+02, 9.807441947708221e+02, 9.813199093991453e+02, 9.818937099840829e+02, 9.824656103750526e+02,
- 9.830356242683662e+02, 9.836037652095063e+02, 9.841700465953636e+02, 9.847344816764236e+02, 9.852970835589225e+02,
- 9.858578652069580e+02, 9.864168394445626e+02, 9.869740189577387e+02, 9.875294162964552e+02, 9.880830438766131e+02,
- 9.886349139819681e+02, 9.891850387660226e+02, 9.897334302538851e+02, 9.902801003440925e+02, 9.908250608104025e+02,
- 9.913683233035532e+02, 9.919098993529909e+02, 9.924498003685699e+02, 9.929880376422201e+02, 9.935246223495835e+02,
- 9.940595655516287e+02, 9.945928781962309e+02, 9.951245711197281e+02, 9.956546550484455e+02, 9.961831406002034e+02,
- 9.967100382857870e+02, 9.972353585104032e+02, 9.977591115751012e+02, 9.982813076781774e+02, 9.988019569165536e+02,
- 9.993210692871321e+02, 9.998386546881255e+02, 1.000354722920371e+03, 1.000869283688613e+03, 1.001382346602775e+03,
- 1.001893921179203e+03, 1.002404016841891e+03, 1.002912642923684e+03, 1.003419808667466e+03, 1.003925523227328e+03,
- 1.004429795669709e+03, 1.004932634974526e+03, 1.005434050036289e+03, 1.005934049665188e+03, 1.006432642588171e+03,
- 1.006929837449995e+03, 1.007425642814277e+03, 1.007920067164509e+03, 1.008413118905071e+03, 1.008904806362219e+03,
- 1.009395137785066e+03, 1.009884121346538e+03, 1.010371765144323e+03, 1.010858077201802e+03, 1.011343065468964e+03,
- 1.011826737823311e+03, 1.012309102070741e+03, 1.012790165946432e+03, 1.013269937115695e+03, 1.013748423174827e+03,
- 1.014225631651945e+03, 1.014701570007807e+03, 1.015176245636625e+03, 1.015649665866860e+03, 1.016121837962012e+03,
- 1.016592769121390e+03, 1.017062466480876e+03, 1.017530937113676e+03, 1.017998188031061e+03, 1.018464226183094e+03,
- 1.018929058459351e+03, 1.019392691689626e+03, 1.019855132644630e+03, 1.020316388036675e+03, 1.020776464520356e+03,
- 1.021235368693215e+03, 1.021693107096398e+03, 1.022149686215303e+03, 1.022605112480222e+03, 1.023059392266965e+03,
- 1.023512531897486e+03, 1.023964537640489e+03, 1.024415415712034e+03, 1.024865172276133e+03, 1.025313813445330e+03,
- 1.025761345281285e+03, 1.026207773795338e+03, 1.026653104949075e+03, 1.027097344654876e+03, 1.027540498776467e+03,
- 1.027982573129453e+03, 1.028423573481854e+03, 1.028863505554621e+03, 1.029302375022160e+03, 1.029740187512835e+03,
- 1.030176948609473e+03, 1.030612663849859e+03, 1.031047338727223e+03, 1.031480978690724e+03, 1.031913589145922e+03,
- 1.032345175455250e+03, 1.032775742938474e+03, 1.033205296873153e+03, 1.033633842495081e+03, 1.034061384998742e+03,
- 1.034487929537739e+03, 1.034913481225230e+03, 1.035338045134356e+03, 1.035761626298659e+03, 1.036184229712500e+03,
- 1.036605860331464e+03, 1.037026523072773e+03, 1.037446222815676e+03, 1.037864964401849e+03, 1.038282752635781e+03,
- 1.038699592285160e+03, 1.039115488081250e+03, 1.039530444719265e+03, 1.039944466858738e+03, 1.040357559123889e+03,
- 1.040769726103977e+03, 1.041180972353665e+03, 1.041591302393361e+03, 1.042000720709570e+03, 1.042409231755234e+03,
- 1.042816839950069e+03, 1.043223549680900e+03, 1.043629365301987e+03, 1.044034291135351e+03, 1.044438331471098e+03,
- 1.044841490567730e+03, 1.045243772652460e+03, 1.045645181921523e+03, 1.046045722540480e+03, 1.046445398644518e+03,
- 1.046844214338747e+03, 1.047242173698498e+03, 1.047639280769610e+03, 1.048035539568714e+03, 1.048430954083525e+03,
- 1.048825528273111e+03, 1.049219266068180e+03, 1.049612171371345e+03, 1.050004248057397e+03, 1.050395499973570e+03,
- 1.050785930939808e+03, 1.051175544749022e+03, 1.051564345167345e+03, 1.051952335934392e+03, 1.052339520763506e+03,
- 1.052725903342008e+03, 1.053111487331442e+03, 1.053496276367814e+03, 1.053880274061836e+03, 1.054263483999163e+03,
- 1.054645909740618e+03, 1.055027554822434e+03, 1.055408422756474e+03, 1.055788517030464e+03, 1.056167841108207e+03,
- 1.056546398429811e+03, 1.056924192411903e+03, 1.057301226447847e+03, 1.057677503907952e+03, 1.058053028139689e+03,
- 1.058427802467892e+03, 1.058801830194972e+03, 1.059175114601110e+03, 1.059547658944468e+03, 1.059919466461379e+03
- },
- {
- 1.585873068231488e+00, 4.826166325931508e+00, 8.112133828718001e+00, 1.144528199455066e+01, 1.482719568282809e+01,
- 1.825954344170419e+01, 2.174408318040999e+01, 2.528266831138267e+01, 2.887725440332230e+01, 3.252990639832674e+01,
- 3.624280644813273e+01, 4.001826243185709e+01, 4.385871722449863e+01, 4.776675879330496e+01, 5.174513120788263e+01,
- 5.579674665973099e+01, 5.992469859781526e+01, 6.413227609896320e+01, 6.842297960537149e+01, 7.280053817642202e+01,
- 7.726892841838566e+01, 8.183239527343379e+01, 8.649547486860236e+01, 9.126301964575174e+01, 9.614022601473295e+01,
- 1.011326647932196e+02, 1.062463147168743e+02, 1.114875993209507e+02, 1.168634275064686e+02, 1.223812381066009e+02,
- 1.280490487567517e+02, 1.338755093349419e+02, 1.398699601673023e+02, 1.460424950816875e+02, 1.524040290913953e+02,
- 1.589663704300108e+02, 1.657422957704322e+02, 1.727456270764694e+02, 1.799913072876839e+02, 1.874954704853266e+02,
- 1.952754999389171e+02, 2.033500642023814e+02, 2.117391169115261e+02, 2.204638397127106e+02, 2.295464994073669e+02,
- 2.390101796398701e+02, 2.488783344545901e+02, 2.591740970418774e+02, 2.699192652906362e+02, 2.811328829759593e+02,
- 2.928293521831914e+02, 3.050160620098205e+02, 3.176906102514318e+02, 3.308378239753402e+02, 3.444269243622708e+02,
- 3.584092872783355e+02, 3.727172885405643e+02, 3.872646877466017e+02, 4.019489105748098e+02, 4.166554195562534e+02,
- 4.312640534811179e+02, 4.456567387693307e+02, 4.597254642720150e+02, 4.733792296687823e+02, 4.865489549156937e+02,
- 4.991878239715429e+02, 5.112701083300512e+02, 5.227879776745544e+02, 5.337473670458685e+02, 5.441639832052455e+02,
- 5.540599570061719e+02, 5.634612803202839e+02, 5.723959520680296e+02, 5.808926790852408e+02, 5.889799796808975e+02,
- 5.966855722454345e+02, 6.040359673157188e+02, 6.110562096901725e+02, 6.177697335341819e+02, 6.241983032464773e+02,
- 6.303620182086363e+02, 6.362793632456613e+02, 6.419672897480521e+02, 6.474413153468277e+02, 6.527156327995519e+02,
- 6.578032212291254e+02, 6.627159549642148e+02, 6.674647069223965e+02, 6.720594447740692e+02, 6.765093190203833e+02,
- 6.808227428922066e+02, 6.850074641801341e+02, 6.890706295750427e+02, 6.930188420962133e+02, 6.968582122786751e+02,
- 7.005944037823592e+02, 7.042326740517620e+02, 7.077779106043198e+02, 7.112346634680092e+02, 7.146071742301103e+02,
- 7.178994021031320e+02, 7.211150473624944e+02, 7.242575724646164e+02, 7.273302211135829e+02, 7.303360355094139e+02,
- 7.332778719806067e+02, 7.361584151775263e+02, 7.389801909808917e+02, 7.417455782603918e+02, 7.444568196020723e+02,
- 7.471160311089402e+02, 7.497252113670819e+02, 7.522862496590251e+02, 7.548009334969254e+02, 7.572709555401989e+02,
- 7.596979199552466e+02, 7.620833482688245e+02, 7.644286847612259e+02, 7.667353014407242e+02, 7.690045026275411e+02,
- 7.712375292357547e+02, 7.734355626435793e+02, 7.755997283693413e+02, 7.777310994324412e+02, 7.798306994809737e+02,
- 7.818995054931621e+02, 7.839384513160676e+02, 7.859484288734349e+02, 7.879302914058442e+02, 7.898848554150060e+02,
- 7.918129027042207e+02, 7.937151822839564e+02, 7.955924121296241e+02, 7.974452808360944e+02, 7.992744484988381e+02,
- 8.010805503710908e+02, 8.028641954349927e+02, 8.046259692789611e+02, 8.063664349426251e+02, 8.080861340403791e+02,
- 8.097855878171717e+02, 8.114652981412712e+02, 8.131257484383887e+02, 8.147674045712154e+02, 8.163907156680596e+02,
- 8.179961149040481e+02, 8.195840202380439e+02, 8.211548351082106e+02, 8.227089490983512e+02, 8.242467385199611e+02,
- 8.257685670590861e+02, 8.272747862904322e+02, 8.287657362136754e+02, 8.302417457513060e+02, 8.317031332203785e+02,
- 8.331502067797708e+02, 8.345832648544475e+02, 8.360025965380985e+02, 8.374084819754527e+02, 8.388011927254629e+02,
- 8.401809921064950e+02, 8.415481355245438e+02, 8.429028707854796e+02, 8.442454383922195e+02, 8.455760718276802e+02,
- 8.468949978243168e+02, 8.482024366209848e+02, 8.494986022078325e+02, 8.507837025598729e+02, 8.520579398598547e+02,
- 8.533215107110034e+02, 8.545746063401795e+02, 8.558174127919502e+02, 8.570501111140684e+02, 8.582728775347919e+02,
- 8.594858836324703e+02, 8.606892964978001e+02, 8.618832788891125e+02, 8.630679893810558e+02, 8.642435825069947e+02,
- 8.654102088954445e+02, 8.665680154008318e+02, 8.677171452288616e+02, 8.688577380567499e+02, 8.699899301485759e+02,
- 8.711138544659794e+02, 8.722296407744301e+02, 8.733374154149435e+02, 8.744373026973502e+02, 8.755294230892841e+02,
- 8.766138945526802e+02, 8.776908323251441e+02, 8.787603490036632e+02, 8.798225546251406e+02, 8.808775567438817e+02,
- 8.819254605061877e+02, 8.829663687221710e+02, 8.840003819349174e+02, 8.850275984871147e+02, 8.860481145852548e+02,
- 8.870620243615141e+02, 8.880694199334115e+02, 8.890703914613387e+02, 8.900650272040530e+02, 8.910534135722213e+02,
- 8.920356351800859e+02, 8.930117748953436e+02, 8.939819138873046e+02, 8.949461316733970e+02, 8.959045061640961e+02,
- 8.968571137063308e+02, 8.978040291254348e+02, 8.987453257656969e+02, 8.996810755295687e+02, 9.006113489155796e+02,
- 9.015362150550155e+02, 9.024557417473999e+02, 9.033699954948306e+02, 9.042790415352172e+02, 9.051829438744538e+02,
- 9.060817653175764e+02, 9.069755674989349e+02, 9.078644109114232e+02, 9.087483549347961e+02, 9.096274578631183e+02,
- 9.105017769313590e+02, 9.113713683411833e+02, 9.122362872859552e+02, 9.130965883219017e+02, 9.139523240203532e+02,
- 9.148035470234587e+02, 9.156503087267365e+02, 9.164926592159439e+02, 9.173306489321324e+02, 9.181643262528817e+02,
- 9.189937391201686e+02, 9.198189346617772e+02, 9.206399592098536e+02, 9.214568583189335e+02, 9.222696767834553e+02,
- 9.230784586547817e+02, 9.238832472577453e+02, 9.246840852067364e+02, 9.254810144213395e+02, 9.262740761415424e+02,
- 9.270633109425326e+02, 9.278487587490845e+02, 9.286304588495606e+02, 9.294084499095361e+02, 9.301827699850552e+02,
- 9.309534565355403e+02, 9.317205464363522e+02, 9.324840759910228e+02, 9.332440809431691e+02, 9.340005964880943e+02,
- 9.347536572840834e+02, 9.355032974634177e+02, 9.362495506430970e+02, 9.369924499352944e+02, 9.377320279575400e+02,
- 9.384683168426534e+02, 9.392013482484199e+02, 9.399311533670309e+02, 9.406577629342841e+02, 9.413812072385592e+02,
- 9.421015161295703e+02, 9.428187190269082e+02, 9.435328449283656e+02, 9.442439224180698e+02, 9.449519796744125e+02,
- 9.456570444777926e+02, 9.463591442181720e+02, 9.470583059024500e+02, 9.477545561616693e+02, 9.484479212580435e+02,
- 9.491384270918275e+02, 9.498260992080213e+02, 9.505109628029236e+02, 9.511930427305288e+02, 9.518723635087809e+02,
- 9.525489493256819e+02, 9.532228240452591e+02, 9.538940112134043e+02, 9.545625340635703e+02, 9.552284155223493e+02,
- 9.558916782149213e+02, 9.565523444703801e+02, 9.572104363269459e+02, 9.578659755370572e+02, 9.585189835723585e+02,
- 9.591694816285664e+02, 9.598174906302463e+02, 9.604630312354690e+02, 9.611061238403801e+02, 9.617467885836606e+02,
- 9.623850453509020e+02, 9.630209137788795e+02, 9.636544132597390e+02, 9.642855629450963e+02, 9.649143817500475e+02,
- 9.655408883570975e+02, 9.661651012200045e+02, 9.667870385675493e+02, 9.674067184072195e+02, 9.680241585288228e+02,
- 9.686393765080280e+02, 9.692523897098296e+02, 9.698632152919415e+02, 9.704718702081259e+02, 9.710783712114538e+02,
- 9.716827348574984e+02, 9.722849775074659e+02, 9.728851153312639e+02, 9.734831643105097e+02, 9.740791402414778e+02,
- 9.746730587379902e+02, 9.752649352342507e+02, 9.758547849876220e+02, 9.764426230813524e+02, 9.770284644272441e+02,
- 9.776123237682781e+02, 9.781942156811797e+02, 9.787741545789418e+02, 9.793521547132976e+02, 9.799282301771476e+02,
- 9.805023949069348e+02, 9.810746626849885e+02, 9.816450471418077e+02, 9.822135617583147e+02, 9.827802198680608e+02,
- 9.833450346593914e+02, 9.839080191775752e+02, 9.844691863268873e+02, 9.850285488726604e+02, 9.855861194432964e+02,
- 9.861419105322392e+02, 9.866959344999162e+02, 9.872482035756417e+02, 9.877987298594842e+02, 9.883475253241079e+02,
- 9.888946018165719e+02, 9.894399710601026e+02, 9.899836446558369e+02, 9.905256340845268e+02, 9.910659507082232e+02,
- 9.916046057719217e+02, 9.921416104051906e+02, 9.926769756237541e+02, 9.932107123310668e+02, 9.937428313198470e+02,
- 9.942733432735895e+02, 9.948022587680525e+02, 9.953295882727175e+02, 9.958553421522251e+02, 9.963795306677863e+02,
- 9.969021639785701e+02, 9.974232521430674e+02, 9.979428051204327e+02, 9.984608327718030e+02, 9.989773448615925e+02,
- 9.994923510587716e+02, 1.000005860938118e+03, 1.000517883981451e+03, 1.001028429578844e+03, 1.001537507029821e+03,
- 1.002045125544525e+03, 1.002551294244877e+03, 1.003056022165711e+03, 1.003559318255890e+03, 1.004061191379408e+03,
- 1.004561650316468e+03, 1.005060703764553e+03, 1.005558360339465e+03, 1.006054628576366e+03, 1.006549516930783e+03,
- 1.007043033779613e+03, 1.007535187422103e+03, 1.008025986080817e+03, 1.008515437902593e+03, 1.009003550959472e+03,
- 1.009490333249631e+03, 1.009975792698280e+03, 1.010459937158568e+03, 1.010942774412457e+03, 1.011424312171589e+03,
- 1.011904558078144e+03, 1.012383519705678e+03, 1.012861204559950e+03, 1.013337620079743e+03, 1.013812773637660e+03,
- 1.014286672540922e+03, 1.014759324032142e+03, 1.015230735290096e+03, 1.015700913430479e+03, 1.016169865506645e+03,
- 1.016637598510351e+03, 1.017104119372469e+03, 1.017569434963706e+03, 1.018033552095302e+03, 1.018496477519723e+03,
- 1.018958217931343e+03, 1.019418779967116e+03, 1.019878170207236e+03, 1.020336395175789e+03, 1.020793461341400e+03,
- 1.021249375117861e+03, 1.021704142864761e+03, 1.022157770888097e+03, 1.022610265440882e+03, 1.023061632723747e+03,
- 1.023511878885525e+03, 1.023961010023837e+03, 1.024409032185661e+03, 1.024855951367902e+03, 1.025301773517944e+03,
- 1.025746504534205e+03, 1.026190150266672e+03, 1.026632716517444e+03, 1.027074209041248e+03, 1.027514633545971e+03,
- 1.027953995693160e+03, 1.028392301098538e+03, 1.028829555332494e+03, 1.029265763920581e+03, 1.029700932343997e+03,
- 1.030135066040067e+03, 1.030568170402709e+03, 1.031000250782905e+03, 1.031431312489160e+03, 1.031861360787951e+03,
- 1.032290400904178e+03, 1.032718438021602e+03, 1.033145477283284e+03, 1.033571523792011e+03, 1.033996582610720e+03,
- 1.034420658762919e+03, 1.034843757233095e+03, 1.035265882967127e+03, 1.035687040872682e+03, 1.036107235819614e+03,
- 1.036526472640358e+03, 1.036944756130312e+03, 1.037362091048220e+03, 1.037778482116551e+03, 1.038193934021866e+03,
- 1.038608451415190e+03, 1.039022038912366e+03, 1.039434701094423e+03, 1.039846442507919e+03, 1.040257267665298e+03,
- 1.040667181045227e+03, 1.041076187092938e+03, 1.041484290220567e+03, 1.041891494807478e+03, 1.042297805200597e+03,
- 1.042703225714729e+03, 1.043107760632882e+03, 1.043511414206576e+03, 1.043914190656161e+03, 1.044316094171119e+03,
- 1.044717128910366e+03, 1.045117299002560e+03, 1.045516608546385e+03, 1.045915061610853e+03, 1.046312662235587e+03,
- 1.046709414431109e+03, 1.047105322179121e+03, 1.047500389432781e+03, 1.047894620116982e+03, 1.048288018128622e+03,
- 1.048680587336867e+03, 1.049072331583425e+03, 1.049463254682803e+03, 1.049853360422563e+03, 1.050242652563586e+03,
- 1.050631134840314e+03, 1.051018810961009e+03, 1.051405684607994e+03, 1.051791759437897e+03, 1.052177039081896e+03,
- 1.052561527145951e+03, 1.052945227211047e+03, 1.053328142833416e+03, 1.053710277544777e+03, 1.054091634852556e+03,
- 1.054472218240116e+03, 1.054852031166972e+03, 1.055231077069018e+03, 1.055609359358738e+03, 1.055986881425421e+03,
- 1.056363646635374e+03, 1.056739658332135e+03, 1.057114919836671e+03, 1.057489434447592e+03, 1.057863205441345e+03
- },
- {
- 1.581000821479917e+00, 4.810992263601546e+00, 8.086024596559421e+00, 1.140756217710293e+01, 1.477714441838621e+01,
- 1.819639071051962e+01, 2.166700572957365e+01, 2.519078517525448e+01, 2.876962197301482e+01, 3.240551298773669e+01,
- 3.610056629706752e+01, 3.985700907885531e+01, 4.367719617281303e+01, 4.756361938301642e+01, 5.151891759502129e+01,
- 5.554588778933703e+01, 5.964749704177430e+01, 6.382689561084676e+01, 6.808743122299008e+01, 7.243266467788224e+01,
- 7.686638690858175e+01, 8.139263764446902e+01, 8.601572583890731e+01, 9.074025203783886e+01, 9.557113287971123e+01,
- 1.005136279304293e+02, 1.055733690682987e+02, 1.107563926414685e+02, 1.160691746216858e+02, 1.215186689696726e+02,
- 1.271123494037191e+02, 1.328582547175239e+02, 1.387650377137521e+02, 1.448420177069519e+02, 1.510992362686069e+02,
- 1.575475158300260e+02, 1.641985199575736e+02, 1.710648138434512e+02, 1.781599224252111e+02, 1.854983823799571e+02,
- 1.930957823805788e+02, 2.009687835217763e+02, 2.091351083728706e+02, 2.176134824742882e+02, 2.264235059906965e+02,
- 2.355854255055109e+02, 2.451197667307324e+02, 2.550467790352298e+02, 2.653856342643371e+02, 2.761533194720495e+02,
- 2.873631726410351e+02, 2.990230409733297e+02, 3.111331006595992e+02, 3.236834657961090e+02, 3.366518191093845e+02,
- 3.500013903006239e+02, 3.636796571748592e+02, 3.776181324146866e+02, 3.917335290503847e+02, 4.059304801819174e+02,
- 4.201058128058540e+02, 4.341541169333485e+02, 4.479740253374037e+02, 4.614743318991674e+02, 4.745790621435439e+02,
- 4.872307421768918e+02, 4.993905508257234e+02, 5.110371906759174e+02, 5.221642004213568e+02, 5.327766361899859e+02,
- 5.428878618868995e+02, 5.525168275122586e+02, 5.616859514330589e+02, 5.704195613831050e+02, 5.787427827727374e+02,
- 5.866807579027885e+02, 5.942581020424443e+02, 6.014985297716995e+02, 6.084246069715061e+02, 6.150575984185377e+02,
- 6.214173891893815e+02, 6.275224627365550e+02, 6.333899213067476e+02, 6.390355365443758e+02, 6.444738201364914e+02,
- 6.497181063194364e+02, 6.547806399335699e+02, 6.596726653488960e+02, 6.644045131059507e+02, 6.689856820836631e+02,
- 6.734249160597893e+02, 6.777302740637646e+02, 6.819091944057186e+02, 6.859685525545930e+02, 6.899147132178281e+02,
- 6.937535770716852e+02, 6.974906226307382e+02, 7.011309437469179e+02, 7.046792832072583e+02, 7.081400628652982e+02,
- 7.115174107009148e+02, 7.148151851616441e+02, 7.180369970981462e+02, 7.211862295688348e+02, 7.242660557546671e+02,
- 7.272794551947916e+02, 7.302292285272356e+02, 7.331180108956572e+02, 7.359482841632068e+02, 7.387223880572396e+02,
- 7.414425303537352e+02, 7.441107961974043e+02, 7.467291566423526e+02, 7.492994764885623e+02, 7.518235214810563e+02,
- 7.543029649313579e+02, 7.567393938144828e+02, 7.591343143891089e+02, 7.614891573756494e+02, 7.638052827796960e+02,
- 7.660839842704372e+02, 7.683264933151277e+02, 7.705339829677698e+02, 7.727075713905623e+02, 7.748483249144481e+02,
- 7.769572619337717e+02, 7.790353543945229e+02, 7.810835313442641e+02, 7.831026811376678e+02, 7.850936537174855e+02,
- 7.870572627540326e+02, 7.889942876264469e+02, 7.909054752687729e+02, 7.927915419039736e+02, 7.946531738958749e+02,
- 7.964910318554155e+02, 7.983057487478418e+02, 8.000979331541810e+02, 8.018681700981900e+02, 8.036170222230385e+02,
- 8.053450308970239e+02, 8.070527172532777e+02, 8.087405831680524e+02, 8.104091121817935e+02, 8.120587703669033e+02,
- 8.136900071457708e+02, 8.153032560623938e+02, 8.168989355200183e+02, 8.184774494303799e+02, 8.200391879231680e+02,
- 8.215845279194566e+02, 8.231138337235629e+02, 8.246274575731894e+02, 8.261257401604064e+02, 8.276090111252893e+02,
- 8.290775895238655e+02, 8.305317842719502e+02, 8.319718945663178e+02, 8.333982102845573e+02, 8.348110123648830e+02,
- 8.362105731670675e+02, 8.375971568155913e+02, 8.389710195260516e+02, 8.403324099157642e+02, 8.416815692994733e+02,
- 8.430187319709946e+02, 8.443441254715800e+02, 8.456579708457341e+02, 8.469604828851793e+02, 8.482518703615970e+02,
- 8.495323362487716e+02, 8.508020779346825e+02, 8.520612874240946e+02, 8.533101515321359e+02, 8.545488520693361e+02,
- 8.557775660185797e+02, 8.569964657043594e+02, 8.582057189547645e+02, 8.594054892565333e+02, 8.605959359035422e+02,
- 8.617772141390466e+02, 8.629494752919918e+02, 8.641128669076732e+02, 8.652675328730347e+02, 8.664136135368549e+02,
- 8.675512458250689e+02, 8.686805633514597e+02, 8.698016962036387e+02, 8.709147723009521e+02, 8.720199156454033e+02,
- 8.731172476238291e+02, 8.742068868021717e+02, 8.752889490125856e+02, 8.763635474372330e+02, 8.774307926888981e+02,
- 8.784907928885717e+02, 8.795436537401438e+02, 8.805894786023218e+02, 8.816283685579019e+02, 8.826604224805116e+02,
- 8.836857370989234e+02, 8.847044070590580e+02, 8.857165249837589e+02, 8.867221815304456e+02, 8.877214654467315e+02,
- 8.887144636240868e+02, 8.897012611496343e+02, 8.906819413561526e+02, 8.916565858703576e+02, 8.926252746595336e+02,
- 8.935880860765893e+02, 8.945450969035859e+02, 8.954963823938111e+02, 8.964420163124552e+02, 8.973820709759397e+02,
- 8.983166172899510e+02, 8.992457247862399e+02, 9.001694616582220e+02, 9.010878947954305e+02, 9.020010898168684e+02,
- 9.029091111032973e+02, 9.038120218285043e+02, 9.047098839895876e+02, 9.056027584362952e+02, 9.064907048994507e+02,
- 9.073737820185042e+02, 9.082520473682373e+02, 9.091255574846519e+02, 9.099943678900783e+02, 9.108585331175225e+02,
- 9.117181067342852e+02, 9.125731417551854e+02, 9.134236887132322e+02, 9.142697995844187e+02, 9.151115239053869e+02,
- 9.159489107454517e+02, 9.167820083360106e+02, 9.176108640897340e+02, 9.184355246191994e+02, 9.192560357550008e+02,
- 9.200724425633446e+02, 9.208847893631529e+02, 9.216931197426849e+02, 9.224974765756984e+02, 9.232979020371695e+02,
- 9.240944376185677e+02, 9.248871241427271e+02, 9.256760017783047e+02, 9.264611100538517e+02, 9.272424878715024e+02,
- 9.280201735203033e+02, 9.287942046891803e+02, 9.295646184795693e+02, 9.303314514177075e+02, 9.310947394666106e+02,
- 9.318545180377309e+02, 9.326108220023189e+02, 9.333636857024884e+02, 9.341131429619992e+02, 9.348592270967645e+02,
- 9.356019709250927e+02, 9.363414067776695e+02, 9.370775665072897e+02, 9.378104814983441e+02, 9.385401826760736e+02,
- 9.392667005155945e+02, 9.399900650506968e+02, 9.407103058824308e+02, 9.414274521874852e+02, 9.421415327263610e+02,
- 9.428525758513455e+02, 9.435606095142984e+02, 9.442656612742516e+02, 9.449677583048259e+02, 9.456669274014733e+02,
- 9.463631949885507e+02, 9.470565871262235e+02, 9.477471295172141e+02, 9.484348475133872e+02, 9.491197661221871e+02,
- 9.498019100129270e+02, 9.504813035229329e+02, 9.511579706635465e+02, 9.518319351259960e+02, 9.525032202871281e+02,
- 9.531718492150204e+02, 9.538378446744557e+02, 9.545012291322882e+02, 9.551620247626804e+02, 9.558202534522284e+02,
- 9.564759368049750e+02, 9.571290961473142e+02, 9.577797525327833e+02, 9.584279267467602e+02, 9.590736393110498e+02,
- 9.597169104883800e+02, 9.603577602867954e+02, 9.609962084639627e+02, 9.616322745313797e+02, 9.622659777584995e+02,
- 9.628973371767673e+02, 9.635263715835697e+02, 9.641530995461062e+02, 9.647775394051782e+02, 9.653997092788969e+02,
- 9.660196270663209e+02, 9.666373104510169e+02, 9.672527769045431e+02, 9.678660436898696e+02, 9.684771278647240e+02,
- 9.690860462848723e+02, 9.696928156073329e+02, 9.702974522935272e+02, 9.708999726123646e+02, 9.715003926432742e+02,
- 9.720987282791641e+02, 9.726949952293363e+02, 9.732892090223339e+02, 9.738813850087392e+02, 9.744715383639133e+02,
- 9.750596840906858e+02, 9.756458370219913e+02, 9.762300118234554e+02, 9.768122229959321e+02, 9.773924848779902e+02,
- 9.779708116483583e+02, 9.785472173283148e+02, 9.791217157840430e+02, 9.796943207289346e+02, 9.802650457258513e+02,
- 9.808339041893521e+02, 9.814009093878636e+02, 9.819660744458275e+02, 9.825294123457975e+02, 9.830909359305020e+02,
- 9.836506579048668e+02, 9.842085908380041e+02, 9.847647471651641e+02, 9.853191391896498e+02, 9.858717790847006e+02,
- 9.864226788953387e+02, 9.869718505401838e+02, 9.875193058132389e+02, 9.880650563856390e+02, 9.886091138073725e+02,
- 9.891514895089703e+02, 9.896921948031678e+02, 9.902312408865358e+02, 9.907686388410841e+02, 9.913043996358358e+02,
- 9.918385341283762e+02, 9.923710530663753e+02, 9.929019670890817e+02, 9.934312867287935e+02, 9.939590224123025e+02,
- 9.944851844623161e+02, 9.950097830988522e+02, 9.955328284406127e+02, 9.960543305063329e+02, 9.965742992161103e+02,
- 9.970927443927065e+02, 9.976096757628349e+02, 9.981251029584195e+02, 9.986390355178380e+02, 9.991514828871417e+02,
- 9.996624544212577e+02, 1.000171959385170e+03, 1.000680006955079e+03, 1.001186606219550e+03, 1.001691766180634e+03,
- 1.002195495754973e+03, 1.002697803774895e+03, 1.003198698989479e+03, 1.003698190065613e+03, 1.004196285589030e+03,
- 1.004692994065332e+03, 1.005188323920989e+03, 1.005682283504335e+03, 1.006174881086539e+03, 1.006666124862559e+03,
- 1.007156022952095e+03, 1.007644583400509e+03, 1.008131814179744e+03, 1.008617723189222e+03, 1.009102318256733e+03,
- 1.009585607139306e+03, 1.010067597524069e+03, 1.010548297029095e+03, 1.011027713204235e+03, 1.011505853531942e+03,
- 1.011982725428075e+03, 1.012458336242698e+03, 1.012932693260865e+03, 1.013405803703390e+03, 1.013877674727610e+03,
- 1.014348313428136e+03, 1.014817726837587e+03, 1.015285921927323e+03, 1.015752905608159e+03, 1.016218684731071e+03,
- 1.016683266087895e+03, 1.017146656412010e+03, 1.017608862379017e+03, 1.018069890607400e+03, 1.018529747659191e+03,
- 1.018988440040605e+03, 1.019445974202692e+03, 1.019902356541952e+03, 1.020357593400964e+03, 1.020811691068993e+03,
- 1.021264655782593e+03, 1.021716493726199e+03, 1.022167211032713e+03, 1.022616813784083e+03, 1.023065308011869e+03,
- 1.023512699697803e+03, 1.023958994774347e+03, 1.024404199125232e+03, 1.024848318586000e+03, 1.025291358944533e+03,
- 1.025733325941577e+03, 1.026174225271253e+03, 1.026614062581573e+03, 1.027052843474936e+03, 1.027490573508624e+03,
- 1.027927258195295e+03, 1.028362903003453e+03, 1.028797513357938e+03, 1.029231094640381e+03, 1.029663652189674e+03,
- 1.030095191302425e+03, 1.030525717233405e+03, 1.030955235195994e+03, 1.031383750362620e+03, 1.031811267865188e+03,
- 1.032237792795511e+03, 1.032663330205723e+03, 1.033087885108705e+03, 1.033511462478487e+03, 1.033934067250653e+03,
- 1.034355704322743e+03, 1.034776378554647e+03, 1.035196094768990e+03, 1.035614857751518e+03, 1.036032672251481e+03,
- 1.036449542982000e+03, 1.036865474620438e+03, 1.037280471808768e+03, 1.037694539153930e+03, 1.038107681228184e+03,
- 1.038519902569466e+03, 1.038931207681730e+03, 1.039341601035290e+03, 1.039751087067161e+03, 1.040159670181387e+03,
- 1.040567354749374e+03, 1.040974145110213e+03, 1.041380045571003e+03, 1.041785060407166e+03, 1.042189193862759e+03,
- 1.042592450150784e+03, 1.042994833453496e+03, 1.043396347922701e+03, 1.043796997680053e+03, 1.044196786817351e+03,
- 1.044595719396831e+03, 1.044993799451446e+03, 1.045391030985155e+03, 1.045787417973205e+03, 1.046182964362398e+03,
- 1.046577674071378e+03, 1.046971550990888e+03, 1.047364598984044e+03, 1.047756821886597e+03, 1.048148223507194e+03,
- 1.048538807627633e+03, 1.048928578003118e+03, 1.049317538362515e+03, 1.049705692408591e+03, 1.050093043818266e+03,
- 1.050479596242854e+03, 1.050865353308304e+03, 1.051250318615431e+03, 1.051634495740155e+03, 1.052017888233734e+03,
- 1.052400499622984e+03, 1.052782333410516e+03, 1.053163393074949e+03, 1.053543682071138e+03, 1.053923203830389e+03,
- 1.054301961760673e+03, 1.054679959246843e+03, 1.055057199650840e+03, 1.055433686311908e+03, 1.055809422546791e+03
- },
- {
- 1.576158769612623e+00, 4.795916656377516e+00, 8.060092631944315e+00, 1.137011021230311e+01, 1.472746473161337e+01,
- 1.813372795547213e+01, 2.159055304894019e+01, 2.509967993542745e+01, 2.866294107738473e+01, 3.228226772056781e+01,
- 3.595969664376409e+01, 3.969737746137478e+01, 4.349758053091424e+01, 4.736270552279044e+01, 5.129529071556055e+01,
- 5.529802308624303e+01, 5.937374927224148e+01, 6.352548748901014e+01, 6.775644049576286e+01, 7.207000971026540e+01,
- 7.646981058298178e+01, 8.095968935043403e+01, 8.554374129735699e+01, 9.022633066673976e+01, 9.501211236561323e+01,
- 9.990605562169081e+01, 1.049134697505734e+02, 1.100400321935661e+02, 1.152918189799253e+02, 1.206753377513236e+02,
- 1.261975634559392e+02, 1.318659767682973e+02, 1.376886052107250e+02, 1.436740668409766e+02, 1.498316161133746e+02,
- 1.561711914694188e+02, 1.627034635063365e+02, 1.694398823446487e+02, 1.763927219034689e+02, 1.835751177681125e+02,
- 1.910010939422771e+02, 1.986855717663366e+02, 2.066443516695729e+02, 2.148940549245036e+02, 2.234520080635585e+02,
- 2.323360470089098e+02, 2.415642113738866e+02, 2.511542923817347e+02, 2.611231917818212e+02, 2.714860466670098e+02,
- 2.822550805114589e+02, 2.934381598472200e+02, 3.050370745651634e+02, 3.170456202135872e+02, 3.294476371977283e+02,
- 3.422152379823638e+02, 3.553075056029565e+02, 3.686699545124952e+02, 3.822350017031112e+02, 3.959236101599616e+02,
- 4.096481471788667e+02, 4.233163449223126e+02, 4.368360567364745e+02, 4.501202961649995e+02, 4.630918980515674e+02,
- 4.756871935356801e+02, 4.878581641259157e+02, 4.995724984667235e+02, 5.108124935044768e+02, 5.215728076534193e+02,
- 5.318577824254277e+02, 5.416788495553789e+02, 5.510523084615101e+02, 5.599975701807681e+02, 5.685358425570074e+02,
- 5.766891768002524e+02, 5.844797868651100e+02, 5.919295658819248e+02, 5.990597479395390e+02, 6.058906729852507e+02,
- 6.124416348103463e+02, 6.187307914220918e+02, 6.247751251744945e+02, 6.305904412140767e+02, 6.361913944941746e+02,
- 6.415915370789704e+02, 6.468033786765604e+02, 6.518384548385087e+02, 6.567073984537963e+02, 6.614200113399759e+02,
- 6.659853337010865e+02, 6.704117100058744e+02, 6.747068504447399e+02, 6.788778875702178e+02, 6.829314280401461e+02,
- 6.868735995923547e+02, 6.907100935098264e+02, 6.944462029072740e+02, 6.980868572013712e+02, 7.016366531308759e+02,
- 7.050998826796924e+02, 7.084805582326911e+02, 7.117824352658978e+02, 7.150090328428223e+02, 7.181636521592795e+02,
- 7.212493933513394e+02, 7.242691707556860e+02, 7.272257267888842e+02, 7.301216445918736e+02, 7.329593595683331e+02,
- 7.357411699300944e+02, 7.384692463493898e+02, 7.411456408060421e+02, 7.437722947076384e+02, 7.463510463519013e+02,
- 7.488836377929008e+02, 7.513717211579832e+02, 7.538168645136698e+02, 7.562205571994175e+02, 7.585842148388772e+02,
- 7.609091839340341e+02, 7.631967461274434e+02, 7.654481221524458e+02, 7.676644752863117e+02, 7.698469156261829e+02,
- 7.719965018927663e+02, 7.741142453108915e+02, 7.762011121017182e+02, 7.782580260325618e+02, 7.802858707998531e+02,
- 7.822854922559756e+02, 7.842577004693275e+02, 7.862032716577800e+02, 7.881229494724479e+02, 7.900174484180656e+02,
- 7.918874532656907e+02, 7.937336217853531e+02, 7.955565858678265e+02, 7.973569528334476e+02, 7.991353066612759e+02,
- 8.008922091442001e+02, 8.026282009751731e+02, 8.043438027693170e+02, 8.060395160263004e+02, 8.077158240370269e+02,
- 8.093731927383833e+02, 8.110120715287583e+02, 8.126328939908582e+02, 8.142360786693356e+02, 8.158220297091913e+02,
- 8.173911375082606e+02, 8.189437793244792e+02, 8.204803198506225e+02, 8.220011117585589e+02, 8.235064962148979e+02,
- 8.249968033697706e+02, 8.264723528203950e+02, 8.279334540509398e+02, 8.293804068500801e+02, 8.308135017075971e+02,
- 8.322330201912247e+02, 8.336392353049016e+02, 8.350324118295024e+02, 8.364128066470496e+02, 8.377806690493277e+02,
- 8.391362410318062e+02, 8.404797575736568e+02, 8.418114469046645e+02, 8.431315307597200e+02, 8.444402246216014e+02,
- 8.457377379526523e+02, 8.470242744159606e+02, 8.483000320865993e+02, 8.495652036534422e+02, 8.508199766120583e+02,
- 8.520645334491395e+02, 8.532990518189042e+02, 8.545237047118795e+02, 8.557386606164534e+02, 8.569440836735616e+02,
- 8.581401338248478e+02, 8.593269669546190e+02, 8.605047350259115e+02, 8.616735862109440e+02, 8.628336650162336e+02,
- 8.639851124026374e+02, 8.651280659005464e+02, 8.662626594096615e+02, 8.673890245238214e+02, 8.685072888406652e+02,
- 8.696175772317265e+02, 8.707200116491347e+02, 8.718147112161975e+02, 8.729017923145184e+02, 8.739813686678077e+02,
- 8.750535514225204e+02, 8.761184492254833e+02, 8.771761682986261e+02, 8.782268125109551e+02, 8.792704834478857e+02,
- 8.803072804780456e+02, 8.813373008176654e+02, 8.823606395926499e+02, 8.833773898984366e+02, 8.843876428577321e+02,
- 8.853914876762130e+02, 8.863890116962800e+02, 8.873803004489444e+02, 8.883654377039215e+02, 8.893445055180097e+02,
- 8.903175842818151e+02, 8.912847527649038e+02, 8.922460881594288e+02, 8.932016661223003e+02, 8.941515608159596e+02,
- 8.950958449478044e+02, 8.960345898083270e+02, 8.969678653080014e+02, 8.978957400129882e+02, 8.988182811796822e+02,
- 8.997355547881621e+02, 9.006476255745710e+02, 9.015545570624828e+02, 9.024564115932792e+02, 9.033532503555808e+02,
- 9.042451334137663e+02, 9.051321197356153e+02, 9.060142672190993e+02, 9.068916327183645e+02, 9.077642720689222e+02,
- 9.086322401120869e+02, 9.094955907186783e+02, 9.103543768120251e+02, 9.112086503902823e+02, 9.120584625480549e+02,
- 9.129038634976043e+02, 9.137449025890116e+02, 9.145816283301801e+02, 9.154140884060544e+02, 9.162423296973360e+02,
- 9.170663982986646e+02, 9.178863395362854e+02, 9.187021979852240e+02, 9.195140174859794e+02, 9.203218411607537e+02,
- 9.211257114292367e+02, 9.219256700239521e+02, 9.227217580051904e+02, 9.235140157755329e+02, 9.243024830939852e+02,
- 9.250871990897274e+02, 9.258682022755036e+02, 9.266455305606515e+02, 9.274192212637845e+02, 9.281893111251486e+02,
- 9.289558363186492e+02, 9.297188324635679e+02, 9.304783346359750e+02, 9.312343773798505e+02, 9.319869947179175e+02,
- 9.327362201621995e+02, 9.334820867243154e+02, 9.342246269255055e+02, 9.349638728064158e+02, 9.356998559366302e+02,
- 9.364326074239722e+02, 9.371621579235715e+02, 9.378885376467108e+02, 9.386117763694575e+02, 9.393319034410773e+02,
- 9.400489477922570e+02, 9.407629379431163e+02, 9.414739020110363e+02, 9.421818677182941e+02, 9.428868623995253e+02,
- 9.435889130089982e+02, 9.442880461277275e+02, 9.449842879704147e+02, 9.456776643922324e+02, 9.463682008954404e+02,
- 9.470559226358654e+02, 9.477408544292180e+02, 9.484230207572709e+02, 9.491024457738966e+02, 9.497791533109646e+02,
- 9.504531668841142e+02, 9.511245096983870e+02, 9.517932046537381e+02, 9.524592743504293e+02, 9.531227410942953e+02,
- 9.537836269018976e+02, 9.544419535055658e+02, 9.550977423583270e+02, 9.557510146387289e+02, 9.564017912555595e+02,
- 9.570500928524611e+02, 9.576959398124517e+02, 9.583393522623431e+02, 9.589803500770696e+02, 9.596189528839235e+02,
- 9.602551800667010e+02, 9.608890507697605e+02, 9.615205839019981e+02, 9.621497981407387e+02, 9.627767119355460e+02,
- 9.634013435119560e+02, 9.640237108751311e+02, 9.646438318134416e+02, 9.652617239019725e+02, 9.658774045059610e+02,
- 9.664908907841632e+02, 9.671021996921519e+02, 9.677113479855508e+02, 9.683183522232046e+02, 9.689232287702805e+02,
- 9.695259938013155e+02, 9.701266633031996e+02, 9.707252530781013e+02, 9.713217787463342e+02, 9.719162557491716e+02,
- 9.725086993516018e+02, 9.730991246450358e+02, 9.736875465499552e+02, 9.742739798185171e+02, 9.748584390371063e+02,
- 9.754409386288346e+02, 9.760214928560004e+02, 9.766001158224969e+02, 9.771768214761756e+02, 9.777516236111677e+02,
- 9.783245358701579e+02, 9.788955717466234e+02, 9.794647445870207e+02, 9.800320675929435e+02, 9.805975538232321e+02,
- 9.811612161960501e+02, 9.817230674909174e+02, 9.822831203507141e+02, 9.828413872836395e+02, 9.833978806651430e+02,
- 9.839526127398155e+02, 9.845055956232493e+02, 9.850568413038637e+02, 9.856063616447000e+02, 9.861541683851809e+02,
- 9.867002731428448e+02, 9.872446874150435e+02, 9.877874225806132e+02, 9.883284899015180e+02, 9.888679005244603e+02,
- 9.894056654824665e+02, 9.899417956964463e+02, 9.904763019767216e+02, 9.910091950245323e+02, 9.915404854335146e+02,
- 9.920701836911545e+02, 9.925983001802181e+02, 9.931248451801558e+02, 9.936498288684835e+02, 9.941732613221411e+02,
- 9.946951525188271e+02, 9.952155123383129e+02, 9.957343505637334e+02, 9.962516768828572e+02, 9.967675008893357e+02,
- 9.972818320839311e+02, 9.977946798757253e+02, 9.983060535833087e+02, 9.988159624359477e+02, 9.993244155747385e+02,
- 9.998314220537349e+02, 1.000336990841064e+03, 1.000841130820023e+03, 1.001343850790154e+03, 1.001845159468306e+03,
- 1.002345065489681e+03, 1.002843577408859e+03, 1.003340703700811e+03, 1.003836452761893e+03, 1.004330832910825e+03,
- 1.004823852389658e+03, 1.005315519364721e+03, 1.005805841927558e+03, 1.006294828095842e+03, 1.006782485814291e+03,
- 1.007268822955551e+03, 1.007753847321078e+03, 1.008237566642002e+03, 1.008719988579981e+03, 1.009201120728034e+03,
- 1.009680970611374e+03, 1.010159545688216e+03, 1.010636853350582e+03, 1.011112900925087e+03, 1.011587695673720e+03,
- 1.012061244794604e+03, 1.012533555422758e+03, 1.013004634630836e+03, 1.013474489429857e+03, 1.013943126769931e+03,
- 1.014410553540969e+03, 1.014876776573379e+03, 1.015341802638764e+03, 1.015805638450593e+03, 1.016268290664881e+03,
- 1.016729765880840e+03, 1.017190070641538e+03, 1.017649211434536e+03, 1.018107194692522e+03, 1.018564026793933e+03,
- 1.019019714063573e+03, 1.019474262773216e+03, 1.019927679142202e+03, 1.020379969338030e+03, 1.020831139476935e+03,
- 1.021281195624460e+03, 1.021730143796025e+03, 1.022177989957476e+03, 1.022624740025641e+03, 1.023070399868867e+03,
- 1.023514975307552e+03, 1.023958472114678e+03, 1.024400896016320e+03, 1.024842252692167e+03, 1.025282547776023e+03,
- 1.025721786856302e+03, 1.026159975476524e+03, 1.026597119135798e+03, 1.027033223289298e+03, 1.027468293348736e+03,
- 1.027902334682826e+03, 1.028335352617747e+03, 1.028767352437588e+03, 1.029198339384801e+03, 1.029628318660639e+03,
- 1.030057295425594e+03, 1.030485274799820e+03, 1.030912261863562e+03, 1.031338261657570e+03, 1.031763279183516e+03,
- 1.032187319404396e+03, 1.032610387244934e+03, 1.033032487591978e+03, 1.033453625294892e+03, 1.033873805165940e+03,
- 1.034293031980671e+03, 1.034711310478290e+03, 1.035128645362034e+03, 1.035545041299538e+03, 1.035960502923193e+03,
- 1.036375034830507e+03, 1.036788641584461e+03, 1.037201327713846e+03, 1.037613097713622e+03, 1.038023956045243e+03,
- 1.038433907137004e+03, 1.038842955384365e+03, 1.039251105150280e+03, 1.039658360765521e+03, 1.040064726528995e+03,
- 1.040470206708058e+03, 1.040874805538831e+03, 1.041278527226501e+03, 1.041681375945627e+03, 1.042083355840442e+03,
- 1.042484471025143e+03, 1.042884725584190e+03, 1.043284123572589e+03, 1.043682669016180e+03, 1.044080365911919e+03,
- 1.044477218228155e+03, 1.044873229904907e+03, 1.045268404854134e+03, 1.045662746960000e+03, 1.046056260079149e+03,
- 1.046448948040954e+03, 1.046840814647788e+03, 1.047231863675272e+03, 1.047622098872528e+03, 1.048011523962436e+03,
- 1.048400142641870e+03, 1.048787958581950e+03, 1.049174975428281e+03, 1.049561196801189e+03, 1.049946626295957e+03,
- 1.050331267483062e+03, 1.050715123908398e+03, 1.051098199093507e+03, 1.051480496535805e+03, 1.051862019708801e+03,
- 1.052242772062318e+03, 1.052622757022708e+03, 1.053001977993070e+03, 1.053380438353459e+03, 1.053758141461096e+03
- },
- {
- 1.571346628207512e+00, 4.780938504751656e+00, 8.034336004785240e+00, 1.133292298495408e+01, 1.467815202195471e+01,
- 1.807154873682211e+01, 2.151471644291932e+01, 2.500934115003089e+01, 2.855719695117989e+01, 3.216015182913897e+01,
- 3.582017391901175e+01, 3.953933826802248e+01, 4.331983413744821e+01, 4.716397289593156e+01, 5.107419655809489e+01,
- 5.505308702744671e+01, 5.910337610803370e+01, 6.322795635513025e+01, 6.742989284144389e+01, 7.171243592177883e+01,
- 7.607903508573929e+01, 8.053335399469709e+01, 8.507928680564099e+01, 8.972097589029580e+01, 9.446283106251070e+01,
- 9.930955042960311e+01, 1.042661429830365e+02, 1.093379530390032e+02, 1.145306866281021e+02, 1.198504399124584e+02,
- 1.253037296743843e+02, 1.308975258676135e+02, 1.366392861426211e+02, 1.425369921423013e+02, 1.485991872147007e+02,
- 1.548350148470039e+02, 1.612542570995767e+02, 1.678673713931658e+02, 1.746855238200707e+02, 1.817206160431119e+02,
- 1.889853017976910e+02, 1.964929873911674e+02, 2.042578086576664e+02, 2.122945740830686e+02, 2.206186605099048e+02,
- 2.292458437030329e+02, 2.381920412969867e+02, 2.474729406245533e+02, 2.571034795579598e+02, 2.670971464995504e+02,
- 2.774650688281350e+02, 2.882148712753387e+02, 2.993493110117627e+02, 3.108647372160183e+02, 3.227494776212619e+02,
- 3.349823139421919e+02, 3.475312563773099e+02, 3.603528470884648e+02, 3.733922025766612e+02, 3.865839460773752e+02,
- 3.998540933235874e+02, 4.131228478067830e+02, 4.263081385260240e+02, 4.393295995590644e+02, 4.521125690142138e+02,
- 4.645916194162013e+02, 4.767131966634489e+02, 4.884370325800800e+02, 4.997361355844736e+02, 5.105957349317188e+02,
- 5.210114105000389e+02, 5.309869203095278e+02, 5.405320953884632e+02, 5.496610171202917e+02, 5.583905561489154e+02,
- 5.667392605582032e+02, 5.747265364869448e+02, 5.823720539088271e+02, 5.896953184710962e+02, 5.967153638221075e+02,
- 6.034505353876107e+02, 6.099183408729241e+02, 6.161353564139051e+02, 6.221171752397754e+02, 6.278783905202351e+02,
- 6.334326045930749e+02, 6.387924577818018e+02, 6.439696709705931e+02, 6.489750970573391e+02, 6.538187773557165e+02,
- 6.585099999119307e+02, 6.630573574990392e+02, 6.674688037269467e+02, 6.717517062522994e+02, 6.759128964957669e+02,
- 6.799587155888379e+02, 6.838950564958494e+02, 6.877274024081046e+02, 6.914608616021449e+02, 6.951001990083972e+02,
- 6.986498647611927e+02, 7.021140200059930e+02, 7.054965602315956e+02, 7.088011363792913e+02, 7.120311739610383e+02,
- 7.151898903972020e+02, 7.182803107629029e+02, 7.213052821114667e+02, 7.242674865244519e+02, 7.271694530205358e+02,
- 7.300135684400860e+02, 7.328020874086760e+02, 7.355371414707984e+02, 7.382207474745924e+02, 7.408548152712185e+02,
- 7.434411548414946e+02, 7.459814827818387e+02, 7.484774283696920e+02, 7.509305391239559e+02, 7.533422859540973e+02,
- 7.557140679253996e+02, 7.580472166732493e+02, 7.603430002826049e+02, 7.626026279699470e+02, 7.648272522383543e+02,
- 7.670179731087158e+02, 7.691758409240225e+02, 7.713018591914253e+02, 7.733969872323916e+02, 7.754621426636136e+02,
- 7.774982036973238e+02, 7.795060112896482e+02, 7.814863711537489e+02, 7.834400549837469e+02, 7.853678044355519e+02,
- 7.872703299275562e+02, 7.891483138478802e+02, 7.910024116390489e+02, 7.928332531612479e+02, 7.946414439728143e+02,
- 7.964275665337743e+02, 7.981921813377641e+02, 7.999358279772533e+02, 8.016590261466264e+02, 8.033622765873039e+02,
- 8.050460619879235e+02, 8.067108477872923e+02, 8.083570830259242e+02, 8.099852010552521e+02, 8.115956202560034e+02,
- 8.131887447075794e+02, 8.147649648212539e+02, 8.163246579394681e+02, 8.178681889033232e+02, 8.193959105902403e+02,
- 8.209081644236055e+02, 8.224052808561038e+02, 8.238875798283156e+02, 8.253553712040602e+02, 8.268089551838511e+02,
- 8.282486226977458e+02, 8.296746557787940e+02, 8.310873279181943e+02, 8.324869044032080e+02, 8.338736426388031e+02,
- 8.352477924539521e+02, 8.366095963934225e+02, 8.379592899958820e+02, 8.392971020590510e+02, 8.406232548926160e+02,
- 8.419379645595701e+02, 8.432414411065794e+02, 8.445338887839890e+02, 8.458155062559817e+02, 8.470864868014346e+02,
- 8.483470185059304e+02, 8.495972844454049e+02, 8.508374628618293e+02, 8.520677273313610e+02, 8.532882469253163e+02,
- 8.544991863643437e+02, 8.557007061661226e+02, 8.568929627869123e+02, 8.580761087572496e+02, 8.592502928120790e+02,
- 8.604156600155859e+02, 8.615723518809846e+02, 8.627205064854977e+02, 8.638602582548764e+02, 8.649917393476125e+02,
- 8.661150778761851e+02, 8.672303992352053e+02, 8.683378258936438e+02, 8.694374774853405e+02, 8.705294708960548e+02,
- 8.716139203472311e+02, 8.726909374766055e+02, 8.737606314158080e+02, 8.748231088650859e+02, 8.758784741652805e+02,
- 8.769268293671649e+02, 8.779682742982686e+02, 8.790029066272896e+02, 8.800308219262066e+02, 8.810521137301661e+02,
- 8.820668735952688e+02, 8.830751911543173e+02, 8.840771541706229e+02, 8.850728485899517e+02, 8.860623585906727e+02,
- 8.870457666322050e+02, 8.880231535018086e+02, 8.889945983597997e+02, 8.899601787832528e+02, 8.909199708082389e+02,
- 8.918740489706754e+02, 8.928224863458246e+02, 8.937653545865029e+02, 8.947027239600518e+02, 8.956346633841118e+02,
- 8.965612404612502e+02, 8.974825215124862e+02, 8.983985716097500e+02, 8.993094546073256e+02, 9.002152331723026e+02,
- 9.011159688140874e+02, 9.020117219129955e+02, 9.029025517479714e+02, 9.037885165234559e+02, 9.046696733954416e+02,
- 9.055460784967385e+02, 9.064177869614861e+02, 9.072848529489268e+02, 9.081473296664822e+02, 9.090052693921425e+02,
- 9.098587234962038e+02, 9.107077424623687e+02, 9.115523759082382e+02, 9.123926726051562e+02, 9.132286804977530e+02,
- 9.140604467224083e+02, 9.148880176257070e+02, 9.157114387821184e+02, 9.165307550112346e+02, 9.173460103945241e+02,
- 9.181572482916258e+02, 9.189645113561903e+02, 9.197678415512860e+02, 9.205672801643932e+02, 9.213628678219800e+02,
- 9.221546445036967e+02, 9.229426495561808e+02, 9.237269217064977e+02, 9.245074990752271e+02, 9.252844191891965e+02,
- 9.260577189938896e+02, 9.268274348655245e+02, 9.275936026228193e+02, 9.283562575384544e+02, 9.291154343502417e+02,
- 9.298711672720037e+02, 9.306234900041809e+02, 9.313724357441663e+02, 9.321180371963839e+02, 9.328603265821093e+02,
- 9.335993356490507e+02, 9.343350956806898e+02, 9.350676375053901e+02, 9.357969915052872e+02, 9.365231876249554e+02,
- 9.372462553798680e+02, 9.379662238646517e+02, 9.386831217611398e+02, 9.393969773462345e+02, 9.401078184995877e+02,
- 9.408156727110835e+02, 9.415205670881614e+02, 9.422225283629583e+02, 9.429215828992843e+02, 9.436177566994355e+02,
- 9.443110754108532e+02, 9.450015643326249e+02, 9.456892484218374e+02, 9.463741522997864e+02, 9.470563002580421e+02,
- 9.477357162643807e+02, 9.484124239685779e+02, 9.490864467080772e+02, 9.497578075135294e+02, 9.504265291142075e+02,
- 9.510926339433049e+02, 9.517561441431139e+02, 9.524170815700930e+02, 9.530754677998241e+02, 9.537313241318559e+02,
- 9.543846715944524e+02, 9.550355309492302e+02, 9.556839226957028e+02, 9.563298670757216e+02, 9.569733840778295e+02,
- 9.576144934415173e+02, 9.582532146613896e+02, 9.588895669912506e+02, 9.595235694480932e+02, 9.601552408160193e+02,
- 9.607845996500627e+02, 9.614116642799456e+02, 9.620364528137553e+02, 9.626589831415405e+02, 9.632792729388394e+02,
- 9.638973396701371e+02, 9.645132005922455e+02, 9.651268727576270e+02, 9.657383730176405e+02, 9.663477180257286e+02,
- 9.669549242405410e+02, 9.675600079289939e+02, 9.681629851692719e+02, 9.687638718537698e+02, 9.693626836919733e+02,
- 9.699594362132908e+02, 9.705541447698256e+02, 9.711468245390930e+02, 9.717374905266895e+02, 9.723261575689097e+02,
- 9.729128403353094e+02, 9.734975533312258e+02, 9.740803109002452e+02, 9.746611272266274e+02, 9.752400163376815e+02,
- 9.758169921061000e+02, 9.763920682522503e+02, 9.769652583464150e+02, 9.775365758110059e+02, 9.781060339227217e+02,
- 9.786736458146769e+02, 9.792394244784864e+02, 9.798033827663123e+02, 9.803655333928784e+02, 9.809258889374404e+02,
- 9.814844618457272e+02, 9.820412644318441e+02, 9.825963088801433e+02, 9.831496072470604e+02, 9.837011714629166e+02,
- 9.842510133336943e+02, 9.847991445427749e+02, 9.853455766526511e+02, 9.858903211066041e+02, 9.864333892303584e+02,
- 9.869747922337015e+02, 9.875145412120800e+02, 9.880526471481636e+02, 9.885891209133880e+02, 9.891239732694658e+02,
- 9.896572148698750e+02, 9.901888562613228e+02, 9.907189078851786e+02, 9.912473800788923e+02, 9.917742830773802e+02,
- 9.922996270143929e+02, 9.928234219238573e+02, 9.933456777411984e+02, 9.938664043046368e+02, 9.943856113564667e+02,
- 9.949033085443153e+02, 9.954195054223723e+02, 9.959342114526110e+02, 9.964474360059800e+02, 9.969591883635823e+02,
- 9.974694777178302e+02, 9.979783131735850e+02, 9.984857037492767e+02, 9.989916583780041e+02, 9.994961859086244e+02,
- 9.999992951068139e+02, 1.000500994656123e+03, 1.001001293159004e+03, 1.001500199137840e+03, 1.001997721035931e+03,
- 1.002493867218489e+03, 1.002988645973606e+03, 1.003482065513210e+03, 1.003974133973999e+03, 1.004464859418378e+03,
- 1.004954249835357e+03, 1.005442313141459e+03, 1.005929057181598e+03, 1.006414489729948e+03, 1.006898618490805e+03,
- 1.007381451099426e+03, 1.007862995122860e+03, 1.008343258060770e+03, 1.008822247346235e+03, 1.009299970346544e+03,
- 1.009776434363985e+03, 1.010251646636603e+03, 1.010725614338970e+03, 1.011198344582927e+03, 1.011669844418323e+03,
- 1.012140120833738e+03, 1.012609180757202e+03, 1.013077031056896e+03, 1.013543678541847e+03, 1.014009129962614e+03,
- 1.014473392011962e+03, 1.014936471325524e+03, 1.015398374482460e+03, 1.015859108006095e+03, 1.016318678364567e+03,
- 1.016777091971443e+03, 1.017234355186343e+03, 1.017690474315549e+03, 1.018145455612604e+03, 1.018599305278904e+03,
- 1.019052029464286e+03, 1.019503634267598e+03, 1.019954125737271e+03, 1.020403509871878e+03, 1.020851792620683e+03,
- 1.021298979884188e+03, 1.021745077514670e+03, 1.022190091316709e+03, 1.022634027047711e+03, 1.023076890418421e+03,
- 1.023518687093433e+03, 1.023959422691691e+03, 1.024399102786978e+03, 1.024837732908413e+03, 1.025275318540922e+03,
- 1.025711865125717e+03, 1.026147378060764e+03, 1.026581862701244e+03, 1.027015324360006e+03, 1.027447768308021e+03,
- 1.027879199774822e+03, 1.028309623948940e+03, 1.028739045978341e+03, 1.029167470970846e+03, 1.029594903994556e+03,
- 1.030021350078264e+03, 1.030446814211864e+03, 1.030871301346759e+03, 1.031294816396256e+03, 1.031717364235958e+03,
- 1.032138949704158e+03, 1.032559577602218e+03, 1.032979252694950e+03, 1.033397979710986e+03, 1.033815763343152e+03,
- 1.034232608248830e+03, 1.034648519050314e+03, 1.035063500335170e+03, 1.035477556656583e+03, 1.035890692533706e+03,
- 1.036302912451996e+03, 1.036714220863561e+03, 1.037124622187482e+03, 1.037534120810150e+03, 1.037942721085584e+03,
- 1.038350427335760e+03, 1.038757243850920e+03, 1.039163174889890e+03, 1.039568224680385e+03, 1.039972397419317e+03,
- 1.040375697273097e+03, 1.040778128377927e+03, 1.041179694840102e+03, 1.041580400736295e+03, 1.041980250113845e+03,
- 1.042379246991041e+03, 1.042777395357402e+03, 1.043174699173954e+03, 1.043571162373500e+03, 1.043966788860897e+03,
- 1.044361582513313e+03, 1.044755547180500e+03, 1.045148686685048e+03, 1.045541004822646e+03, 1.045932505362332e+03,
- 1.046323192046749e+03, 1.046713068592391e+03, 1.047102138689848e+03, 1.047490406004048e+03, 1.047877874174499e+03,
- 1.048264546815522e+03, 1.048650427516489e+03, 1.049035519842051e+03, 1.049419827332370e+03, 1.049803353503339e+03,
- 1.050186101846814e+03, 1.050568075830827e+03, 1.050949278899807e+03, 1.051329714474796e+03, 1.051709385953665e+03
- },
- {
- 1.566564116482007e+00, 4.766056823452486e+00, 8.008752815123254e+00, 1.129599743257092e+01, 1.462920177256490e+01,
- 1.800984674007315e+01, 2.143948739584824e+01, 2.491975762817655e+01, 2.845237517152109e+01, 3.203914700475203e+01,
- 3.568197516043139e+01, 3.938286298074594e+01, 4.314392185873096e+01, 4.696737850688102e+01, 5.085558279895583e+01,
- 5.481101623475199e+01, 5.883630108181168e+01, 6.293421025244154e+01, 6.710767797896831e+01, 7.135981135477280e+01,
- 7.569390281319441e+01, 8.011344362069606e+01, 8.462213846445397e+01, 8.922392121741316e+01, 9.392297196530036e+01,
- 9.872373537937828e+01, 1.036309405148690e+02, 1.086496221065917e+02, 1.137851434185989e+02, 1.190432206809279e+02,
- 1.244299491105995e+02, 1.299518304610936e+02, 1.356158019685209e+02, 1.414292664553620e+02, 1.474001232176385e+02,
- 1.535367990174622e+02, 1.598482784904135e+02, 1.663441324684224e+02, 1.730345425965102e+02, 1.799303196986687e+02,
- 1.870429124886320e+02, 1.943844020172931e+02, 2.019674755974970e+02, 2.098053720263217e+02, 2.179117873088026e+02,
- 2.263007270987208e+02, 2.349862885866232e+02, 2.439823509436982e+02, 2.533021502789096e+02, 2.629577135261766e+02,
- 2.729591275860107e+02, 2.833136279545838e+02, 2.940245078836043e+02, 3.050898770314163e+02, 3.165013373168002e+02,
- 3.282426885730280e+02, 3.402888177547219e+02, 3.526049498341542e+02, 3.651464348108332e+02, 3.778592092623190e+02,
- 3.906810075960092e+02, 4.035433180091759e+02, 4.163739904847563e+02, 4.291003142526057e+02, 4.416522966320724e+02,
- 4.539658094158094e+02, 4.659852487463553e+02, 4.776654061957935e+02, 4.889723997563259e+02, 4.998836007887445e+02,
- 5.103866434022473e+02, 5.204778698218622e+02, 5.301605594666960e+02, 5.394432114228611e+02, 5.483380435449326e+02,
- 5.568597728405382e+02, 5.650246729801767e+02, 5.728498688171981e+02, 5.803528171223236e+02, 5.875509268226451e+02,
- 5.944612822266380e+02, 6.011004423134655e+02, 6.074843002412416e+02, 6.136279872669672e+02, 6.195458154101896e+02,
- 6.252512495978441e+02, 6.307569037672358e+02, 6.360745553750186e+02, 6.412151734986844e+02, 6.461889563835150e+02,
- 6.510053749752104e+02, 6.556732196574148e+02, 6.602006480480144e+02, 6.645952322707572e+02, 6.688640045946428e+02,
- 6.730135007189299e+02, 6.770498002817161e+02, 6.809785643944311e+02, 6.848050701656417e+02, 6.885342422874952e+02,
- 6.921706818286603e+02, 6.957186924185261e+02, 6.991823040271028e+02, 7.025652945500547e+02, 7.058712094034461e+02,
- 7.091033793220737e+02, 7.122649365411052e+02, 7.153588295251620e+02, 7.183878363931783e+02, 7.213545771720144e+02,
- 7.242615249975216e+02, 7.271110163686354e+02, 7.299052605482532e+02, 7.326463481871203e+02, 7.353362592875388e+02,
- 7.379768704632767e+02, 7.405699617028610e+02, 7.431172225746319e+02, 7.456202579666765e+02, 7.480805933954994e+02,
- 7.504996799209136e+02, 7.528788984864631e+02, 7.552195650318731e+02, 7.575229330364921e+02, 7.597901981204609e+02,
- 7.620225011864592e+02, 7.642209315760249e+02, 7.663865300103962e+02, 7.685202913397547e+02, 7.706231671017260e+02,
- 7.726960679029906e+02, 7.747398656508642e+02, 7.767553951426515e+02, 7.787434576727036e+02, 7.807048207551935e+02,
- 7.826402210551414e+02, 7.845503657272121e+02, 7.864359339236596e+02, 7.882975782101618e+02, 7.901359258960168e+02,
- 7.919515802846744e+02, 7.937451218500884e+02, 7.955171093439614e+02, 7.972680808385744e+02, 7.989985547184597e+02,
- 8.007090305701703e+02, 8.023999901135415e+02, 8.040718979876649e+02, 8.057252025405083e+02, 8.073603365655168e+02,
- 8.089777179980731e+02, 8.105777505743647e+02, 8.121608244550006e+02, 8.137273168155670e+02, 8.152775924061589e+02,
- 8.168120040817687e+02, 8.183308933053053e+02, 8.198345906248753e+02, 8.213234161268624e+02, 8.227976798662257e+02,
- 8.242576822753512e+02, 8.257037145527054e+02, 8.271360590324405e+02, 8.285549895360459e+02, 8.299607717070651e+02,
- 8.313536633298120e+02, 8.327339146330033e+02, 8.341017685791077e+02, 8.354574611402312e+02, 8.368012215612313e+02,
- 8.381332726107851e+02, 8.394538308210285e+02, 8.407631067163906e+02, 8.420613050321839e+02, 8.433486249234911e+02,
- 8.446252601648455e+02, 8.458913993411878e+02, 8.471472260305400e+02, 8.483929189788175e+02, 8.496286522671726e+02,
- 8.508545954722538e+02, 8.520709138197160e+02, 8.532777683313295e+02, 8.544753159659905e+02, 8.556637097549349e+02,
- 8.568430989314345e+02, 8.580136290552356e+02, 8.591754421319959e+02, 8.603286764111118e+02, 8.614734677385121e+02,
- 8.626099478340776e+02, 8.637382455893355e+02, 8.648584868716758e+02, 8.659707946182965e+02, 8.670752889265666e+02,
- 8.681720871409485e+02, 8.692613039366514e+02, 8.703430514001438e+02, 8.714174391066806e+02, 8.724845741949594e+02,
- 8.735445614390437e+02, 8.745975033176655e+02, 8.756435000810185e+02, 8.766826498151514e+02, 8.777150485040652e+02,
- 8.787407900896072e+02, 8.797599665292521e+02, 8.807726678518659e+02, 8.817789822115333e+02, 8.827789959395164e+02,
- 8.837727935944432e+02, 8.847604580107773e+02, 8.857420703456492e+02, 8.867177101241087e+02, 8.876874552828727e+02,
- 8.886513822126067e+02, 8.896095657988225e+02, 8.905620794614275e+02, 8.915089951929887e+02, 8.924503835957516e+02,
- 8.933863139174755e+02, 8.943168540861135e+02, 8.952420707433957e+02, 8.961620292773501e+02, 8.970767938538011e+02,
- 8.979864274468803e+02, 8.988909918686006e+02, 8.997905477975092e+02, 9.006851548064642e+02, 9.015748713895659e+02,
- 9.024597549882717e+02, 9.033398620167243e+02, 9.042152478863201e+02, 9.050859670295471e+02, 9.059520729231180e+02,
- 9.068136181104225e+02, 9.076706542233198e+02, 9.085232320033014e+02, 9.093714013220384e+02, 9.102152112013398e+02,
- 9.110547098325391e+02, 9.118899445952684e+02, 9.127209620760034e+02, 9.135478080854934e+02, 9.143705276762880e+02,
- 9.151891651594873e+02, 9.160037641210878e+02, 9.168143674378781e+02, 9.176210172928984e+02, 9.184237551904807e+02,
- 9.192226219708817e+02, 9.200176578245192e+02, 9.208089023058346e+02, 9.215963943467766e+02, 9.223801722699345e+02,
- 9.231602738013231e+02, 9.239367360828339e+02, 9.247095956843585e+02, 9.254788886156001e+02, 9.262446503375812e+02,
- 9.270069157738513e+02, 9.277657193214152e+02, 9.285210948613753e+02, 9.292730757693133e+02, 9.300216949254049e+02,
- 9.307669847242825e+02, 9.315089770846536e+02, 9.322477034586828e+02, 9.329831948411356e+02, 9.337154817783062e+02,
- 9.344445943767219e+02, 9.351705623116358e+02, 9.358934148353221e+02, 9.366131807851584e+02, 9.373298885915281e+02,
- 9.380435662855247e+02, 9.387542415064790e+02, 9.394619415093071e+02, 9.401666931716850e+02, 9.408685230010567e+02,
- 9.415674571414792e+02, 9.422635213803082e+02, 9.429567411547309e+02, 9.436471415581472e+02, 9.443347473464080e+02,
- 9.450195829439097e+02, 9.457016724495505e+02, 9.463810396425544e+02, 9.470577079881638e+02, 9.477317006432053e+02,
- 9.484030404615297e+02, 9.490717499993362e+02, 9.497378515203760e+02, 9.504013670010428e+02, 9.510623181353528e+02,
- 9.517207263398138e+02, 9.523766127581955e+02, 9.530299982661900e+02, 9.536809034759752e+02, 9.543293487406828e+02,
- 9.549753541587681e+02, 9.556189395782899e+02, 9.562601246010988e+02, 9.568989285869385e+02, 9.575353706574595e+02,
- 9.581694697001543e+02, 9.588012443722048e+02, 9.594307131042543e+02, 9.600578941041014e+02, 9.606828053603180e+02,
- 9.613054646457938e+02, 9.619258895212091e+02, 9.625440973384373e+02, 9.631601052438788e+02, 9.637739301817280e+02,
- 9.643855888971773e+02, 9.649950979395538e+02, 9.656024736653966e+02, 9.662077322414726e+02, 9.668108896477340e+02,
- 9.674119616802162e+02, 9.680109639538816e+02, 9.686079119054065e+02, 9.692028207959138e+02, 9.697957057136568e+02,
- 9.703865815766449e+02, 9.709754631352280e+02, 9.715623649746241e+02, 9.721473015174007e+02, 9.727302870259155e+02,
- 9.733113356046999e+02, 9.738904612028110e+02, 9.744676776161285e+02, 9.750429984896156e+02, 9.756164373195356e+02,
- 9.761880074556291e+02, 9.767577221032481e+02, 9.773255943254557e+02, 9.778916370450843e+02, 9.784558630467561e+02,
- 9.790182849788697e+02, 9.795789153555484e+02, 9.801377665585554e+02, 9.806948508391739e+02, 9.812501803200520e+02,
- 9.818037669970178e+02, 9.823556227408624e+02, 9.829057592990871e+02, 9.834541882976263e+02, 9.840009212425339e+02,
- 9.845459695216457e+02, 9.850893444062101e+02, 9.856310570524887e+02, 9.861711185033358e+02, 9.867095396897430e+02,
- 9.872463314323625e+02, 9.877815044430030e+02, 9.883150693260983e+02, 9.888470365801555e+02, 9.893774165991739e+02,
- 9.899062196740418e+02, 9.904334559939111e+02, 9.909591356475486e+02, 9.914832686246626e+02, 9.920058648172089e+02,
- 9.925269340206780e+02, 9.930464859353543e+02, 9.935645301675620e+02, 9.940810762308861e+02, 9.945961335473746e+02,
- 9.951097114487210e+02, 9.956218191774291e+02, 9.961324658879563e+02, 9.966416606478392e+02, 9.971494124388050e+02,
- 9.976557301578591e+02, 9.981606226183585e+02, 9.986640985510695e+02, 9.991661666052064e+02, 9.996668353494521e+02,
- 1.000166113272968e+03, 1.000664008786385e+03, 1.001160530222776e+03, 1.001655685838618e+03, 1.002149483814739e+03,
- 1.002641932257246e+03, 1.003133039198445e+03, 1.003622812597737e+03, 1.004111260342514e+03, 1.004598390249029e+03,
- 1.005084210063258e+03, 1.005568727461751e+03, 1.006051950052465e+03, 1.006533885375587e+03, 1.007014540904347e+03,
- 1.007493924045812e+03, 1.007972042141678e+03, 1.008448902469040e+03, 1.008924512241160e+03, 1.009398878608212e+03,
- 1.009872008658030e+03, 1.010343909416833e+03, 1.010814587849946e+03, 1.011284050862509e+03, 1.011752305300174e+03,
- 1.012219357949795e+03, 1.012685215540104e+03, 1.013149884742380e+03, 1.013613372171109e+03, 1.014075684384630e+03,
- 1.014536827885778e+03, 1.014996809122515e+03, 1.015455634488548e+03, 1.015913310323947e+03, 1.016369842915743e+03,
- 1.016825238498531e+03, 1.017279503255049e+03, 1.017732643316766e+03, 1.018184664764445e+03, 1.018635573628710e+03,
- 1.019085375890601e+03, 1.019534077482121e+03, 1.019981684286773e+03, 1.020428202140099e+03, 1.020873636830198e+03,
- 1.021317994098246e+03, 1.021761279639009e+03, 1.022203499101345e+03, 1.022644658088699e+03, 1.023084762159599e+03,
- 1.023523816828131e+03, 1.023961827564423e+03, 1.024398799795113e+03, 1.024834738903812e+03, 1.025269650231565e+03,
- 1.025703539077299e+03, 1.026136410698274e+03, 1.026568270310517e+03, 1.026999123089259e+03, 1.027428974169366e+03,
- 1.027857828645757e+03, 1.028285691573823e+03, 1.028712567969842e+03, 1.029138462811379e+03, 1.029563381037691e+03,
- 1.029987327550124e+03, 1.030410307212500e+03, 1.030832324851505e+03, 1.031253385257071e+03, 1.031673493182747e+03,
- 1.032092653346074e+03, 1.032510870428951e+03, 1.032928149077996e+03, 1.033344493904901e+03, 1.033759909486786e+03,
- 1.034174400366548e+03, 1.034587971053203e+03, 1.035000626022226e+03, 1.035412369715885e+03, 1.035823206543573e+03,
- 1.036233140882134e+03, 1.036642177076185e+03, 1.037050319438435e+03, 1.037457572250001e+03, 1.037863939760716e+03,
- 1.038269426189439e+03, 1.038674035724354e+03, 1.039077772523273e+03, 1.039480640713932e+03, 1.039882644394278e+03,
- 1.040283787632766e+03, 1.040684074468634e+03, 1.041083508912192e+03, 1.041482094945099e+03, 1.041879836520635e+03,
- 1.042276737563974e+03, 1.042672801972454e+03, 1.043068033615839e+03, 1.043462436336584e+03, 1.043856013950089e+03,
- 1.044248770244962e+03, 1.044640708983263e+03, 1.045031833900762e+03, 1.045422148707177e+03, 1.045811657086429e+03,
- 1.046200362696869e+03, 1.046588269171531e+03, 1.046975380118356e+03, 1.047361699120427e+03, 1.047747229736203e+03,
- 1.048131975499744e+03, 1.048515939920933e+03, 1.048899126485702e+03, 1.049281538656250e+03, 1.049663179871257e+03
- },
- {
- 1.561810957233375e+00, 4.751270641176868e+00, 7.983341192497834e+00, 1.125933054417882e+01, 1.458060954825086e+01,
- 1.794861577268057e+01, 2.136485756696350e+01, 2.483091842252994e+01, 2.834846164720122e+01, 3.191923538257836e+01,
- 3.554507799146121e+01, 3.922792384598178e+01, 4.296980954954424e+01, 4.677288062839563e+01, 5.063939873154352e+01,
- 5.457174938077113e+01, 5.857245031565090e+01, 6.264416048167309e+01, 6.678968971282434e+01, 7.101200916306769e+01,
- 7.531426254405302e+01, 7.969977822882890e+01, 8.417208228305989e+01, 8.873491248591205e+01, 9.339223340184640e+01,
- 9.814825256137601e+01, 1.030074378024830e+02, 1.079745358136249e+02, 1.130545919024418e+02, 1.182529709892086e+02,
- 1.235753797878410e+02, 1.290278900859712e+02, 1.346169629641287e+02, 1.403494736955960e+02, 1.462327369478846e+02,
- 1.522745316363618e+02, 1.584831247827405e+02, 1.648672930196001e+02, 1.714363403100944e+02, 1.782001096752598e+02,
- 1.851689860385064e+02, 1.923538863162924e+02, 1.997662316713203e+02, 2.074178952236431e+02, 2.153211167068360e+02,
- 2.234883731995692e+02, 2.319321925632184e+02, 2.406648935712274e+02, 2.496982344357295e+02, 2.590429502794090e+02,
- 2.687081612904598e+02, 2.787006385509844e+02, 2.890239258595759e+02, 2.996773350156075e+02, 3.106548593894779e+02,
- 3.219440838764505e+02, 3.335252026230468e+02, 3.453702802357654e+02, 3.574428980097273e+02, 3.696983079249529e+02,
- 3.820841742049134e+02, 3.945419221521130e+02, 4.070086466611563e+02, 4.194194663091729e+02, 4.317101480113269e+02,
- 4.438197766864187e+02, 4.556932135974009e+02, 4.672830896238900e+02, 4.785511091594258e+02, 4.894686759890935e+02,
- 5.000167527506121e+02, 5.101849554743437e+02, 5.199702599653609e+02, 5.293755511287104e+02, 5.384082149497190e+02,
- 5.470788975433853e+02, 5.554004838924639e+02, 5.633872970211829e+02, 5.710544895467217e+02, 5.784175894082275e+02,
- 5.854921630893806e+02, 5.922935665032819e+02, 5.988367617028654e+02, 6.051361832976725e+02, 6.112056464541051e+02,
- 6.170582848408643e+02, 6.227065165546040e+02, 6.281620307424529e+02, 6.334357912421719e+02, 6.385380532249721e+02,
- 6.434783893639000e+02, 6.482657225428908e+02, 6.529083626237184e+02, 6.574140452794596e+02, 6.617899713586738e+02,
- 6.660428456464107e+02, 6.701789142276291e+02, 6.742039999339015e+02, 6.781235355694876e+02, 6.819425947747883e+02,
- 6.856659205023396e+02, 6.892979511613878e+02, 6.928428445396677e+02, 6.963044996422270e+02, 6.996865766027717e+02,
- 7.029925148276741e+02, 7.062255495301256e+02, 7.093887268045381e+02, 7.124849173812776e+02, 7.155168291904314e+02,
- 7.184870188516351e+02, 7.213979021885891e+02, 7.242517639050677e+02, 7.270507663998048e+02, 7.297969579417463e+02,
- 7.324922801613727e+02, 7.351385749638322e+02, 7.377375909097577e+02, 7.402909891117177e+02, 7.428003486892109e+02,
- 7.452671716069234e+02, 7.476928882430676e+02, 7.500788603599908e+02, 7.524263860944590e+02, 7.547367034626224e+02,
- 7.570109938525577e+02, 7.592503852769565e+02, 7.614559554101827e+02, 7.636287344184568e+02, 7.657697075930903e+02,
- 7.678798178157620e+02, 7.699599678635884e+02, 7.720110218913437e+02, 7.740338097577412e+02, 7.760291259061755e+02,
- 7.779977329101621e+02, 7.799403627398524e+02, 7.818577183229571e+02, 7.837504750107840e+02, 7.856192819560242e+02,
- 7.874647634083848e+02, 7.892875199336880e+02, 7.910881295616540e+02, 7.928671488758694e+02, 7.946251139969852e+02,
- 7.963625415995471e+02, 7.980799297806370e+02, 7.997777589261379e+02, 8.014564925196682e+02, 8.031165779071468e+02,
- 8.047584470198004e+02, 8.063825170582214e+02, 8.079891911399054e+02, 8.095788589125119e+02, 8.111518971349642e+02,
- 8.127086702283306e+02, 8.142495307983016e+02, 8.157748201309761e+02, 8.172848686635214e+02, 8.187799964311907e+02,
- 8.202605134920760e+02, 8.217267203308849e+02, 8.231789082429350e+02, 8.246173596995047e+02, 8.260423486955800e+02,
- 8.274541410809942e+02, 8.288529948758718e+02, 8.302391605712540e+02, 8.316128814157046e+02, 8.329743936886640e+02,
- 8.343239269612628e+02, 8.356617043452695e+02, 8.369879427307927e+02, 8.383028530133359e+02, 8.396066403107660e+02,
- 8.408995041707070e+02, 8.421816387688572e+02, 8.434532330987004e+02, 8.447144711530358e+02, 8.459655320977448e+02,
- 8.472065904381865e+02, 8.484378161785767e+02, 8.496593749747097e+02, 8.508714282803361e+02, 8.520741334875140e+02,
- 8.532676440612200e+02, 8.544521096684942e+02, 8.556276763023810e+02, 8.567944860925804e+02, 8.579526786290141e+02,
- 8.591023892922898e+02, 8.602437505230857e+02, 8.613768916378853e+02, 8.625019389264133e+02, 8.636190157453461e+02,
- 8.647282426084473e+02, 8.658297372732981e+02, 8.669236148247752e+02, 8.680099877554118e+02, 8.690889660427813e+02,
- 8.701606572240446e+02, 8.712251664677640e+02, 8.722825966431142e+02, 8.733330483866044e+02, 8.743766201664039e+02,
- 8.754134083443855e+02, 8.764435072359754e+02, 8.774670091679043e+02, 8.784840045339395e+02, 8.794945818486956e+02,
- 8.804988277995858e+02, 8.814968272969998e+02, 8.824886635227765e+02, 8.834744179770429e+02, 8.844541705234775e+02,
- 8.854279994330692e+02, 8.863959814264241e+02, 8.873581917146822e+02, 8.883147040390955e+02, 8.892655907093177e+02,
- 8.902109226404596e+02, 8.911507693889536e+02, 8.920851991872726e+02, 8.930142789775531e+02, 8.939380744441522e+02,
- 8.948566500451867e+02, 8.957700690430937e+02, 8.966783935342397e+02, 8.975816844776203e+02, 8.984800017226866e+02,
- 8.993734040363189e+02, 9.002619491289877e+02, 9.011456936801297e+02, 9.020246933627644e+02, 9.028990028673805e+02,
- 9.037686759251153e+02, 9.046337653302517e+02, 9.054943229620671e+02, 9.063503998060366e+02, 9.072020459744310e+02,
- 9.080493107263238e+02, 9.088922424870232e+02, 9.097308888669561e+02, 9.105652966800167e+02, 9.113955119613352e+02,
- 9.122215799848839e+02, 9.130435452799314e+02, 9.138614516476977e+02, 9.146753421772305e+02, 9.154852592609075e+02,
- 9.162912446095233e+02, 9.170933392669639e+02, 9.178915836244892e+02, 9.186860174346332e+02, 9.194766798247357e+02,
- 9.202636093101133e+02, 9.210468438068881e+02, 9.218264206444752e+02, 9.226023765777530e+02, 9.233747477989077e+02,
- 9.241435699489832e+02, 9.249088781291272e+02, 9.256707069115560e+02, 9.264290903502358e+02, 9.271840619912997e+02,
- 9.279356548831979e+02, 9.286839015865997e+02, 9.294288341840439e+02, 9.301704842893547e+02, 9.309088830568232e+02,
- 9.316440611901641e+02, 9.323760489512567e+02, 9.331048761686704e+02, 9.338305722459855e+02, 9.345531661699164e+02,
- 9.352726865182373e+02, 9.359891614675212e+02, 9.367026188006956e+02, 9.374130859144185e+02, 9.381205898262842e+02,
- 9.388251571818595e+02, 9.395268142615546e+02, 9.402255869873384e+02, 9.409215009292965e+02, 9.416145813120429e+02,
- 9.423048530209791e+02, 9.429923406084172e+02, 9.436770682995624e+02, 9.443590599983590e+02, 9.450383392932092e+02,
- 9.457149294625630e+02, 9.463888534803809e+02, 9.470601340214822e+02, 9.477287934667708e+02, 9.483948539083477e+02,
- 9.490583371545124e+02, 9.497192647346579e+02, 9.503776579040566e+02, 9.510335376485434e+02, 9.516869246891034e+02,
- 9.523378394863546e+02, 9.529863022449404e+02, 9.536323329178300e+02, 9.542759512105221e+02, 9.549171765851694e+02,
- 9.555560282646089e+02, 9.561925252363130e+02, 9.568266862562597e+02, 9.574585298527176e+02, 9.580880743299601e+02,
- 9.587153377718986e+02, 9.593403380456454e+02, 9.599630928050004e+02, 9.605836194938730e+02, 9.612019353496277e+02,
- 9.618180574063725e+02, 9.624320024981713e+02, 9.630437872622015e+02, 9.636534281418425e+02, 9.642609413897094e+02,
- 9.648663430706199e+02, 9.654696490645119e+02, 9.660708750692968e+02, 9.666700366036611e+02, 9.672671490098162e+02,
- 9.678622274561883e+02, 9.684552869400649e+02, 9.690463422901838e+02, 9.696354081692803e+02, 9.702224990765772e+02,
- 9.708076293502377e+02, 9.713908131697631e+02, 9.719720645583537e+02, 9.725513973852187e+02, 9.731288253678478e+02,
- 9.737043620742403e+02, 9.742780209250910e+02, 9.748498151959377e+02, 9.754197580192680e+02, 9.759878623865930e+02,
- 9.765541411504722e+02, 9.771186070265155e+02, 9.776812725953372e+02, 9.782421503044840e+02, 9.788012524703224e+02,
- 9.793585912798953e+02, 9.799141787927448e+02, 9.804680269427042e+02, 9.810201475396558e+02, 9.815705522712616e+02,
- 9.821192527046570e+02, 9.826662602881256e+02, 9.832115863527337e+02, 9.837552421139440e+02, 9.842972386731982e+02,
- 9.848375870194743e+02, 9.853762980308148e+02, 9.859133824758312e+02, 9.864488510151830e+02, 9.869827142030263e+02,
- 9.875149824884480e+02, 9.880456662168666e+02, 9.885747756314136e+02, 9.891023208742921e+02, 9.896283119881099e+02,
- 9.901527589171960e+02, 9.906756715088881e+02, 9.911970595148051e+02, 9.917169325920956e+02, 9.922353003046654e+02,
- 9.927521721243884e+02, 9.932675574322933e+02, 9.937814655197351e+02, 9.942939055895444e+02, 9.948048867571608e+02,
- 9.953144180517476e+02, 9.958225084172856e+02, 9.963291667136539e+02, 9.968344017176923e+02, 9.973382221242440e+02,
- 9.978406365471852e+02, 9.983416535204374e+02, 9.988412814989633e+02, 9.993395288597476e+02, 9.998364039027637e+02,
- 1.000331914851921e+03, 1.000826069856005e+03, 1.001318876989594e+03, 1.001810344253971e+03, 1.002300479578013e+03,
- 1.002789290819073e+03, 1.003276785763844e+03, 1.003762972129215e+03, 1.004247857563106e+03, 1.004731449645304e+03,
- 1.005213755888269e+03, 1.005694783737940e+03, 1.006174540574529e+03, 1.006653033713296e+03, 1.007130270405315e+03,
- 1.007606257838235e+03, 1.008081003137023e+03, 1.008554513364695e+03, 1.009026795523041e+03, 1.009497856553339e+03,
- 1.009967703337054e+03, 1.010436342696534e+03, 1.010903781395687e+03, 1.011370026140656e+03, 1.011835083580480e+03,
- 1.012298960307748e+03, 1.012761662859240e+03, 1.013223197716566e+03, 1.013683571306784e+03, 1.014142790003022e+03,
- 1.014600860125083e+03, 1.015057787940047e+03, 1.015513579662854e+03, 1.015968241456896e+03, 1.016421779434584e+03,
- 1.016874199657915e+03, 1.017325508139034e+03, 1.017775710840781e+03, 1.018224813677234e+03, 1.018672822514243e+03,
- 1.019119743169963e+03, 1.019565581415369e+03, 1.020010342974772e+03, 1.020454033526326e+03, 1.020896658702527e+03,
- 1.021338224090704e+03, 1.021778735233509e+03, 1.022218197629393e+03, 1.022656616733080e+03, 1.023093997956036e+03,
- 1.023530346666926e+03, 1.023965668192073e+03, 1.024399967815899e+03, 1.024833250781376e+03, 1.025265522290456e+03,
- 1.025696787504505e+03, 1.026127051544726e+03, 1.026556319492582e+03, 1.026984596390205e+03, 1.027411887240808e+03,
- 1.027838197009089e+03, 1.028263530621625e+03, 1.028687892967268e+03, 1.029111288897532e+03, 1.029533723226977e+03,
- 1.029955200733584e+03, 1.030375726159131e+03, 1.030795304209559e+03, 1.031213939555334e+03, 1.031631636831814e+03,
- 1.032048400639594e+03, 1.032464235544858e+03, 1.032879146079728e+03, 1.033293136742604e+03, 1.033706211998499e+03,
- 1.034118376279369e+03, 1.034529633984451e+03, 1.034939989480576e+03, 1.035349447102498e+03, 1.035758011153204e+03,
- 1.036165685904231e+03, 1.036572475595972e+03, 1.036978384437982e+03, 1.037383416609279e+03, 1.037787576258640e+03,
- 1.038190867504895e+03, 1.038593294437220e+03, 1.038994861115420e+03, 1.039395571570213e+03, 1.039795429803512e+03,
- 1.040194439788697e+03, 1.040592605470893e+03, 1.040989930767235e+03, 1.041386419567140e+03, 1.041782075732563e+03,
- 1.042176903098264e+03, 1.042570905472062e+03, 1.042964086635089e+03, 1.043356450342041e+03, 1.043748000321428e+03,
- 1.044138740275815e+03, 1.044528673882071e+03, 1.044917804791599e+03, 1.045306136630582e+03, 1.045693673000213e+03,
- 1.046080417476923e+03, 1.046466373612616e+03, 1.046851544934887e+03, 1.047235934947255e+03, 1.047619547129372e+03
- }
-};
-
-typedef TabulatedCO2Properties< TabulatedDensityTraits > TabulatedDensity;
-
-struct TabulatedEnthalpyTraits {
- typedef double Scalar;
- static const char *name;
- static const int numTempSteps = 50;
- static constexpr Scalar minTemp = 2.900000000000000e+02;
- static constexpr Scalar maxTemp = 3.400000000000000e+02;
- static const int numPressSteps = 495;
- static constexpr Scalar minPress = 1.000000000000000e+05;
- static constexpr Scalar maxPress = 1.000000000000000e+08;
- static const Scalar vals[numTempSteps][numPressSteps];
-};
-
-const char *TabulatedEnthalpyTraits::name = "enthalpy";
-
-const double TabulatedEnthalpyTraits::vals[50][495] =
-{
- {
- 1.408170164632048e+04, 1.206094408005154e+04, 9.999072512842231e+03, 7.893568696047847e+03, 5.741654534329271e+03,
- 3.540252931973033e+03, 1.285940716489019e+03, -1.025108403205529e+03, -3.397193547607618e+03, -5.835172655297544e+03,
- -8.344569638992209e+03, -1.093170943112132e+04, -1.360389031381476e+04, -1.636960690529315e+04, -1.923884322708486e+04,
- -2.222346472242436e+04, -2.533775326501835e+04, -2.859915436299174e+04, -3.202934911259839e+04, -3.565584148137851e+04,
- -3.951439945650057e+04, -4.365298724826737e+04, -4.813847787068548e+04, -5.306900640130677e+04, -5.859914510016920e+04,
- -6.499940358326967e+04, -2.394171990492217e+05, -2.402571596804630e+05, -2.410293867563451e+05, -2.417444362282047e+05,
- -2.424104124259224e+05, -2.430337005425708e+05, -2.436194376744032e+05, -2.441718290563100e+05, -2.446943678697854e+05,
- -2.451899924721747e+05, -2.456612016134948e+05, -2.461101406309721e+05, -2.465386670990346e+05, -2.469484016247012e+05,
- -2.473407677010811e+05, -2.477170233674764e+05, -2.480782866434373e+05, -2.484255561689096e+05, -2.487597281088241e+05,
- -2.490816101150538e+05, -2.493919329472170e+05, -2.496913602138078e+05, -2.499804965914476e+05, -2.502598948023235e+05,
- -2.505300615710223e+05, -2.507914627369179e+05, -2.510445276634825e+05, -2.512896530587872e+05, -2.515272063001881e+05,
- -2.517575283393337e+05, -2.519809362502368e+05, -2.521977254723610e+05, -2.524081717920010e+05, -2.526125330981728e+05,
- -2.528110509434589e+05, -2.530039519355357e+05, -2.531914489811930e+05, -2.533737424014272e+05, -2.535510209334879e+05,
- -2.537234626335108e+05, -2.538912356914616e+05, -2.540544991685349e+05, -2.542134036657877e+05, -2.543680919316462e+05,
- -2.545186994149385e+05, -2.546653547692785e+05, -2.548081803138950e+05, -2.549472924553986e+05, -2.550828020744269e+05,
- -2.552148148806621e+05, -2.553434317393068e+05, -2.554687489717571e+05, -2.555908586329046e+05, -2.557098487672442e+05,
- -2.558258036457143e+05, -2.559388039850049e+05, -2.560489271508896e+05, -2.561562473469620e+05, -2.562608357900384e+05,
- -2.563627608733511e+05, -2.564620883185477e+05, -2.565588813174136e+05, -2.566532006641569e+05, -2.567451048789950e+05,
- -2.568346503237435e+05, -2.569218913100144e+05, -2.570068802005966e+05, -2.570896675045294e+05, -2.571703019663446e+05,
- -2.572488306498998e+05, -2.573252990172009e+05, -2.573997510025698e+05, -2.574722290824874e+05, -2.575427743414188e+05,
- -2.576114265338902e+05, -2.576782241430798e+05, -2.577432044361578e+05, -2.578064035165863e+05, -2.578678563735878e+05,
- -2.579275969289572e+05, -2.579856580814001e+05, -2.580420717485421e+05, -2.580968689067650e+05, -2.581500796290021e+05,
- -2.582017331206175e+05, -2.582518577534871e+05, -2.583004810983917e+05, -2.583476299558161e+05, -2.583933303852821e+05,
- -2.584376077333342e+05, -2.584804866600372e+05, -2.585219911642595e+05, -2.585621446078119e+05, -2.586009697262858e+05,
- -2.586384887010340e+05, -2.586747231031017e+05, -2.587096939461578e+05, -2.587434217646014e+05, -2.587759265324065e+05,
- -2.588072277415807e+05, -2.588373444048451e+05, -2.588662950716779e+05, -2.588940978436808e+05, -2.589207703892972e+05,
- -2.589463299579209e+05, -2.589707933934271e+05, -2.589941771471419e+05, -2.590164972902962e+05, -2.590377695259765e+05,
- -2.590580092005963e+05, -2.590772313149243e+05, -2.590954505346712e+05, -2.591126812023242e+05, -2.591289373401782e+05,
- -2.591442326701396e+05, -2.591585806156843e+05, -2.591719943123995e+05, -2.591844866163817e+05, -2.591960701123258e+05,
- -2.592067571213089e+05, -2.592165597083049e+05, -2.592254896894162e+05, -2.592335586388542e+05, -2.592407778956699e+05,
- -2.592471585702456e+05, -2.592527115505638e+05, -2.592574475082541e+05, -2.592613769044369e+05, -2.592645099953623e+05,
- -2.592668568378623e+05, -2.592684272946167e+05, -2.592692310392434e+05, -2.592692775612216e+05, -2.592685761706487e+05,
- -2.592671360028480e+05, -2.592649660228199e+05, -2.592620750295543e+05, -2.592584716602039e+05, -2.592541643941222e+05,
- -2.592491615567781e+05, -2.592434713235436e+05, -2.592371017233669e+05, -2.592300606429729e+05, -2.592223558277077e+05,
- -2.592139948888380e+05, -2.592049853041192e+05, -2.591953344216201e+05, -2.591850494627706e+05, -2.591741375253208e+05,
- -2.591626055862138e+05, -2.591504605043725e+05, -2.591377090234058e+05, -2.591243577742355e+05, -2.591104132776496e+05,
- -2.590958819467805e+05, -2.590807700895116e+05, -2.590650839108202e+05, -2.590488295150499e+05, -2.590320129081217e+05,
- -2.590146399996835e+05, -2.589967166051996e+05, -2.589782484479840e+05, -2.589592411611768e+05, -2.589397002896686e+05,
- -2.589196312919713e+05, -2.588990395420392e+05, -2.588779303310435e+05, -2.588563088690963e+05, -2.588341802869323e+05,
- -2.588115496375450e+05, -2.587884218977790e+05, -2.587648019698842e+05, -2.587406946830280e+05, -2.587161047947690e+05,
- -2.586910369924910e+05, -2.586654958948054e+05, -2.586394860529150e+05, -2.586130119519436e+05, -2.585860780122331e+05,
- -2.585586885906090e+05, -2.585308479816131e+05, -2.585025604187089e+05, -2.584738300754529e+05, -2.584446610666421e+05,
- -2.584150574494316e+05, -2.583850232244246e+05, -2.583545623367390e+05, -2.583236786770449e+05, -2.582923760825820e+05,
- -2.582606583381478e+05, -2.582285291770684e+05, -2.581959922821414e+05, -2.581630512865618e+05, -2.581297097748214e+05,
- -2.580959712835916e+05, -2.580618393025854e+05, -2.580273172753959e+05, -2.579924086003248e+05, -2.579571166311791e+05,
- -2.579214446780625e+05, -2.578853960081427e+05, -2.578489738464018e+05, -2.578121813763715e+05, -2.577750217773675e+05,
- -2.577374980807536e+05, -2.576996133849043e+05, -2.576613707145841e+05, -2.576227730565474e+05, -2.575838233601842e+05,
- -2.575445245381474e+05, -2.575048794669730e+05, -2.574648909876826e+05, -2.574245619063729e+05, -2.573838949947980e+05,
- -2.573428929909317e+05, -2.573015585995269e+05, -2.572598944926542e+05, -2.572179033102382e+05, -2.571755876605753e+05,
- -2.571329501208472e+05, -2.570899932376183e+05, -2.570467195201521e+05, -2.570031314698643e+05, -2.569592315369147e+05,
- -2.569150221502060e+05, -2.568705057103796e+05, -2.568256845902565e+05, -2.567805611352721e+05, -2.567351376639021e+05,
- -2.566894164680786e+05, -2.566433998136017e+05, -2.565970899405371e+05, -2.565504890636129e+05, -2.565035993726031e+05,
- -2.564564230327075e+05, -2.564089621849215e+05, -2.563612189464014e+05, -2.563131954108219e+05, -2.562648936487245e+05,
- -2.562163157078640e+05, -2.561674636135427e+05, -2.561183393689465e+05, -2.560689449554636e+05, -2.560192823330098e+05,
- -2.559693534403363e+05, -2.559191601953399e+05, -2.558687044953651e+05, -2.558179882174978e+05, -2.557670132188585e+05,
- -2.557157813368864e+05, -2.556642943896213e+05, -2.556125541759772e+05, -2.555605624760145e+05, -2.555083210512043e+05,
- -2.554558316446903e+05, -2.554030959815443e+05, -2.553501157690184e+05, -2.552968926967928e+05, -2.552434284372188e+05,
- -2.551897246455562e+05, -2.551357829602101e+05, -2.550816050029602e+05, -2.550271923791877e+05, -2.549725466780981e+05,
- -2.549176694729411e+05, -2.548625623212231e+05, -2.548072267649229e+05, -2.547516643306952e+05, -2.546958765300793e+05,
- -2.546398648596963e+05, -2.545836308014505e+05, -2.545271758227196e+05, -2.544705013765504e+05, -2.544136089018431e+05,
- -2.543564998235389e+05, -2.542991755527985e+05, -2.542416374871854e+05, -2.541838870108376e+05, -2.541259254946444e+05,
- -2.540677542964124e+05, -2.540093747610375e+05, -2.539507882206669e+05, -2.538919959948622e+05, -2.538329993907577e+05,
- -2.537737997032203e+05, -2.537143982150012e+05, -2.536547961968886e+05, -2.535949949078587e+05, -2.535349955952216e+05,
- -2.534747994947672e+05, -2.534144078309069e+05, -2.533538218168159e+05, -2.532930426545693e+05, -2.532320715352795e+05,
- -2.531709096392314e+05, -2.531095581360119e+05, -2.530480181846418e+05, -2.529862909337036e+05, -2.529243775214662e+05,
- -2.528622790760110e+05, -2.527999967153534e+05, -2.527375315475622e+05, -2.526748846708796e+05, -2.526120571738372e+05,
- -2.525490501353726e+05, -2.524858646249400e+05, -2.524225017026244e+05, -2.523589624192500e+05, -2.522952478164902e+05,
- -2.522313589269732e+05, -2.521672967743874e+05, -2.521030623735855e+05, -2.520386567306871e+05, -2.519740808431767e+05,
- -2.519093357000077e+05, -2.518444222816958e+05, -2.517793415604179e+05, -2.517140945001061e+05, -2.516486820565425e+05,
- -2.515831051774487e+05, -2.515173648025814e+05, -2.514514618638173e+05, -2.513853972852442e+05, -2.513191719832503e+05,
- -2.512527868666030e+05, -2.511862428365420e+05, -2.511195407868579e+05, -2.510526816039757e+05, -2.509856661670369e+05,
- -2.509184953479780e+05, -2.508511700116114e+05, -2.507836910157024e+05, -2.507160592110454e+05, -2.506482754415416e+05,
- -2.505803405442720e+05, -2.505122553495714e+05, -2.504440206811030e+05, -2.503756373559265e+05, -2.503071061845738e+05,
- -2.502384279711142e+05, -2.501696035132260e+05, -2.501006336022637e+05, -2.500315190233255e+05, -2.499622605553191e+05,
- -2.498928589710268e+05, -2.498233150371713e+05, -2.497536295144757e+05, -2.496838031577320e+05, -2.496138367158578e+05,
- -2.495437309319592e+05, -2.494734865433924e+05, -2.494031042818219e+05, -2.493325848732790e+05, -2.492619290382215e+05,
- -2.491911374915878e+05, -2.491202109428574e+05, -2.490491500961041e+05, -2.489779556500499e+05, -2.489066282981244e+05,
- -2.488351687285118e+05, -2.487635776242093e+05, -2.486918556630766e+05, -2.486200035178883e+05, -2.485480218563847e+05,
- -2.484759113413239e+05, -2.484036726305274e+05, -2.483313063769340e+05, -2.482588132286444e+05, -2.481861938289720e+05,
- -2.481134488164878e+05, -2.480405788250697e+05, -2.479675844839456e+05, -2.478944664177416e+05, -2.478212252465250e+05,
- -2.477478615858506e+05, -2.476743760468033e+05, -2.476007692360410e+05, -2.475270417558392e+05, -2.474531942041321e+05,
- -2.473792271745547e+05, -2.473051412564835e+05, -2.472309370350788e+05, -2.471566150913236e+05, -2.470821760020631e+05,
- -2.470076203400464e+05, -2.469329486739616e+05, -2.468581615684793e+05, -2.467832595842855e+05, -2.467082432781216e+05,
- -2.466331132028221e+05, -2.465578699073490e+05, -2.464825139368301e+05, -2.464070458325937e+05, -2.463314661322050e+05,
- -2.462557753694979e+05, -2.461799740746153e+05, -2.461040627740366e+05, -2.460280419906166e+05, -2.459519122436161e+05,
- -2.458756740487366e+05, -2.457993279181504e+05, -2.457228743605356e+05, -2.456463138811057e+05, -2.455696469816439e+05,
- -2.454928741605294e+05, -2.454159959127746e+05, -2.453390127300488e+05, -2.452619251007137e+05, -2.451847335098511e+05,
- -2.451074384392897e+05, -2.450300403676404e+05, -2.449525397703172e+05, -2.448749371195730e+05, -2.447972328845221e+05,
- -2.447194275311712e+05, -2.446415215224469e+05, -2.445635153182202e+05, -2.444854093753366e+05, -2.444072041476389e+05,
- -2.443289000859990e+05, -2.442504976383377e+05, -2.441719972496550e+05, -2.440933993620535e+05, -2.440147044147634e+05,
- -2.439359128441691e+05, -2.438570250838324e+05, -2.437780415645150e+05, -2.436989627142069e+05, -2.436197889581486e+05,
- -2.435405207188506e+05, -2.434611584161232e+05, -2.433817024670968e+05, -2.433021532862405e+05, -2.432225112853935e+05,
- -2.431427768737790e+05, -2.430629504580313e+05, -2.429830324422160e+05, -2.429030232278512e+05, -2.428229232139296e+05,
- -2.427427327969408e+05, -2.426624523708893e+05, -2.425820823273173e+05, -2.425016230553256e+05, -2.424210749415919e+05,
- -2.423404383703941e+05, -2.422597137236261e+05, -2.421789013808203e+05, -2.420980017191665e+05, -2.420170151135314e+05,
- -2.419359419364764e+05, -2.418547825582773e+05, -2.417735373469440e+05, -2.416922066682370e+05, -2.416107908856878e+05,
- -2.415292903606142e+05, -2.414477054521419e+05, -2.413660365172188e+05, -2.412842839106344e+05, -2.412024479850378e+05,
- -2.411205290909527e+05, -2.410385275767967e+05, -2.409564437888954e+05, -2.408742780715031e+05, -2.407920307668155e+05,
- -2.407097022149893e+05, -2.406272927541542e+05, -2.405448027204333e+05, -2.404622324479572e+05, -2.403795822688795e+05
- },
- {
- 1.494233218995250e+04, 1.293773571180264e+04, 1.089296286396707e+04, 8.805598574580494e+03, 6.672983057102992e+03,
- 4.492175670355582e+03, 2.259911618850659e+03, -2.745031208505466e+01, -2.373991362716449e+03, -4.784310899509553e+03,
- -7.263623252962212e+03, -9.817879083148458e+03, -1.245391930009710e+04, -1.517967286103220e+04, -1.800441472478818e+04,
- -2.093910788478931e+04, -2.399686549750557e+04, -2.719358886243985e+04, -3.054887036882754e+04, -3.408730923505473e+04,
- -3.784049625429069e+04, -4.185013552182096e+04, -4.617321504649690e+04, -5.089115270295276e+04, -5.612744275382369e+04,
- -6.208609784101752e+04, -6.915239613300648e+04, -2.365590649446803e+05, -2.374607154254610e+05, -2.382857779305339e+05,
- -2.390468425256966e+05, -2.397534312375853e+05, -2.404129556857311e+05, -2.410313190546707e+05, -2.416133128022934e+05,
- -2.421628881657728e+05, -2.426833478320314e+05, -2.431774848092592e+05, -2.436476852957051e+05, -2.440960063507838e+05,
- -2.445242355292891e+05, -2.449339373479842e+05, -2.453264899708707e+05, -2.457031145153198e+05, -2.460648987135226e+05,
- -2.464128162015927e+05, -2.467477423831286e+05, -2.470704675810238e+05, -2.473817080220554e+05, -2.476821150742292e+05,
- -2.479722830640323e+05, -2.482527559308247e+05, -2.485240329223629e+05, -2.487865734945200e+05, -2.490408015465332e+05,
- -2.492871090982782e+05, -2.495258594965133e+05, -2.497573902214920e+05, -2.499820153529182e+05, -2.502000277442344e+05,
- -2.504117009461304e+05, -2.506172909135693e+05, -2.508170375252423e+05, -2.510111659399077e+05, -2.511998878104138e+05,
- -2.513834023731365e+05, -2.515618974280270e+05, -2.517355502223281e+05, -2.519045282492135e+05, -2.520689899710993e+05,
- -2.522290854760761e+05, -2.523849570748243e+05, -2.525367398444413e+05, -2.526845621247966e+05, -2.528285459723595e+05,
- -2.529688075758360e+05, -2.531054576374473e+05, -2.532386017232412e+05, -2.533683405854268e+05, -2.534947704594064e+05,
- -2.536179833378733e+05, -2.537380672240833e+05, -2.538551063661982e+05, -2.539691814743830e+05, -2.540803699221774e+05,
- -2.541887459335014e+05, -2.542943807565187e+05, -2.543973428254639e+05, -2.544976979114299e+05, -2.545955092630140e+05,
- -2.546908377376386e+05, -2.547837419242924e+05, -2.548742782583548e+05, -2.549625011291171e+05, -2.550484629805613e+05,
- -2.551322144059009e+05, -2.552138042363367e+05, -2.552932796244697e+05, -2.553706861227403e+05, -2.554460677572588e+05,
- -2.555194670973475e+05, -2.555909253210951e+05, -2.556604822771976e+05, -2.557281765433356e+05, -2.557940454813244e+05,
- -2.558581252892497e+05, -2.559204510507843e+05, -2.559810567818727e+05, -2.560399754749498e+05, -2.560972391408510e+05,
- -2.561528788485567e+05, -2.562069247629115e+05, -2.562594061804317e+05, -2.563103515633299e+05, -2.563597885718537e+05,
- -2.564077440950945e+05, -2.564542442803184e+05, -2.564993145607374e+05, -2.565429796820360e+05, -2.565852637276670e+05,
- -2.566261901430032e+05, -2.566657817468157e+05, -2.567040607836498e+05, -2.567410489322100e+05, -2.567767672939173e+05,
- -2.568112364485099e+05, -2.568444764610743e+05, -2.568765068995597e+05, -2.569073468515418e+05, -2.569370149402716e+05,
- -2.569655293400457e+05, -2.569929077909335e+05, -2.570191676128949e+05, -2.570443257193163e+05, -2.570683986299957e+05,
- -2.570914024836027e+05, -2.571133530496410e+05, -2.571342657399351e+05, -2.571541556196654e+05, -2.571730374179726e+05,
- -2.571909255396738e+05, -2.572078340688293e+05, -2.572237767877604e+05, -2.572387671795664e+05, -2.572528184385392e+05,
- -2.572659434785775e+05, -2.572781549412857e+05, -2.572894652037765e+05, -2.572998863861940e+05, -2.573094303589630e+05,
- -2.573181087497803e+05, -2.573259329503608e+05, -2.573329141229424e+05, -2.573390632065671e+05, -2.573443909231426e+05,
- -2.573489077832983e+05, -2.573526240920376e+05, -2.573555499542018e+05, -2.573576952797508e+05, -2.573590697888645e+05,
- -2.573596830168778e+05, -2.573595443190520e+05, -2.573586628751918e+05, -2.573570476941100e+05, -2.573547076179521e+05,
- -2.573516513263788e+05, -2.573478873406174e+05, -2.573434240273866e+05, -2.573382696034624e+05, -2.573324321362556e+05,
- -2.573259195520999e+05, -2.573187396365213e+05, -2.573109000384023e+05, -2.573024082732305e+05, -2.572932717262538e+05,
- -2.572834976555416e+05, -2.572730931949512e+05, -2.572620653570107e+05, -2.572504210357142e+05, -2.572381670092381e+05,
- -2.572253099425770e+05, -2.572118563901040e+05, -2.571978127980584e+05, -2.571831855069613e+05, -2.571679807539654e+05,
- -2.571522046751369e+05, -2.571358633076721e+05, -2.571189625920579e+05, -2.571015083741652e+05, -2.570835064072942e+05,
- -2.570649623541534e+05, -2.570458817887935e+05, -2.570262701984846e+05, -2.570061329855462e+05, -2.569854754691249e+05,
- -2.569643028869277e+05, -2.569426203969089e+05, -2.569204330789131e+05, -2.568977459362748e+05, -2.568745638973772e+05,
- -2.568508918171689e+05, -2.568267344786474e+05, -2.568020965942967e+05, -2.567769828074961e+05, -2.567513976938872e+05,
- -2.567253457627119e+05, -2.566988314581137e+05, -2.566718591604081e+05, -2.566444331873214e+05, -2.566165577951992e+05,
- -2.565882371801845e+05, -2.565594754793710e+05, -2.565302767719215e+05, -2.565006450801657e+05, -2.564705843706714e+05,
- -2.564400985552860e+05, -2.564091914921552e+05, -2.563778669867228e+05, -2.563461287926975e+05, -2.563139806130059e+05,
- -2.562814261007190e+05, -2.562484688599577e+05, -2.562151124467780e+05, -2.561813603700387e+05, -2.561472160922421e+05,
- -2.561126830303649e+05, -2.560777645566641e+05, -2.560424639994642e+05, -2.560067846777747e+05, -2.559707297682354e+05,
- -2.559343025042793e+05, -2.558975060460636e+05, -2.558603435135097e+05, -2.558228179869922e+05, -2.557849325080163e+05,
- -2.557466900798786e+05, -2.557080936683138e+05, -2.556691462021290e+05, -2.556298505738224e+05, -2.555902096401904e+05,
- -2.555502262229224e+05, -2.555099031091817e+05, -2.554692430521734e+05, -2.554282487645750e+05, -2.553869229478706e+05,
- -2.553452682492806e+05, -2.553032872916440e+05, -2.552609826665173e+05, -2.552183569346784e+05, -2.551754126266164e+05,
- -2.551321522430170e+05, -2.550885782552328e+05, -2.550446931057485e+05, -2.550004992086331e+05, -2.549559989499871e+05,
- -2.549111946883766e+05, -2.548660887552630e+05, -2.548206834554207e+05, -2.547749810673498e+05, -2.547289838436771e+05,
- -2.546826940115546e+05, -2.546361137730438e+05, -2.545892453054991e+05, -2.545420907619381e+05, -2.544946522714096e+05,
- -2.544469319393524e+05, -2.543989318479463e+05, -2.543506540564592e+05, -2.543021006015848e+05, -2.542532734977773e+05,
- -2.542041747375751e+05, -2.541548062919251e+05, -2.541051701104950e+05, -2.540552681219823e+05, -2.540051022344179e+05,
- -2.539546743354652e+05, -2.539039862927096e+05, -2.538530399539482e+05, -2.538018371474708e+05, -2.537503796823357e+05,
- -2.536986693486432e+05, -2.536467079178015e+05, -2.535944971427894e+05, -2.535420387584142e+05, -2.534893344815650e+05,
- -2.534363860114591e+05, -2.533831950298916e+05, -2.533297632014682e+05, -2.532760921738482e+05, -2.532221835779718e+05,
- -2.531680390282895e+05, -2.531136601229864e+05, -2.530590484442009e+05, -2.530042055582422e+05, -2.529491330158044e+05,
- -2.528938323521721e+05, -2.528383050874279e+05, -2.527825527266558e+05, -2.527265767601382e+05, -2.526703786635510e+05,
- -2.526139598981569e+05, -2.525573219109945e+05, -2.525004661350638e+05, -2.524433939895077e+05, -2.523861068797949e+05,
- -2.523286061978925e+05, -2.522708933224449e+05, -2.522129696189421e+05, -2.521548364398871e+05, -2.520964951249643e+05,
- -2.520379470012007e+05, -2.519791933831277e+05, -2.519202355729379e+05, -2.518610748606412e+05, -2.518017125242156e+05,
- -2.517421498297619e+05, -2.516823880316480e+05, -2.516224283726557e+05, -2.515622720841254e+05, -2.515019203860966e+05,
- -2.514413744874460e+05, -2.513806355860268e+05, -2.513197048688010e+05, -2.512585835119731e+05, -2.511972726811228e+05,
- -2.511357735313298e+05, -2.510740872073038e+05, -2.510122148435086e+05, -2.509501575642829e+05, -2.508879164839656e+05,
- -2.508254927070108e+05, -2.507628873281072e+05, -2.507001014322956e+05, -2.506371360950792e+05, -2.505739923825378e+05,
- -2.505106713514394e+05, -2.504471740493477e+05, -2.503835015147299e+05, -2.503196547770630e+05, -2.502556348569376e+05,
- -2.501914427661605e+05, -2.501270795078569e+05, -2.500625460765692e+05, -2.499978434583556e+05, -2.499329726308878e+05,
- -2.498679345635455e+05, -2.498027302175109e+05, -2.497373605458624e+05, -2.496718264936639e+05, -2.496061289980585e+05,
- -2.495402689883538e+05, -2.494742473861120e+05, -2.494080651052360e+05, -2.493417230520539e+05, -2.492752221254018e+05,
- -2.492085632167115e+05, -2.491417472100856e+05, -2.490747749823846e+05, -2.490076474033006e+05, -2.489403653354407e+05,
- -2.488729296343995e+05, -2.488053411488403e+05, -2.487376007205656e+05, -2.486697091845953e+05, -2.486016673692370e+05,
- -2.485334760961599e+05, -2.484651361804640e+05, -2.483966484307542e+05, -2.483280136492047e+05, -2.482592326316308e+05,
- -2.481903061675557e+05, -2.481212350402760e+05, -2.480520200269283e+05, -2.479826618985541e+05, -2.479131614201628e+05,
- -2.478435193507962e+05, -2.477737364435902e+05, -2.477038134458351e+05, -2.476337510990374e+05, -2.475635501389809e+05,
- -2.474932112957827e+05, -2.474227352939545e+05, -2.473521228524582e+05, -2.472813746847637e+05, -2.472104914989044e+05,
- -2.471394739975335e+05, -2.470683228779785e+05, -2.469970388322931e+05, -2.469256225473136e+05, -2.468540747047102e+05,
- -2.467823959810367e+05, -2.467105870477877e+05, -2.466386485714416e+05, -2.465665812135165e+05, -2.464943856306170e+05,
- -2.464220624744839e+05, -2.463496123920421e+05, -2.462770360254467e+05, -2.462043340121323e+05, -2.461315069848590e+05,
- -2.460585555717559e+05, -2.459854803963693e+05, -2.459122820777062e+05, -2.458389612302777e+05, -2.457655184641432e+05,
- -2.456919543849544e+05, -2.456182695939964e+05, -2.455444646882311e+05, -2.454705402603364e+05, -2.453964968987511e+05,
- -2.453223351877104e+05, -2.452480557072926e+05, -2.451736590334505e+05, -2.450991457380574e+05, -2.450245163889431e+05,
- -2.449497715499309e+05, -2.448749117808779e+05, -2.447999376377095e+05, -2.447248496724588e+05, -2.446496484333019e+05,
- -2.445743344645929e+05, -2.444989083069009e+05, -2.444233704970448e+05, -2.443477215681282e+05, -2.442719620495720e+05,
- -2.441960924671520e+05, -2.441201133430278e+05, -2.440440251957799e+05, -2.439678285404405e+05, -2.438915238885256e+05,
- -2.438151117480691e+05, -2.437385926236522e+05, -2.436619670164361e+05, -2.435852354241907e+05, -2.435083983413293e+05,
- -2.434314562589353e+05, -2.433544096647931e+05, -2.432772590434180e+05, -2.432000048760863e+05, -2.431226476408608e+05,
- -2.430451878126234e+05, -2.429676258631020e+05, -2.428899622608977e+05, -2.428121974715118e+05, -2.427343319573763e+05,
- -2.426563661778766e+05, -2.425783005893821e+05, -2.425001356452707e+05, -2.424218717959549e+05, -2.423435094889076e+05,
- -2.422650491686902e+05, -2.421864912769725e+05, -2.421078362525640e+05, -2.420290845314334e+05, -2.419502365467373e+05,
- -2.418712927288412e+05, -2.417922535053445e+05, -2.417131193011055e+05, -2.416338905382627e+05, -2.415545676362606e+05,
- -2.414751510118690e+05, -2.413956410792095e+05, -2.413160382497744e+05, -2.412363429324533e+05, -2.411565555335504e+05,
- -2.410766764568090e+05, -2.409967061034336e+05, -2.409166448721074e+05, -2.408364931590185e+05, -2.407562513578776e+05,
- -2.406759198599387e+05, -2.405954990540201e+05, -2.405149893265249e+05, -2.404343910614602e+05, -2.403537046404587e+05,
- -2.402729304427945e+05, -2.401920688454081e+05, -2.401111202229200e+05, -2.400300849476522e+05, -2.399489633896477e+05,
- -2.398677559166889e+05, -2.397864628943133e+05, -2.397050846858356e+05, -2.396236216523629e+05, -2.395420741528143e+05,
- -2.394604425439368e+05, -2.393787271803248e+05, -2.392969284144360e+05, -2.392150465966090e+05, -2.391330820750805e+05,
- -2.390510351960015e+05, -2.389689063034540e+05, -2.388866957394684e+05, -2.388044038440383e+05, -2.387220309551382e+05
- },
- {
- 1.580396481253643e+04, 1.381531420616917e+04, 1.178739962878438e+04, 9.717904502768479e+03, 7.604281736063099e+03,
- 5.443720354462670e+03, 3.233105661384819e+03, 9.689713285342059e+02, -1.352558672428035e+03, -3.735841053391670e+03,
- -6.185800793802027e+03, -8.708040318691743e+03, -1.130897713859093e+04, -1.399601955366146e+04, -1.677779409506105e+04,
- -1.966444457398082e+04, -2.266803228525191e+04, -2.580308245821799e+04, -2.908734784964687e+04, -3.254290483730186e+04,
- -3.619777743651135e+04, -4.008843645902335e+04, -4.426382769660899e+04, -4.879225175406175e+04, -5.377402861196772e+04,
- -5.936729833096786e+04, -6.584888855417217e+04, -7.379641865925108e+04, -2.336701904521194e+05, -2.346387851249729e+05,
- -2.355206303976807e+05, -2.363307757721018e+05, -2.370804214241840e+05, -2.377781733780507e+05, -2.384308138260852e+05,
- -2.390437989953858e+05, -2.396215944139615e+05, -2.401679083696576e+05, -2.406858590780143e+05, -2.411780972506385e+05,
- -2.416468978134576e+05, -2.420942297693753e+05, -2.425218102515174e+05, -2.429311469288950e+05, -2.433235716897125e+05,
- -2.437002676968913e+05, -2.440622913407705e+05, -2.444105902159893e+05, -2.447460179668651e+05, -2.450693466416705e+05,
- -2.453812770471097e+05, -2.456824474838384e+05, -2.459734411611240e+05, -2.462547925260416e+05, -2.465269926946585e+05,
- -2.467904941356130e+05, -2.470457147276505e+05, -2.472930412900389e+05, -2.475328326668484e+05, -2.477654224318244e+05,
- -2.479911212691045e+05, -2.482102190758078e+05, -2.484229868249961e+05, -2.486296782213964e+05, -2.488305311772231e+05,
- -2.490257691313015e+05, -2.492156022312340e+05, -2.494002283955062e+05, -2.495798342700086e+05, -2.497545960914492e+05,
- -2.499246804684352e+05, -2.500902450895512e+05, -2.502514393665563e+05, -2.504084050197712e+05, -2.505612766118368e+05,
- -2.507101820352712e+05, -2.508552429585810e+05, -2.509965752351266e+05, -2.511342892784475e+05, -2.512684904073243e+05,
- -2.513992791634890e+05, -2.515267516045658e+05, -2.516509995745488e+05, -2.517721109538690e+05, -2.518901698908922e+05,
- -2.520052570164873e+05, -2.521174496431516e+05, -2.522268219500132e+05, -2.523334451549108e+05, -2.524373876746302e+05,
- -2.525387152742658e+05, -2.526374912065990e+05, -2.527337763422820e+05, -2.528276292915574e+05, -2.529191065181719e+05,
- -2.530082624460808e+05, -2.530951495594921e+05, -2.531798184967435e+05, -2.532623181384746e+05, -2.533426956905017e+05,
- -2.534209967617816e+05, -2.534972654378113e+05, -2.535715443497839e+05, -2.536438747397944e+05, -2.537142965223689e+05,
- -2.537828483425590e+05, -2.538495676308397e+05, -2.539144906550156e+05, -2.539776525693346e+05, -2.540390874609868e+05,
- -2.540988283941573e+05, -2.541569074517884e+05, -2.542133557751902e+05, -2.542682036016388e+05, -2.543214803000788e+05,
- -2.543732144050517e+05, -2.544234336490379e+05, -2.544721649931378e+05, -2.545194346561904e+05, -2.545652681425678e+05,
- -2.546096902686632e+05, -2.546527251881387e+05, -2.546943964043170e+05, -2.547347268216808e+05, -2.547737387640992e+05,
- -2.548114539508355e+05, -2.548478935617810e+05, -2.548830782431822e+05, -2.549170281259340e+05, -2.549497628430778e+05,
- -2.549813015465552e+05, -2.550116629232451e+05, -2.550408652103257e+05, -2.550689262099959e+05, -2.550958633035888e+05,
- -2.551216934651017e+05, -2.551464332741830e+05, -2.551700989285906e+05, -2.551927062561547e+05, -2.552142707262653e+05,
- -2.552348074609112e+05, -2.552543312452881e+05, -2.552728565393827e+05, -2.552903974820978e+05, -2.553069679094261e+05,
- -2.553225813575517e+05, -2.553372510731263e+05, -2.553509900216866e+05, -2.553638108957603e+05, -2.553757261226783e+05,
- -2.553867478721037e+05, -2.553968880632895e+05, -2.554061583720795e+05, -2.554145702376588e+05, -2.554221348690713e+05,
- -2.554288632515065e+05, -2.554347661523715e+05, -2.554398541271535e+05, -2.554441375250829e+05, -2.554476264946054e+05,
- -2.554503309886706e+05, -2.554522607698424e+05, -2.554534254152433e+05, -2.554538343213344e+05, -2.554534967085397e+05,
- -2.554524216257220e+05, -2.554506179545132e+05, -2.554480944144340e+05, -2.554448595631951e+05, -2.554409218063465e+05,
- -2.554362893972193e+05, -2.554309704415982e+05, -2.554249729012974e+05, -2.554183045976285e+05, -2.554109732147601e+05,
- -2.554029863029798e+05, -2.553943512818541e+05, -2.553850754432969e+05, -2.553751659545436e+05, -2.553646298610434e+05,
- -2.553534740892604e+05, -2.553417054493953e+05, -2.553293306380312e+05, -2.553163562407007e+05, -2.553027887343778e+05,
- -2.552886344899040e+05, -2.552738997743413e+05, -2.552585907532629e+05, -2.552427134929765e+05, -2.552262739626880e+05,
- -2.552092780366068e+05, -2.551917314959908e+05, -2.551736400311355e+05, -2.551550092433142e+05, -2.551358446466586e+05,
- -2.551161516699959e+05, -2.550959356586319e+05, -2.550752018760903e+05, -2.550539555058045e+05, -2.550322016527671e+05,
- -2.550099453451319e+05, -2.549871915357815e+05, -2.549639451038487e+05, -2.549402108562007e+05, -2.549159935288871e+05,
- -2.548912977885501e+05, -2.548661282337981e+05, -2.548404893965470e+05, -2.548143857433276e+05, -2.547878216765583e+05,
- -2.547608015357909e+05, -2.547333295989220e+05, -2.547054100833758e+05, -2.546770471472599e+05, -2.546482448904915e+05,
- -2.546190073558957e+05, -2.545893385302828e+05, -2.545592423454919e+05, -2.545287226794172e+05, -2.544977833570051e+05,
- -2.544664281512315e+05, -2.544346607840555e+05, -2.544024849273471e+05, -2.543699042038006e+05, -2.543369221878218e+05,
- -2.543035424063960e+05, -2.542697683399369e+05, -2.542356034231179e+05, -2.542010510783695e+05, -2.541661145874537e+05,
- -2.541307972838144e+05, -2.540951024270887e+05, -2.540590332350495e+05, -2.540225928843327e+05, -2.539857845111441e+05,
- -2.539486112119533e+05, -2.539110760441734e+05, -2.538731820268246e+05, -2.538349321411842e+05, -2.537963293243632e+05,
- -2.537573764984384e+05, -2.537180765278751e+05, -2.536784322492045e+05, -2.536384464642627e+05, -2.535981219407632e+05,
- -2.535574614128544e+05, -2.535164675816707e+05, -2.534751431158695e+05, -2.534334906521531e+05, -2.533915127957893e+05,
- -2.533492121211120e+05, -2.533065911720194e+05, -2.532636524624546e+05, -2.532203984768834e+05, -2.531768316707589e+05,
- -2.531329544709772e+05, -2.530887692763245e+05, -2.530442784579152e+05, -2.529994843596233e+05, -2.529543892985000e+05,
- -2.529089955651917e+05, -2.528633054243392e+05, -2.528173211149796e+05, -2.527710448509342e+05, -2.527244788211899e+05,
- -2.526776251902740e+05, -2.526304860986234e+05, -2.525830636629436e+05, -2.525353599765640e+05, -2.524873771097837e+05,
- -2.524391171102120e+05, -2.523905820031050e+05, -2.523417737916928e+05, -2.522926944574996e+05, -2.522433459606631e+05,
- -2.521937302402417e+05, -2.521438492145219e+05, -2.520937047813163e+05, -2.520432988182567e+05, -2.519926331830838e+05,
- -2.519417097139292e+05, -2.518905302295942e+05, -2.518390965298237e+05, -2.517874103955734e+05, -2.517354735892730e+05,
- -2.516832878550858e+05, -2.516308549191646e+05, -2.515781764898987e+05, -2.515252542581610e+05, -2.514720898975488e+05,
- -2.514186850646221e+05, -2.513650413991345e+05, -2.513111605242635e+05, -2.512570440468360e+05, -2.512026935575479e+05,
- -2.511481106311833e+05, -2.510932968268269e+05, -2.510382536880738e+05, -2.509829827432383e+05, -2.509274855055552e+05,
- -2.508717634733794e+05, -2.508158181303826e+05, -2.507596509457486e+05, -2.507032633743586e+05, -2.506466568569821e+05,
- -2.505898328204602e+05, -2.505327926778829e+05, -2.504755378287712e+05, -2.504180696592504e+05, -2.503603895422199e+05,
- -2.503024988375263e+05, -2.502443988921273e+05, -2.501860910402563e+05, -2.501275766035838e+05, -2.500688568913758e+05,
- -2.500099332006507e+05, -2.499508068163315e+05, -2.498914790113989e+05, -2.498319510470388e+05, -2.497722241727889e+05,
- -2.497122996266837e+05, -2.496521786353967e+05, -2.495918624143784e+05, -2.495313521679976e+05, -2.494706490896706e+05,
- -2.494097543620025e+05, -2.493486691569125e+05, -2.492873946357664e+05, -2.492259319495012e+05, -2.491642822387561e+05,
- -2.491024466339881e+05, -2.490404262556008e+05, -2.489782222140608e+05, -2.489158356100166e+05, -2.488532675344142e+05,
- -2.487905190686135e+05, -2.487275912844988e+05, -2.486644852445924e+05, -2.486012020021616e+05, -2.485377426013296e+05,
- -2.484741080771790e+05, -2.484102994558594e+05, -2.483463177546879e+05, -2.482821639822534e+05, -2.482178391385159e+05,
- -2.481533442149037e+05, -2.480886801944144e+05, -2.480238480517077e+05, -2.479588487532023e+05, -2.478936832571675e+05,
- -2.478283525138169e+05, -2.477628574653982e+05, -2.476971990462807e+05, -2.476313781830477e+05, -2.475653957945810e+05,
- -2.474992527921446e+05, -2.474329500794731e+05, -2.473664885528535e+05, -2.472998691012052e+05, -2.472330926061646e+05,
- -2.471661599421619e+05, -2.470990719765034e+05, -2.470318295694439e+05, -2.469644335742699e+05, -2.468968848373692e+05,
- -2.468291841983096e+05, -2.467613324899115e+05, -2.466933305383182e+05, -2.466251791630697e+05, -2.465568791771736e+05,
- -2.464884313871746e+05, -2.464198365932209e+05, -2.463510955891353e+05, -2.462822091624796e+05, -2.462131780946220e+05,
- -2.461440031608023e+05, -2.460746851301955e+05, -2.460052247659758e+05, -2.459356228253783e+05, -2.458658800597620e+05,
- -2.457959972146706e+05, -2.457259750298912e+05, -2.456558142395157e+05, -2.455855155719983e+05, -2.455150797502144e+05,
- -2.454445074915157e+05, -2.453737995077886e+05, -2.453029565055096e+05, -2.452319791857991e+05, -2.451608682444769e+05,
- -2.450896243721149e+05, -2.450182482540904e+05, -2.449467405706388e+05, -2.448751019969044e+05, -2.448033332029924e+05,
- -2.447314348540151e+05, -2.446594076101496e+05, -2.445872521266792e+05, -2.445149690540443e+05, -2.444425590378924e+05,
- -2.443700227191217e+05, -2.442973607339310e+05, -2.442245737138634e+05, -2.441516622858536e+05, -2.440786270722700e+05,
- -2.440054686909638e+05, -2.439321877553081e+05, -2.438587848742434e+05, -2.437852606523213e+05, -2.437116156897442e+05,
- -2.436378505824096e+05, -2.435639659219502e+05, -2.434899622957737e+05, -2.434158402871050e+05, -2.433416004750255e+05,
- -2.432672434345110e+05, -2.431927697364718e+05, -2.431181799477919e+05, -2.430434746313643e+05, -2.429686543461305e+05,
- -2.428937196471175e+05, -2.428186710854744e+05, -2.427435092085076e+05, -2.426682345597167e+05, -2.425928476788311e+05,
- -2.425173491018434e+05, -2.424417393610450e+05, -2.423660189850600e+05, -2.422901884988787e+05, -2.422142484238895e+05,
- -2.421381992779163e+05, -2.420620415752457e+05, -2.419857758266620e+05, -2.419094025394795e+05, -2.418329222175718e+05,
- -2.417563353614056e+05, -2.416796424680699e+05, -2.416028440313046e+05, -2.415259405415356e+05, -2.414489324858999e+05,
- -2.413718203482756e+05, -2.412946046093137e+05, -2.412172857464642e+05, -2.411398642340057e+05, -2.410623405430726e+05,
- -2.409847151416844e+05, -2.409069884947717e+05, -2.408291610642036e+05, -2.407512333088155e+05, -2.406732056844355e+05,
- -2.405950786439093e+05, -2.405168526371276e+05, -2.404385281110515e+05, -2.403601055097380e+05, -2.402815852743639e+05,
- -2.402029678432541e+05, -2.401242536519016e+05, -2.400454431329945e+05, -2.399665367164420e+05, -2.398875348293926e+05,
- -2.398084378962639e+05, -2.397292463387612e+05, -2.396499605759028e+05, -2.395705810240437e+05, -2.394911080968957e+05,
- -2.394115422055513e+05, -2.393318837585048e+05, -2.392521331616766e+05, -2.391722908184318e+05, -2.390923571296024e+05,
- -2.390123324935104e+05, -2.389322173059870e+05, -2.388520119603932e+05, -2.387717168476404e+05, -2.386913323562128e+05,
- -2.386108588721846e+05, -2.385302967792409e+05, -2.384496464586994e+05, -2.383689082895248e+05, -2.382880826483555e+05,
- -2.382071699095159e+05, -2.381261704450386e+05, -2.380450846246828e+05, -2.379639128159518e+05, -2.378826553841125e+05,
- -2.378013126922135e+05, -2.377198851011020e+05, -2.376383729694423e+05, -2.375567766537324e+05, -2.374750965083243e+05,
- -2.373933328854370e+05, -2.373114861351764e+05, -2.372295566055528e+05, -2.371475446424950e+05, -2.370654505898673e+05
- },
- {
- 1.666659918993276e+04, 1.469368337128063e+04, 1.268239158583278e+04, 1.063050130939687e+04, 8.535572833564287e+03,
- 6.394918449247592e+03, 4.205565776894477e+03, 1.964213830942384e+03, -3.328200204860501e+02, -2.689664611871535e+03,
- -5.110974256254778e+03, -7.602027051680679e+03, -1.016884810175606e+04, -1.281836580708430e+04, -1.555861273303595e+04,
- -1.839898759835578e+04, -2.135060269399423e+04, -2.442675333124493e+04, -2.764356596955805e+04, -3.102091554891727e+04,
- -3.458376213792030e+04, -3.836416692918930e+04, -4.240446210395671e+04, -4.676249803229714e+04, -5.152091446918043e+04,
- -5.680499270707036e+04, -6.282139643881178e+04, -6.995889793619969e+04, -2.295848671771139e+05, -2.307502186611415e+05,
- -2.317913671715336e+05, -2.327341269094616e+05, -2.335965133090361e+05, -2.343917059550623e+05, -2.351296949267372e+05,
- -2.358182663186951e+05, -2.364636264807655e+05, -2.370708154123387e+05, -2.376439905856254e+05, -2.381866277307758e+05,
- -2.387016665161067e+05, -2.391916185654324e+05, -2.396586490732738e+05, -2.401046394997058e+05, -2.405312364414860e+05,
- -2.409398902284136e+05, -2.413318857648067e+05, -2.417083674367500e+05, -2.420703594213357e+05, -2.424187823926400e+05,
- -2.427544673745857e+05, -2.430781673131013e+05, -2.433905668091657e+05, -2.436922903567890e+05, -2.439839093564994e+05,
- -2.442659481189509e+05, -2.445388890302360e+05, -2.448031770171234e+05, -2.450592234243246e+05, -2.453074093953284e+05,
- -2.455480888319818e+05, -2.457815909949391e+05, -2.460082227965775e+05, -2.462282708294619e+05, -2.464420031664980e+05,
- -2.466496709632461e+05, -2.468515098881754e+05, -2.470477414027810e+05, -2.472385739102686e+05, -2.474242037888263e+05,
- -2.476048163232534e+05, -2.477805865468284e+05, -2.479516800036866e+05, -2.481182534406333e+05, -2.482804554361583e+05,
- -2.484384269734279e+05, -2.485923019631938e+05, -2.487422077218264e+05, -2.488882654090578e+05, -2.490305904294744e+05,
- -2.491692928013391e+05, -2.493044774959051e+05, -2.494362447500386e+05, -2.495646903546494e+05, -2.496899059211621e+05,
- -2.498119791280242e+05, -2.499309939490290e+05, -2.500470308650621e+05, -2.501601670606981e+05, -2.502704766069497e+05,
- -2.503780306313292e+05, -2.504828974762736e+05, -2.505851428468899e+05, -2.506848299488725e+05, -2.507820196173813e+05,
- -2.508767704375858e+05, -2.509691388575179e+05, -2.510591792938239e+05, -2.511469442309458e+05, -2.512324843142266e+05,
- -2.513158484373763e+05, -2.513970838247179e+05, -2.514762361085750e+05, -2.515533494021566e+05, -2.516284663682424e+05,
- -2.517016282839650e+05, -2.517728751019525e+05, -2.518422455080780e+05, -2.519097769760377e+05, -2.519755058189736e+05,
- -2.520394672383237e+05, -2.521016953700889e+05, -2.521622233286695e+05, -2.522210832484333e+05, -2.522783063231505e+05,
- -2.523339228434314e+05, -2.523879622322995e+05, -2.524404530790941e+05, -2.524914231715419e+05, -2.525408995262725e+05,
- -2.525889084179144e+05, -2.526354754068094e+05, -2.526806253654169e+05, -2.527243824916398e+05, -2.527667703587634e+05,
- -2.528078119457604e+05, -2.528475295980284e+05, -2.528859451038449e+05, -2.529230796984684e+05, -2.529589540832315e+05,
- -2.529935884437971e+05, -2.530270024676293e+05, -2.530592153607160e+05, -2.530902458635814e+05, -2.531201122666265e+05,
- -2.531488324248316e+05, -2.531764237718495e+05, -2.532029033335264e+05, -2.532282877408698e+05, -2.532525932424972e+05,
- -2.532758357165922e+05, -2.532980306823813e+05, -2.533191933111663e+05, -2.533393384369264e+05, -2.533584805677617e+05,
- -2.533766338905812e+05, -2.533938122884003e+05, -2.534100293440399e+05, -2.534252983502465e+05, -2.534396323181119e+05,
- -2.534530439851778e+05, -2.534655458232503e+05, -2.534771500459312e+05, -2.534878686158754e+05, -2.534977132517969e+05,
- -2.535066954352224e+05, -2.535148264170101e+05, -2.535221172236419e+05, -2.535285786632992e+05, -2.535342213317306e+05,
- -2.535390556179167e+05, -2.535430917095483e+05, -2.535463395983215e+05, -2.535488090850509e+05, -2.535505097846195e+05,
- -2.535514511307647e+05, -2.535516423807077e+05, -2.535510926206619e+05, -2.535498107659989e+05, -2.535478055717942e+05,
- -2.535450856325970e+05, -2.535416593874589e+05, -2.535375351237476e+05, -2.535327209808447e+05, -2.535272249537253e+05,
- -2.535210548964331e+05, -2.535142185254462e+05, -2.535067234229429e+05, -2.534985770399693e+05, -2.534897866995106e+05,
- -2.534803595994757e+05, -2.534703028155887e+05, -2.534596233041992e+05, -2.534483279050101e+05, -2.534364233437270e+05,
- -2.534239162346303e+05, -2.534108130830750e+05, -2.533971202879187e+05, -2.533828441438829e+05, -2.533679908438463e+05,
- -2.533525664810746e+05, -2.533365770513893e+05, -2.533200284552776e+05, -2.533029264999411e+05, -2.532852769012929e+05,
- -2.532670852858994e+05, -2.532483571928672e+05, -2.532290980756835e+05, -2.532093133040072e+05, -2.531890081654080e+05,
- -2.531681878670662e+05, -2.531468575374250e+05, -2.531250222277983e+05, -2.531026869139404e+05, -2.530798564975724e+05,
- -2.530565358078728e+05, -2.530327296029269e+05, -2.530084425711420e+05, -2.529836793326240e+05, -2.529584444405250e+05,
- -2.529327423823520e+05, -2.529065775812455e+05, -2.528799543972276e+05, -2.528528771284170e+05, -2.528253500122163e+05,
- -2.527973772264717e+05, -2.527689628906010e+05, -2.527401110666984e+05, -2.527108257606103e+05, -2.526811109229880e+05,
- -2.526509704503123e+05, -2.526204081858974e+05, -2.525894279208709e+05, -2.525580333951261e+05, -2.525262282982610e+05,
- -2.524940162704880e+05, -2.524614009035259e+05, -2.524283857715026e+05, -2.523949743131503e+05, -2.523611700084728e+05,
- -2.523269762637373e+05, -2.522923964408817e+05, -2.522574338582952e+05, -2.522220917915759e+05, -2.521863734670221e+05,
- -2.521502820916641e+05, -2.521138208095761e+05, -2.520769927324757e+05, -2.520398009328511e+05, -2.520022484446292e+05,
- -2.519643382638244e+05, -2.519260733491810e+05, -2.518874566227942e+05, -2.518484909707234e+05, -2.518091792435923e+05,
- -2.517695242571724e+05, -2.517295287929578e+05, -2.516891955987281e+05, -2.516485273890974e+05, -2.516075268460555e+05,
- -2.515661966194933e+05, -2.515245393277210e+05, -2.514825575579763e+05, -2.514402538669181e+05, -2.513976307811162e+05,
- -2.513546907975254e+05, -2.513114363839536e+05, -2.512678699795194e+05, -2.512239939951026e+05, -2.511798108137819e+05,
- -2.511353227912673e+05, -2.510905322563235e+05, -2.510454415111840e+05, -2.510000528319579e+05, -2.509543684690275e+05,
- -2.509083906474419e+05, -2.508621215672992e+05, -2.508155634041229e+05, -2.507687183092300e+05, -2.507215884100957e+05,
- -2.506741758107069e+05, -2.506264825919104e+05, -2.505785108117570e+05, -2.505302625058360e+05, -2.504817396876051e+05,
- -2.504329443487131e+05, -2.503838784593189e+05, -2.503345439684025e+05, -2.502849428040704e+05, -2.502350768738568e+05,
- -2.501849480650177e+05, -2.501345582448224e+05, -2.500839092608356e+05, -2.500330029411980e+05, -2.499818410949021e+05,
- -2.499304255120585e+05, -2.498787579641618e+05, -2.498268402043535e+05, -2.497746739676730e+05, -2.497222609713118e+05,
- -2.496696029148586e+05, -2.496167014805420e+05, -2.495635583334686e+05, -2.495101751218573e+05, -2.494565534772693e+05,
- -2.494026950148329e+05, -2.493486013334686e+05, -2.492942740161036e+05, -2.492397146298898e+05, -2.491849247264129e+05,
- -2.491299058419012e+05, -2.490746594974287e+05, -2.490191871991166e+05, -2.489634904383290e+05, -2.489075706918694e+05,
- -2.488514294221691e+05, -2.487950680774765e+05, -2.487384880920403e+05, -2.486816908862932e+05, -2.486246778670271e+05,
- -2.485674504275729e+05, -2.485100099479693e+05, -2.484523577951362e+05, -2.483944953230403e+05, -2.483364238728597e+05,
- -2.482781447731464e+05, -2.482196593399859e+05, -2.481609688771531e+05, -2.481020746762683e+05, -2.480429780169472e+05,
- -2.479836801669513e+05, -2.479241823823368e+05, -2.478644859075980e+05, -2.478045919758074e+05, -2.477445018087626e+05,
- -2.476842166171185e+05, -2.476237376005258e+05, -2.475630659477660e+05, -2.475022028368821e+05, -2.474411494353086e+05,
- -2.473799069000001e+05, -2.473184763775580e+05, -2.472568590043534e+05, -2.471950559066483e+05, -2.471330682007201e+05,
- -2.470708969929763e+05, -2.470085433800729e+05, -2.469460084490302e+05, -2.468832932773456e+05, -2.468203989331039e+05,
- -2.467573264750908e+05, -2.466940769528977e+05, -2.466306514070321e+05, -2.465670508690186e+05, -2.465032763615083e+05,
- -2.464393288983759e+05, -2.463752094848235e+05, -2.463109191174795e+05, -2.462464587844947e+05, -2.461818294656420e+05,
- -2.461170321324086e+05, -2.460520677480922e+05, -2.459869372678910e+05, -2.459216416389975e+05, -2.458561818006854e+05,
- -2.457905586844016e+05, -2.457247732138498e+05, -2.456588263050796e+05, -2.455927188665706e+05, -2.455264517993149e+05,
- -2.454600259969016e+05, -2.453934423455967e+05, -2.453267017244237e+05, -2.452598050052435e+05, -2.451927530528325e+05,
- -2.451255467249576e+05, -2.450581868724559e+05, -2.449906743393058e+05, -2.449230099627031e+05, -2.448551945731347e+05,
- -2.447872289944465e+05, -2.447191140439200e+05, -2.446508505323389e+05, -2.445824392640580e+05, -2.445138810370721e+05,
- -2.444451766430842e+05, -2.443763268675700e+05, -2.443073324898459e+05, -2.442381942831306e+05, -2.441689130146109e+05,
- -2.440994894455038e+05, -2.440299243311198e+05, -2.439602184209224e+05, -2.438903724585895e+05, -2.438203871820734e+05,
- -2.437502633236597e+05, -2.436800016100248e+05, -2.436096027622930e+05, -2.435390674960964e+05, -2.434683965216252e+05,
- -2.433975905436887e+05, -2.433266502617655e+05, -2.432555763700604e+05, -2.431843695575552e+05, -2.431130305080641e+05,
- -2.430415599002811e+05, -2.429699584078350e+05, -2.428982266993400e+05, -2.428263654384423e+05, -2.427543752838728e+05,
- -2.426822568894935e+05, -2.426100109043462e+05, -2.425376379727023e+05, -2.424651387341048e+05, -2.423925138234188e+05,
- -2.423197638708758e+05, -2.422468895021186e+05, -2.421738913382466e+05, -2.421007699958589e+05, -2.420275260870979e+05,
- -2.419541602196948e+05, -2.418806729970086e+05, -2.418070650180696e+05, -2.417333368776217e+05, -2.416594891661613e+05,
- -2.415855224699798e+05, -2.415114373712024e+05, -2.414372344478290e+05, -2.413629142737714e+05, -2.412884774188923e+05,
- -2.412139244490449e+05, -2.411392559261091e+05, -2.410644724080289e+05, -2.409895744488501e+05, -2.409145625987555e+05,
- -2.408394374041019e+05, -2.407641994074542e+05, -2.406888491476228e+05, -2.406133871596960e+05, -2.405378139750745e+05,
- -2.404621301215077e+05, -2.403863361231244e+05, -2.403104325004666e+05, -2.402344197705250e+05, -2.401582984467655e+05,
- -2.400820690391675e+05, -2.400057320542522e+05, -2.399292879951133e+05, -2.398527373614503e+05, -2.397760806495974e+05,
- -2.396993183525538e+05, -2.396224509600155e+05, -2.395454789584006e+05, -2.394684028308837e+05, -2.393912230574209e+05,
- -2.393139401147801e+05, -2.392365544765691e+05, -2.391590666132631e+05, -2.390814769922332e+05, -2.390037860777716e+05,
- -2.389259943311216e+05, -2.388481022105025e+05, -2.387701101711356e+05, -2.386920186652724e+05, -2.386138281422175e+05,
- -2.385355390483578e+05, -2.384571518271833e+05, -2.383786669193173e+05, -2.383000847625363e+05, -2.382214057917981e+05,
- -2.381426304392638e+05, -2.380637591343228e+05, -2.379847923036162e+05, -2.379057303710607e+05, -2.378265737578702e+05,
- -2.377473228825805e+05, -2.376679781610710e+05, -2.375885400065895e+05, -2.375090088297704e+05, -2.374293850386583e+05,
- -2.373496690387325e+05, -2.372698612329244e+05, -2.371899620216419e+05, -2.371099718027872e+05, -2.370298909717824e+05,
- -2.369497199215851e+05, -2.368694590427127e+05, -2.367891087232603e+05, -2.367086693489215e+05, -2.366281413030077e+05,
- -2.365475249664690e+05, -2.364668207179121e+05, -2.363860289336212e+05, -2.363051499875738e+05, -2.362241842514633e+05,
- -2.361431320947151e+05, -2.360619938845070e+05, -2.359807699857837e+05, -2.358994607612803e+05, -2.358180665715354e+05,
- -2.357365877749111e+05, -2.356550247276101e+05, -2.355733777836932e+05, -2.354916472950948e+05, -2.354098336116438e+05
- },
- {
- 1.753023494309773e+04, 1.557284685304053e+04, 1.357794720946860e+04, 1.154340332839052e+04, 9.466877859217679e+03,
- 7.345800317122452e+03, 5.177333320313007e+03, 2.958332282190817e+03, 6.852969393141030e+02, -1.645687395661817e+03,
- -4.039021643335797e+03, -6.499681554398350e+03, -9.033328140610320e+03, -1.164644687913651e+04, -1.434652538947140e+04,
- -1.714228338893244e+04, -2.004397498151955e+04, -2.306379308487430e+04, -2.621642145064916e+04, -2.951980568226143e+04,
- -3.299625931150265e+04, -3.667410127484247e+04, -4.059017299032714e+04, -4.479388919069816e+04, -4.935414112597501e+04,
- -5.437196204576319e+04, -6.000619388934156e+04, -6.653348602610327e+04, -7.452452577085026e+04, -2.265361464648133e+05,
- -2.277991324079646e+05, -2.289187689609929e+05, -2.299267208291157e+05, -2.308445663906999e+05, -2.316878092973449e+05,
- -2.324680353359897e+05, -2.331941709703912e+05, -2.338732642459103e+05, -2.345109931791723e+05, -2.351120098116751e+05,
- -2.356801806242196e+05, -2.362187591224115e+05, -2.367305126198982e+05, -2.372178172534144e+05, -2.376827304454807e+05,
- -2.381270470274866e+05, -2.385523433089663e+05, -2.389600121105733e+05, -2.393512909243557e+05, -2.397272847782959e+05,
- -2.400889849716681e+05, -2.404372845558593e+05, -2.407729912245620e+05, -2.410968381229910e+05, -2.414094929714694e+05,
- -2.417115658129745e+05, -2.420036156292945e+05, -2.422861560206847e+05, -2.425596601055034e+05, -2.428245647663572e+05,
- -2.430812743457616e+05, -2.433301638757029e+05, -2.435715819106445e+05, -2.438058530216069e+05, -2.440332799993300e+05,
- -2.442541458067112e+05, -2.444687153143327e+05, -2.446772368476362e+05, -2.448799435699907e+05, -2.450770547222965e+05,
- -2.452687767367801e+05, -2.454553042401389e+05, -2.456368209590832e+05, -2.458135005395546e+05, -2.459855072893925e+05,
- -2.461529968529531e+05, -2.463161168250882e+05, -2.464750073109637e+05, -2.466298014373994e+05, -2.467806258207258e+05,
- -2.469276009955540e+05, -2.470708418083428e+05, -2.472104577792133e+05, -2.473465534350479e+05, -2.474792286165971e+05,
- -2.476085787620067e+05, -2.477346951689237e+05, -2.478576652371094e+05, -2.479775726932851e+05, -2.480944977997693e+05,
- -2.482085175482900e+05, -2.483197058402384e+05, -2.484281336544887e+05, -2.485338692038121e+05, -2.486369780808062e+05,
- -2.487375233941855e+05, -2.488355658961877e+05, -2.489311641017873e+05, -2.490243744003532e+05, -2.491152511603146e+05,
- -2.492038468273610e+05, -2.492902120166594e+05, -2.493743955995158e+05, -2.494564447848862e+05, -2.495364051961062e+05,
- -2.496143209431703e+05, -2.496902346908682e+05, -2.497641877230709e+05, -2.498362200034182e+05, -2.499063702326549e+05,
- -2.499746759028332e+05, -2.500411733485902e+05, -2.501058977956890e+05, -2.501688834069943e+05, -2.502301633260524e+05,
- -2.502897697184197e+05, -2.503477338108789e+05, -2.504040859287237e+05, -2.504588555312270e+05, -2.505120712451624e+05,
- -2.505637608967621e+05, -2.506139515421395e+05, -2.506626694962666e+05, -2.507099403605655e+05, -2.507557890186312e+05,
- -2.508002397771155e+05, -2.508433162237525e+05, -2.508850413567680e+05, -2.509254375807997e+05, -2.509645267277258e+05,
- -2.510023300765728e+05, -2.510388683725504e+05, -2.510741618452566e+05, -2.511082302261026e+05, -2.511410927649901e+05,
- -2.511727682462866e+05, -2.512032750041295e+05, -2.512326309370962e+05, -2.512608535222690e+05, -2.512879598287270e+05,
- -2.513139665304923e+05, -2.513388899189579e+05, -2.513627459148194e+05, -2.513855500795392e+05, -2.514073176263597e+05,
- -2.514280634321216e+05, -2.514478020424145e+05, -2.514665476891034e+05, -2.514843142944601e+05, -2.515011154815929e+05,
- -2.515169645831795e+05, -2.515318746498749e+05, -2.515458584584155e+05, -2.515589285194268e+05, -2.515710970849489e+05,
- -2.515823761556942e+05, -2.515927774880475e+05, -2.516023126008196e+05, -2.516109927817639e+05, -2.516188290938688e+05,
- -2.516258323814304e+05, -2.516320132759213e+05, -2.516373822016577e+05, -2.516419493812777e+05, -2.516457248410326e+05,
- -2.516487184159101e+05, -2.516509397545780e+05, -2.516523983252897e+05, -2.516531034159966e+05, -2.516530641457090e+05,
- -2.516522894641781e+05, -2.516507881572823e+05, -2.516485688510928e+05, -2.516456400158144e+05, -2.516420099696044e+05,
- -2.516376868822710e+05, -2.516326787788585e+05, -2.516269935431250e+05, -2.516206389209104e+05, -2.516136225234075e+05,
- -2.516059518303320e+05, -2.515976341929988e+05, -2.515886768373082e+05, -2.515790868666418e+05, -2.515688712646781e+05,
- -2.515580368981231e+05, -2.515465905193606e+05, -2.515345387690332e+05, -2.515218881785416e+05, -2.515086451724792e+05,
- -2.514948160709943e+05, -2.514804070920907e+05, -2.514654243538580e+05, -2.514498738766465e+05, -2.514337615851776e+05,
- -2.514170933106007e+05, -2.513998747924908e+05, -2.513821116807931e+05, -2.513638095377177e+05, -2.513449738395803e+05,
- -2.513256099785954e+05, -2.513057232646240e+05, -2.512853189268728e+05, -2.512644021155511e+05, -2.512429779034822e+05,
- -2.512210512876761e+05, -2.511986271908607e+05, -2.511757104629729e+05, -2.511523058826146e+05, -2.511284181584682e+05,
- -2.511040519306792e+05, -2.510792117722048e+05, -2.510539021901262e+05, -2.510281276269313e+05, -2.510018924617642e+05,
- -2.509752010116455e+05, -2.509480575326616e+05, -2.509204662211241e+05, -2.508924312147078e+05, -2.508639565935507e+05,
- -2.508350463813398e+05, -2.508057045463590e+05, -2.507759350025239e+05, -2.507457416103836e+05, -2.507151281781039e+05,
- -2.506840984624257e+05, -2.506526561696016e+05, -2.506208049851349e+05, -2.505885484608205e+05, -2.505558901842884e+05,
- -2.505228336616422e+05, -2.504893823745893e+05, -2.504555397375175e+05, -2.504213091277596e+05, -2.503866938789254e+05,
- -2.503516972816673e+05, -2.503163225844258e+05, -2.502805729941579e+05, -2.502444516770530e+05, -2.502079617592316e+05,
- -2.501711063274243e+05, -2.501338884296476e+05, -2.500963110758510e+05, -2.500583772385621e+05, -2.500200898535114e+05,
- -2.499814518202473e+05, -2.499424660027334e+05, -2.499031352299422e+05, -2.498634622964246e+05, -2.498234499628781e+05,
- -2.497831009566976e+05, -2.497424179725172e+05, -2.497014036727377e+05, -2.496600606880481e+05, -2.496183916179329e+05,
- -2.495763990311701e+05, -2.495340854663199e+05, -2.494914534322038e+05, -2.494485054083713e+05, -2.494052438455606e+05,
- -2.493616711661502e+05, -2.493177897645991e+05, -2.492736020078793e+05, -2.492291102359021e+05, -2.491843167619318e+05,
- -2.491392238729963e+05, -2.490938338302852e+05, -2.490481488695441e+05, -2.490021712014598e+05, -2.489559030120344e+05,
- -2.489093464629611e+05, -2.488625036919837e+05, -2.488153768132562e+05, -2.487679679176901e+05, -2.487202790732997e+05,
- -2.486723123255381e+05, -2.486240696976290e+05, -2.485755531908909e+05, -2.485267647850553e+05, -2.484777064385804e+05,
- -2.484283800889585e+05, -2.483787876530166e+05, -2.483289310272128e+05, -2.482788120879280e+05, -2.482284326917499e+05,
- -2.481777946757552e+05, -2.481268998577846e+05, -2.480757500367118e+05, -2.480243469927105e+05, -2.479726924875166e+05,
- -2.479207882646824e+05, -2.478686360498297e+05, -2.478162375508988e+05, -2.477635944583890e+05, -2.477107084455994e+05,
- -2.476575811688634e+05, -2.476042142677807e+05, -2.475506093654432e+05, -2.474967680686571e+05, -2.474426919681641e+05,
- -2.473883826388568e+05, -2.473338416399898e+05, -2.472790705153881e+05, -2.472240707936518e+05, -2.471688439883601e+05,
- -2.471133915982648e+05, -2.470577151074893e+05, -2.470018159857188e+05, -2.469456956883862e+05, -2.468893556568634e+05,
- -2.468327973186376e+05, -2.467760220874937e+05, -2.467190313636895e+05, -2.466618265341312e+05, -2.466044089725419e+05,
- -2.465467800396306e+05, -2.464889410832583e+05, -2.464308934385993e+05, -2.463726384283015e+05, -2.463141773626459e+05,
- -2.462555115396990e+05, -2.461966422454666e+05, -2.461375707540446e+05, -2.460782983277665e+05, -2.460188262173473e+05,
- -2.459591556620303e+05, -2.458992878897245e+05, -2.458392241171467e+05, -2.457789655499552e+05, -2.457185133828872e+05,
- -2.456578687998894e+05, -2.455970329742502e+05, -2.455360070687267e+05, -2.454747922356721e+05, -2.454133896171610e+05,
- -2.453518003451116e+05, -2.452900255414057e+05, -2.452280663180104e+05, -2.451659237770941e+05, -2.451035990111400e+05,
- -2.450410931030655e+05, -2.449784071263277e+05, -2.449155421450408e+05, -2.448524992140781e+05, -2.447892793791861e+05,
- -2.447258836770863e+05, -2.446623131355800e+05, -2.445985687736513e+05, -2.445346516015693e+05, -2.444705626209865e+05,
- -2.444063028250387e+05, -2.443418731984401e+05, -2.442772747175806e+05, -2.442125083506188e+05, -2.441475750575754e+05,
- -2.440824757904260e+05, -2.440172114931883e+05, -2.439517831020128e+05, -2.438861915452732e+05, -2.438204377436475e+05,
- -2.437545226102078e+05, -2.436884470505019e+05, -2.436222119626382e+05, -2.435558182373646e+05, -2.434892667581533e+05,
- -2.434225584012764e+05, -2.433556940358861e+05, -2.432886745240934e+05, -2.432215007210413e+05, -2.431541734749835e+05,
- -2.430866936273554e+05, -2.430190620128503e+05, -2.429512794594900e+05, -2.428833467886962e+05, -2.428152648153613e+05,
- -2.427470343479181e+05, -2.426786561884073e+05, -2.426101311325459e+05, -2.425414599697932e+05, -2.424726434834180e+05,
- -2.424036824505611e+05, -2.423345776423026e+05, -2.422653298237210e+05, -2.421959397539598e+05, -2.421264081862867e+05,
- -2.420567358681549e+05, -2.419869235412622e+05, -2.419169719416123e+05, -2.418468817995720e+05, -2.417766538399282e+05,
- -2.417062887819458e+05, -2.416357873394245e+05, -2.415651502207525e+05, -2.414943781289631e+05, -2.414234717617878e+05,
- -2.413524318117100e+05, -2.412812589660175e+05, -2.412099539068557e+05, -2.411385173112768e+05, -2.410669498512927e+05,
- -2.409952521939247e+05, -2.409234250012520e+05, -2.408514689304609e+05, -2.407793846338951e+05, -2.407071727590999e+05,
- -2.406348339488723e+05, -2.405623688413060e+05, -2.404897780698379e+05, -2.404170622632935e+05, -2.403442220459311e+05,
- -2.402712580374870e+05, -2.401981708532181e+05, -2.401249611039473e+05, -2.400516293961029e+05, -2.399781763317639e+05,
- -2.399046025087001e+05, -2.398309085204130e+05, -2.397570949561783e+05, -2.396831624010827e+05, -2.396091114360678e+05,
- -2.395349426379665e+05, -2.394606565795427e+05, -2.393862538295284e+05, -2.393117349526645e+05, -2.392371005097348e+05,
- -2.391623510576056e+05, -2.390874871492594e+05, -2.390125093338350e+05, -2.389374181566599e+05, -2.388622141592859e+05,
- -2.387868978795262e+05, -2.387114698514877e+05, -2.386359306056056e+05, -2.385602806686772e+05, -2.384845205638954e+05,
- -2.384086508108807e+05, -2.383326719257160e+05, -2.382565844209757e+05, -2.381803888057602e+05, -2.381040855857243e+05,
- -2.380276752631120e+05, -2.379511583367844e+05, -2.378745353022512e+05, -2.377978066517000e+05, -2.377209728740268e+05,
- -2.376440344548663e+05, -2.375669918766169e+05, -2.374898456184753e+05, -2.374125961564593e+05, -2.373352439634407e+05,
- -2.372577895091677e+05, -2.371802332602987e+05, -2.371025756804237e+05, -2.370248172300946e+05, -2.369469583668507e+05,
- -2.368689995452451e+05, -2.367909412168701e+05, -2.367127838303845e+05, -2.366345278315358e+05, -2.365561736631899e+05,
- -2.364777217653528e+05, -2.363991725751950e+05, -2.363205265270772e+05, -2.362417840525745e+05, -2.361629455804993e+05,
- -2.360840115369246e+05, -2.360049823452094e+05, -2.359258584260189e+05, -2.358466401973494e+05, -2.357673280745499e+05,
- -2.356879224703449e+05, -2.356084237948561e+05, -2.355288324556252e+05, -2.354491488576331e+05, -2.353693734033252e+05,
- -2.352895064926284e+05, -2.352095485229754e+05, -2.351294998893231e+05, -2.350493609841760e+05, -2.349691321976018e+05,
- -2.348888139172565e+05, -2.348084065284011e+05, -2.347279104139233e+05, -2.346473259543541e+05, -2.345666535278922e+05,
- -2.344858935104159e+05, -2.344050462755091e+05, -2.343241121944752e+05, -2.342430916363580e+05, -2.341619849679587e+05,
- -2.340807925538558e+05, -2.339995147564204e+05, -2.339181519358364e+05, -2.338367044501168e+05, -2.337551726551208e+05
- },
- {
- 1.839487163940627e+04, 1.645280813882590e+04, 1.447407467743036e+04, 1.245662441260083e+04, 1.039821759345494e+04,
- 8.296395256554382e+03, 6.148448130057817e+03, 3.951379639601249e+03, 1.701861589747157e+03, -6.038193280012223e+02,
- -2.969826627477456e+03, -5.400853942618788e+03, -7.902224098526847e+03, -1.048001325062847e+04, -1.314120828266490e+04,
- -1.589390900851201e+04, -1.874759176512137e+04, -2.171345874446511e+04, -2.480490967787966e+04, -2.803819246426630e+04,
- -3.143332301570088e+04, -3.501542370021922e+04, -3.881673840573006e+04, -4.287979364699934e+04, -4.726261478408663e+04,
- -5.204790253275794e+04, -5.736059070347127e+04, -6.340557024188227e+04, -7.056407609674087e+04, -7.972570650903856e+04,
- -2.234472888767688e+05, -2.248173145322870e+05, -2.260216504967869e+05, -2.270991691659596e+05, -2.280757064638372e+05,
- -2.289694792418775e+05, -2.297939020646117e+05, -2.305591888626523e+05, -2.312733262635755e+05, -2.319426964441634e+05,
- -2.325724925780619e+05, -2.331670055634346e+05, -2.337298276644321e+05, -2.342640007206191e+05, -2.347721263147665e+05,
- -2.352564491872255e+05, -2.357189214283076e+05, -2.361612525961885e+05, -2.365849493543450e+05, -2.369913471860740e+05,
- -2.373816360374342e+05, -2.377568812495929e+05, -2.381180407951922e+05, -2.384659795848760e+05, -2.388014814293012e+05,
- -2.391252591086590e+05, -2.394379629022789e+05, -2.397401878558528e+05, -2.400324800066230e+05, -2.403153417428721e+05,
- -2.405892364398688e+05, -2.408545924876845e+05, -2.411118068051779e+05, -2.413612479176650e+05, -2.416032586623737e+05,
- -2.418381585749637e+05, -2.420662460016265e+05, -2.422877999741414e+05, -2.425030818794070e+05, -2.427123369501475e+05,
- -2.429157955995036e+05, -2.431136746188922e+05, -2.433061782557569e+05, -2.434934991854934e+05, -2.436758193898865e+05,
- -2.438533109527307e+05, -2.440261367819086e+05, -2.441944512659993e+05, -2.443584008724668e+05, -2.445181246936110e+05,
- -2.446737549456962e+05, -2.448254174260376e+05, -2.449732319322511e+05, -2.451173126473965e+05, -2.452577684943136e+05,
- -2.453947034620821e+05, -2.455282169072181e+05, -2.456584038319347e+05, -2.457853551415427e+05, -2.459091578828621e+05,
- -2.460298954653046e+05, -2.461476478661342e+05, -2.462624918212530e+05, -2.463745010027312e+05, -2.464837461841769e+05,
- -2.465902953949426e+05, -2.466942140640648e+05, -2.467955651547545e+05, -2.468944092901764e+05, -2.469908048711956e+05,
- -2.470848081866980e+05, -2.471764735170500e+05, -2.472658532312026e+05, -2.473529978779089e+05, -2.474379562714811e+05,
- -2.475207755724812e+05, -2.476015013636926e+05, -2.476801777217189e+05, -2.477568472844972e+05, -2.478315513150121e+05,
- -2.479043297614642e+05, -2.479752213141294e+05, -2.480442634591277e+05, -2.481114925293018e+05, -2.481769437523929e+05,
- -2.482406512966842e+05, -2.483026483142732e+05, -2.483629669821208e+05, -2.484216385411004e+05, -2.484786933330271e+05,
- -2.485341608357161e+05, -2.485880696963959e+05, -2.486404477635042e+05, -2.486913221169477e+05, -2.487407190969179e+05,
- -2.487886642976177e+05, -2.488351827208166e+05, -2.488802986188938e+05, -2.489240356351046e+05, -2.489664167981370e+05,
- -2.490074645438213e+05, -2.490472007358744e+05, -2.490856466857256e+05, -2.491228231714787e+05, -2.491587504560486e+05,
- -2.491934483045253e+05, -2.492269360007911e+05, -2.492592323634458e+05, -2.492903557610606e+05, -2.493203241268038e+05,
- -2.493491549724631e+05, -2.493768654019028e+05, -2.494034721239714e+05, -2.494289914648998e+05, -2.494534393802031e+05,
- -2.494768314661176e+05, -2.494991829717813e+05, -2.495205088049210e+05, -2.495408235495158e+05, -2.495601414704370e+05,
- -2.495784765241730e+05, -2.495958423678819e+05, -2.496122523681123e+05, -2.496277196091978e+05, -2.496422569013482e+05,
- -2.496558767884470e+05, -2.496685915555674e+05, -2.496804132362206e+05, -2.496913536193509e+05, -2.497014242560775e+05,
- -2.497106364662097e+05, -2.497190013445302e+05, -2.497265297668653e+05, -2.497332323959483e+05, -2.497391196870838e+05,
- -2.497442018936214e+05, -2.497484890735012e+05, -2.497519910892790e+05, -2.497547176208279e+05, -2.497566781648726e+05,
- -2.497578820409575e+05, -2.497583383959246e+05, -2.497580562082565e+05, -2.497570442922728e+05, -2.497553113022023e+05,
- -2.497528657361209e+05, -2.497497159397714e+05, -2.497458701102630e+05, -2.497413362996576e+05, -2.497361224184487e+05,
- -2.497302362389307e+05, -2.497236853984705e+05, -2.497164774026803e+05, -2.497086196284947e+05, -2.497001193271590e+05,
- -2.496909836271273e+05, -2.496812195368797e+05, -2.496708339476541e+05, -2.496598336361015e+05, -2.496482252668650e+05,
- -2.496360153950854e+05, -2.496232104688340e+05, -2.496098168314825e+05, -2.495958407239993e+05, -2.495812882871879e+05,
- -2.495661655638618e+05, -2.495504785009575e+05, -2.495342329515948e+05, -2.495174346770737e+05, -2.495000893488272e+05,
- -2.494822025503130e+05, -2.494637797788594e+05, -2.494448264474619e+05, -2.494253478865316e+05, -2.494053493455962e+05,
- -2.493848359949623e+05, -2.493638129273281e+05, -2.493422851593575e+05, -2.493202576332150e+05, -2.492977352180591e+05,
- -2.492747227115004e+05, -2.492512248410205e+05, -2.492272462653563e+05, -2.492027915758503e+05, -2.491778652977681e+05,
- -2.491524718915798e+05, -2.491266157542158e+05, -2.491003012202857e+05, -2.490735325632722e+05, -2.490463139966945e+05,
- -2.490186496752434e+05, -2.489905436958899e+05, -2.489620000989658e+05, -2.489330228692239e+05, -2.489036159368652e+05,
- -2.488737831785574e+05, -2.488435284113578e+05, -2.488128554497016e+05, -2.487817679543500e+05, -2.487502696236291e+05,
- -2.487183640807988e+05, -2.486860549011495e+05, -2.486533456128599e+05, -2.486202396978325e+05, -2.485867405925122e+05,
- -2.485528516886866e+05, -2.485185763342673e+05, -2.484839178340565e+05, -2.484488794504925e+05, -2.484134644043842e+05,
- -2.483776758756244e+05, -2.483415170038915e+05, -2.483049908893349e+05, -2.482681005932440e+05, -2.482308491387056e+05,
- -2.481932395112447e+05, -2.481552746594550e+05, -2.481169574956120e+05, -2.480782908962767e+05, -2.480392777028847e+05,
- -2.479999207223237e+05, -2.479602227274996e+05, -2.479201864578901e+05, -2.478798146200856e+05, -2.478391098883239e+05,
- -2.477980749050064e+05, -2.477567122812127e+05, -2.477150245971964e+05, -2.476730144028771e+05, -2.476306842183188e+05,
- -2.475880365342022e+05, -2.475450738122821e+05, -2.475017984858438e+05, -2.474582129601423e+05, -2.474143196128379e+05,
- -2.473701207944230e+05, -2.473256188286375e+05, -2.472808160128804e+05, -2.472357146186093e+05, -2.471903168917359e+05,
- -2.471446250530117e+05, -2.470986412984059e+05, -2.470523677994795e+05, -2.470058067037475e+05, -2.469589601350387e+05,
- -2.469118301938454e+05, -2.468644189576695e+05, -2.468167284813591e+05, -2.467687607974412e+05, -2.467205179164480e+05,
- -2.466720018272360e+05, -2.466232144973002e+05, -2.465741578730822e+05, -2.465248338802734e+05, -2.464752444241116e+05,
- -2.464253913896721e+05, -2.463752766421567e+05, -2.463249020271726e+05, -2.462742693710092e+05, -2.462233804809121e+05,
- -2.461722371453455e+05, -2.461208411342590e+05, -2.460691941993408e+05, -2.460172980742742e+05, -2.459651544749824e+05,
- -2.459127650998771e+05, -2.458601316300931e+05, -2.458072557297297e+05, -2.457541390460778e+05, -2.457007832098512e+05,
- -2.456471898354093e+05, -2.455933605209751e+05, -2.455392968488552e+05, -2.454850003856496e+05, -2.454304726824634e+05,
- -2.453757152751100e+05, -2.453207296843155e+05, -2.452655174159147e+05, -2.452100799610514e+05, -2.451544187963648e+05,
- -2.450985353841842e+05, -2.450424311727107e+05, -2.449861075962033e+05, -2.449295660751570e+05, -2.448728080164811e+05,
- -2.448158348136732e+05, -2.447586478469898e+05, -2.447012484836165e+05, -2.446436380778324e+05, -2.445858179711736e+05,
- -2.445277894925969e+05, -2.444695539586327e+05, -2.444111126735456e+05, -2.443524669294846e+05, -2.442936180066352e+05,
- -2.442345671733679e+05, -2.441753156863834e+05, -2.441158647908581e+05, -2.440562157205837e+05, -2.439963696981085e+05,
- -2.439363279348736e+05, -2.438760916313487e+05, -2.438156619771648e+05, -2.437550401512459e+05, -2.436942273219372e+05,
- -2.436332246471325e+05, -2.435720332744013e+05, -2.435106543411081e+05, -2.434490889745390e+05, -2.433873382920170e+05,
- -2.433254034010222e+05, -2.432632853993069e+05, -2.432009853750111e+05, -2.431385044067746e+05, -2.430758435638484e+05,
- -2.430130039062018e+05, -2.429499864846358e+05, -2.428867923408823e+05, -2.428234225077146e+05, -2.427598780090473e+05,
- -2.426961598600393e+05, -2.426322690671947e+05, -2.425682066284587e+05, -2.425039735333186e+05, -2.424395707628976e+05,
- -2.423749992900491e+05, -2.423102600794531e+05, -2.422453540877024e+05, -2.421802822634003e+05, -2.421150455472443e+05,
- -2.420496448721166e+05, -2.419840811631704e+05, -2.419183553379170e+05, -2.418524683063084e+05, -2.417864209708213e+05,
- -2.417202142265395e+05, -2.416538489612345e+05, -2.415873260554462e+05, -2.415206463825598e+05, -2.414538108088869e+05,
- -2.413868201937383e+05, -2.413196753895021e+05, -2.412523772417193e+05, -2.411849265891525e+05, -2.411173242638642e+05,
- -2.410495710912856e+05, -2.409816678902871e+05, -2.409136154732489e+05, -2.408454146461293e+05, -2.407770662085330e+05,
- -2.407085709537770e+05, -2.406399296689597e+05, -2.405711431350208e+05, -2.405022121268102e+05, -2.404331374131511e+05,
- -2.403639197568997e+05, -2.402945599150101e+05, -2.402250586385947e+05, -2.401554166729827e+05, -2.400856347577821e+05,
- -2.400157136269365e+05, -2.399456540087834e+05, -2.398754566261135e+05, -2.398051221962234e+05, -2.397346514309745e+05,
- -2.396640450368470e+05, -2.395933037149937e+05, -2.395224281612951e+05, -2.394514190664108e+05, -2.393802771158323e+05,
- -2.393090029899344e+05, -2.392375973640289e+05, -2.391660609084110e+05, -2.390943942884094e+05, -2.390225981644396e+05,
- -2.389506731920485e+05, -2.388786200219624e+05, -2.388064393001368e+05, -2.387341316678011e+05, -2.386616977615041e+05,
- -2.385891382131637e+05, -2.385164536501064e+05, -2.384436446951157e+05, -2.383707119664744e+05, -2.382976560780090e+05,
- -2.382244776391311e+05, -2.381511772548819e+05, -2.380777555259714e+05, -2.380042130488226e+05, -2.379305504156101e+05,
- -2.378567682143014e+05, -2.377828670286977e+05, -2.377088474384711e+05, -2.376347100192057e+05, -2.375604553424343e+05,
- -2.374860839756793e+05, -2.374115964824862e+05, -2.373369934224635e+05, -2.372622753513195e+05, -2.371874428208976e+05,
- -2.371124963792116e+05, -2.370374365704836e+05, -2.369622639351763e+05, -2.368869790100284e+05, -2.368115823280906e+05,
- -2.367360744187562e+05, -2.366604558077978e+05, -2.365847270173988e+05, -2.365088885661850e+05, -2.364329409692601e+05,
- -2.363568847382332e+05, -2.362807203812548e+05, -2.362044484030453e+05, -2.361280693049260e+05, -2.360515835848516e+05,
- -2.359749917374374e+05, -2.358982942539918e+05, -2.358214916225447e+05, -2.357445843278757e+05, -2.356675728515450e+05,
- -2.355904576719209e+05, -2.355132392642072e+05, -2.354359181004713e+05, -2.353584946496756e+05, -2.352809693776962e+05,
- -2.352033427473602e+05, -2.351256152184646e+05, -2.350477872478068e+05, -2.349698592892081e+05, -2.348918317935418e+05,
- -2.348137052087580e+05, -2.347354799799073e+05, -2.346571565491683e+05, -2.345787353558709e+05, -2.345002168365202e+05,
- -2.344216014248225e+05, -2.343428895517077e+05, -2.342640816453530e+05, -2.341851781312083e+05, -2.341061794320161e+05,
- -2.340270859678365e+05, -2.339478981560709e+05, -2.338686164114813e+05, -2.337892411462157e+05, -2.337097727698279e+05,
- -2.336302116892998e+05, -2.335505583090640e+05, -2.334708130310240e+05, -2.333909762545740e+05, -2.333110483766232e+05,
- -2.332310297916137e+05, -2.331509208915406e+05, -2.330707220659747e+05, -2.329904337020807e+05, -2.329100561846365e+05,
- -2.328295898960542e+05, -2.327490352163989e+05, -2.326683925234076e+05, -2.325876621925084e+05, -2.325068445968390e+05,
- -2.324259401072673e+05, -2.323449490924058e+05, -2.322638719186327e+05, -2.321827089501109e+05, -2.321014605488025e+05
- },
- {
- 1.926050879403259e+04, 1.733357056137324e+04, 1.537078187867282e+04, 1.337017794784566e+04, 1.132961211115011e+04,
- 9.246731540220675e+03, 7.118948587946905e+03, 4.943406823025757e+03, 2.716940490378647e+03, 4.360257768322313e+02,
- -1.903278232531825e+03, -4.305401696993087e+03, -6.775352987536230e+03, -9.318829522226615e+03, -1.194235739778109e+04,
- -1.465346949083428e+04, -1.746093578138160e+04, -2.037506584710749e+04, -2.340811312642730e+04, -2.657482600158358e+04,
- -2.989321630612142e+04, -3.338565969599444e+04, -3.708052081889042e+04, -4.101464396765734e+04, -4.523734583952458e+04,
- -4.981718453393519e+04, -5.485428976520725e+04, -6.050508808499263e+04, -6.703913923658527e+04, -7.500102458028450e+04,
- -2.185585656577998e+05, -2.203184953515760e+05, -2.218056013861942e+05, -2.231010569985276e+05, -2.242525542326778e+05,
- -2.252909810923273e+05, -2.262376998006507e+05, -2.271082062882168e+05, -2.279141580536755e+05, -2.286645812444755e+05,
- -2.293666299843858e+05, -2.300260856027354e+05, -2.306476969687088e+05, -2.312354196500039e+05, -2.317925883683948e+05,
- -2.323220441547454e+05, -2.328262299392315e+05, -2.333072636488026e+05, -2.337669949562415e+05, -2.342070499357919e+05,
- -2.346288666308889e+05, -2.350337236950107e+05, -2.354227636845701e+05, -2.357970121743790e+05, -2.361573935750386e+05,
- -2.365047443209250e+05, -2.368398239429463e+05, -2.371633244255198e+05, -2.374758781610640e+05, -2.377780647498939e+05,
- -2.380704168432757e+05, -2.383534251886061e+05, -2.386275430054223e+05, -2.388931897971332e+05, -2.391507546845069e+05,
- -2.394005993318859e+05, -2.396430605250070e+05, -2.398784524495221e+05, -2.401070687113665e+05, -2.403291841336123e+05,
- -2.405450563591043e+05, -2.407549272837504e+05, -2.409590243416821e+05, -2.411575616604297e+05, -2.413507411017067e+05,
- -2.415387532012398e+05, -2.417217780192603e+05, -2.418999859117368e+05, -2.420735382311165e+05, -2.422425879642219e+05,
- -2.424072803140011e+05, -2.425677532309967e+05, -2.427241378996967e+05, -2.428765591843241e+05, -2.430251360380795e+05,
- -2.431699818794033e+05, -2.433112049384137e+05, -2.434489085763401e+05, -2.435831915804453e+05, -2.437141484366847e+05,
- -2.438418695820971e+05, -2.439664416387198e+05, -2.440879476306465e+05, -2.442064671856647e+05, -2.443220767227851e+05,
- -2.444348496268344e+05, -2.445448564111817e+05, -2.446521648695513e+05, -2.447568402178027e+05, -2.448589452264647e+05,
- -2.449585403447412e+05, -2.450556838166519e+05, -2.451504317898908e+05, -2.452428384179596e+05, -2.453329559560642e+05,
- -2.454208348512331e+05, -2.455065238270737e+05, -2.455900699635447e+05, -2.456715187720986e+05, -2.457509142665132e+05,
- -2.458282990297099e+05, -2.459037142768287e+05, -2.459771999148112e+05, -2.460487945987256e+05, -2.461185357850430e+05,
- -2.461864597820648e+05, -2.462526017976845e+05, -2.463169959846512e+05, -2.463796754835046e+05, -2.464406724634209e+05,
- -2.465000181608247e+05, -2.465577429160445e+05, -2.466138762082148e+05, -2.466684466884662e+05, -2.467214822115088e+05,
- -2.467730098656895e+05, -2.468230559644033e+05, -2.468716462136345e+05, -2.469188055382711e+05, -2.469645582343246e+05,
- -2.470089279618958e+05, -2.470519377677891e+05, -2.470936101071072e+05, -2.471339668638897e+05, -2.471730293708429e+05,
- -2.472108184282113e+05, -2.472473543218297e+05, -2.472826568404094e+05, -2.473167452920877e+05, -2.473496385202810e+05,
- -2.473813549188811e+05, -2.474119124468219e+05, -2.474413286420513e+05, -2.474696206349361e+05, -2.474968051611274e+05,
- -2.475228985739154e+05, -2.475479168560921e+05, -2.475718756313526e+05, -2.475947901762810e+05, -2.476166754266667e+05,
- -2.476375459941257e+05, -2.476574161714059e+05, -2.476762999429097e+05, -2.476942109937278e+05, -2.477111627183328e+05,
- -2.477271682289589e+05, -2.477422403636744e+05, -2.477563916941612e+05, -2.477696345332183e+05, -2.477819809419944e+05,
- -2.477934427369689e+05, -2.478040314966859e+05, -2.478137585682540e+05, -2.478226350736222e+05, -2.478306719156423e+05,
- -2.478378797839203e+05, -2.478442691617846e+05, -2.478498503264386e+05, -2.478546333623398e+05, -2.478586281608275e+05,
- -2.478618444264599e+05, -2.478642916817948e+05, -2.478659792720166e+05, -2.478669163694150e+05, -2.478671119777206e+05,
- -2.478665749363015e+05, -2.478653139242294e+05, -2.478633374642205e+05, -2.478606539264482e+05, -2.478572715322449e+05,
- -2.478531983576846e+05, -2.478484423370612e+05, -2.478430112662585e+05, -2.478369128060189e+05, -2.478301544851177e+05,
- -2.478227437034386e+05, -2.478146877349631e+05, -2.478059937306675e+05, -2.477966687213420e+05, -2.477867196203212e+05,
- -2.477761532261409e+05, -2.477649762251170e+05, -2.477531951938529e+05, -2.477408166016733e+05, -2.477278468129929e+05,
- -2.477142920896169e+05, -2.477001585929776e+05, -2.476854523863127e+05, -2.476701794367777e+05, -2.476543456175079e+05,
- -2.476379567096200e+05, -2.476210184041607e+05, -2.476035363040039e+05, -2.475855159256973e+05, -2.475669627012587e+05,
- -2.475478819799288e+05, -2.475282790298729e+05, -2.475081590398427e+05, -2.474875271207931e+05, -2.474663883074579e+05,
- -2.474447475598857e+05, -2.474226097649339e+05, -2.473999797377306e+05, -2.473768622230944e+05, -2.473532618969201e+05,
- -2.473291833675313e+05, -2.473046311769986e+05, -2.472796098024254e+05, -2.472541236572015e+05, -2.472281770922272e+05,
- -2.472017743971075e+05, -2.471749197941399e+05, -2.471476174684587e+05, -2.471198715251738e+05, -2.470916860200852e+05,
- -2.470630649532523e+05, -2.470340122700260e+05, -2.470045318883803e+05, -2.469746275959957e+05, -2.469443032050508e+05,
- -2.469135624519270e+05, -2.468824090231151e+05, -2.468508465561120e+05, -2.468188786403027e+05, -2.467865088178131e+05,
- -2.467537405843522e+05, -2.467205773900291e+05, -2.466870226401570e+05, -2.466530796960353e+05, -2.466187518757173e+05,
- -2.465840424547583e+05, -2.465489546669501e+05, -2.465134917050383e+05, -2.464776567214233e+05, -2.464414528288469e+05,
- -2.464048831010662e+05, -2.463679505735079e+05, -2.463306582439140e+05, -2.462930090729719e+05, -2.462550059849303e+05,
- -2.462166518682031e+05, -2.461779495759604e+05, -2.461389019267074e+05, -2.460995117048516e+05, -2.460597816612582e+05,
- -2.460197145137929e+05, -2.459793129478553e+05, -2.459385796169010e+05, -2.458975171429510e+05, -2.458561281170960e+05,
- -2.458144150999848e+05, -2.457723806223049e+05, -2.457300271852569e+05, -2.456873572610134e+05, -2.456443732931749e+05,
- -2.456010776972116e+05, -2.455574728609003e+05, -2.455135611447496e+05, -2.454693448824225e+05, -2.454248263811411e+05,
- -2.453800079220952e+05, -2.453348917608323e+05, -2.452894801276483e+05, -2.452437752279663e+05, -2.451977792427091e+05,
- -2.451514943286659e+05, -2.451049226188503e+05, -2.450580662228528e+05, -2.450109272271864e+05, -2.449635076956263e+05,
- -2.449158096695421e+05, -2.448678351682246e+05, -2.448195861892072e+05, -2.447710647085809e+05, -2.447222726813022e+05,
- -2.446732120414980e+05, -2.446238847027627e+05, -2.445742925584521e+05, -2.445244374819698e+05, -2.444743213270498e+05,
- -2.444239459280346e+05, -2.443733131001459e+05, -2.443224246397534e+05, -2.442712823246378e+05, -2.442198879142485e+05,
- -2.441682431499571e+05, -2.441163497553064e+05, -2.440642094362585e+05, -2.440118238814303e+05, -2.439591947623345e+05,
- -2.439063237336095e+05, -2.438532124332508e+05, -2.437998624828308e+05, -2.437462754877259e+05, -2.436924530373284e+05,
- -2.436383967052629e+05, -2.435841080495948e+05, -2.435295886130372e+05, -2.434748399231536e+05, -2.434198634925580e+05,
- -2.433646608191106e+05, -2.433092333861105e+05, -2.432535826624862e+05, -2.431977101029821e+05, -2.431416171483425e+05,
- -2.430853052254903e+05, -2.430287757477084e+05, -2.429720301148110e+05, -2.429150697133182e+05, -2.428578959166232e+05,
- -2.428005100851601e+05, -2.427429135665689e+05, -2.426851076958533e+05, -2.426270937955438e+05, -2.425688731758502e+05,
- -2.425104471348185e+05, -2.424518169584793e+05, -2.423929839209992e+05, -2.423339492848268e+05, -2.422747143008353e+05,
- -2.422152802084687e+05, -2.421556482358774e+05, -2.420958196000589e+05, -2.420357955069920e+05, -2.419755771517713e+05,
- -2.419151657187380e+05, -2.418545623816114e+05, -2.417937683036132e+05, -2.417327846375963e+05, -2.416716125261668e+05,
- -2.416102531018072e+05, -2.415487074869961e+05, -2.414869767943251e+05, -2.414250621266177e+05, -2.413629645770429e+05,
- -2.413006852292282e+05, -2.412382251573722e+05, -2.411755854263531e+05, -2.411127670918372e+05, -2.410497712003868e+05,
- -2.409865987895649e+05, -2.409232508880357e+05, -2.408597285156723e+05, -2.407960326836534e+05, -2.407321643945630e+05,
- -2.406681246424885e+05, -2.406039144131175e+05, -2.405395346838324e+05, -2.404749864238049e+05, -2.404102705940860e+05,
- -2.403453881476988e+05, -2.402803400297294e+05, -2.402151271774122e+05, -2.401497505202194e+05, -2.400842109799470e+05,
- -2.400185094707978e+05, -2.399526468994675e+05, -2.398866241652260e+05, -2.398204421599976e+05, -2.397541017684437e+05,
- -2.396876038680396e+05, -2.396209493291540e+05, -2.395541390151251e+05, -2.394871737823383e+05, -2.394200544802975e+05,
- -2.393527819517031e+05, -2.392853570325222e+05, -2.392177805520614e+05, -2.391500533330387e+05, -2.390821761916503e+05,
- -2.390141499376451e+05, -2.389459753743859e+05, -2.388776532989233e+05, -2.388091845020579e+05, -2.387405697684071e+05,
- -2.386718098764695e+05, -2.386029055986893e+05, -2.385338577015186e+05, -2.384646669454797e+05, -2.383953340852256e+05,
- -2.383258598696018e+05, -2.382562450417058e+05, -2.381864903389465e+05, -2.381165964930993e+05, -2.380465642303682e+05,
- -2.379763942714389e+05, -2.379060873315377e+05, -2.378356441204834e+05, -2.377650653427441e+05, -2.376943516974913e+05,
- -2.376235038786535e+05, -2.375525225749651e+05, -2.374814084700228e+05, -2.374101622423345e+05, -2.373387845653702e+05,
- -2.372672761076116e+05, -2.371956375326032e+05, -2.371238694989988e+05, -2.370519726606108e+05, -2.369799476664575e+05,
- -2.369077951608090e+05, -2.368355157832364e+05, -2.367631101686547e+05, -2.366905789473684e+05, -2.366179227451184e+05,
- -2.365451421831241e+05, -2.364722378781267e+05, -2.363992104424342e+05, -2.363260604839619e+05, -2.362527886062761e+05,
- -2.361793954086349e+05, -2.361058814860286e+05, -2.360322474292221e+05, -2.359584938247924e+05, -2.358846212551708e+05,
- -2.358106302986799e+05, -2.357365215295741e+05, -2.356622955180756e+05, -2.355879528304149e+05, -2.355134940288657e+05,
- -2.354389196717833e+05, -2.353642303136396e+05, -2.352894265050606e+05, -2.352145087928616e+05, -2.351394777200815e+05,
- -2.350643338260191e+05, -2.349890776462649e+05, -2.349137097127388e+05, -2.348382305537210e+05, -2.347626406938852e+05,
- -2.346869406543331e+05, -2.346111309526248e+05, -2.345352121028132e+05, -2.344591846154738e+05, -2.343830489977358e+05,
- -2.343068057533160e+05, -2.342304553825452e+05, -2.341539983824030e+05, -2.340774352465440e+05, -2.340007664653293e+05,
- -2.339239925258560e+05, -2.338471139119851e+05, -2.337701311043710e+05, -2.336930445804895e+05, -2.336158548146649e+05,
- -2.335385622781002e+05, -2.334611674389023e+05, -2.333836707621101e+05, -2.333060727097196e+05, -2.332283737407126e+05,
- -2.331505743110836e+05, -2.330726748738619e+05, -2.329946758791409e+05, -2.329165777741022e+05, -2.328383810030394e+05,
- -2.327600860073859e+05, -2.326816932257370e+05, -2.326032030938744e+05, -2.325246160447911e+05, -2.324459325087172e+05,
- -2.323671529131363e+05, -2.322882776828175e+05, -2.322093072398338e+05, -2.321302420035840e+05, -2.320510823908187e+05,
- -2.319718288156600e+05, -2.318924816896237e+05, -2.318130414216426e+05, -2.317335084180871e+05, -2.316538830827859e+05,
- -2.315741658170492e+05, -2.314943570196876e+05, -2.314144570870341e+05, -2.313344664129635e+05, -2.312543853889141e+05,
- -2.311742144039065e+05, -2.310939538445642e+05, -2.310136040951323e+05, -2.309331655374996e+05, -2.308526385512135e+05,
- -2.307720235135040e+05, -2.306913207992979e+05, -2.306105307812417e+05, -2.305296538297164e+05, -2.304486903128579e+05
- },
- {
- 2.012714587139982e+04, 1.821513730289510e+04, 1.626807642155951e+04, 1.428407686735211e+04, 1.226108080553125e+04,
- 1.019683645307303e+04, 8.088871678198354e+03, 5.934462804633700e+03, 3.730597512559985e+03, 1.473930415058227e+03,
- -8.392705337264523e+02, -3.213189215903718e+03, -5.652541319016183e+03, -8.162673404954809e+03, -1.074968694789905e+04,
- -1.342059546187678e+04, -1.618352614605308e+04, -1.904798243736725e+04, -2.202519147785538e+04, -2.512857250979661e+04,
- -2.837438170249699e+04, -3.178262164722549e+04, -3.537836093231076e+04, -3.919371370117583e+04, -4.327093105237558e+04,
- -4.766747237983417e+04, -5.246485725765522e+04, -5.778541730878131e+04, -6.382770606298401e+04, -7.095457585317583e+04,
- -7.998078911026132e+04, -2.152109777000264e+05, -2.171505880641336e+05, -2.187653321138980e+05, -2.201584399337339e+05,
- -2.213882922922000e+05, -2.224917175891272e+05, -2.234936932220004e+05, -2.244120648071305e+05, -2.252600959843795e+05,
- -2.260479557188022e+05, -2.267836383641593e+05, -2.274735600925199e+05, -2.281229606167384e+05, -2.287361825615484e+05,
- -2.293168710962072e+05, -2.298681199612735e+05, -2.303925804784587e+05, -2.308925443934405e+05, -2.313700078358323e+05,
- -2.318267214007714e+05, -2.322642298617650e+05, -2.326839040218313e+05, -2.330869665238243e+05, -2.334745129625234e+05,
- -2.338475293020980e+05, -2.342069063586250e+05, -2.345534519293748e+05, -2.348879010190477e+05, -2.352109245147830e+05,
- -2.355231365874131e+05, -2.358251010396412e+05, -2.361173367780320e+05, -2.364003225516650e+05, -2.366745010735847e+05,
- -2.369402826200856e+05, -2.371980481860631e+05, -2.374481522612114e+05, -2.376909252809739e+05, -2.379266757973548e+05,
- -2.381556924074982e+05, -2.383782454720502e+05, -2.385945886504383e+05, -2.388049602761895e+05, -2.390095845920292e+05,
- -2.392086728617118e+05, -2.394024243731654e+05, -2.395910273455501e+05, -2.397746597511469e+05, -2.399534900615615e+05,
- -2.401276779265173e+05, -2.402973747924565e+05, -2.404627244672965e+05, -2.406238636368948e+05, -2.407809223381333e+05,
- -2.409340243929470e+05, -2.410832878071287e+05, -2.412288251373061e+05, -2.413707438291090e+05, -2.415091465292189e+05,
- -2.416441313736939e+05, -2.417757922547226e+05, -2.419042190677156e+05, -2.420294979404699e+05, -2.421517114459484e+05,
- -2.422709388000684e+05, -2.423872560457610e+05, -2.425007362244328e+05, -2.426114495358577e+05, -2.427194634874309e+05,
- -2.428248430336262e+05, -2.429276507064243e+05, -2.430279467374108e+05, -2.431257891721741e+05, -2.432212339775880e+05,
- -2.433143351425028e+05, -2.434051447723299e+05, -2.434937131779640e+05, -2.435800889594427e+05, -2.436643190847207e+05,
- -2.437464489638970e+05, -2.438265225192087e+05, -2.439045822510802e+05, -2.439806693004961e+05, -2.440548235079349e+05,
- -2.441270834691011e+05, -2.441974865876573e+05, -2.442660691251477e+05, -2.443328662520870e+05, -2.443979120738967e+05,
- -2.444612397114370e+05, -2.445228813033637e+05, -2.445828680633733e+05, -2.446412303128258e+05, -2.446979975153611e+05,
- -2.447531983098309e+05, -2.448068605204335e+05, -2.448590112513830e+05, -2.449096768580799e+05, -2.449588829664941e+05,
- -2.450066545327128e+05, -2.450530158552314e+05, -2.450979905984853e+05, -2.451416018153139e+05, -2.451838719684289e+05,
- -2.452248229509237e+05, -2.452644761058931e+05, -2.453028522451958e+05, -2.453399716674105e+05, -2.453758541750262e+05,
- -2.454105190909091e+05, -2.454439852740755e+05, -2.454762711348133e+05, -2.455073946491820e+05, -2.455373733729174e+05,
- -2.455662244547793e+05, -2.455939646493609e+05, -2.456206103293902e+05, -2.456461774975460e+05, -2.456706817987887e+05,
- -2.456941385272839e+05, -2.457165626430353e+05, -2.457379687777805e+05, -2.457583712457847e+05, -2.457777840531883e+05,
- -2.457962209070117e+05, -2.458136952238233e+05, -2.458302201380926e+05, -2.458458085102381e+05, -2.458604729343868e+05,
- -2.458742257458559e+05, -2.458870790283657e+05, -2.458990446210052e+05, -2.459101341249469e+05, -2.459203589099329e+05,
- -2.459297301219697e+05, -2.459382586835553e+05, -2.459459553083887e+05, -2.459528305010101e+05, -2.459588945637805e+05,
- -2.459641576021598e+05, -2.459686295298083e+05, -2.459723200735186e+05, -2.459752387779931e+05, -2.459773950104605e+05,
- -2.459787979651502e+05, -2.459794566676182e+05, -2.459793799789442e+05, -2.459785765997876e+05, -2.459770550743249e+05,
- -2.459748237940586e+05, -2.459718910015155e+05, -2.459682647938257e+05, -2.459639531261969e+05, -2.459589638152811e+05,
- -2.459533045424438e+05, -2.459469828569312e+05, -2.459400061789481e+05, -2.459323818026423e+05, -2.459241168990028e+05,
- -2.459152185186742e+05, -2.459056935946892e+05, -2.458955489451218e+05, -2.458847912756682e+05, -2.458734271821501e+05,
- -2.458614631529507e+05, -2.458489055713819e+05, -2.458357607179842e+05, -2.458220347727649e+05, -2.458077338173728e+05,
- -2.457928638372155e+05, -2.457774307235184e+05, -2.457614402753265e+05, -2.457448982014543e+05, -2.457278101223833e+05,
- -2.457101815721091e+05, -2.456920179999394e+05, -2.456733247722443e+05, -2.456541071741616e+05, -2.456343704112587e+05,
- -2.456141196111498e+05, -2.455933598250720e+05, -2.455720960294234e+05, -2.455503331272575e+05, -2.455280759497453e+05,
- -2.455053292575966e+05, -2.454820977424478e+05, -2.454583860211889e+05, -2.454341986656811e+05, -2.454095401609878e+05,
- -2.453844149356482e+05, -2.453588273555689e+05, -2.453327817252162e+05, -2.453062822887824e+05, -2.452793332313270e+05,
- -2.452519386798862e+05, -2.452241027282897e+05, -2.451958293445916e+05, -2.451671225106465e+05, -2.451379861319971e+05,
- -2.451084240613374e+05, -2.450784400994786e+05, -2.450480379962905e+05, -2.450172214516239e+05, -2.449859941162048e+05,
- -2.449543595925197e+05, -2.449223214356698e+05, -2.448898831542133e+05, -2.448570482109861e+05, -2.448238200239021e+05,
- -2.447902019667437e+05, -2.447561973699227e+05, -2.447218095212372e+05, -2.446870416666017e+05, -2.446518970107682e+05,
- -2.446163787180279e+05, -2.445804899128995e+05, -2.445442336808035e+05, -2.445076130687173e+05, -2.444706310858239e+05,
- -2.444332907041417e+05, -2.443955948591412e+05, -2.443575464503511e+05, -2.443191483419507e+05, -2.442804033633490e+05,
- -2.442413143097531e+05, -2.442018839427246e+05, -2.441621149907254e+05, -2.441220101496482e+05, -2.440815720833444e+05,
- -2.440408034241314e+05, -2.439997067732995e+05, -2.439582847015990e+05, -2.439165397497261e+05, -2.438744744287940e+05,
- -2.438320912207955e+05, -2.437893925790581e+05, -2.437463809286894e+05, -2.437030586670117e+05, -2.436594281639922e+05,
- -2.436154917626607e+05, -2.435712517795227e+05, -2.435267105049618e+05, -2.434818702036363e+05, -2.434367331148672e+05,
- -2.433913014530195e+05, -2.433455774078749e+05, -2.432995631450009e+05, -2.432532608061070e+05, -2.432066725094015e+05,
- -2.431598003499350e+05, -2.431126463999418e+05, -2.430652127091746e+05, -2.430175013052299e+05, -2.429695141938716e+05,
- -2.429212533593455e+05, -2.428727207646900e+05, -2.428239183520403e+05, -2.427748480429274e+05, -2.427255117385708e+05,
- -2.426759113201679e+05, -2.426260486491765e+05, -2.425759255675929e+05, -2.425255438982252e+05, -2.424749054449615e+05,
- -2.424240119930330e+05, -2.423728653092737e+05, -2.423214671423748e+05, -2.422698192231344e+05, -2.422179232647028e+05,
- -2.421657809628257e+05, -2.421133939960790e+05, -2.420607640261029e+05, -2.420078926978332e+05, -2.419547816397231e+05,
- -2.419014324639681e+05, -2.418478467667201e+05, -2.417940261283064e+05, -2.417399721134344e+05, -2.416856862714040e+05,
- -2.416311701363070e+05, -2.415764252272296e+05, -2.415214530484485e+05, -2.414662550896256e+05, -2.414108328259953e+05,
- -2.413551877185554e+05, -2.412993212142498e+05, -2.412432347461486e+05, -2.411869297336291e+05, -2.411304075825490e+05,
- -2.410736696854191e+05, -2.410167174215742e+05, -2.409595521573400e+05, -2.409021752461967e+05, -2.408445880289424e+05,
- -2.407867918338499e+05, -2.407287879768255e+05, -2.406705777615637e+05, -2.406121624796964e+05, -2.405535434109453e+05,
- -2.404947218232670e+05, -2.404356989729998e+05, -2.403764761050039e+05, -2.403170544528047e+05, -2.402574352387282e+05,
- -2.401976196740393e+05, -2.401376089590756e+05, -2.400774042833773e+05, -2.400170068258211e+05, -2.399564177547440e+05,
- -2.398956382280733e+05, -2.398346693934477e+05, -2.397735123883417e+05, -2.397121683401855e+05, -2.396506383664835e+05,
- -2.395889235749315e+05, -2.395270250635323e+05, -2.394649439207083e+05, -2.394026812254146e+05, -2.393402380472487e+05,
- -2.392776154465587e+05, -2.392148144745507e+05, -2.391518361733940e+05, -2.390886815763270e+05, -2.390253517077567e+05,
- -2.389618475833606e+05, -2.388981702101875e+05, -2.388343205867551e+05, -2.387702997031454e+05, -2.387061085411015e+05,
- -2.386417480741214e+05, -2.385772192675491e+05, -2.385125230786692e+05, -2.384476604567929e+05, -2.383826323433501e+05,
- -2.383174396719758e+05, -2.382520833685944e+05, -2.381865643515092e+05, -2.381208835314827e+05, -2.380550418118201e+05,
- -2.379890400884528e+05, -2.379228792500160e+05, -2.378565601779308e+05, -2.377900837464810e+05, -2.377234508228908e+05,
- -2.376566622674005e+05, -2.375897189333434e+05, -2.375226216672173e+05, -2.374553713087599e+05, -2.373879686910205e+05,
- -2.373204146404307e+05, -2.372527099768737e+05, -2.371848555137572e+05, -2.371168520580764e+05, -2.370487004104878e+05,
- -2.369804013653701e+05, -2.369119557108930e+05, -2.368433642290824e+05, -2.367746276958818e+05, -2.367057468812189e+05,
- -2.366367225490648e+05, -2.365675554574979e+05, -2.364982463587627e+05, -2.364287959993321e+05, -2.363592051199640e+05,
- -2.362894744557619e+05, -2.362196047362309e+05, -2.361495966853354e+05, -2.360794510215568e+05, -2.360091684579447e+05,
- -2.359387497021775e+05, -2.358681954566116e+05, -2.357975064183371e+05, -2.357266832792310e+05, -2.356557267260068e+05,
- -2.355846374402691e+05, -2.355134160985621e+05, -2.354420633724209e+05, -2.353705799284203e+05, -2.352989664282242e+05,
- -2.352272235286334e+05, -2.351553518816339e+05, -2.350833521344446e+05, -2.350112249295615e+05, -2.349389709048066e+05,
- -2.348665906933716e+05, -2.347940849238622e+05, -2.347214542203447e+05, -2.346486992023870e+05, -2.345758204851041e+05,
- -2.345028186792006e+05, -2.344296943910106e+05, -2.343564482225423e+05, -2.342830807715183e+05, -2.342095926314146e+05,
- -2.341359843915041e+05, -2.340622566368922e+05, -2.339884099485612e+05, -2.339144449034036e+05, -2.338403620742652e+05,
- -2.337661620299800e+05, -2.336918453354090e+05, -2.336174125514766e+05, -2.335428642352074e+05, -2.334682009397626e+05,
- -2.333934232144760e+05, -2.333185316048886e+05, -2.332435266527831e+05, -2.331684088962201e+05, -2.330931788695709e+05,
- -2.330178371035515e+05, -2.329423841252564e+05, -2.328668204581903e+05, -2.327911466223028e+05, -2.327153631340192e+05,
- -2.326394705062714e+05, -2.325634692485314e+05, -2.324873598668422e+05, -2.324111428638459e+05, -2.323348187388187e+05,
- -2.322583879876966e+05, -2.321818511031081e+05, -2.321052085744015e+05, -2.320284608876759e+05, -2.319516085258097e+05,
- -2.318746519684862e+05, -2.317975916922266e+05, -2.317204281704133e+05, -2.316431618733202e+05, -2.315657932681398e+05,
- -2.314883228190079e+05, -2.314107509870325e+05, -2.313330782303196e+05, -2.312553050039977e+05, -2.311774317602464e+05,
- -2.310994589483202e+05, -2.310213870145730e+05, -2.309432164024838e+05, -2.308649475526822e+05, -2.307865809029719e+05,
- -2.307081168883546e+05, -2.306295559410543e+05, -2.305508984905417e+05, -2.304721449635564e+05, -2.303932957841289e+05,
- -2.303143513736074e+05, -2.302353121506762e+05, -2.301561785313814e+05, -2.300769509291505e+05, -2.299976297548146e+05,
- -2.299182154166333e+05, -2.298387083203125e+05, -2.297591088690257e+05, -2.296794174634383e+05, -2.295996345017260e+05,
- -2.295197603795943e+05, -2.294397954903019e+05, -2.293597402246784e+05, -2.292795949711457e+05, -2.291993601157369e+05,
- -2.291190360421165e+05, -2.290386231315988e+05, -2.289581217631685e+05, -2.288775323134980e+05, -2.287968551569674e+05
- },
- {
- 2.099478228670655e+04, 1.909751139945360e+04, 1.716596564246455e+04, 1.519833366668887e+04, 1.319264241252431e+04,
- 1.114673633053598e+04, 9.058253045865617e+03, 6.924594696780082e+03, 4.742893970077908e+03, 2.509973586400410e+03,
- 2.222976267637193e+02, -2.124087395856332e+03, -4.533624482002477e+03, -7.011334792394948e+03, -9.562927975283810e+03,
- -1.219494100354300e+04, -1.491491503846420e+04, -1.773162382078368e+04, -2.065537312333451e+04, -2.369840016480853e+04,
- -2.687541682510288e+04, -3.020436509724379e+04, -3.370749517788314e+04, -3.741295127569864e+04, -4.135718967713400e+04,
- -4.558883036910943e+04, -5.017513236252034e+04, -5.521365661975791e+04, -6.085528225803022e+04, -6.735583953828135e+04,
- -7.521710146052163e+04, -8.573772183782236e+04, -2.118051947232825e+05, -2.139451610012796e+05, -2.156984012134116e+05,
- -2.171956695950975e+05, -2.185081303878303e+05, -2.196795145791855e+05, -2.207389108167730e+05, -2.217067919932384e+05,
- -2.225981931835728e+05, -2.234245295873016e+05, -2.241947031852730e+05, -2.249158104610238e+05, -2.255936135798008e+05,
- -2.262328647859035e+05, -2.268375361866654e+05, -2.274109865450157e+05, -2.279560849474490e+05, -2.284753042213292e+05,
- -2.289707926727150e+05, -2.294444299891089e+05, -2.298978713777849e+05, -2.303325828293964e+05, -2.307498695937412e+05,
- -2.311508993983793e+05, -2.315367215488669e+05, -2.319082827688161e+05, -2.322664404342890e+05, -2.326119737071662e+05,
- -2.329455929605189e+05, -2.332679478049691e+05, -2.335796339610684e+05, -2.338811991735672e+05, -2.341731483253519e+05,
- -2.344559478790312e+05, -2.347300297506604e+05, -2.349957947014640e+05, -2.352536153184853e+05, -2.355038386431228e+05,
- -2.357467884967682e+05, -2.359827675448702e+05, -2.362120591342517e+05, -2.364349289331799e+05, -2.366516263992675e+05,
- -2.368623860966146e+05, -2.370674288805445e+05, -2.372669629656905e+05, -2.374611848910658e+05, -2.376502803938781e+05,
- -2.378344252023316e+05, -2.380137857563154e+05, -2.381885198637648e+05, -2.383587772995011e+05, -2.385247003525350e+05,
- -2.386864243270965e+05, -2.388440780020325e+05, -2.389977840526829e+05, -2.391476594388726e+05, -2.392938157622497e+05,
- -2.394363595958504e+05, -2.395753927884544e+05, -2.397110127460191e+05, -2.398433126922502e+05, -2.399723819101439e+05,
- -2.400983059661542e+05, -2.402211669184711e+05, -2.403410435107533e+05, -2.404580113525175e+05, -2.405721430872861e+05,
- -2.406835085494761e+05, -2.407921749109305e+05, -2.408982068179059e+05, -2.410016665192552e+05, -2.411026139864842e+05,
- -2.412011070262903e+05, -2.412972013861498e+05, -2.413909508534627e+05, -2.414824073487254e+05, -2.415716210131605e+05,
- -2.416586402911972e+05, -2.417435120081609e+05, -2.418262814435099e+05, -2.419069923999207e+05, -2.419856872684987e+05,
- -2.420624070903846e+05, -2.421371916149836e+05, -2.422100793550469e+05, -2.422811076388039e+05, -2.423503126593374e+05,
- -2.424177295214733e+05, -2.424833922861799e+05, -2.425473340125520e+05, -2.426095867977611e+05, -2.426701818150084e+05,
- -2.427291493495969e+05, -2.427865188332336e+05, -2.428423188516172e+05, -2.428965772551076e+05, -2.429493211090199e+05,
- -2.430005767298379e+05, -2.430503697405708e+05, -2.430987250846398e+05, -2.431456670503392e+05, -2.431912192941916e+05,
- -2.432354048632527e+05, -2.432782462164233e+05, -2.433197652448239e+05, -2.433599832912780e+05, -2.433989211689562e+05,
- -2.434365991792158e+05, -2.434730371286873e+05, -2.435082543456400e+05, -2.435422696956641e+05, -2.435751015967065e+05,
- -2.436067680334872e+05, -2.436372865713334e+05, -2.436666743694538e+05, -2.436949481936828e+05, -2.437221244287221e+05,
- -2.437482190908069e+05, -2.437732478352860e+05, -2.437972259732148e+05, -2.438201684778804e+05, -2.438420899958645e+05,
- -2.438630048567140e+05, -2.438829270822545e+05, -2.439018703955545e+05, -2.439198482295634e+05, -2.439368737354308e+05,
- -2.439529597905263e+05, -2.439681190061718e+05, -2.439823637350954e+05, -2.439957060786229e+05, -2.440081578951700e+05,
- -2.440197308006353e+05, -2.440304361844716e+05, -2.440402852094186e+05, -2.440492888191888e+05, -2.440574577442940e+05,
- -2.440648025076750e+05, -2.440713334301442e+05, -2.440770606356471e+05, -2.440819940563538e+05, -2.440861434375777e+05,
- -2.440895183425425e+05, -2.440921281569894e+05, -2.440939820936414e+05, -2.440950891965217e+05, -2.440954583451404e+05,
- -2.440950982585447e+05, -2.440940174992476e+05, -2.440922244770342e+05, -2.440897274526477e+05, -2.440865345413682e+05,
- -2.440826537164773e+05, -2.440780928126248e+05, -2.440728595290887e+05, -2.440669614329409e+05, -2.440604059621211e+05,
- -2.440532004284160e+05, -2.440453520203560e+05, -2.440368678060261e+05, -2.440277547357945e+05, -2.440180196449655e+05,
- -2.440076692563558e+05, -2.439967101827971e+05, -2.439851489295707e+05, -2.439729918967705e+05, -2.439602453816041e+05,
- -2.439469155806288e+05, -2.439330085919244e+05, -2.439185304172094e+05, -2.439034869639004e+05, -2.438878840471113e+05,
- -2.438717273916051e+05, -2.438550226336874e+05, -2.438377753230559e+05, -2.438199909245961e+05, -2.438016748201328e+05,
- -2.437828323101349e+05, -2.437634686153762e+05, -2.437435888713782e+05, -2.437231981589973e+05, -2.437023014619659e+05,
- -2.436809036980504e+05, -2.436590097130095e+05, -2.436366242820181e+05, -2.436137521110542e+05, -2.435903978382532e+05,
- -2.435665660352260e+05, -2.435422612083478e+05, -2.435174878000130e+05, -2.434922501898611e+05, -2.434665526959726e+05,
- -2.434403995760357e+05, -2.434137950509498e+05, -2.433867432173462e+05, -2.433592481797101e+05, -2.433313139652867e+05,
- -2.433029445463590e+05, -2.432741438412625e+05, -2.432449157153711e+05, -2.432152639820626e+05, -2.431851924036600e+05,
- -2.431547046923545e+05, -2.431238045111037e+05, -2.430924954745146e+05, -2.430607811496993e+05, -2.430286650571178e+05,
- -2.429961506714018e+05, -2.429632414221546e+05, -2.429299406947389e+05, -2.428962518310464e+05, -2.428621781302470e+05,
- -2.428277228495273e+05, -2.427928892048066e+05, -2.427576803714434e+05, -2.427220994849227e+05, -2.426861496415310e+05,
- -2.426498338990158e+05, -2.426131552772294e+05, -2.425761167587633e+05, -2.425387212895669e+05, -2.425009717795508e+05,
- -2.424628711031829e+05, -2.424244221000671e+05, -2.423856275755131e+05, -2.423464903010942e+05, -2.423070130151917e+05,
- -2.422671984235306e+05, -2.422270491997027e+05, -2.421865679856806e+05, -2.421457573923189e+05, -2.421046199998509e+05,
- -2.420631583583656e+05, -2.420213749882871e+05, -2.419792723808348e+05, -2.419368529984792e+05, -2.418941192753893e+05,
- -2.418510736178674e+05, -2.418077184047802e+05, -2.417640559879768e+05, -2.417200886927038e+05, -2.416758188180081e+05,
- -2.416312486371327e+05, -2.415863803979086e+05, -2.415412163231330e+05, -2.414957586109474e+05, -2.414500094352016e+05,
- -2.414039709458173e+05, -2.413576452691391e+05, -2.413110345082850e+05, -2.412641407434842e+05, -2.412169660324124e+05,
- -2.411695124105223e+05, -2.411217818913618e+05, -2.410737764668949e+05, -2.410254981078097e+05, -2.409769487638228e+05,
- -2.409281303639826e+05, -2.408790448169595e+05, -2.408296940113368e+05, -2.407800798158933e+05, -2.407302040798843e+05,
- -2.406800686333129e+05, -2.406296752871998e+05, -2.405790258338482e+05, -2.405281220471021e+05, -2.404769656826034e+05,
- -2.404255584780400e+05, -2.403739021533938e+05, -2.403219984111826e+05, -2.402698489366973e+05, -2.402174553982373e+05,
- -2.401648194473369e+05, -2.401119427189954e+05, -2.400588268318965e+05, -2.400054733886280e+05, -2.399518839758949e+05,
- -2.398980601647320e+05, -2.398440035107110e+05, -2.397897155541434e+05, -2.397351978202845e+05, -2.396804518195259e+05,
- -2.396254790475931e+05, -2.395702809857367e+05, -2.395148591009178e+05, -2.394592148459942e+05, -2.394033496599025e+05,
- -2.393472649678362e+05, -2.392909621814207e+05, -2.392344426988890e+05, -2.391777079052494e+05, -2.391207591724552e+05,
- -2.390635978595673e+05, -2.390062253129189e+05, -2.389486428662732e+05, -2.388908518409831e+05, -2.388328535461414e+05,
- -2.387746492787392e+05, -2.387162403238112e+05, -2.386576279545846e+05, -2.385988134326253e+05, -2.385397980079805e+05,
- -2.384805829193182e+05, -2.384211693940688e+05, -2.383615586485584e+05, -2.383017518881451e+05, -2.382417503073522e+05,
- -2.381815550899966e+05, -2.381211674093188e+05, -2.380605884281085e+05, -2.379998192988297e+05, -2.379388611637444e+05,
- -2.378777151550303e+05, -2.378163823949045e+05, -2.377548639957373e+05, -2.376931610601687e+05, -2.376312746812239e+05,
- -2.375692059424229e+05, -2.375069559178933e+05, -2.374445256724779e+05, -2.373819162618431e+05, -2.373191287325845e+05,
- -2.372561641223299e+05, -2.371930234598440e+05, -2.371297077651289e+05, -2.370662180495237e+05, -2.370025553158024e+05,
- -2.369387205582736e+05, -2.368747147628724e+05, -2.368105389072577e+05, -2.367461939609023e+05, -2.366816808851884e+05,
- -2.366170006334948e+05, -2.365521541512865e+05, -2.364871423762034e+05, -2.364219662381465e+05, -2.363566266593634e+05,
- -2.362911245545333e+05, -2.362254608308465e+05, -2.361596363880932e+05, -2.360936521187368e+05, -2.360275089079977e+05,
- -2.359612076339326e+05, -2.358947491675099e+05, -2.358281343726858e+05, -2.357613641064812e+05, -2.356944392190573e+05,
- -2.356273605537860e+05, -2.355601289473239e+05, -2.354927452296846e+05, -2.354252102243073e+05, -2.353575247481277e+05,
- -2.352896896116468e+05, -2.352217056189982e+05, -2.351535735680136e+05, -2.350852942502919e+05, -2.350168684512608e+05,
- -2.349482969502439e+05, -2.348795805205225e+05, -2.348107199293987e+05, -2.347417159382573e+05, -2.346725693026259e+05,
- -2.346032807722361e+05, -2.345338510910829e+05, -2.344642809974830e+05, -2.343945712241313e+05, -2.343247224981613e+05,
- -2.342547355411984e+05, -2.341846110694166e+05, -2.341143497935949e+05, -2.340439524191698e+05, -2.339734196462892e+05,
- -2.339027521698659e+05, -2.338319506796300e+05, -2.337610158601795e+05, -2.336899483910324e+05, -2.336187489466766e+05,
- -2.335474181966189e+05, -2.334759568054360e+05, -2.334043654328200e+05, -2.333326447336296e+05, -2.332607953579361e+05,
- -2.331888179510677e+05, -2.331167131536598e+05, -2.330444816016983e+05, -2.329721239265644e+05, -2.328996407550798e+05,
- -2.328270327095503e+05, -2.327543004078105e+05, -2.326814444632639e+05, -2.326084654849278e+05, -2.325353640774746e+05,
- -2.324621408412727e+05, -2.323887963724268e+05, -2.323153312628196e+05, -2.322417461001520e+05, -2.321680414679805e+05,
- -2.320942179457575e+05, -2.320202761088698e+05, -2.319462165286767e+05, -2.318720397725471e+05, -2.317977464038979e+05,
- -2.317233369822281e+05, -2.316488120631578e+05, -2.315741721984634e+05, -2.314994179361124e+05, -2.314245498202991e+05,
- -2.313495683914786e+05, -2.312744741864012e+05, -2.311992677381466e+05, -2.311239495761585e+05, -2.310485202262750e+05,
- -2.309729802107628e+05, -2.308973300483507e+05, -2.308215702542588e+05, -2.307457013402332e+05, -2.306697238145744e+05,
- -2.305936381821707e+05, -2.305174449445272e+05, -2.304411445997953e+05, -2.303647376428058e+05, -2.302882245650948e+05,
- -2.302116058549344e+05, -2.301348819973622e+05, -2.300580534742097e+05, -2.299811207641287e+05, -2.299040843426226e+05,
- -2.298269446820698e+05, -2.297497022517552e+05, -2.296723575178941e+05, -2.295949109436622e+05, -2.295173629892170e+05,
- -2.294397141117291e+05, -2.293619647654057e+05, -2.292841154015153e+05, -2.292061664684164e+05, -2.291281184115774e+05,
- -2.290499716736065e+05, -2.289717266942722e+05, -2.288933839105316e+05, -2.288149437565492e+05, -2.287364066637256e+05,
- -2.286577730607180e+05, -2.285790433734639e+05, -2.285002180252061e+05, -2.284212974365110e+05, -2.283422820252969e+05,
- -2.282631722068508e+05, -2.281839683938543e+05, -2.281046709964025e+05, -2.280252804220291e+05, -2.279457970757236e+05,
- -2.278662213599556e+05, -2.277865536746937e+05, -2.277067944174275e+05, -2.276269439831876e+05, -2.275470027645652e+05,
- -2.274669711517339e+05, -2.273868495324674e+05, -2.273066382921606e+05, -2.272263378138477e+05, -2.271459484782235e+05
- },
- {
- 2.186341740753333e+04, 1.998069574559477e+04, 1.806445661479401e+04, 1.611296041921253e+04, 1.412431503557940e+04,
- 1.209645659693792e+04, 1.002712705489240e+04, 7.913847838285516e+03, 5.753888746041501e+03, 3.544230979583151e+03,
- 1.281522910412445e+03, -1.037973236280809e+03, -3.418446163595465e+03, -5.864614904721811e+03, -8.381827075009998e+03,
- -1.097618172679815e+04, -1.365468474840482e+04, -1.642544795517680e+04, -1.929794781453031e+04, -2.228336707968448e+04,
- -2.539505411318980e+04, -2.864915326700915e+04, -3.206549071445540e+04, -3.566885395211109e+04, -3.949090071321788e+04,
- -4.357311967050466e+04, -4.797164497733285e+04, -5.276556374624390e+04, -5.807239248111154e+04, -6.408005680665883e+04,
- -7.112363823504013e+04, -7.991984676319371e+04, -9.274801166807635e+04, -2.083430442934275e+05, -2.107047915380159e+05,
- -2.126073254271227e+05, -2.142150459182425e+05, -2.156141357072992e+05, -2.168562243373400e+05, -2.179750143987370e+05,
- -2.189938828438144e+05, -2.199297988196679e+05, -2.207955243229205e+05, -2.216009337737354e+05, -2.223538472151687e+05,
- -2.230605789985438e+05, -2.237263119734326e+05, -2.243553603480603e+05, -2.249513590985074e+05, -2.255174034974633e+05,
- -2.260561539059582e+05, -2.265699158323274e+05, -2.270607020320893e+05, -2.275302813364386e+05, -2.279802175176283e+05,
- -2.284119005675748e+05, -2.288265721241094e+05, -2.292253463293508e+05, -2.296092270841878e+05, -2.299791224312119e+05,
- -2.303358566287496e+05, -2.306801803527613e+05, -2.310127793689416e+05, -2.313342819457153e+05, -2.316452652239816e+05,
- -2.319462607170328e+05, -2.322377590810168e+05, -2.325202142703150e+05, -2.327940471716131e+05, -2.330596487940181e+05,
- -2.333173830793907e+05, -2.335675893863891e+05, -2.338105846930656e+05, -2.340466655557547e+05, -2.342761098561882e+05,
- -2.344991783639369e+05, -2.347161161373000e+05, -2.349271537824295e+05, -2.351325085876771e+05, -2.353323855478196e+05,
- -2.355269782908286e+05, -2.357164699181708e+05, -2.359010337682065e+05, -2.360808341110265e+05, -2.362560267820261e+05,
- -2.364267597606268e+05, -2.365931736997737e+05, -2.367554024111761e+05, -2.369135733106825e+05, -2.370678078276713e+05,
- -2.372182217819156e+05, -2.373649257309825e+05, -2.375080252909065e+05, -2.376476214325771e+05, -2.377838107560267e+05,
- -2.379166857445758e+05, -2.380463350005911e+05, -2.381728434644435e+05, -2.382962926180829e+05, -2.384167606745177e+05,
- -2.385343227543622e+05, -2.386490510504968e+05, -2.387610149817984e+05, -2.388702813368004e+05, -2.389769144080710e+05,
- -2.390809761180229e+05, -2.391825261368018e+05, -2.392816219928567e+05, -2.393783191767198e+05, -2.394726712385079e+05,
- -2.395647298795871e+05, -2.396545450388236e+05, -2.397421649737971e+05, -2.398276363373353e+05, -2.399110042496808e+05,
- -2.399923123665997e+05, -2.400716029436933e+05, -2.401489168971744e+05, -2.402242938613345e+05, -2.402977722429211e+05,
- -2.403693892726409e+05, -2.404391810540650e+05, -2.405071826098041e+05, -2.405734279252898e+05, -2.406379499903882e+05,
- -2.407007808389253e+05, -2.407619515862290e+05, -2.408214924648300e+05, -2.408794328289153e+05, -2.409358012834333e+05,
- -2.409906256097945e+05, -2.410439328217038e+05, -2.410957492153771e+05, -2.411461003851564e+05, -2.411950112489217e+05,
- -2.412425060723441e+05, -2.412886084920447e+05, -2.413333415377183e+05, -2.413767276532773e+05, -2.414187887170661e+05,
- -2.414595460612002e+05, -2.414990204900687e+05, -2.415372322980497e+05, -2.415742012864733e+05, -2.416099467798782e+05,
- -2.416444876415853e+05, -2.416778422886386e+05, -2.417100287061293e+05, -2.417410644609415e+05, -2.417709667149491e+05,
- -2.417997522376833e+05, -2.418274374193368e+05, -2.418540382790388e+05, -2.418795704813565e+05, -2.419040493434964e+05,
- -2.419274898466287e+05, -2.419499066458841e+05, -2.419713140799832e+05, -2.419917261804985e+05, -2.420111566807819e+05,
- -2.420296190245583e+05, -2.420471263742115e+05, -2.420636916187672e+05, -2.420793273815914e+05, -2.420940460293718e+05,
- -2.421078596729565e+05, -2.421207801839062e+05, -2.421328191946301e+05, -2.421439881064889e+05, -2.421542980960165e+05,
- -2.421637601209272e+05, -2.421723849259233e+05, -2.421801830483065e+05, -2.421871648234016e+05, -2.421933403898023e+05,
- -2.421987196944466e+05, -2.422033124975222e+05, -2.422071283772169e+05, -2.422101767343167e+05, -2.422124667966541e+05,
- -2.422140076234176e+05, -2.422148081093266e+05, -2.422148769886729e+05, -2.422142228392390e+05, -2.422128540860931e+05,
- -2.422107790052722e+05, -2.422080057273484e+05, -2.422045422408889e+05, -2.422003963958141e+05, -2.421955759066515e+05,
- -2.421900883556975e+05, -2.421839411960819e+05, -2.421771417547458e+05, -2.421696972353308e+05, -2.421616147209854e+05,
- -2.421529011770914e+05, -2.421435634539097e+05, -2.421336082891556e+05, -2.421230423104977e+05, -2.421118720379860e+05,
- -2.421001038864173e+05, -2.420877441676284e+05, -2.420747990927326e+05, -2.420612747742887e+05, -2.420471772284175e+05,
- -2.420325123768546e+05, -2.420172860489519e+05, -2.420015039836260e+05, -2.419851718242441e+05, -2.419682951488052e+05,
- -2.419508794287585e+05, -2.419329300597309e+05, -2.419144523559049e+05, -2.418954515516743e+05, -2.418759328032647e+05,
- -2.418559011903071e+05, -2.418353617173746e+05, -2.418143193154792e+05, -2.417927788435308e+05, -2.417707450897602e+05,
- -2.417482227731058e+05, -2.417252165445660e+05, -2.417017309885206e+05, -2.416777706240169e+05, -2.416533399060240e+05,
- -2.416284432266612e+05, -2.416030849375756e+05, -2.415772692676021e+05, -2.415510004473699e+05, -2.415242826292676e+05,
- -2.414971199085328e+05, -2.414695163243125e+05, -2.414414758606979e+05, -2.414130024477360e+05, -2.413840999624189e+05,
- -2.413547722296462e+05, -2.413250230231709e+05, -2.412948560665185e+05, -2.412642750338903e+05, -2.412332835510407e+05,
- -2.412018851961403e+05, -2.411700835006146e+05, -2.411378819499686e+05, -2.411052839845888e+05, -2.410722930005322e+05,
- -2.410389123502927e+05, -2.410051453435556e+05, -2.409709952479325e+05, -2.409364652896809e+05, -2.409015586544098e+05,
- -2.408662784877686e+05, -2.408306278961203e+05, -2.407946099472046e+05, -2.407582276707820e+05, -2.407214840592669e+05,
- -2.406843820683470e+05, -2.406469246175900e+05, -2.406091145910376e+05, -2.405709548377858e+05, -2.405324481725563e+05,
- -2.404935973762524e+05, -2.404544051965074e+05, -2.404148743482175e+05, -2.403750075140681e+05, -2.403348073450482e+05,
- -2.402942764609515e+05, -2.402534174508725e+05, -2.402122328736876e+05, -2.401707252585321e+05, -2.401288971052616e+05,
- -2.400867508849107e+05, -2.400442890401368e+05, -2.400015139856607e+05, -2.399584281086943e+05, -2.399150337693604e+05,
- -2.398713333011099e+05, -2.398273290111230e+05, -2.397830231807072e+05, -2.397384180656884e+05, -2.396935158967925e+05,
- -2.396483188800201e+05, -2.396028291970148e+05, -2.395570490054258e+05, -2.395109804392592e+05, -2.394646256092296e+05,
- -2.394179866030980e+05, -2.393710654860098e+05, -2.393238643008218e+05, -2.392763850684257e+05, -2.392286297880669e+05,
- -2.391806004376518e+05, -2.391322989740571e+05, -2.390837273334294e+05, -2.390348874314780e+05, -2.389857811637656e+05,
- -2.389364104059940e+05, -2.388867770142812e+05, -2.388368828254368e+05, -2.387867296572301e+05, -2.387363193086584e+05,
- -2.386856535602029e+05, -2.386347341740877e+05, -2.385835628945281e+05, -2.385321414479798e+05, -2.384804715433802e+05,
- -2.384285548723874e+05, -2.383763931096143e+05, -2.383239879128581e+05, -2.382713409233282e+05, -2.382184537658691e+05,
- -2.381653280491758e+05, -2.381119653660131e+05, -2.380583672934256e+05, -2.380045353929448e+05, -2.379504712107946e+05,
- -2.378961762780926e+05, -2.378416521110472e+05, -2.377869002111526e+05, -2.377319220653807e+05, -2.376767191463681e+05,
- -2.376212929126034e+05, -2.375656448086062e+05, -2.375097762651095e+05, -2.374536886992350e+05, -2.373973835146652e+05,
- -2.373408621018160e+05, -2.372841258380038e+05, -2.372271760876112e+05, -2.371700142022496e+05, -2.371126415209192e+05,
- -2.370550593701667e+05, -2.369972690642407e+05, -2.369392719052431e+05, -2.368810691832826e+05, -2.368226621766191e+05,
- -2.367640521518106e+05, -2.367052403638583e+05, -2.366462280563450e+05, -2.365870164615775e+05, -2.365276068007199e+05,
- -2.364680002839315e+05, -2.364081981104974e+05, -2.363482014689617e+05, -2.362880115372537e+05, -2.362276294828158e+05,
- -2.361670564627296e+05, -2.361062936238380e+05, -2.360453421028649e+05, -2.359842030265387e+05, -2.359228775117060e+05,
- -2.358613666654488e+05, -2.357996715852002e+05, -2.357377933588554e+05, -2.356757330648826e+05, -2.356134917724337e+05,
- -2.355510705414491e+05, -2.354884704227686e+05, -2.354256924582298e+05, -2.353627376807781e+05, -2.352996071145617e+05,
- -2.352363017750368e+05, -2.351728226690636e+05, -2.351091707950043e+05, -2.350453471428195e+05, -2.349813526941616e+05,
- -2.349171884224697e+05, -2.348528552930602e+05, -2.347883542632176e+05, -2.347236862822848e+05, -2.346588522917502e+05,
- -2.345938532253347e+05, -2.345286900090773e+05, -2.344633635614213e+05, -2.343978747932943e+05, -2.343322246081938e+05,
- -2.342664139022660e+05, -2.342004435643872e+05, -2.341343144762405e+05, -2.340680275123971e+05, -2.340015835403892e+05,
- -2.339349834207878e+05, -2.338682280072781e+05, -2.338013181467307e+05, -2.337342546792763e+05, -2.336670384383762e+05,
- -2.335996702508942e+05, -2.335321509371658e+05, -2.334644813110658e+05, -2.333966621800792e+05, -2.333286943453660e+05,
- -2.332605786018266e+05, -2.331923157381706e+05, -2.331239065369775e+05, -2.330553517747624e+05, -2.329866522220386e+05,
- -2.329178086433788e+05, -2.328488217974773e+05, -2.327796924372094e+05, -2.327104213096916e+05, -2.326410091563390e+05,
- -2.325714567129280e+05, -2.325017647096461e+05, -2.324319338711556e+05, -2.323619649166458e+05, -2.322918585598883e+05,
- -2.322216155092928e+05, -2.321512364679595e+05, -2.320807221337344e+05, -2.320100731992589e+05, -2.319392903520233e+05,
- -2.318683742744180e+05, -2.317973256437829e+05, -2.317261451324589e+05, -2.316548334078362e+05, -2.315833911324028e+05,
- -2.315118189637915e+05, -2.314401175548314e+05, -2.313682875535894e+05, -2.312963296034212e+05, -2.312242443430139e+05,
- -2.311520324064319e+05, -2.310796944231635e+05, -2.310072310181618e+05, -2.309346428118908e+05, -2.308619304203673e+05,
- -2.307890944552037e+05, -2.307161355236498e+05, -2.306430542286346e+05, -2.305698511688077e+05, -2.304965269385781e+05,
- -2.304230821281568e+05, -2.303495173235944e+05, -2.302758331068211e+05, -2.302020300556847e+05, -2.301281087439898e+05,
- -2.300540697415342e+05, -2.299799136141476e+05, -2.299056409237274e+05, -2.298312522282761e+05, -2.297567480819359e+05,
- -2.296821290350256e+05, -2.296073956340752e+05, -2.295325484218613e+05, -2.294575879374408e+05, -2.293825147161838e+05,
- -2.293073292898111e+05, -2.292320321864220e+05, -2.291566239305320e+05, -2.290811050431012e+05, -2.290054760415702e+05,
- -2.289297374398895e+05, -2.288538897485504e+05, -2.287779334746180e+05, -2.287018691217610e+05, -2.286256971902799e+05,
- -2.285494181771421e+05, -2.284730325760059e+05, -2.283965408772529e+05, -2.283199435680172e+05, -2.282432411322115e+05,
- -2.281664340505598e+05, -2.280895228006205e+05, -2.280125078568180e+05, -2.279353896904683e+05, -2.278581687698055e+05,
- -2.277808455600110e+05, -2.277034205232380e+05, -2.276258941186375e+05, -2.275482668023869e+05, -2.274705390277125e+05,
- -2.273927112449178e+05, -2.273147839014049e+05, -2.272367574417036e+05, -2.271586323074935e+05, -2.270804089376281e+05,
- -2.270020877681602e+05, -2.269236692323662e+05, -2.268451537607666e+05, -2.267665417811521e+05, -2.266878337186066e+05,
- -2.266090299955276e+05, -2.265301310316525e+05, -2.264511372440770e+05, -2.263720490472807e+05, -2.262928668531460e+05,
- -2.262135910709824e+05, -2.261342221075446e+05, -2.260547603670584e+05, -2.259752062512365e+05, -2.258955601593038e+05,
- -2.258158224880140e+05, -2.257359936316736e+05, -2.256560739821584e+05, -2.255760639289371e+05, -2.254959638590880e+05
- },
- {
- 2.273305055551828e+04, 2.086469309921926e+04, 1.896355615838895e+04, 1.702796879198023e+04, 1.505611617110021e+04,
- 1.304602180414245e+04, 1.099552684579879e+04, 8.902265879235158e+03, 6.763638416299155e+03, 4.576775150953789e+03,
- 2.338497740361991e+03, 4.527053363297284e+01, -2.306857807074568e+03, -4.722325496533671e+03, -7.206145226210726e+03,
- -9.764013027051828e+03, -1.240244503454520e+04, -1.512895138239183e+04, -1.795226027105181e+04, -2.088261101904083e+04,
- -2.393214380426028e+04, -2.711542792180723e+04, -3.045019347650378e+04, -3.395837054014276e+04, -3.766760871454250e+04,
- -4.161357760690431e+04, -4.584359790957146e+04, -5.042267526824482e+04, -5.544420115082611e+04, -6.105062242927185e+04,
- -6.747836236106497e+04, -7.517423340046503e+04, -8.520375885432631e+04, -2.011482017164672e+05, -2.048289074284027e+05,
- -2.074333253243537e+05, -2.094953348424258e+05, -2.112193159511093e+05, -2.127086842759275e+05, -2.140239311500864e+05,
- -2.152038522625978e+05, -2.162749899973104e+05, -2.172564001223705e+05, -2.181622852125003e+05, -2.190035522155508e+05,
- -2.197887845672668e+05, -2.205248759822454e+05, -2.212174589270517e+05, -2.218712033089457e+05, -2.224900302407497e+05,
- -2.230772685585345e+05, -2.236357717364950e+05, -2.241680067739923e+05, -2.246761228419724e+05, -2.251620050463719e+05,
- -2.256273170692480e+05, -2.260735353755820e+05, -2.265019769386449e+05, -2.269138219240782e+05, -2.273101324092674e+05,
- -2.276918679529330e+05, -2.280598986389115e+05, -2.284150160770092e+05, -2.287579427382974e+05, -2.290893399224530e+05,
- -2.294098145938599e+05, -2.297199252762255e+05, -2.300201871589626e+05, -2.303110765399469e+05, -2.305930347066481e+05,
- -2.308664713396120e+05, -2.311317675078383e+05, -2.313892783139631e+05, -2.316393352376971e+05, -2.318822482182580e+05,
- -2.321183075102132e+05, -2.323477853419215e+05, -2.325709374014289e+05, -2.327880041710840e+05, -2.329992121291049e+05,
- -2.332047748338149e+05, -2.334048939041100e+05, -2.335997599079286e+05, -2.337895531689493e+05, -2.339744445004336e+05,
- -2.341545958740124e+05, -2.343301610302507e+05, -2.345012860369997e+05, -2.346681098008284e+05, -2.348307645362129e+05,
- -2.349893761966187e+05, -2.351440648711479e+05, -2.352949451500133e+05, -2.354421264617516e+05, -2.355857133847615e+05,
- -2.357258059354939e+05, -2.358624998353659e+05, -2.359958867582719e+05, -2.361260545603556e+05, -2.362530874935662e+05,
- -2.363770664043472e+05, -2.364980689186951e+05, -2.366161696146978e+05, -2.367314401835594e+05, -2.368439495800226e+05,
- -2.369537641630269e+05, -2.370609478273477e+05, -2.371655621269081e+05, -2.372676663903966e+05, -2.373673178297497e+05,
- -2.374645716420360e+05, -2.375594811052121e+05, -2.376520976681936e+05, -2.377424710356432e+05, -2.378306492478414e+05,
- -2.379166787559848e+05, -2.380006044932230e+05, -2.380824699417208e+05, -2.381623171960056e+05, -2.382401870228647e+05,
- -2.383161189179914e+05, -2.383901511608286e+05, -2.384623208671522e+05, -2.385326640111742e+05, -2.386012155346191e+05,
- -2.386680093207156e+05, -2.387330782717089e+05, -2.387964543403913e+05, -2.388581685428582e+05, -2.389182510809195e+05,
- -2.389767312488568e+05, -2.390336375739387e+05, -2.390889977730790e+05, -2.391428388213243e+05, -2.391951869693104e+05,
- -2.392460677696348e+05, -2.392955061020240e+05, -2.393435261973539e+05, -2.393901516605964e+05, -2.394354054927427e+05,
- -2.394793101117591e+05, -2.395218873726296e+05, -2.395631585865275e+05, -2.396031445391719e+05, -2.396418655083923e+05,
- -2.396793412809648e+05, -2.397155911687399e+05, -2.397506340241023e+05, -2.397844882547981e+05, -2.398171718381578e+05,
- -2.398487023347469e+05, -2.398790969014702e+05, -2.399083723049116e+05, -2.399365449303268e+05, -2.399636307980292e+05,
- -2.399896455712933e+05, -2.400146045679371e+05, -2.400385227706518e+05, -2.400614148369471e+05, -2.400832951087179e+05,
- -2.401041776214640e+05, -2.401240761131593e+05, -2.401430040328089e+05, -2.401609745503345e+05, -2.401780005578133e+05,
- -2.401940946873677e+05, -2.402092693116170e+05, -2.402235365525708e+05, -2.402369082885076e+05, -2.402493961606194e+05,
- -2.402610115794209e+05, -2.402717657309455e+05, -2.402816695827285e+05, -2.402907338895897e+05, -2.402989691992223e+05,
- -2.403063858575967e+05, -2.403129940141857e+05, -2.403188036270202e+05, -2.403238244675790e+05, -2.403280661255217e+05,
- -2.403315380132693e+05, -2.403342493704410e+05, -2.403362092681465e+05, -2.403374266131494e+05, -2.403379101518959e+05,
- -2.403376684744208e+05, -2.403367100181332e+05, -2.403350430714870e+05, -2.403326757775373e+05, -2.403296161373943e+05,
- -2.403258720135679e+05, -2.403214511332178e+05, -2.403163610913037e+05, -2.403106093536454e+05, -2.403042032598925e+05,
- -2.402971500264067e+05, -2.402894567490629e+05, -2.402811304059696e+05, -2.402721778601091e+05, -2.402626058619077e+05,
- -2.402524210517292e+05, -2.402416299623007e+05, -2.402302390210702e+05, -2.402182545525023e+05, -2.402056827734591e+05,
- -2.401925298230424e+05, -2.401788017227318e+05, -2.401645044067424e+05, -2.401496437168600e+05, -2.401342254043870e+05,
- -2.401182551320350e+05, -2.401017384757661e+05, -2.400846809265892e+05, -2.400670878923058e+05, -2.400489646992130e+05,
- -2.400303165937606e+05, -2.400111487441690e+05, -2.399914662419994e+05, -2.399712741036918e+05, -2.399505772720602e+05,
- -2.399293806177471e+05, -2.399076889406509e+05, -2.398855069713049e+05, -2.398628393722373e+05, -2.398396907392818e+05,
- -2.398160656028716e+05, -2.397919684491880e+05, -2.397674036429827e+05, -2.397423755446410e+05, -2.397168884352310e+05,
- -2.396909465363972e+05, -2.396645540114728e+05, -2.396377149665640e+05, -2.396104334516127e+05, -2.395827134614279e+05,
- -2.395545589367004e+05, -2.395259737649879e+05, -2.394969617816840e+05, -2.394675267709565e+05, -2.394376724666715e+05,
- -2.394074025532952e+05, -2.393767206667711e+05, -2.393456303953825e+05, -2.393141352805937e+05, -2.392822388178718e+05,
- -2.392499444574919e+05, -2.392172556053231e+05, -2.391841756235975e+05, -2.391507078316644e+05, -2.391168555067243e+05,
- -2.390826218845508e+05, -2.390480101601952e+05, -2.390130234886747e+05, -2.389776649856498e+05, -2.389419377280826e+05,
- -2.389058447548837e+05, -2.388693890675475e+05, -2.388325736307698e+05, -2.387954013730543e+05, -2.387578751873086e+05,
- -2.387199979314245e+05, -2.386817724288492e+05, -2.386432014691425e+05, -2.386042878085248e+05, -2.385650341704115e+05,
- -2.385254432459386e+05, -2.384855176944777e+05, -2.384452601441389e+05, -2.384046731922651e+05, -2.383637594059164e+05,
- -2.383225213223439e+05, -2.382809614494561e+05, -2.382390822662741e+05, -2.381968862233783e+05, -2.381543757433471e+05,
- -2.381115532211880e+05, -2.380684210247571e+05, -2.380249814951748e+05, -2.379812369472285e+05, -2.379371896697728e+05,
- -2.378928419261198e+05, -2.378481959544196e+05, -2.378032539680386e+05, -2.377580181559260e+05, -2.377124906829770e+05,
- -2.376666736903866e+05, -2.376205692959986e+05, -2.375741795946473e+05, -2.375275066584929e+05, -2.374805525373517e+05,
- -2.374333192590182e+05, -2.373858088295841e+05, -2.373380232337482e+05, -2.372899644351247e+05, -2.372416343765431e+05,
- -2.371930349803409e+05, -2.371441681486589e+05, -2.370950357637204e+05, -2.370456396881150e+05, -2.369959817650711e+05,
- -2.369460638187259e+05, -2.368958876543928e+05, -2.368454550588193e+05, -2.367947678004448e+05, -2.367438276296518e+05,
- -2.366926362790127e+05, -2.366411954635338e+05, -2.365895068808925e+05, -2.365375722116746e+05, -2.364853931196016e+05,
- -2.364329712517615e+05, -2.363803082388283e+05, -2.363274056952833e+05, -2.362742652196308e+05, -2.362208883946088e+05,
- -2.361672767873968e+05, -2.361134319498242e+05, -2.360593554185695e+05, -2.360050487153565e+05, -2.359505133471534e+05,
- -2.358957508063624e+05, -2.358407625710086e+05, -2.357855501049247e+05, -2.357301148579360e+05, -2.356744582660376e+05,
- -2.356185817515728e+05, -2.355624867234049e+05, -2.355061745770907e+05, -2.354496466950479e+05, -2.353929044467205e+05,
- -2.353359491887420e+05, -2.352787822650959e+05, -2.352214050072747e+05, -2.351638187344328e+05, -2.351060247535427e+05,
- -2.350480243595443e+05, -2.349898188354925e+05, -2.349314094527036e+05, -2.348727974709004e+05, -2.348139841383522e+05,
- -2.347549706920151e+05, -2.346957583576676e+05, -2.346363483500501e+05, -2.345767418729918e+05, -2.345169401195475e+05,
- -2.344569442721225e+05, -2.343967555026026e+05, -2.343363749724788e+05, -2.342758038329686e+05, -2.342150432251412e+05,
- -2.341540942800345e+05, -2.340929581187734e+05, -2.340316358526873e+05, -2.339701285834228e+05, -2.339084374030596e+05,
- -2.338465633942172e+05, -2.337845076301694e+05, -2.337222711749477e+05, -2.336598550834522e+05, -2.335972604015525e+05,
- -2.335344881661923e+05, -2.334715394054935e+05, -2.334084151388542e+05, -2.333451163770471e+05, -2.332816441223203e+05,
- -2.332179993684902e+05, -2.331541831010379e+05, -2.330901962972023e+05, -2.330260399260726e+05, -2.329617149486789e+05,
- -2.328972223180822e+05, -2.328325629794622e+05, -2.327677378702038e+05, -2.327027479199859e+05, -2.326375940508617e+05,
- -2.325722771773459e+05, -2.325067982064966e+05, -2.324411580379949e+05, -2.323753575642264e+05, -2.323093976703590e+05,
- -2.322432792344233e+05, -2.321770031273871e+05, -2.321105702132322e+05, -2.320439813490302e+05, -2.319772373850149e+05,
- -2.319103391646551e+05, -2.318432875247286e+05, -2.317760832953905e+05, -2.317087273002459e+05, -2.316412203564157e+05,
- -2.315735632746085e+05, -2.315057568591838e+05, -2.314378019082223e+05, -2.313696992135892e+05, -2.313014495609988e+05,
- -2.312330537300793e+05, -2.311645124944348e+05, -2.310958266217078e+05, -2.310269968736426e+05, -2.309580240061404e+05,
- -2.308889087693255e+05, -2.308196519076009e+05, -2.307502541597056e+05, -2.306807162587761e+05, -2.306110389323980e+05,
- -2.305412229026668e+05, -2.304712688862403e+05, -2.304011775943940e+05, -2.303309497330755e+05, -2.302605860029578e+05,
- -2.301900870994911e+05, -2.301194537129557e+05, -2.300486865285117e+05, -2.299777862262529e+05, -2.299067534812528e+05,
- -2.298355889636168e+05, -2.297642933385306e+05, -2.296928672663078e+05, -2.296213114024376e+05, -2.295496263976306e+05,
- -2.294778128978697e+05, -2.294058715444506e+05, -2.293338029740294e+05, -2.292616078186694e+05, -2.291892867058809e+05,
- -2.291168402586691e+05, -2.290442690955750e+05, -2.289715738307184e+05, -2.288987550738413e+05, -2.288258134303465e+05,
- -2.287527495013435e+05, -2.286795638836842e+05, -2.286062571700065e+05, -2.285328299487725e+05, -2.284592828043075e+05,
- -2.283856163168408e+05, -2.283118310625408e+05, -2.282379276135560e+05, -2.281639065380504e+05, -2.280897684002416e+05,
- -2.280155137604357e+05, -2.279411431750664e+05, -2.278666571967278e+05, -2.277920563742105e+05, -2.277173412525386e+05,
- -2.276425123730005e+05, -2.275675702731855e+05, -2.274925154870175e+05, -2.274173485447876e+05, -2.273420699731870e+05,
- -2.272666802953395e+05, -2.271911800308346e+05, -2.271155696957587e+05, -2.270398498027255e+05, -2.269640208609101e+05,
- -2.268880833760756e+05, -2.268120378506086e+05, -2.267358847835439e+05, -2.266596246705978e+05, -2.265832580041978e+05,
- -2.265067852735084e+05, -2.264302069644630e+05, -2.263535235597910e+05, -2.262767355390475e+05, -2.261998433786380e+05,
- -2.261228475518487e+05, -2.260457485288731e+05, -2.259685467768380e+05, -2.258912427598308e+05, -2.258138369389260e+05,
- -2.257363297722116e+05, -2.256587217148132e+05, -2.255810132189227e+05, -2.255032047338181e+05, -2.254252967058952e+05,
- -2.253472895786867e+05, -2.252691837928902e+05, -2.251909797863898e+05, -2.251126779942812e+05, -2.250342788488967e+05,
- -2.249557827798254e+05, -2.248771902139397e+05, -2.247985015754153e+05, -2.247197172857556e+05, -2.246408377638149e+05,
- -2.245618634258176e+05, -2.244827946853829e+05, -2.244036319535449e+05, -2.243243756387765e+05, -2.242450261470063e+05,
- -2.241655838816442e+05, -2.240860492435999e+05, -2.240064226313035e+05, -2.239267044407265e+05, -2.238468950654023e+05
- },
- {
- 2.360368100809248e+04, 2.174950608665221e+04, 1.986327084924248e+04, 1.794337006203180e+04, 1.598806273332699e+04,
- 1.399545567024282e+04, 1.196348439286822e+04, 9.889890864214562e+03, 7.772197369426436e+03, 5.607675696528574e+03,
- 3.393310547661667e+03, 1.125755807779516e+03, -1.198718104323778e+03, -3.584288122022691e+03, -6.035656718898640e+03,
- -8.558148499390278e+03, -1.115783075253390e+04, -1.384166562118860e+04, -1.661770459104665e+04, -1.949534054557951e+04,
- -2.248563954355648e+04, -2.560178525422686e+04, -2.885968627411496e+04, -3.227882517965464e+04, -3.588347736417923e+04,
- -3.970451581537531e+04, -4.378218439509439e+04, -4.817055486268138e+04, -5.294510112459124e+04, -5.821652390615277e+04,
- -6.415850463981684e+04, -7.107144588405998e+04, -7.956281799525408e+04, -9.130062562052933e+04, -1.970762424942075e+05,
- -2.012707721441617e+05, -2.041362179898310e+05, -2.063664894261267e+05, -2.082117045663316e+05, -2.097944563495409e+05,
- -2.111849323080101e+05, -2.124274351478539e+05, -2.135518990225696e+05, -2.145795990038077e+05, -2.155262601650950e+05,
- -2.164038746295650e+05, -2.172218241604505e+05, -2.179876056358344e+05, -2.187073177202923e+05, -2.193859977992967e+05,
- -2.200278616379270e+05, -2.206364778913115e+05, -2.212148978119420e+05, -2.217657534193653e+05, -2.222913330068997e+05,
- -2.227936400596451e+05, -2.232744398271691e+05, -2.237352965703112e+05, -2.241776036667707e+05, -2.246026081803143e+05,
- -2.250114310890062e+05, -2.254050840742673e+05, -2.257844835591262e+05, -2.261504625267976e+05, -2.265037805335508e+05,
- -2.268451322415027e+05, -2.271751547297275e+05, -2.274944337903635e+05, -2.278035093762845e+05, -2.281028803355385e+05,
- -2.283930085429900e+05, -2.286743225199675e+05, -2.289472206169858e+05, -2.292120738219569e+05, -2.294692282460422e+05,
- -2.297190073309497e+05, -2.299617138146207e+05, -2.301976314866135e+05, -2.304270267598236e+05, -2.306501500812891e+05,
- -2.308672372015903e+05, -2.310785103196236e+05, -2.312841791172397e+05, -2.314844416962969e+05, -2.316794854290254e+05,
- -2.318694877312080e+05, -2.320546167664706e+05, -2.322350320889592e+05, -2.324108852307854e+05, -2.325823202398699e+05,
- -2.327494741731445e+05, -2.329124775495032e+05, -2.330714547664028e+05, -2.332265244835652e+05, -2.333777999768650e+05,
- -2.335253894651518e+05, -2.336693964124594e+05, -2.338099198078047e+05, -2.339470544245431e+05, -2.340808910610606e+05,
- -2.342115167643919e+05, -2.343390150382030e+05, -2.344634660364389e+05, -2.345849467438078e+05, -2.347035311441690e+05,
- -2.348192903777805e+05, -2.349322928882910e+05, -2.350426045602656e+05, -2.351502888479730e+05, -2.352554068960942e+05,
- -2.353580176529544e+05, -2.354581779768311e+05, -2.355559427358412e+05, -2.356513649018699e+05, -2.357444956389622e+05,
- -2.358353843865714e+05, -2.359240789380134e+05, -2.360106255144610e+05, -2.360950688347845e+05, -2.361774521815021e+05,
- -2.362578174631169e+05, -2.363362052731861e+05, -2.364126549484679e+05, -2.364872046212664e+05, -2.365598912670054e+05,
- -2.366307506797515e+05, -2.366998177570733e+05, -2.367671262308348e+05, -2.368327089018103e+05, -2.368965975955033e+05,
- -2.369588232977914e+05, -2.370194160865066e+05, -2.370784051916584e+05, -2.371358190478150e+05, -2.371916853137112e+05,
- -2.372460309009243e+05, -2.372988820012188e+05, -2.373502641126289e+05, -2.374002020643589e+05, -2.374487200405573e+05,
- -2.374958416030252e+05, -2.375415897129251e+05, -2.375859867515309e+05, -2.376290545400807e+05, -2.376708143587706e+05,
- -2.377112869649399e+05, -2.377504926104867e+05, -2.377884510585507e+05, -2.378251815995049e+05, -2.378607030662894e+05,
- -2.378950338491127e+05, -2.379281919095665e+05, -2.379601947941653e+05, -2.379910596480232e+05, -2.380208032245899e+05,
- -2.380494419018944e+05, -2.380769916911710e+05, -2.381034682487023e+05, -2.381288868864821e+05, -2.381532625824810e+05,
- -2.381766099905229e+05, -2.381989434497932e+05, -2.382202769957315e+05, -2.382406243617931e+05, -2.382599989987181e+05,
- -2.382784140754167e+05, -2.382958824887282e+05, -2.383124168710373e+05, -2.383280295976216e+05, -2.383427327937425e+05,
- -2.383565383414884e+05, -2.383694578863815e+05, -2.383815028437576e+05, -2.383926844049321e+05, -2.384030135431504e+05,
- -2.384125010193463e+05, -2.384211573877045e+05, -2.384289930010391e+05, -2.384360180159979e+05, -2.384422423980918e+05,
- -2.384476759265686e+05, -2.384523281991239e+05, -2.384562086364641e+05, -2.384593264867246e+05, -2.384616908297476e+05,
- -2.384633105812272e+05, -2.384641944967258e+05, -2.384643511755636e+05, -2.384637890645939e+05, -2.384625164618577e+05,
- -2.384605415201321e+05, -2.384578722503682e+05, -2.384545165250305e+05, -2.384504820813322e+05, -2.384457765243783e+05,
- -2.384404073302160e+05, -2.384343818487965e+05, -2.384277073068481e+05, -2.384203908106709e+05, -2.384124393418670e+05,
- -2.384038597882199e+05, -2.383946589033974e+05, -2.383848433383518e+05, -2.383744196364243e+05, -2.383633942356976e+05,
- -2.383517734712826e+05, -2.383395635775431e+05, -2.383267706902613e+05, -2.383134008487409e+05, -2.382994599978570e+05,
- -2.382849539900502e+05, -2.382698885872664e+05, -2.382542694628458e+05, -2.382381022033628e+05, -2.382213923104177e+05,
- -2.382041452023789e+05, -2.381863662160863e+05, -2.381680606085022e+05, -2.381492335583280e+05, -2.381298901675734e+05,
- -2.381100354630913e+05, -2.380896743980704e+05, -2.380688118534902e+05, -2.380474526395407e+05, -2.380256014970097e+05,
- -2.380032630986301e+05, -2.379804420690119e+05, -2.379571429126275e+05, -2.379333701233336e+05, -2.379091281145057e+05,
- -2.378844212377389e+05, -2.378592537840162e+05, -2.378336299848428e+05, -2.378075540133589e+05, -2.377810299854248e+05,
- -2.377540619606789e+05, -2.377266539435747e+05, -2.376988098843883e+05, -2.376705336802079e+05, -2.376418291758980e+05,
- -2.376127001650423e+05, -2.375831503908628e+05, -2.375531835471228e+05, -2.375228032790055e+05, -2.374920131839740e+05,
- -2.374608168126131e+05, -2.374292176694511e+05, -2.373972192137641e+05, -2.373648248603630e+05, -2.373320379803619e+05,
- -2.372988619019306e+05, -2.372652999110324e+05, -2.372313552521424e+05, -2.371970311289523e+05, -2.371623307050613e+05,
- -2.371272571046522e+05, -2.370918134131468e+05, -2.370560026778607e+05, -2.370198279086281e+05, -2.369832920784276e+05,
- -2.369463981239870e+05, -2.369091489463774e+05, -2.368715474115962e+05, -2.368335963511365e+05, -2.367952985625456e+05,
- -2.367566568099728e+05, -2.367176738247052e+05, -2.366783523056912e+05, -2.366386949200580e+05, -2.365987043036135e+05,
- -2.365583830613416e+05, -2.365177337678865e+05, -2.364767589680265e+05, -2.364354611771408e+05, -2.363938428816664e+05,
- -2.363519065395422e+05, -2.363096545806521e+05, -2.362670894072517e+05, -2.362242133943919e+05, -2.361810288903323e+05,
- -2.361375382169473e+05, -2.360937436701240e+05, -2.360496475201533e+05, -2.360052520121106e+05, -2.359605593662363e+05,
- -2.359155717783007e+05, -2.358702914199680e+05, -2.358247204391506e+05, -2.357788609603593e+05, -2.357327150850437e+05,
- -2.356862848919288e+05, -2.356395724373456e+05, -2.355925797555535e+05, -2.355453088590603e+05, -2.354977617389320e+05,
- -2.354499403650997e+05, -2.354018466866628e+05, -2.353534826321822e+05, -2.353048501099710e+05, -2.352559510083797e+05,
- -2.352067871960786e+05, -2.351573605223292e+05, -2.351076728172569e+05, -2.350577258921163e+05, -2.350075215395517e+05,
- -2.349570615338538e+05, -2.349063476312113e+05, -2.348553815699600e+05, -2.348041650708233e+05, -2.347526998371551e+05,
- -2.347009875551708e+05, -2.346490298941831e+05, -2.345968285068238e+05, -2.345443850292721e+05, -2.344917010814722e+05,
- -2.344387782673480e+05, -2.343856181750169e+05, -2.343322223769985e+05, -2.342785924304199e+05, -2.342247298772169e+05,
- -2.341706362443323e+05, -2.341163130439144e+05, -2.340617617735036e+05, -2.340069839162268e+05, -2.339519809409803e+05,
- -2.338967543026128e+05, -2.338413054421061e+05, -2.337856357867529e+05, -2.337297467503285e+05, -2.336736397332662e+05,
- -2.336173161228212e+05, -2.335607772932399e+05, -2.335040246059230e+05, -2.334470594095851e+05, -2.333898830404139e+05,
- -2.333324968222254e+05, -2.332749020666182e+05, -2.332171000731230e+05, -2.331590921293529e+05, -2.331008795111483e+05,
- -2.330424634827224e+05, -2.329838452968012e+05, -2.329250261947653e+05, -2.328660074067858e+05, -2.328067901519607e+05,
- -2.327473756384480e+05, -2.326877650635967e+05, -2.326279596140769e+05, -2.325679604660069e+05, -2.325077687850793e+05,
- -2.324473857266827e+05, -2.323868124360276e+05, -2.323260500482607e+05, -2.322650996885894e+05, -2.322039624723922e+05,
- -2.321426395053392e+05, -2.320811318835003e+05, -2.320194406934606e+05, -2.319575670124275e+05, -2.318955119083398e+05,
- -2.318332764399749e+05, -2.317708616570532e+05, -2.317082686003428e+05, -2.316454983017600e+05, -2.315825517844695e+05,
- -2.315194300629887e+05, -2.314561341432777e+05, -2.313926650228422e+05, -2.313290236908245e+05, -2.312652111281007e+05,
- -2.312012283073694e+05, -2.311370761932454e+05, -2.310727557423483e+05, -2.310082679033926e+05, -2.309436136172728e+05,
- -2.308787938171508e+05, -2.308138094285417e+05, -2.307486613693950e+05, -2.306833505501808e+05, -2.306178778739678e+05,
- -2.305522442365051e+05, -2.304864505263029e+05, -2.304204976247084e+05, -2.303543864059836e+05, -2.302881177373830e+05,
- -2.302216924792262e+05, -2.301551114849735e+05, -2.300883756012982e+05, -2.300214856681603e+05, -2.299544425188756e+05,
- -2.298872469801865e+05, -2.298198998723319e+05, -2.297524020091156e+05, -2.296847541979723e+05, -2.296169572400357e+05,
- -2.295490119302039e+05, -2.294809190572033e+05, -2.294126794036537e+05, -2.293442937461307e+05, -2.292757628552281e+05,
- -2.292070874956215e+05, -2.291382684261238e+05, -2.290693063997516e+05, -2.290002021637791e+05, -2.289309564598009e+05,
- -2.288615700237854e+05, -2.287920435861348e+05, -2.287223778717401e+05, -2.286525736000371e+05, -2.285826314850611e+05,
- -2.285125522355009e+05, -2.284423365547507e+05, -2.283719851409668e+05, -2.283014986871156e+05, -2.282308778810276e+05,
- -2.281601234054466e+05, -2.280892359380814e+05, -2.280182161516539e+05, -2.279470647139483e+05, -2.278757822878630e+05,
- -2.278043695314511e+05, -2.277328270979740e+05, -2.276611556359451e+05, -2.275893557891775e+05, -2.275174281968278e+05,
- -2.274453734934396e+05, -2.273731923089941e+05, -2.273008852689458e+05, -2.272284529942728e+05, -2.271558961015142e+05,
- -2.270832152028166e+05, -2.270104109059728e+05, -2.269374838144641e+05, -2.268644345275027e+05, -2.267912636400694e+05,
- -2.267179717429550e+05, -2.266445594227995e+05, -2.265710272621296e+05, -2.264973758394005e+05, -2.264236057290290e+05,
- -2.263497175014360e+05, -2.262757117230798e+05, -2.262015889564955e+05, -2.261273497603287e+05, -2.260529946893736e+05,
- -2.259785242946072e+05, -2.259039391232250e+05, -2.258292397186745e+05, -2.257544266206898e+05, -2.256795003653279e+05,
- -2.256044614849967e+05, -2.255293105084939e+05, -2.254540479610353e+05, -2.253786743642903e+05, -2.253031902364118e+05,
- -2.252275960920678e+05, -2.251518924424736e+05, -2.250760797954232e+05, -2.250001586553172e+05, -2.249241295231959e+05,
- -2.248479928967677e+05, -2.247717492704377e+05, -2.246953991353407e+05, -2.246189429793640e+05, -2.245423812871824e+05,
- -2.244657145402813e+05, -2.243889432169875e+05, -2.243120677924960e+05, -2.242350887388967e+05, -2.241580065252036e+05,
- -2.240808216173775e+05, -2.240035344783575e+05, -2.239261455680827e+05, -2.238486553435204e+05, -2.237710642586916e+05,
- -2.236933727646954e+05, -2.236155813097343e+05, -2.235376903391388e+05, -2.234597002953944e+05, -2.233816116181608e+05,
- -2.233034247443009e+05, -2.232251401079012e+05, -2.231467581402969e+05, -2.230682792700944e+05, -2.229897039231953e+05,
- -2.229110325228177e+05, -2.228322654895192e+05, -2.227534032412199e+05, -2.226744461932234e+05, -2.225953947582393e+05,
- -2.225162493464054e+05, -2.224370103653071e+05, -2.223576782199980e+05, -2.222782533130260e+05, -2.221987360444490e+05
- },
- {
- 2.447530800025762e+04, 2.263513720785418e+04, 2.076360702942986e+04, 1.885917513289338e+04, 1.692017108108737e+04,
- 1.494478111808595e+04, 1.293103056057888e+04, 1.087676331373441e+04, 8.779617923108111e+03, 6.636999417470033e+03,
- 4.446046006119829e+03, 2.203589436808294e+03, -9.389252002448600e+01, -2.450333452378281e+03, -4.870148166572516e+03,
- -7.358318495271956e+03, -9.920499718383358e+03, -1.256315395653101e+04, -1.529371934117063e+04, -1.812082735655914e+04,
- -2.105458613464938e+04, -2.410695574928773e+04, -2.729225457210264e+04, -3.062785685788864e+04, -3.413517712034005e+04,
- -3.784109846749695e+04, -4.178011457938814e+04, -4.599767092859287e+04, -5.055563425443113e+04, -5.554180378327566e+04,
- -6.108779835432410e+04, -6.740646226733096e+04, -7.488308701179735e+04, -8.436078380464090e+04, -9.864281238091849e+04,
- -1.929319770890749e+05, -1.976812617440289e+05, -2.008208707487659e+05, -2.032258060356727e+05, -2.051959590049906e+05,
- -2.068744438162682e+05, -2.083417279463487e+05, -2.096479179840556e+05, -2.108265069539139e+05, -2.119010899802137e+05,
- -2.128889783960049e+05, -2.138032913105161e+05, -2.146542369814747e+05, -2.154499348329112e+05, -2.161969632972669e+05,
- -2.169007368774950e+05, -2.175657729249275e+05, -2.181958849582800e+05, -2.187943257166594e+05, -2.193638949929240e+05,
- -2.199070222665406e+05, -2.204258309637772e+05, -2.209221890956053e+05, -2.213977496405866e+05, -2.218539831002675e+05,
- -2.222922040042943e+05, -2.227135926847717e+05, -2.231192133123291e+05, -2.235100289492917e+05, -2.238869142012582e+05,
- -2.242506659190059e+05, -2.246020123053830e+05, -2.249416207079798e+05, -2.252701043217137e+05, -2.255880279816201e+05,
- -2.258959131919004e+05, -2.261942425103560e+05, -2.264834633859678e+05, -2.267639915303459e+05, -2.270362138900590e+05,
- -2.273004912757685e+05, -2.275571606950775e+05, -2.278065374286181e+05, -2.280489168828355e+05, -2.282845762478997e+05,
- -2.285137759850146e+05, -2.287367611639030e+05, -2.289537626683444e+05, -2.291649982851699e+05, -2.293706736900611e+05,
- -2.295709833417243e+05, -2.297661112945367e+05, -2.299562319384533e+05, -2.301415106738973e+05, -2.303221045283935e+05,
- -2.304981627209061e+05, -2.306698271791298e+05, -2.308372330143882e+05, -2.310005089582485e+05, -2.311597777645166e+05,
- -2.313151565798587e+05, -2.314667572859623e+05, -2.316146868158165e+05, -2.317590474464411e+05, -2.318999370701412e+05,
- -2.320374494461547e+05, -2.321716744343780e+05, -2.323026982126812e+05, -2.324306034791815e+05, -2.325554696407108e+05,
- -2.326773729885958e+05, -2.327963868627680e+05, -2.329125818051182e+05, -2.330260257029371e+05, -2.331367839232055e+05,
- -2.332449194384212e+05, -2.333504929446047e+05, -2.334535629720552e+05, -2.335541859893917e+05, -2.336524165013605e+05,
- -2.337483071408539e+05, -2.338419087555498e+05, -2.339332704895463e+05, -2.340224398603311e+05, -2.341094628314124e+05,
- -2.341943838808913e+05, -2.342772460662576e+05, -2.343580910863256e+05, -2.344369593418429e+05, -2.345138899876417e+05,
- -2.345889209346381e+05, -2.346620890492935e+05, -2.347334300226167e+05, -2.348029785120725e+05, -2.348707681629415e+05,
- -2.349368316482921e+05, -2.350012006986702e+05, -2.350639061725029e+05, -2.351249780375112e+05, -2.351844454398809e+05,
- -2.352423367260204e+05, -2.352986794722675e+05, -2.353535005132114e+05, -2.354068259687086e+05, -2.354586812696576e+05,
- -2.355090911826101e+05, -2.355580798332750e+05, -2.356056707289782e+05, -2.356518867801337e+05, -2.356967503207745e+05,
- -2.357402831281973e+05, -2.357825064417641e+05, -2.358234409809071e+05, -2.358631069623713e+05, -2.359015241167403e+05,
- -2.359387117042775e+05, -2.359746885301187e+05, -2.360094729588417e+05, -2.360430829284570e+05, -2.360755359644183e+05,
- -2.361068491901063e+05, -2.361370393429310e+05, -2.361661227836884e+05, -2.361941155086597e+05, -2.362210331606180e+05,
- -2.362468910394111e+05, -2.362717041139623e+05, -2.362954870247024e+05, -2.363182541042592e+05, -2.363400193789173e+05,
- -2.363607965793214e+05, -2.363805991489178e+05, -2.363994402520937e+05, -2.364173327820208e+05, -2.364342893682297e+05,
- -2.364503223839067e+05, -2.364654439529430e+05, -2.364796659567379e+05, -2.364930000407667e+05, -2.365054576209237e+05,
- -2.365170498896526e+05, -2.365277878218674e+05, -2.365376821806764e+05, -2.365467435229171e+05, -2.365549822045065e+05,
- -2.365624083856192e+05, -2.365690320356932e+05, -2.365748629382780e+05, -2.365799106957224e+05, -2.365841847337212e+05,
- -2.365876943057073e+05, -2.365904484971144e+05, -2.365924562295032e+05, -2.365937262645580e+05, -2.365942672079655e+05,
- -2.365940875131695e+05, -2.365931954850119e+05, -2.365915992832699e+05, -2.365893069260791e+05, -2.365863262932577e+05,
- -2.365826651227275e+05, -2.365783310411891e+05, -2.365733315253522e+05, -2.365676739330968e+05, -2.365613654992006e+05,
- -2.365544133381207e+05, -2.365468244466983e+05, -2.365386057067859e+05, -2.365297638878001e+05, -2.365203056492037e+05,
- -2.365102375429183e+05, -2.364995660156691e+05, -2.364882974112673e+05, -2.364764379728275e+05, -2.364639938449269e+05,
- -2.364509710757055e+05, -2.364373756189082e+05, -2.364232133358753e+05, -2.364084899974767e+05, -2.363932112859989e+05,
- -2.363773827969770e+05, -2.363610100409857e+05, -2.363440984453767e+05, -2.363266533559771e+05, -2.363086800387397e+05,
- -2.362901836813543e+05, -2.362711693948158e+05, -2.362516422149537e+05, -2.362316071039230e+05, -2.362110689516581e+05,
- -2.361900325772892e+05, -2.361685027478552e+05, -2.361464841114470e+05, -2.361239812992082e+05, -2.361009988605442e+05,
- -2.360775412806376e+05, -2.360536129816702e+05, -2.360292183240165e+05, -2.360043616074066e+05, -2.359790470720631e+05,
- -2.359532788998102e+05, -2.359270612151582e+05, -2.359003980863618e+05, -2.358732935264519e+05, -2.358457514942457e+05,
- -2.358177758953357e+05, -2.357893705830493e+05, -2.357605393593939e+05, -2.357312859759746e+05, -2.357016141348967e+05,
- -2.356715274896408e+05, -2.356410296459277e+05, -2.356101241625540e+05, -2.355788145522167e+05, -2.355471042823161e+05,
- -2.355149967757411e+05, -2.354824954116408e+05, -2.354496035261723e+05, -2.354163244132405e+05, -2.353826613252152e+05,
- -2.353486174736384e+05, -2.353141960299096e+05, -2.352794001259651e+05, -2.352442328549367e+05, -2.352086972717965e+05,
- -2.351727963939919e+05, -2.351365332020665e+05, -2.350999106402632e+05, -2.350629316171223e+05, -2.350255990060612e+05,
- -2.349879156459458e+05, -2.349498843416478e+05, -2.349115078645926e+05, -2.348727889532965e+05, -2.348337303138885e+05,
- -2.347943346206280e+05, -2.347546045164082e+05, -2.347145426132505e+05, -2.346741514927885e+05, -2.346334337067431e+05,
- -2.345923917773886e+05, -2.345510281980085e+05, -2.345093454333444e+05, -2.344673459200318e+05, -2.344250320670341e+05,
- -2.343824062560626e+05, -2.343394708419911e+05, -2.342962281532614e+05, -2.342526804922816e+05, -2.342088301358194e+05,
- -2.341646793353804e+05, -2.341202303175897e+05, -2.340754852845569e+05, -2.340304464142419e+05, -2.339851158608061e+05,
- -2.339394957549665e+05, -2.338935882043336e+05, -2.338473952937501e+05, -2.338009190856203e+05, -2.337541616202347e+05,
- -2.337071249160861e+05, -2.336598109701852e+05, -2.336122217583648e+05, -2.335643592355824e+05, -2.335162253362149e+05,
- -2.334678219743503e+05, -2.334191510440724e+05, -2.333702144197424e+05, -2.333210139562722e+05, -2.332715514893963e+05,
- -2.332218288359390e+05, -2.331718477940723e+05, -2.331216101435764e+05, -2.330711176460884e+05, -2.330203720453529e+05,
- -2.329693750674642e+05, -2.329181284211063e+05, -2.328666337977887e+05, -2.328148928720763e+05, -2.327629073018192e+05,
- -2.327106787283738e+05, -2.326582087768245e+05, -2.326054990561994e+05, -2.325525511596821e+05, -2.324993666648224e+05,
- -2.324459471337406e+05, -2.323922941133289e+05, -2.323384091354533e+05, -2.322842937171456e+05, -2.322299493607979e+05,
- -2.321753775543526e+05, -2.321205797714848e+05, -2.320655574717912e+05, -2.320103121009646e+05, -2.319548450909748e+05,
- -2.318991578602424e+05, -2.318432518138093e+05, -2.317871283435095e+05, -2.317307888281335e+05, -2.316742346335942e+05,
- -2.316174671130840e+05, -2.315604876072387e+05, -2.315032974442902e+05, -2.314458979402194e+05, -2.313882903989093e+05,
- -2.313304761122951e+05, -2.312724563605068e+05, -2.312142324120159e+05, -2.311558055237792e+05, -2.310971769413755e+05,
- -2.310383478991450e+05, -2.309793196203248e+05, -2.309200933171825e+05, -2.308606701911493e+05, -2.308010514329456e+05,
- -2.307412382227136e+05, -2.306812317301404e+05, -2.306210331145805e+05, -2.305606435251831e+05, -2.305000641010057e+05,
- -2.304392959711374e+05, -2.303783402548140e+05, -2.303171980615332e+05, -2.302558704911670e+05, -2.301943586340754e+05,
- -2.301326635712138e+05, -2.300707863742440e+05, -2.300087281056392e+05, -2.299464898187911e+05, -2.298840725581119e+05,
- -2.298214773591371e+05, -2.297587052486275e+05, -2.296957572446681e+05, -2.296326343567643e+05, -2.295693375859422e+05,
- -2.295058679248396e+05, -2.294422263578041e+05, -2.293784138609817e+05, -2.293144314024117e+05, -2.292502799421142e+05,
- -2.291859604321795e+05, -2.291214738168574e+05, -2.290568210326397e+05, -2.289920030083496e+05, -2.289270206652228e+05,
- -2.288618749169914e+05, -2.287965666699649e+05, -2.287310968231126e+05, -2.286654662681402e+05, -2.285996758895704e+05,
- -2.285337265648197e+05, -2.284676191642734e+05, -2.284013545513632e+05, -2.283349335826395e+05, -2.282683571078457e+05,
- -2.282016259699895e+05, -2.281347410054153e+05, -2.280677030438735e+05, -2.280005129085912e+05, -2.279331714163396e+05,
- -2.278656793775016e+05, -2.277980375961396e+05, -2.277302468700599e+05, -2.276623079908795e+05, -2.275942217440874e+05,
- -2.275259889091117e+05, -2.274576102593789e+05, -2.273890865623765e+05, -2.273204185797147e+05, -2.272516070671861e+05,
- -2.271826527748241e+05, -2.271135564469626e+05, -2.270443188222941e+05, -2.269749406339241e+05, -2.269054226094316e+05,
- -2.268357654709219e+05, -2.267659699350820e+05, -2.266960367132350e+05, -2.266259665113947e+05, -2.265557600303168e+05,
- -2.264854179655519e+05, -2.264149410074977e+05, -2.263443298414487e+05, -2.262735851476486e+05, -2.262027076013362e+05,
- -2.261316978727996e+05, -2.260605566274199e+05, -2.259892845257215e+05, -2.259178822234207e+05, -2.258463503714686e+05,
- -2.257746896161008e+05, -2.257029005988811e+05, -2.256309839567466e+05, -2.255589403220540e+05, -2.254867703226210e+05,
- -2.254144745817716e+05, -2.253420537183781e+05, -2.252695083469031e+05, -2.251968390774435e+05, -2.251240465157696e+05,
- -2.250511312633664e+05, -2.249780939174746e+05, -2.249049350711316e+05, -2.248316553132085e+05, -2.247582552284505e+05,
- -2.246847353975154e+05, -2.246110963970124e+05, -2.245373387995367e+05, -2.244634631737115e+05, -2.243894700842212e+05,
- -2.243153600918489e+05, -2.242411337535109e+05, -2.241667916222957e+05, -2.240923342474949e+05, -2.240177621746417e+05,
- -2.239430759455421e+05, -2.238682760983112e+05, -2.237933631674045e+05, -2.237183376836530e+05, -2.236432001742954e+05,
- -2.235679511630090e+05, -2.234925911699446e+05, -2.234171207117560e+05, -2.233415403016309e+05, -2.232658504493246e+05,
- -2.231900516611871e+05, -2.231141444401976e+05, -2.230381292859887e+05, -2.229620066948817e+05, -2.228857771599130e+05,
- -2.228094411708628e+05, -2.227329992142852e+05, -2.226564517735356e+05, -2.225797993287988e+05, -2.225030423571167e+05,
- -2.224261813324154e+05, -2.223492167255337e+05, -2.222721490042475e+05, -2.221949786332994e+05, -2.221177060744214e+05,
- -2.220403317863637e+05, -2.219628562249182e+05, -2.218852798429466e+05, -2.218076030904030e+05, -2.217298264143598e+05,
- -2.216519502590313e+05, -2.215739750657998e+05, -2.214959012732386e+05, -2.214177293171346e+05, -2.213394596305147e+05,
- -2.212610926436671e+05, -2.211826287841637e+05, -2.211040684768852e+05, -2.210254121440417e+05, -2.209466602051962e+05,
- -2.208678130772852e+05, -2.207888711746427e+05, -2.207098349090211e+05, -2.206307046896104e+05, -2.205514809230630e+05
- },
- {
- 2.534793072638198e+04, 2.352158884170240e+04, 2.166457081712515e+04, 1.977539455111799e+04, 1.785245704263586e+04,
- 1.589402031332272e+04, 1.389819515892830e+04, 1.186292230347190e+04, 9.785950436571540e+03, 7.664810478778211e+03,
- 5.496785255851577e+03, 3.278873543310961e+03, 1.007747154236238e+03, -1.320300641426126e+03, -3.709417596690859e+03,
- -6.164268805599175e+03, -8.690130778844750e+03, -1.129300857224392e+04, -1.397978322558540e+04, -1.675839961680609e+04,
- -1.963810904835074e+04, -2.262978724709102e+04, -2.574635830835747e+04, -2.900337077083114e+04, -3.241979766567242e+04,
- -3.601917593564211e+04, -3.983127747151411e+04, -4.389464677165993e+04, -4.826061942360825e+04, -5.300002295424601e+04,
- -5.821510476481377e+04, -6.406266368182159e+04, -7.080453026136161e+04, -7.893886840206332e+04, -8.966054104124643e+04,
- -1.082240590728471e+05, -1.887641314203832e+05, -1.940782527819983e+05, -1.974968495074145e+05, -2.000793621332083e+05,
- -2.021763989302958e+05, -2.039519703335084e+05, -2.054970235635280e+05, -2.068675920403086e+05, -2.081008085734060e+05,
- -2.092226434340377e+05, -2.102520324704064e+05, -2.112032486801834e+05, -2.120873459042710e+05, -2.129130797480216e+05,
- -2.136875182018593e+05, -2.144164599432829e+05, -2.151047290117890e+05, -2.157563874865696e+05, -2.163748922741516e+05,
- -2.169632128867054e+05, -2.175239214013370e+05, -2.180592622080171e+05, -2.185712068181956e+05, -2.190614974605613e+05,
- -2.195316821423128e+05, -2.199831431311847e+05, -2.204171203059841e+05, -2.208347304617021e+05, -2.212369833937651e+05,
- -2.216247953944630e+05, -2.219990006525651e+05, -2.223603609406457e+05, -2.227095738939227e+05, -2.230472801226593e+05,
- -2.233740693524617e+05, -2.236904857496456e+05, -2.239970325596464e+05, -2.242941761633560e+05, -2.245823496378438e+05,
- -2.248619558931536e+05, -2.251333704449270e+05, -2.253969438729101e+05, -2.256530040074798e+05, -2.259018578798114e+05,
- -2.261437934659393e+05, -2.263790812505033e+05, -2.266079756322461e+05, -2.268307161902302e+05, -2.270475288271082e+05,
- -2.272586268035829e+05, -2.274642116763233e+05, -2.276644741499931e+05, -2.278595948527153e+05, -2.280497450431120e+05,
- -2.282350872560732e+05, -2.284157758935375e+05, -2.285919577658366e+05, -2.287637725884924e+05, -2.289313534388237e+05,
- -2.290948271761991e+05, -2.292543148293755e+05, -2.294099319539703e+05, -2.295617889628021e+05, -2.297099914315351e+05,
- -2.298546403818195e+05, -2.299958325438897e+05, -2.301336606003898e+05, -2.302682134130161e+05, -2.303995762334155e+05,
- -2.305278308996331e+05, -2.306530560192896e+05, -2.307753271405473e+05, -2.308947169118337e+05, -2.310112952312012e+05,
- -2.311251293861195e+05, -2.312362841844282e+05, -2.313448220771207e+05, -2.314508032735509e+05, -2.315542858496351e+05,
- -2.316553258495426e+05, -2.317539773813493e+05, -2.318502927070741e+05, -2.319443223274953e+05, -2.320361150621072e+05,
- -2.321257181245426e+05, -2.322131771937773e+05, -2.322985364814176e+05, -2.323818387972011e+05, -2.324631256099849e+05,
- -2.325424371015808e+05, -2.326198121537568e+05, -2.326952886115746e+05, -2.327689030731583e+05, -2.328406910803346e+05,
- -2.329106871311199e+05, -2.329789247128180e+05, -2.330454363756486e+05, -2.331102537171882e+05, -2.331734074545068e+05,
- -2.332349274485073e+05, -2.332948427362704e+05, -2.333531815617812e+05, -2.334099714052329e+05, -2.334652390109726e+05,
- -2.335190104141624e+05, -2.335713109662288e+05, -2.336221653591649e+05, -2.336715976487477e+05, -2.337196312767289e+05,
- -2.337662890920505e+05, -2.338115933711431e+05, -2.338555658373473e+05, -2.338982276795084e+05, -2.339395995697846e+05,
- -2.339797016807077e+05, -2.340185537015368e+05, -2.340561748539378e+05, -2.340925839070231e+05, -2.341277991917812e+05,
- -2.341618386154315e+05, -2.341947196726591e+05, -2.342264594615722e+05, -2.342570746937948e+05, -2.342865817068272e+05,
- -2.343149964772680e+05, -2.343423346240813e+05, -2.343686114307617e+05, -2.343938418475160e+05, -2.344180405030079e+05,
- -2.344412217137231e+05, -2.344633994929913e+05, -2.344845875596787e+05, -2.345047993465684e+05, -2.345240480084383e+05,
- -2.345423464298519e+05, -2.345597072326734e+05, -2.345761427833197e+05, -2.345916651997598e+05, -2.346062863582741e+05,
- -2.346200178999761e+05, -2.346328712371194e+05, -2.346448575591862e+05, -2.346559878387749e+05, -2.346662728372863e+05,
- -2.346757231104281e+05, -2.346843490135345e+05, -2.346921607067132e+05, -2.346991681598246e+05, -2.347053811573015e+05,
- -2.347108093028165e+05, -2.347154620237976e+05, -2.347193485758051e+05, -2.347224780467666e+05, -2.347248593610876e+05,
- -2.347265012836260e+05, -2.347274124169160e+05, -2.347276012317660e+05, -2.347270760301077e+05, -2.347258449760324e+05,
- -2.347239160922388e+05, -2.347212972633387e+05, -2.347179962390731e+05, -2.347140206374274e+05, -2.347093779476601e+05,
- -2.347040755332414e+05, -2.346981206347081e+05, -2.346915203724352e+05, -2.346842817493323e+05, -2.346764116534595e+05,
- -2.346679168605701e+05, -2.346588040365874e+05, -2.346490797400052e+05, -2.346387504242273e+05, -2.346278224398425e+05,
- -2.346163020368322e+05, -2.346041953667262e+05, -2.345915084846936e+05, -2.345782473515808e+05, -2.345644178358949e+05,
- -2.345500257157329e+05, -2.345350766806633e+05, -2.345195763335531e+05, -2.345035301923536e+05, -2.344869436918336e+05,
- -2.344698221852741e+05, -2.344521709461131e+05, -2.344339951695531e+05, -2.344152999741265e+05, -2.343960904032218e+05,
- -2.343763714265692e+05, -2.343561479577424e+05, -2.343354247924441e+05, -2.343142067030191e+05, -2.342924983787197e+05,
- -2.342703044420428e+05, -2.342476294500108e+05, -2.342244778954219e+05, -2.342008542080687e+05, -2.341767627559296e+05,
- -2.341522078463302e+05, -2.341271937270784e+05, -2.341017245875714e+05, -2.340758045598785e+05, -2.340494377197967e+05,
- -2.340226280878831e+05, -2.339953796304628e+05, -2.339676962606144e+05, -2.339395818391318e+05, -2.339110401754648e+05,
- -2.338820750286386e+05, -2.338526901081510e+05, -2.338228890748534e+05, -2.337926755418059e+05, -2.337620530751192e+05,
- -2.337310251947750e+05, -2.336995953754281e+05, -2.336677670471933e+05, -2.336355435964121e+05, -2.336029283664040e+05,
- -2.335699246582027e+05, -2.335365357312748e+05, -2.335027648042245e+05, -2.334686150554811e+05, -2.334340896239744e+05,
- -2.333991916097950e+05, -2.333639240748397e+05, -2.333282900434436e+05, -2.332922925030015e+05, -2.332559344045719e+05,
- -2.332192186634741e+05, -2.331821481598665e+05, -2.331447257393196e+05, -2.331069542133718e+05, -2.330688363600780e+05,
- -2.330303749245446e+05, -2.329915726194546e+05, -2.329524321255827e+05, -2.329129560922986e+05, -2.328731471380620e+05,
- -2.328330078509068e+05, -2.327925407889149e+05, -2.327517484806843e+05, -2.327106334257823e+05, -2.326691980951957e+05,
- -2.326274449317690e+05, -2.325853763506319e+05, -2.325429947396272e+05, -2.325003024597198e+05, -2.324573018454039e+05,
- -2.324139952051031e+05, -2.323703848215596e+05, -2.323264729522179e+05, -2.322822618296025e+05, -2.322377536616846e+05,
- -2.321929506322464e+05, -2.321478549012362e+05, -2.321024686051174e+05, -2.320567938572106e+05, -2.320108327480309e+05,
- -2.319645873456178e+05, -2.319180596958589e+05, -2.318712518228079e+05, -2.318241657289984e+05, -2.317768033957502e+05,
- -2.317291667834704e+05, -2.316812578319493e+05, -2.316330784606513e+05, -2.315846305690021e+05, -2.315359160366666e+05,
- -2.314869367238266e+05, -2.314376944714495e+05, -2.313881911015572e+05, -2.313384284174848e+05, -2.312884082041390e+05,
- -2.312381322282505e+05, -2.311876022386211e+05, -2.311368199663691e+05, -2.310857871251674e+05, -2.310345054114801e+05,
- -2.309829765047937e+05, -2.309312020678451e+05, -2.308791837468453e+05, -2.308269231716986e+05, -2.307744219562213e+05,
- -2.307216816983515e+05, -2.306687039803609e+05, -2.306154903690591e+05, -2.305620424159964e+05, -2.305083616576632e+05,
- -2.304544496156856e+05, -2.304003077970180e+05, -2.303459376941313e+05, -2.302913407852026e+05, -2.302365185342945e+05,
- -2.301814723915390e+05, -2.301262037933123e+05, -2.300707141624124e+05, -2.300150049082274e+05, -2.299590774269080e+05,
- -2.299029331015314e+05, -2.298465733022675e+05, -2.297899993865388e+05, -2.297332126991795e+05, -2.296762145725902e+05,
- -2.296190063268957e+05, -2.295615892700916e+05, -2.295039646981969e+05, -2.294461338953994e+05, -2.293880981342008e+05,
- -2.293298586755577e+05, -2.292714167690239e+05, -2.292127736528862e+05, -2.291539305543017e+05, -2.290948886894313e+05,
- -2.290356492635720e+05, -2.289762134712849e+05, -2.289165824965258e+05, -2.288567575127695e+05, -2.287967396831329e+05,
- -2.287365301605010e+05, -2.286761300876429e+05, -2.286155405973333e+05, -2.285547628124690e+05, -2.284937978461826e+05,
- -2.284326468019579e+05, -2.283713107737417e+05, -2.283097908460515e+05, -2.282480880940884e+05, -2.281862035838386e+05,
- -2.281241383721859e+05, -2.280618935070080e+05, -2.279994700272861e+05, -2.279368689632010e+05, -2.278740913362343e+05,
- -2.278111381592678e+05, -2.277480104366781e+05, -2.276847091644346e+05, -2.276212353301906e+05, -2.275575899133787e+05,
- -2.274937738853001e+05, -2.274297882092181e+05, -2.273656338404421e+05, -2.273013117264193e+05, -2.272368228068209e+05,
- -2.271721680136247e+05, -2.271073482712024e+05, -2.270423644963999e+05, -2.269772175986210e+05, -2.269119084799076e+05,
- -2.268464380350191e+05, -2.267808071515115e+05, -2.267150167098124e+05, -2.266490675833025e+05, -2.265829606383853e+05,
- -2.265166967345662e+05, -2.264502767245224e+05, -2.263837014541774e+05, -2.263169717627708e+05, -2.262500884829324e+05,
- -2.261830524407463e+05, -2.261158644558240e+05, -2.260485253413702e+05, -2.259810359042505e+05, -2.259133969450563e+05,
- -2.258456092581710e+05, -2.257776736318334e+05, -2.257095908482025e+05, -2.256413616834184e+05, -2.255729869076656e+05,
- -2.255044672852326e+05, -2.254358035745731e+05, -2.253669965283659e+05, -2.252980468935723e+05, -2.252289554114953e+05,
- -2.251597228178356e+05, -2.250903498427488e+05, -2.250208372109010e+05, -2.249511856415251e+05, -2.248813958484723e+05,
- -2.248114685402695e+05, -2.247414044201682e+05, -2.246712041862015e+05, -2.246008685312312e+05, -2.245303981430020e+05,
- -2.244597937041906e+05, -2.243890558924567e+05, -2.243181853804908e+05, -2.242471828360634e+05, -2.241760489220731e+05,
- -2.241047842965930e+05, -2.240333896129210e+05, -2.239618655196202e+05, -2.238902126605707e+05, -2.238184316750096e+05,
- -2.237465231975804e+05, -2.236744878583729e+05, -2.236023262829680e+05, -2.235300390924838e+05, -2.234576269036124e+05,
- -2.233850903286680e+05, -2.233124299756222e+05, -2.232396464481511e+05, -2.231667403456712e+05, -2.230937122633815e+05,
- -2.230205627923026e+05, -2.229472925193167e+05, -2.228739020272046e+05, -2.228003918946848e+05, -2.227267626964520e+05,
- -2.226530150032127e+05, -2.225791493817236e+05, -2.225051663948263e+05, -2.224310666014867e+05, -2.223568505568255e+05,
- -2.222825188121591e+05, -2.222080719150291e+05, -2.221335104092408e+05, -2.220588348348954e+05, -2.219840457284218e+05,
- -2.219091436226152e+05, -2.218341290466631e+05, -2.217590025261839e+05, -2.216837645832550e+05, -2.216084157364463e+05,
- -2.215329565008508e+05, -2.214573873881174e+05, -2.213817089064779e+05, -2.213059215607822e+05, -2.212300258525249e+05,
- -2.211540222798744e+05, -2.210779113377068e+05, -2.210016935176291e+05, -2.209253693080127e+05, -2.208489391940184e+05,
- -2.207724036576274e+05, -2.206957631776659e+05, -2.206190182298360e+05, -2.205421692867390e+05, -2.204652168179066e+05,
- -2.203881612898244e+05, -2.203110031659585e+05, -2.202337429067827e+05, -2.201563809698041e+05, -2.200789178095861e+05,
- -2.200013538777785e+05, -2.199236896231375e+05, -2.198459254915527e+05, -2.197680619260707e+05, -2.196900993669212e+05,
- -2.196120382515370e+05, -2.195338790145817e+05, -2.194556220879707e+05, -2.193772679008944e+05, -2.192988168798418e+05,
- -2.192202694486237e+05, -2.191416260283935e+05, -2.190628870376697e+05, -2.189840528923591e+05, -2.189051240057774e+05
- },
- {
- 2.622154834199604e+04, 2.440886325126771e+04, 2.256616811657186e+04, 2.069203852266329e+04, 1.878493594100698e+04,
- 1.684319470164424e+04, 1.486500699724814e+04, 1.284840554088299e+04, 1.079124341862551e+04, 8.691170560831059e+03,
- 6.545606115386270e+03, 4.351705818885339e+03, 2.106323217267409e+03, -1.940367363749154e+02, -2.553273612588967e+03,
- -4.975759457751220e+03, -7.466422065404632e+03, -1.003084798341610e+04, -1.267541125220476e+04, -1.540743613282032e+04,
- -1.823540538786098e+04, -2.116923059786878e+04, -2.422060848362245e+04, -2.740349888554892e+04, -3.073477878704989e+04,
- -3.423515779637044e+04, -3.793049369445227e+04, -4.185374219256538e+04, -4.604795436769114e+04, -5.057109429020502e+04,
- -5.550422065804842e+04, -6.096639373303635e+04, -6.714449179048881e+04, -7.436117763868597e+04, -8.326401789506408e+04,
- -9.557756240845456e+04, -1.234776048392778e+05, -1.846413394613802e+05, -1.904846384698059e+05, -1.941758607035946e+05,
- -1.969343306830169e+05, -1.991579551536971e+05, -2.010307190057473e+05, -2.026537450510993e+05, -2.040888894733415e+05,
- -2.053768932658028e+05, -2.065460972358819e+05, -2.076170666161593e+05, -2.086052357105312e+05, -2.095225112329253e+05,
- -2.103782912161806e+05, -2.111801382198806e+05, -2.119342389621794e+05, -2.126457270727026e+05, -2.133189153186738e+05,
- -2.139574663023142e+05, -2.145645203236504e+05, -2.151427927823036e+05, -2.156946495020439e+05, -2.162221657786214e+05,
- -2.167271732403791e+05, -2.172112974544619e+05, -2.176759884148848e+05, -2.181225454907969e+05, -2.185521380164479e+05,
- -2.189658224180132e+05, -2.193645565631308e+05, -2.197492118640773e+05, -2.201205835495849e+05, -2.204793994325926e+05,
- -2.208263274342372e+05, -2.211619820727321e+05, -2.214869300856185e+05, -2.218016953223661e+05, -2.221067630194221e+05,
- -2.224025835499949e+05, -2.226895757249998e+05, -2.229681297087822e+05, -2.232386096028595e+05, -2.235013557424412e+05,
- -2.237566867435472e+05, -2.240049013327882e+05, -2.242462799871369e+05, -2.244810864070553e+05, -2.247095688430244e+05,
- -2.249319612927559e+05, -2.251484845840067e+05, -2.253593473559418e+05, -2.255647469502959e+05, -2.257648702221515e+05,
- -2.259598942789158e+05, -2.261499871550268e+05, -2.263353084290042e+05, -2.265160097886806e+05, -2.266922355497646e+05,
- -2.268641231322990e+05, -2.270318034990614e+05, -2.271954015595114e+05, -2.273550365424849e+05, -2.275108223405062e+05,
- -2.276628678282750e+05, -2.278112771576247e+05, -2.279561500310101e+05, -2.280975819553802e+05, -2.282356644781014e+05,
- -2.283704854064331e+05, -2.285021290119231e+05, -2.286306762209426e+05, -2.287562047924831e+05, -2.288787894842208e+05,
- -2.289985022077695e+05, -2.291154121739564e+05, -2.292295860288842e+05, -2.293410879814689e+05, -2.294499799230928e+05,
- -2.295563215399483e+05, -2.296601704186034e+05, -2.297615821452771e+05, -2.298606103992677e+05, -2.299573070409449e+05,
- -2.300517221946815e+05, -2.301439043270711e+05, -2.302339003207500e+05, -2.303217555445069e+05, -2.304075139220602e+05,
- -2.304912179923732e+05, -2.305729089668026e+05, -2.306526266957354e+05, -2.307304100135570e+05, -2.308062964243368e+05,
- -2.308803223566003e+05, -2.309525231633741e+05, -2.310229331578226e+05, -2.310915856837447e+05, -2.311585131082615e+05,
- -2.312237468903222e+05, -2.312873176074898e+05, -2.313492549895357e+05, -2.314095879498999e+05, -2.314683446161746e+05,
- -2.315255523589385e+05, -2.315812378193013e+05, -2.316354269351965e+05, -2.316881449664785e+05, -2.317394165189005e+05,
- -2.317892655670268e+05, -2.318377154761349e+05, -2.318847890231662e+05, -2.319305084167705e+05, -2.319748953164913e+05,
- -2.320179708511397e+05, -2.320597556363917e+05, -2.321002697916583e+05, -2.321395329562491e+05, -2.321775643048839e+05,
- -2.322143825630366e+05, -2.322500060192788e+05, -2.322844525419704e+05, -2.323177395903765e+05, -2.323498842297756e+05,
- -2.323809031357422e+05, -2.324108126178484e+05, -2.324396286227420e+05, -2.324673667470338e+05, -2.324940422476992e+05,
- -2.325196700520892e+05, -2.325442647675727e+05, -2.325678406908180e+05, -2.325904118167430e+05, -2.326119918471324e+05,
- -2.326325941989491e+05, -2.326522320123493e+05, -2.326709181584113e+05, -2.326886652465928e+05, -2.327054856319265e+05,
- -2.327213914219701e+05, -2.327363944835118e+05, -2.327505064490506e+05, -2.327637387230562e+05, -2.327761024880140e+05,
- -2.327876087102742e+05, -2.327982681457015e+05, -2.328080913451418e+05, -2.328170886597077e+05, -2.328252702458924e+05,
- -2.328326460705204e+05, -2.328392259087362e+05, -2.328450193761743e+05, -2.328500358916419e+05, -2.328542847096923e+05,
- -2.328577749176942e+05, -2.328605154399128e+05, -2.328625150414681e+05, -2.328637823321711e+05, -2.328643257702432e+05,
- -2.328641536659248e+05, -2.328632741849723e+05, -2.328616953520546e+05, -2.328594250540467e+05, -2.328564710432255e+05,
- -2.328528409403746e+05, -2.328485422377960e+05, -2.328435823022384e+05, -2.328379683777365e+05, -2.328317075883737e+05,
- -2.328248069409634e+05, -2.328172733276562e+05, -2.328091135284731e+05, -2.328003342137699e+05, -2.327909419466297e+05,
- -2.327809431851938e+05, -2.327703442849249e+05, -2.327591515008123e+05, -2.327473709895141e+05, -2.327350088114436e+05,
- -2.327220709327997e+05, -2.327085632275433e+05, -2.326944914793202e+05, -2.326798613833353e+05, -2.326646785481757e+05,
- -2.326489484975902e+05, -2.326326766722160e+05, -2.326158684312686e+05, -2.325985290541832e+05, -2.325806637422166e+05,
- -2.325622776200074e+05, -2.325433757518785e+05, -2.325239630852253e+05, -2.325040445376109e+05, -2.324836249420446e+05,
- -2.324627090621544e+05, -2.324413015935300e+05, -2.324194071650341e+05, -2.323970303400770e+05, -2.323741756178663e+05,
- -2.323508474346205e+05, -2.323270501647610e+05, -2.323027881220662e+05, -2.322780655608092e+05, -2.322528866768604e+05,
- -2.322272556087656e+05, -2.322011764388045e+05, -2.321746531940163e+05, -2.321476898472094e+05, -2.321202903179435e+05,
- -2.320924584734887e+05, -2.320641981297661e+05, -2.320355130522661e+05, -2.320064069569418e+05, -2.319768835110903e+05,
- -2.319469463342069e+05, -2.319165989988243e+05, -2.318858450313329e+05, -2.318546879127811e+05, -2.318231310796609e+05,
- -2.317911779246751e+05, -2.317588317974860e+05, -2.317260960054509e+05, -2.316929738143407e+05, -2.316594684490432e+05,
- -2.316255830942498e+05, -2.315913208951310e+05, -2.315566849579939e+05, -2.315216783509289e+05, -2.314863041044418e+05,
- -2.314505652120719e+05, -2.314144646309978e+05, -2.313780052826327e+05, -2.313411900532028e+05, -2.313040217943197e+05,
- -2.312665033235362e+05, -2.312286374248930e+05, -2.311904268494557e+05, -2.311518743158378e+05, -2.311129825107156e+05,
- -2.310737540893314e+05, -2.310341916759892e+05, -2.309942978645369e+05, -2.309540752188414e+05, -2.309135262732555e+05,
- -2.308726535330714e+05, -2.308314594749707e+05, -2.307899465474613e+05, -2.307481171713082e+05, -2.307059737399562e+05,
- -2.306635186199420e+05, -2.306207541513024e+05, -2.305776826479705e+05, -2.305343063981686e+05, -2.304906276647892e+05,
- -2.304466486857736e+05, -2.304023716744793e+05, -2.303577988200431e+05, -2.303129322877371e+05, -2.302677742193164e+05,
- -2.302223267333637e+05, -2.301765919256230e+05, -2.301305718693328e+05, -2.300842686155472e+05, -2.300376841934577e+05,
- -2.299908206107029e+05, -2.299436798536758e+05, -2.298962638878273e+05, -2.298485746579604e+05, -2.298006140885211e+05,
- -2.297523840838850e+05, -2.297038865286376e+05, -2.296551232878502e+05, -2.296060962073488e+05, -2.295568071139843e+05,
- -2.295072578158898e+05, -2.294574501027400e+05, -2.294073857460040e+05, -2.293570664991913e+05, -2.293064940980987e+05,
- -2.292556702610477e+05, -2.292045966891206e+05, -2.291532750663942e+05, -2.291017070601647e+05, -2.290498943211745e+05,
- -2.289978384838300e+05, -2.289455411664193e+05, -2.288930039713255e+05, -2.288402284852360e+05, -2.287872162793462e+05,
- -2.287339689095665e+05, -2.286804879167170e+05, -2.286267748267261e+05, -2.285728311508221e+05, -2.285186583857241e+05,
- -2.284642580138272e+05, -2.284096315033864e+05, -2.283547803086972e+05, -2.282997058702744e+05, -2.282444096150246e+05,
- -2.281888929564212e+05, -2.281331572946705e+05, -2.280772040168814e+05, -2.280210344972268e+05, -2.279646500971078e+05,
- -2.279080521653100e+05, -2.278512420381607e+05, -2.277942210396846e+05, -2.277369904817520e+05, -2.276795516642325e+05,
- -2.276219058751375e+05, -2.275640543907683e+05, -2.275059984758561e+05, -2.274477393837038e+05, -2.273892783563247e+05,
- -2.273306166245760e+05, -2.272717554082957e+05, -2.272126959164328e+05, -2.271534393471782e+05, -2.270939868880920e+05,
- -2.270343397162301e+05, -2.269744989982691e+05, -2.269144658906277e+05, -2.268542415395864e+05, -2.267938270814103e+05,
- -2.267332236424603e+05, -2.266724323393141e+05, -2.266114542788762e+05, -2.265502905584913e+05, -2.264889422660551e+05,
- -2.264274104801217e+05, -2.263656962700116e+05, -2.263038006959185e+05, -2.262417248090112e+05, -2.261794696515377e+05,
- -2.261170362569272e+05, -2.260544256498864e+05, -2.259916388465029e+05, -2.259286768543379e+05, -2.258655406725236e+05,
- -2.258022312918577e+05, -2.257387496948949e+05, -2.256750968560412e+05, -2.256112737416397e+05, -2.255472813100654e+05,
- -2.254831205118084e+05, -2.254187922895626e+05, -2.253542975783114e+05, -2.252896373054103e+05, -2.252248123906717e+05,
- -2.251598237464463e+05, -2.250946722777042e+05, -2.250293588821137e+05, -2.249638844501205e+05, -2.248982498650268e+05,
- -2.248324560030652e+05, -2.247665037334757e+05, -2.247003939185806e+05, -2.246341274138576e+05, -2.245677050680121e+05,
- -2.245011277230482e+05, -2.244343962143418e+05, -2.243675113707065e+05, -2.243004740144663e+05, -2.242332849615213e+05,
- -2.241659450214141e+05, -2.240984549973980e+05, -2.240308156865000e+05, -2.239630278795872e+05, -2.238950923614297e+05,
- -2.238270099107627e+05, -2.237587813003481e+05, -2.236904072970382e+05, -2.236218886618329e+05, -2.235532261499407e+05,
- -2.234844205108385e+05, -2.234154724883272e+05, -2.233463828205915e+05, -2.232771522402554e+05, -2.232077814744384e+05,
- -2.231382712448093e+05, -2.230686222676430e+05, -2.229988352538728e+05, -2.229289109091439e+05, -2.228588499338663e+05,
- -2.227886530232654e+05, -2.227183208674346e+05, -2.226478541513848e+05, -2.225772535550952e+05, -2.225065197535620e+05,
- -2.224356534168474e+05, -2.223646552101276e+05, -2.222935257937399e+05, -2.222222658232302e+05, -2.221508759493994e+05,
- -2.220793568183494e+05, -2.220077090715266e+05, -2.219359333457695e+05, -2.218640302733509e+05, -2.217920004820203e+05,
- -2.217198445950524e+05, -2.216475632312822e+05, -2.215751570051531e+05, -2.215026265267554e+05, -2.214299724018682e+05,
- -2.213571952320005e+05, -2.212842956144309e+05, -2.212112741422474e+05, -2.211381314043855e+05, -2.210648679856691e+05,
- -2.209914844668474e+05, -2.209179814246316e+05, -2.208443594317354e+05, -2.207706190569091e+05, -2.206967608649781e+05,
- -2.206227854168765e+05, -2.205486932696858e+05, -2.204744849766687e+05, -2.204001610873032e+05, -2.203257221473196e+05,
- -2.202511686987304e+05, -2.201765012798693e+05, -2.201017204254198e+05, -2.200268266664509e+05, -2.199518205304490e+05,
- -2.198767025413492e+05, -2.198014732195687e+05, -2.197261330820369e+05, -2.196506826422278e+05, -2.195751224101884e+05,
- -2.194994528925735e+05, -2.194236745926710e+05, -2.193477880104345e+05, -2.192717936425113e+05, -2.191956919822733e+05,
- -2.191194835198437e+05, -2.190431687421278e+05, -2.189667481328377e+05, -2.188902221725238e+05, -2.188135913386013e+05,
- -2.187368561053753e+05, -2.186600169440702e+05, -2.185830743228557e+05, -2.185060287068733e+05, -2.184288805582602e+05,
- -2.183516303361797e+05, -2.182742784968423e+05, -2.181968254935328e+05, -2.181192717766358e+05, -2.180416177936591e+05,
- -2.179638639892589e+05, -2.178860108052638e+05, -2.178080586806996e+05, -2.177300080518103e+05, -2.176518593520859e+05,
- -2.175736130122814e+05, -2.174952694604415e+05, -2.174168291219242e+05, -2.173382924194206e+05, -2.172596597729805e+05
- },
- {
- 2.709615996555889e+04, 2.529696258901193e+04, 2.346840462786001e+04, 2.160911692889340e+04, 1.971762261849835e+04,
- 1.779232504484198e+04, 1.583149393607736e+04, 1.383324943869939e+04, 1.179554363080009e+04, 9.716139003321139e+03,
- 7.592583282061632e+03, 5.422179803210277e+03, 3.201952447932332e+03, 9.286038687978220e+02, -1.401534621588816e+03,
- -3.792563616292295e+03, -6.249089412499000e+03, -8.776314732472731e+03, -1.138015132915631e+04, -1.406736124220275e+04,
- -1.684573606983489e+04, -1.972432743811242e+04, -2.271374756620217e+04, -2.582656758697179e+04, -2.907785505249209e+04,
- -3.248591433699333e+04, -3.607333083778806e+04, -3.986848462776672e+04, -4.390781628467683e+04, -4.823935186516915e+04,
- -5.292844986588423e+04, -5.806773515156976e+04, -6.379561226557195e+04, -7.033442955955266e+04, -7.808127882360111e+04,
- -8.787813121076948e+04, -1.022329651355804e+05, -1.529850558958266e+05, -1.806423826026857e+05, -1.869269711080251e+05,
- -1.908714011263608e+05, -1.937989059281696e+05, -1.961461761252648e+05, -1.981147570508755e+05, -1.998150614277291e+05,
- -2.013143986850930e+05, -2.026569526418286e+05, -2.038733578751499e+05, -2.049857729202796e+05, -2.060107766130032e+05,
- -2.069611210526847e+05, -2.078468436506194e+05, -2.086760005397561e+05, -2.094551663606101e+05, -2.101897845219267e+05,
- -2.108844187118538e+05, -2.115429373928393e+05, -2.121686517156520e+05, -2.127644203631321e+05, -2.133327304666131e+05,
- -2.138757609125422e+05, -2.143954324871558e+05, -2.148934480444471e+05, -2.153713250140442e+05, -2.158304219579811e+05,
- -2.162719604536309e+05, -2.166970432690014e+05, -2.171066695694690e+05, -2.175017477272061e+05, -2.178831061790948e+05,
- -2.182515026841898e+05, -2.186076322595021e+05, -2.189521340172415e+05, -2.192855970834312e+05, -2.196085657439869e+05,
- -2.199215439376434e+05, -2.202249991939012e+05, -2.205193660971933e+05, -2.208050493447802e+05, -2.210824264548251e+05,
- -2.213518501720476e+05, -2.216136506109631e+05, -2.218681371706118e+05, -2.221156002496408e+05, -2.223563127863839e+05,
- -2.225905316450952e+05, -2.228184988665297e+05, -2.230404427985943e+05, -2.232565791206837e+05, -2.234671117735380e+05,
- -2.236722338049409e+05, -2.238721281402732e+05, -2.240669682858307e+05, -2.242569189718462e+05, -2.244421367413409e+05,
- -2.246227704902054e+05, -2.247989619632915e+05, -2.249708462107610e+05, -2.251385520084543e+05, -2.253022022456476e+05,
- -2.254619142831860e+05, -2.256178002846770e+05, -2.257699675231459e+05, -2.259185186653026e+05, -2.260635520353609e+05,
- -2.262051618601498e+05, -2.263434384970903e+05, -2.264784686464565e+05, -2.266103355492089e+05, -2.267391191715549e+05,
- -2.268648963773013e+05, -2.269877410889510e+05, -2.271077244384176e+05, -2.272249149081518e+05, -2.273393784634036e+05,
- -2.274511786762798e+05, -2.275603768422043e+05, -2.276670320893303e+05, -2.277712014814123e+05, -2.278729401146029e+05,
- -2.279723012086004e+05, -2.280693361925394e+05, -2.281640947859820e+05, -2.282566250753549e+05, -2.283469735876491e+05,
- -2.284351853603875e+05, -2.285213040027516e+05, -2.286053716926583e+05, -2.286874294342579e+05, -2.287675168714927e+05,
- -2.288456724740335e+05, -2.289219335577304e+05, -2.289963363242853e+05, -2.290689159343564e+05, -2.291397065050846e+05,
- -2.292087411807890e+05, -2.292760521630613e+05, -2.293416707469612e+05, -2.294056273554692e+05, -2.294679515721666e+05,
- -2.295286721730087e+05, -2.295878171554276e+05, -2.296454137672013e+05, -2.297014885334809e+05, -2.297560672826867e+05,
- -2.298091751712420e+05, -2.298608367072061e+05, -2.299110757728626e+05, -2.299599156463217e+05, -2.300073790221857e+05,
- -2.300534880313277e+05, -2.300982642598249e+05, -2.301417287671027e+05, -2.301839021033051e+05, -2.302248043259581e+05,
- -2.302644550159431e+05, -2.303028732932007e+05, -2.303400778298560e+05, -2.303760868687500e+05, -2.304109182272613e+05,
- -2.304445893230571e+05, -2.304771171782539e+05, -2.305085184335668e+05, -2.305388093598734e+05, -2.305680058693353e+05,
- -2.305961235260961e+05, -2.306231775565843e+05, -2.306491828594233e+05, -2.306741540149832e+05, -2.306981052945772e+05,
- -2.307210506693244e+05, -2.307430038186949e+05, -2.307639781387440e+05, -2.307839867500591e+05, -2.308030425054204e+05,
- -2.308211579971965e+05, -2.308383455644821e+05, -2.308546172999877e+05, -2.308699850566965e+05, -2.308844604542891e+05,
- -2.308980548853576e+05, -2.309107795214065e+05, -2.309226453120133e+05, -2.309336630173324e+05, -2.309438431726723e+05,
- -2.309531961213304e+05, -2.309617320126822e+05, -2.309694608070987e+05, -2.309763922807033e+05, -2.309825360299810e+05,
- -2.309879014762381e+05, -2.309924978699268e+05, -2.309963342948305e+05, -2.309994196721251e+05, -2.310017627643099e+05,
- -2.310033721790232e+05, -2.310042563727388e+05, -2.310044236543550e+05, -2.310038821886707e+05, -2.310026399997650e+05,
- -2.310007049742703e+05, -2.309980848645537e+05, -2.309947872918044e+05, -2.309908197490300e+05, -2.309861896039689e+05,
- -2.309809041019185e+05, -2.309749703684804e+05, -2.309683954122328e+05, -2.309611861273223e+05, -2.309533492959877e+05,
- -2.309448915910119e+05, -2.309358195781033e+05, -2.309261397182184e+05, -2.309158583698137e+05, -2.309049817910417e+05,
- -2.308935161418849e+05, -2.308814674862330e+05, -2.308688417939061e+05, -2.308556449426220e+05, -2.308418827199134e+05,
- -2.308275608249931e+05, -2.308126848705730e+05, -2.307972603846323e+05, -2.307812928121442e+05, -2.307647875167563e+05,
- -2.307477497824252e+05, -2.307301848285408e+05, -2.307120977583632e+05, -2.306934936387877e+05, -2.306743774505786e+05,
- -2.306547541024025e+05, -2.306346284322286e+05, -2.306140052087069e+05, -2.305928891325015e+05, -2.305712848375981e+05,
- -2.305491968925790e+05, -2.305266298018636e+05, -2.305035880069253e+05, -2.304800758874739e+05, -2.304560977626115e+05,
- -2.304316578919641e+05, -2.304067604767828e+05, -2.303814096610214e+05, -2.303556095323870e+05, -2.303293641233688e+05,
- -2.303026774122423e+05, -2.302755533240492e+05, -2.302479957315567e+05, -2.302200084561929e+05, -2.301915952689646e+05,
- -2.301627598913523e+05, -2.301335059961819e+05, -2.301038372084854e+05, -2.300737571063333e+05, -2.300432692216548e+05,
- -2.300123770410378e+05, -2.299810840065119e+05, -2.299493935163136e+05, -2.299173089256348e+05, -2.298848335473588e+05,
- -2.298519706527735e+05, -2.298187234722767e+05, -2.297850951960616e+05, -2.297510889747895e+05, -2.297167079202495e+05,
- -2.296819551060006e+05, -2.296468335680049e+05, -2.296113463052451e+05, -2.295754962803296e+05, -2.295392864200857e+05,
- -2.295027196161383e+05, -2.294657987254811e+05, -2.294285265710331e+05, -2.293909059421839e+05, -2.293529395953284e+05,
- -2.293146302543917e+05, -2.292759806113434e+05, -2.292369933266981e+05, -2.291976710300134e+05, -2.291580163203690e+05,
- -2.291180317668443e+05, -2.290777199089819e+05, -2.290370832572430e+05, -2.289961242934561e+05, -2.289548454712542e+05,
- -2.289132492165046e+05, -2.288713379277297e+05, -2.288291139765243e+05, -2.287865797079574e+05, -2.287437374409708e+05,
- -2.287005894687734e+05, -2.286571380592189e+05, -2.286133854551858e+05, -2.285693338749445e+05, -2.285249855125215e+05,
- -2.284803425380520e+05, -2.284354070981314e+05, -2.283901813161563e+05, -2.283446672926609e+05, -2.282988671056477e+05,
- -2.282527828109117e+05, -2.282064164423576e+05, -2.281597700123131e+05, -2.281128455118364e+05, -2.280656449110156e+05,
- -2.280181701592674e+05, -2.279704231856266e+05, -2.279224058990300e+05, -2.278741201886010e+05, -2.278255679239220e+05,
- -2.277767509553065e+05, -2.277276711140653e+05, -2.276783302127678e+05, -2.276287300454988e+05, -2.275788723881117e+05,
- -2.275287589984768e+05, -2.274783916167250e+05, -2.274277719654866e+05, -2.273769017501287e+05, -2.273257826589874e+05,
- -2.272744163635926e+05, -2.272228045188958e+05, -2.271709487634874e+05, -2.271188507198156e+05, -2.270665119943983e+05,
- -2.270139341780323e+05, -2.269611188459988e+05, -2.269080675582690e+05, -2.268547818596999e+05, -2.268012632802318e+05,
- -2.267475133350818e+05, -2.266935335249323e+05, -2.266393253361182e+05, -2.265848902408103e+05, -2.265302296971970e+05,
- -2.264753451496609e+05, -2.264202380289538e+05, -2.263649097523699e+05, -2.263093617239140e+05, -2.262535953344692e+05,
- -2.261976119619598e+05, -2.261414129715154e+05, -2.260849997156263e+05, -2.260283735343039e+05, -2.259715357552311e+05,
- -2.259144876939169e+05, -2.258572306538448e+05, -2.257997659266190e+05, -2.257420947921107e+05, -2.256842185185991e+05,
- -2.256261383629143e+05, -2.255678555705714e+05, -2.255093713759126e+05, -2.254506870022354e+05, -2.253918036619285e+05,
- -2.253327225566006e+05, -2.252734448772085e+05, -2.252139718041846e+05, -2.251543045075590e+05, -2.250944441470838e+05,
- -2.250343918723541e+05, -2.249741488229256e+05, -2.249137161284324e+05, -2.248530949087030e+05, -2.247922862738728e+05,
- -2.247312913244995e+05, -2.246701111516673e+05, -2.246087468371032e+05, -2.245471994532796e+05, -2.244854700635209e+05,
- -2.244235597221088e+05, -2.243614694743850e+05, -2.242992003568517e+05, -2.242367533972711e+05, -2.241741296147655e+05,
- -2.241113300199142e+05, -2.240483556148463e+05, -2.239852073933402e+05, -2.239218863409111e+05, -2.238583934349071e+05,
- -2.237947296445969e+05, -2.237308959312609e+05, -2.236668932482776e+05, -2.236027225412118e+05, -2.235383847478986e+05,
- -2.234738807985288e+05, -2.234092116157332e+05, -2.233443781146614e+05, -2.232793812030660e+05, -2.232142217813821e+05,
- -2.231489007428038e+05, -2.230834189733632e+05, -2.230177773520094e+05, -2.229519767506795e+05, -2.228860180343781e+05,
- -2.228199020612474e+05, -2.227536296826410e+05, -2.226872017431961e+05, -2.226206190809049e+05, -2.225538825271802e+05,
- -2.224869929069314e+05, -2.224199510386260e+05, -2.223527577343597e+05, -2.222854137999239e+05, -2.222179200348669e+05,
- -2.221502772325617e+05, -2.220824861802697e+05, -2.220145476592023e+05, -2.219464624445822e+05, -2.218782313057068e+05,
- -2.218098550060081e+05, -2.217413343031114e+05, -2.216726699488938e+05, -2.216038626895450e+05, -2.215349132656219e+05,
- -2.214658224121065e+05, -2.213965908584627e+05, -2.213272193286901e+05, -2.212577085413795e+05, -2.211880592097662e+05,
- -2.211182720417834e+05, -2.210483477401164e+05, -2.209782870022504e+05, -2.209080905205277e+05, -2.208377589821931e+05,
- -2.207672930694463e+05, -2.206966934594903e+05, -2.206259608245820e+05, -2.205550958320781e+05, -2.204840991444860e+05,
- -2.204129714195058e+05, -2.203417133100808e+05, -2.202703254644428e+05, -2.201988085261559e+05, -2.201271631341634e+05,
- -2.200553899228298e+05, -2.199834895219862e+05, -2.199114625569727e+05, -2.198393096486814e+05, -2.197670314135988e+05,
- -2.196946284638466e+05, -2.196221014072235e+05, -2.195494508472468e+05, -2.194766773831905e+05, -2.194037816101270e+05,
- -2.193307641189649e+05, -2.192576254964890e+05, -2.191843663253984e+05, -2.191109871843438e+05, -2.190374886479646e+05,
- -2.189638712869282e+05, -2.188901356679644e+05, -2.188162823539017e+05, -2.187423119037045e+05, -2.186682248725079e+05,
- -2.185940218116508e+05, -2.185197032687146e+05, -2.184452697875520e+05, -2.183707219083252e+05, -2.182960601675379e+05,
- -2.182212850980664e+05, -2.181463972291959e+05, -2.180713970866500e+05, -2.179962851926232e+05, -2.179210620658117e+05,
- -2.178457282214484e+05, -2.177702841713272e+05, -2.176947304238406e+05, -2.176190674840046e+05, -2.175432958534895e+05,
- -2.174674160306532e+05, -2.173914285105644e+05, -2.173153337850365e+05, -2.172391323426537e+05, -2.171628246687987e+05,
- -2.170864112456829e+05, -2.170098925523716e+05, -2.169332690648132e+05, -2.168565412558657e+05, -2.167797095953217e+05,
- -2.167027745499365e+05, -2.166257365834559e+05, -2.165485961566379e+05, -2.164713537272819e+05, -2.163940097502521e+05,
- -2.163165646775027e+05, -2.162390189581043e+05, -2.161613730382652e+05, -2.160836273613599e+05, -2.160057823679490e+05,
- -2.159278384958055e+05, -2.158497961799368e+05, -2.157716558526100e+05, -2.156934179433724e+05, -2.156150828790754e+05
- },
- {
- 2.797176468017552e+04, 2.618588890181453e+04, 2.437128585639291e+04, 2.252663934199716e+04, 2.065053146019646e+04,
- 1.874143145534568e+04, 1.679768293667763e+04, 1.481748918483899e+04, 1.279889618509193e+04, 1.073977294112855e+04,
- 8.637788520391792e+03, 6.490385145164036e+03, 4.294746467888644e+03, 2.047759939348449e+03, -2.540281249065153e+02,
- -2.614466578705247e+03, -5.037864923658994e+03, -7.529073318834619e+03, -1.009358123610624e+04, -1.273764031589108e+04,
- -1.546841902864033e+04, -1.829419971720559e+04, -2.122463297735952e+04, -2.427107093595434e+04, -2.744701116676109e+04,
- -3.076869909743456e+04, -3.425596304277178e+04, -3.793340022281723e+04, -4.183210999570073e+04, -4.599231280873382e+04,
- -5.046746986836482e+04, -5.533108976337980e+04, -6.068868942010989e+04, -6.670055810453206e+04, -7.363000971531605e+04,
- -8.196274099630211e+04, -9.278337467599897e+04, -1.096559146409427e+05, -1.577089034028970e+05, -1.768388817092807e+05,
- -1.834330798255092e+05, -1.875980937456966e+05, -1.906821033004543e+05, -1.931471839753416e+05, -1.952085438835883e+05,
- -1.969844063999051e+05, -1.985468851690504e+05, -1.999432960680409e+05, -2.012064098648687e+05, -2.023598952171012e+05,
- -2.034214302463939e+05, -2.044045872191786e+05, -2.053200285504737e+05, -2.061762955503383e+05, -2.069803457240754e+05,
- -2.077379290834160e+05, -2.084538581289493e+05, -2.091322056851237e+05, -2.097764526080158e+05, -2.103895999265633e+05,
- -2.109742552704626e+05, -2.115327003914202e+05, -2.120669445680915e+05, -2.125787673232243e+05, -2.130697529448149e+05,
- -2.135413186479570e+05, -2.139947377488010e+05, -2.144311588869793e+05, -2.148516220883701e+05, -2.152570722795568e+05,
- -2.156483707305119e+05, -2.160263048003117e+05, -2.163915962831589e+05, -2.167449085923590e+05, -2.170868529736514e+05,
- -2.174179939031125e+05, -2.177388537963413e+05, -2.180499171330009e+05, -2.183516340826988e+05, -2.186444237036368e+05,
- -2.189286767736746e+05, -2.192047583038581e+05, -2.194730097766164e+05, -2.197337511443598e+05, -2.199872826188633e+05,
- -2.202338862773907e+05, -2.204738275077782e+05, -2.207073563116158e+05, -2.209347084820234e+05, -2.211561066703141e+05,
- -2.213717613539570e+05, -2.215818717166567e+05, -2.217866264499956e+05, -2.219862044849128e+05, -2.221807756602943e+05,
- -2.223705013350751e+05, -2.225555349494984e+05, -2.227360225405397e+05, -2.229121032159181e+05, -2.230839095906444e+05,
- -2.232515681896005e+05, -2.234151998192881e+05, -2.235749199115399e+05, -2.237308388416951e+05, -2.238830622234902e+05,
- -2.240316911826794e+05, -2.241768226112041e+05, -2.243185494035500e+05, -2.244569606767684e+05, -2.245921419755036e+05,
- -2.247241754632313e+05, -2.248531401008154e+05, -2.249791118133726e+05, -2.251021636463575e+05, -2.252223659116909e+05,
- -2.253397863246883e+05, -2.254544901324721e+05, -2.255665402344974e+05, -2.256759972957691e+05, -2.257829198532702e+05,
- -2.258873644160918e+05, -2.259893855597003e+05, -2.260890360147583e+05, -2.261863667508618e+05, -2.262814270558064e+05,
- -2.263742646130669e+05, -2.264649255709132e+05, -2.265534546067427e+05, -2.266398949030644e+05, -2.267242884900814e+05,
- -2.268066759511693e+05, -2.268870966751951e+05, -2.269655888641577e+05, -2.270421895755235e+05, -2.271169347920057e+05,
- -2.271898594277779e+05, -2.272609973954043e+05, -2.273303816384445e+05, -2.273980441687913e+05, -2.274640161022103e+05,
- -2.275283276921829e+05, -2.275910083621489e+05, -2.276520867359837e+05, -2.277115906682700e+05, -2.277695472709016e+05,
- -2.278259829406287e+05, -2.278809233843439e+05, -2.279343936434300e+05, -2.279864181170340e+05, -2.280370205843154e+05,
- -2.280862242257320e+05, -2.281340516434080e+05, -2.281805248806296e+05, -2.282256654405211e+05, -2.282694943039323e+05,
- -2.283120319465842e+05, -2.283532983558506e+05, -2.283933130471352e+05, -2.284320950729654e+05, -2.284696630485488e+05,
- -2.285060351575892e+05, -2.285412291678487e+05, -2.285752624440078e+05, -2.286081519600335e+05, -2.286399143110664e+05,
- -2.286705657248508e+05, -2.287001220727379e+05, -2.287285988802648e+05, -2.287560113373487e+05, -2.287823743080944e+05,
- -2.288077023402461e+05, -2.288320096742916e+05, -2.288553102522400e+05, -2.288776177260772e+05, -2.288989454659285e+05,
- -2.289193065679245e+05, -2.289387138617940e+05, -2.289571799181917e+05, -2.289747170492832e+05, -2.289913373418575e+05,
- -2.290070526239904e+05, -2.290218744983933e+05, -2.290358143417356e+05, -2.290488833105986e+05, -2.290610923472305e+05,
- -2.290724521851136e+05, -2.290829733543454e+05, -2.290926661868496e+05, -2.291015408214158e+05, -2.291096072085782e+05,
- -2.291168751153394e+05, -2.291233541297452e+05, -2.291290536653141e+05, -2.291339829653303e+05, -2.291381511070031e+05,
- -2.291415670054968e+05, -2.291442394178380e+05, -2.291461769467088e+05, -2.291473880441152e+05, -2.291478810149550e+05,
- -2.291476640204753e+05, -2.291467450816255e+05, -2.291451320823181e+05, -2.291428327725856e+05, -2.291398547716529e+05,
- -2.291362055709158e+05, -2.291318925368378e+05, -2.291269229137613e+05, -2.291213038266386e+05, -2.291150422836917e+05,
- -2.291081451789880e+05, -2.291006192949529e+05, -2.290924713048067e+05, -2.290837077749403e+05, -2.290743351672182e+05,
- -2.290643598412257e+05, -2.290537880564517e+05, -2.290426259744146e+05, -2.290308796607285e+05, -2.290185550871168e+05,
- -2.290056581333734e+05, -2.289921945892689e+05, -2.289781701564098e+05, -2.289635904500481e+05, -2.289484610008446e+05,
- -2.289327872565860e+05, -2.289165745961442e+05, -2.288998282829052e+05, -2.288825535373007e+05, -2.288647554919408e+05,
- -2.288464392045177e+05, -2.288276096592778e+05, -2.288082717684595e+05, -2.287884303736938e+05, -2.287680902473715e+05,
- -2.287472560939774e+05, -2.287259325513903e+05, -2.287041241921537e+05, -2.286818355247157e+05, -2.286590709946370e+05,
- -2.286358349857735e+05, -2.286121318214282e+05, -2.285879657654775e+05, -2.285633410234711e+05, -2.285382617437051e+05,
- -2.285127320182704e+05, -2.284867558840805e+05, -2.284603373238674e+05, -2.284334802671660e+05, -2.284061885912651e+05,
- -2.283784661221447e+05, -2.283503166353886e+05, -2.283217438570764e+05, -2.282927514646591e+05, -2.282633430878087e+05,
- -2.282335223092567e+05, -2.282032926656087e+05, -2.281726576481428e+05, -2.281416207035904e+05, -2.281101852349011e+05,
- -2.280783546019911e+05, -2.280461321224724e+05, -2.280135210723713e+05, -2.279805246868260e+05, -2.279471461607762e+05,
- -2.279133886496306e+05, -2.278792552699274e+05, -2.278447490999744e+05, -2.278098731804824e+05, -2.277746305151798e+05,
- -2.277390240714178e+05, -2.277030567807618e+05, -2.276667315395718e+05, -2.276300512095690e+05, -2.275930186183938e+05,
- -2.275556365601489e+05, -2.275179077959355e+05, -2.274798350543749e+05, -2.274414210321235e+05, -2.274026683943732e+05,
- -2.273635797753463e+05, -2.273241577787760e+05, -2.272844049783855e+05, -2.272443239183444e+05, -2.272039171137319e+05,
- -2.271631870509768e+05, -2.271221361883009e+05, -2.270807669561441e+05, -2.270390817575884e+05, -2.269970829687709e+05,
- -2.269547729392871e+05, -2.269121539925906e+05, -2.268692284263835e+05, -2.268259985129974e+05, -2.267824664997709e+05,
- -2.267386346094176e+05, -2.266945050403883e+05, -2.266500799672260e+05, -2.266053615409140e+05, -2.265603518892193e+05,
- -2.265150531170285e+05, -2.264694673066762e+05, -2.264235965182713e+05, -2.263774427900127e+05, -2.263310081385031e+05,
- -2.262842945590564e+05, -2.262373040259968e+05, -2.261900384929564e+05, -2.261424998931662e+05, -2.260946901397398e+05,
- -2.260466111259553e+05, -2.259982647255311e+05, -2.259496527928962e+05, -2.259007771634562e+05, -2.258516396538547e+05,
- -2.258022420622309e+05, -2.257525861684715e+05, -2.257026737344596e+05, -2.256525065043174e+05, -2.256020862046478e+05,
- -2.255514145447679e+05, -2.255004932169436e+05, -2.254493238966152e+05, -2.253979082426213e+05, -2.253462478974226e+05,
- -2.252943444873120e+05, -2.252421996226347e+05, -2.251898148979930e+05, -2.251371918924537e+05, -2.250843321697518e+05,
- -2.250312372784885e+05, -2.249779087523264e+05, -2.249243481101857e+05, -2.248705568564310e+05, -2.248165364810581e+05,
- -2.247622884598799e+05, -2.247078142547047e+05, -2.246531153135159e+05, -2.245981930706442e+05, -2.245430489469449e+05,
- -2.244876843499615e+05, -2.244321006740973e+05, -2.243762993007764e+05, -2.243202815986059e+05, -2.242640489235382e+05,
- -2.242076026190228e+05, -2.241509440161630e+05, -2.240940744338677e+05, -2.240369951790012e+05, -2.239797075465288e+05,
- -2.239222128196631e+05, -2.238645122700059e+05, -2.238066071576889e+05, -2.237484987315134e+05, -2.236901882290839e+05,
- -2.236316768769434e+05, -2.235729658907081e+05, -2.235140564751940e+05, -2.234549498245471e+05, -2.233956471223684e+05,
- -2.233361495418408e+05, -2.232764582458495e+05, -2.232165743871033e+05, -2.231564991082550e+05, -2.230962335420159e+05,
- -2.230357788112753e+05, -2.229751360292099e+05, -2.229143062994000e+05, -2.228532907159383e+05, -2.227920903635377e+05,
- -2.227307063176425e+05, -2.226691396445298e+05, -2.226073914014163e+05, -2.225454626365620e+05, -2.224833543893700e+05,
- -2.224210676904863e+05, -2.223586035618996e+05, -2.222959630170389e+05, -2.222331470608661e+05, -2.221701566899746e+05,
- -2.221069928926802e+05, -2.220436566491121e+05, -2.219801489313066e+05, -2.219164707032926e+05, -2.218526229211829e+05,
- -2.217886065332583e+05, -2.217244224800558e+05, -2.216600716944516e+05, -2.215955551017445e+05, -2.215308736197390e+05,
- -2.214660281588243e+05, -2.214010196220571e+05, -2.213358489052386e+05, -2.212705168969921e+05, -2.212050244788420e+05,
- -2.211393725252869e+05, -2.210735619038752e+05, -2.210075934752804e+05, -2.209414680933710e+05, -2.208751866052850e+05,
- -2.208087498514998e+05, -2.207421586659007e+05, -2.206754138758513e+05, -2.206085163022632e+05, -2.205414667596591e+05,
- -2.204742660562432e+05, -2.204069149939633e+05, -2.203394143685775e+05, -2.202717649697176e+05, -2.202039675809524e+05,
- -2.201360229798489e+05, -2.200679319380329e+05, -2.199996952212526e+05, -2.199313135894347e+05, -2.198627877967466e+05,
- -2.197941185916522e+05, -2.197253067169712e+05, -2.196563529099340e+05, -2.195872579022406e+05, -2.195180224201136e+05,
- -2.194486471843529e+05, -2.193791329103903e+05, -2.193094803083448e+05, -2.192396900830715e+05, -2.191697629342158e+05,
- -2.190996995562651e+05, -2.190295006385985e+05, -2.189591668655366e+05, -2.188886989163925e+05, -2.188180974655200e+05,
- -2.187473631823610e+05, -2.186764967314941e+05, -2.186054987726812e+05, -2.185343699609153e+05, -2.184631109464648e+05,
- -2.183917223749195e+05, -2.183202048872360e+05, -2.182485591197820e+05, -2.181767857043785e+05, -2.181048852683459e+05,
- -2.180328584345434e+05, -2.179607058214150e+05, -2.178884280430278e+05, -2.178160257091161e+05, -2.177434994251189e+05,
- -2.176708497922238e+05, -2.175980774074046e+05, -2.175251828634611e+05, -2.174521667490586e+05, -2.173790296487646e+05,
- -2.173057721430890e+05, -2.172323948085207e+05, -2.171588982175639e+05, -2.170852829387758e+05, -2.170115495368030e+05,
- -2.169376985724167e+05, -2.168637306025483e+05, -2.167896461803243e+05, -2.167154458551019e+05, -2.166411301725013e+05,
- -2.165666996744411e+05, -2.164921548991716e+05, -2.164174963813082e+05, -2.163427246518617e+05, -2.162678402382741e+05,
- -2.161928436644483e+05, -2.161177354507806e+05, -2.160425161141909e+05, -2.159671861681560e+05, -2.158917461227363e+05,
- -2.158161964846104e+05, -2.157405377571019e+05, -2.156647704402101e+05, -2.155888950306396e+05, -2.155129120218277e+05,
- -2.154368219039737e+05, -2.153606251640700e+05, -2.152843222859249e+05, -2.152079137501931e+05, -2.151314000344049e+05,
- -2.150547816129896e+05, -2.149780589573040e+05, -2.149012325356590e+05, -2.148243028133466e+05, -2.147472702526635e+05,
- -2.146701353129373e+05, -2.145928984505555e+05, -2.145155601189854e+05, -2.144381207688017e+05, -2.143605808477112e+05,
- -2.142829408005761e+05, -2.142052010694381e+05, -2.141273620935428e+05, -2.140494243093633e+05, -2.139713881506234e+05
- },
- {
- 2.884836153524409e+04, 2.707564413578380e+04, 2.527481712187433e+04, 2.344461503967880e+04, 2.158367641628894e+04,
- 1.969053342892682e+04, 1.776360010781751e+04, 1.580115880830681e+04, 1.380134463587059e+04, 1.176212743171901e+04,
- 9.681290838128982e+03, 7.556407846010954e+03, 5.384812078041250e+03, 3.163563866917706e+03, 8.894099344392714e+02,
- -1.441264858729205e+03, -3.832495671730911e+03, -6.288808336816864e+03, -8.815305924349186e+03, -1.141777578897984e+04,
- -1.410282328798169e+04, -1.687804068052804e+04, -1.975222308768884e+04, -2.273564839014594e+04, -2.584044550752897e+04,
- -2.908108723612148e+04, -3.247506251578164e+04, -3.604381360957849e+04, -3.981407594955107e+04, -4.381985037337420e+04,
- -4.810540861875710e+04, -5.273006795213147e+04, -5.777617368385777e+04, -6.336333021957176e+04, -6.967597783134576e+04,
- -7.702320505471015e+04, -8.599112785254672e+04, -9.794063185520006e+04, -1.174945377963296e+05, -1.573549858403111e+05,
- -1.732760554246764e+05, -1.800290271577587e+05, -1.843708038527001e+05, -1.875934457030366e+05, -1.901675697629143e+05,
- -1.923169091059061e+05, -1.941654873983673e+05, -1.957893095188069e+05, -1.972383684237275e+05, -1.985473297774371e+05,
- -1.997412385065454e+05, -2.008387951259715e+05, -2.018543465867009e+05, -2.027991526809334e+05, -2.036822226711710e+05,
- -2.045108858873931e+05, -2.052911916478586e+05, -2.060281962736821e+05, -2.067261734023938e+05, -2.073887709669692e+05,
- -2.080191303140908e+05, -2.086199779449017e+05, -2.091936971264990e+05, -2.097423844783142e+05, -2.102678951877975e+05,
- -2.107718795117459e+05, -2.112558125210724e+05, -2.117210185505268e+05, -2.121686914573447e+05, -2.125999115319254e+05,
- -2.130156597110068e+05, -2.134168296000033e+05, -2.138042377026660e+05, -2.141786321736079e+05, -2.145407003457092e+05,
- -2.148910752351830e+05, -2.152303411885967e+05, -2.155590388058361e+05, -2.158776692489648e+05, -2.161866980277300e+05,
- -2.164865583370350e+05, -2.167776540092245e+05, -2.170603621338602e+05, -2.173350353893803e+05, -2.176020041241942e+05,
- -2.178615782191203e+05, -2.181140487583942e+05, -2.183596895325625e+05, -2.185987583932993e+05, -2.188314984774317e+05,
- -2.190581393151296e+05, -2.192788978352484e+05, -2.194939792791205e+05, -2.197035780326766e+05, -2.199078783855405e+05,
- -2.201070552246764e+05, -2.203012746692831e+05, -2.204906946528163e+05, -2.206754654573560e+05, -2.208557302049412e+05,
- -2.210316253099683e+05, -2.212032808963123e+05, -2.213708211824234e+05, -2.215343648373131e+05, -2.216940253100311e+05,
- -2.218499111349776e+05, -2.220021262151407e+05, -2.221507700851581e+05, -2.222959381558981e+05, -2.224377219421024e+05,
- -2.225762092744759e+05, -2.227114844974907e+05, -2.228436286540332e+05, -2.229727196579419e+05, -2.230988324553693e+05,
- -2.232220391758322e+05, -2.233424092737289e+05, -2.234600096610334e+05, -2.235749048318291e+05, -2.236871569792642e+05,
- -2.237968261054883e+05, -2.239039701250608e+05, -2.240086449622965e+05, -2.241109046429707e+05, -2.242108013807679e+05,
- -2.243083856601634e+05, -2.244037063156579e+05, -2.244968106010731e+05, -2.245877441951824e+05, -2.246765514619772e+05,
- -2.247632752777798e+05, -2.248479572194130e+05, -2.249306375916593e+05, -2.250113554741963e+05, -2.250901487936041e+05,
- -2.251670543358985e+05, -2.252421078151721e+05, -2.253153439099472e+05, -2.253867963036199e+05, -2.254564977229321e+05,
- -2.255244799745838e+05, -2.255907739800942e+05, -2.256554098090098e+05, -2.257184167105556e+05, -2.257798231438143e+05,
- -2.258396568060744e+05, -2.258979446619836e+05, -2.259547129673937e+05, -2.260099872959385e+05, -2.260637925626209e+05,
- -2.261161530467075e+05, -2.261670924136273e+05, -2.262166337359244e+05, -2.262647995133140e+05, -2.263116116918879e+05,
- -2.263570916825088e+05, -2.264012603804815e+05, -2.264441381744141e+05, -2.264857449740411e+05, -2.265261002187998e+05,
- -2.265652228938225e+05, -2.266031315445557e+05, -2.266398442905173e+05, -2.266753788385145e+05, -2.267097524953490e+05,
- -2.267429821800250e+05, -2.267750844354937e+05, -2.268060754399489e+05, -2.268359710176960e+05, -2.268647866496135e+05,
- -2.268925374832262e+05, -2.269192383424068e+05, -2.269449037367220e+05, -2.269695478704385e+05, -2.269931846448571e+05,
- -2.270158276924054e+05, -2.270374903456205e+05, -2.270581856713498e+05, -2.270779264715760e+05, -2.270967252906697e+05,
- -2.271145944223962e+05, -2.271315459166805e+05, -2.271475915861434e+05, -2.271627430124151e+05, -2.271770115522403e+05,
- -2.271904083433771e+05, -2.272029443103021e+05, -2.272146301697300e+05, -2.272254764359497e+05, -2.272354934259910e+05,
- -2.272446912646240e+05, -2.272530798891972e+05, -2.272606690543257e+05, -2.272674683364289e+05, -2.272734871381267e+05,
- -2.272787346924994e+05, -2.272832200672170e+05, -2.272869521685396e+05, -2.272899397451968e+05, -2.272921913921518e+05,
- -2.272937155542472e+05, -2.272945205297471e+05, -2.272946144737705e+05, -2.272940054016263e+05, -2.272927011920438e+05,
- -2.272907095903203e+05, -2.272880382113653e+05, -2.272846945426651e+05, -2.272806859471603e+05, -2.272760196660399e+05,
- -2.272707028214581e+05, -2.272647424191740e+05, -2.272581453511188e+05, -2.272509183978870e+05, -2.272430682311676e+05,
- -2.272346014160993e+05, -2.272255244135655e+05, -2.272158435824298e+05, -2.272055651817047e+05, -2.271946953726675e+05,
- -2.271832402209173e+05, -2.271712056983789e+05, -2.271585976852504e+05, -2.271454219719063e+05, -2.271316842607424e+05,
- -2.271173901679797e+05, -2.271025452364833e+05, -2.270871548941081e+05, -2.270712245191173e+05, -2.270547594001378e+05,
- -2.270377647479599e+05, -2.270202456970789e+05, -2.270022073072021e+05, -2.269836545647130e+05, -2.269645923841045e+05,
- -2.269450256093744e+05, -2.269249590153859e+05, -2.269043973091974e+05, -2.268833451313582e+05, -2.268618070571731e+05,
- -2.268397875979389e+05, -2.268172912021482e+05, -2.267943222566664e+05, -2.267708850878813e+05, -2.267469839628247e+05,
- -2.267226230902681e+05, -2.266978066217938e+05, -2.266725386528388e+05, -2.266468232237182e+05, -2.266206643206225e+05,
- -2.265940658765910e+05, -2.265670317724696e+05, -2.265395658378372e+05, -2.265116718519198e+05, -2.264833535444800e+05,
- -2.264546145966874e+05, -2.264254586419693e+05, -2.263958892668436e+05, -2.263659100117338e+05, -2.263355243717648e+05,
- -2.263047357975397e+05, -2.262735476959070e+05, -2.262419634307016e+05, -2.262099863234773e+05, -2.261776196542192e+05,
- -2.261448666620447e+05, -2.261117305458863e+05, -2.260782144651615e+05, -2.260443215404290e+05, -2.260100548540306e+05,
- -2.259754174507200e+05, -2.259404123382774e+05, -2.259050424881152e+05, -2.258693108358650e+05, -2.258332202819592e+05,
- -2.257967736921965e+05, -2.257599738982966e+05, -2.257228236984455e+05, -2.256853258578278e+05, -2.256474831091506e+05,
- -2.256092981531531e+05, -2.255707736591109e+05, -2.255319122653274e+05, -2.254927165796150e+05, -2.254531891797692e+05,
- -2.254133326140327e+05, -2.253731494015486e+05, -2.253326420328068e+05, -2.252918129700825e+05, -2.252506646478632e+05,
- -2.252091994732700e+05, -2.251674198264721e+05, -2.251253280610887e+05, -2.250829265045879e+05, -2.250402174586763e+05,
- -2.249972031996816e+05, -2.249538859789279e+05, -2.249102680231020e+05, -2.248663515346191e+05, -2.248221386919733e+05,
- -2.247776316500883e+05, -2.247328325406589e+05, -2.246877434724868e+05, -2.246423665318101e+05, -2.245967037826261e+05,
- -2.245507572670107e+05, -2.245045290054295e+05, -2.244580209970439e+05, -2.244112352200133e+05, -2.243641736317904e+05,
- -2.243168381694114e+05, -2.242692307497812e+05, -2.242213532699538e+05, -2.241732076074088e+05, -2.241247956203199e+05,
- -2.240761191478236e+05, -2.240271800102785e+05, -2.239779800095222e+05, -2.239285209291245e+05, -2.238788045346351e+05,
- -2.238288325738279e+05, -2.237786067769396e+05, -2.237281288569077e+05, -2.236774005095983e+05, -2.236264234140377e+05,
- -2.235751992326345e+05, -2.235237296113999e+05, -2.234720161801651e+05, -2.234200605527929e+05, -2.233678643273883e+05,
- -2.233154290865038e+05, -2.232627563973427e+05, -2.232098478119577e+05, -2.231567048674473e+05, -2.231033290861491e+05,
- -2.230497219758280e+05, -2.229958850298646e+05, -2.229418197274381e+05, -2.228875275337074e+05, -2.228330098999883e+05,
- -2.227782682639285e+05, -2.227233040496813e+05, -2.226681186680729e+05, -2.226127135167712e+05, -2.225570899804490e+05,
- -2.225012494309446e+05, -2.224451932274239e+05, -2.223889227165342e+05, -2.223324392325591e+05, -2.222757440975730e+05,
- -2.222188386215847e+05, -2.221617241026915e+05, -2.221044018272184e+05, -2.220468730698641e+05, -2.219891390938417e+05,
- -2.219312011510143e+05, -2.218730604820345e+05, -2.218147183164760e+05, -2.217561758729686e+05, -2.216974343593262e+05,
- -2.216384949726753e+05, -2.215793588995837e+05, -2.215200273161818e+05, -2.214605013882873e+05, -2.214007822715266e+05,
- -2.213408711114518e+05, -2.212807690436597e+05, -2.212204771939072e+05, -2.211599966782242e+05, -2.210993286030277e+05,
- -2.210384740652315e+05, -2.209774341523543e+05, -2.209162099426295e+05, -2.208548025051086e+05, -2.207932128997681e+05,
- -2.207314421776104e+05, -2.206694913807666e+05, -2.206073615425965e+05, -2.205450536877852e+05, -2.204825688324442e+05,
- -2.204199079842042e+05, -2.203570721423098e+05, -2.202940622977146e+05, -2.202308794331710e+05, -2.201675245233228e+05,
- -2.201039985347922e+05, -2.200403024262705e+05, -2.199764371486038e+05, -2.199124036448777e+05, -2.198482028505041e+05,
- -2.197838356933027e+05, -2.197193030935843e+05, -2.196546059642319e+05, -2.195897452107797e+05, -2.195247217314942e+05,
- -2.194595364174492e+05, -2.193941901526050e+05, -2.193286838138847e+05, -2.192630182712449e+05, -2.191971943877552e+05,
- -2.191312130196661e+05, -2.190650750164847e+05, -2.189987812210434e+05, -2.189323324695694e+05, -2.188657295917561e+05,
- -2.187989734108288e+05, -2.187320647436144e+05, -2.186650044006058e+05, -2.185977931860272e+05, -2.185304318979016e+05,
- -2.184629213281109e+05, -2.183952622624623e+05, -2.183274554807479e+05, -2.182595017568076e+05, -2.181914018585893e+05,
- -2.181231565482085e+05, -2.180547665820080e+05, -2.179862327106161e+05, -2.179175556790025e+05, -2.178487362265387e+05,
- -2.177797750870506e+05, -2.177106729888759e+05, -2.176414306549192e+05, -2.175720488027033e+05, -2.175025281444271e+05,
- -2.174328693870137e+05, -2.173630732321655e+05, -2.172931403764147e+05, -2.172230715111735e+05, -2.171528673227861e+05,
- -2.170825284925757e+05, -2.170120556968956e+05, -2.169414496071764e+05, -2.168707108899743e+05, -2.167998402070171e+05,
- -2.167288382152539e+05, -2.166577055668968e+05, -2.165864429094699e+05, -2.165150508858524e+05, -2.164435301343241e+05,
- -2.163718812886078e+05, -2.163001049779147e+05, -2.162282018269856e+05, -2.161561724561331e+05, -2.160840174812852e+05,
- -2.160117375140241e+05, -2.159393331616301e+05, -2.158668050271187e+05, -2.157941537092835e+05, -2.157213798027320e+05,
- -2.156484838979288e+05, -2.155754665812313e+05, -2.155023284349279e+05, -2.154290700372769e+05, -2.153556919625423e+05,
- -2.152821947810321e+05, -2.152085790591323e+05, -2.151348453593454e+05, -2.150609942403249e+05, -2.149870262569083e+05,
- -2.149129419601560e+05, -2.148387418973815e+05, -2.147644266121878e+05, -2.146899966444995e+05, -2.146154525305987e+05,
- -2.145407948031533e+05, -2.144660239912517e+05, -2.143911406204368e+05, -2.143161452127347e+05, -2.142410382866865e+05,
- -2.141658203573807e+05, -2.140904919364823e+05, -2.140150535322647e+05, -2.139395056496378e+05, -2.138638487901785e+05,
- -2.137880834521609e+05, -2.137122101305832e+05, -2.136362293171984e+05, -2.135601415005413e+05, -2.134839471659572e+05,
- -2.134076467956291e+05, -2.133312408686058e+05, -2.132547298608279e+05, -2.131781142451564e+05, -2.131013944913974e+05,
- -2.130245710663296e+05, -2.129476444337293e+05, -2.128706150543975e+05, -2.127934833861833e+05, -2.127162498840110e+05,
- -2.126389149999036e+05, -2.125614791830087e+05, -2.124839428796209e+05, -2.124063065332077e+05, -2.123285705844333e+05
- },
- {
- 2.972594954801246e+04, 2.796623014077302e+04, 2.617900356677562e+04, 2.436305301886391e+04, 2.251707102301853e+04,
- 2.063964987528787e+04, 1.872927074951303e+04, 1.678429124073834e+04, 1.480293106558801e+04, 1.278325557374901e+04,
- 1.072315664982916e+04, 8.620330484747921e+03, 6.472251569345648e+03, 4.276142099464796e+03, 2.028935769128356e+03,
- -2.727653507731169e+02, -2.632742521175590e+03, -5.055222800138918e+03, -7.544955106878785e+03, -1.010730365031195e+04,
- -1.274836377280847e+04, -1.547510707361347e+04, -1.829556527788507e+04, -2.121906611463945e+04, -2.425654011829664e+04,
- -2.742092586235540e+04, -3.072771452810911e+04, -3.419569609407177e+04, -3.784800491859678e+04, -4.171362279519073e+04,
- -4.582960546195225e+04, -5.024449979531932e+04, -5.502381716429998e+04, -6.025927180883945e+04, -6.608543565914663e+04,
- -7.271243086021869e+04, -8.049782872231257e+04, -9.013169814822206e+04, -1.032302907745508e+05, -1.247775664938363e+05,
- -1.561571239794791e+05, -1.699628442228861e+05, -1.767359023504485e+05, -1.812036424933819e+05, -1.845425635436793e+05,
- -1.872142257396880e+05, -1.894449894478637e+05, -1.913622703867281e+05, -1.930448327012898e+05, -1.945447624685436e+05,
- -1.958982993563433e+05, -1.971316800154793e+05, -1.982645174295258e+05, -1.993118658297764e+05, -2.002855399824139e+05,
- -2.011949897778662e+05, -2.020478983380477e+05, -2.028506020901831e+05, -2.036083927073032e+05, -2.043257385949272e+05,
- -2.050064503200775e+05, -2.056538061828951e+05, -2.062706489321038e+05, -2.068594612457071e+05, -2.074224253525180e+05,
- -2.079614706482680e+05, -2.084783121103325e+05, -2.089744815792348e+05, -2.094513534515760e+05, -2.099101659514772e+05,
- -2.103520388719072e+05, -2.107779884735384e+05, -2.111889400766186e+05, -2.115857387665355e+05, -2.119691585462839e+05,
- -2.123399102018302e+05, -2.126986480942694e+05, -2.130459760519479e+05, -2.133824525036996e+05, -2.137085949689185e+05,
- -2.140248839999261e+05, -2.143317666557912e+05, -2.146296595736016e+05, -2.149189516924763e+05, -2.152000066768625e+05,
- -2.154731650784695e+05, -2.157387462702586e+05, -2.159970501809720e+05, -2.162483588545887e+05, -2.164929378556467e+05,
- -2.167310375384880e+05, -2.169628941960378e+05, -2.171887311016646e+05, -2.174087594559124e+05, -2.176231792483886e+05,
- -2.178321800438212e+05, -2.180359417001801e+05, -2.182346350258165e+05, -2.184284223817597e+05, -2.186174582345808e+05,
- -2.188018896646334e+05, -2.189818568339346e+05, -2.191574934174800e+05, -2.193289270013763e+05, -2.194962794508150e+05,
- -2.196596672505909e+05, -2.198192018205917e+05, -2.199749898084364e+05, -2.201271333612237e+05, -2.202757303781545e+05,
- -2.204208747456247e+05, -2.205626565562275e+05, -2.207011623129708e+05, -2.208364751198920e+05, -2.209686748601430e+05,
- -2.210978383625227e+05, -2.212240395573438e+05, -2.213473496224459e+05, -2.214678371200877e+05, -2.215855681254039e+05,
- -2.217006063470337e+05, -2.218130132404898e+05, -2.219228481147892e+05, -2.220301682328171e+05, -2.221350289058635e+05,
- -2.222374835829473e+05, -2.223375839377696e+05, -2.224353799469622e+05, -2.225309199625158e+05, -2.226242506949164e+05,
- -2.227154175641763e+05, -2.228044644116703e+05, -2.228914337588981e+05, -2.229763668163632e+05, -2.230593035577424e+05,
- -2.231402827396112e+05, -2.232193419716609e+05, -2.232965177571566e+05, -2.233718455367236e+05, -2.234453597299703e+05,
- -2.235170937750784e+05, -2.235870801664734e+05, -2.236553504906902e+05, -2.237219354605362e+05, -2.237868649476470e+05,
- -2.238501680135240e+05, -2.239118729391442e+05, -2.239720072532127e+05, -2.240305977584186e+05, -2.240876705599364e+05,
- -2.241432510861199e+05, -2.241973641145408e+05, -2.242500337938929e+05, -2.243012836655249e+05, -2.243511366840457e+05,
- -2.243996152391101e+05, -2.244467411659660e+05, -2.244925357765316e+05, -2.245370198672290e+05, -2.245802137391666e+05,
- -2.246221372131942e+05, -2.246628096454624e+05, -2.247022499421322e+05, -2.247404765735008e+05, -2.247775075875681e+05,
- -2.248133606230771e+05, -2.248480529220435e+05, -2.248816013418075e+05, -2.249140223666260e+05, -2.249453321188208e+05,
- -2.249755463632951e+05, -2.250046805430723e+05, -2.250327497509245e+05, -2.250597687648611e+05, -2.250857520507971e+05,
- -2.251107137714554e+05, -2.251346677949510e+05, -2.251576277030670e+05, -2.251796067992415e+05, -2.252006181162716e+05,
- -2.252206744237517e+05, -2.252397882352497e+05, -2.252579718152442e+05, -2.252752371858167e+05, -2.252915961331267e+05,
- -2.253070602136607e+05, -2.253216407602793e+05, -2.253353488880583e+05, -2.253481954999429e+05, -2.253601912922135e+05,
- -2.253713467597759e+05, -2.253816722012798e+05, -2.253911777240747e+05, -2.253998732490077e+05, -2.254077685150692e+05,
- -2.254148730838938e+05, -2.254211963441200e+05, -2.254267475156153e+05, -2.254315356535725e+05, -2.254355696524773e+05,
- -2.254388582499610e+05, -2.254414100305302e+05, -2.254432334291904e+05, -2.254443367349601e+05, -2.254447280942771e+05,
- -2.254444155143110e+05, -2.254434068661729e+05, -2.254417098880359e+05, -2.254393321881637e+05, -2.254362812478530e+05,
- -2.254325644242895e+05, -2.254281889533275e+05, -2.254231619521866e+05, -2.254174904220754e+05, -2.254111812507422e+05,
- -2.254042412149530e+05, -2.253966769829036e+05, -2.253884951165642e+05, -2.253797020739600e+05, -2.253703042113927e+05,
- -2.253603077855977e+05, -2.253497189558481e+05, -2.253385437860011e+05, -2.253267882464870e+05, -2.253144582162524e+05,
- -2.253015594846477e+05, -2.252880977631308e+05, -2.252740786484462e+05, -2.252595076810672e+05, -2.252443903098886e+05,
- -2.252287319029456e+05, -2.252125377490302e+05, -2.251958130592674e+05, -2.251785629686505e+05, -2.251607925375370e+05,
- -2.251425067531143e+05, -2.251237105308178e+05, -2.251044087157258e+05, -2.250846060839112e+05, -2.250643073437684e+05,
- -2.250435171372990e+05, -2.250222400413778e+05, -2.250004805689779e+05, -2.249782431703719e+05, -2.249555322343064e+05,
- -2.249323520891438e+05, -2.249087070039812e+05, -2.248846011897439e+05, -2.248600388002463e+05, -2.248350239332400e+05,
- -2.248095606314284e+05, -2.247836528834604e+05, -2.247573046249046e+05, -2.247305197391975e+05, -2.247033020585729e+05,
- -2.246756553649690e+05, -2.246475833909163e+05, -2.246190898204058e+05, -2.245901782897357e+05, -2.245608523883434e+05,
- -2.245311156596152e+05, -2.245009716016829e+05, -2.244704236681977e+05, -2.244394752690914e+05, -2.244081297713210e+05,
- -2.243763904995959e+05, -2.243442607370883e+05, -2.243117437261322e+05, -2.242788426689061e+05, -2.242455607281000e+05,
- -2.242119010275693e+05, -2.241778666529761e+05, -2.241434606524154e+05, -2.241086860370301e+05, -2.240735457816133e+05,
- -2.240380428251943e+05, -2.240021800716190e+05, -2.239659603901157e+05, -2.239293866158452e+05, -2.238924615504480e+05,
- -2.238551879625747e+05, -2.238175685884068e+05, -2.237796061321683e+05, -2.237413032666270e+05, -2.237026626335847e+05,
- -2.236636868443596e+05, -2.236243784802570e+05, -2.235847400930339e+05, -2.235447742053508e+05, -2.235044833112187e+05,
- -2.234638698764335e+05, -2.234229363390062e+05, -2.233816851095821e+05, -2.233401185718523e+05, -2.232982390829583e+05,
- -2.232560489738888e+05, -2.232135505498686e+05, -2.231707460907403e+05, -2.231276378513386e+05, -2.230842280618604e+05,
- -2.230405189282223e+05, -2.229965126324178e+05, -2.229522113328641e+05, -2.229076171647418e+05, -2.228627322403346e+05,
- -2.228175586493539e+05, -2.227720984592644e+05, -2.227263537156016e+05, -2.226803264422819e+05, -2.226340186419112e+05,
- -2.225874322960837e+05, -2.225405693656771e+05, -2.224934317911443e+05, -2.224460214927983e+05, -2.223983403710900e+05,
- -2.223503903068863e+05, -2.223021731617394e+05, -2.222536907781511e+05, -2.222049449798364e+05, -2.221559375719781e+05,
- -2.221066703414797e+05, -2.220571450572134e+05, -2.220073634702640e+05, -2.219573273141672e+05, -2.219070383051472e+05,
- -2.218564981423463e+05, -2.218057085080532e+05, -2.217546710679274e+05, -2.217033874712180e+05, -2.216518593509811e+05,
- -2.216000883242930e+05, -2.215480759924582e+05, -2.214958239412159e+05, -2.214433337409433e+05, -2.213906069468544e+05,
- -2.213376450991939e+05, -2.212844497234341e+05, -2.212310223304607e+05, -2.211773644167611e+05, -2.211234774646084e+05,
- -2.210693629422414e+05, -2.210150223040419e+05, -2.209604569907114e+05, -2.209056684294407e+05, -2.208506580340825e+05,
- -2.207954272053147e+05, -2.207399773308078e+05, -2.206843097853850e+05, -2.206284259311803e+05, -2.205723271177974e+05,
- -2.205160146824622e+05, -2.204594899501753e+05, -2.204027542338609e+05, -2.203458088345155e+05, -2.202886550413508e+05,
- -2.202312941319367e+05, -2.201737273723440e+05, -2.201159560172802e+05, -2.200579813102282e+05, -2.199998044835776e+05,
- -2.199414267587595e+05, -2.198828493463765e+05, -2.198240734463304e+05, -2.197651002479476e+05, -2.197059309301063e+05,
- -2.196465666613567e+05, -2.195870086000439e+05, -2.195272578944244e+05, -2.194673156827872e+05, -2.194071830935662e+05,
- -2.193468612454556e+05, -2.192863512475227e+05, -2.192256541993170e+05, -2.191647711909814e+05, -2.191037033033571e+05,
- -2.190424516080927e+05, -2.189810171677467e+05, -2.189194010358902e+05, -2.188576042572105e+05, -2.187956278676089e+05,
- -2.187334728942999e+05, -2.186711403559107e+05, -2.186086312625739e+05, -2.185459466160240e+05, -2.184830874096900e+05,
- -2.184200546287883e+05, -2.183568492504113e+05, -2.182934722436198e+05, -2.182299245695288e+05, -2.181662071813950e+05,
- -2.181023210247038e+05, -2.180382670372517e+05, -2.179740461492323e+05, -2.179096592833162e+05, -2.178451073547340e+05,
- -2.177803912713566e+05, -2.177155119337715e+05, -2.176504702353633e+05, -2.175852670623918e+05, -2.175199032940632e+05,
- -2.174543798026099e+05, -2.173886974533616e+05, -2.173228571048182e+05, -2.172568596087237e+05, -2.171907058101352e+05,
- -2.171243965474936e+05, -2.170579326526930e+05, -2.169913149511480e+05, -2.169245442618635e+05, -2.168576213974971e+05,
- -2.167905471644285e+05, -2.167233223628222e+05, -2.166559477866918e+05, -2.165884242239633e+05, -2.165207524565369e+05,
- -2.164529332603502e+05, -2.163849674054355e+05, -2.163168556559827e+05, -2.162485987703975e+05, -2.161801975013600e+05,
- -2.161116525958812e+05, -2.160429647953621e+05, -2.159741348356475e+05, -2.159051634470827e+05, -2.158360513545690e+05,
- -2.157667992776167e+05, -2.156974079303998e+05, -2.156278780218065e+05, -2.155582102554933e+05, -2.154884053299361e+05,
- -2.154184639384816e+05, -2.153483867693953e+05, -2.152781745059147e+05, -2.152078278262947e+05, -2.151373474038582e+05,
- -2.150667339070430e+05, -2.149959879994497e+05, -2.149251103398871e+05, -2.148541015824214e+05, -2.147829623764177e+05,
- -2.147116933665870e+05, -2.146402951930306e+05, -2.145687684912851e+05, -2.144971138923631e+05, -2.144253320227989e+05,
- -2.143534235046886e+05, -2.142813889557334e+05, -2.142092289892806e+05, -2.141369442143649e+05, -2.140645352357482e+05,
- -2.139920026539584e+05, -2.139193470653319e+05, -2.138465690620507e+05, -2.137736692321796e+05, -2.137006481597078e+05,
- -2.136275064245834e+05, -2.135542446027521e+05, -2.134808632661943e+05, -2.134073629829598e+05, -2.133337443172056e+05,
- -2.132600078292306e+05, -2.131861540755115e+05, -2.131121836087353e+05, -2.130380969778368e+05, -2.129638947280296e+05,
- -2.128895774008421e+05, -2.128151455341494e+05, -2.127405996622065e+05, -2.126659403156796e+05, -2.125911680216805e+05,
- -2.125162833037961e+05, -2.124412866821208e+05, -2.123661786732879e+05, -2.122909597904989e+05, -2.122156305435556e+05,
- -2.121401914388882e+05, -2.120646429795867e+05, -2.119889856654293e+05, -2.119132199929112e+05, -2.118373464552745e+05,
- -2.117613655425342e+05, -2.116852777415103e+05, -2.116090835358508e+05, -2.115327834060629e+05, -2.114563778295381e+05,
- -2.113798672805794e+05, -2.113032522304292e+05, -2.112265331472942e+05, -2.111497104963711e+05, -2.110727847398737e+05,
- -2.109957563370581e+05, -2.109186257442463e+05, -2.108413934148537e+05, -2.107640597994118e+05, -2.106866253455920e+05
- },
- {
- 3.060452770503346e+04, 2.885764867456725e+04, 2.708385016415249e+04, 2.528196200844651e+04, 2.345072842195135e+04,
- 2.158879914645084e+04, 1.969471939347908e+04, 1.776691837334579e+04, 1.580369616406083e+04, 1.380320861670236e+04,
- 1.176344992788196e+04, 9.682232425845059e+03, 7.557163008703114e+03, 5.385615535628606e+03, 3.164698293662394e+03,
- 8.912154305207096e+02, -1.438379061836557e+03, -3.828036634298865e+03, -6.282181105410697e+03, -8.805790332379658e+03,
- -1.140449675690542e+04, -1.408471237711608e+04, -1.685378571033465e+04, -1.972020120715841e+04, -2.269383581640791e+04,
- -2.578629372855727e+04, -2.901134997931415e+04, -3.238554869760952e+04, -3.592902595536263e+04, -3.966666754420035e+04,
- -4.362978072414679e+04, -4.785858272112717e+04, -5.240604041609593e+04, -5.734405623349637e+04, -6.277397395368030e+04,
- -6.884563409214758e+04, -7.579494437763091e+04, -8.402631961598818e+04, -9.431934884694619e+04, -1.084167096244107e+05,
- -1.304178767621079e+05, -1.546880094246577e+05, -1.668808157459768e+05, -1.735673356865617e+05, -1.781089486152092e+05,
- -1.815387330030774e+05, -1.842941171975480e+05, -1.865981176235160e+05, -1.885789305472508e+05, -1.903167989765897e+05,
- -1.918652176310697e+05, -1.932616111781224e+05, -1.945331769115965e+05, -1.957002983015589e+05, -1.967786471972959e+05,
- -1.977805353601950e+05, -1.987158149982058e+05, -1.995924971813974e+05, -2.004171876493014e+05, -2.011954009112663e+05,
- -2.019317911455453e+05, -2.026303249407080e+05, -2.032944125756675e+05, -2.039270092159100e+05, -2.045306939319577e+05,
- -2.051077321310240e+05, -2.056601254189667e+05, -2.061896518208942e+05, -2.066978985236553e+05, -2.071862887578487e+05,
- -2.076561040427987e+05, -2.081085027295813e+05, -2.085445355638403e+05, -2.089651588306037e+05, -2.093712455228280e+05,
- -2.097635948835599e+05, -2.101429406009804e+05, -2.105099578808417e+05, -2.108652695780101e+05, -2.112094515351528e+05,
- -2.115430372498903e+05, -2.118665219704396e+05, -2.121803663026430e+05, -2.124849993974596e+05, -2.127808217767541e+05,
- -2.130682078460434e+05, -2.133475081353071e+05, -2.136190513027623e+05, -2.138831459313242e+05, -2.141400821431878e+05,
- -2.143901330543565e+05, -2.146335560879250e+05, -2.148705941623805e+05, -2.151014767690081e+05, -2.153264209506747e+05,
- -2.155456321926853e+05, -2.157593052350639e+05, -2.159676248144785e+05, -2.161707663430226e+05, -2.163688965302230e+05,
- -2.165621739538905e+05, -2.167507495848060e+05, -2.169347672696547e+05, -2.171143641761469e+05, -2.172896712038307e+05,
- -2.174608133637266e+05, -2.176279101295868e+05, -2.177910757632906e+05, -2.179504196166286e+05, -2.181060464115101e+05,
- -2.182580565004129e+05, -2.184065461087323e+05, -2.185516075605147e+05, -2.186933294889262e+05, -2.188317970326811e+05,
- -2.189670920195365e+05, -2.190992931378641e+05, -2.192284760972172e+05, -2.193547137787293e+05, -2.194780763761041e+05,
- -2.195986315279023e+05, -2.197164444417559e+05, -2.198315780110917e+05, -2.199440929249116e+05, -2.200540477711044e+05,
- -2.201614991337559e+05, -2.202665016861943e+05, -2.203691082798426e+05, -2.204693700223563e+05, -2.205673362900737e+05,
- -2.206630550005869e+05, -2.207565724420382e+05, -2.208479334710300e+05, -2.209371815416892e+05, -2.210243587819722e+05,
- -2.211095060214295e+05, -2.211926628629147e+05, -2.212738677275078e+05, -2.213531579018930e+05, -2.214305695833658e+05,
- -2.215061379226200e+05, -2.215798970644299e+05, -2.216518801863661e+05, -2.217221195356472e+05, -2.217906464642423e+05,
- -2.218574914623161e+05, -2.219226841901140e+05, -2.219862535083759e+05, -2.220482275073530e+05, -2.221086335345106e+05,
- -2.221674982209842e+05, -2.222248475068578e+05, -2.222807066640544e+05, -2.223351003243354e+05, -2.223880524963824e+05,
- -2.224395865831363e+05, -2.224897254137321e+05, -2.225384912543593e+05, -2.225859058284281e+05, -2.226319903353679e+05,
- -2.226767654670227e+05, -2.227202514242131e+05, -2.227624679324508e+05, -2.228034342570302e+05, -2.228431692175132e+05,
- -2.228816912016438e+05, -2.229190181726124e+05, -2.229551677066592e+05, -2.229901569677874e+05, -2.230240027450946e+05,
- -2.230567214577495e+05, -2.230883291659948e+05, -2.231188415817356e+05, -2.231482740787384e+05, -2.231766417024538e+05,
- -2.232039591794804e+05, -2.232302409266872e+05, -2.232555010600063e+05, -2.232797534029121e+05, -2.233030114946021e+05,
- -2.233252885978880e+05, -2.233465977068117e+05, -2.233669515539978e+05, -2.233863626177529e+05, -2.234048431289231e+05,
- -2.234224050775176e+05, -2.234390602191109e+05, -2.234548200810293e+05, -2.234696959683328e+05, -2.234836989696008e+05,
- -2.234968399625245e+05, -2.235091296193232e+05, -2.235205784119801e+05, -2.235311966173146e+05, -2.235409943218883e+05,
- -2.235499814267610e+05, -2.235581676520930e+05, -2.235655625416034e+05, -2.235721754668952e+05, -2.235780156316404e+05,
- -2.235830920756409e+05, -2.235874136787649e+05, -2.235909891647646e+05, -2.235938271049771e+05, -2.235959359219183e+05,
- -2.235973238927669e+05, -2.235979991527474e+05, -2.235979696984136e+05, -2.235972433908366e+05, -2.235958279586986e+05,
- -2.235937310013018e+05, -2.235909599914868e+05, -2.235875222784722e+05, -2.235834250906086e+05, -2.235786755380608e+05,
- -2.235732806154127e+05, -2.235672472041988e+05, -2.235605820753672e+05, -2.235532918916750e+05, -2.235453832100181e+05,
- -2.235368624836984e+05, -2.235277360646270e+05, -2.235180102054742e+05, -2.235076910617547e+05, -2.234967846938650e+05,
- -2.234852970690598e+05, -2.234732340720753e+05, -2.234606014730392e+05, -2.234474049790915e+05, -2.234336502037172e+05,
- -2.234193426764147e+05, -2.234044878443881e+05, -2.233890910741967e+05, -2.233731576533628e+05, -2.233566927919370e+05,
- -2.233397016240298e+05, -2.233221892092967e+05, -2.233041605343963e+05, -2.232856205144050e+05, -2.232665739942009e+05,
- -2.232470257498112e+05, -2.232269804897321e+05, -2.232064428562110e+05, -2.231854174265014e+05, -2.231639087140867e+05,
- -2.231419211698772e+05, -2.231194591833741e+05, -2.230965270838105e+05, -2.230731291412664e+05, -2.230492695677518e+05,
- -2.230249525182717e+05, -2.230001820918612e+05, -2.229749623326027e+05, -2.229492972306120e+05, -2.229231907230104e+05,
- -2.228966466948687e+05, -2.228696689801322e+05, -2.228422613625268e+05, -2.228144275764411e+05, -2.227861713077916e+05,
- -2.227574961948694e+05, -2.227284058291652e+05, -2.226989037561799e+05, -2.226689934762146e+05, -2.226386784451465e+05,
- -2.226079620751835e+05, -2.225768477356083e+05, -2.225453387535024e+05, -2.225134384144559e+05, -2.224811499632635e+05,
- -2.224484766046036e+05, -2.224154215037059e+05, -2.223819877870011e+05, -2.223481785427615e+05, -2.223139968217253e+05,
- -2.222794456377106e+05, -2.222445279682123e+05, -2.222092467549935e+05, -2.221736049046578e+05, -2.221376052892150e+05,
- -2.221012507466344e+05, -2.220645440813836e+05, -2.220274880649620e+05, -2.219900854364199e+05, -2.219523389028679e+05,
- -2.219142511399768e+05, -2.218758247924686e+05, -2.218370624745939e+05, -2.217979667706072e+05, -2.217585402352245e+05,
- -2.217187853940786e+05, -2.216787047441620e+05, -2.216383007542639e+05, -2.215975758653955e+05, -2.215565324912104e+05,
- -2.215151730184161e+05, -2.214734998071765e+05, -2.214315151915075e+05, -2.213892214796665e+05, -2.213466209545330e+05,
- -2.213037158739830e+05, -2.212605084712541e+05, -2.212170009553097e+05, -2.211731955111890e+05, -2.211290943003567e+05,
- -2.210846994610422e+05, -2.210400131085757e+05, -2.209950373357161e+05, -2.209497742129740e+05, -2.209042257889287e+05,
- -2.208583940905389e+05, -2.208122811234493e+05, -2.207658888722902e+05, -2.207192193009734e+05, -2.206722743529799e+05,
- -2.206250559516471e+05, -2.205775660004468e+05, -2.205298063832612e+05, -2.204817789646517e+05, -2.204334855901251e+05,
- -2.203849280863941e+05, -2.203361082616337e+05, -2.202870279057339e+05, -2.202376887905449e+05, -2.201880926701232e+05,
- -2.201382412809699e+05, -2.200881363422657e+05, -2.200377795561015e+05, -2.199871726077080e+05, -2.199363171656772e+05,
- -2.198852148821826e+05, -2.198338673931964e+05, -2.197822763187017e+05, -2.197304432629019e+05, -2.196783698144247e+05,
- -2.196260575465275e+05, -2.195735080172932e+05, -2.195207227698289e+05, -2.194677033324569e+05, -2.194144512189037e+05,
- -2.193609679284886e+05, -2.193072549463055e+05, -2.192533137434027e+05, -2.191991457769641e+05, -2.191447524904802e+05,
- -2.190901353139219e+05, -2.190352956639096e+05, -2.189802349438804e+05, -2.189249545442515e+05, -2.188694558425828e+05,
- -2.188137402037345e+05, -2.187578089800240e+05, -2.187016635113813e+05, -2.186453051254987e+05, -2.185887351379826e+05,
- -2.185319548524991e+05, -2.184749655609185e+05, -2.184177685434584e+05, -2.183603650688263e+05, -2.183027563943540e+05,
- -2.182449437661373e+05, -2.181869284191688e+05, -2.181287115774701e+05, -2.180702944542227e+05, -2.180116782518952e+05,
- -2.179528641623712e+05, -2.178938533670733e+05, -2.178346470370846e+05, -2.177752463332712e+05, -2.177156524064012e+05,
- -2.176558663972604e+05, -2.175958894367704e+05, -2.175357226461005e+05, -2.174753671367817e+05, -2.174148240108169e+05,
- -2.173540943607877e+05, -2.172931792699668e+05, -2.172320798124194e+05, -2.171707970531100e+05, -2.171093320480052e+05,
- -2.170476858441755e+05, -2.169858594798937e+05, -2.169238539847352e+05, -2.168616703796755e+05, -2.167993096771858e+05,
- -2.167367728813259e+05, -2.166740609878409e+05, -2.166111749842500e+05, -2.165481158499380e+05, -2.164848845562472e+05,
- -2.164214820665625e+05, -2.163579093363989e+05, -2.162941673134886e+05, -2.162302569378663e+05, -2.161661791419489e+05,
- -2.161019348506224e+05, -2.160375249813206e+05, -2.159729504441056e+05, -2.159082121417471e+05, -2.158433109697994e+05,
- -2.157782478166816e+05, -2.157130235637485e+05, -2.156476390853703e+05, -2.155820952490030e+05, -2.155163929152639e+05,
- -2.154505329380012e+05, -2.153845161643673e+05, -2.153183434348881e+05, -2.152520155835297e+05, -2.151855334377715e+05,
- -2.151188978186693e+05, -2.150521095409241e+05, -2.149851694129467e+05, -2.149180782369235e+05, -2.148508368088788e+05,
- -2.147834459187395e+05, -2.147159063503967e+05, -2.146482188817677e+05, -2.145803842848559e+05, -2.145124033258113e+05,
- -2.144442767649891e+05, -2.143760053570094e+05, -2.143075898508146e+05, -2.142390309897248e+05, -2.141703295114955e+05,
- -2.141014861483734e+05, -2.140325016271494e+05, -2.139633766692162e+05, -2.138941119906178e+05, -2.138247083021055e+05,
- -2.137551663091876e+05, -2.136854867121831e+05, -2.136156702062707e+05, -2.135457174815414e+05, -2.134756292230459e+05,
- -2.134054061108443e+05, -2.133350488200552e+05, -2.132645580209035e+05, -2.131939343787663e+05, -2.131231785542224e+05,
- -2.130522912030949e+05, -2.129812729764991e+05, -2.129101245208883e+05, -2.128388464780952e+05, -2.127674394853791e+05,
- -2.126959041754680e+05, -2.126242411765995e+05, -2.125524511125679e+05, -2.124805346027624e+05, -2.124084922622096e+05,
- -2.123363247016134e+05, -2.122640325273992e+05, -2.121916163417475e+05, -2.121190767426404e+05, -2.120464143238951e+05,
- -2.119736296752059e+05, -2.119007233821808e+05, -2.118276960263799e+05, -2.117545481853519e+05, -2.116812804326717e+05,
- -2.116078933379765e+05, -2.115343874670020e+05, -2.114607633816165e+05, -2.113870216398599e+05, -2.113131627959744e+05,
- -2.112391874004399e+05, -2.111650960000105e+05, -2.110908891377439e+05, -2.110165673530384e+05, -2.109421311816645e+05,
- -2.108675811557960e+05, -2.107929178040435e+05, -2.107181416514869e+05, -2.106432532197052e+05, -2.105682530268081e+05,
- -2.104931415874667e+05, -2.104179194129446e+05, -2.103425870111276e+05, -2.102671448865515e+05, -2.101915935404353e+05,
- -2.101159334707062e+05, -2.100401651720314e+05, -2.099642891358450e+05, -2.098883058503758e+05, -2.098122158006776e+05,
- -2.097360194686526e+05, -2.096597173330834e+05, -2.095833098696544e+05, -2.095067975509842e+05, -2.094301808466475e+05,
- -2.093534602232032e+05, -2.092766361442200e+05, -2.091997090703021e+05, -2.091226794591132e+05, -2.090455477654020e+05
- },
- {
- 3.148409496350826e+04, 2.974990140670785e+04, 2.798936172477989e+04, 2.620135048088747e+04, 2.438466137770494e+04,
- 2.253799906255073e+04, 2.065996984031343e+04, 1.874907110910724e+04, 1.680367930122838e+04, 1.482203606153694e+04,
- 1.280223234113405e+04, 1.074219000978629e+04, 8.639640500837666e+03, 6.492099885235937e+03, 4.296839622242658e+03,
- 2.050852041082415e+03, -2.491906446043295e+02, -2.606985320308407e+03, -5.026656925879188e+03, -7.512829952063737e+03,
- -1.007071585923938e+04, -1.270622091741495e+04, -1.542608052885585e+04, -1.823802830983753e+04, -2.115101139994786e+04,
- -2.417546814898699e+04, -2.732369133393331e+04, -3.061031077179259e+04, -3.405294590370497e+04, -3.767310606085608e+04,
- -4.149746070725717e+04, -4.555967922803351e+04, -4.990317777003571e+04, -5.458536981845427e+04, -5.968453080495763e+04,
- -6.531147117204228e+04, -7.163067110762575e+04, -7.890155515166293e+04, -8.756633452739402e+04, -9.845042818220980e+04,
- -1.131805767890373e+05, -1.339745910077702e+05, -1.531084683181901e+05, -1.640015869888854e+05, -1.705288932020451e+05,
- -1.750963946442325e+05, -1.785903779178377e+05, -1.814140003270152e+05, -1.837816611573917e+05, -1.858197627966290e+05,
- -1.876086891075030e+05, -1.892025980729760e+05, -1.906396605957737e+05, -1.919477654728830e+05, -1.931478963020005e+05,
- -1.942562319692897e+05, -1.952855079030445e+05, -1.962459290646650e+05, -1.971458003650857e+05, -1.979919729727590e+05,
- -1.987901672156376e+05, -1.995452107028527e+05, -2.002612169304330e+05, -2.009417212999540e+05, -2.015897861384269e+05,
- -2.022080828043441e+05, -2.027989566177369e+05, -2.033644787498252e+05, -2.039064880952333e+05, -2.044266253651508e+05,
- -2.049263610786598e+05, -2.054070187228765e+05, -2.058697940544325e+05, -2.063157712937875e+05, -2.067459367982780e+05,
- -2.071611906745681e+05, -2.075623566955646e+05, -2.079501908132610e+05, -2.083253885018782e+05, -2.086885911209916e+05,
- -2.090403914531776e+05, -2.093813385427996e+05, -2.097119419403019e+05, -2.100326754384825e+05, -2.103439803727765e+05,
- -2.106462685458304e+05, -2.109399248270667e+05, -2.112253094700532e+05, -2.115027601839987e+05, -2.117725939903093e+05,
- -2.120351088906447e+05, -2.122905853691753e+05, -2.125392877485745e+05, -2.127814654166300e+05, -2.130173539381154e+05,
- -2.132471760646362e+05, -2.134711426535517e+05, -2.136894535056757e+05, -2.139022981302596e+05, -2.141098564447394e+05,
- -2.143122994158394e+05, -2.145097896478498e+05, -2.147024819232408e+05, -2.148905237001827e+05, -2.150740555710403e+05,
- -2.152532116854734e+05, -2.154281201413698e+05, -2.155989033465151e+05, -2.157656783535885e+05, -2.159285571708173e+05,
- -2.160876470503811e+05, -2.162430507564579e+05, -2.163948668146102e+05, -2.165431897440492e+05, -2.166881102741726e+05,
- -2.168297155466361e+05, -2.169680893041015e+05, -2.171033120667037e+05, -2.172354612971839e+05, -2.173646115555506e+05,
- -2.174908346440557e+05, -2.176141997432051e+05, -2.177347735394575e+05, -2.178526203452215e+05, -2.179678022116928e+05,
- -2.180803790350422e+05, -2.181904086566755e+05, -2.182979469604999e+05, -2.184030479604976e+05, -2.185057638821606e+05,
- -2.186061451501235e+05, -2.187042407600837e+05, -2.188000979814440e+05, -2.188937626289521e+05, -2.189852790959978e+05,
- -2.190746903912301e+05, -2.191620382117195e+05, -2.192473629927188e+05, -2.193307039588938e+05, -2.194120991729653e+05,
- -2.194915855819149e+05, -2.195691990609022e+05, -2.196449744550269e+05, -2.197189456190619e+05, -2.197911454552760e+05,
- -2.198616059494533e+05, -2.199303582052128e+05, -2.199974324767265e+05, -2.200628581999179e+05, -2.201266640222331e+05,
- -2.201888778310586e+05, -2.202495267808562e+05, -2.203086373190919e+05, -2.203662352130585e+05, -2.204223455652360e+05,
- -2.204769928468642e+05, -2.205302009180601e+05, -2.205819930404990e+05, -2.206323919040232e+05, -2.206814196437443e+05,
- -2.207290978588306e+05, -2.207754476296433e+05, -2.208204895286148e+05, -2.208642436607186e+05, -2.209067296418712e+05,
- -2.209479666388384e+05, -2.209879733771344e+05, -2.210267681547170e+05, -2.210643688551529e+05, -2.211007929602728e+05,
- -2.211360575623397e+05, -2.211701793757611e+05, -2.212031747483510e+05, -2.212350596721783e+05, -2.212658497940060e+05,
- -2.212955604253505e+05, -2.213242065521707e+05, -2.213518028442038e+05, -2.213783636639699e+05, -2.214039030754490e+05,
- -2.214284348524534e+05, -2.214519724867039e+05, -2.214745291956252e+05, -2.214961179298677e+05, -2.215167513805709e+05,
- -2.215364419863814e+05, -2.215552019402284e+05, -2.215730431958721e+05, -2.215899774742315e+05, -2.216060162695063e+05,
- -2.216211708550891e+05, -2.216354522892889e+05, -2.216488714208676e+05, -2.216614388943949e+05, -2.216731651554329e+05,
- -2.216840604555550e+05, -2.216941348572047e+05, -2.217033982384011e+05, -2.217118602972998e+05, -2.217195305566071e+05,
- -2.217264183678629e+05, -2.217325329155893e+05, -2.217378832213116e+05, -2.217424781474603e+05, -2.217463264011536e+05,
- -2.217494365378686e+05, -2.217518169649993e+05, -2.217534759453163e+05, -2.217544216003150e+05, -2.217546619134778e+05,
- -2.217542047334308e+05, -2.217530577770181e+05, -2.217512286322808e+05, -2.217487247613569e+05, -2.217455535032958e+05,
- -2.217417220767941e+05, -2.217372375828564e+05, -2.217321070073785e+05, -2.217263372236649e+05, -2.217199349948705e+05,
- -2.217129069763801e+05, -2.217052597181225e+05, -2.216969996668194e+05, -2.216881331681781e+05, -2.216786664690226e+05,
- -2.216686057193670e+05, -2.216579569819818e+05, -2.216467262049414e+05, -2.216349192665799e+05, -2.216225419493622e+05,
- -2.216095999485317e+05, -2.215960988738840e+05, -2.215820442514893e+05, -2.215674415253780e+05, -2.215522960591766e+05,
- -2.215366131377087e+05, -2.215203979685520e+05, -2.215036556835575e+05, -2.214863913403325e+05, -2.214686099236840e+05,
- -2.214503163470306e+05, -2.214315154537769e+05, -2.214122120186551e+05, -2.213924107490366e+05, -2.213721162862088e+05,
- -2.213513332066220e+05, -2.213300660231114e+05, -2.213083191860814e+05, -2.212860970846707e+05, -2.212634040478844e+05,
- -2.212402443457030e+05, -2.212166221901638e+05, -2.211925417364172e+05, -2.211680070837618e+05, -2.211430222766513e+05,
- -2.211175913056815e+05, -2.210917181085545e+05, -2.210654065710203e+05, -2.210386605277999e+05, -2.210114837634833e+05,
- -2.209838800134109e+05, -2.209558529645351e+05, -2.209274062562627e+05, -2.208985434812779e+05, -2.208692681863469e+05,
- -2.208395838731105e+05, -2.208094939988495e+05, -2.207790019772444e+05, -2.207481111791104e+05, -2.207168249331228e+05,
- -2.206851465265222e+05, -2.206530792058090e+05, -2.206206261774203e+05, -2.205877906083932e+05, -2.205545756270167e+05,
- -2.205209843234651e+05, -2.204870197504249e+05, -2.204526849237026e+05, -2.204179828228231e+05, -2.203829163916167e+05,
- -2.203474885387922e+05, -2.203117021384981e+05, -2.202755600308774e+05, -2.202390650226013e+05, -2.202022198874054e+05,
- -2.201650273666022e+05, -2.201274901695936e+05, -2.200896109743677e+05, -2.200513924279868e+05, -2.200128371470678e+05,
- -2.199739477182510e+05, -2.199347266986600e+05, -2.198951766163561e+05, -2.198552999707775e+05, -2.198150992331766e+05,
- -2.197745768470458e+05, -2.197337352285343e+05, -2.196925767668601e+05, -2.196511038247105e+05, -2.196093187386389e+05,
- -2.195672238194518e+05, -2.195248213525880e+05, -2.194821135984928e+05, -2.194391027929845e+05, -2.193957911476134e+05,
- -2.193521808500154e+05, -2.193082740642583e+05, -2.192640729311816e+05, -2.192195795687315e+05, -2.191747960722877e+05,
- -2.191297245149870e+05, -2.190843669480383e+05, -2.190387254010339e+05, -2.189928018822553e+05, -2.189465983789713e+05,
- -2.189001168577345e+05, -2.188533592646687e+05, -2.188063275257547e+05, -2.187590235471078e+05, -2.187114492152544e+05,
- -2.186636063973993e+05, -2.186154969416928e+05, -2.185671226774893e+05, -2.185184854156037e+05, -2.184695869485637e+05,
- -2.184204290508574e+05, -2.183710134791738e+05, -2.183213419726453e+05, -2.182714162530788e+05, -2.182212380251914e+05,
- -2.181708089768325e+05, -2.181201307792101e+05, -2.180692050871105e+05, -2.180180335391127e+05, -2.179666177578022e+05,
- -2.179149593499789e+05, -2.178630599068635e+05, -2.178109210042989e+05, -2.177585442029493e+05, -2.177059310484965e+05,
- -2.176530830718300e+05, -2.176000017892402e+05, -2.175466887026007e+05, -2.174931452995549e+05, -2.174393730536939e+05,
- -2.173853734247353e+05, -2.173311478586982e+05, -2.172766977880737e+05, -2.172220246319956e+05, -2.171671297964070e+05,
- -2.171120146742222e+05, -2.170566806454911e+05, -2.170011290775558e+05, -2.169453613252087e+05, -2.168893787308442e+05,
- -2.168331826246137e+05, -2.167767743245717e+05, -2.167201551368248e+05, -2.166633263556760e+05, -2.166062892637671e+05,
- -2.165490451322191e+05, -2.164915952207710e+05, -2.164339407779155e+05, -2.163760830410338e+05, -2.163180232365268e+05,
- -2.162597625799465e+05, -2.162013022761228e+05, -2.161426435192919e+05, -2.160837874932189e+05, -2.160247353713209e+05,
- -2.159654883167891e+05, -2.159060474827058e+05, -2.158464140121636e+05, -2.157865890383810e+05, -2.157265736848142e+05,
- -2.156663690652721e+05, -2.156059762840250e+05, -2.155453964359157e+05, -2.154846306064634e+05, -2.154236798719760e+05,
- -2.153625452996473e+05, -2.153012279476642e+05, -2.152397288653092e+05, -2.151780490930566e+05, -2.151161896626746e+05,
- -2.150541515973210e+05, -2.149919359116395e+05, -2.149295436118553e+05, -2.148669756958659e+05, -2.148042331533351e+05,
- -2.147413169657839e+05, -2.146782281066785e+05, -2.146149675415196e+05, -2.145515362279290e+05, -2.144879351157361e+05,
- -2.144241651470611e+05, -2.143602272564002e+05, -2.142961223707070e+05, -2.142318514094736e+05, -2.141674152848113e+05,
- -2.141028149015300e+05, -2.140380511572143e+05, -2.139731249423035e+05, -2.139080371401650e+05, -2.138427886271698e+05,
- -2.137773802727679e+05, -2.137118129395586e+05, -2.136460874833649e+05, -2.135802047533043e+05, -2.135141655918573e+05,
- -2.134479708349371e+05, -2.133816213119596e+05, -2.133151178459085e+05, -2.132484612534034e+05, -2.131816523447653e+05,
- -2.131146919240797e+05, -2.130475807892630e+05, -2.129803197321246e+05, -2.129129095384286e+05, -2.128453509879555e+05,
- -2.127776448545651e+05, -2.127097919062531e+05, -2.126417929052133e+05, -2.125736486078931e+05, -2.125053597650544e+05,
- -2.124369271218286e+05, -2.123683514177735e+05, -2.122996333869291e+05, -2.122307737578718e+05, -2.121617732537685e+05,
- -2.120926325924314e+05, -2.120233524863703e+05, -2.119539336428443e+05, -2.118843767639125e+05, -2.118146825464893e+05,
- -2.117448516823879e+05, -2.116748848583760e+05, -2.116047827562218e+05, -2.115345460527437e+05, -2.114641754198560e+05,
- -2.113936715246212e+05, -2.113230350292900e+05, -2.112522665913541e+05, -2.111813668635860e+05, -2.111103364940888e+05,
- -2.110391761263380e+05, -2.109678863992264e+05, -2.108964679471066e+05, -2.108249213998365e+05, -2.107532473828192e+05,
- -2.106814465170450e+05, -2.106095194191352e+05, -2.105374667013809e+05, -2.104652889717841e+05, -2.103929868340977e+05,
- -2.103205608878658e+05, -2.102480117284617e+05, -2.101753399471264e+05, -2.101025461310084e+05, -2.100296308632002e+05,
- -2.099565947227750e+05, -2.098834382848254e+05, -2.098101621204985e+05, -2.097367667970319e+05, -2.096632528777902e+05,
- -2.095896209222996e+05, -2.095158714862828e+05, -2.094420051216940e+05, -2.093680223767520e+05, -2.092939237959743e+05,
- -2.092197099202090e+05, -2.091453812866725e+05, -2.090709384289746e+05, -2.089963818771570e+05, -2.089217121577221e+05,
- -2.088469297936658e+05, -2.087720353045059e+05, -2.086970292063168e+05, -2.086219120117576e+05, -2.085466842301012e+05,
- -2.084713463672667e+05, -2.083958989258470e+05, -2.083203424051378e+05, -2.082446773011690e+05, -2.081689041067276e+05,
- -2.080930233113927e+05, -2.080170354015584e+05, -2.079409408604623e+05, -2.078647401682148e+05, -2.077884338018241e+05,
- -2.077120222352226e+05, -2.076355059392954e+05, -2.075588853819043e+05, -2.074821610279139e+05, -2.074053333392182e+05
- },
- {
- 3.236465025251212e+04, 3.064298992193791e+04, 2.889554290357461e+04, 2.712122666267634e+04, 2.531888229389799e+04,
- 2.348726693538015e+04, 2.162504519297798e+04, 1.973077941040580e+04, 1.780291859338989e+04, 1.583978575248779e+04,
- 1.383956338142184e+04, 1.180027672700998e+04, 9.719774427228858e+03, 7.595705997811842e+03, 5.425495521541719e+03,
- 3.206310733857400e+03, 9.350264898333940e+02, -1.391818675028482e+03, -3.778074537527182e+03, -6.228041859875209e+03,
- -8.746548516100738e+03, -1.133904272507667e+04, -1.401170825840093e+04, -1.677160819048128e+04, -1.962686616969719e+04,
- -2.258689766740468e+04, -2.566270876646565e+04, -2.886728769840966e+04, -3.221612597716089e+04, -3.572792439548606e+04,
- -3.942556841775985e+04, -4.333750650075929e+04, -4.749974859419069e+04, -5.195885160385341e+04, -5.677653716403548e+04,
- -6.203713186448383e+04, -6.786014198881719e+04, -7.442269973512330e+04, -8.200197758301484e+04, -9.105838111926366e+04,
- -1.023864239621372e+05, -1.172421540400939e+05, -1.358693352165405e+05, -1.514819288752615e+05, -1.612978777664606e+05,
- -1.676196311045143e+05, -1.721724478792715e+05, -1.757045880986882e+05, -1.785801028038237e+05, -1.810008167884175e+05,
- -1.830890519756711e+05, -1.849240406578697e+05, -1.865598455555291e+05, -1.880349192662736e+05, -1.893775473328190e+05,
- -1.906091211703735e+05, -1.917461984017082e+05, -1.928018509088821e+05, -1.937865761343992e+05, -1.947089305341794e+05,
- -1.955759805856946e+05, -1.963936306736843e+05, -1.971668658849070e+05, -1.978999347539765e+05, -1.985964888412479e+05,
- -1.992596907611229e+05, -1.998922988065423e+05, -2.004967339763254e+05, -2.010751336071783e+05, -2.016293946926552e+05,
- -2.021612091785431e+05, -2.026720929549084e+05, -2.031634098511848e+05, -2.036363916362559e+05, -2.040921547991300e+05,
- -2.045317147158307e+05, -2.049559976792371e+05, -2.053658511700786e+05, -2.057620526712748e+05, -2.061453172687589e+05,
- -2.065163042356771e+05, -2.068756227604027e+05, -2.072238369498566e+05, -2.075614702165255e+05, -2.078890091389799e+05,
- -2.082069068706908e+05, -2.085155861597326e+05, -2.088154420320055e+05, -2.091068441824023e+05, -2.093901391116110e+05,
- -2.096656520406266e+05, -2.099336886304004e+05, -2.101945365301364e+05, -2.104484667744887e+05, -2.106957350471412e+05,
- -2.109365828259241e+05, -2.111712384226322e+05, -2.113999179290276e+05, -2.116228260790599e+05, -2.118401570360969e+05,
- -2.120520951129000e+05, -2.122588154311507e+05, -2.124604845265445e+05, -2.126572609047721e+05, -2.128492955531144e+05,
- -2.130367324118487e+05, -2.132197088092019e+05, -2.133983558631963e+05, -2.135727988533671e+05, -2.137431575650301e+05,
- -2.139095466085028e+05, -2.140720757154285e+05, -2.142308500141602e+05, -2.143859702859480e+05, -2.145375332035189e+05,
- -2.146856315534821e+05, -2.148303544438571e+05, -2.149717874979058e+05, -2.151100130353373e+05, -2.152451102418623e+05,
- -2.153771553279809e+05, -2.155062216778196e+05, -2.156323799887493e+05, -2.157556984024688e+05, -2.158762426281654e+05,
- -2.159940760583250e+05, -2.161092598777155e+05, -2.162218531676099e+05, -2.163319130045269e+05, -2.164394945478581e+05,
- -2.165446510569516e+05, -2.166474341870861e+05, -2.167478938075035e+05, -2.168460782148383e+05, -2.169420341830951e+05,
- -2.170358070098884e+05, -2.171274405910858e+05, -2.172169774757810e+05, -2.173044589216561e+05, -2.173899249475171e+05,
- -2.174734143831652e+05, -2.175549649167720e+05, -2.176346131399035e+05, -2.177123945903314e+05, -2.177883437927630e+05,
- -2.178624942976114e+05, -2.179348787179102e+05, -2.180055287644918e+05, -2.180744752795118e+05, -2.181417482684245e+05,
- -2.182073769304879e+05, -2.182713896900743e+05, -2.183338142155267e+05, -2.183946774594049e+05, -2.184540056745619e+05,
- -2.185118244407913e+05, -2.185681586880413e+05, -2.186230327186299e+05, -2.186764702200523e+05, -2.187284943191933e+05,
- -2.187791275509892e+05, -2.188283919110981e+05, -2.188763088653009e+05, -2.189228993666931e+05, -2.189681838721740e+05,
- -2.190121823582753e+05, -2.190549143363539e+05, -2.190963988671860e+05, -2.191366545749846e+05, -2.191756996608724e+05,
- -2.192135519158335e+05, -2.192502287331665e+05, -2.192857471204654e+05, -2.193201237111474e+05, -2.193533747755460e+05,
- -2.193855162315970e+05, -2.194165636551232e+05, -2.194465322897490e+05, -2.194754370564503e+05, -2.195032925627585e+05,
- -2.195301131116424e+05, -2.195559127100628e+05, -2.195807050772369e+05, -2.196045036526051e+05, -2.196273216035226e+05,
- -2.196491718326884e+05, -2.196700669853158e+05, -2.196900194560593e+05, -2.197090413957117e+05, -2.197271447176677e+05,
- -2.197443411041831e+05, -2.197606420124157e+05, -2.197760586802765e+05, -2.197906021320842e+05, -2.198042831840401e+05,
- -2.198171124495221e+05, -2.198291003442148e+05, -2.198402570910723e+05, -2.198505927251253e+05, -2.198601170981390e+05,
- -2.198688398831243e+05, -2.198767705787098e+05, -2.198839185133780e+05, -2.198902928495754e+05, -2.198959025876948e+05,
- -2.199007565699363e+05, -2.199048634840570e+05, -2.199082318670060e+05, -2.199108701084510e+05, -2.199127864542030e+05,
- -2.199139890095411e+05, -2.199144857424363e+05, -2.199142844866908e+05, -2.199133929449763e+05, -2.199118186917949e+05,
- -2.199095691763510e+05, -2.199066517253424e+05, -2.199030735456756e+05, -2.198988417271039e+05, -2.198939632447901e+05,
- -2.198884449618036e+05, -2.198822936315460e+05, -2.198755159001086e+05, -2.198681183085709e+05, -2.198601072952343e+05,
- -2.198514891977967e+05, -2.198422702618901e+05, -2.198324566181569e+05, -2.198220543207175e+05, -2.198110693254666e+05,
- -2.197995074977362e+05, -2.197873746141456e+05, -2.197746763644092e+05, -2.197614183530964e+05, -2.197476061013446e+05,
- -2.197332450485311e+05, -2.197183405539035e+05, -2.197028978981653e+05, -2.196869222850277e+05, -2.196704188427162e+05,
- -2.196533926254465e+05, -2.196358486148600e+05, -2.196177917214250e+05, -2.195992267858061e+05, -2.195801585801950e+05,
- -2.195605918096174e+05, -2.195405311132024e+05, -2.195199810654214e+05, -2.194989461773027e+05, -2.194774308976128e+05,
- -2.194554396140121e+05, -2.194329766541840e+05, -2.194100462869346e+05, -2.193866527232711e+05, -2.193628001174548e+05,
- -2.193384925680247e+05, -2.193137341188069e+05, -2.192885287598914e+05, -2.192628804285957e+05, -2.192367930103985e+05,
- -2.192102703398611e+05, -2.191833162015196e+05, -2.191559343307647e+05, -2.191281284146963e+05, -2.190999020929641e+05,
- -2.190712589585871e+05, -2.190422025587565e+05, -2.190127363956188e+05, -2.189828639270457e+05, -2.189525885673855e+05,
- -2.189219136881984e+05, -2.188908426189745e+05, -2.188593786478428e+05, -2.188275250222569e+05, -2.187952849496727e+05,
- -2.187626615982084e+05, -2.187296580972933e+05, -2.186962775383008e+05, -2.186625229751698e+05, -2.186283974250135e+05,
- -2.185939038687146e+05, -2.185590452515098e+05, -2.185238244835599e+05, -2.184882444405139e+05, -2.184523079640540e+05,
- -2.184160178624359e+05, -2.183793769110161e+05, -2.183423878527700e+05, -2.183050533987950e+05, -2.182673762288118e+05,
- -2.182293589916482e+05, -2.181910043057183e+05, -2.181523147594903e+05, -2.181132929119458e+05, -2.180739412930299e+05,
- -2.180342624040941e+05, -2.179942587183267e+05, -2.179539326811823e+05, -2.179132867107946e+05, -2.178723231983876e+05,
- -2.178310445086765e+05, -2.177894529802625e+05, -2.177475509260176e+05, -2.177053406334653e+05, -2.176628243651516e+05,
- -2.176200043590127e+05, -2.175768828287314e+05, -2.175334619640899e+05, -2.174897439313174e+05, -2.174457308734262e+05,
- -2.174014249105475e+05, -2.173568281402584e+05, -2.173119426379018e+05, -2.172667704569043e+05, -2.172213136290846e+05,
- -2.171755741649580e+05, -2.171295540540371e+05, -2.170832552651237e+05, -2.170366797465994e+05, -2.169898294267070e+05,
- -2.169427062138315e+05, -2.168953119967719e+05, -2.168476486450126e+05, -2.167997180089852e+05, -2.167515219203314e+05,
- -2.167030621921549e+05, -2.166543406192758e+05, -2.166053589784768e+05, -2.165561190287428e+05, -2.165066225115035e+05,
- -2.164568711508670e+05, -2.164068666538476e+05, -2.163566107105964e+05, -2.163061049946211e+05, -2.162553511630075e+05,
- -2.162043508566348e+05, -2.161531057003855e+05, -2.161016173033579e+05, -2.160498872590680e+05, -2.159979171456516e+05,
- -2.159457085260654e+05, -2.158932629482805e+05, -2.158405819454733e+05, -2.157876670362173e+05, -2.157345197246677e+05,
- -2.156811415007455e+05, -2.156275338403158e+05, -2.155736982053662e+05, -2.155196360441823e+05, -2.154653487915178e+05,
- -2.154108378687648e+05, -2.153561046841188e+05, -2.153011506327441e+05, -2.152459770969339e+05, -2.151905854462700e+05,
- -2.151349770377776e+05, -2.150791532160809e+05, -2.150231153135541e+05, -2.149668646504689e+05, -2.149104025351442e+05,
- -2.148537302640893e+05, -2.147968491221452e+05, -2.147397603826284e+05, -2.146824653074647e+05, -2.146249651473291e+05,
- -2.145672611417774e+05, -2.145093545193796e+05, -2.144512464978499e+05, -2.143929382841739e+05, -2.143344310747361e+05,
- -2.142757260554436e+05, -2.142168244018489e+05, -2.141577272792710e+05, -2.140984358429136e+05, -2.140389512379830e+05,
- -2.139792745998044e+05, -2.139194070539328e+05, -2.138593497162701e+05, -2.137991036931714e+05, -2.137386700815562e+05,
- -2.136780499690150e+05, -2.136172444339162e+05, -2.135562545455104e+05, -2.134950813640306e+05, -2.134337259407995e+05,
- -2.133721893183239e+05, -2.133104725303957e+05, -2.132485766021895e+05, -2.131865025503583e+05, -2.131242513831277e+05,
- -2.130618241003886e+05, -2.129992216937909e+05, -2.129364451468332e+05, -2.128734954349507e+05, -2.128103735256071e+05,
- -2.127470803783782e+05, -2.126836169450381e+05, -2.126199841696470e+05, -2.125561829886301e+05, -2.124922143308639e+05,
- -2.124280791177547e+05, -2.123637782633209e+05, -2.122993126742700e+05, -2.122346832500777e+05, -2.121698908830657e+05,
- -2.121049364584756e+05, -2.120398208545463e+05, -2.119745449425843e+05, -2.119091095870424e+05, -2.118435156455856e+05,
- -2.117777639691647e+05, -2.117118554020880e+05, -2.116457907820888e+05, -2.115795709403925e+05, -2.115131967017869e+05,
- -2.114466688846868e+05, -2.113799883012004e+05, -2.113131557571930e+05, -2.112461720523526e+05, -2.111790379802515e+05,
- -2.111117543284103e+05, -2.110443218783590e+05, -2.109767414056960e+05, -2.109090136801506e+05, -2.108411394656395e+05,
- -2.107731195203298e+05, -2.107049545966914e+05, -2.106366454415571e+05, -2.105681927961792e+05, -2.104995973962829e+05,
- -2.104308599721240e+05, -2.103619812485398e+05, -2.102929619450063e+05, -2.102238027756892e+05, -2.101545044494940e+05,
- -2.100850676701231e+05, -2.100154931361218e+05, -2.099457815409295e+05, -2.098759335729327e+05, -2.098059499155091e+05,
- -2.097358312470806e+05, -2.096655782411587e+05, -2.095951915663921e+05, -2.095246718866144e+05, -2.094540198608896e+05,
- -2.093832361435585e+05, -2.093123213842812e+05, -2.092412762280864e+05, -2.091701013154116e+05, -2.090987972821467e+05,
- -2.090273647596799e+05, -2.089558043749380e+05, -2.088841167504274e+05, -2.088123025042774e+05, -2.087403622502821e+05,
- -2.086682965979383e+05, -2.085961061524868e+05, -2.085237915149525e+05, -2.084513532821828e+05, -2.083787920468861e+05,
- -2.083061083976713e+05, -2.082333029190835e+05, -2.081603761916434e+05, -2.080873287918831e+05, -2.080141612923821e+05,
- -2.079408742618056e+05, -2.078674682649371e+05, -2.077939438627157e+05, -2.077203016122702e+05, -2.076465420669549e+05,
- -2.075726657763816e+05, -2.074986732864532e+05, -2.074245651393994e+05, -2.073503418738088e+05, -2.072760040246589e+05,
- -2.072015521233527e+05, -2.071269866977456e+05, -2.070523082721813e+05, -2.069775173675194e+05, -2.069026145011698e+05,
- -2.068276001871191e+05, -2.067524749359647e+05, -2.066772392549408e+05, -2.066018936479503e+05, -2.065264386155943e+05,
- -2.064508746551973e+05, -2.063752022608419e+05, -2.062994219233902e+05, -2.062235341305169e+05, -2.061475393667329e+05,
- -2.060714381134166e+05, -2.059952308488371e+05, -2.059189180481831e+05, -2.058425001835888e+05, -2.057659777241600e+05
- },
- {
- 3.324619247410358e+04, 3.153691572327126e+04, 2.980239820530613e+04, 2.804159854365649e+04, 2.625340322742381e+04,
- 2.443661958941129e+04, 2.258996788721430e+04, 2.071207234167081e+04, 1.880145096339894e+04, 1.685650396028121e+04,
- 1.487550047840545e+04, 1.285656337605079e+04, 1.079765166336872e+04, 8.696540161102816e+03, 6.550795821568665e+03,
- 4.357750026000669e+03, 2.114465997392746e+03, -1.822997547124956e+02, -2.536143333580675e+03, -4.951068461070666e+03,
- -7.431552867183484e+03, -9.982629034953974e+03, -1.260998321875136e+04, -1.532007796040389e+04, -1.812030515473214e+04,
- -2.101917930894638e+04, -2.402658437828975e+04, -2.715409304289817e+04, -3.041538549821814e+04, -3.382680727298876e+04,
- -3.740812532401177e+04, -4.118357271675768e+04, -4.518332416453581e+04, -4.944563259766984e+04, -5.402001213975150e+04,
- -5.897213641689941e+04, -6.439165779674161e+04, -7.040519446692755e+04, -7.719872638813211e+04, -8.505687516719379e+04,
- -9.442692056179365e+04, -1.059799320744609e+05, -1.204520295201201e+05, -1.366990711119469e+05, -1.498389450984085e+05,
- -1.587465550967448e+05, -1.648346546257838e+05, -1.693403667357137e+05, -1.728867450464038e+05, -1.757978031419935e+05,
- -1.782603771810686e+05, -1.803909104043294e+05, -1.822663379060364e+05, -1.839399066871222e+05, -1.854498883176427e+05,
- -1.868246602151992e+05, -1.880858161882322e+05, -1.892501515839687e+05, -1.903309764139573e+05, -1.913390110921947e+05,
- -1.922830138538110e+05, -1.931702304213547e+05, -1.940067227891942e+05, -1.947976138947519e+05, -1.955472725691302e+05,
- -1.962594553218303e+05, -1.969374164239010e+05, -1.975839943727674e+05, -1.982016805306831e+05, -1.987926741477301e+05,
- -1.993589268715761e+05, -1.999021790571508e+05, -2.004239896203158e+05, -2.009257607641102e+05, -2.014087585993359e+05,
- -2.018741304523359e+05, -2.023229194803431e+05, -2.027560770836633e+05, -2.031744735034110e+05, -2.035789069158271e+05,
- -2.039701112736791e+05, -2.043487630978050e+05, -2.047154873843657e+05, -2.050708627635967e+05, -2.054154260220271e+05,
- -2.057496760809714e+05, -2.060740775086057e+05, -2.063890636303296e+05, -2.066950392918187e+05, -2.069923833207024e+05,
- -2.072814507258147e+05, -2.075625746671824e+05, -2.078360682250733e+05, -2.081022259924181e+05, -2.083613255115020e+05,
- -2.086136285729988e+05, -2.088593823929779e+05, -2.090988206814853e+05, -2.093321646145334e+05, -2.095596237198592e+05,
- -2.097813966855191e+05, -2.099976720992863e+05, -2.102086291258742e+05, -2.104144381281808e+05, -2.106152612380389e+05,
- -2.108112528813349e+05, -2.110025602618217e+05, -2.111893238074716e+05, -2.113716775828103e+05, -2.115497496702999e+05,
- -2.117236625235265e+05, -2.118935332946587e+05, -2.120594741384009e+05, -2.122215924944344e+05, -2.123799913501592e+05,
- -2.125347694853523e+05, -2.126860217002275e+05, -2.128338390282244e+05, -2.129783089347405e+05, -2.131195155029028e+05,
- -2.132575396073903e+05, -2.133924590772025e+05, -2.135243488482222e+05, -2.136532811063213e+05, -2.137793254217080e+05,
- -2.139025488751486e+05, -2.140230161766520e+05, -2.141407897775479e+05, -2.142559299788440e+05, -2.143684950282703e+05,
- -2.144785412116669e+05, -2.145861228417300e+05, -2.146912926657410e+05, -2.147941015379467e+05, -2.148945987322794e+05,
- -2.149928319490140e+05, -2.150888473909929e+05, -2.151826898241885e+05, -2.152744026374973e+05, -2.153640278994378e+05,
- -2.154516064119495e+05, -2.155371777614631e+05, -2.156207803674098e+05, -2.157024515283239e+05, -2.157822274656753e+05,
- -2.158601433655695e+05, -2.159362334184372e+05, -2.160105308568291e+05, -2.160830679914205e+05, -2.161538762453320e+05,
- -2.162229861890270e+05, -2.162904275626837e+05, -2.163562293195319e+05, -2.164204196450968e+05, -2.164830259808654e+05,
- -2.165440750740677e+05, -2.166035929662753e+05, -2.166616050416792e+05, -2.167181360435679e+05, -2.167732100961774e+05,
- -2.168268507253829e+05, -2.168790808752822e+05, -2.169299229407800e+05, -2.169793987662329e+05, -2.170275296758140e+05,
- -2.170743364872655e+05, -2.171198395280839e+05, -2.171640586510594e+05, -2.172070132491974e+05, -2.172487222700529e+05,
- -2.172892042295060e+05, -2.173284772250032e+05, -2.173665589482902e+05, -2.174034666976585e+05, -2.174392173897295e+05,
- -2.174738275707971e+05, -2.175073134277449e+05, -2.175396907985625e+05, -2.175709751824760e+05, -2.176011817497065e+05,
- -2.176303253508809e+05, -2.176584205261004e+05, -2.176854815136887e+05, -2.177115222586312e+05, -2.177365564207148e+05,
- -2.177605973823893e+05, -2.177836582563534e+05, -2.178057518928787e+05, -2.178268908868897e+05, -2.178470875847975e+05,
- -2.178663540911089e+05, -2.178847022748118e+05, -2.179021437755483e+05, -2.179186900095898e+05, -2.179343521756079e+05,
- -2.179491412602675e+05, -2.179630680436307e+05, -2.179761431043944e+05, -2.179883768249571e+05, -2.179997793963254e+05,
- -2.180103608228695e+05, -2.180201309269268e+05, -2.180290993532645e+05, -2.180372755734053e+05, -2.180446688898173e+05,
- -2.180512884399809e+05, -2.180571432003312e+05, -2.180622419900782e+05, -2.180665934749194e+05, -2.180702061706376e+05,
- -2.180730884465949e+05, -2.180752485291226e+05, -2.180766945048131e+05, -2.180774343237174e+05, -2.180774758024501e+05,
- -2.180768266272042e+05, -2.180754943566830e+05, -2.180734864249459e+05, -2.180708101441758e+05, -2.180674727073719e+05,
- -2.180634811909617e+05, -2.180588425573460e+05, -2.180535636573724e+05, -2.180476512327411e+05, -2.180411119183452e+05,
- -2.180339522445489e+05, -2.180261786394034e+05, -2.180177974367977e+05, -2.180088148552857e+05, -2.179992370340318e+05,
- -2.179890700128472e+05, -2.179783197394624e+05, -2.179669920714167e+05, -2.179550927778972e+05, -2.179426275415318e+05,
- -2.179296019601378e+05, -2.179160215484224e+05, -2.179018917396432e+05, -2.178872178872271e+05, -2.178720052663471e+05,
- -2.178562590754600e+05, -2.178399844378081e+05, -2.178231864028815e+05, -2.178058699478461e+05, -2.177880399789361e+05,
- -2.177697013328138e+05, -2.177508587778952e+05, -2.177315170156445e+05, -2.177116806818390e+05, -2.176913543477998e+05,
- -2.176705425215998e+05, -2.176492496492378e+05, -2.176274801157867e+05, -2.176052382465178e+05, -2.175825283079937e+05,
- -2.175593545091416e+05, -2.175357210022977e+05, -2.175116318842299e+05, -2.174870911971383e+05, -2.174621029296278e+05,
- -2.174366710176677e+05, -2.174107993455199e+05, -2.173844917466547e+05, -2.173577520046408e+05, -2.173305838540191e+05,
- -2.173029909811542e+05, -2.172749770250699e+05, -2.172465455782661e+05, -2.172177001875156e+05, -2.171884443546474e+05,
- -2.171587815373101e+05, -2.171287151497205e+05, -2.170982485633953e+05, -2.170673851078697e+05, -2.170361280713968e+05,
- -2.170044807016360e+05, -2.169724462063247e+05, -2.169400277539370e+05, -2.169072284743296e+05, -2.168740514593715e+05,
- -2.168404997635644e+05, -2.168065764046470e+05, -2.167722843641900e+05, -2.167376265881770e+05, -2.167026059875733e+05,
- -2.166672254388868e+05, -2.166314877847118e+05, -2.165953958342684e+05, -2.165589523639252e+05, -2.165221601177170e+05,
- -2.164850218078468e+05, -2.164475401151848e+05, -2.164097176897501e+05, -2.163715571511890e+05, -2.163330610892402e+05,
- -2.162942320641940e+05, -2.162550726073401e+05, -2.162155852214083e+05, -2.161757723810014e+05, -2.161356365330159e+05,
- -2.160951800970614e+05, -2.160544054658658e+05, -2.160133150056775e+05, -2.159719110566566e+05, -2.159301959332606e+05,
- -2.158881719246226e+05, -2.158458412949239e+05, -2.158032062837555e+05, -2.157602691064803e+05, -2.157170319545795e+05,
- -2.156734969960002e+05, -2.156296663754930e+05, -2.155855422149459e+05, -2.155411266137081e+05, -2.154964216489130e+05,
- -2.154514293757926e+05, -2.154061518279852e+05, -2.153605910178410e+05, -2.153147489367196e+05, -2.152686275552841e+05,
- -2.152222288237873e+05, -2.151755546723567e+05, -2.151286070112714e+05, -2.150813877312354e+05, -2.150338987036468e+05,
- -2.149861417808615e+05, -2.149381187964509e+05, -2.148898315654601e+05, -2.148412818846554e+05, -2.147924715327719e+05,
- -2.147434022707566e+05, -2.146940758420039e+05, -2.146444939725934e+05, -2.145946583715157e+05, -2.145445707309031e+05,
- -2.144942327262482e+05, -2.144436460166263e+05, -2.143928122449072e+05, -2.143417330379701e+05, -2.142904100069099e+05,
- -2.142388447472431e+05, -2.141870388391078e+05, -2.141349938474640e+05, -2.140827113222867e+05, -2.140301927987595e+05,
- -2.139774397974621e+05, -2.139244538245559e+05, -2.138712363719688e+05, -2.138177889175726e+05, -2.137641129253625e+05,
- -2.137102098456278e+05, -2.136560811151281e+05, -2.136017281572588e+05, -2.135471523822177e+05, -2.134923551871690e+05,
- -2.134373379564052e+05, -2.133821020615046e+05, -2.133266488614865e+05, -2.132709797029679e+05, -2.132150959203109e+05,
- -2.131589988357756e+05, -2.131026897596634e+05, -2.130461699904643e+05, -2.129894408149970e+05, -2.129325035085506e+05,
- -2.128753593350225e+05, -2.128180095470532e+05, -2.127604553861618e+05, -2.127026980828760e+05, -2.126447388568648e+05,
- -2.125865789170639e+05, -2.125282194618040e+05, -2.124696616789334e+05, -2.124109067459403e+05, -2.123519558300767e+05,
- -2.122928100884730e+05, -2.122334706682583e+05, -2.121739387066735e+05, -2.121142153311880e+05, -2.120543016596085e+05,
- -2.119941988001924e+05, -2.119339078517558e+05, -2.118734299037798e+05, -2.118127660365183e+05, -2.117519173211009e+05,
- -2.116908848196364e+05, -2.116296695853146e+05, -2.115682726625046e+05, -2.115066950868556e+05, -2.114449378853940e+05,
- -2.113830020766172e+05, -2.113208886705888e+05, -2.112585986690342e+05, -2.111961330654295e+05, -2.111334928450935e+05,
- -2.110706789852772e+05, -2.110076924552515e+05, -2.109445342163943e+05, -2.108812052222769e+05, -2.108177064187475e+05,
- -2.107540387440160e+05, -2.106902031287343e+05, -2.106262004960799e+05, -2.105620317618345e+05, -2.104976978344635e+05,
- -2.104331996151940e+05, -2.103685379980917e+05, -2.103037138701364e+05, -2.102387281112983e+05, -2.101735815946098e+05,
- -2.101082751862404e+05, -2.100428097455674e+05, -2.099771861252480e+05, -2.099114051712884e+05, -2.098454677231130e+05,
- -2.097793746136340e+05, -2.097131266693173e+05, -2.096467247102495e+05, -2.095801695502040e+05, -2.095134619967061e+05,
- -2.094466028510948e+05, -2.093795929085891e+05, -2.093124329583479e+05, -2.092451237835331e+05, -2.091776661613690e+05,
- -2.091100608632033e+05, -2.090423086545672e+05, -2.089744102952302e+05, -2.089063665392637e+05, -2.088381781350919e+05,
- -2.087698458255528e+05, -2.087013703479515e+05, -2.086327524341160e+05, -2.085639928104493e+05, -2.084950921979874e+05,
- -2.084260513124473e+05, -2.083568708642836e+05, -2.082875515587358e+05, -2.082180940958831e+05, -2.081484991706921e+05,
- -2.080787674730681e+05, -2.080088996879035e+05, -2.079388964951273e+05, -2.078687585697506e+05, -2.077984865819175e+05,
- -2.077280811969482e+05, -2.076575430753887e+05, -2.075868728730534e+05, -2.075160712410727e+05, -2.074451388259361e+05,
- -2.073740762695364e+05, -2.073028842092141e+05, -2.072315632777993e+05, -2.071601141036547e+05, -2.070885373107188e+05,
- -2.070168335185440e+05, -2.069450033423425e+05, -2.068730473930222e+05, -2.068009662772298e+05, -2.067287605973888e+05,
- -2.066564309517399e+05, -2.065839779343780e+05, -2.065114021352925e+05, -2.064387041404035e+05, -2.063658845315997e+05,
- -2.062929438867754e+05, -2.062198827798667e+05, -2.061467017808888e+05, -2.060734014559689e+05, -2.059999823673853e+05,
- -2.059264450735983e+05, -2.058527901292885e+05, -2.057790180853877e+05, -2.057051294891140e+05, -2.056311248840064e+05,
- -2.055570048099538e+05, -2.054827698032329e+05, -2.054084203965354e+05, -2.053339571190040e+05, -2.052593804962607e+05,
- -2.051846910504395e+05, -2.051098893002176e+05, -2.050349757608445e+05, -2.049599509441734e+05, -2.048848153586900e+05,
- -2.048095695095426e+05, -2.047342138985714e+05, -2.046587490243365e+05, -2.045831753821474e+05, -2.045074934640904e+05,
- -2.044317037590561e+05, -2.043558067527691e+05, -2.042798029278135e+05, -2.042036927636598e+05, -2.041274767366921e+05
- },
- {
- 3.412872050432128e+04, 3.243168023469609e+04, 3.070993198962769e+04, 2.896247388525314e+04, 2.718823590110212e+04,
- 2.538607338053189e+04, 2.355475971858923e+04, 2.169297810803935e+04, 1.979931219437825e+04, 1.787223545759280e+04,
- 1.591009910407641e+04, 1.391111820672198e+04, 1.187335577578758e+04, 9.794704371770425e+03, 7.672864787890536e+03,
- 5.505321211827550e+03, 3.289312139930722e+03, 1.021796130524287e+03, -1.300588753836038e+03, -3.681573276636886e+03,
- -6.125315002671013e+03, -8.636468338803283e+03, -1.122026979924016e+04, -1.388264266057781e+04, -1.663032655964481e+04,
- -1.947103952597876e+04, -2.241368268788326e+04, -2.546860184332046e+04, -2.864792587789434e+04, -3.196601056937056e+04,
- -3.544002955802143e+04, -3.909077436333521e+04, -4.294375786097439e+04, -4.703076823713779e+04, -5.139210874907011e+04,
- -5.607991027083900e+04, -6.116316953538065e+04, -6.673563403300321e+04, -7.292843948865394e+04, -7.993042481837040e+04,
- -8.801851561578790e+04, -9.758783295593440e+04, -1.091136297712131e+05, -1.228003488271865e+05, -1.368700350935453e+05,
- -1.481958461102909e+05, -1.563282174806615e+05, -1.621672348787905e+05, -1.666006762607415e+05, -1.701403462926937e+05,
- -1.730713629266484e+05, -1.755644992689185e+05, -1.777290993250561e+05, -1.796388804549819e+05, -1.813456390144151e+05,
- -1.828870327774303e+05, -1.842912331137460e+05, -1.855798281890854e+05, -1.867697038286478e+05, -1.878743027017289e+05,
- -1.889044918343243e+05, -1.898691754077713e+05, -1.907757371743884e+05, -1.916303660251049e+05, -1.924382996423969e+05,
- -1.932040096021997e+05, -1.939313438976084e+05, -1.946236380201633e+05, -1.952838024991071e+05, -1.959143925921125e+05,
- -1.965176642888401e+05, -1.970956197080707e+05, -1.976500441958696e+05, -1.981825368717261e+05, -1.986945359583612e+05,
- -1.991873399259126e+05, -1.996621252526857e+05, -2.001199614318494e+05, -2.005618237216217e+05, -2.009886040350674e+05,
- -2.014011202870462e+05, -2.018001244544698e+05, -2.021863095577763e+05, -2.025603157333682e+05, -2.029227355363458e+05,
- -2.032741185885304e+05, -2.036149756671555e+05, -2.039457823137162e+05, -2.042669820295389e+05, -2.045789891140535e+05,
- -2.048821911930429e+05, -2.051769514769736e+05, -2.054636107835332e+05, -2.057424893535566e+05, -2.060138884853483e+05,
- -2.062780920089337e+05, -2.065353676188298e+05, -2.067859680814248e+05, -2.070301323309680e+05, -2.072680864663441e+05,
- -2.075000446592909e+05, -2.077262099833816e+05, -2.079467751719743e+05, -2.081619233123424e+05, -2.083718284823541e+05,
- -2.085766563353428e+05, -2.087765646381608e+05, -2.089717037668622e+05, -2.091622171639659e+05, -2.093482417608306e+05,
- -2.095299083682952e+05, -2.097073420384087e+05, -2.098806623997867e+05, -2.100499839688735e+05, -2.102154164391557e+05,
- -2.103770649501864e+05, -2.105350303380799e+05, -2.106894093689985e+05, -2.108402949569912e+05, -2.109877763674339e+05,
- -2.111319394071932e+05, -2.112728666025433e+05, -2.114106373657706e+05, -2.115453281513178e+05, -2.116770126022447e+05,
- -2.118057616877185e+05, -2.119316438321865e+05, -2.120547250368567e+05, -2.121750689961282e+05, -2.122927372062811e+05,
- -2.124077890634155e+05, -2.125202818822027e+05, -2.126302712289243e+05, -2.127378107099662e+05, -2.128429522227830e+05,
- -2.129457459879643e+05, -2.130462406272169e+05, -2.131444832299083e+05, -2.132405194175962e+05, -2.133343934051888e+05,
- -2.134261480589374e+05, -2.135158249514576e+05, -2.136034644139637e+05, -2.136891055858774e+05, -2.137727864619730e+05,
- -2.138545439372052e+05, -2.139344138493477e+05, -2.140124310195783e+05, -2.140886292911232e+05, -2.141630415682089e+05,
- -2.142356998366109e+05, -2.143066352340970e+05, -2.143758780372560e+05, -2.144434577186668e+05, -2.145094029697890e+05,
- -2.145737417287498e+05, -2.146365012068956e+05, -2.146977079141752e+05, -2.147573876833416e+05, -2.148155656934950e+05,
- -2.148722664918399e+05, -2.149275140152955e+05, -2.149813316108083e+05, -2.150337420548945e+05, -2.150847675678025e+05,
- -2.151344298493158e+05, -2.151827500698685e+05, -2.152297489040818e+05, -2.152754465424895e+05, -2.153198627067797e+05,
- -2.153630166644417e+05, -2.154049272428334e+05, -2.154456128427099e+05, -2.154850914512280e+05, -2.155233806544549e+05,
- -2.155604976494028e+05, -2.155964592556118e+05, -2.156312819263018e+05, -2.156649817591092e+05, -2.156975745064307e+05,
- -2.157290755853916e+05, -2.157595000874488e+05, -2.157888627876538e+05, -2.158171781535831e+05, -2.158444603539517e+05,
- -2.158707232669268e+05, -2.158959804881476e+05, -2.159202453384710e+05, -2.159435308714492e+05, -2.159658498805521e+05,
- -2.159872149061433e+05, -2.160076382422254e+05, -2.160271319429557e+05, -2.160457078289464e+05, -2.160633774933601e+05,
- -2.160801523077993e+05, -2.160960434280116e+05, -2.161110617994063e+05, -2.161252181623929e+05, -2.161385230575534e+05,
- -2.161509868306472e+05, -2.161626196374609e+05, -2.161734314485034e+05, -2.161834320535606e+05, -2.161926310661025e+05,
- -2.162010379275609e+05, -2.162086619114743e+05, -2.162155121275066e+05, -2.162215975253476e+05, -2.162269268984938e+05,
- -2.162315088879190e+05, -2.162353519856351e+05, -2.162384645381500e+05, -2.162408547498230e+05, -2.162425306861227e+05,
- -2.162435002767949e+05, -2.162437713189328e+05, -2.162433514799673e+05, -2.162422483005666e+05, -2.162404691974575e+05,
- -2.162380214661679e+05, -2.162349122836907e+05, -2.162311487110764e+05, -2.162267376959523e+05, -2.162216860749763e+05,
- -2.162160005762185e+05, -2.162096878214851e+05, -2.162027543334620e+05, -2.161952065190133e+05, -2.161870506987325e+05,
- -2.161782930913511e+05, -2.161689398200409e+05, -2.161589969143895e+05, -2.161484703123229e+05, -2.161373658619804e+05,
- -2.161256893235411e+05, -2.161134463710011e+05, -2.161006425939102e+05, -2.160872834990593e+05, -2.160733745121279e+05,
- -2.160589209792932e+05, -2.160439281687933e+05, -2.160284012724561e+05, -2.160123454071886e+05, -2.159957656164299e+05,
- -2.159786668715701e+05, -2.159610540733333e+05, -2.159429320531260e+05, -2.159243055743579e+05, -2.159051793337241e+05,
- -2.158855579624638e+05, -2.158654460275843e+05, -2.158448480330596e+05, -2.158237684209965e+05, -2.158022115727793e+05,
- -2.157801818101820e+05, -2.157576833964609e+05, -2.157347205374163e+05, -2.157112973824328e+05, -2.156874180254977e+05,
- -2.156630865061921e+05, -2.156383068106626e+05, -2.156130828725703e+05, -2.155874185740199e+05, -2.155613177464649e+05,
- -2.155347841715963e+05, -2.155078215822100e+05, -2.154804336630562e+05, -2.154526240516671e+05, -2.154243963391728e+05,
- -2.153957540710930e+05, -2.153667007481145e+05, -2.153372398268542e+05, -2.153073747206011e+05, -2.152771088000480e+05,
- -2.152464453940015e+05, -2.152153877900823e+05, -2.151839392354095e+05, -2.151521029372684e+05, -2.151198820637677e+05,
- -2.150872797444796e+05, -2.150542990710702e+05, -2.150209430979149e+05, -2.149872148427010e+05, -2.149531172870206e+05,
- -2.149186533769465e+05, -2.148838260236027e+05, -2.148486381037194e+05, -2.148130924601766e+05, -2.147771919025406e+05,
- -2.147409392075847e+05, -2.147043371198047e+05, -2.146673883519207e+05, -2.146300955853704e+05, -2.145924614707934e+05,
- -2.145544886285036e+05, -2.145161796489568e+05, -2.144775370932043e+05, -2.144385634933421e+05, -2.143992613529480e+05,
- -2.143596331475134e+05, -2.143196813248651e+05, -2.142794083055793e+05, -2.142388164833876e+05, -2.141979082255774e+05,
- -2.141566858733819e+05, -2.141151517423644e+05, -2.140733081227975e+05, -2.140311572800291e+05, -2.139887014548488e+05,
- -2.139459428638448e+05, -2.139028836997502e+05, -2.138595261317933e+05, -2.138158723060274e+05, -2.137719243456683e+05,
- -2.137276843514178e+05, -2.136831544017824e+05, -2.136383365533884e+05, -2.135932328412906e+05, -2.135478452792739e+05,
- -2.135021758601515e+05, -2.134562265560585e+05, -2.134099993187377e+05, -2.133634960798212e+05, -2.133167187511104e+05,
- -2.132696692248460e+05, -2.132223493739775e+05, -2.131747610524251e+05, -2.131269060953392e+05, -2.130787863193542e+05,
- -2.130304035228399e+05, -2.129817594861457e+05, -2.129328559718427e+05, -2.128836947249607e+05, -2.128342774732235e+05,
- -2.127846059272767e+05, -2.127346817809138e+05, -2.126845067112993e+05, -2.126340823791868e+05, -2.125834104291324e+05,
- -2.125324924897082e+05, -2.124813301737081e+05, -2.124299250783538e+05, -2.123782787854952e+05, -2.123263928618072e+05,
- -2.122742688589875e+05, -2.122219083139438e+05, -2.121693127489857e+05, -2.121164836720098e+05, -2.120634225766794e+05,
- -2.120101309426067e+05, -2.119566102355298e+05, -2.119028619074849e+05, -2.118488873969780e+05, -2.117946881291544e+05,
- -2.117402655159638e+05, -2.116856209563233e+05, -2.116307558362793e+05, -2.115756715291645e+05, -2.115203693957545e+05,
- -2.114648507844223e+05, -2.114091170312859e+05, -2.113531694603616e+05, -2.112970093837069e+05, -2.112406381015672e+05,
- -2.111840569025164e+05, -2.111272670635976e+05, -2.110702698504606e+05, -2.110130665174983e+05, -2.109556583079800e+05,
- -2.108980464541831e+05, -2.108402321775229e+05, -2.107822166886808e+05, -2.107240011877301e+05, -2.106655868642611e+05,
- -2.106069748975010e+05, -2.105481664564369e+05, -2.104891626999337e+05, -2.104299647768514e+05, -2.103705738261591e+05,
- -2.103109909770511e+05, -2.102512173490566e+05, -2.101912540521518e+05, -2.101311021868683e+05, -2.100707628443992e+05,
- -2.100102371067073e+05, -2.099495260466269e+05, -2.098886307279686e+05, -2.098275522056188e+05, -2.097662915256419e+05,
- -2.097048497253752e+05, -2.096432278335311e+05, -2.095814268702881e+05, -2.095194478473884e+05, -2.094572917682290e+05,
- -2.093949596279548e+05, -2.093324524135491e+05, -2.092697711039226e+05, -2.092069166700012e+05, -2.091438900748137e+05,
- -2.090806922735768e+05, -2.090173242137795e+05, -2.089537868352688e+05, -2.088900810703286e+05, -2.088262078437617e+05,
- -2.087621680729726e+05, -2.086979626680432e+05, -2.086335925318121e+05, -2.085690585599524e+05, -2.085043616410456e+05,
- -2.084395026566578e+05, -2.083744824814129e+05, -2.083093019830678e+05, -2.082439620225790e+05, -2.081784634541811e+05,
- -2.081128071254496e+05, -2.080469938773749e+05, -2.079810245444284e+05, -2.079148999546313e+05, -2.078486209296192e+05,
- -2.077821882847087e+05, -2.077156028289640e+05, -2.076488653652565e+05, -2.075819766903331e+05, -2.075149375948751e+05,
- -2.074477488635600e+05, -2.073804112751234e+05, -2.073129256024197e+05, -2.072452926124782e+05, -2.071775130665651e+05,
- -2.071095877202382e+05, -2.070415173234076e+05, -2.069733026203878e+05, -2.069049443499567e+05, -2.068364432454084e+05,
- -2.067678000346085e+05, -2.066990154400478e+05, -2.066300901788936e+05, -2.065610249630441e+05, -2.064918204991790e+05,
- -2.064224774888101e+05, -2.063529966283320e+05, -2.062833786090726e+05, -2.062136241173410e+05, -2.061437338344759e+05,
- -2.060737084368952e+05, -2.060035485961427e+05, -2.059332549789332e+05, -2.058628282472005e+05, -2.057922690581433e+05,
- -2.057215780642697e+05, -2.056507559134409e+05, -2.055798032489165e+05, -2.055087207093984e+05, -2.054375089290724e+05,
- -2.053661685376515e+05, -2.052947001604177e+05, -2.052231044182645e+05, -2.051513819277359e+05, -2.050795333010689e+05,
- -2.050075591462326e+05, -2.049354600669686e+05, -2.048632366628282e+05, -2.047908895292139e+05, -2.047184192574156e+05,
- -2.046458264346491e+05, -2.045731116440929e+05, -2.045002754649277e+05, -2.044273184723680e+05, -2.043542412377022e+05,
- -2.042810443283279e+05, -2.042077283077866e+05, -2.041342937357972e+05, -2.040607411682922e+05, -2.039870711574517e+05,
- -2.039132842517363e+05, -2.038393809959211e+05, -2.037653619311285e+05, -2.036912275948607e+05, -2.036169785210317e+05,
- -2.035426152400002e+05, -2.034681382785992e+05, -2.033935481601689e+05, -2.033188454045873e+05, -2.032440305282999e+05,
- -2.031691040443506e+05, -2.030940664624107e+05, -2.030189182888083e+05, -2.029436600265604e+05, -2.028682921753966e+05,
- -2.027928152317920e+05, -2.027172296889930e+05, -2.026415360370471e+05, -2.025657347628284e+05, -2.024898263500660e+05
- },
- {
- 3.501223319407398e+04, 3.332728480353826e+04, 3.161814847546494e+04, 2.988386022768988e+04, 2.812339171481411e+04,
- 2.633564421263157e+04, 2.451944186659091e+04, 2.267352408971105e+04, 2.079653697845314e+04, 1.888702358635296e+04,
- 1.694341286588700e+04, 1.496400705034473e+04, 1.294696720027099e+04, 1.089029658053403e+04, 8.791821458525834e+03,
- 6.649168826427946e+03, 4.459740424913783e+03, 2.220682302659466e+03, -7.115105142664291e+01, -2.419239215938049e+03,
- -4.827446525635619e+03, -7.300082915012758e+03, -9.841977467570192e+03, -1.245856799787981e+04, -1.515601104950309e+04,
- -1.794131814505699e+04, -2.082252614968970e+04, -2.380891246895616e+04, -2.691126990703330e+04, -3.014226192877386e+04,
- -3.351688801719571e+04, -3.705310193110249e+04, -4.077264626101981e+04, -4.470219857071254e+04, -4.887497548700932e+04,
- -5.333302386362277e+04, -5.813056323954253e+04, -6.333896044261804e+04, -6.905423472235879e+04, -7.540829959212309e+04,
- -8.258461957390474e+04, -9.083373022636073e+04, -1.004623380471278e+05, -1.117234985450851e+05, -1.243851184306270e+05,
- -1.366226325143851e+05, -1.465615378101451e+05, -1.540262037579635e+05, -1.596099247468449e+05, -1.639518558834899e+05,
- -1.674670593619997e+05, -1.704037655911299e+05, -1.729165114115023e+05, -1.751068580695748e+05, -1.770446456337159e+05,
- -1.787797052426035e+05, -1.803487026599487e+05, -1.817793287541259e+05, -1.830929664169835e+05, -1.843064457875635e+05,
- -1.854332343978703e+05, -1.864842658244554e+05, -1.874685303221642e+05, -1.883935045911430e+05, -1.892654702366566e+05,
- -1.900897535813126e+05, -1.908709088598876e+05, -1.916128599734298e+05, -1.923190114577873e+05, -1.929923362753899e+05,
- -1.936354459472251e+05, -1.942506470804890e+05, -1.948399873103369e+05, -1.954052929278468e+05, -1.959481999223138e+05,
- -1.964701797648389e+05, -1.969725609611628e+05, -1.974565471766715e+05, -1.979232325655420e+05, -1.983736148050987e+05,
- -1.988086062353486e+05, -1.992290434250665e+05, -1.996356954242169e+05, -2.000292709139668e+05, -2.004104244270224e+05,
- -2.007797617802973e+05, -2.011378448372346e+05, -2.014851956972171e+05, -2.018223003933185e+05, -2.021496121665054e+05,
- -2.024675543735941e+05, -2.027765230773942e+05, -2.030768893601204e+05, -2.033690013950701e+05, -2.036531863064696e+05,
- -2.039297518431511e+05, -2.041989878881343e+05, -2.044611678231811e+05, -2.047165497648429e+05, -2.049653776863406e+05,
- -2.052078824377832e+05, -2.054442826756483e+05, -2.056747857110893e+05, -2.058995882854787e+05, -2.061188772805863e+05,
- -2.063328303699224e+05, -2.065416166170276e+05, -2.067453970258296e+05, -2.069443250476211e+05, -2.071385470487125e+05,
- -2.073282027423709e+05, -2.075134255882835e+05, -2.076943431624351e+05, -2.078710775000000e+05, -2.080437454135772e+05,
- -2.082124587888742e+05, -2.083773248597317e+05, -2.085384464641966e+05, -2.086959222831978e+05, -2.088498470632171e+05,
- -2.090003118242330e+05, -2.091474040540897e+05, -2.092912078903388e+05, -2.094318042905165e+05, -2.095692711917218e+05,
- -2.097036836602956e+05, -2.098351140323276e+05, -2.099636320456589e+05, -2.100893049647872e+05, -2.102121977007528e+05,
- -2.103323729180103e+05, -2.104498910786749e+05, -2.105648107180819e+05, -2.106771883262687e+05, -2.107870785522903e+05,
- -2.108945342588429e+05, -2.109996066022690e+05, -2.111023451054643e+05, -2.112027977274821e+05, -2.113010109294621e+05,
- -2.113970297371035e+05, -2.114908977999093e+05, -2.115826574473906e+05, -2.116723497424212e+05, -2.117600145319126e+05,
- -2.118456904949688e+05, -2.119294151886721e+05, -2.120112250861758e+05, -2.120911556424131e+05, -2.121692412912578e+05,
- -2.122455155190715e+05, -2.123200108858221e+05, -2.123927590615275e+05, -2.124637908588520e+05, -2.125331362642149e+05,
- -2.126008244674926e+05, -2.126668838903893e+05, -2.127313422135497e+05, -2.127942264023465e+05, -2.128555627321991e+05,
- -2.129153768114804e+05, -2.129736936047662e+05, -2.130305374544277e+05, -2.130859321014530e+05, -2.131399007053962e+05,
- -2.131924658634982e+05, -2.132436496290275e+05, -2.132934735229690e+05, -2.133419585739811e+05, -2.133891253007360e+05,
- -2.134349937495669e+05, -2.134795835040098e+05, -2.135229136991620e+05, -2.135650030354868e+05, -2.136058697920844e+05,
- -2.136455318394564e+05, -2.136840066517862e+05, -2.137213113187584e+05, -2.137574625569350e+05, -2.137924767207128e+05,
- -2.138263698128745e+05, -2.138591574947583e+05, -2.138908550960571e+05, -2.139214776242643e+05, -2.139510397737866e+05,
- -2.139795559347283e+05, -2.140070402013721e+05, -2.140335063803586e+05, -2.140589679985863e+05, -2.140834383108383e+05,
- -2.141069303071467e+05, -2.141294567199093e+05, -2.141510300307648e+05, -2.141716624772390e+05, -2.141913660591696e+05,
- -2.142101525449174e+05, -2.142280334773771e+05, -2.142450201797889e+05, -2.142611237613643e+05, -2.142763551227299e+05,
- -2.142907249611981e+05, -2.143042437758696e+05, -2.143169218725773e+05, -2.143287693686724e+05, -2.143397961976645e+05,
- -2.143500121137151e+05, -2.143594266959977e+05, -2.143680493529203e+05, -2.143758893262218e+05, -2.143829556949470e+05,
- -2.143892573792968e+05, -2.143948031443723e+05, -2.143996016037991e+05, -2.144036612232522e+05, -2.144069903238736e+05,
- -2.144095970855935e+05, -2.144114895503544e+05, -2.144126756252408e+05, -2.144131630855241e+05, -2.144129595776163e+05,
- -2.144120726219453e+05, -2.144105096157445e+05, -2.144082778357696e+05, -2.144053844409370e+05, -2.144018364748894e+05,
- -2.143976408684947e+05, -2.143928044422723e+05, -2.143873339125749e+05, -2.143812358792202e+05, -2.143745168488614e+05,
- -2.143671832236302e+05, -2.143592413065084e+05, -2.143506973033935e+05, -2.143415573251081e+05, -2.143318273893586e+05,
- -2.143215134226427e+05, -2.143106212621082e+05, -2.142991566573634e+05, -2.142871252722420e+05, -2.142745326865226e+05,
- -2.142613843976067e+05, -2.142476858221510e+05, -2.142334422976638e+05, -2.142186590840569e+05, -2.142033413651637e+05,
- -2.141874942502156e+05, -2.141711227752873e+05, -2.141542319047007e+05, -2.141368265324017e+05, -2.141189114832993e+05,
- -2.141004915145731e+05, -2.140815713169516e+05, -2.140621555159587e+05, -2.140422486731310e+05, -2.140218552872064e+05,
- -2.140009797952865e+05, -2.139796265739693e+05, -2.139577999404575e+05, -2.139355041536414e+05, -2.139127434151556e+05,
- -2.138895218704141e+05, -2.138658436096176e+05, -2.138417126687447e+05, -2.138171330305130e+05, -2.137921086253244e+05,
- -2.137666433321883e+05, -2.137407409796221e+05, -2.137144053465337e+05, -2.136876401630862e+05, -2.136604491115383e+05,
- -2.136328358270720e+05, -2.136048038986007e+05, -2.135763568695585e+05, -2.135474982386737e+05, -2.135182314607241e+05,
- -2.134885599472815e+05, -2.134584870674332e+05, -2.134280161484925e+05, -2.133971504766942e+05, -2.133658932978744e+05,
- -2.133342478181364e+05, -2.133022172045041e+05, -2.132698045855591e+05, -2.132370130520683e+05, -2.132038456575962e+05,
- -2.131703054191035e+05, -2.131363953175394e+05, -2.131021182984143e+05, -2.130674772723655e+05, -2.130324751157129e+05,
- -2.129971146709984e+05, -2.129613987475196e+05, -2.129253301218499e+05, -2.128889115383515e+05, -2.128521457096720e+05,
- -2.128150353172410e+05, -2.127775830117474e+05, -2.127397914136137e+05, -2.127016631134580e+05, -2.126632006725502e+05,
- -2.126244066232550e+05, -2.125852834694701e+05, -2.125458336870554e+05, -2.125060597242537e+05, -2.124659640021022e+05,
- -2.124255489148379e+05, -2.123848168302963e+05, -2.123437700902996e+05, -2.123024110110407e+05, -2.122607418834575e+05,
- -2.122187649736043e+05, -2.121764825230103e+05, -2.121338967490383e+05, -2.120910098452309e+05, -2.120478239816554e+05,
- -2.120043413052387e+05, -2.119605639400985e+05, -2.119164939878669e+05, -2.118721335280102e+05, -2.118274846181407e+05,
- -2.117825492943250e+05, -2.117373295713857e+05, -2.116918274431987e+05, -2.116460448829822e+05, -2.115999838435872e+05,
- -2.115536462577757e+05, -2.115070340384986e+05, -2.114601490791672e+05, -2.114129932539194e+05, -2.113655684178843e+05,
- -2.113178764074377e+05, -2.112699190404580e+05, -2.112216981165738e+05, -2.111732154174099e+05, -2.111244727068287e+05,
- -2.110754717311648e+05, -2.110262142194615e+05, -2.109767018836964e+05, -2.109269364190100e+05, -2.108769195039237e+05,
- -2.108266528005597e+05, -2.107761379548571e+05, -2.107253765967779e+05, -2.106743703405190e+05, -2.106231207847131e+05,
- -2.105716295126310e+05, -2.105198980923783e+05, -2.104679280770905e+05, -2.104157210051216e+05, -2.103632784002355e+05,
- -2.103106017717892e+05, -2.102576926149148e+05, -2.102045524106991e+05, -2.101511826263605e+05, -2.100975847154218e+05,
- -2.100437601178802e+05, -2.099897102603783e+05, -2.099354365563673e+05, -2.098809404062701e+05, -2.098262231976434e+05,
- -2.097712863053339e+05, -2.097161310916353e+05, -2.096607589064398e+05, -2.096051710873911e+05, -2.095493689600306e+05,
- -2.094933538379457e+05, -2.094371270229126e+05, -2.093806898050382e+05, -2.093240434629014e+05, -2.092671892636886e+05,
- -2.092101284633295e+05, -2.091528623066336e+05, -2.090953920274168e+05, -2.090377188486356e+05, -2.089798439825135e+05,
- -2.089217686306638e+05, -2.088634939842190e+05, -2.088050212239479e+05, -2.087463515203781e+05, -2.086874860339164e+05,
- -2.086284259149621e+05, -2.085691723040251e+05, -2.085097263318379e+05, -2.084500891194672e+05, -2.083902617784264e+05,
- -2.083302454107824e+05, -2.082700411092624e+05, -2.082096499573610e+05, -2.081490730294441e+05, -2.080883113908510e+05,
- -2.080273660979946e+05, -2.079662381984647e+05, -2.079049287311223e+05, -2.078434387261996e+05, -2.077817692053939e+05,
- -2.077199211819625e+05, -2.076578956608165e+05, -2.075956936386121e+05, -2.075333161038403e+05, -2.074707640369156e+05,
- -2.074080384102679e+05, -2.073451401884246e+05, -2.072820703280987e+05, -2.072188297782735e+05, -2.071554194802835e+05,
- -2.070918403679013e+05, -2.070280933674132e+05, -2.069641793977022e+05, -2.069000993703281e+05, -2.068358541896015e+05,
- -2.067714447526652e+05, -2.067068719495657e+05, -2.066421366633322e+05, -2.065772397700468e+05, -2.065121821389191e+05,
- -2.064469646323587e+05, -2.063815881060445e+05, -2.063160534089960e+05, -2.062503613836425e+05, -2.061845128658898e+05,
- -2.061185086851888e+05, -2.060523496646029e+05, -2.059860366208708e+05, -2.059195703644740e+05, -2.058529516996991e+05,
- -2.057861814247015e+05, -2.057192603315680e+05, -2.056521892063781e+05, -2.055849688292640e+05, -2.055175999744713e+05,
- -2.054500834104187e+05, -2.053824198997551e+05, -2.053146101994188e+05, -2.052466550606926e+05, -2.051785552292629e+05,
- -2.051103114452724e+05, -2.050419244433767e+05, -2.049733949527983e+05, -2.049047236973793e+05, -2.048359113956352e+05,
- -2.047669587608075e+05, -2.046978665009137e+05, -2.046286353187993e+05, -2.045592659121885e+05, -2.044897589737333e+05,
- -2.044201151910632e+05, -2.043503352468319e+05, -2.042804198187683e+05, -2.042103695797211e+05, -2.041401851977070e+05,
- -2.040698673359568e+05, -2.039994166529608e+05, -2.039288338025141e+05, -2.038581194337609e+05, -2.037872741912387e+05,
- -2.037162987149217e+05, -2.036451936402648e+05, -2.035739595982456e+05, -2.035025972154035e+05, -2.034311071138875e+05,
- -2.033594899114914e+05, -2.032877462216968e+05, -2.032158766537133e+05, -2.031438818125180e+05, -2.030717622988932e+05,
- -2.029995187094679e+05, -2.029271516367532e+05, -2.028546616691818e+05, -2.027820493911459e+05, -2.027093153830311e+05,
- -2.026364602212568e+05, -2.025634844783092e+05, -2.024903887227801e+05, -2.024171735193987e+05, -2.023438394290685e+05,
- -2.022703870089027e+05, -2.021968168122554e+05, -2.021231293887583e+05, -2.020493252843526e+05, -2.019754050413209e+05,
- -2.019013691983232e+05, -2.018272182904255e+05, -2.017529528491331e+05, -2.016785734024229e+05, -2.016040804747737e+05,
- -2.015294745871965e+05, -2.014547562572667e+05, -2.013799259991528e+05, -2.013049843236462e+05, -2.012299317381923e+05,
- -2.011547687469173e+05, -2.010794958506592e+05, -2.010041135469946e+05, -2.009286223302689e+05, -2.008530226916218e+05
- },
- {
- 3.589672936993559e+04, 3.422373070251864e+04, 3.252705174483375e+04, 3.080576489628018e+04, 2.905888175528824e+04,
- 2.728534755224072e+04, 2.548403491602926e+04, 2.365373687265440e+04, 2.179315896015971e+04, 1.990091031898099e+04,
- 1.797549359206521e+04, 1.601529343594392e+04, 1.401856340404517e+04, 1.198341091392039e+04, 9.907779948844627e+03,
- 7.789431064742359e+03, 5.625918182456448e+03, 3.414561512674411e+03, 1.152415812307066e+03, -1.163767035997658e+03,
- -3.537582390024980e+03, -5.973025771131848e+03, -8.474556406537651e+03, -1.104717405239593e+04, -1.369651256391052e+04,
- -1.642895476995049e+04, -1.925177470564953e+04, -2.217331533154248e+04, -2.520321278184733e+04, -2.835268234250931e+04,
- -3.163488727113502e+04, -3.506542051801039e+04, -3.866294212460217e+04, -4.245003493203800e+04, -4.645437094330588e+04,
- -5.071032651146170e+04, -5.526125417285447e+04, -6.016272049707567e+04, -6.548714687362534e+04, -7.133036167111533e+04,
- -7.782018582021928e+04, -8.512477757438739e+04, -9.344954708675541e+04, -1.029914206783610e+05, -1.137977024395652e+05,
- -1.253515186397472e+05, -1.360951904786920e+05, -1.449405666565018e+05, -1.518258633508130e+05, -1.571549413592553e+05,
- -1.613909667811167e+05, -1.648669537478361e+05, -1.677966893734123e+05, -1.703187930383403e+05, -1.725267671400482e+05,
- -1.744861633776584e+05, -1.762444684597508e+05, -1.778370493033047e+05, -1.792908788528442e+05, -1.806269535928783e+05,
- -1.818619101805665e+05, -1.830091360566654e+05, -1.840795511918634e+05, -1.850821704882058e+05, -1.860245163371697e+05,
- -1.869129265440006e+05, -1.877527877205594e+05, -1.885487146308952e+05, -1.893046897109769e+05, -1.900241728178663e+05,
- -1.907101884362697e+05, -1.913653956159588e+05, -1.919921445395568e+05, -1.925925226393364e+05, -1.931683924717236e+05,
- -1.937214230378050e+05, -1.942531158522868e+05, -1.947648267742827e+05, -1.952577843946586e+05, -1.957331056077829e+05,
- -1.961918088671748e+05, -1.966348255250047e+05, -1.970630095777067e+05, -1.974771460788746e+05, -1.978779584323052e+05,
- -1.982661147395991e+05, -1.986422333459596e+05, -1.990068877030665e+05, -1.993606106478700e+05, -1.997038981798661e+05,
- -2.000372128061074e+05, -2.003609865122964e+05, -2.006756234092893e+05, -2.009815020969163e+05, -2.012789777807982e+05,
- -2.015683841726970e+05, -2.018500352005968e+05, -2.021242265510640e+05, -2.023912370633729e+05, -2.026513299922725e+05,
- -2.029047541540590e+05, -2.031517449687386e+05, -2.033925254094430e+05, -2.036273068688826e+05, -2.038562899514362e+05,
- -2.040796651984364e+05, -2.042976137533361e+05, -2.045103079726614e+05, -2.047179119879900e+05, -2.049205822236079e+05,
- -2.051184678739931e+05, -2.053117113448124e+05, -2.055004486607493e+05, -2.056848098431066e+05, -2.058649192598499e+05,
- -2.060408959504690e+05, -2.062128539278076e+05, -2.063809024587960e+05, -2.065451463258320e+05, -2.067056860703965e+05,
- -2.068626182203270e+05, -2.070160355020570e+05, -2.071660270389912e+05, -2.073126785370964e+05, -2.074560724586820e+05,
- -2.075962881852589e+05, -2.077334021702961e+05, -2.078674880826094e+05, -2.079986169412397e+05, -2.081268572450021e+05,
- -2.082522750909959e+05, -2.083749342840056e+05, -2.084948963527207e+05, -2.086122209379443e+05, -2.087269655298235e+05,
- -2.088391857593179e+05, -2.089489354372587e+05, -2.090562666340139e+05, -2.091612297545241e+05, -2.092638736093206e+05,
- -2.093642454817939e+05, -2.094623911919374e+05, -2.095583551567927e+05, -2.096521804423350e+05, -2.097439088400847e+05,
- -2.098335808850125e+05, -2.099212359297957e+05, -2.100069121766253e+05, -2.100906467355422e+05, -2.101724756572533e+05,
- -2.102524339758156e+05, -2.103305557469941e+05, -2.104068740848151e+05, -2.104814211964236e+05, -2.105542284153338e+05,
- -2.106253262331607e+05, -2.106947443299186e+05, -2.107625116029598e+05, -2.108286561944482e+05, -2.108932055185304e+05,
- -2.109561862854954e+05, -2.110176245267261e+05, -2.110775456176563e+05, -2.111359742999377e+05, -2.111929347026719e+05,
- -2.112484503627561e+05, -2.113025442443839e+05, -2.113552387577459e+05, -2.114065557769660e+05, -2.114565166573160e+05,
- -2.115051422442710e+05, -2.115524529186392e+05, -2.115984685687724e+05, -2.116432086333296e+05, -2.116866921084585e+05,
- -2.117289375613244e+05, -2.117699631431242e+05, -2.118097866016085e+05, -2.118484252931278e+05, -2.118858961942319e+05,
- -2.119222159128384e+05, -2.119574006989901e+05, -2.119914664552189e+05, -2.120244287465363e+05, -2.120563028100602e+05,
- -2.120871035643021e+05, -2.121168456181215e+05, -2.121455432793692e+05, -2.121732105632225e+05, -2.121998612002379e+05,
- -2.122255086441198e+05, -2.122501660792284e+05, -2.122738464278306e+05, -2.122965623571047e+05, -2.123183262859137e+05,
- -2.123391503913495e+05, -2.123590466150648e+05, -2.123780266693931e+05, -2.123961020432715e+05, -2.124132840079720e+05,
- -2.124295836226468e+05, -2.124450117396963e+05, -2.124595790099699e+05, -2.124732958877979e+05, -2.124861726358693e+05,
- -2.124982193299564e+05, -2.125094458634927e+05, -2.125198619520119e+05, -2.125294771374490e+05, -2.125383007923129e+05,
- -2.125463421237311e+05, -2.125536101773750e+05, -2.125601138412675e+05, -2.125658618494779e+05, -2.125708627857075e+05,
- -2.125751250867712e+05, -2.125786570459784e+05, -2.125814668164131e+05, -2.125835624141243e+05, -2.125849517212229e+05,
- -2.125856424888886e+05, -2.125856423402972e+05, -2.125849587734603e+05, -2.125835991639900e+05, -2.125815707677835e+05,
- -2.125788807236385e+05, -2.125755360557896e+05, -2.125715436791643e+05, -2.125669103912194e+05, -2.125616428893317e+05,
- -2.125557477635500e+05, -2.125492315010705e+05, -2.125421004883951e+05, -2.125343610134322e+05, -2.125260192675401e+05,
- -2.125170813475232e+05, -2.125075532575690e+05, -2.124974409111420e+05, -2.124867501328221e+05, -2.124754866601025e+05,
- -2.124636561451379e+05, -2.124512641564517e+05, -2.124383161805954e+05, -2.124248176237729e+05, -2.124107738134187e+05,
- -2.123961899997416e+05, -2.123810713572273e+05, -2.123654229861046e+05, -2.123492499137794e+05, -2.123325570962286e+05,
- -2.123153494193639e+05, -2.122976317003624e+05, -2.122794086889647e+05, -2.122606850687425e+05, -2.122414654583376e+05,
- -2.122217544126685e+05, -2.122015564241127e+05, -2.121808759236582e+05, -2.121597172820302e+05, -2.121380848107921e+05,
- -2.121159827634197e+05, -2.120934153363509e+05, -2.120703866700142e+05, -2.120469008498308e+05, -2.120229619071962e+05,
- -2.119985738204370e+05, -2.119737405157512e+05, -2.119484658681231e+05, -2.119227537022205e+05, -2.118966077932697e+05,
- -2.118700318679155e+05, -2.118430296050585e+05, -2.118156046366754e+05, -2.117877605486228e+05, -2.117595008814221e+05,
- -2.117308291310299e+05, -2.117017487495873e+05, -2.116722631461596e+05, -2.116423756874558e+05, -2.116120896985342e+05,
- -2.115814084634934e+05, -2.115503352261500e+05, -2.115188731907000e+05, -2.114870255223676e+05, -2.114547953480415e+05,
- -2.114221857568973e+05, -2.113891998010064e+05, -2.113558404959344e+05, -2.113221108213266e+05, -2.112880137214803e+05,
- -2.112535521059078e+05, -2.112187288498879e+05, -2.111835467950041e+05, -2.111480087496743e+05, -2.111121174896715e+05,
- -2.110758757586284e+05, -2.110392862685404e+05, -2.110023517002514e+05, -2.109650747039348e+05, -2.109274578995621e+05,
- -2.108895038773666e+05, -2.108512151982918e+05, -2.108125943944395e+05, -2.107736439695017e+05, -2.107343663991887e+05,
- -2.106947641316476e+05, -2.106548395878739e+05, -2.106145951621149e+05, -2.105740332222643e+05, -2.105331561102520e+05,
- -2.104919661424240e+05, -2.104504656099188e+05, -2.104086567790320e+05, -2.103665418915791e+05, -2.103241231652485e+05,
- -2.102814027939501e+05, -2.102383829481545e+05, -2.101950657752308e+05, -2.101514533997749e+05, -2.101075479239314e+05,
- -2.100633514277127e+05, -2.100188659693113e+05, -2.099740935854045e+05, -2.099290362914558e+05, -2.098836960820126e+05,
- -2.098380749309933e+05, -2.097921747919761e+05, -2.097459975984771e+05, -2.096995452642275e+05, -2.096528196834435e+05,
- -2.096058227310927e+05, -2.095585562631566e+05, -2.095110221168865e+05, -2.094632221110572e+05, -2.094151580462164e+05,
- -2.093668317049269e+05, -2.093182448520085e+05, -2.092693992347736e+05, -2.092202965832601e+05, -2.091709386104589e+05,
- -2.091213270125394e+05, -2.090714634690697e+05, -2.090213496432346e+05, -2.089709871820485e+05, -2.089203777165664e+05,
- -2.088695228620897e+05, -2.088184242183712e+05, -2.087670833698141e+05, -2.087155018856682e+05, -2.086636813202253e+05,
- -2.086116232130077e+05, -2.085593290889600e+05, -2.085068004586276e+05, -2.084540388183435e+05, -2.084010456504041e+05,
- -2.083478224232472e+05, -2.082943705916231e+05, -2.082406915967666e+05, -2.081867868665648e+05, -2.081326578157212e+05,
- -2.080783058459200e+05, -2.080237323459836e+05, -2.079689386920333e+05, -2.079139262476433e+05, -2.078586963639923e+05,
- -2.078032503800155e+05, -2.077475896225533e+05, -2.076917154064945e+05, -2.076356290349243e+05, -2.075793317992619e+05,
- -2.075228249794023e+05, -2.074661098438528e+05, -2.074091876498690e+05, -2.073520596435867e+05, -2.072947270601556e+05,
- -2.072371911238657e+05, -2.071794530482773e+05, -2.071215140363461e+05, -2.070633752805448e+05, -2.070050379629882e+05,
- -2.069465032555525e+05, -2.068877723199903e+05, -2.068288463080529e+05, -2.067697263616015e+05, -2.067104136127219e+05,
- -2.066509091838354e+05, -2.065912141878101e+05, -2.065313297280682e+05, -2.064712568986938e+05, -2.064109967845385e+05,
- -2.063505504613246e+05, -2.062899189957493e+05, -2.062291034455829e+05, -2.061681048597716e+05, -2.061069242785340e+05,
- -2.060455627334575e+05, -2.059840212475955e+05, -2.059223008355615e+05, -2.058604025036200e+05, -2.057983272497797e+05,
- -2.057360760638855e+05, -2.056736499277029e+05, -2.056110498150112e+05, -2.055482766916866e+05, -2.054853315157893e+05,
- -2.054222152376482e+05, -2.053589287999428e+05, -2.052954731377863e+05, -2.052318491788062e+05, -2.051680578432244e+05,
- -2.051041000439364e+05, -2.050399766865884e+05, -2.049756886696544e+05, -2.049112368845121e+05, -2.048466222155173e+05,
- -2.047818455400781e+05, -2.047169077287275e+05, -2.046518096451948e+05, -2.045865521464775e+05, -2.045211360829101e+05,
- -2.044555622982343e+05, -2.043898316296658e+05, -2.043239449079633e+05, -2.042579029574931e+05, -2.041917065962955e+05,
- -2.041253566361510e+05, -2.040588538826412e+05, -2.039921991352134e+05, -2.039253931872437e+05, -2.038584368260978e+05,
- -2.037913308331900e+05, -2.037240759840464e+05, -2.036566730483608e+05, -2.035891227900564e+05, -2.035214259673401e+05,
- -2.034535833327614e+05, -2.033855956332693e+05, -2.033174636102660e+05, -2.032491879996629e+05, -2.031807695319345e+05,
- -2.031122089321725e+05, -2.030435069201378e+05, -2.029746642103127e+05, -2.029056815119533e+05, -2.028365595291395e+05,
- -2.027672989608267e+05, -2.026979005008934e+05, -2.026283648381923e+05, -2.025586926565976e+05, -2.024888846350529e+05,
- -2.024189414476203e+05, -2.023488637635245e+05, -2.022786522472008e+05, -2.022083075583400e+05, -2.021378303519344e+05,
- -2.020672212783212e+05, -2.019964809832272e+05, -2.019256101078128e+05, -2.018546092887134e+05, -2.017834791580836e+05,
- -2.017122203436386e+05, -2.016408334686958e+05, -2.015693191522152e+05, -2.014976780088401e+05, -2.014259106489390e+05,
- -2.013540176786422e+05, -2.012819996998829e+05, -2.012098573104365e+05, -2.011375911039557e+05, -2.010652016700123e+05,
- -2.009926895941318e+05, -2.009200554578313e+05, -2.008472998386558e+05, -2.007744233102148e+05, -2.007014264422180e+05,
- -2.006283098005097e+05, -2.005550739471039e+05, -2.004817194402199e+05, -2.004082468343153e+05, -2.003346566801198e+05,
- -2.002609495246693e+05, -2.001871259113379e+05, -2.001131863798717e+05, -2.000391314664193e+05, -1.999649617035657e+05,
- -1.998906776203618e+05, -1.998162797423578e+05, -1.997417685916318e+05, -1.996671446868225e+05, -1.995924085431566e+05,
- -1.995175606724818e+05, -1.994426015832938e+05, -1.993675317807666e+05, -1.992923517667815e+05, -1.992170620399551e+05
- },
- {
- 3.678220783485653e+04, 3.512101913154528e+04, 3.343664574615951e+04, 3.172819500692529e+04, 2.999471680468386e+04,
- 2.823519844148643e+04, 2.644855887604939e+04, 2.463364227605219e+04, 2.278921077546874e+04, 2.091393631318025e+04,
- 1.900639140797914e+04, 1.706503869702563e+04, 1.508821903084088e+04, 1.307413787630725e+04, 1.102084972753644e+04,
- 8.926240160746585e+03, 6.788005086398483e+03, 4.603626658189640e+03, 2.370345159452881e+03, 8.512603488265924e+01,
- -2.255378979503888e+03, -4.654877944014920e+03, -7.117493689185060e+03, -9.647829807714403e+03, -1.225105040983152e+04,
- -1.493297720772834e+04, -1.770020860161929e+04, -2.056026694856594e+04, -2.352178227266180e+04, -2.659472357642561e+04,
- -2.979069292503348e+04, -3.312330342275051e+04, -3.660867028843225e+04, -4.026605652698952e+04, -4.411873215098822e+04,
- -4.819513142840976e+04, -5.253042866943603e+04, -5.716870030886318e+04, -6.216588906532488e+04, -6.759378104009667e+04,
- -7.354494435901054e+04, -8.013738211568142e+04, -8.751369446937619e+04, -9.582029189677355e+04, -1.051430093382623e+05,
- -1.153647361562206e+05, -1.258403726377046e+05, -1.353725867620255e+05, -1.433347871895553e+05, -1.497141447763632e+05,
- -1.547942702262669e+05, -1.589140981158606e+05, -1.623388138146572e+05, -1.652506030939852e+05, -1.677727444261883e+05,
- -1.699906664598082e+05, -1.719654217533375e+05, -1.737419024315971e+05, -1.753539473330729e+05, -1.768276195606884e+05,
- -1.781833742770105e+05, -1.794375315168061e+05, -1.806033013824786e+05, -1.816915136410408e+05, -1.827111475472168e+05,
- -1.836697236942848e+05, -1.845735986258634e+05, -1.854281896224763e+05, -1.862381484848800e+05, -1.870074974825986e+05,
- -1.877397368430342e+05, -1.884379305637214e+05, -1.891047755264795e+05, -1.897426576165712e+05, -1.903536976341655e+05,
- -1.909397891188324e+05, -1.915026297165408e+05, -1.920437473524423e+05, -1.925645221969332e+05, -1.930662052028225e+05,
- -1.935499338306300e+05, -1.940167454547606e+05, -1.944675888465082e+05, -1.949033340539434e+05, -1.953247809388629e+05,
- -1.957326665834076e+05, -1.961276717409937e+05, -1.965104264757044e+05, -1.968815151096785e+05, -1.972414805780716e+05,
- -1.975908282748958e+05, -1.979300294597172e+05, -1.982595242842403e+05, -1.985797244887533e+05, -1.988910158109104e+05,
- -1.991937601430776e+05, -1.994882974692429e+05, -1.997749476081157e+05, -2.000540117853522e+05, -2.003257740547260e+05,
- -2.005905025854186e+05, -2.008484508303728e+05, -2.010998585887139e+05, -2.013449529736241e+05, -2.015839492956365e+05,
- -2.018170518701107e+05, -2.020444547565980e+05, -2.022663424369111e+05, -2.024828904379193e+05, -2.026942659044088e+05,
- -2.029006281267574e+05, -2.031021290276462e+05, -2.032989136115775e+05, -2.034911203805706e+05, -2.036788817190492e+05,
- -2.038623242506283e+05, -2.040415691692325e+05, -2.042167325467329e+05, -2.043879256190804e+05, -2.045552550527108e+05,
- -2.047188231928385e+05, -2.048787282950983e+05, -2.050350647418547e+05, -2.051879232443869e+05, -2.053373910320373e+05,
- -2.054835520293238e+05, -2.056264870219234e+05, -2.057662738123539e+05, -2.059029873661178e+05, -2.060366999506855e+05,
- -2.061674812665244e+05, -2.062953985649736e+05, -2.064205166913708e+05, -2.065428984159232e+05, -2.066626042625095e+05,
- -2.067796927611377e+05, -2.068942205013059e+05, -2.070062422188342e+05, -2.071158108766970e+05, -2.072229777360025e+05,
- -2.073277924506791e+05, -2.074303031020133e+05, -2.075305562866739e+05, -2.076285971724433e+05, -2.077244695566584e+05,
- -2.078182159238529e+05, -2.079098774895953e+05, -2.079994942641087e+05, -2.080871050906386e+05, -2.081727476930917e+05,
- -2.082564587191294e+05, -2.083382737811965e+05, -2.084182274956078e+05, -2.084963535198003e+05, -2.085726845878489e+05,
- -2.086472525443519e+05, -2.087200883767637e+05, -2.087912222462687e+05, -2.088606835170417e+05, -2.089285007853523e+05,
- -2.089947019050836e+05, -2.090593140144586e+05, -2.091223635604398e+05, -2.091838763223181e+05, -2.092438774342971e+05,
- -2.093023914071278e+05, -2.093594421488348e+05, -2.094150529845878e+05, -2.094692466757497e+05, -2.095220454381539e+05,
- -2.095734709596390e+05, -2.096235444168796e+05, -2.096722864915503e+05, -2.097197173765654e+05, -2.097658568274521e+05,
- -2.098107241229884e+05, -2.098543381141420e+05, -2.098967172286955e+05, -2.099378794839971e+05, -2.099778424992343e+05,
- -2.100166235072485e+05, -2.100542393659080e+05, -2.100907065690674e+05, -2.101260412571204e+05, -2.101602592271762e+05,
- -2.101933759428635e+05, -2.102254065437886e+05, -2.102563658546548e+05, -2.102862683940618e+05, -2.103151283829981e+05,
- -2.103429597530360e+05, -2.103697761542472e+05, -2.103955909628436e+05, -2.104204172885619e+05, -2.104442679817961e+05,
- -2.104671556404933e+05, -2.104890926168167e+05, -2.105100910235903e+05, -2.105301627405323e+05, -2.105493194202840e+05,
- -2.105675724942422e+05, -2.105849331782062e+05, -2.106014124778427e+05, -2.106170211939771e+05, -2.106317699277178e+05,
- -2.106456690854195e+05, -2.106587288834939e+05, -2.106709593530667e+05, -2.106823703444974e+05, -2.106929715317543e+05,
- -2.107027724166643e+05, -2.107117823330254e+05, -2.107200104506043e+05, -2.107274657790089e+05, -2.107341571714482e+05,
- -2.107400933283822e+05, -2.107452828010633e+05, -2.107497339949753e+05, -2.107534551731736e+05, -2.107564544595287e+05,
- -2.107587398418764e+05, -2.107603191750790e+05, -2.107612001840017e+05, -2.107613904664020e+05, -2.107608974957402e+05,
- -2.107597286239153e+05, -2.107578910839166e+05, -2.107553919941930e+05, -2.107522383545545e+05, -2.107484370578025e+05,
- -2.107439948864508e+05, -2.107389185163428e+05, -2.107332145189091e+05, -2.107268893633601e+05, -2.107199494188197e+05,
- -2.107124009564107e+05, -2.107042501512746e+05, -2.106955030845497e+05, -2.106861657452902e+05, -2.106762440323412e+05,
- -2.106657437561617e+05, -2.106546706406052e+05, -2.106430303246522e+05, -2.106308283641006e+05, -2.106180702332148e+05,
- -2.106047613263299e+05, -2.105909069594213e+05, -2.105765123716313e+05, -2.105615827267623e+05, -2.105461231147288e+05,
- -2.105301385529795e+05, -2.105136339878805e+05, -2.104966142960678e+05, -2.104790842857674e+05, -2.104610486980829e+05,
- -2.104425122082541e+05, -2.104234794268836e+05, -2.104039549011377e+05, -2.103839431159181e+05, -2.103634484950036e+05,
- -2.103424754021718e+05, -2.103210281422878e+05, -2.102991109623736e+05, -2.102767280526503e+05, -2.102538835475569e+05,
- -2.102305815267470e+05, -2.102068260160644e+05, -2.101826209884916e+05, -2.101579703650862e+05, -2.101328780158843e+05,
- -2.101073477607984e+05, -2.100813833704828e+05, -2.100549885671885e+05, -2.100281670255956e+05, -2.100009223736277e+05,
- -2.099732581932520e+05, -2.099451780212580e+05, -2.099166853500223e+05, -2.098877836282565e+05, -2.098584762617398e+05,
- -2.098287666140342e+05, -2.097986580071869e+05, -2.097681537224177e+05, -2.097372570007906e+05, -2.097059710438744e+05,
- -2.096742990143846e+05, -2.096422440368193e+05, -2.096098091980754e+05, -2.095769975480568e+05, -2.095438121002663e+05,
- -2.095102558323907e+05, -2.094763316868692e+05, -2.094420425714540e+05, -2.094073913597554e+05, -2.093723808917835e+05,
- -2.093370139744702e+05, -2.093012933821888e+05, -2.092652218572561e+05, -2.092288021104333e+05, -2.091920368214083e+05,
- -2.091549286392756e+05, -2.091174801830032e+05, -2.090796940418902e+05, -2.090415727760193e+05, -2.090031189166975e+05,
- -2.089643349668872e+05, -2.089252234016356e+05, -2.088857866684870e+05, -2.088460271878946e+05, -2.088059473536221e+05,
- -2.087655495331367e+05, -2.087248360679966e+05, -2.086838092742293e+05, -2.086424714427073e+05, -2.086008248395103e+05,
- -2.085588717062862e+05, -2.085166142606040e+05, -2.084740546962992e+05, -2.084311951838142e+05, -2.083880378705322e+05,
- -2.083445848811040e+05, -2.083008383177724e+05, -2.082568002606858e+05, -2.082124727682108e+05, -2.081678578772364e+05,
- -2.081229576034751e+05, -2.080777739417558e+05, -2.080323088663144e+05, -2.079865643310779e+05, -2.079405422699443e+05,
- -2.078942445970570e+05, -2.078476732070736e+05, -2.078008299754333e+05, -2.077537167586164e+05, -2.077063353944020e+05,
- -2.076586877021165e+05, -2.076107754828858e+05, -2.075626005198761e+05, -2.075141645785341e+05, -2.074654694068231e+05,
- -2.074165167354529e+05, -2.073673082781092e+05, -2.073178457316770e+05, -2.072681307764603e+05, -2.072181650763994e+05,
- -2.071679502792835e+05, -2.071174880169605e+05, -2.070667799055430e+05, -2.070158275456118e+05, -2.069646325224140e+05,
- -2.069131964060614e+05, -2.068615207517215e+05, -2.068096070998099e+05, -2.067574569761746e+05, -2.067050718922826e+05,
- -2.066524533453999e+05, -2.065996028187692e+05, -2.065465217817873e+05, -2.064932116901759e+05, -2.064396739861525e+05,
- -2.063859100985987e+05, -2.063319214432225e+05, -2.062777094227229e+05, -2.062232754269491e+05, -2.061686208330558e+05,
- -2.061137470056622e+05, -2.060586552970001e+05, -2.060033470470670e+05, -2.059478235837718e+05, -2.058920862230826e+05,
- -2.058361362691690e+05, -2.057799750145435e+05, -2.057236037401999e+05, -2.056670237157518e+05, -2.056102361995671e+05,
- -2.055532424389011e+05, -2.054960436700256e+05, -2.054386411183624e+05, -2.053810359986057e+05, -2.053232295148513e+05,
- -2.052652228607171e+05, -2.052070172194666e+05, -2.051486137641279e+05, -2.050900136576133e+05, -2.050312180528344e+05,
- -2.049722280928172e+05, -2.049130449108155e+05, -2.048536696304216e+05, -2.047941033656782e+05, -2.047343472211836e+05,
- -2.046744022922027e+05, -2.046142696647684e+05, -2.045539504157877e+05, -2.044934456131425e+05, -2.044327563157929e+05,
- -2.043718835738733e+05, -2.043108284287942e+05, -2.042495919133359e+05, -2.041881750517456e+05, -2.041265788598311e+05,
- -2.040648043450536e+05, -2.040028525066183e+05, -2.039407243355659e+05, -2.038784208148616e+05, -2.038159429194824e+05,
- -2.037532916165028e+05, -2.036904678651818e+05, -2.036274726170467e+05, -2.035643068159755e+05, -2.035009713982801e+05,
- -2.034374672927858e+05, -2.033737954209126e+05, -2.033099566967528e+05, -2.032459520271488e+05, -2.031817823117706e+05,
- -2.031174484431910e+05, -2.030529513069602e+05, -2.029882917816795e+05, -2.029234707390727e+05, -2.028584890440605e+05,
- -2.027933475548312e+05, -2.027280471229060e+05, -2.026625885932145e+05, -2.025969728041574e+05, -2.025312005876768e+05,
- -2.024652727693220e+05, -2.023991901683148e+05, -2.023329535976124e+05, -2.022665638639747e+05, -2.022000217680239e+05,
- -2.021333281043095e+05, -2.020664836613678e+05, -2.019994892217831e+05, -2.019323455622480e+05, -2.018650534536213e+05,
- -2.017976136609887e+05, -2.017300269437176e+05, -2.016622940555163e+05, -2.015944157444887e+05, -2.015263927531904e+05,
- -2.014582258186844e+05, -2.013899156725933e+05, -2.013214630411548e+05, -2.012528686452722e+05, -2.011841332005696e+05,
- -2.011152574174405e+05, -2.010462420011011e+05, -2.009770876516387e+05, -2.009077950640614e+05, -2.008383649283502e+05,
- -2.007687979295028e+05, -2.006990947475850e+05, -2.006292560577771e+05, -2.005592825304194e+05, -2.004891748310599e+05,
- -2.004189336205003e+05, -2.003485595548383e+05, -2.002780532855167e+05, -2.002074154593617e+05, -2.001366467186325e+05,
- -2.000657477010586e+05, -1.999947190398872e+05, -1.999235613639219e+05, -1.998522752975643e+05, -1.997808614608583e+05,
- -1.997093204695262e+05, -1.996376529350120e+05, -1.995658594645189e+05, -1.994939406610503e+05, -1.994218971234471e+05,
- -1.993497294464264e+05, -1.992774382206192e+05, -1.992050240326075e+05, -1.991324874649631e+05, -1.990598290962799e+05,
- -1.989870495012153e+05, -1.989141492505221e+05, -1.988411289110843e+05, -1.987679890459543e+05, -1.986947302143844e+05,
- -1.986213529718622e+05, -1.985478578701452e+05, -1.984742454572924e+05, -1.984005162776989e+05, -1.983266708721275e+05,
- -1.982527097777403e+05, -1.981786335281330e+05, -1.981044426533636e+05, -1.980301376799858e+05, -1.979557191310776e+05,
- -1.978811875262743e+05, -1.978065433817978e+05, -1.977317872104841e+05, -1.976569195218163e+05, -1.975819408219521e+05
- },
- {
- 3.766866736880577e+04, 3.601915121928482e+04, 3.434693429718210e+04, 3.265115747094340e+04, 3.093090734818167e+04,
- 2.918521150958800e+04, 2.741303319714723e+04, 2.561326537692458e+04, 2.378472408696217e+04, 2.192614096156060e+04,
- 2.003615480550352e+04, 1.811330206761730e+04, 1.615600603464766e+04, 1.416256453119251e+04, 1.213113586840574e+04,
- 1.005972273091343e+04, 7.946153625700093e+03, 5.788061430861091e+03, 3.582858486943028e+03, 1.327707529078886e+03,
- -9.805123966726903e+02, -3.345246109974386e+03, -5.770309916532103e+03, -8.259948380889145e+03, -1.081890242850181e+04,
- -1.345249157075257e+04, -1.616671386608407e+04, -1.896836832820341e+04, -2.186520597513634e+04, -2.486611774057680e+04,
- -2.798137019466157e+04, -3.122290398913492e+04, -3.460471508463987e+04, -3.814334645187113e+04, -4.185852819428735e+04,
- -4.577401822379154e+04, -4.991871406294471e+04, -5.432812746983259e+04, -5.904632810173272e+04, -6.412843647361444e+04,
- -6.964357195474775e+04, -7.567752350894551e+04, -8.233252045273298e+04, -8.971709445462469e+04, -9.791342169618951e+04,
- -1.069106915213053e+05, -1.164785818170083e+05, -1.259663707555690e+05, -1.345096832061930e+05, -1.417443995689220e+05,
- -1.476793935947588e+05, -1.525197632366125e+05, -1.565166569947143e+05, -1.598804479783506e+05, -1.627649435981190e+05,
- -1.652788422146064e+05, -1.674996386342475e+05, -1.694838161558455e+05, -1.712735291565141e+05, -1.729009324025090e+05,
- -1.743910350477753e+05, -1.757636265177378e+05, -1.770346061733375e+05, -1.782169211703933e+05, -1.793212412796282e+05,
- -1.803564535166776e+05, -1.813300309339727e+05, -1.822483118989956e+05, -1.831167145813694e+05, -1.839399037785706e+05,
- -1.847219221566854e+05, -1.854662945615351e+05, -1.861761116999189e+05, -1.868540978418136e+05, -1.875026660218648e+05,
- -1.881239633724256e+05, -1.887199086014578e+05, -1.892922231702044e+05, -1.898424573821219e+05, -1.903720123346243e+05,
- -1.908821584866004e+05, -1.913740514416050e+05, -1.918487454277659e+05, -1.923072048624427e+05, -1.927503143164273e+05,
- -1.931788871344263e+05, -1.935936729222811e+05, -1.939953640742907e+05, -1.943846014840971e+05, -1.947619795583905e+05,
- -1.951280506329866e+05, -1.954833288747273e+05, -1.958282937394375e+05, -1.961633930452624e+05, -1.964890457117028e+05,
- -1.968056442071517e+05, -1.971135567414911e+05, -1.974131292350682e+05, -1.977046870909690e+05, -1.979885367937997e+05,
- -1.982649673550467e+05, -1.985342516224220e+05, -1.987966474683392e+05, -1.990523988707174e+05, -1.993017368976671e+05,
- -1.995448806061748e+05, -1.997820378636853e+05, -2.000134061004155e+05, -2.002391729993190e+05, -2.004595171298278e+05,
- -2.006746085307930e+05, -2.008846092474581e+05, -2.010896738267559e+05, -2.012899497747620e+05, -2.014855779797384e+05,
- -2.016766931038261e+05, -2.018634239461476e+05, -2.020458937797871e+05, -2.022242206648835e+05, -2.023985177398325e+05,
- -2.025688934924217e+05, -2.027354520125336e+05, -2.028982932278975e+05, -2.030575131242481e+05, -2.032132039511035e+05,
- -2.033654544142810e+05, -2.035143498561629e+05, -2.036599724246345e+05, -2.038024012315426e+05, -2.039417125020956e+05,
- -2.040779797177940e+05, -2.042112737450434e+05, -2.043416629572462e+05, -2.044692132447200e+05, -2.045939884721360e+05,
- -2.047160501487217e+05, -2.048354577662270e+05, -2.049522688588895e+05, -2.050665390583066e+05, -2.051783221975344e+05,
- -2.052876703833711e+05, -2.053946340700362e+05, -2.054992621289483e+05, -2.056016019148546e+05, -2.057016993306403e+05,
- -2.057995988782242e+05, -2.058953437281921e+05, -2.059889757644610e+05, -2.060805356375379e+05, -2.061700628129753e+05,
- -2.062575956174643e+05, -2.063431712826983e+05, -2.064268259871428e+05, -2.065085948958207e+05, -2.065885121982339e+05,
- -2.066666111445190e+05, -2.067429240799383e+05, -2.068174824777950e+05, -2.068903169705888e+05, -2.069614573811384e+05,
- -2.070309327495719e+05, -2.070987713619002e+05, -2.071650007759445e+05, -2.072296478464242e+05, -2.072927387489682e+05,
- -2.073542990031048e+05, -2.074143534942809e+05, -2.074729264949623e+05, -2.075300416848555e+05, -2.075857221703022e+05,
- -2.076399905028779e+05, -2.076928686972420e+05, -2.077443782482678e+05, -2.077945401474944e+05, -2.078433748989249e+05,
- -2.078909025342080e+05, -2.079371426158686e+05, -2.079821142960343e+05, -2.080258362639808e+05, -2.080683268023531e+05,
- -2.081096037890210e+05, -2.081496847091025e+05, -2.081885866665401e+05, -2.082263263952507e+05, -2.082629202698678e+05,
- -2.082983843160944e+05, -2.083327342206815e+05, -2.083659853410509e+05, -2.083981527145768e+05, -2.084292510675379e+05,
- -2.084592948237592e+05, -2.084882981129503e+05, -2.085162747787595e+05, -2.085432383865481e+05, -2.085692022309035e+05,
- -2.085941793428966e+05, -2.086181824970951e+05, -2.086412242183455e+05, -2.086633167883286e+05, -2.086844722518991e+05,
- -2.087047024232200e+05, -2.087240188916968e+05, -2.087424330277197e+05, -2.087599559882240e+05, -2.087765987220728e+05,
- -2.087923719752671e+05, -2.088072862959976e+05, -2.088213520395339e+05, -2.088345793729640e+05, -2.088469782797895e+05,
- -2.088585585643775e+05, -2.088693298562784e+05, -2.088793016144130e+05, -2.088884831311344e+05, -2.088968835361680e+05,
- -2.089045118004340e+05, -2.089113767397591e+05, -2.089174870184778e+05, -2.089228511529294e+05, -2.089274775148531e+05,
- -2.089313743346873e+05, -2.089345497047706e+05, -2.089370115824578e+05, -2.089387677931407e+05, -2.089398260331897e+05,
- -2.089401938728110e+05, -2.089398787588224e+05, -2.089388880181728e+05, -2.089372288577711e+05, -2.089349083705736e+05,
- -2.089319335361330e+05, -2.089283112234029e+05, -2.089240481930918e+05, -2.089191510999521e+05, -2.089136264950109e+05,
- -2.089074808277418e+05, -2.089007204481772e+05, -2.088933516089687e+05, -2.088853804673915e+05, -2.088768130872966e+05,
- -2.088676554410169e+05, -2.088579134112188e+05, -2.088475927927112e+05, -2.088366992942059e+05, -2.088252385400365e+05,
- -2.088132160718314e+05, -2.088006373501450e+05, -2.087875077560541e+05, -2.087738325927053e+05, -2.087596170868339e+05,
- -2.087448663902402e+05, -2.087295855812302e+05, -2.087137796660246e+05, -2.086974535801307e+05, -2.086806121896841e+05,
- -2.086632602927556e+05, -2.086454026206294e+05, -2.086270438390504e+05, -2.086081885494431e+05, -2.085888412901001e+05,
- -2.085690065373445e+05, -2.085486887066658e+05, -2.085278921538287e+05, -2.085066211759556e+05, -2.084848800125874e+05,
- -2.084626728467179e+05, -2.084400038058051e+05, -2.084168769627601e+05, -2.083932963369144e+05, -2.083692658949647e+05,
- -2.083447895518978e+05, -2.083198711718942e+05, -2.082945145692125e+05, -2.082687235090538e+05, -2.082425017084081e+05,
- -2.082158528368817e+05, -2.081887805175072e+05, -2.081612883275363e+05, -2.081333797992145e+05, -2.081050584205416e+05,
- -2.080763276360121e+05, -2.080471908473455e+05, -2.080176514141973e+05, -2.079877126548549e+05, -2.079573778469209e+05,
- -2.079266502279841e+05, -2.078955329962694e+05, -2.078640293112835e+05, -2.078321422944408e+05, -2.077998750296795e+05,
- -2.077672305640638e+05, -2.077342119083766e+05, -2.077008220376945e+05, -2.076670638919597e+05, -2.076329403765324e+05,
- -2.075984543627373e+05, -2.075636086883968e+05, -2.075284061583560e+05, -2.074928495449955e+05, -2.074569415887329e+05,
- -2.074206849985192e+05, -2.073840824523206e+05, -2.073471365975940e+05, -2.073098500517521e+05, -2.072722254026212e+05,
- -2.072342652088867e+05, -2.071959720005342e+05, -2.071573482792808e+05, -2.071183965189963e+05, -2.070791191661198e+05,
- -2.070395186400665e+05, -2.069995973336259e+05, -2.069593576133573e+05, -2.069188018199707e+05, -2.068779322687079e+05,
- -2.068367512497119e+05, -2.067952610283909e+05, -2.067534638457772e+05, -2.067113619188766e+05, -2.066689574410141e+05,
- -2.066262525821721e+05, -2.065832494893230e+05, -2.065399502867555e+05, -2.064963570763951e+05, -2.064524719381199e+05,
- -2.064082969300687e+05, -2.063638340889464e+05, -2.063190854303215e+05, -2.062740529489203e+05, -2.062287386189146e+05,
- -2.061831443942054e+05, -2.061372722087019e+05, -2.060911239765927e+05, -2.060447015926188e+05, -2.059980069323331e+05,
- -2.059510418523648e+05, -2.059038081906711e+05, -2.058563077667905e+05, -2.058085423820896e+05, -2.057605138200038e+05,
- -2.057122238462791e+05, -2.056636742092031e+05, -2.056148666398381e+05, -2.055658028522483e+05, -2.055164845437212e+05,
- -2.054669133949897e+05, -2.054170910704434e+05, -2.053670192183472e+05, -2.053166994710442e+05, -2.052661334451657e+05,
- -2.052153227418307e+05, -2.051642689468456e+05, -2.051129736309009e+05, -2.050614383497624e+05, -2.050096646444606e+05,
- -2.049576540414791e+05, -2.049054080529354e+05, -2.048529281767642e+05, -2.048002158968931e+05, -2.047472726834186e+05,
- -2.046940999927784e+05, -2.046406992679205e+05, -2.045870719384699e+05, -2.045332194208946e+05, -2.044791431186650e+05,
- -2.044248444224145e+05, -2.043703247100962e+05, -2.043155853471378e+05, -2.042606276865931e+05, -2.042054530692906e+05,
- -2.041500628239841e+05, -2.040944582674954e+05, -2.040386407048569e+05, -2.039826114294553e+05, -2.039263717231688e+05,
- -2.038699228565029e+05, -2.038132660887264e+05, -2.037564026680040e+05, -2.036993338315271e+05, -2.036420608056418e+05,
- -2.035845848059761e+05, -2.035269070375660e+05, -2.034690286949772e+05, -2.034109509624279e+05, -2.033526750139066e+05,
- -2.032942020132932e+05, -2.032355331144711e+05, -2.031766694614452e+05, -2.031176121884537e+05, -2.030583624200783e+05,
- -2.029989212713550e+05, -2.029392898478824e+05, -2.028794692459280e+05, -2.028194605525328e+05, -2.027592648456156e+05,
- -2.026988831940748e+05, -2.026383166578891e+05, -2.025775662882168e+05, -2.025166331274946e+05, -2.024555182095324e+05,
- -2.023942225596107e+05, -2.023327471945721e+05, -2.022710931229158e+05, -2.022092613448881e+05, -2.021472528525727e+05,
- -2.020850686299795e+05, -2.020227096531325e+05, -2.019601768901557e+05, -2.018974713013586e+05, -2.018345938393211e+05,
- -2.017715454489746e+05, -2.017083270676858e+05, -2.016449396253376e+05, -2.015813840444056e+05, -2.015176612400416e+05,
- -2.014537721201469e+05, -2.013897175854514e+05, -2.013254985295882e+05, -2.012611158391680e+05, -2.011965703938538e+05,
- -2.011318630664320e+05, -2.010669947228842e+05, -2.010019662224593e+05, -2.009367784177428e+05, -2.008714321547240e+05,
- -2.008059282728664e+05, -2.007402676051726e+05, -2.006744509782531e+05, -2.006084792123893e+05, -2.005423531215996e+05,
- -2.004760735137018e+05, -2.004096411903779e+05, -2.003430569472338e+05, -2.002763215738640e+05, -2.002094358539080e+05,
- -2.001424005651133e+05, -2.000752164793934e+05, -2.000078843628864e+05, -1.999404049760106e+05, -1.998727790735260e+05,
- -1.998050074045851e+05, -1.997370907127914e+05, -1.996690297362530e+05, -1.996008252076393e+05, -1.995324778542292e+05,
- -1.994639883979697e+05, -1.993953575555242e+05, -1.993265860383248e+05, -1.992576745526236e+05, -1.991886237995436e+05,
- -1.991194344751270e+05, -1.990501072703840e+05, -1.989806428713431e+05, -1.989110419590970e+05, -1.988413052098516e+05,
- -1.987714332949708e+05, -1.987014268810238e+05, -1.986312866298313e+05, -1.985610131985096e+05, -1.984906072395144e+05,
- -1.984200694006862e+05, -1.983494003252939e+05, -1.982786006520766e+05, -1.982076710152864e+05, -1.981366120447312e+05,
- -1.980654243658143e+05, -1.979941085995778e+05, -1.979226653627416e+05, -1.978510952677431e+05, -1.977793989227784e+05,
- -1.977075769318393e+05, -1.976356298947541e+05, -1.975635584072240e+05, -1.974913630608619e+05, -1.974190444432298e+05,
- -1.973466031378743e+05, -1.972740397243664e+05, -1.972013547783331e+05, -1.971285488714961e+05, -1.970556225717065e+05,
- -1.969825764429803e+05, -1.969094110455301e+05, -1.968361269358025e+05, -1.967627246665107e+05, -1.966892047866664e+05,
- -1.966155678416149e+05, -1.965418143730662e+05, -1.964679449191277e+05, -1.963939600143367e+05, -1.963198601896910e+05,
- -1.962456459726803e+05, -1.961713178873166e+05, -1.960968764541659e+05, -1.960223221903780e+05, -1.959476556097145e+05
- },
- {
- 3.855610672935705e+04, 3.691812802456004e+04, 3.525792108753177e+04, 3.357465899936478e+04, 3.186746358076416e+04,
- 3.013540098318754e+04, 2.837747678648532e+04, 2.659263053244938e+04, 2.477972961574392e+04, 2.293756243678855e+04,
- 2.106483070620921e+04, 1.916014077005362e+04, 1.722199380066109e+04, 1.524877466886200e+04, 1.323873927697226e+04,
- 1.119000008796648e+04, 9.100509531684456e+03, 6.968040901845228e+03, 4.790166269779366e+03, 2.564230844946635e+03,
- 2.873230641304865e+02, -2.043760463742487e+03, -4.432556253274857e+03, -6.882982848753507e+03, -9.399399067890541e+03,
- -1.198667377395223e+04, -1.465026997366532e+04, -1.739634683695931e+04, -2.023188429287058e+04, -2.316483627308107e+04,
- -2.620432052430430e+04, -2.936085556145416e+04, -3.264665858861295e+04, -3.607602295413177e+04, -3.966579968427964e+04,
- -4.343601541624252e+04, -4.741066817526644e+04, -5.161875092306572e+04, -5.609555357420466e+04, -6.088426606591623e+04,
- -6.603778896018102e+04, -7.162029897947352e+04, -7.770715436085066e+04, -8.437956505009609e+04, -9.170723267938745e+04,
- -9.971187237618711e+04, -1.083081966722645e+05, -1.172038624889172e+05, -1.258161634331764e+05, -1.335431031157475e+05,
- -1.401686406725761e+05, -1.457112558540109e+05, -1.503233018466806e+05, -1.541935792064851e+05, -1.574889531931140e+05,
- -1.603383263190371e+05, -1.628367581879226e+05, -1.650540532462805e+05, -1.670421467594064e+05, -1.688403911857731e+05,
- -1.704791625091817e+05, -1.719823162230439e+05, -1.733688826025912e+05, -1.746542574426343e+05, -1.758510534956737e+05,
- -1.769697199863278e+05, -1.780190009483111e+05, -1.790062796866375e+05, -1.799378414653454e+05, -1.808190765358123e+05,
- -1.816546389776877e+05, -1.824485723454506e+05, -1.832044100507893e+05, -1.839252562856241e+05, -1.846138517936791e+05,
- -1.852726277286055e+05, -1.859037500610742e+05, -1.865091564274487e+05, -1.870905868888065e+05, -1.876496097501932e+05,
- -1.881876433475201e+05, -1.887059745234504e+05, -1.892057743695460e+05, -1.896881116995359e+05, -1.901539646302180e+05,
- -1.906042305766142e+05, -1.910397349123517e+05, -1.914612385017025e+05, -1.918694442738652e+05, -1.922650029810562e+05,
- -1.926485182584284e+05, -1.930205510845612e+05, -1.933816237254986e+05, -1.937322232323138e+05, -1.940728045514213e+05,
- -1.944037932979529e+05, -1.947255882350734e+05, -1.950385634959076e+05, -1.953430705795306e+05, -1.956394401480957e+05,
- -1.959279836484641e+05, -1.962089947785548e+05, -1.964827508159799e+05, -1.967495138242418e+05, -1.970095317498286e+05,
- -1.972630394218820e+05, -1.975102594646679e+05, -1.977514031318563e+05, -1.979866710705351e+05, -1.982162540219695e+05,
- -1.984403334653080e+05, -1.986590822097326e+05, -1.988726649399516e+05, -1.990812387193805e+05, -1.992849534549114e+05,
- -1.994839523267337e+05, -1.996783721863289e+05, -1.998683439254244e+05, -2.000539928184252e+05, -2.002354388405767e+05,
- -2.004127969638999e+05, -2.005861774327379e+05, -2.007556860205810e+05, -2.009214242696738e+05, -2.010834897147764e+05,
- -2.012419760923189e+05, -2.013969735360803e+05, -2.015485687604232e+05, -2.016968452320157e+05, -2.018418833310842e+05,
- -2.019837605055153e+05, -2.021225514121945e+05, -2.022583280478588e+05, -2.023911597831628e+05, -2.025211137774469e+05,
- -2.026482547224251e+05, -2.027726451561037e+05, -2.028943455164963e+05, -2.030134142352853e+05, -2.031299078263126e+05,
- -2.032438809692424e+05, -2.033553865886993e+05, -2.034644759314076e+05, -2.035711986280663e+05, -2.036756027744995e+05,
- -2.037777349859327e+05, -2.038776404599087e+05, -2.039753630337120e+05, -2.040709452389032e+05, -2.041644283531491e+05,
- -2.042558524494915e+05, -2.043452564432210e+05, -2.044326781364845e+05, -2.045181542607560e+05, -2.046017205173019e+05,
- -2.046834116157384e+05, -2.047632613108039e+05, -2.048413024370928e+05, -2.049175669439150e+05, -2.049920859251298e+05,
- -2.050648896511217e+05, -2.051360075975990e+05, -2.052054684734786e+05, -2.052733002475524e+05, -2.053395301740027e+05,
- -2.054041848168182e+05, -2.054672900731752e+05, -2.055288711958299e+05, -2.055889528145763e+05, -2.056475589568119e+05,
- -2.057047130672584e+05, -2.057604380268773e+05, -2.058147561710222e+05, -2.058676893068592e+05, -2.059192587300949e+05,
- -2.059694852410452e+05, -2.060183891600721e+05, -2.060659903424223e+05, -2.061123081924904e+05, -2.061573616638274e+05,
- -2.062011693263677e+05, -2.062437492993031e+05, -2.062851193157262e+05, -2.063252967214921e+05, -2.063642984865579e+05,
- -2.064021412159059e+05, -2.064388411600679e+05, -2.064744142252750e+05, -2.065088759832399e+05, -2.065422416805933e+05,
- -2.065745262479875e+05, -2.066057443088822e+05, -2.066359101880228e+05, -2.066650379196279e+05, -2.066931412552940e+05,
- -2.067202336716352e+05, -2.067463283776583e+05, -2.067714383218961e+05, -2.067955761993008e+05, -2.068187544579068e+05,
- -2.068409853052780e+05, -2.068622807147431e+05, -2.068826524314258e+05, -2.069021119780857e+05, -2.069206706607679e+05,
- -2.069383395742732e+05, -2.069551296074580e+05, -2.069710514483662e+05, -2.069861155891987e+05, -2.070003323311324e+05,
- -2.070137117889888e+05, -2.070262638957598e+05, -2.070379984069954e+05, -2.070489249050601e+05, -2.070590528032599e+05,
- -2.070683913498468e+05, -2.070769496319035e+05, -2.070847365791152e+05, -2.070917609674287e+05, -2.070980314226070e+05,
- -2.071035564236786e+05, -2.071083443062893e+05, -2.071124032659573e+05, -2.071157413612351e+05, -2.071183665167831e+05,
- -2.071202865263555e+05, -2.071215090557034e+05, -2.071220416453986e+05, -2.071218917138806e+05, -2.071210665593582e+05,
- -2.071195733629129e+05, -2.071174191910934e+05, -2.071146109982571e+05, -2.071111556289635e+05, -2.071070598202996e+05,
- -2.071023302041455e+05, -2.070969733093775e+05, -2.070909955640189e+05, -2.070844032973284e+05, -2.070772027418374e+05,
- -2.070694000353346e+05, -2.070610012227970e+05, -2.070520122582754e+05, -2.070424390067295e+05, -2.070322872458149e+05,
- -2.070215626676298e+05, -2.070102708804119e+05, -2.069984174101998e+05, -2.069860077024466e+05, -2.069730471235981e+05,
- -2.069595409626307e+05, -2.069454944325510e+05, -2.069309126718606e+05, -2.069158007459852e+05, -2.069001636486663e+05,
- -2.068840063033250e+05, -2.068673335643888e+05, -2.068501502185880e+05, -2.068324609862239e+05, -2.068142705224029e+05,
- -2.067955834182453e+05, -2.067764042020667e+05, -2.067567373405264e+05, -2.067365872397566e+05, -2.067159582464608e+05,
- -2.066948546489882e+05, -2.066732806783858e+05, -2.066512405094239e+05, -2.066287382615998e+05, -2.066057780001192e+05,
- -2.065823637368560e+05, -2.065584994312889e+05, -2.065341889914213e+05, -2.065094362746751e+05, -2.064842450887706e+05,
- -2.064586191925849e+05, -2.064325622969903e+05, -2.064060780656775e+05, -2.063791701159585e+05, -2.063518420195545e+05,
- -2.063240973033649e+05, -2.062959394502220e+05, -2.062673718996283e+05, -2.062383980484789e+05, -2.062090212517694e+05,
- -2.061792448232869e+05, -2.061490720362903e+05, -2.061185061241721e+05, -2.060875502811115e+05, -2.060562076627086e+05,
- -2.060244813866113e+05, -2.059923745331242e+05, -2.059598901458103e+05, -2.059270312320768e+05, -2.058938007637494e+05,
- -2.058602016776380e+05, -2.058262368760889e+05, -2.057919092275249e+05, -2.057572215669778e+05, -2.057221766966086e+05,
- -2.056867773862184e+05, -2.056510263737476e+05, -2.056149263657667e+05, -2.055784800379589e+05, -2.055416900355910e+05,
- -2.055045589739761e+05, -2.054670894389285e+05, -2.054292839872087e+05, -2.053911451469604e+05, -2.053526754181393e+05,
- -2.053138772729330e+05, -2.052747531561759e+05, -2.052353054857521e+05, -2.051955366529941e+05, -2.051554490230726e+05,
- -2.051150449353803e+05, -2.050743267039069e+05, -2.050332966176082e+05, -2.049919569407701e+05, -2.049503099133620e+05,
- -2.049083577513887e+05, -2.048661026472311e+05, -2.048235467699843e+05, -2.047806922657898e+05, -2.047375412581566e+05,
- -2.046940958482856e+05, -2.046503581153782e+05, -2.046063301169480e+05, -2.045620138891215e+05, -2.045174114469359e+05,
- -2.044725247846322e+05, -2.044273558759400e+05, -2.043819066743615e+05, -2.043361791134490e+05, -2.042901751070762e+05,
- -2.042438965497056e+05, -2.041973453166535e+05, -2.041505232643471e+05, -2.041034322305812e+05, -2.040560740347644e+05,
- -2.040084504781680e+05, -2.039605633441676e+05, -2.039124143984799e+05, -2.038640053893965e+05, -2.038153380480135e+05,
- -2.037664140884591e+05, -2.037172352081144e+05, -2.036678030878323e+05, -2.036181193921527e+05, -2.035681857695149e+05,
- -2.035180038524652e+05, -2.034675752578602e+05, -2.034169015870709e+05, -2.033659844261798e+05, -2.033148253461751e+05,
- -2.032634259031433e+05, -2.032117876384583e+05, -2.031599120789677e+05, -2.031078007371741e+05, -2.030554551114166e+05,
- -2.030028766860481e+05, -2.029500669316069e+05, -2.028970273049942e+05, -2.028437592496360e+05, -2.027902641956554e+05,
- -2.027365435600333e+05, -2.026825987467695e+05, -2.026284311470445e+05, -2.025740421393725e+05, -2.025194330897563e+05,
- -2.024646053518406e+05, -2.024095602670591e+05, -2.023542991647828e+05, -2.022988233624652e+05, -2.022431341657831e+05,
- -2.021872328687801e+05, -2.021311207540014e+05, -2.020747990926344e+05, -2.020182691446379e+05, -2.019615321588797e+05,
- -2.019045893732636e+05, -2.018474420148587e+05, -2.017900913000262e+05, -2.017325384345441e+05, -2.016747846137308e+05,
- -2.016168310225642e+05, -2.015586788358027e+05, -2.015003292181031e+05, -2.014417833241356e+05, -2.013830422986979e+05,
- -2.013241072768284e+05, -2.012649793839189e+05, -2.012056597358197e+05, -2.011461494389515e+05, -2.010864495904098e+05,
- -2.010265612780710e+05, -2.009664855806940e+05, -2.009062235680243e+05, -2.008457763008933e+05, -2.007851448313158e+05,
- -2.007243302025916e+05, -2.006633334493981e+05, -2.006021555978880e+05, -2.005407976657813e+05, -2.004792606624570e+05,
- -2.004175455890492e+05, -2.003556534385293e+05, -2.002935851958005e+05, -2.002313418377838e+05, -2.001689243335037e+05,
- -2.001063336441733e+05, -2.000435707232790e+05, -1.999806365166621e+05, -1.999175319626021e+05, -1.998542579918963e+05,
- -1.997908155279391e+05, -1.997272054868023e+05, -1.996634287773094e+05, -1.995994863011146e+05, -1.995353789527786e+05,
- -1.994711076198399e+05, -1.994066731828911e+05, -1.993420765156509e+05, -1.992773184850349e+05, -1.992123999512263e+05,
- -1.991473217677459e+05, -1.990820847815211e+05, -1.990166898329523e+05, -1.989511377559833e+05, -1.988854293781626e+05,
- -1.988195655207137e+05, -1.987535469985954e+05, -1.986873746205689e+05, -1.986210491892571e+05, -1.985545715012098e+05,
- -1.984879423469641e+05, -1.984211625111026e+05, -1.983542327723170e+05, -1.982871539034636e+05, -1.982199266716246e+05,
- -1.981525518381618e+05, -1.980850301587771e+05, -1.980173623835666e+05, -1.979495492570770e+05, -1.978815915183587e+05,
- -1.978134899010205e+05, -1.977452451332860e+05, -1.976768579380403e+05, -1.976083290328882e+05, -1.975396591301994e+05,
- -1.974708489371663e+05, -1.974018991558481e+05, -1.973328104832243e+05, -1.972635836112404e+05, -1.971942192268606e+05,
- -1.971247180121112e+05, -1.970550806441297e+05, -1.969853077952127e+05, -1.969154001328597e+05, -1.968453583198200e+05,
- -1.967751830141376e+05, -1.967048748691946e+05, -1.966344345337577e+05, -1.965638626520188e+05, -1.964931598636387e+05,
- -1.964223268037909e+05, -1.963513641032021e+05, -1.962802723881943e+05, -1.962090522807244e+05, -1.961377043984279e+05,
- -1.960662293546546e+05, -1.959946277585112e+05, -1.959229002148998e+05, -1.958510473245555e+05, -1.957790696840858e+05,
- -1.957069678860079e+05, -1.956347425187849e+05, -1.955623941668652e+05, -1.954899234107170e+05, -1.954173308268641e+05,
- -1.953446169879232e+05, -1.952717824626376e+05, -1.951988278159137e+05, -1.951257536088537e+05, -1.950525603987890e+05,
- -1.949792487393189e+05, -1.949058191803370e+05, -1.948322722680680e+05, -1.947586085451016e+05, -1.946848285504206e+05,
- -1.946109328194360e+05, -1.945369218840171e+05, -1.944627962725241e+05, -1.943885565098351e+05, -1.943142031173828e+05
- },
- {
- 3.944452465223097e+04, 3.781795053761604e+04, 3.616960968105727e+04, 3.449870610682075e+04, 3.280439541337342e+04,
- 3.108578069575783e+04, 2.934190802189547e+04, 2.757176140035370e+04, 2.577425717073657e+04, 2.394823773298898e+04,
- 2.209246451938491e+04, 2.020561009553046e+04, 1.828624925642311e+04, 1.633284895871718e+04, 1.434375690062696e+04,
- 1.231718852402605e+04, 1.025121216859085e+04, 8.143732052535047e+03, 5.992468686916972e+03, 3.794936241297009e+03,
- 1.548416283996246e+03, -7.500728305165189e+02, -3.103811806231278e+03, -5.516422583604591e+03, -7.991918221090707e+03,
- -1.053476219886397e+04, -1.314993931176650e+04, -1.584304089872681e+04, -1.862036790989146e+04, -2.148905629582575e+04,
- -2.445723049735617e+04, -2.753419242997337e+04, -3.073065570226338e+04, -3.405903734946949e+04, -3.753382308962905e+04,
- -4.117202608712520e+04, -4.499376342643698e+04, -4.902297692523543e+04, -5.328832053087141e+04, -5.782421208188579e+04,
- -6.267196936298938e+04, -6.788073931790850e+04, -7.350741171074614e+04, -7.961359768104495e+04, -8.625597273612056e+04,
- -9.346535183767053e+04, -1.012130055546949e+05, -1.093629562287535e+05, -1.176045437386157e+05, -1.254534838240851e+05,
- -1.324979951256666e+05, -1.386062521066816e+05, -1.438006187132492e+05, -1.481969976223502e+05, -1.519395176001627e+05,
- -1.551609316023159e+05, -1.579687520411946e+05, -1.604455113982180e+05, -1.626536571147486e+05, -1.646406597385879e+05,
- -1.664430599716110e+05, -1.680894067335415e+05, -1.696023392454517e+05, -1.710000634691662e+05, -1.722974095885436e+05,
- -1.735065995271986e+05, -1.746378120256076e+05, -1.756996047200638e+05, -1.766992338923785e+05, -1.776428999883584e+05,
- -1.785359385361976e+05, -1.793829703494491e+05, -1.801880209636549e+05, -1.809546165319601e+05, -1.816858614978208e+05,
- -1.823845020104640e+05, -1.830529780770846e+05, -1.836934667383881e+05, -1.843079180325199e+05, -1.848980851230482e+05,
- -1.854655496727259e+05, -1.860117433204233e+05, -1.865379659457982e+05, -1.870454012719259e+05, -1.875351302508510e+05,
- -1.880081425939426e+05, -1.884653467429192e+05, -1.889075785246359e+05, -1.893356086903023e+05, -1.897501495055122e+05,
- -1.901518605296102e+05, -1.905413537002059e+05, -1.909191978200280e+05, -1.912859225279747e+05, -1.916420218235751e+05,
- -1.919879572035659e+05, -1.923241604605525e+05, -1.926510361864226e+05, -1.929689640170669e+05, -1.932783006498080e+05,
- -1.935793816606053e+05, -1.938725231444253e+05, -1.941580231990484e+05, -1.944361632699312e+05, -1.947072093714731e+05,
- -1.949714131980929e+05, -1.952290131368621e+05, -1.954802351919993e+05, -1.957252938302936e+05, -1.959643927554551e+05,
- -1.961977256184617e+05, -1.964254766701600e+05, -1.966478213616780e+05, -1.968649268975873e+05, -1.970769527462206e+05,
- -1.972840511110727e+05, -1.974863673667977e+05, -1.976840404629560e+05, -1.978772032983327e+05, -1.980659830683711e+05,
- -1.982505015880069e+05, -1.984308755919696e+05, -1.986072170144100e+05, -1.987796332495445e+05, -1.989482273948418e+05,
- -1.991130984781346e+05, -1.992743416699219e+05, -1.994320484819989e+05, -1.995863069534644e+05, -1.997372018200572e+05,
- -1.998848147000667e+05, -2.000292242180654e+05, -2.001705061669625e+05, -2.003087335672443e+05, -2.004439770135175e+05,
- -2.005763045342444e+05, -2.007057818472394e+05, -2.008324724365509e+05, -2.009564376531984e+05, -2.010777368102893e+05,
- -2.011964272728913e+05, -2.013125645451432e+05, -2.014262023418729e+05, -2.015373926781171e+05, -2.016461859320284e+05,
- -2.017526309155158e+05, -2.018567749390089e+05, -2.019586638729020e+05, -2.020583422058822e+05, -2.021558531003309e+05,
- -2.022512384449683e+05, -2.023445389049089e+05, -2.024357939692763e+05, -2.025250419965193e+05, -2.026123202575608e+05,
- -2.026976649769019e+05, -2.027811113718010e+05, -2.028626936892499e+05, -2.029424452431508e+05, -2.030203984459580e+05,
- -2.030965848427634e+05, -2.031710351418972e+05, -2.032437792445637e+05, -2.033148462731735e+05, -2.033842645984383e+05,
- -2.034520618652914e+05, -2.035182650177002e+05, -2.035829003224190e+05, -2.036459933917423e+05, -2.037075692053069e+05,
- -2.037676521309865e+05, -2.038262659449315e+05, -2.038834338507871e+05, -2.039391784981361e+05, -2.039935220002010e+05,
- -2.040464859508402e+05, -2.040980914408735e+05, -2.041483590737696e+05, -2.041973089807198e+05, -2.042449608351331e+05,
- -2.042913338665771e+05, -2.043364468576207e+05, -2.043803182220305e+05, -2.044229659219639e+05, -2.044644075383156e+05,
- -2.045046602739993e+05, -2.045437409602108e+05, -2.045816660683125e+05, -2.046184517201406e+05, -2.046541136979478e+05,
- -2.046886674539887e+05, -2.047221281197702e+05, -2.047545105149759e+05, -2.047858291560815e+05, -2.048160982646717e+05,
- -2.048453317754714e+05, -2.048735433441066e+05, -2.049007463545976e+05, -2.049269539266055e+05, -2.049521789224338e+05,
- -2.049764339537998e+05, -2.049997313883822e+05, -2.050220833561546e+05, -2.050435017555128e+05, -2.050639982592082e+05,
- -2.050835843200835e+05, -2.051022711766350e+05, -2.051200698583907e+05, -2.051369911911250e+05, -2.051530458019073e+05,
- -2.051682441239961e+05, -2.051825964015804e+05, -2.051961126943768e+05, -2.052088028820867e+05, -2.052206766687182e+05,
- -2.052317435867784e+05, -2.052420130013397e+05, -2.052514941139862e+05, -2.052601959666428e+05, -2.052681274452928e+05,
- -2.052752972835860e+05, -2.052817140663436e+05, -2.052873862329597e+05, -2.052923220807082e+05, -2.052965297679535e+05,
- -2.053000173172707e+05, -2.053027926184791e+05, -2.053048634315880e+05, -2.053062373890350e+05, -2.053069220013984e+05,
- -2.053069246551360e+05, -2.053062526188995e+05, -2.053049130450925e+05, -2.053029129723646e+05, -2.053002593280391e+05,
- -2.052969589304748e+05, -2.052930184913664e+05, -2.052884446179819e+05, -2.052832438153440e+05, -2.052774224883501e+05,
- -2.052709869438434e+05, -2.052639433926225e+05, -2.052562979514072e+05, -2.052480566447476e+05, -2.052392254068881e+05,
- -2.052298100835831e+05, -2.052198164338668e+05, -2.052092501317794e+05, -2.051981167680476e+05, -2.051864218517280e+05,
- -2.051741708118058e+05, -2.051613689987549e+05, -2.051480216860622e+05, -2.051341340717122e+05, -2.051197112796361e+05,
- -2.051047583611295e+05, -2.050892802962285e+05, -2.050732819950613e+05, -2.050567682991635e+05, -2.050397439827611e+05,
- -2.050222137540275e+05, -2.050041822563066e+05, -2.049856540693121e+05, -2.049666337102935e+05, -2.049471256351811e+05,
- -2.049271342396998e+05, -2.049066638604611e+05, -2.048857187760266e+05, -2.048643032079533e+05, -2.048424213218069e+05,
- -2.048200772281609e+05, -2.047972749835680e+05, -2.047740185915123e+05, -2.047503120033377e+05, -2.047261591191620e+05,
- -2.047015637887623e+05, -2.046765298124491e+05, -2.046510609419167e+05, -2.046251608810759e+05, -2.045988332868710e+05,
- -2.045720817700766e+05, -2.045449098960788e+05, -2.045173211856400e+05, -2.044893191156469e+05, -2.044609071198426e+05,
- -2.044320885895441e+05, -2.044028668743454e+05, -2.043732452828027e+05, -2.043432270831113e+05, -2.043128155037610e+05,
- -2.042820137341860e+05, -2.042508249253948e+05, -2.042192521905923e+05, -2.041872986057859e+05, -2.041549672103807e+05,
- -2.041222610077632e+05, -2.040891829658736e+05, -2.040557360177639e+05, -2.040219230621491e+05, -2.039877469639440e+05,
- -2.039532105547911e+05, -2.039183166335798e+05, -2.038830679669490e+05, -2.038474672897916e+05, -2.038115173057345e+05,
- -2.037752206876224e+05, -2.037385800779851e+05, -2.037015980894978e+05, -2.036642773054314e+05, -2.036266202800981e+05,
- -2.035886295392837e+05, -2.035503075806742e+05, -2.035116568742749e+05, -2.034726798628202e+05, -2.034333789621769e+05,
- -2.033937565617397e+05, -2.033538150248190e+05, -2.033135566890223e+05, -2.032729838666277e+05, -2.032320988449509e+05,
- -2.031909038867068e+05, -2.031494012303629e+05, -2.031075930904863e+05, -2.030654816580859e+05, -2.030230691009471e+05,
- -2.029803575639605e+05, -2.029373491694479e+05, -2.028940460174757e+05, -2.028504501861717e+05, -2.028065637320272e+05,
- -2.027623886902016e+05, -2.027179270748167e+05, -2.026731808792471e+05, -2.026281520764080e+05, -2.025828426190329e+05,
- -2.025372544399534e+05, -2.024913894523669e+05, -2.024452495501052e+05, -2.023988366078963e+05, -2.023521524816209e+05,
- -2.023051990085687e+05, -2.022579780076818e+05, -2.022104912798066e+05, -2.021627406079290e+05, -2.021147277574133e+05,
- -2.020664544762348e+05, -2.020179224952093e+05, -2.019691335282160e+05, -2.019200892724221e+05, -2.018707914084985e+05,
- -2.018212416008343e+05, -2.017714414977483e+05, -2.017213927316958e+05, -2.016710969194721e+05, -2.016205556624151e+05,
- -2.015697705465998e+05, -2.015187431430363e+05, -2.014674750078565e+05, -2.014159676825067e+05, -2.013642226939301e+05,
- -2.013122415547507e+05, -2.012600257634502e+05, -2.012075768045474e+05, -2.011548961487711e+05, -2.011019852532292e+05,
- -2.010488455615805e+05, -2.009954785041979e+05, -2.009418854983337e+05, -2.008880679482777e+05, -2.008340272455186e+05,
- -2.007797647688970e+05, -2.007252818847612e+05, -2.006705799471167e+05, -2.006156602977762e+05, -2.005605242665048e+05,
- -2.005051731711669e+05, -2.004496083178649e+05, -2.003938310010830e+05, -2.003378425038218e+05, -2.002816440977373e+05,
- -2.002252370432719e+05, -2.001686225897899e+05, -2.001118019757043e+05, -2.000547764286048e+05, -1.999975471653877e+05,
- -1.999401153923769e+05, -1.998824823054466e+05, -1.998246490901442e+05, -1.997666169218069e+05, -1.997083869656814e+05,
- -1.996499603770371e+05, -1.995913383012817e+05, -1.995325218740736e+05, -1.994735122214312e+05, -1.994143104598437e+05,
- -1.993549176963779e+05, -1.992953350287835e+05, -1.992355635455999e+05, -1.991756043262569e+05, -1.991154584411781e+05,
- -1.990551269518803e+05, -1.989946109110717e+05, -1.989339113627517e+05, -1.988730293423046e+05, -1.988119658765956e+05,
- -1.987507219840643e+05, -1.986892986748158e+05, -1.986276969507132e+05, -1.985659178054665e+05, -1.985039622247207e+05,
- -1.984418311861448e+05, -1.983795256595152e+05, -1.983170466068022e+05, -1.982543949822543e+05, -1.981915717324800e+05,
- -1.981285777965290e+05, -1.980654141059738e+05, -1.980020815849887e+05, -1.979385811504269e+05, -1.978749137118995e+05,
- -1.978110801718509e+05, -1.977470814256345e+05, -1.976829183615861e+05, -1.976185918610984e+05, -1.975541027986926e+05,
- -1.974894520420891e+05, -1.974246404522807e+05, -1.973596688835984e+05, -1.972945381837829e+05, -1.972292491940505e+05,
- -1.971638027491616e+05, -1.970981996774867e+05, -1.970324408010688e+05, -1.969665269356918e+05, -1.969004588909416e+05,
- -1.968342374702685e+05, -1.967678634710510e+05, -1.967013376846554e+05, -1.966346608964965e+05, -1.965678338860977e+05,
- -1.965008574271496e+05, -1.964337322875687e+05, -1.963664592295526e+05, -1.962990390096392e+05, -1.962314723787633e+05,
- -1.961637600823075e+05, -1.960959028601621e+05, -1.960279014467761e+05, -1.959597565712104e+05, -1.958914689571910e+05,
- -1.958230393231627e+05, -1.957544683823371e+05, -1.956857568427456e+05, -1.956169054072892e+05, -1.955479147737879e+05,
- -1.954787856350284e+05, -1.954095186788146e+05, -1.953401145880142e+05, -1.952705740406048e+05, -1.952008977097226e+05,
- -1.951310862637074e+05, -1.950611403661471e+05, -1.949910606759255e+05, -1.949208478472632e+05, -1.948505025297629e+05,
- -1.947800253684553e+05, -1.947094170038375e+05, -1.946386780719192e+05, -1.945678092042611e+05, -1.944968110280202e+05,
- -1.944256841659878e+05, -1.943544292366309e+05, -1.942830468541311e+05, -1.942115376284259e+05, -1.941399021652479e+05,
- -1.940681410661602e+05, -1.939962549285977e+05, -1.939242443459046e+05, -1.938521099073695e+05, -1.937798521982651e+05,
- -1.937074717998816e+05, -1.936349692895656e+05, -1.935623452407544e+05, -1.934896002230098e+05, -1.934167348020555e+05,
- -1.933437495398110e+05, -1.932706449944232e+05, -1.931974217203042e+05, -1.931240802681591e+05, -1.930506211850251e+05,
- -1.929770450142996e+05, -1.929033522957734e+05, -1.928295435656644e+05, -1.927556193566451e+05, -1.926815801978791e+05
- },
- {
- 4.033391985181019e+04, 3.871861968130223e+04, 3.708200351798967e+04, 3.542330511515377e+04, 3.374171247862647e+04,
- 3.203636409633547e+04, 3.030634476487550e+04, 2.855068095786316e+04, 2.676833567581794e+04, 2.495820270419242e+04,
- 2.311910019574708e+04, 2.124976347864337e+04, 1.934883697448229e+04, 1.741486508991632e+04, 1.544628192026417e+04,
- 1.344139957362828e+04, 1.139839488685013e+04, 9.315294259788372e+03, 7.189956279057192e+03, 5.020051735091258e+03,
- 2.803040547256334e+03, 5.361450198986795e+02, -1.783681298235891e+03, -4.159790024768661e+03, -6.595880714390887e+03,
- -9.096051337172830e+03, -1.166485814294211e+04, -1.430738701051556e+04, -1.702933891585727e+04, -1.983713283536701e+04,
- -2.273803027647484e+04, -2.574028667331455e+04, -2.885333639724308e+04, -3.208801959004973e+04, -3.545686117228876e+04,
- -3.897441430485901e+04, -4.265768218471586e+04, -4.652663169506539e+04, -5.060480660357802e+04, -5.492002833387237e+04,
- -5.950511955260285e+04, -6.439845718779157e+04, -6.964386994552567e+04, -7.528879904031586e+04, -8.137865906355182e+04,
- -8.794450992459479e+04, -9.498237385841347e+04, -1.024257289602935e+05, -1.101100016795137e+05, -1.177377158453914e+05,
- -1.249250599911720e+05, -1.313920867709011e+05, -1.370557918006403e+05, -1.419395518836039e+05, -1.461333829071583e+05,
- -1.497490262816589e+05, -1.528926717805148e+05, -1.556537909207259e+05, -1.581036268184157e+05, -1.602976903754740e+05,
- -1.622791209126079e+05, -1.640816754896436e+05, -1.657320607066307e+05, -1.672516653219475e+05, -1.686578292570618e+05,
- -1.699647736663851e+05, -1.711842876063385e+05, -1.723262402489398e+05, -1.733989674315564e+05, -1.744095669303095e+05,
- -1.753641267536758e+05, -1.762679037256371e+05, -1.771254647342321e+05, -1.779407996023794e+05, -1.787174121351745e+05,
- -1.794583941960509e+05, -1.801664864472005e+05, -1.808441285099643e+05, -1.814935006576167e+05, -1.821165586770062e+05,
- -1.827150631791953e+05, -1.832906043694733e+05, -1.838446230807076e+05, -1.843784287144749e+05, -1.848932146100454e+05,
- -1.853900712634880e+05, -1.858699977416940e+05, -1.863339115743320e+05, -1.867826573571466e+05, -1.872170142599870e+05,
- -1.876377026004751e+05, -1.880453896177373e+05, -1.884406945589274e+05, -1.888241931734383e+05, -1.891964216949473e+05,
- -1.895578803792491e+05, -1.899090366556273e+05, -1.902503279410764e+05, -1.905821641595290e+05, -1.909049300022992e+05,
- -1.912189869609009e+05, -1.915246751591337e+05, -1.918223150077281e+05, -1.921122087017490e+05, -1.923946415783478e+05,
- -1.926698833501990e+05, -1.929381892280376e+05, -1.931998009440577e+05, -1.934549476864985e+05, -1.937038469545265e+05,
- -1.939467053414319e+05, -1.941837192532494e+05, -1.944150755690963e+05, -1.946409522488118e+05, -1.948615188928808e+05,
- -1.950769372590646e+05, -1.952873617397079e+05, -1.954929398032607e+05, -1.956938124031901e+05, -1.958901143571365e+05,
- -1.960819746988737e+05, -1.962695170053876e+05, -1.964528597011519e+05, -1.966321163414875e+05, -1.968073958767064e+05,
- -1.969788028985834e+05, -1.971464378657666e+05, -1.973103973384864e+05, -1.974707741501212e+05, -1.976276576160160e+05,
- -1.977811337061395e+05, -1.979312852136367e+05, -1.980781919121200e+05, -1.982219306197034e+05, -1.983625755564891e+05,
- -1.985001982276146e+05, -1.986348676747601e+05, -1.987666505645186e+05, -1.988956112966844e+05, -1.990218121086984e+05,
- -1.991453131629045e+05, -1.992661726518814e+05, -1.993844468749817e+05, -1.995001903223546e+05, -1.996134557521439e+05,
- -1.997242942636081e+05, -1.998327553664192e+05, -1.999388870463769e+05, -2.000427358277583e+05, -2.001443468325078e+05,
- -2.002437638364558e+05, -2.003410293227469e+05, -2.004361845326353e+05, -2.005292695138108e+05, -2.006203231663868e+05,
- -2.007093832866967e+05, -2.007964866090119e+05, -2.008816688448956e+05, -2.009649647227944e+05, -2.010464080216335e+05,
- -2.011260316070961e+05, -2.012038674641293e+05, -2.012799467284272e+05, -2.013542997165138e+05, -2.014269559545031e+05,
- -2.014979442056027e+05, -2.015672924964293e+05, -2.016350281421932e+05, -2.017011777708139e+05, -2.017657673460183e+05,
- -2.018288221894717e+05, -2.018903670019929e+05, -2.019504258838963e+05, -2.020090223545028e+05, -2.020661793708643e+05,
- -2.021219193457331e+05, -2.021762641648185e+05, -2.022292352033618e+05, -2.022808533420596e+05, -2.023311389823708e+05,
- -2.023801120612312e+05, -2.024277920652045e+05, -2.024741980264893e+05, -2.025193486054379e+05, -2.025632620005484e+05,
- -2.026059560280280e+05, -2.026474481184393e+05, -2.026877553218161e+05, -2.027268943276013e+05, -2.027648814691576e+05,
- -2.028017327353243e+05, -2.028374637801494e+05, -2.028720899322816e+05, -2.029056262040303e+05, -2.029380873001117e+05,
- -2.029694876260921e+05, -2.029998412965428e+05, -2.030291621429163e+05, -2.030574637211561e+05, -2.030847593190515e+05,
- -2.031110619633458e+05, -2.031363844266111e+05, -2.031607392338927e+05, -2.031841386691426e+05, -2.032065947814371e+05,
- -2.032281193909982e+05, -2.032487240950206e+05, -2.032684202733136e+05, -2.032872190937629e+05, -2.033051315176235e+05,
- -2.033221683046434e+05, -2.033383400180324e+05, -2.033536570292751e+05, -2.033681295227959e+05, -2.033817675004838e+05,
- -2.033945807860801e+05, -2.034065790294300e+05, -2.034177717106156e+05, -2.034281681439555e+05, -2.034377774818949e+05,
- -2.034466087187769e+05, -2.034546706945056e+05, -2.034619720981017e+05, -2.034685214711560e+05, -2.034743272111850e+05,
- -2.034793975748893e+05, -2.034837406813192e+05, -2.034873645149540e+05, -2.034902769271648e+05, -2.034924856455975e+05,
- -2.034939982667743e+05, -2.034948222659807e+05, -2.034949649980820e+05, -2.034944337001227e+05, -2.034932354938591e+05,
- -2.034913773882203e+05, -2.034888662817072e+05, -2.034857089647243e+05, -2.034819121218516e+05, -2.034774823340559e+05,
- -2.034724260808438e+05, -2.034667497423605e+05, -2.034604596014323e+05, -2.034535618455557e+05, -2.034460625688391e+05,
- -2.034379677738913e+05, -2.034292833736636e+05, -2.034200151932455e+05, -2.034101689716153e+05, -2.033997503633468e+05,
- -2.033887649402723e+05, -2.033772181931076e+05, -2.033651155330344e+05, -2.033524622932439e+05, -2.033392637304454e+05,
- -2.033255250263345e+05, -2.033112512890300e+05, -2.032964475544729e+05, -2.032811187877945e+05, -2.032652698846497e+05,
- -2.032489056725217e+05, -2.032320309119927e+05, -2.032146502979875e+05, -2.031967684609864e+05, -2.031783899682118e+05,
- -2.031595193247854e+05, -2.031401609748592e+05, -2.031203193027243e+05, -2.030999986338864e+05, -2.030792032361268e+05,
- -2.030579373205317e+05, -2.030362050425020e+05, -2.030140105027402e+05, -2.029913577482156e+05, -2.029682507731058e+05,
- -2.029446935197221e+05, -2.029206898794087e+05, -2.028962436934276e+05, -2.028713587538219e+05, -2.028460388042582e+05,
- -2.028202875408574e+05, -2.027941086129998e+05, -2.027675056241190e+05, -2.027404821324750e+05, -2.027130416519147e+05,
- -2.026851876526132e+05, -2.026569235617999e+05, -2.026282527644717e+05, -2.025991786040892e+05, -2.025697043832597e+05,
- -2.025398333644047e+05, -2.025095687704155e+05, -2.024789137852942e+05, -2.024478715547816e+05, -2.024164451869744e+05,
- -2.023846377529255e+05, -2.023524522872376e+05, -2.023198917886415e+05, -2.022869592205636e+05, -2.022536575116820e+05,
- -2.022199895564727e+05, -2.021859582157432e+05, -2.021515663171582e+05, -2.021168166557513e+05, -2.020817119944317e+05,
- -2.020462550644762e+05, -2.020104485660144e+05, -2.019742951685045e+05, -2.019377975111998e+05, -2.019009582036039e+05,
- -2.018637798259227e+05, -2.018262649295016e+05, -2.017884160372593e+05, -2.017502356441113e+05, -2.017117262173837e+05,
- -2.016728901972244e+05, -2.016337299970027e+05, -2.015942480037000e+05, -2.015544465782996e+05, -2.015143280561624e+05,
- -2.014738947474005e+05, -2.014331489372411e+05, -2.013920928863874e+05, -2.013507288313674e+05, -2.013090589848816e+05,
- -2.012670855361423e+05, -2.012248106512068e+05, -2.011822364733046e+05, -2.011393651231602e+05, -2.010961986993072e+05,
- -2.010527392784008e+05, -2.010089889155218e+05, -2.009649496444759e+05, -2.009206234780892e+05, -2.008760124084957e+05,
- -2.008311184074253e+05, -2.007859434264779e+05, -2.007404893974036e+05, -2.006947582323681e+05, -2.006487518242209e+05,
- -2.006024720467553e+05, -2.005559207549646e+05, -2.005090997852938e+05, -2.004620109558885e+05, -2.004146560668381e+05,
- -2.003670369004153e+05, -2.003191552213124e+05, -2.002710127768711e+05, -2.002226112973137e+05, -2.001739524959646e+05,
- -2.001250380694705e+05, -2.000758696980204e+05, -2.000264490455551e+05, -1.999767777599809e+05, -1.999268574733717e+05,
- -1.998766898021760e+05, -1.998262763474153e+05, -1.997756186948798e+05, -1.997247184153248e+05, -1.996735770646565e+05,
- -1.996221961841250e+05, -1.995705773005032e+05, -1.995187219262740e+05, -1.994666315598036e+05, -1.994143076855211e+05,
- -1.993617517740906e+05, -1.993089652825809e+05, -1.992559496546336e+05, -1.992027063206299e+05, -1.991492366978511e+05,
- -1.990955421906395e+05, -1.990416241905567e+05, -1.989874840765390e+05, -1.989331232150478e+05, -1.988785429602249e+05,
- -1.988237446540357e+05, -1.987687296264202e+05, -1.987134991954320e+05, -1.986580546673841e+05, -1.986023973369870e+05,
- -1.985465284874853e+05, -1.984904493907943e+05, -1.984341613076349e+05, -1.983776654876608e+05, -1.983209631695928e+05,
- -1.982640555813435e+05, -1.982069439401457e+05, -1.981496294526726e+05, -1.980921133151636e+05, -1.980343967135440e+05,
- -1.979764808235407e+05, -1.979183668108030e+05, -1.978600558310170e+05, -1.978015490300170e+05, -1.977428475438995e+05,
- -1.976839524991346e+05, -1.976248650126710e+05, -1.975655861920481e+05, -1.975061171354973e+05, -1.974464589320502e+05,
- -1.973866126616384e+05, -1.973265793951971e+05, -1.972663601947630e+05, -1.972059561135751e+05, -1.971453681961697e+05,
- -1.970845974784791e+05, -1.970236449879223e+05, -1.969625117435020e+05, -1.969011987558941e+05, -1.968397070275395e+05,
- -1.967780375527338e+05, -1.967161913177143e+05, -1.966541693007483e+05, -1.965919724722188e+05, -1.965296017947085e+05,
- -1.964670582230834e+05, -1.964043427045771e+05, -1.963414561788693e+05, -1.962783995781683e+05, -1.962151738272892e+05,
- -1.961517798437327e+05, -1.960882185377608e+05, -1.960244908124747e+05, -1.959605975638885e+05, -1.958965396810051e+05,
- -1.958323180458867e+05, -1.957679335337292e+05, -1.957033870129321e+05, -1.956386793451699e+05, -1.955738113854613e+05,
- -1.955087839822361e+05, -1.954435979774054e+05, -1.953782542064264e+05, -1.953127534983695e+05, -1.952470966759822e+05,
- -1.951812845557548e+05, -1.951153179479816e+05, -1.950491976568266e+05, -1.949829244803826e+05, -1.949164992107332e+05,
- -1.948499226340137e+05, -1.947831955304697e+05, -1.947163186745158e+05, -1.946492928347947e+05, -1.945821187742338e+05,
- -1.945147972501011e+05, -1.944473290140626e+05, -1.943797148122363e+05, -1.943119553852476e+05, -1.942440514682820e+05,
- -1.941760037911398e+05, -1.941078130782873e+05, -1.940394800489091e+05, -1.939710054169601e+05, -1.939023898912151e+05,
- -1.938336341753197e+05, -1.937647389678390e+05, -1.936957049623062e+05, -1.936265328472726e+05, -1.935572233063529e+05,
- -1.934877770182739e+05, -1.934181946569210e+05, -1.933484768913827e+05, -1.932786243859985e+05, -1.932086378004002e+05,
- -1.931385177895606e+05, -1.930682650038339e+05, -1.929978800890015e+05, -1.929273636863114e+05, -1.928567164325248e+05,
- -1.927859389599544e+05, -1.927150318965083e+05, -1.926439958657290e+05, -1.925728314868347e+05, -1.925015393747585e+05,
- -1.924301201401888e+05, -1.923585743896074e+05, -1.922869027253287e+05, -1.922151057455381e+05, -1.921431840443277e+05,
- -1.920711382117364e+05, -1.919989688337844e+05, -1.919266764925109e+05, -1.918542617660087e+05, -1.917817252284619e+05,
- -1.917090674501796e+05, -1.916362889976296e+05, -1.915633904334769e+05, -1.914903723166123e+05, -1.914172352021896e+05,
- -1.913439796416580e+05, -1.912706061827950e+05, -1.911971153697388e+05, -1.911235077430198e+05, -1.910497838395940e+05
- },
- {
- 4.122429102163507e+04, 3.962013631220405e+04, 3.799510591700755e+04, 3.634846215685370e+04, 3.467942413624163e+04,
- 3.298716425779231e+04, 3.127080437286857e+04, 2.952941151955814e+04, 2.776199319536409e+04, 2.596749210033833e+04,
- 2.414478027776377e+04, 2.229265256690099e+04, 2.040981926792500e+04, 1.849489790188170e+04, 1.654640392784696e+04,
- 1.456274025422784e+04, 1.254218535134551e+04, 1.048287973543430e+04, 8.382810549792666e+03, 6.239793914220541e+03,
- 4.051454647965308e+03, 1.815202883705229e+03, -4.717929969315513e+02, -2.812637823804305e+03, -5.210746347858951e+03,
- -7.669886259467610e+03, -1.019422881370223e+04, -1.278840866463946e+04, -1.545759488831072e+04, -1.820757564377361e+04,
- -2.104485950918958e+04, -2.397679719412394e+04, -2.701172829437414e+04, -3.015915854058033e+04, -3.342997417993272e+04,
- -3.683670090251642e+04, -4.039381497993581e+04, -4.411811275527113e+04, -4.802913889373885e+04, -5.214965853265496e+04,
- -5.650612224521797e+04, -6.112899191605941e+04, -6.605262475872987e+04, -7.131407957668992e+04, -7.694966004459969e+04,
- -8.298743565529390e+04, -8.943427237794305e+04, -9.625806426591428e+04, -1.033671423719921e+05, -1.105868959171387e+05,
- -1.176514633100217e+05, -1.242654389364086e+05, -1.302381951904423e+05, -1.355158326477047e+05, -1.401212353112733e+05,
- -1.441255589343177e+05, -1.476167334524791e+05, -1.506803053158567e+05, -1.533907386740432e+05, -1.558092825364715e+05,
- -1.579850093331324e+05, -1.599569074287030e+05, -1.617560081702530e+05, -1.634071841502114e+05, -1.649305600627288e+05,
- -1.663425860603787e+05, -1.676568461432743e+05, -1.688846670695245e+05, -1.700355794747414e+05, -1.711176699226938e+05,
- -1.721378522794829e+05, -1.731020790634643e+05, -1.740155077755518e+05, -1.748826331433698e+05, -1.757073932922407e+05,
- -1.764932557616447e+05, -1.772432877795318e+05, -1.779602141174657e+05, -1.786464650557079e+05, -1.793042164035231e+05,
- -1.799354230862977e+05, -1.805418474854574e+05, -1.811250834701147e+05, -1.816865768699464e+05, -1.822276429921284e+05,
- -1.827494816705031e+05, -1.832531902448063e+05, -1.837397747959879e+05, -1.842101599062195e+05, -1.846651971659458e+05,
- -1.851056726128582e+05, -1.855323132571692e+05, -1.859457928225955e+05, -1.863467368119340e+05, -1.867357269891565e+05,
- -1.871133053559305e+05, -1.874799776887530e+05, -1.878362166931555e+05, -1.881824648232547e+05, -1.885191368080556e+05,
- -1.888466219201255e+05, -1.891652860173595e+05, -1.894754733844092e+05, -1.897775083968159e+05, -1.900716970278727e+05,
- -1.903583282156762e+05, -1.906376751056158e+05, -1.909099961816500e+05, -1.911755362980931e+05, -1.914345276222188e+05,
- -1.916871904967663e+05, -1.919337342303813e+05, -1.921743578230928e+05, -1.924092506331301e+05, -1.926385929906853e+05,
- -1.928625567636034e+05, -1.930813058794537e+05, -1.932949968079582e+05, -1.935037790073333e+05, -1.937077953377422e+05,
- -1.939071824447221e+05, -1.941020711151659e+05, -1.942925866081841e+05, -1.944788489583498e+05, -1.946609732811304e+05,
- -1.948390700115859e+05, -1.950132451732631e+05, -1.951836006062451e+05, -1.953502341850003e+05, -1.955132400222422e+05,
- -1.956727086603613e+05, -1.958287272535126e+05, -1.959813797388757e+05, -1.961307469695705e+05, -1.962769067969387e+05,
- -1.964199345162988e+05, -1.965599025916090e+05, -1.966968810136091e+05, -1.968309373672398e+05, -1.969621369324902e+05,
- -1.970905428015448e+05, -1.972162159672711e+05, -1.973392154179890e+05, -1.974595982248274e+05, -1.975774196243730e+05,
- -1.976927330969115e+05, -1.978055904405412e+05, -1.979160418414153e+05, -1.980241359403557e+05, -1.981299198960562e+05,
- -1.982334394450872e+05, -1.983347389588921e+05, -1.984338614979505e+05, -1.985308488632829e+05, -1.986257416454448e+05,
- -1.987185792711609e+05, -1.988094000477242e+05, -1.988982412048861e+05, -1.989851389369219e+05, -1.990701284383779e+05,
- -1.991532439426048e+05, -1.992345187562884e+05, -1.993139852928734e+05, -1.993916751044943e+05, -1.994676189124832e+05,
- -1.995418466365399e+05, -1.996143874226277e+05, -1.996852696696634e+05, -1.997545210550626e+05, -1.998221685591993e+05,
- -1.998882384888348e+05, -1.999527564995671e+05, -2.000157476173495e+05, -2.000772362591242e+05, -2.001372462526167e+05,
- -2.001958008553260e+05, -2.002529227727556e+05, -2.003086341759186e+05, -2.003629567181504e+05, -2.004159115512630e+05,
- -2.004675193410730e+05, -2.005178002823280e+05, -2.005667740954154e+05, -2.006144601097203e+05, -2.006608771741487e+05,
- -2.007060437374129e+05, -2.007499778437282e+05, -2.007926971446764e+05, -2.008342189106368e+05, -2.008745600436979e+05,
- -2.009137370808027e+05, -2.009517662150294e+05, -2.009886632982146e+05, -2.010244438522638e+05, -2.010591230783448e+05,
- -2.010927158657609e+05, -2.011252368005152e+05, -2.011567001735853e+05, -2.011871199889125e+05, -2.012165099711220e+05,
- -2.012448835729847e+05, -2.012722539826281e+05, -2.012986341305100e+05, -2.013240366961607e+05, -2.013484741147073e+05,
- -2.013719585831827e+05, -2.013945020666336e+05, -2.014161163040326e+05, -2.014368128139992e+05, -2.014566029003432e+05,
- -2.014754976574318e+05, -2.014935079753888e+05, -2.015106445451339e+05, -2.015269178632643e+05, -2.015423382367887e+05,
- -2.015569157877168e+05, -2.015706604575074e+05, -2.015835820113859e+05, -2.015956900425306e+05, -2.016069939761356e+05,
- -2.016175030733524e+05, -2.016272264351165e+05, -2.016361730058637e+05, -2.016443515771344e+05, -2.016517707910795e+05,
- -2.016584391438604e+05, -2.016643649889562e+05, -2.016695565403744e+05, -2.016740218733838e+05, -2.016777689374226e+05,
- -2.016808055437871e+05, -2.016831393789540e+05, -2.016847780046866e+05, -2.016857288607501e+05, -2.016859992675475e+05,
- -2.016855964286897e+05, -2.016845274334893e+05, -2.016827992593938e+05, -2.016804187743505e+05, -2.016773927391108e+05,
- -2.016737278094704e+05, -2.016694305384563e+05, -2.016645073784506e+05, -2.016589646832644e+05, -2.016528087101548e+05,
- -2.016460456217919e+05, -2.016386814881750e+05, -2.016307222885001e+05, -2.016221739129796e+05, -2.016130421646188e+05,
- -2.016033327609447e+05, -2.015930513356939e+05, -2.015822034404581e+05, -2.015707945462891e+05, -2.015588300452644e+05,
- -2.015463152520149e+05, -2.015332554052158e+05, -2.015196556690414e+05, -2.015055211345829e+05, -2.014908568212366e+05,
- -2.014756676780553e+05, -2.014599585850689e+05, -2.014437343545757e+05, -2.014269997324006e+05, -2.014097593991253e+05,
- -2.013920179712898e+05, -2.013737800025670e+05, -2.013550499849095e+05, -2.013358323496697e+05, -2.013161314686948e+05,
- -2.012959516553984e+05, -2.012752971658050e+05, -2.012541721995738e+05, -2.012325809009983e+05, -2.012105273599840e+05,
- -2.011880156130044e+05, -2.011650496440354e+05, -2.011416333854704e+05, -2.011177707190141e+05, -2.010934654765582e+05,
- -2.010687214410364e+05, -2.010435423472635e+05, -2.010179318827537e+05, -2.009918936885227e+05, -2.009654313598736e+05,
- -2.009385484471661e+05, -2.009112484565661e+05, -2.008835348507841e+05, -2.008554110497962e+05, -2.008268804315496e+05,
- -2.007979463326541e+05, -2.007686120490609e+05, -2.007388808367219e+05, -2.007087559122442e+05, -2.006782404535232e+05,
- -2.006473376003679e+05, -2.006160504551107e+05, -2.005843820832069e+05, -2.005523355138211e+05, -2.005199137404024e+05,
- -2.004871197212473e+05, -2.004539563800530e+05, -2.004204266064582e+05, -2.003865332565749e+05, -2.003522791535077e+05,
- -2.003176670878651e+05, -2.002826998182597e+05, -2.002473800717991e+05, -2.002117105445667e+05, -2.001756939020956e+05,
- -2.001393327798301e+05, -2.001026297835791e+05, -2.000655874899659e+05, -2.000282084468608e+05, -1.999904951738138e+05,
- -1.999524501624730e+05, -1.999140758770006e+05, -1.998753747544755e+05, -1.998363492052938e+05, -1.997970016135582e+05,
- -1.997573343374626e+05, -1.997173497096674e+05, -1.996770500376699e+05, -1.996364376041678e+05, -1.995955146674148e+05,
- -1.995542834615699e+05, -1.995127461970439e+05, -1.994709050608338e+05, -1.994287622168550e+05, -1.993863198062690e+05,
- -1.993435799478024e+05, -1.993005447380587e+05, -1.992572162518312e+05, -1.992135965424019e+05, -1.991696876418446e+05,
- -1.991254915613129e+05, -1.990810102913312e+05, -1.990362458020762e+05, -1.989912000436547e+05, -1.989458749463790e+05,
- -1.989002724210318e+05, -1.988543943591333e+05, -1.988082426332006e+05, -1.987618190969994e+05, -1.987151255857991e+05,
- -1.986681639166177e+05, -1.986209358884638e+05, -1.985734432825758e+05, -1.985256878626554e+05, -1.984776713751010e+05,
- -1.984293955492302e+05, -1.983808620975073e+05, -1.983320727157598e+05, -1.982830290833957e+05, -1.982337328636150e+05,
- -1.981841857036199e+05, -1.981343892348187e+05, -1.980843450730289e+05, -1.980340548186770e+05, -1.979835200569922e+05,
- -1.979327423582023e+05, -1.978817232777193e+05, -1.978304643563300e+05, -1.977789671203770e+05, -1.977272330819397e+05,
- -1.976752637390147e+05, -1.976230605756872e+05, -1.975706250623068e+05, -1.975179586556553e+05, -1.974650627991146e+05,
- -1.974119389228308e+05, -1.973585884438776e+05, -1.973050127664132e+05, -1.972512132818398e+05, -1.971971913689579e+05,
- -1.971429483941171e+05, -1.970884857113685e+05, -1.970338046626102e+05, -1.969789065777350e+05, -1.969237927747714e+05,
- -1.968684645600276e+05, -1.968129232282279e+05, -1.967571700626516e+05, -1.967012063352672e+05, -1.966450333068666e+05,
- -1.965886522271935e+05, -1.965320643350758e+05, -1.964752708585506e+05, -1.964182730149900e+05, -1.963610720112262e+05,
- -1.963036690436708e+05, -1.962460652984370e+05, -1.961882619514560e+05, -1.961302601685961e+05, -1.960720611057736e+05,
- -1.960136659090712e+05, -1.959550757148447e+05, -1.958962916498371e+05, -1.958373148312843e+05, -1.957781463670233e+05,
- -1.957187873555972e+05, -1.956592388863599e+05, -1.955995020395786e+05, -1.955395778865331e+05, -1.954794674896176e+05,
- -1.954191719024384e+05, -1.953586921699102e+05, -1.952980293283523e+05, -1.952371844055831e+05, -1.951761584210120e+05,
- -1.951149523857329e+05, -1.950535673026122e+05, -1.949920041663803e+05, -1.949302639637186e+05, -1.948683476733464e+05,
- -1.948062562661065e+05, -1.947439907050500e+05, -1.946815519455187e+05, -1.946189409352294e+05, -1.945561586143527e+05,
- -1.944932059155941e+05, -1.944300837642738e+05, -1.943667930784031e+05, -1.943033347687621e+05, -1.942397097389761e+05,
- -1.941759188855897e+05, -1.941119630981408e+05, -1.940478432592339e+05, -1.939835602446117e+05, -1.939191149232278e+05,
- -1.938545081573138e+05, -1.937897408024517e+05, -1.937248137076393e+05, -1.936597277153604e+05, -1.935944836616498e+05,
- -1.935290823761602e+05, -1.934635246822245e+05, -1.933978113969235e+05, -1.933319433311467e+05, -1.932659212896557e+05,
- -1.931997460711461e+05, -1.931334184683074e+05, -1.930669392678834e+05, -1.930003092507328e+05, -1.929335291918865e+05,
- -1.928665998606065e+05, -1.927995220204420e+05, -1.927322964292862e+05, -1.926649238394337e+05, -1.925974049976323e+05,
- -1.925297406451412e+05, -1.924619315177824e+05, -1.923939783459935e+05, -1.923258818548812e+05, -1.922576427642737e+05,
- -1.921892617887706e+05, -1.921207396377931e+05, -1.920520770156363e+05, -1.919832746215147e+05, -1.919143331496159e+05,
- -1.918452532891431e+05, -1.917760357243689e+05, -1.917066811346764e+05, -1.916371901946086e+05, -1.915675635739157e+05,
- -1.914978019375973e+05, -1.914279059459486e+05, -1.913578762546055e+05, -1.912877135145870e+05, -1.912174183723396e+05,
- -1.911469914697793e+05, -1.910764334443338e+05, -1.910057449289841e+05, -1.909349265523074e+05, -1.908639789385160e+05,
- -1.907929027074980e+05, -1.907216984748582e+05, -1.906503668519552e+05, -1.905789084459436e+05, -1.905073238598095e+05,
- -1.904356136924109e+05, -1.903637785385127e+05, -1.902918189888266e+05, -1.902197356300461e+05, -1.901475290448834e+05,
- -1.900751998121054e+05, -1.900027485065695e+05, -1.899301756992576e+05, -1.898574819573116e+05, -1.897846678440689e+05,
- -1.897117339190942e+05, -1.896386807382141e+05, -1.895655088535504e+05, -1.894922188135528e+05, -1.894188111630322e+05
- },
- {
- 4.211563683489135e+04, 4.052250122175880e+04, 3.890892007726600e+04, 3.727418317841686e+04, 3.561753947831363e+04,
- 3.393819388483291e+04, 3.223530371107669e+04, 3.050797475447155e+04, 2.875525695859349e+04, 2.697613960148613e+04,
- 2.516954594715964e+04, 2.333432728627266e+04, 2.146925627994471e+04, 1.957301950624022e+04, 1.764420909166132e+04,
- 1.568131328953269e+04, 1.368270584217467e+04, 1.164663393449459e+04, 9.571204510297641e+03, 7.454368679360799e+03,
- 5.293903890405115e+03, 3.087393481640316e+03, 8.322031361978794e+02, -1.474546310546572e+03, -3.836010406961034e+03,
- -6.255657781540705e+03, -8.737313006427165e+03, -1.128520684809766e+04, -1.390403538930977e+04, -1.659902982688004e+04,
- -1.937603913766847e+04, -2.224162821463853e+04, -2.520319468065477e+04, -2.826910795745835e+04, -3.144887477955638e+04,
- -3.475333548057598e+04, -3.819489497798423e+04, -4.178779047890301e+04, -4.554839286519070e+04, -4.949552704893480e+04,
- -5.365077142195892e+04, -5.803864440145907e+04, -6.268648246965382e+04, -6.762362122469244e+04, -7.287917666039101e+04,
- -7.847735675502229e+04, -8.442920912107699e+04, -9.072076910743465e+04, -9.729934939342903e+04, -1.040593724728920e+05,
- -1.108301531166199e+05, -1.173850614722618e+05, -1.235005615052627e+05, -1.290458233864094e+05, -1.339850798625063e+05,
- -1.383398707730314e+05, -1.421672887051440e+05, -1.455374885464842e+05, -1.485199422470145e+05, -1.511767463508706e+05,
- -1.535604366406203e+05, -1.557142019943009e+05, -1.576731038406767e+05, -1.594655325371105e+05, -1.611145533177146e+05,
- -1.626390281068134e+05, -1.640545067118820e+05, -1.653739195703886e+05, -1.666081119428189e+05, -1.677662556626014e+05,
- -1.688561677570428e+05, -1.698845586140357e+05, -1.708572268308154e+05, -1.717792135543712e+05, -1.726549258507621e+05,
- -1.734882362078619e+05, -1.742825634835325e+05, -1.750409392950204e+05, -1.757660628785652e+05, -1.764603467355605e+05,
- -1.771259548532814e+05, -1.777648348935490e+05, -1.783787454453219e+05, -1.789692792110037e+05, -1.795378828225287e+05,
- -1.800858738485525e+05, -1.806144554486386e+05, -1.811247290470753e+05, -1.816177053327013e+05, -1.820943138379847e+05,
- -1.825554113076971e+05, -1.830017890326941e+05, -1.834341792958376e+05, -1.838532610537315e+05, -1.842596649586702e+05,
- -1.846539778092220e+05, -1.850367465045957e+05, -1.854084815668457e+05, -1.857696602856902e+05, -1.861207295329000e+05,
- -1.864621082866500e+05, -1.867941899006448e+05, -1.871173441481230e+05, -1.874319190668199e+05, -1.877382426275625e+05,
- -1.880366242462254e+05, -1.883273561562873e+05, -1.886107146570582e+05, -1.888869612508104e+05, -1.891563436804217e+05,
- -1.894190968777741e+05, -1.896754438319415e+05, -1.899255963851495e+05, -1.901697559635938e+05, -1.904081142493983e+05,
- -1.906408537993053e+05, -1.908681486150811e+05, -1.910901646700848e+05, -1.913070603959781e+05, -1.915189871331413e+05,
- -1.917260895435646e+05, -1.919285060159836e+05, -1.921263689977588e+05, -1.923198053477915e+05, -1.925089366427007e+05,
- -1.926938794664945e+05, -1.928747456806752e+05, -1.930516426763412e+05, -1.932246736097057e+05, -1.933939376223240e+05,
- -1.935595300474141e+05, -1.937215426058108e+05, -1.938800635920934e+05, -1.940351780166902e+05, -1.941869677161381e+05,
- -1.943355117608674e+05, -1.944808862512489e+05, -1.946231646509775e+05, -1.947624178604688e+05, -1.948987143476296e+05,
- -1.950321202499964e+05, -1.951626994818152e+05, -1.952905138330079e+05, -1.954156230626977e+05, -1.955380849876442e+05,
- -1.956579555659194e+05, -1.957752889761251e+05, -1.958901376924372e+05, -1.960025525557323e+05, -1.961125828410459e+05,
- -1.962202763215798e+05, -1.963256793294724e+05, -1.964288368135260e+05, -1.965297923940684e+05, -1.966285884151220e+05,
- -1.967252659940337e+05, -1.968198650682099e+05, -1.969124244421690e+05, -1.970029818272207e+05, -1.970915738844911e+05,
- -1.971782362633211e+05, -1.972630036384278e+05, -1.973459097453761e+05, -1.974269874144490e+05, -1.975062686029985e+05,
- -1.975837844263650e+05, -1.976595651874340e+05, -1.977336404049071e+05, -1.978060388403504e+05, -1.978767885240820e+05,
- -1.979459167799623e+05, -1.980134502491386e+05, -1.980794149127984e+05, -1.981438361139777e+05, -1.982067385784779e+05,
- -1.982681464349246e+05, -1.983280832340198e+05, -1.983865719670184e+05, -1.984436350834737e+05, -1.984992945082784e+05,
- -1.985535716580408e+05, -1.986064874568234e+05, -1.986580623336216e+05, -1.987083163064556e+05, -1.987572688936556e+05,
- -1.988049391947674e+05, -1.988513458869215e+05, -1.988965072373177e+05, -1.989404411152554e+05, -1.989831650037201e+05,
- -1.990246960105509e+05, -1.990650508792044e+05, -1.991042460014083e+05, -1.991422974181999e+05, -1.991792208428580e+05,
- -1.992150316614939e+05, -1.992497449441967e+05, -1.992833754537206e+05, -1.993159376538695e+05, -1.993474457175987e+05,
- -1.993779135348413e+05, -1.994073547200719e+05, -1.994357826196185e+05, -1.994632103187316e+05, -1.994896506484202e+05,
- -1.995151161920649e+05, -1.995396192918143e+05, -1.995631720547790e+05, -1.995857863590227e+05, -1.996074738593633e+05,
- -1.996282459929929e+05, -1.996481139849178e+05, -1.996670888532314e+05, -1.996851814142196e+05, -1.997024022873136e+05,
- -1.997187618998862e+05, -1.997342704919035e+05, -1.997489381204384e+05, -1.997627746640429e+05, -1.997757898269953e+05,
- -1.997879931434151e+05, -1.997993939812628e+05, -1.998100015462170e+05, -1.998198248854394e+05, -1.998288728912338e+05,
- -1.998371543045936e+05, -1.998446777186545e+05, -1.998514515820410e+05, -1.998574842021252e+05, -1.998627837452568e+05,
- -1.998673582518760e+05, -1.998712156210164e+05, -1.998743636258017e+05, -1.998768099130639e+05, -1.998785620060905e+05,
- -1.998796273072999e+05, -1.998800131008423e+05, -1.998797265551316e+05, -1.998787747253076e+05, -1.998771645556362e+05,
- -1.998749028818416e+05, -1.998719964333808e+05, -1.998684518356553e+05, -1.998642756121677e+05, -1.998594741866205e+05,
- -1.998540538849622e+05, -1.998480209373793e+05, -1.998413814802390e+05, -1.998341415579809e+05, -1.998263071249633e+05,
- -1.998178840472604e+05, -1.998088781044153e+05, -1.997992949911514e+05, -1.997891403190392e+05, -1.997784196181219e+05,
- -1.997671383385031e+05, -1.997553018518933e+05, -1.997429154531222e+05, -1.997299843616103e+05, -1.997165137228096e+05,
- -1.997025086096056e+05, -1.996879740236893e+05, -1.996729148968951e+05, -1.996573360925065e+05, -1.996412424065341e+05,
- -1.996246385689609e+05, -1.996075292449587e+05, -1.995899190360787e+05, -1.995718124814133e+05, -1.995532140587305e+05,
- -1.995341281855838e+05, -1.995145592203976e+05, -1.994945114635237e+05, -1.994739891582825e+05, -1.994529964919703e+05,
- -1.994315375968534e+05, -1.994096165511348e+05, -1.993872373799016e+05, -1.993644040560513e+05, -1.993411205011974e+05,
- -1.993173905865566e+05, -1.992932181338136e+05, -1.992686069159725e+05, -1.992435606581843e+05, -1.992180830385615e+05,
- -1.991921776889710e+05, -1.991658481958137e+05, -1.991390981007868e+05, -1.991119309016275e+05, -1.990843500528467e+05,
- -1.990563589664403e+05, -1.990279610125914e+05, -1.989991595203561e+05, -1.989699577783351e+05, -1.989403590353306e+05,
- -1.989103665009919e+05, -1.988799833464467e+05, -1.988492127049193e+05, -1.988180576723361e+05, -1.987865213079226e+05,
- -1.987546066347811e+05, -1.987223166404653e+05, -1.986896542775373e+05, -1.986566224641175e+05, -1.986232240844198e+05,
- -1.985894619892811e+05, -1.985553389966766e+05, -1.985208578922271e+05, -1.984860214296951e+05, -1.984508323314729e+05,
- -1.984152932890612e+05, -1.983794069635350e+05, -1.983431759860084e+05, -1.983066029580814e+05, -1.982696904522848e+05,
- -1.982324410125139e+05, -1.981948571544559e+05, -1.981569413660056e+05, -1.981186961076795e+05, -1.980801238130159e+05,
- -1.980412268889714e+05, -1.980020077163086e+05, -1.979624686499790e+05, -1.979226120194943e+05, -1.978824401292966e+05,
- -1.978419552591175e+05, -1.978011596643323e+05, -1.977600555763085e+05, -1.977186452027471e+05, -1.976769307280183e+05,
- -1.976349143134913e+05, -1.975925980978573e+05, -1.975499841974473e+05, -1.975070747065464e+05, -1.974638716976991e+05,
- -1.974203772220111e+05, -1.973765933094462e+05, -1.973325219691167e+05, -1.972881651895712e+05, -1.972435249390737e+05,
- -1.971986031658828e+05, -1.971534017985194e+05, -1.971079227460385e+05, -1.970621678982887e+05, -1.970161391261711e+05,
- -1.969698382818933e+05, -1.969232671992191e+05, -1.968764276937127e+05, -1.968293215629820e+05, -1.967819505869137e+05,
- -1.967343165279084e+05, -1.966864211311091e+05, -1.966382661246273e+05, -1.965898532197644e+05, -1.965411841112311e+05,
- -1.964922604773620e+05, -1.964430839803248e+05, -1.963936562663328e+05, -1.963439789658451e+05, -1.962940536937692e+05,
- -1.962438820496602e+05, -1.961934656179148e+05, -1.961428059679636e+05, -1.960919046544587e+05, -1.960407632174611e+05,
- -1.959893831826214e+05, -1.959377660613632e+05, -1.958859133510565e+05, -1.958338265351946e+05, -1.957815070835647e+05,
- -1.957289564524167e+05, -1.956761760846326e+05, -1.956231674098843e+05, -1.955699318448015e+05, -1.955164707931263e+05,
- -1.954627856458714e+05, -1.954088777814737e+05, -1.953547485659458e+05, -1.953003993530264e+05, -1.952458314843260e+05,
- -1.951910462894738e+05, -1.951360450862586e+05, -1.950808291807705e+05, -1.950253998675394e+05, -1.949697584296712e+05,
- -1.949139061389831e+05, -1.948578442561348e+05, -1.948015740307602e+05, -1.947450967015964e+05, -1.946884134966077e+05,
- -1.946315256331150e+05, -1.945744343179154e+05, -1.945171407474042e+05, -1.944596461076962e+05, -1.944019515747408e+05,
- -1.943440583144411e+05, -1.942859674827656e+05, -1.942276802258643e+05, -1.941691976801756e+05, -1.941105209725412e+05,
- -1.940516512203094e+05, -1.939925895314451e+05, -1.939333370046329e+05, -1.938738947293822e+05, -1.938142637861276e+05,
- -1.937544452463328e+05, -1.936944401725852e+05, -1.936342496186986e+05, -1.935738746298070e+05, -1.935133162424609e+05,
- -1.934525754847209e+05, -1.933916533762511e+05, -1.933305509284092e+05, -1.932692691443380e+05, -1.932078090190546e+05,
- -1.931461715395355e+05, -1.930843576848070e+05, -1.930223684260274e+05, -1.929602047265733e+05, -1.928978675421213e+05,
- -1.928353578207310e+05, -1.927726765029261e+05, -1.927098245217722e+05, -1.926468028029590e+05, -1.925836122648744e+05,
- -1.925202538186836e+05, -1.924567283684048e+05, -1.923930368109821e+05, -1.923291800363614e+05, -1.922651589275608e+05,
- -1.922009743607453e+05, -1.921366272052947e+05, -1.920721183238766e+05, -1.920074485725125e+05, -1.919426188006483e+05,
- -1.918776298512198e+05, -1.918124825607209e+05, -1.917471777592679e+05, -1.916817162706644e+05, -1.916160989124660e+05,
- -1.915503264960430e+05, -1.914843998266419e+05, -1.914183197034481e+05, -1.913520869196468e+05, -1.912857022624814e+05,
- -1.912191665133148e+05, -1.911524804476861e+05, -1.910856448353700e+05, -1.910186604404322e+05, -1.909515280212872e+05,
- -1.908842483307532e+05, -1.908168221161074e+05, -1.907492501191398e+05, -1.906815330762077e+05, -1.906136717182875e+05,
- -1.905456667710287e+05, -1.904775189548037e+05, -1.904092289847605e+05, -1.903407975708711e+05, -1.902722254179838e+05,
- -1.902035132258716e+05, -1.901346616892793e+05, -1.900656714979739e+05, -1.899965433367908e+05, -1.899272778856797e+05,
- -1.898578758197537e+05, -1.897883378093327e+05, -1.897186645199899e+05, -1.896488566125965e+05, -1.895789147433644e+05,
- -1.895088395638924e+05, -1.894386317212074e+05, -1.893682918578079e+05, -1.892978206117055e+05, -1.892272186164675e+05,
- -1.891564865012583e+05, -1.890856248908778e+05, -1.890146344058047e+05, -1.889435156622344e+05, -1.888722692721192e+05,
- -1.888008958432059e+05, -1.887293959790758e+05, -1.886577702791819e+05, -1.885860193388872e+05, -1.885141437494995e+05,
- -1.884421440983108e+05, -1.883700209686339e+05, -1.882977749398336e+05, -1.882254065873692e+05, -1.881529164828231e+05,
- -1.880803051939399e+05, -1.880075732846585e+05, -1.879347213151463e+05, -1.878617498418339e+05, -1.877886594174457e+05
- },
- {
- 4.300795594489851e+04, 4.142571513738297e+04, 3.982344908043953e+04, 3.820047394370488e+04, 3.655606733454882e+04,
- 3.488946532187230e+04, 3.319985916401432e+04, 3.148639170270073e+04, 2.974815338307474e+04, 2.798417785065578e+04,
- 2.619343707032506e+04, 2.437483590337992e+04, 2.252720606862778e+04, 2.064929940151396e+04, 1.873978031107850e+04,
- 1.679721731763999e+04, 1.482007353411173e+04, 1.280669592947692e+04, 1.075530318467294e+04, 8.663971916075929e+03,
- 6.530621000444074e+03, 4.352993684959451e+03, 2.128637106489432e+03, -1.451212352680642e+02, -2.471200576898266e+03,
- -4.852798222198991e+03, -7.293425867707143e+03, -9.796951853172950e+03, -1.236765044513798e+04, -1.501025947695466e+04,
- -1.773004791311764e+04, -2.053289518762309e+04, -2.342538439076305e+04, -2.641491178606772e+04, -2.950981504670278e+04,
- -3.271952269416354e+04, -3.605472638999104e+04, -3.952757587018832e+04, -4.315189204956708e+04, -4.694338497001690e+04,
- -5.091984557115335e+04, -5.510124587748051e+04, -5.950961750385691e+04, -6.416846307758678e+04, -6.910127084880543e+04,
- -7.432847451815649e+04, -7.986210383399759e+04, -8.569782192452624e+04, -9.180526154257040e+04, -9.811838156236275e+04,
- -1.045268948415449e+05, -1.108731690542107e+05, -1.169701449505198e+05, -1.226501475762921e+05, -1.278221960262808e+05,
- -1.324624310588949e+05, -1.365905817345317e+05, -1.402530365405397e+05, -1.435064731790456e+05, -1.464077837564535e+05,
- -1.490089263246167e+05, -1.513549313697064e+05, -1.534836881577086e+05, -1.554265921602762e+05, -1.572095027096712e+05,
- -1.588537204225480e+05, -1.603768573049486e+05, -1.617935618353238e+05, -1.631161030693319e+05, -1.643548333707144e+05,
- -1.655185524847770e+05, -1.666147937374118e+05, -1.676500496652375e+05, -1.686299508359089e+05, -1.695594085316430e+05,
- -1.704427294670055e+05, -1.712837087581030e+05, -1.720857058668492e+05, -1.728517071163551e+05, -1.735843775273921e+05,
- -1.742861040921802e+05, -1.749590321264225e+05, -1.756050959824849e+05, -1.762260451353488e+05, -1.768234664458444e+05,
- -1.773988032462549e+05, -1.779533717695769e+05, -1.784883753467186e+05, -1.790049167192794e+05, -1.795040087544719e+05,
- -1.799865837997174e+05, -1.804535018747921e+05, -1.809055578671258e+05, -1.813434878694332e+05, -1.817679747771043e+05,
- -1.821796532447887e+05, -1.825791140866592e+05, -1.829669081923687e+05, -1.833435500202671e+05, -1.837095207206705e+05,
- -1.840652709345707e+05, -1.844112233069198e+05, -1.847477747483089e+05, -1.850752984743515e+05, -1.853941458482246e+05,
- -1.857046480485364e+05, -1.860071175818531e+05, -1.863018496568130e+05, -1.865891234346432e+05, -1.868692031691120e+05,
- -1.871423392473799e+05, -1.874087691418581e+05, -1.876687182820182e+05, -1.879224008540596e+05, -1.881700205354653e+05,
- -1.884117711706758e+05, -1.886478373934515e+05, -1.888783951965834e+05, -1.891036124794333e+05, -1.893236495113022e+05,
- -1.895386594033165e+05, -1.897487885242505e+05, -1.899541768906532e+05, -1.901549585292162e+05, -1.903512618137083e+05,
- -1.905432097785966e+05, -1.907309204112559e+05, -1.909145069244885e+05, -1.910940780109354e+05, -1.912697380807901e+05,
- -1.914415874841936e+05, -1.916097227293311e+05, -1.917742366463430e+05, -1.919352186155627e+05, -1.920927546277893e+05,
- -1.922469277044683e+05, -1.923978177363909e+05, -1.925455018102168e+05, -1.926900542964283e+05, -1.928315469779815e+05,
- -1.929700491693175e+05, -1.931056278286133e+05, -1.932383476637325e+05, -1.933682712322932e+05, -1.934954590362399e+05,
- -1.936199696112777e+05, -1.937418596114983e+05, -1.938611838895052e+05, -1.939779955723228e+05, -1.940923461333484e+05,
- -1.942042854605957e+05, -1.943138619214559e+05, -1.944211224241842e+05, -1.945261124763111e+05, -1.946288762401597e+05,
- -1.947294565856387e+05, -1.948278951399499e+05, -1.949242323375336e+05, -1.950185074623164e+05, -1.951107586933390e+05,
- -1.952010231455296e+05, -1.952893369091385e+05, -1.953757350873599e+05, -1.954602518322420e+05, -1.955429203789753e+05,
- -1.956237730786499e+05, -1.957028414295591e+05, -1.957801561071280e+05, -1.958557469925381e+05, -1.959296432001176e+05,
- -1.960018731035559e+05, -1.960724643610072e+05, -1.961414439391371e+05, -1.962088381361646e+05, -1.962746726039508e+05,
- -1.963389723691785e+05, -1.964017618536725e+05, -1.964630648938957e+05, -1.965229047596641e+05, -1.965813041721205e+05,
- -1.966382853209952e+05, -1.966938698811934e+05, -1.967480790287376e+05, -1.968009334373664e+05, -1.968524533670653e+05,
- -1.969026585692349e+05, -1.969515683719210e+05, -1.969992016753265e+05, -1.970455769644605e+05, -1.970907123213229e+05,
- -1.971346254366435e+05, -1.971773336211956e+05, -1.972188538167001e+05, -1.972592026063407e+05, -1.972983962249065e+05,
- -1.973364505712727e+05, -1.973733812071857e+05, -1.974092033821595e+05, -1.974439320318857e+05, -1.974775817892926e+05,
- -1.975101669927538e+05, -1.975417016940183e+05, -1.975721996658721e+05, -1.976016744095470e+05, -1.976301391618823e+05,
- -1.976576069022504e+05, -1.976840903592582e+05, -1.977096020172259e+05, -1.977341541224638e+05, -1.977577586893407e+05,
- -1.977804275061634e+05, -1.978021721408686e+05, -1.978230039465360e+05, -1.978429340667288e+05, -1.978619734406687e+05,
- -1.978801328082512e+05, -1.978974227149062e+05, -1.979138535163115e+05, -1.979294353829639e+05, -1.979441783046103e+05,
- -1.979580920945501e+05, -1.979711863938042e+05, -1.979834706751666e+05, -1.979949542471344e+05, -1.980056462577199e+05,
- -1.980155556981575e+05, -1.980246914065004e+05, -1.980330620711149e+05, -1.980406762340734e+05, -1.980475422906962e+05,
- -1.980536685080538e+05, -1.980590630047679e+05, -1.980637337698080e+05, -1.980676886614423e+05, -1.980709354100998e+05,
- -1.980734816211564e+05, -1.980753347776430e+05, -1.980765022428807e+05, -1.980769912630456e+05, -1.980768089696640e+05,
- -1.980759623820421e+05, -1.980744584096299e+05, -1.980723038543239e+05, -1.980695054127075e+05, -1.980660696782380e+05,
- -1.980620031433681e+05, -1.980573122016224e+05, -1.980520031496130e+05, -1.980460821890081e+05, -1.980395554284480e+05,
- -1.980324288854136e+05, -1.980247084880491e+05, -1.980164000769366e+05, -1.980075094068287e+05, -1.979980421483370e+05,
- -1.979880038895786e+05, -1.979774001377849e+05, -1.979662363208676e+05, -1.979545177889481e+05, -1.979422498158519e+05,
- -1.979294376005635e+05, -1.979160862686486e+05, -1.979022008736441e+05, -1.978877863984102e+05, -1.978728477564563e+05,
- -1.978573897932319e+05, -1.978414172873889e+05, -1.978249349520152e+05, -1.978079474358365e+05, -1.977904593243971e+05,
- -1.977724751412038e+05, -1.977539993488548e+05, -1.977350363501348e+05, -1.977155904890870e+05, -1.976956660520660e+05,
- -1.976752672687584e+05, -1.976543983131899e+05, -1.976330633047027e+05, -1.976112663089162e+05, -1.975890113386628e+05,
- -1.975663023549076e+05, -1.975431432676438e+05, -1.975195379367703e+05, -1.974954901729519e+05, -1.974710037384600e+05,
- -1.974460823479929e+05, -1.974207296694827e+05, -1.973949493248818e+05, -1.973687448909355e+05, -1.973421198999361e+05,
- -1.973150778404617e+05, -1.972876221581015e+05, -1.972597562561634e+05, -1.972314834963684e+05, -1.972028071995305e+05,
- -1.971737306462228e+05, -1.971442570774301e+05, -1.971143896951865e+05, -1.970841316632039e+05, -1.970534861074839e+05,
- -1.970224561169198e+05, -1.969910447438854e+05, -1.969592550048121e+05, -1.969270898807567e+05, -1.968945523179543e+05,
- -1.968616452283634e+05, -1.968283714901990e+05, -1.967947339484561e+05, -1.967607354154202e+05, -1.967263786711737e+05,
- -1.966916664640870e+05, -1.966566015113007e+05, -1.966211864992043e+05, -1.965854240838975e+05, -1.965493168916488e+05,
- -1.965128675193440e+05, -1.964760785349231e+05, -1.964389524778156e+05, -1.964014918593601e+05, -1.963636991632217e+05,
- -1.963255768457988e+05, -1.962871273366238e+05, -1.962483530387563e+05, -1.962092563291674e+05, -1.961698395591185e+05,
- -1.961301050545350e+05, -1.960900551163687e+05, -1.960496920209573e+05, -1.960090180203758e+05, -1.959680353427836e+05,
- -1.959267461927625e+05, -1.958851527516492e+05, -1.958432571778662e+05, -1.958010616072402e+05, -1.957585681533193e+05,
- -1.957157789076839e+05, -1.956726959402515e+05, -1.956293212995764e+05, -1.955856570131446e+05, -1.955417050876627e+05,
- -1.954974675093432e+05, -1.954529462441834e+05, -1.954081432382405e+05, -1.953630604179030e+05, -1.953176996901529e+05,
- -1.952720629428316e+05, -1.952261520448927e+05, -1.951799688466550e+05, -1.951335151800534e+05, -1.950867928588789e+05,
- -1.950398036790222e+05, -1.949925494187072e+05, -1.949450318387230e+05, -1.948972526826553e+05, -1.948492136771067e+05,
- -1.948009165319210e+05, -1.947523629403985e+05, -1.947035545795090e+05, -1.946544931101055e+05, -1.946051801771273e+05,
- -1.945556174098064e+05, -1.945058064218650e+05, -1.944557488117150e+05, -1.944054461626515e+05, -1.943549000430415e+05,
- -1.943041120065157e+05, -1.942530835921499e+05, -1.942018163246483e+05, -1.941503117145227e+05, -1.940985712582683e+05,
- -1.940465964385397e+05, -1.939943887243168e+05, -1.939419495710786e+05, -1.938892804209650e+05, -1.938363827029415e+05,
- -1.937832578329601e+05, -1.937299072141169e+05, -1.936763322368071e+05, -1.936225342788797e+05, -1.935685147057881e+05,
- -1.935142748707403e+05, -1.934598161148410e+05, -1.934051397672420e+05, -1.933502471452793e+05, -1.932951395546164e+05,
- -1.932398182893813e+05, -1.931842846323022e+05, -1.931285398548410e+05, -1.930725852173269e+05, -1.930164219690853e+05,
- -1.929600513485654e+05, -1.929034745834682e+05, -1.928466928908693e+05, -1.927897074773419e+05, -1.927325195390790e+05,
- -1.926751302620110e+05, -1.926175408219231e+05, -1.925597523845722e+05, -1.925017661058003e+05, -1.924435831316456e+05,
- -1.923852045984569e+05, -1.923266316329999e+05, -1.922678653525641e+05, -1.922089068650731e+05, -1.921497572691854e+05,
- -1.920904176543997e+05, -1.920308891011559e+05, -1.919711726809362e+05, -1.919112694563633e+05, -1.918511804812987e+05,
- -1.917909068009382e+05, -1.917304494519093e+05, -1.916698094623605e+05, -1.916089878520571e+05, -1.915479856324726e+05,
- -1.914868038068759e+05, -1.914254433704221e+05, -1.913639053102395e+05, -1.913021906055155e+05, -1.912403002275811e+05,
- -1.911782351399977e+05, -1.911159962986364e+05, -1.910535846517617e+05, -1.909910011401118e+05, -1.909282466969796e+05,
- -1.908653222482870e+05, -1.908022287126677e+05, -1.907389670015403e+05, -1.906755380191848e+05, -1.906119426628170e+05,
- -1.905481818226619e+05, -1.904842563820265e+05, -1.904201672173714e+05, -1.903559151983818e+05, -1.902915011880359e+05,
- -1.902269260426749e+05, -1.901621906120723e+05, -1.900972957394972e+05, -1.900322422617845e+05, -1.899670310093989e+05,
- -1.899016628064977e+05, -1.898361384709982e+05, -1.897704588146373e+05, -1.897046246430351e+05, -1.896386367557570e+05,
- -1.895724959463721e+05, -1.895062030025159e+05, -1.894397587059471e+05, -1.893731638326067e+05, -1.893064191526761e+05,
- -1.892395254306337e+05, -1.891724834253109e+05, -1.891052938899480e+05, -1.890379575722477e+05, -1.889704752144324e+05,
- -1.889028475532948e+05, -1.888350753202512e+05, -1.887671592413945e+05, -1.886991000375457e+05, -1.886308984243045e+05,
- -1.885625551120997e+05, -1.884940708062394e+05, -1.884254462069588e+05, -1.883566820094703e+05, -1.882877789040111e+05,
- -1.882187375758892e+05, -1.881495587055323e+05, -1.880802429685331e+05, -1.880107910356932e+05, -1.879412035730730e+05,
- -1.878714812420315e+05, -1.878016246992724e+05, -1.877316345968881e+05, -1.876615115824021e+05, -1.875912562988116e+05,
- -1.875208693846304e+05, -1.874503514739286e+05, -1.873797031963763e+05, -1.873089251772827e+05, -1.872380180376356e+05,
- -1.871669823941428e+05, -1.870958188592703e+05, -1.870245280412817e+05, -1.869531105442752e+05, -1.868815669682233e+05,
- -1.868098979090097e+05, -1.867381039584653e+05, -1.866661857044061e+05, -1.865941437306702e+05, -1.865219786171498e+05,
- -1.864496909398318e+05, -1.863772812708286e+05, -1.863047501784150e+05, -1.862320982270630e+05, -1.861593259774711e+05
- },
- {
- 4.390124698560454e+04, 4.232977872363047e+04, 4.073869589281546e+04, 3.912734003736221e+04, 3.749501627754574e+04,
- 3.584099056091224e+04, 3.416448664696286e+04, 3.246468279174657e+04, 3.074070809767990e+04, 2.899163848567631e+04,
- 2.721649224206575e+04, 2.541422508511863e+04, 2.358372468760192e+04, 2.172380458187055e+04, 1.983319736230579e+04,
- 1.791054708610979e+04, 1.595440075711147e+04, 1.396319875801624e+04, 1.193526407315293e+04, 9.868790116995036e+03,
- 7.761826950604773e+03, 5.612265629605919e+03, 3.417820380893992e+03, 1.176008251217521e+03, -1.115874201818123e+03,
- -3.460777664413730e+03, -5.861930876108517e+03, -8.322876183201270e+03, -1.084751066391262e+04, -1.344013378775200e+04,
- -1.610550272360655e+04, -1.884889657485797e+04, -2.167619090928309e+04, -2.459394417136249e+04, -2.760949732112327e+04,
- -3.073108793734610e+04, -3.396797912234766e+04, -3.733060184313914e+04, -4.083070585461760e+04, -4.448150764466684e+04,
- -4.829781125734033e+04, -5.229605471390095e+04, -5.649419331085367e+04, -6.091126016299531e+04, -6.556633356371362e+04,
- -7.047649950412424e+04, -7.565330587354350e+04, -8.109737706354952e+04, -8.679153801156671e+04, -9.269368740256448e+04,
- -9.873069622274923e+04, -1.047944919789227e+05, -1.107453380787749e+05, -1.164320963048679e+05, -1.217293690237187e+05,
- -1.265729422351551e+05, -1.309469972659969e+05, -1.348693061691985e+05, -1.383779638318116e+05, -1.415192726047295e+05,
- -1.443402094201605e+05, -1.468844363558578e+05, -1.491905754137339e+05, -1.512918008972361e+05, -1.532161295167650e+05,
- -1.549870222467785e+05, -1.566240729421884e+05, -1.581436665473834e+05, -1.595595566678117e+05, -1.608833494514397e+05,
- -1.621248986867037e+05, -1.632926240353793e+05, -1.643937657937690e+05, -1.654345885989204e+05, -1.664205446540249e+05,
- -1.673564050822356e+05, -1.682463662407259e+05, -1.690941363368371e+05, -1.699030064904663e+05, -1.706759094480094e+05,
- -1.714154684282352e+05, -1.721240380255532e+05, -1.728037386729548e+05, -1.734564858442867e+05, -1.740840149289240e+05,
- -1.746879025225532e+05, -1.752695847314530e+05, -1.758303729737980e+05, -1.763714676721663e+05, -1.768939701607932e+05,
- -1.773988930747927e+05, -1.778871694433312e+05, -1.783596606721171e+05, -1.788171635707305e+05, -1.792604165558659e+05,
- -1.796901051413829e+05, -1.801068668093293e+05, -1.805112953421934e+05, -1.809039446849764e+05, -1.812853323959014e+05,
- -1.816559427363334e+05, -1.820162294435071e+05, -1.823666182237544e+05, -1.827075089988843e+05, -1.830392779340895e+05,
- -1.833622792720647e+05, -1.836768469948987e+05, -1.839832963325775e+05, -1.842819251346174e+05, -1.845730151193292e+05,
- -1.848568330134805e+05, -1.851336315936045e+05, -1.854036506389008e+05, -1.856671178045276e+05, -1.859242494189175e+05,
- -1.861752512373982e+05, -1.864203190940605e+05, -1.866596395441965e+05, -1.868933904361797e+05, -1.871217414439798e+05,
- -1.873448545597181e+05, -1.875628845497949e+05, -1.877759793777614e+05, -1.879842805968002e+05, -1.881879237143891e+05,
- -1.883870385314671e+05, -1.885817494582212e+05, -1.887721758083808e+05, -1.889584320737580e+05, -1.891406281805953e+05,
- -1.893188697291698e+05, -1.894932582279368e+05, -1.896638912710211e+05, -1.898308627834840e+05, -1.899942631021691e+05,
- -1.901541793693283e+05, -1.903106954415018e+05, -1.904638921821692e+05, -1.906138475758131e+05, -1.907606368632203e+05,
- -1.909043326689395e+05, -1.910450051214393e+05, -1.911827219664567e+05, -1.913175486739974e+05, -1.914495485394032e+05,
- -1.915787827788818e+05, -1.917053106198540e+05, -1.918291893864535e+05, -1.919504745804866e+05, -1.920692199581378e+05,
- -1.921854776026847e+05, -1.922992979934711e+05, -1.924107300713634e+05, -1.925198213009045e+05, -1.926266177293625e+05,
- -1.927311640422681e+05, -1.928335036192077e+05, -1.929336785808932e+05, -1.930317298400525e+05, -1.931276971468183e+05,
- -1.932216191325992e+05, -1.933135333519027e+05, -1.934034763222176e+05, -1.934914835620679e+05, -1.935775896273396e+05,
- -1.936618281459620e+05, -1.937442318510482e+05, -1.938248326125638e+05, -1.939036614676054e+05, -1.939807486493619e+05,
- -1.940561236148284e+05, -1.941298150713291e+05, -1.942018510019228e+05, -1.942722586897321e+05, -1.943410647412624e+05,
- -1.944082951087539e+05, -1.944739751116180e+05, -1.945381294569998e+05, -1.946007822595103e+05, -1.946619570601692e+05,
- -1.947216768445938e+05, -1.947799640604720e+05, -1.948368406343504e+05, -1.948923279690751e+05, -1.949464470329384e+05,
- -1.949992182658580e+05, -1.950506616651152e+05, -1.951007967815966e+05, -1.951496427330957e+05, -1.951972182171175e+05,
- -1.952435415232149e+05, -1.952886305448713e+05, -1.953325027909544e+05, -1.953751753967557e+05, -1.954166651346368e+05,
- -1.954569884242958e+05, -1.954961613426741e+05, -1.955341996335142e+05, -1.955711187197561e+05, -1.956069336999116e+05,
- -1.956416593752500e+05, -1.956753102458633e+05, -1.957079005217190e+05, -1.957394441304212e+05, -1.957699547247095e+05,
- -1.957994456897105e+05, -1.958279301499507e+05, -1.958554209761406e+05, -1.958819307917373e+05, -1.959074719792962e+05,
- -1.959320566866182e+05, -1.959556968327024e+05, -1.959784041135088e+05, -1.960001900075403e+05, -1.960210657812510e+05,
- -1.960410424942859e+05, -1.960601310045582e+05, -1.960783419731726e+05, -1.960956858691965e+05, -1.961121729742886e+05,
- -1.961278133871867e+05, -1.961426170280617e+05, -1.961565936427420e+05, -1.961697528068140e+05, -1.961821039296002e+05,
- -1.961936562580217e+05, -1.962044188803510e+05, -1.962144007298518e+05, -1.962236105883187e+05, -1.962320570849665e+05,
- -1.962397487181789e+05, -1.962466938308356e+05, -1.962529006322637e+05, -1.962583771965625e+05, -1.962631314655833e+05,
- -1.962671712518309e+05, -1.962705042412812e+05, -1.962731379961243e+05, -1.962750799574327e+05, -1.962763374477583e+05,
- -1.962769176736579e+05, -1.962768277281535e+05, -1.962760745931249e+05, -1.962746651416431e+05, -1.962726061402370e+05,
- -1.962699042511057e+05, -1.962665660342716e+05, -1.962625979496765e+05, -1.962580063592263e+05, -1.962527975287825e+05,
- -1.962469776301020e+05, -1.962405527427293e+05, -1.962335288558400e+05, -1.962259118700403e+05, -1.962177075991170e+05,
- -1.962089217717503e+05, -1.961995600331796e+05, -1.961896279468305e+05, -1.961791309959017e+05, -1.961680745849136e+05,
- -1.961564640412187e+05, -1.961443046164762e+05, -1.961316014880922e+05, -1.961183597606240e+05, -1.961045844671520e+05,
- -1.960902805706196e+05, -1.960754529651396e+05, -1.960601064772749e+05, -1.960442458672810e+05, -1.960278758303319e+05,
- -1.960110009977039e+05, -1.959936259379445e+05, -1.959757551580058e+05, -1.959573931043575e+05, -1.959385441640729e+05,
- -1.959192126658905e+05, -1.958994028812507e+05, -1.958791190253130e+05, -1.958583652579456e+05, -1.958371456846971e+05,
- -1.958154643577456e+05, -1.957933252768267e+05, -1.957707323901406e+05, -1.957476895952439e+05, -1.957242007399127e+05,
- -1.957002696229994e+05, -1.956758999952603e+05, -1.956510955601730e+05, -1.956258599747320e+05, -1.956001968502297e+05,
- -1.955741097530214e+05, -1.955476022052704e+05, -1.955206776856835e+05, -1.954933396302273e+05, -1.954655914328292e+05,
- -1.954374364460669e+05, -1.954088779818422e+05, -1.953799193120388e+05, -1.953505636691723e+05, -1.953208142470208e+05,
- -1.952906742012486e+05, -1.952601466500107e+05, -1.952292346745531e+05, -1.951979413197929e+05, -1.951662695948955e+05,
- -1.951342224738321e+05, -1.951018028959315e+05, -1.950690137664201e+05, -1.950358579569513e+05, -1.950023383061217e+05,
- -1.949684576199830e+05, -1.949342186725390e+05, -1.948996242062355e+05, -1.948646769324397e+05, -1.948293795319122e+05,
- -1.947937346552679e+05, -1.947577449234284e+05, -1.947214129280686e+05, -1.946847412320525e+05, -1.946477323698590e+05,
- -1.946103888480050e+05, -1.945727131454567e+05, -1.945347077140335e+05, -1.944963749788066e+05, -1.944577173384884e+05,
- -1.944187371658143e+05, -1.943794368079211e+05, -1.943398185867139e+05, -1.942998847992299e+05, -1.942596377179932e+05,
- -1.942190795913649e+05, -1.941782126438866e+05, -1.941370390766178e+05, -1.940955610674652e+05, -1.940537807715108e+05,
- -1.940117003213300e+05, -1.939693218273050e+05, -1.939266473779354e+05, -1.938836790401385e+05, -1.938404188595505e+05,
- -1.937968688608160e+05, -1.937530310478788e+05, -1.937089074042611e+05, -1.936644998933450e+05, -1.936198104586437e+05,
- -1.935748410240694e+05, -1.935295934941994e+05, -1.934840697545348e+05, -1.934382716717544e+05, -1.933922010939672e+05,
- -1.933458598509580e+05, -1.932992497544311e+05, -1.932523725982485e+05, -1.932052301586635e+05, -1.931578241945527e+05,
- -1.931101564476429e+05, -1.930622286427340e+05, -1.930140424879183e+05, -1.929655996747971e+05, -1.929169018786938e+05,
- -1.928679507588611e+05, -1.928187479586893e+05, -1.927692951059068e+05, -1.927195938127800e+05, -1.926696456763097e+05,
- -1.926194522784232e+05, -1.925690151861654e+05, -1.925183359518851e+05, -1.924674161134174e+05, -1.924162571942677e+05,
- -1.923648607037878e+05, -1.923132281373526e+05, -1.922613609765313e+05, -1.922092606892591e+05, -1.921569287300036e+05,
- -1.921043665399310e+05, -1.920515755470661e+05, -1.919985571664536e+05, -1.919453128003168e+05, -1.918918438382104e+05,
- -1.918381516571738e+05, -1.917842376218819e+05, -1.917301030847936e+05, -1.916757493862962e+05, -1.916211778548512e+05,
- -1.915663898071339e+05, -1.915113865481736e+05, -1.914561693714923e+05, -1.914007395592371e+05, -1.913450983823168e+05,
- -1.912892471005312e+05, -1.912331869627011e+05, -1.911769192067969e+05, -1.911204450600627e+05, -1.910637657391413e+05,
- -1.910068824501956e+05, -1.909497963890309e+05, -1.908925087412098e+05, -1.908350206821740e+05, -1.907773333773541e+05,
- -1.907194479822889e+05, -1.906613656427329e+05, -1.906030874947681e+05, -1.905446146649146e+05, -1.904859482702359e+05,
- -1.904270894184442e+05, -1.903680392080076e+05, -1.903087987282502e+05, -1.902493690594551e+05, -1.901897512729623e+05,
- -1.901299464312717e+05, -1.900699555881355e+05, -1.900097797886566e+05, -1.899494200693834e+05, -1.898888774584029e+05,
- -1.898281529754313e+05, -1.897672476319073e+05, -1.897061624310788e+05, -1.896448983680952e+05, -1.895834564300902e+05,
- -1.895218375962696e+05, -1.894600428379985e+05, -1.893980731188802e+05, -1.893359293948434e+05, -1.892736126142202e+05,
- -1.892111237178290e+05, -1.891484636390525e+05, -1.890856333039160e+05, -1.890226336311655e+05, -1.889594655323431e+05,
- -1.888961299118620e+05, -1.888326276670816e+05, -1.887689596883816e+05, -1.887051268592314e+05, -1.886411300562645e+05,
- -1.885769701493472e+05, -1.885126480016483e+05, -1.884481644697102e+05, -1.883835204035116e+05, -1.883187166465408e+05,
- -1.882537540358559e+05, -1.881886334021534e+05, -1.881233555698324e+05, -1.880579213570563e+05, -1.879923315758186e+05,
- -1.879265870320015e+05, -1.878606885254395e+05, -1.877946368499793e+05, -1.877284327935386e+05, -1.876620771381654e+05,
- -1.875955706600980e+05, -1.875289141298202e+05, -1.874621083121176e+05, -1.873951539661374e+05, -1.873280518454389e+05,
- -1.872608026980525e+05, -1.871934072665305e+05, -1.871258662880023e+05, -1.870581804942270e+05, -1.869903506116449e+05,
- -1.869223773614286e+05, -1.868542614595348e+05, -1.867860036167543e+05, -1.867176045387610e+05, -1.866490649261612e+05,
- -1.865803854745428e+05, -1.865115668745220e+05, -1.864426098117912e+05, -1.863735149671646e+05, -1.863042830166268e+05,
- -1.862349146313760e+05, -1.861654104778700e+05, -1.860957712178713e+05, -1.860259975084901e+05, -1.859560900022274e+05,
- -1.858860493470206e+05, -1.858158761862830e+05, -1.857455711589473e+05, -1.856751348995064e+05, -1.856045680380556e+05,
- -1.855338712003318e+05, -1.854630450077544e+05, -1.853920900774651e+05, -1.853210070223653e+05, -1.852497964511578e+05,
- -1.851784589683824e+05, -1.851069951744551e+05, -1.850354056657062e+05, -1.849636910344138e+05, -1.848918518688453e+05,
- -1.848198887532895e+05, -1.847478022680960e+05, -1.846755929897052e+05, -1.846032614906899e+05, -1.845308083397846e+05
- },
- {
- 4.479550857208960e+04, 4.323469258339491e+04, 4.165466336746298e+04, 4.005478686833201e+04, 3.843439462818020e+04,
- 3.679278124949956e+04, 3.512920161744067e+04, 3.344286785273626e+04, 3.173294596519273e+04, 2.999855217032275e+04,
- 2.823874882807753e+04, 2.645253995615391e+04, 2.463886626339589e+04, 2.279659964061707e+04, 2.092453703658148e+04,
- 1.902139363564054e+04, 1.708579524032563e+04, 1.511626974665037e+04, 1.311123758176098e+04, 1.106900095162789e+04,
- 8.987731721751059e+03, 6.865457723374632e+03, 4.700047242887724e+03, 2.489191410723351e+03, 2.303841578597527e+02,
- -2.079100645910106e+03, -4.442235335699490e+03, -6.862268377367741e+03, -9.342758713411435e+03, -1.188761520137405e+04,
- -1.450114193437441e+04, -1.718809030859988e+04, -1.995371871212594e+04, -2.280386080965038e+04, -2.574500308538336e+04,
- -2.878437210413679e+04, -3.193003107950489e+04, -3.519098385270774e+04, -3.857728157139412e+04, -4.210012227358130e+04,
- -4.577192453761114e+04, -4.960634051723105e+04, -5.361814653420170e+04, -5.782290467937085e+04, -6.223622069753599e+04,
- -6.687233550312778e+04, -7.174171756590325e+04, -7.684737991976016e+04, -8.217999490094141e+04, -8.771251911074221e+04,
- -9.339545517972173e+04, -9.915362889636282e+04, -1.048858728435299e+05, -1.104719335925171e+05, -1.157913254416541e+05,
- -1.207501981156212e+05, -1.253025511920398e+05, -1.294380985119644e+05, -1.331726888452053e+05, -1.365378929325672e+05,
- -1.395719104896798e+05, -1.423138379262768e+05, -1.448005429329999e+05, -1.470652064488142e+05, -1.491368494944543e+05,
- -1.510404106932869e+05, -1.527971036845789e+05, -1.544248874580907e+05, -1.559389521220548e+05, -1.573521692629867e+05,
- -1.586754854827563e+05, -1.599182545212800e+05, -1.610885118398753e+05, -1.621931990234506e+05, -1.632383461576744e+05,
- -1.642292198449140e+05, -1.651704435153852e+05, -1.660660955663028e+05, -1.669197898082219e+05, -1.677347417873978e+05,
- -1.685138238017228e+05, -1.692596108250946e+05, -1.699744190799867e+05, -1.706603386274760e+05, -1.713192610566486e+05,
- -1.719529031328820e+05, -1.725628270921311e+05, -1.731504581343386e+05, -1.737170995643438e+05, -1.742639459463271e+05,
- -1.747920945726066e+05, -1.753025554955913e+05, -1.757962603298970e+05, -1.762740699977903e+05, -1.767367815635502e+05,
- -1.771851342797044e+05, -1.776198149494188e+05, -1.780414626938236e+05, -1.784506732001131e+05, -1.788480025154314e+05,
- -1.792339704424311e+05, -1.796090635846789e+05, -1.799737380835649e+05, -1.803284220828079e+05, -1.806735179519086e+05,
- -1.810094042958581e+05, -1.813364377749266e+05, -1.816549547553693e+05, -1.819652728093145e+05, -1.822676920798694e+05,
- -1.825624965255587e+05, -1.828499550524577e+05, -1.831303225698268e+05, -1.834038409160599e+05, -1.836707397486599e+05,
- -1.839312373411447e+05, -1.841855413199897e+05, -1.844338493432263e+05, -1.846763497261212e+05, -1.849132220187800e+05,
- -1.851446375400168e+05, -1.853707598713822e+05, -1.855917453148491e+05, -1.858077433172994e+05, -1.860188968646492e+05,
- -1.862253428481706e+05, -1.864272124053205e+05, -1.866246312371647e+05, -1.868177199043003e+05, -1.870065941029835e+05,
- -1.871913649326992e+05, -1.873721390990275e+05, -1.875490192045159e+05, -1.877221039057895e+05, -1.878914880721283e+05,
- -1.880572631602982e+05, -1.882195171522402e+05, -1.883783348516031e+05, -1.885337980093053e+05, -1.886859854684055e+05,
- -1.888349733005095e+05, -1.889808349342866e+05, -1.891236412766463e+05, -1.892634608270640e+05, -1.894003597855168e+05,
- -1.895344021544517e+05, -1.896656498351741e+05, -1.897941627190245e+05, -1.899199987736673e+05, -1.900432141248112e+05,
- -1.901638631336409e+05, -1.902819984702295e+05, -1.903976711831811e+05, -1.905109307657252e+05, -1.906218252184862e+05,
- -1.907304011085256e+05, -1.908367036284696e+05, -1.909407766466773e+05, -1.910426627611136e+05, -1.911424033475337e+05,
- -1.912400386060001e+05, -1.913356076052154e+05, -1.914291483247799e+05, -1.915206976954991e+05, -1.916102916378403e+05,
- -1.916979650986467e+05, -1.917837520861943e+05, -1.918676857036876e+05, -1.919497981812736e+05, -1.920301209066497e+05,
- -1.921086844543435e+05, -1.921855186137304e+05, -1.922606524158513e+05, -1.923341141590978e+05, -1.924059314338138e+05,
- -1.924761311458763e+05, -1.925447395392964e+05, -1.926117822178975e+05, -1.926772841661106e+05, -1.927412697689297e+05,
- -1.928037628310707e+05, -1.928647865953660e+05, -1.929243637604383e+05, -1.929825164976823e+05, -1.930392664477731e+05,
- -1.930946348144018e+05, -1.931486422640915e+05, -1.932013090164068e+05, -1.932526548392935e+05, -1.933026990625317e+05,
- -1.933514605906937e+05, -1.933989579156195e+05, -1.934452091284420e+05, -1.934902319311726e+05, -1.935340436478713e+05,
- -1.935766612354176e+05, -1.936181012938977e+05, -1.936583800766275e+05, -1.936975134998231e+05, -1.937355171519372e+05,
- -1.937724063026718e+05, -1.938081959153714e+05, -1.938429006408296e+05, -1.938765348470821e+05, -1.939091126129674e+05,
- -1.939406477392495e+05, -1.939711537559563e+05, -1.940006439294741e+05, -1.940291312694143e+05, -1.940566285352531e+05,
- -1.940831482427596e+05, -1.941087026702157e+05, -1.941333038644402e+05, -1.941569636466196e+05, -1.941796936179588e+05,
- -1.942015051651506e+05, -1.942224094656818e+05, -1.942424174929677e+05, -1.942615400213378e+05, -1.942797876308610e+05,
- -1.942971707120310e+05, -1.943136994703076e+05, -1.943293839305237e+05, -1.943442339411580e+05, -1.943582591784870e+05,
- -1.943714691506091e+05, -1.943838732013557e+05, -1.943954805140839e+05, -1.944063001153661e+05, -1.944163408732719e+05,
- -1.944256115222108e+05, -1.944341206340230e+05, -1.944418766429332e+05, -1.944488878432927e+05, -1.944551623926832e+05,
- -1.944607083149330e+05, -1.944655335030501e+05, -1.944696457220767e+05, -1.944730526118638e+05, -1.944757616897704e+05,
- -1.944777803532925e+05, -1.944791158826194e+05, -1.944797754431204e+05, -1.944797660877710e+05, -1.944790947595076e+05,
- -1.944777682935279e+05, -1.944757934195241e+05, -1.944731767638644e+05, -1.944699248517138e+05, -1.944660441091030e+05,
- -1.944615408649424e+05, -1.944564213529863e+05, -1.944506917137469e+05, -1.944443579963608e+05, -1.944374261604062e+05,
- -1.944299020776798e+05, -1.944217915339237e+05, -1.944131002305150e+05, -1.944038337861098e+05, -1.943939977382490e+05,
- -1.943835975449275e+05, -1.943726385861191e+05, -1.943611261652708e+05, -1.943490655107591e+05, -1.943364617773111e+05,
- -1.943233200473914e+05, -1.943096453325591e+05, -1.942954425747910e+05, -1.942807166477719e+05, -1.942654723581584e+05,
- -1.942497144468137e+05, -1.942334475900090e+05, -1.942166764006026e+05, -1.941994054291906e+05, -1.941816391652304e+05,
- -1.941633820381383e+05, -1.941446384183661e+05, -1.941254126184478e+05, -1.941057088940296e+05, -1.940855314448713e+05,
- -1.940648844158292e+05, -1.940437718978143e+05, -1.940221979287334e+05, -1.940001664944070e+05, -1.939776815294667e+05,
- -1.939547469182363e+05, -1.939313664955901e+05, -1.939075440477966e+05, -1.938832833133414e+05, -1.938585879837334e+05,
- -1.938334617042937e+05, -1.938079080749315e+05, -1.937819306508961e+05, -1.937555329435212e+05, -1.937287184209481e+05,
- -1.937014905088375e+05, -1.936738525910653e+05, -1.936458080104023e+05, -1.936173600691842e+05, -1.935885120299637e+05,
- -1.935592671161522e+05, -1.935296285126469e+05, -1.934995993664470e+05, -1.934691827872565e+05, -1.934383818480730e+05,
- -1.934071995857706e+05, -1.933756390016634e+05, -1.933437030620661e+05, -1.933113946988362e+05, -1.932787168099110e+05,
- -1.932456722598324e+05, -1.932122638802592e+05, -1.931784944704737e+05, -1.931443667978756e+05, -1.931098835984679e+05,
- -1.930750475773315e+05, -1.930398614090948e+05, -1.930043277383886e+05, -1.929684491802989e+05, -1.929322283208054e+05,
- -1.928956677172169e+05, -1.928587698985934e+05, -1.928215373661649e+05, -1.927839725937405e+05, -1.927460780281085e+05,
- -1.927078560894336e+05, -1.926693091716409e+05, -1.926304396427976e+05, -1.925912498454865e+05, -1.925517420971714e+05,
- -1.925119186905576e+05, -1.924717818939447e+05, -1.924313339515742e+05, -1.923905770839699e+05, -1.923495134882735e+05,
- -1.923081453385726e+05, -1.922664747862239e+05, -1.922245039601716e+05, -1.921822349672579e+05, -1.921396698925298e+05,
- -1.920968107995425e+05, -1.920536597306517e+05, -1.920102187073055e+05, -1.919664897303321e+05, -1.919224747802195e+05,
- -1.918781758173913e+05, -1.918335947824772e+05, -1.917887335965830e+05, -1.917435941615495e+05, -1.916981783602118e+05,
- -1.916524880566542e+05, -1.916065250964579e+05, -1.915602913069453e+05, -1.915137884974246e+05, -1.914670184594231e+05,
- -1.914199829669227e+05, -1.913726837765888e+05, -1.913251226279959e+05, -1.912773012438495e+05, -1.912292213302047e+05,
- -1.911808845766803e+05, -1.911322926566713e+05, -1.910834472275559e+05, -1.910343499309000e+05, -1.909850023926603e+05,
- -1.909354062233795e+05, -1.908855630183834e+05, -1.908354743579727e+05, -1.907851418076113e+05, -1.907345669181113e+05,
- -1.906837512258178e+05, -1.906326962527891e+05, -1.905814035069701e+05, -1.905298744823729e+05, -1.904781106592442e+05,
- -1.904261135042353e+05, -1.903738844705703e+05, -1.903214249982082e+05, -1.902687365140056e+05, -1.902158204318746e+05,
- -1.901626781529425e+05, -1.901093110657008e+05, -1.900557205461621e+05, -1.900019079580070e+05, -1.899478746527330e+05,
- -1.898936219697986e+05, -1.898391512367662e+05, -1.897844637694434e+05, -1.897295608720236e+05, -1.896744438372187e+05,
- -1.896191139463985e+05, -1.895635724697194e+05, -1.895078206662574e+05, -1.894518597841378e+05, -1.893956910606596e+05,
- -1.893393157224224e+05, -1.892827349854497e+05, -1.892259500553109e+05, -1.891689621272395e+05, -1.891117723862521e+05,
- -1.890543820072663e+05, -1.889967921552137e+05, -1.889390039851516e+05, -1.888810186423793e+05, -1.888228372625436e+05,
- -1.887644609717488e+05, -1.887058908866633e+05, -1.886471281146266e+05, -1.885881737537505e+05, -1.885290288930232e+05,
- -1.884696946124101e+05, -1.884101719829537e+05, -1.883504620668715e+05, -1.882905659176525e+05, -1.882304845801534e+05,
- -1.881702190906930e+05, -1.881097704771447e+05, -1.880491397590275e+05, -1.879883279475992e+05, -1.879273360459415e+05,
- -1.878661650490524e+05, -1.878048159439294e+05, -1.877432897096574e+05, -1.876815873174923e+05, -1.876197097309448e+05,
- -1.875576579058623e+05, -1.874954327905104e+05, -1.874330353256533e+05, -1.873704664446315e+05, -1.873077270734415e+05,
- -1.872448181308115e+05, -1.871817405282791e+05, -1.871184951702643e+05, -1.870550829541440e+05, -1.869915047703256e+05,
- -1.869277615023195e+05, -1.868638540268083e+05, -1.867997832137200e+05, -1.867355499262941e+05, -1.866711550211531e+05,
- -1.866065993483673e+05, -1.865418837515233e+05, -1.864770090677898e+05, -1.864119761279816e+05, -1.863467857566246e+05,
- -1.862814387720191e+05, -1.862159359863020e+05, -1.861502782055087e+05, -1.860844662296343e+05, -1.860185008526947e+05,
- -1.859523828627838e+05, -1.858861130421350e+05, -1.858196921671767e+05, -1.857531210085921e+05, -1.856864003313732e+05,
- -1.856195308948791e+05, -1.855525134528901e+05, -1.854853487536614e+05, -1.854180375399790e+05, -1.853505805492110e+05,
- -1.852829785133617e+05, -1.852152321591220e+05, -1.851473422079228e+05, -1.850793093759825e+05, -1.850111343743613e+05,
- -1.849428179090058e+05, -1.848743606808031e+05, -1.848057633856239e+05, -1.847370267143752e+05, -1.846681513530428e+05,
- -1.845991379827415e+05, -1.845299872797597e+05, -1.844606999156038e+05, -1.843912765570455e+05, -1.843217178661640e+05,
- -1.842520245003920e+05, -1.841821971125571e+05, -1.841122363509263e+05, -1.840421428592470e+05, -1.839719172767898e+05,
- -1.839015602383897e+05, -1.838310723744881e+05, -1.837604543111699e+05, -1.836897066702070e+05, -1.836188300690981e+05,
- -1.835478251211030e+05, -1.834766924352877e+05, -1.834054326165568e+05, -1.833340462656959e+05, -1.832625339794050e+05,
- -1.831908963503393e+05, -1.831191339671417e+05, -1.830472474144826e+05, -1.829752372730925e+05, -1.829031041197992e+05
- },
- {
- 4.569073930108565e+04, 4.414045725916783e+04, 4.257135424649754e+04, 4.098281967349993e+04, 3.937421046113632e+04,
- 3.774484869882437e+04, 3.609401908676824e+04, 3.442096613663814e+04, 3.272489110472038e+04, 3.100494862494426e+04,
- 2.926024300642404e+04, 2.748982415468067e+04, 2.569268306996386e+04, 2.386774686936163e+04, 2.201387327155770e+04,
- 2.012984447398986e+04, 1.821436034155416e+04, 1.626603081363392e+04, 1.428336742181108e+04, 1.226477379375835e+04,
- 1.020853499951960e+04, 8.112805572808897e+03, 5.975596014784461e+03, 3.794757556135735e+03, 1.567964919028608e+03,
- -7.073032193776428e+02, -3.033786402150852e+03, -5.414467609729673e+03, -7.852601933609595e+03, -1.035174923261583e+04,
- -1.291581128569096e+04, -1.554907402048066e+04, -1.825625534463617e+04, -2.104255913815550e+04, -2.391373562879918e+04,
- -2.687614813425839e+04, -2.993684535935984e+04, -3.310363717451649e+04, -3.638516955051330e+04, -3.979099046019723e+04,
- -4.333159199235744e+04, -4.701840290689525e+04, -5.086368772327054e+04, -5.488027959196223e+04, -5.908103132514931e+04,
- -6.347781360606218e+04, -6.807983996811739e+04, -7.289111018852850e+04, -7.790693616554802e+04, -8.310990808472877e+04,
- -8.846609050861324e+04, -9.392229154922691e+04, -9.940506451408232e+04, -1.048228719141936e+05, -1.100743968092864e+05,
- -1.150643344314581e+05, -1.197222315461724e+05, -1.240146790917013e+05, -1.279352439669842e+05, -1.314979769839987e+05,
- -1.347292505770824e+05, -1.376608534234542e+05, -1.403255626251023e+05, -1.427546651887688e+05, -1.449767362309655e+05,
- -1.470171655454925e+05, -1.488981154181420e+05, -1.506387157619305e+05, -1.522553747897153e+05, -1.537621288770748e+05,
- -1.551709864339554e+05, -1.564922420739312e+05, -1.577347512916584e+05, -1.589061640929295e+05, -1.600131203433852e+05,
- -1.610614114755236e+05, -1.620561136681885e+05, -1.630016973652020e+05, -1.639021174337190e+05, -1.647608876023348e+05,
- -1.655811421785677e+05, -1.663656874764044e+05, -1.671170449036301e+05, -1.678374872645061e+05, -1.685290695166066e+05,
- -1.691936549692802e+05, -1.698329377131602e+05, -1.704484619146552e+05, -1.710416384872400e+05, -1.716137595553379e+05,
- -1.721660110507035e+05, -1.726994837209843e+05, -1.732151827820285e+05, -1.737140364068059e+05, -1.741969032124952e+05,
- -1.746645788817448e+05, -1.751178020331737e+05, -1.755572594388796e+05, -1.759835906723509e+05, -1.763973922581945e+05,
- -1.767992213850256e+05, -1.771895992343788e+05, -1.775690139713364e+05, -1.779379234364575e+05, -1.782967575734094e+05,
- -1.786459206222485e+05, -1.789857931045024e+05, -1.793167336229129e+05, -1.796390804918754e+05, -1.799531532406339e+05,
- -1.802592539427003e+05, -1.805576684690940e+05, -1.808486676135645e+05, -1.811325081264412e+05, -1.814094336621843e+05,
- -1.816796756490442e+05, -1.819434540883156e+05, -1.822009782898483e+05, -1.824524475497667e+05, -1.826980517757185e+05,
- -1.829379720644115e+05, -1.831723812357101e+05, -1.834014443271269e+05, -1.836253190521594e+05, -1.838441562255736e+05,
- -1.840581001584406e+05, -1.842672890254549e+05, -1.844718552068236e+05, -1.846719256067948e+05, -1.848676219507102e+05,
- -1.850590610723039e+05, -1.852463551348447e+05, -1.854296119306727e+05, -1.856089350741643e+05, -1.857844242159377e+05,
- -1.859561751324910e+05, -1.861242802833418e+05, -1.862888285180345e+05, -1.864499055099649e+05, -1.866075938523631e+05,
- -1.867619732041385e+05, -1.869131204272233e+05, -1.870611097160063e+05, -1.872060127193853e+05, -1.873478986559474e+05,
- -1.874868344227235e+05, -1.876228846979479e+05, -1.877561120382100e+05, -1.878865769703641e+05, -1.880143380785272e+05,
- -1.881394520864760e+05, -1.882619739357362e+05, -1.883819568596243e+05, -1.884994524534908e+05, -1.886145107407438e+05,
- -1.887271802388750e+05, -1.888375080154748e+05, -1.889455397482919e+05, -1.890513197789114e+05, -1.891548911645403e+05,
- -1.892562957273065e+05, -1.893555741012223e+05, -1.894527657769350e+05, -1.895479091443960e+05, -1.896410415335566e+05,
- -1.897321992532036e+05, -1.898214176280331e+05, -1.899087310340562e+05, -1.899941729324293e+05, -1.900777759017891e+05,
- -1.901595716691699e+05, -1.902395911395831e+05, -1.903178644243182e+05, -1.903944208680396e+05, -1.904692890747342e+05,
- -1.905424969325702e+05, -1.906140716377228e+05, -1.906840397172129e+05, -1.907524270508124e+05, -1.908192588920604e+05,
- -1.908845598884296e+05, -1.909483541006883e+05, -1.910106650214934e+05, -1.910715155932531e+05, -1.911309282055436e+05,
- -1.911889247893629e+05, -1.912455267181728e+05, -1.913007548985230e+05, -1.913546297661789e+05, -1.914071713002524e+05,
- -1.914583990368012e+05, -1.915083320819262e+05, -1.915569891243894e+05, -1.916043884477670e+05, -1.916505479421660e+05,
- -1.916954851155164e+05, -1.917392171044614e+05, -1.917817606848615e+05, -1.918231322819273e+05, -1.918633479800001e+05,
- -1.919024235319898e+05, -1.919403743684907e+05, -1.919772156065820e+05, -1.920129620583311e+05, -1.920476282432655e+05,
- -1.920812283794465e+05, -1.921137764161958e+05, -1.921452860249795e+05, -1.921757706106780e+05, -1.922052433185278e+05,
- -1.922337170408368e+05, -1.922612044234859e+05, -1.922877178722188e+05, -1.923132695587355e+05, -1.923378714265875e+05,
- -1.923615351968938e+05, -1.923842723738739e+05, -1.924060942502105e+05, -1.924270119122477e+05, -1.924470362450273e+05,
- -1.924661779371746e+05, -1.924844474856344e+05, -1.925018552002645e+05, -1.925184112082921e+05, -1.925341254586387e+05,
- -1.925490077261144e+05, -1.925630676154919e+05, -1.925763145654601e+05, -1.925887578524631e+05, -1.926004065944270e+05,
- -1.926112697485168e+05, -1.926213561382861e+05, -1.926306744214215e+05, -1.926392331169791e+05, -1.926470406026038e+05,
- -1.926541051176700e+05, -1.926604347663303e+05, -1.926660375204839e+05, -1.926709212226638e+05, -1.926750935888406e+05,
- -1.926785622111575e+05, -1.926813345605829e+05, -1.926834179895001e+05, -1.926848197342237e+05, -1.926855469174480e+05,
- -1.926856065506348e+05, -1.926850055363342e+05, -1.926837506704490e+05, -1.926818486444365e+05, -1.926793060474550e+05,
- -1.926761293684582e+05, -1.926723249982283e+05, -1.926678992313660e+05, -1.926628582682247e+05, -1.926572082167973e+05,
- -1.926509550945578e+05, -1.926441048302535e+05, -1.926366632656542e+05, -1.926286361572614e+05, -1.926200291779693e+05,
- -1.926108479186902e+05, -1.926010978899406e+05, -1.925907845233833e+05, -1.925799131733408e+05, -1.925684891182634e+05,
- -1.925565175621716e+05, -1.925440036360551e+05, -1.925309523992469e+05, -1.925173688407599e+05, -1.925032578805935e+05,
- -1.924886243710121e+05, -1.924734730977887e+05, -1.924578087814274e+05, -1.924416360783508e+05, -1.924249595820635e+05,
- -1.924077838242912e+05, -1.923901132760880e+05, -1.923719523489260e+05, -1.923533053957549e+05, -1.923341767120411e+05,
- -1.923145705367810e+05, -1.922944910534967e+05, -1.922739423912032e+05, -1.922529286253602e+05, -1.922314537788007e+05,
- -1.922095218226374e+05, -1.921871366771552e+05, -1.921643022126782e+05, -1.921410222504215e+05, -1.921173005633254e+05,
- -1.920931408768692e+05, -1.920685468698704e+05, -1.920435221752661e+05, -1.920180703808762e+05, -1.919921950301550e+05,
- -1.919658996229222e+05, -1.919391876160830e+05, -1.919120624243304e+05, -1.918845274208339e+05, -1.918565859379154e+05,
- -1.918282412677106e+05, -1.917994966628143e+05, -1.917703553369193e+05, -1.917408204654337e+05, -1.917108951860940e+05,
- -1.916805825995607e+05, -1.916498857700042e+05, -1.916188077256782e+05, -1.915873514594838e+05, -1.915555199295188e+05,
- -1.915233160596203e+05, -1.914907427398948e+05, -1.914578028272375e+05, -1.914244991458421e+05, -1.913908344877026e+05,
- -1.913568116131009e+05, -1.913224332510917e+05, -1.912877020999713e+05, -1.912526208277429e+05, -1.912171920725703e+05,
- -1.911814184432226e+05, -1.911453025195140e+05, -1.911088468527317e+05, -1.910720539660579e+05, -1.910349263549822e+05,
- -1.909974664877092e+05, -1.909596768055564e+05, -1.909215597233451e+05, -1.908831176297846e+05, -1.908443528878501e+05,
- -1.908052678351517e+05, -1.907658647843002e+05, -1.907261460232610e+05, -1.906861138157081e+05, -1.906457704013662e+05,
- -1.906051179963511e+05, -1.905641587934995e+05, -1.905228949626979e+05, -1.904813286512031e+05, -1.904394619839555e+05,
- -1.903972970638910e+05, -1.903548359722435e+05, -1.903120807688458e+05, -1.902690334924208e+05, -1.902256961608740e+05,
- -1.901820707715745e+05, -1.901381593016338e+05, -1.900939637081827e+05, -1.900494859286383e+05, -1.900047278809696e+05,
- -1.899596914639605e+05, -1.899143785574629e+05, -1.898687910226494e+05, -1.898229307022623e+05, -1.897767994208569e+05,
- -1.897303989850393e+05, -1.896837311837042e+05, -1.896367977882666e+05, -1.895896005528884e+05, -1.895421412147019e+05,
- -1.894944214940349e+05, -1.894464430946218e+05, -1.893982077038223e+05, -1.893497169928271e+05, -1.893009726168681e+05,
- -1.892519762154197e+05, -1.892027294124004e+05, -1.891532338163683e+05, -1.891034910207151e+05, -1.890535026038586e+05,
- -1.890032701294291e+05, -1.889527951464535e+05, -1.889020791895393e+05, -1.888511237790516e+05, -1.887999304212916e+05,
- -1.887485006086671e+05, -1.886968358198678e+05, -1.886449375200281e+05, -1.885928071608984e+05, -1.885404461810042e+05,
- -1.884878560058080e+05, -1.884350380478680e+05, -1.883819937069938e+05, -1.883287243703993e+05, -1.882752314128544e+05,
- -1.882215161968331e+05, -1.881675800726617e+05, -1.881134243786613e+05, -1.880590504412913e+05, -1.880044595752900e+05,
- -1.879496530838110e+05, -1.878946322585616e+05, -1.878393983799352e+05, -1.877839527171426e+05, -1.877282965283461e+05,
- -1.876724310607829e+05, -1.876163575508944e+05, -1.875600772244509e+05, -1.875035912966726e+05, -1.874469009723525e+05,
- -1.873900074459748e+05, -1.873329119018323e+05, -1.872756155141422e+05, -1.872181194471618e+05, -1.871604248552987e+05,
- -1.871025328832245e+05, -1.870444446659826e+05, -1.869861613290958e+05, -1.869276839886740e+05, -1.868690137515182e+05,
- -1.868101517152246e+05, -1.867510989682863e+05, -1.866918565901939e+05, -1.866324256515345e+05, -1.865728072140893e+05,
- -1.865130023309321e+05, -1.864530120465214e+05, -1.863928373967970e+05, -1.863324794092704e+05, -1.862719391031178e+05,
- -1.862112174892700e+05, -1.861503155704997e+05, -1.860892343415105e+05, -1.860279747890249e+05, -1.859665378918654e+05,
- -1.859049246210432e+05, -1.858431359398380e+05, -1.857811728038829e+05, -1.857190361612426e+05, -1.856567269524938e+05,
- -1.855942461108053e+05, -1.855315945620148e+05, -1.854687732247060e+05, -1.854057830102826e+05, -1.853426248230459e+05,
- -1.852792995602668e+05, -1.852158081122579e+05, -1.851521513624463e+05, -1.850883301874454e+05, -1.850243454571238e+05,
- -1.849601980346737e+05, -1.848958887766801e+05, -1.848314185331886e+05, -1.847667881477707e+05, -1.847019984575908e+05,
- -1.846370502934687e+05, -1.845719444799457e+05, -1.845066818353486e+05, -1.844412631718483e+05, -1.843756892955252e+05,
- -1.843099610064279e+05, -1.842440790986337e+05, -1.841780443603094e+05, -1.841118575737669e+05, -1.840455195155230e+05,
- -1.839790309563582e+05, -1.839123926613683e+05, -1.838456053900249e+05, -1.837786698962284e+05, -1.837115869283625e+05,
- -1.836443572293471e+05, -1.835769815366933e+05, -1.835094605825545e+05, -1.834417950937780e+05, -1.833739857919569e+05,
- -1.833060333934814e+05, -1.832379386095850e+05, -1.831697021463992e+05, -1.831013247049982e+05, -1.830328069814481e+05,
- -1.829641496668560e+05, -1.828953534474143e+05, -1.828264190044503e+05, -1.827573470144693e+05, -1.826881381492009e+05,
- -1.826187930756453e+05, -1.825493124561147e+05, -1.824796969482804e+05, -1.824099472052140e+05, -1.823400638754297e+05,
- -1.822700476029284e+05, -1.821998990272381e+05, -1.821296187834570e+05, -1.820592075022903e+05, -1.819886658100959e+05,
- -1.819179943289201e+05, -1.818471936765397e+05, -1.817762644664981e+05, -1.817052073081481e+05, -1.816340228066851e+05,
- -1.815627115631886e+05, -1.814912741746576e+05, -1.814197112340473e+05, -1.813480233303074e+05, -1.812762110484148e+05
- },
- {
- 4.658693775150731e+04, 4.504707323435106e+04, 4.348877116344112e+04, 4.191144352147035e+04, 4.031447161059469e+04,
- 3.869720389197853e+04, 3.705895363176247e+04, 3.539899633052156e+04, 3.371656691398919e+04, 3.201085665670363e+04,
- 3.028100980819414e+04, 2.852611988670797e+04, 2.674522560076246e+04, 2.493730635330076e+04, 2.310127727687689e+04,
- 2.123598374096341e+04, 1.934019526400339e+04, 1.741259875304723e+04, 1.545179098252474e+04, 1.345627021068801e+04,
- 1.142442681724354e+04, 9.354532828852511e+03, 7.244730178753882e+03, 5.093017525953926e+03, 2.897235433407403e+03,
- 6.550496779943096e+02, -1.636067564518083e+03, -3.978858944237107e+03, -6.376305901816533e+03, -8.831655685553716e+03,
- -1.134845181488352e+04, -1.393056831923451e+04, -1.658224808506169e+04, -1.930814548068629e+04, -2.211337337873021e+04,
- -2.500355410297463e+04, -2.798487340500836e+04, -3.106413537893646e+04, -3.424881447162836e+04, -3.754709779212177e+04,
- -4.096790611426061e+04, -4.452087419952125e+04, -4.821625873589566e+04, -5.206472321326363e+04, -5.607692154947304e+04,
- -6.026276696497569e+04, -6.463023889899319e+04, -6.918357760181953e+04, -7.392079955408929e+04, -7.883069353426924e+04,
- -8.388978384904735e+04, -8.905994462162525e+04, -9.428723892740053e+04, -9.950253161593071e+04, -1.046250874134351e+05,
- -1.095707961982879e+05, -1.142645618540401e+05, -1.186532659612693e+05, -1.227123577290506e+05, -1.264381038007788e+05,
- -1.298429227227084e+05, -1.329490002431371e+05, -1.357829929207343e+05, -1.383725653091939e+05, -1.407444012988865e+05,
- -1.429231805747553e+05, -1.449311346170721e+05, -1.467879418283544e+05, -1.485108183113010e+05, -1.501147151030226e+05,
- -1.516125640177691e+05, -1.530155348909246e+05, -1.543332818432149e+05, -1.555741667476968e+05, -1.567454551424534e+05,
- -1.578534841501051e+05, -1.589038043222300e+05, -1.599012983999051e+05, -1.608502802820459e+05, -1.617545773700971e+05,
- -1.626175991318128e+05, -1.634423943290857e+05, -1.642316989568281e+05, -1.649879765771667e+05, -1.657134524196785e+05,
- -1.664101423562710e+05, -1.670798776448899e+05, -1.677243261632558e+05, -1.683450107155188e+05, -1.689433248846174e+05,
- -1.695205468156000e+05, -1.700778512455543e+05, -1.706163200402168e+05, -1.711369514528331e+05, -1.716406682849689e+05,
- -1.721283250999314e+05, -1.726007146157619e+05, -1.730585733853380e+05, -1.735025868550738e+05, -1.739333938803889e+05,
- -1.743515907649931e+05, -1.747577348816897e+05, -1.751523479245325e+05, -1.755359188354916e+05, -1.759089064431080e+05,
- -1.762717418457763e+05, -1.766248305645023e+05, -1.769685545121897e+05, -1.773032737451533e+05, -1.776293280920552e+05,
- -1.779470386192669e+05, -1.782567089710907e+05, -1.785586265940148e+05, -1.788530638566584e+05, -1.791402790757398e+05,
- -1.794205174572468e+05, -1.796940119609714e+05, -1.799609840956891e+05, -1.802216446514729e+05, -1.804761943749516e+05,
- -1.807248245927051e+05, -1.809677177874602e+05, -1.812050481312681e+05, -1.814369819794288e+05, -1.816636783285473e+05,
- -1.818852892417799e+05, -1.821019602440240e+05, -1.823138306895538e+05, -1.825210341043485e+05, -1.827236985189272e+05,
- -1.829219467094289e+05, -1.831158965641202e+05, -1.833056612851990e+05, -1.834913496445241e+05, -1.836730662104905e+05,
- -1.838509114544211e+05, -1.840249823037385e+05, -1.841953718834602e+05, -1.843621699483711e+05, -1.845254629925483e+05,
- -1.846853344051428e+05, -1.848418646170119e+05, -1.849951312388376e+05, -1.851452091913129e+05, -1.852921708279352e+05,
- -1.854360860509022e+05, -1.855770224205684e+05, -1.857150452588818e+05, -1.858502177471957e+05, -1.859826010188156e+05,
- -1.861122542466160e+05, -1.862392347260354e+05, -1.863635979537441e+05, -1.864853977015164e+05, -1.866046860899946e+05,
- -1.867215136513014e+05, -1.868359293960134e+05, -1.869479808730102e+05, -1.870577142271500e+05, -1.871651742541329e+05,
- -1.872704044527192e+05, -1.873734470744475e+05, -1.874743431710008e+05, -1.875731326393454e+05, -1.876698542647747e+05,
- -1.877645457619647e+05, -1.878572438141571e+05, -1.879479841105671e+05, -1.880368013821118e+05, -1.881237294355510e+05,
- -1.882088011861196e+05, -1.882920486887362e+05, -1.883735031678568e+05, -1.884531950460445e+05, -1.885311539713246e+05,
- -1.886074088433795e+05, -1.886819878386479e+05, -1.887549184343808e+05, -1.888262274317020e+05, -1.888959409777291e+05,
- -1.889640845867958e+05, -1.890306831608169e+05, -1.890957610088449e+05, -1.891593418658467e+05, -1.892214488910885e+05,
- -1.892821047628542e+05, -1.893413315808706e+05, -1.893991509572949e+05, -1.894555840136817e+05, -1.895106513958144e+05,
- -1.895643732879764e+05, -1.896167694266929e+05, -1.896678591139656e+05, -1.897176612300155e+05, -1.897661942455681e+05,
- -1.898134762336879e+05, -1.898595248811899e+05, -1.899043574996433e+05, -1.899479910359865e+05, -1.899904420827653e+05,
- -1.900317268880169e+05, -1.900718613648085e+05, -1.901108611004464e+05, -1.901487413653744e+05, -1.901855171217623e+05,
- -1.902212030318123e+05, -1.902558134657797e+05, -1.902893625146054e+05, -1.903218639780912e+05, -1.903533314008788e+05,
- -1.903837780604905e+05, -1.904132169788170e+05, -1.904416609286874e+05, -1.904691224402294e+05, -1.904956138070243e+05,
- -1.905211470920713e+05, -1.905457341335599e+05, -1.905693865504662e+05, -1.905921157479715e+05, -1.906139329227182e+05,
- -1.906348490678997e+05, -1.906548749782000e+05, -1.906740212545799e+05, -1.906922983089216e+05, -1.907097163685331e+05,
- -1.907262854805192e+05, -1.907420155160233e+05, -1.907569161743439e+05, -1.907709969869325e+05, -1.907842673212728e+05,
- -1.907967363780708e+05, -1.908084132213633e+05, -1.908193067422357e+05, -1.908294256889305e+05, -1.908387786635207e+05,
- -1.908473741251754e+05, -1.908552203933308e+05, -1.908623256507756e+05, -1.908686979466506e+05, -1.908743451993650e+05,
- -1.908792751994358e+05, -1.908834956122471e+05, -1.908870139807370e+05, -1.908898377280119e+05, -1.908919741598904e+05,
- -1.908934304673818e+05, -1.908942137290954e+05, -1.908943309135911e+05, -1.908937888816642e+05, -1.908925943885748e+05,
- -1.908907540862162e+05, -1.908882745252312e+05, -1.908851621570699e+05, -1.908814233359989e+05, -1.908770643210576e+05,
- -1.908720912779664e+05, -1.908665102809869e+05, -1.908603273147332e+05, -1.908535482759436e+05, -1.908461789752038e+05,
- -1.908382251386291e+05, -1.908296924095074e+05, -1.908205863498995e+05, -1.908109124422025e+05, -1.908006760906747e+05,
- -1.907898826229252e+05, -1.907785372913657e+05, -1.907666452746315e+05, -1.907542116789638e+05, -1.907412415395655e+05,
- -1.907277398219201e+05, -1.907137114230834e+05, -1.906991611729439e+05, -1.906840938354529e+05, -1.906685141098296e+05,
- -1.906524266317363e+05, -1.906358359744260e+05, -1.906187466498684e+05, -1.906011631098442e+05, -1.905830897470209e+05,
- -1.905645308960007e+05, -1.905454908343473e+05, -1.905259737835882e+05, -1.905059839101956e+05, -1.904855253265481e+05,
- -1.904646020918671e+05, -1.904432182131370e+05, -1.904213776460007e+05, -1.903990842956428e+05, -1.903763420176471e+05,
- -1.903531546188399e+05, -1.903295258581123e+05, -1.903054594472291e+05, -1.902809590516169e+05, -1.902560282911376e+05,
- -1.902306707408453e+05, -1.902048899317280e+05, -1.901786893514328e+05, -1.901520724449762e+05, -1.901250426154423e+05,
- -1.900976032246640e+05, -1.900697575938893e+05, -1.900415090044391e+05, -1.900128606983456e+05, -1.899838158789840e+05,
- -1.899543777116863e+05, -1.899245493243437e+05, -1.898943338080016e+05, -1.898637342174374e+05, -1.898327535717294e+05,
- -1.898013948548136e+05, -1.897696610160324e+05, -1.897375549706671e+05, -1.897050796004657e+05, -1.896722377541587e+05,
- -1.896390322479612e+05, -1.896054658660728e+05, -1.895715413611608e+05, -1.895372614548383e+05, -1.895026288381323e+05,
- -1.894676461719427e+05, -1.894323160874923e+05, -1.893966411867696e+05, -1.893606240429626e+05, -1.893242672008840e+05,
- -1.892875731773893e+05, -1.892505444617873e+05, -1.892131835162430e+05, -1.891754927761714e+05, -1.891374746506277e+05,
- -1.890991315226865e+05, -1.890604657498172e+05, -1.890214796642505e+05, -1.889821755733400e+05, -1.889425557599158e+05,
- -1.889026224826328e+05, -1.888623779763130e+05, -1.888218244522806e+05, -1.887809640986917e+05, -1.887397990808600e+05,
- -1.886983315415726e+05, -1.886565636014050e+05, -1.886144973590274e+05, -1.885721348915077e+05, -1.885294782546064e+05,
- -1.884865294830718e+05, -1.884432905909226e+05, -1.883997635717327e+05, -1.883559503989074e+05, -1.883118530259554e+05,
- -1.882674733867574e+05, -1.882228133958280e+05, -1.881778749485762e+05, -1.881326599215579e+05, -1.880871701727276e+05,
- -1.880414075416855e+05, -1.879953738499164e+05, -1.879490709010300e+05, -1.879025004809941e+05, -1.878556643583670e+05,
- -1.878085642845193e+05, -1.877612019938624e+05, -1.877135792040627e+05, -1.876656976162616e+05, -1.876175589152836e+05,
- -1.875691647698486e+05, -1.875205168327743e+05, -1.874716167411817e+05, -1.874224661166898e+05, -1.873730665656155e+05,
- -1.873234196791633e+05, -1.872735270336171e+05, -1.872233901905251e+05, -1.871730106968845e+05, -1.871223900853225e+05,
- -1.870715298742731e+05, -1.870204315681538e+05, -1.869690966575384e+05, -1.869175266193256e+05, -1.868657229169064e+05,
- -1.868136870003299e+05, -1.867614203064656e+05, -1.867089242591608e+05, -1.866562002694021e+05, -1.866032497354654e+05,
- -1.865500740430735e+05, -1.864966745655428e+05, -1.864430526639318e+05, -1.863892096871894e+05, -1.863351469722964e+05,
- -1.862808658444070e+05, -1.862263676169901e+05, -1.861716535919635e+05, -1.861167250598338e+05, -1.860615832998257e+05,
- -1.860062295800149e+05, -1.859506651574584e+05, -1.858948912783214e+05, -1.858389091780029e+05, -1.857827200812600e+05,
- -1.857263252023302e+05, -1.856697257450520e+05, -1.856129229029824e+05, -1.855559178595153e+05, -1.854987117879963e+05,
- -1.854413058518369e+05, -1.853837012046256e+05, -1.853258989902396e+05, -1.852679003429517e+05, -1.852097063875408e+05,
- -1.851513182393957e+05, -1.850927370046192e+05, -1.850339637801325e+05, -1.849749996537772e+05, -1.849158457044122e+05,
- -1.848565030020164e+05, -1.847969726077846e+05, -1.847372555742215e+05, -1.846773529452408e+05, -1.846172657562546e+05,
- -1.845569950342672e+05, -1.844965417979676e+05, -1.844359070578157e+05, -1.843750918161342e+05, -1.843140970671939e+05,
- -1.842529237973008e+05, -1.841915729848800e+05, -1.841300456005613e+05, -1.840683426072604e+05, -1.840064649602607e+05,
- -1.839444136072948e+05, -1.838821894886236e+05, -1.838197935371133e+05, -1.837572266783155e+05, -1.836944898305415e+05,
- -1.836315839049384e+05, -1.835685098055637e+05, -1.835052684294575e+05, -1.834418606667184e+05, -1.833782874005701e+05,
- -1.833145495074360e+05, -1.832506478570075e+05, -1.831865833123128e+05, -1.831223567297851e+05, -1.830579689593286e+05,
- -1.829934208443878e+05, -1.829287132220082e+05, -1.828638469229057e+05, -1.827988227715268e+05, -1.827336415861134e+05,
- -1.826683041787639e+05, -1.826028113554959e+05, -1.825371639163054e+05, -1.824713626552272e+05, -1.824054083603951e+05,
- -1.823393018140973e+05, -1.822730437928383e+05, -1.822066350673919e+05, -1.821400764028598e+05, -1.820733685587266e+05,
- -1.820065122889137e+05, -1.819395083418350e+05, -1.818723574604502e+05, -1.818050603823162e+05, -1.817376178396410e+05,
- -1.816700305593353e+05, -1.816022992630608e+05, -1.815344246672858e+05, -1.814664074833296e+05, -1.813982484174143e+05,
- -1.813299481707141e+05, -1.812615074394013e+05, -1.811929269146939e+05, -1.811242072829056e+05, -1.810553492254881e+05,
- -1.809863534190788e+05, -1.809172205355456e+05, -1.808479512420333e+05, -1.807785462010039e+05, -1.807090060702848e+05,
- -1.806393315031088e+05, -1.805695231481575e+05, -1.804995816496045e+05, -1.804295076471560e+05, -1.803593017760917e+05,
- -1.802889646673070e+05, -1.802184969473518e+05, -1.801478992384712e+05, -1.800771721586432e+05, -1.800063163216210e+05,
- -1.799353323369675e+05, -1.798642208100948e+05, -1.797929823423043e+05, -1.797216175308191e+05, -1.796501269688248e+05
- },
- {
- 4.748410248499794e+04, 4.595454093462567e+04, 4.440691664568063e+04, 4.284066331647729e+04, 4.125518567608072e+04,
- 3.964985749238003e+04, 3.802401940657062e+04, 3.637697657388280e+04, 3.470799609156186e+04, 3.301630418949209e+04,
- 3.130108315744370e+04, 2.956146797903315e+04, 2.779654263863901e+04, 2.600533606304199e+04, 2.418681765443722e+04,
- 2.233989236560477e+04, 2.046339526131645e+04, 1.855608550238942e+04, 1.661663968004697e+04, 1.464364441828822e+04,
- 1.263558815068140e+04, 1.059085196521964e+04, 8.507699396995371e+03, 6.384265031810531e+03, 4.218541768189365e+03,
- 2.008366565850739e+03, -2.485955089876093e+02, -2.554869148881206e+03, -4.913188800318600e+03, -7.326521033161651e+03,
- -9.798089479889644e+03, -1.233140258651690e+04, -1.493028430304854e+04, -1.759890771961647e+04, -2.034183157483606e+04,
- -2.316403903050044e+04, -2.607097774213883e+04, -2.906859925945408e+04, -3.216339440229230e+04, -3.536241899321274e+04,
- -3.867330077641104e+04, -4.210421280662213e+04, -4.566379007714239e+04, -4.936095344800831e+04, -5.320458696354205e+04,
- -5.720299180214934e+04, -6.136301742029440e+04, -6.568876340742380e+04, -7.017978564107350e+04, -7.482886718147881e+04,
- -7.961963152576209e+04, -8.452448254549236e+04, -8.950338217477036e+04, -9.450384580754898e+04, -9.946260948517073e+04,
- -1.043098127778527e+05, -1.089763219549185e+05, -1.134030367548735e+05, -1.175497102242094e+05, -1.213981374898296e+05,
- -1.249464777406686e+05, -1.282056944209809e+05, -1.311945706650532e+05, -1.339356123862216e+05, -1.364523127651564e+05,
- -1.387675399547995e+05, -1.409026765673152e+05, -1.428772159507971e+05, -1.447086282338765e+05, -1.464123860368887e+05,
- -1.480020831424942e+05, -1.494896027707134e+05, -1.508853061911231e+05, -1.521982223636593e+05, -1.534362268246496e+05,
- -1.546062035756193e+05, -1.557141875418603e+05, -1.567654875688747e+05, -1.577647912815355e+05, -1.587162537762841e+05,
- -1.596235723149260e+05, -1.604900491289687e+05, -1.613186442520182e+05, -1.621120200530827e+05, -1.628725788914669e+05,
- -1.636024950785023e+05, -1.643037421236301e+05, -1.649781160654146e+05, -1.656272555408938e+05, -1.662526591260956e+05,
- -1.668557003827833e+05, -1.674376409676197e+05, -1.679996420965501e+05, -1.685427746061924e+05, -1.690680278129442e+05,
- -1.695763173372982e+05, -1.700684920338969e+05, -1.705453401458475e+05, -1.710075947837556e+05, -1.714559388150357e+05,
- -1.718910092366632e+05, -1.723134010942213e+05, -1.727236710013990e+05, -1.731223403031778e+05, -1.735098979453938e+05,
- -1.738868030300967e+05, -1.742534871633356e+05, -1.746103565646118e+05, -1.749577939851435e+05, -1.752961604517481e+05,
- -1.756257968546409e+05, -1.759470253952957e+05, -1.762601509086316e+05, -1.765654620721571e+05, -1.768632325132790e+05,
- -1.771537218247203e+05, -1.774371764969099e+05, -1.777138307752366e+05, -1.779839074492109e+05, -1.782476185798368e+05,
- -1.785051661708321e+05, -1.787567427887561e+05, -1.790025321365856e+05, -1.792427095848193e+05, -1.794774426637960e+05,
- -1.797068915205324e+05, -1.799312093430777e+05, -1.801505427550931e+05, -1.803650321851418e+05, -1.805748122122072e+05,
- -1.807800118492705e+05, -1.809807549081455e+05, -1.811771602304695e+05, -1.813693419584066e+05, -1.815574097774448e+05,
- -1.817414690402701e+05, -1.819216213247282e+05, -1.820979641993842e+05, -1.822705916612398e+05, -1.824395942578127e+05,
- -1.826050592533404e+05, -1.827670707851510e+05, -1.829257100108936e+05, -1.830810552472500e+05, -1.832331821007180e+05,
- -1.833821635909903e+05, -1.835280702674342e+05, -1.836709703191180e+05, -1.838109296788111e+05, -1.839480121213474e+05,
- -1.840822793567081e+05, -1.842137911181656e+05, -1.843426052457918e+05, -1.844687777649115e+05, -1.845923629641010e+05,
- -1.847134134619568e+05, -1.848319802778265e+05, -1.849481128952921e+05, -1.850618593232541e+05, -1.851732661540264e+05,
- -1.852823786185992e+05, -1.853892406392483e+05, -1.854938948796290e+05, -1.855963827925042e+05, -1.856967446652391e+05,
- -1.857950196631810e+05, -1.858912458710447e+05, -1.859854603324128e+05, -1.860776990874485e+05, -1.861679972089207e+05,
- -1.862563888366293e+05, -1.863429072103139e+05, -1.864275847011277e+05, -1.865104528417480e+05, -1.865915423551934e+05,
- -1.866708831824190e+05, -1.867485045087414e+05, -1.868244347891607e+05, -1.868987017726315e+05, -1.869713325253318e+05,
- -1.870423534529845e+05, -1.871117903222718e+05, -1.871796682813893e+05, -1.872460118797808e+05, -1.873108450870909e+05,
- -1.873741912905654e+05, -1.874360733944896e+05, -1.874965137160113e+05, -1.875555340807361e+05, -1.876131558187403e+05,
- -1.876693997795406e+05, -1.877242863465060e+05, -1.877778354507312e+05, -1.878300665843960e+05, -1.878809988136376e+05,
- -1.879306507909496e+05, -1.879790407671357e+05, -1.880261866028316e+05, -1.880721057796185e+05, -1.881168154107406e+05,
- -1.881603322514456e+05, -1.882026727089678e+05, -1.882438528521587e+05, -1.882838884207924e+05, -1.883227948345478e+05,
- -1.883605872016876e+05, -1.883972803274446e+05, -1.884328887221259e+05, -1.884674266089485e+05, -1.885009079316134e+05,
- -1.885333463671692e+05, -1.885647553111337e+05, -1.885951479170310e+05, -1.886245370814216e+05, -1.886529354556839e+05,
- -1.886803554522323e+05, -1.887068092505416e+05, -1.887323088029797e+05, -1.887568658404596e+05, -1.887804918779160e+05,
- -1.888031982196122e+05, -1.888249959642854e+05, -1.888458960101348e+05, -1.888659090596589e+05, -1.888850456243465e+05,
- -1.889033160292287e+05, -1.889207304172945e+05, -1.889372987537775e+05, -1.889530308303133e+05, -1.889679362689803e+05,
- -1.889820245189622e+05, -1.889953048894716e+05, -1.890077865096691e+05, -1.890194783614984e+05, -1.890303892758563e+05,
- -1.890405279359855e+05, -1.890499028807722e+05, -1.890585225079515e+05, -1.890663950772256e+05, -1.890735287132921e+05,
- -1.890799314087930e+05, -1.890856110271826e+05, -1.890905753055160e+05, -1.890948318571637e+05, -1.890983881744539e+05,
- -1.891012516312416e+05, -1.891034294854141e+05, -1.891049288813253e+05, -1.891057568521702e+05, -1.891059203222944e+05,
- -1.891054261094456e+05, -1.891042809269671e+05, -1.891024913859318e+05, -1.891000639972259e+05, -1.890970051735773e+05,
- -1.890933212315323e+05, -1.890890183933823e+05, -1.890841027890462e+05, -1.890785804578997e+05, -1.890724573505636e+05,
- -1.890657393306468e+05, -1.890584321764463e+05, -1.890505415826054e+05, -1.890420731617330e+05, -1.890330324459817e+05,
- -1.890234248885890e+05, -1.890132558653826e+05, -1.890025306762476e+05, -1.889912545465606e+05, -1.889794326285893e+05,
- -1.889670700028597e+05, -1.889541716794899e+05, -1.889407425994950e+05, -1.889267876360605e+05, -1.889123115957864e+05,
- -1.888973192199024e+05, -1.888818151854572e+05, -1.888658041064778e+05, -1.888492905351054e+05, -1.888322789627039e+05,
- -1.888147738209450e+05, -1.887967794828667e+05, -1.887783002639114e+05, -1.887593404229390e+05, -1.887399041632176e+05,
- -1.887199956333936e+05, -1.886996189284399e+05, -1.886787780905846e+05, -1.886574771102174e+05, -1.886357199267774e+05,
- -1.886135104296252e+05, -1.885908524588895e+05, -1.885677498063032e+05, -1.885442062160158e+05, -1.885202253853922e+05,
- -1.884958109657942e+05, -1.884709665633436e+05, -1.884456957396729e+05, -1.884200020126573e+05, -1.883938888571329e+05,
- -1.883673597056012e+05, -1.883404179489166e+05, -1.883130669369628e+05, -1.882853099793126e+05, -1.882571503458779e+05,
- -1.882285912675421e+05, -1.881996359367848e+05, -1.881702875082897e+05, -1.881405490995435e+05, -1.881104237914203e+05,
- -1.880799146287578e+05, -1.880490246209187e+05, -1.880177567423434e+05, -1.879861139330916e+05, -1.879540990993723e+05,
- -1.879217151140644e+05, -1.878889648172284e+05, -1.878558510166046e+05, -1.878223764881081e+05, -1.877885439763058e+05,
- -1.877543561948930e+05, -1.877198158271558e+05, -1.876849255264257e+05, -1.876496879165267e+05, -1.876141055922131e+05,
- -1.875781811195994e+05, -1.875419170365837e+05, -1.875053158532601e+05, -1.874683800523267e+05, -1.874311120894847e+05,
- -1.873935143938292e+05, -1.873555893682355e+05, -1.873173393897365e+05, -1.872787668098938e+05, -1.872398739551607e+05,
- -1.872006631272430e+05, -1.871611366034471e+05, -1.871212966370284e+05, -1.870811454575277e+05, -1.870406852711061e+05,
- -1.869999182608715e+05, -1.869588465871998e+05, -1.869174723880533e+05, -1.868757977792866e+05, -1.868338248549560e+05,
- -1.867915556876170e+05, -1.867489923286190e+05, -1.867061368083959e+05, -1.866629911367505e+05, -1.866195573031324e+05,
- -1.865758372769157e+05, -1.865318330076685e+05, -1.864875464254166e+05, -1.864429794409094e+05, -1.863981339458716e+05,
- -1.863530118132601e+05, -1.863076148975091e+05, -1.862619450347779e+05, -1.862160040431889e+05, -1.861697937230646e+05,
- -1.861233158571596e+05, -1.860765722108901e+05, -1.860295645325594e+05, -1.859822945535762e+05, -1.859347639886771e+05,
- -1.858869745361369e+05, -1.858389278779807e+05, -1.857906256801915e+05, -1.857420695929139e+05, -1.856932612506561e+05,
- -1.856442022724860e+05, -1.855948942622249e+05, -1.855453388086433e+05, -1.854955374856443e+05, -1.854454918524520e+05,
- -1.853952034537933e+05, -1.853446738200770e+05, -1.852939044675735e+05, -1.852428968985835e+05, -1.851916526016172e+05,
- -1.851401730515562e+05, -1.850884597098226e+05, -1.850365140245457e+05, -1.849843374307169e+05, -1.849319313503546e+05,
- -1.848792971926566e+05, -1.848264363541564e+05, -1.847733502188740e+05, -1.847200401584663e+05, -1.846665075323728e+05,
- -1.846127536879613e+05, -1.845587799606719e+05, -1.845045876741566e+05, -1.844501781404181e+05, -1.843955526599462e+05,
- -1.843407125218538e+05, -1.842856590040085e+05, -1.842303933731628e+05, -1.841749168850841e+05, -1.841192307846817e+05,
- -1.840633363061309e+05, -1.840072346729966e+05, -1.839509270983562e+05, -1.838944147849172e+05, -1.838376989251369e+05,
- -1.837807807013389e+05, -1.837236612858269e+05, -1.836663418409987e+05, -1.836088235194559e+05, -1.835511074641173e+05,
- -1.834931948083241e+05, -1.834350866759486e+05, -1.833767841814985e+05, -1.833182884302219e+05, -1.832596005182090e+05,
- -1.832007215324937e+05, -1.831416525511523e+05, -1.830823946434041e+05, -1.830229488697055e+05, -1.829633162818469e+05,
- -1.829034979230483e+05, -1.828434948280501e+05, -1.827833080232061e+05, -1.827229385265739e+05, -1.826623873480045e+05,
- -1.826016554892297e+05, -1.825407439439494e+05, -1.824796536979174e+05, -1.824183857290264e+05, -1.823569410073902e+05,
- -1.822953204954277e+05, -1.822335251479431e+05, -1.821715559122065e+05, -1.821094137280332e+05, -1.820470995278617e+05,
- -1.819846142368300e+05, -1.819219587728534e+05, -1.818591340466975e+05, -1.817961409620541e+05, -1.817329804156142e+05,
- -1.816696532971385e+05, -1.816061604895305e+05, -1.815425028689064e+05, -1.814786813046639e+05, -1.814146966595514e+05,
- -1.813505497897357e+05, -1.812862415448684e+05, -1.812217727681520e+05, -1.811571442964065e+05, -1.810923569601303e+05,
- -1.810274115835672e+05, -1.809623089847676e+05, -1.808970499756501e+05, -1.808316353620638e+05, -1.807660659438473e+05,
- -1.807003425148897e+05, -1.806344658631882e+05, -1.805684367709072e+05, -1.805022560144355e+05, -1.804359243644428e+05,
- -1.803694425859366e+05, -1.803028114383164e+05, -1.802360316754281e+05, -1.801691040456207e+05, -1.801020292917956e+05,
- -1.800348081514631e+05, -1.799674413567921e+05, -1.798999296346628e+05, -1.798322737067160e+05, -1.797644742894053e+05,
- -1.796965320940453e+05, -1.796284478268615e+05, -1.795602221890369e+05, -1.794918558767636e+05, -1.794233495812859e+05,
- -1.793547039889482e+05, -1.792859197812442e+05, -1.792169976348582e+05, -1.791479382217132e+05, -1.790787422090137e+05,
- -1.790094102592909e+05, -1.789399430304458e+05, -1.788703411757920e+05, -1.788006053440988e+05, -1.787307361796313e+05,
- -1.786607343221963e+05, -1.785906004071784e+05, -1.785203350655832e+05, -1.784499389240778e+05, -1.783794126050282e+05,
- -1.783087567265418e+05, -1.782379719025024e+05, -1.781670587426121e+05, -1.780960178524268e+05, -1.780248498333941e+05
- },
- {
- 4.838223204648915e+04, 4.686286072937273e+04, 4.532579311701562e+04, 4.377048380241746e+04, 4.219636002845725e+04,
- 4.060281985234530e+04, 3.898923015462653e+04, 3.735492447502250e+04, 3.569920065896976e+04, 3.402131829352879e+04,
- 3.232049591045951e+04, 3.059590793098950e+04, 2.884668132368445e+04, 2.707189194322403e+04, 2.527056051379206e+04,
- 2.344164821614722e+04, 2.158405183218202e+04, 1.969659839483580e+04, 1.777803928453326e+04, 1.582704370581420e+04,
- 1.384219146945651e+04, 1.182196499615902e+04, 9.764740447721590e+03, 7.668777881235439e+03, 5.532210309570239e+03,
- 3.353031541725652e+03, 1.129082664780803e+03, -1.141962978384239e+03, -3.462616465906081e+03, -5.835591772762487e+03,
- -8.263826192327542e+03, -1.075050276867256e+04, -1.329907481772252e+04, -1.591329239521148e+04, -1.859723053322233e+04,
- -2.135531858184339e+04, -2.419236968709554e+04, -2.711360861191570e+04, -3.012469500526747e+04, -3.323173748404397e+04,
- -3.644129124786083e+04, -3.976032794043957e+04, -4.319616051294647e+04, -4.675629719516531e+04, -5.044818674248845e+04,
- -5.427880214284294e+04, -5.825399475596284e+04, -6.237754393327708e+04, -6.664984627617372e+04, -7.106625915138761e+04,
- -7.561524903991884e+04, -8.027666008375124e+04, -8.502050833559713e+04, -8.980664760785646e+04, -9.458555744195044e+04,
- -9.930058995306041e+04, -1.038921410547020e+05, -1.083037487894592e+05, -1.124888800951028e+05, -1.164168849629644e+05,
- -1.200741864575752e+05, -1.234602636851847e+05, -1.265847979192365e+05, -1.294637855494784e+05, -1.321163455763266e+05,
- -1.345625409161904e+05, -1.368220599594338e+05, -1.389134894163074e+05, -1.408539526192878e+05, -1.426589654957211e+05,
- -1.443424230191888e+05, -1.459166646792544e+05, -1.473925862166767e+05, -1.487797751402521e+05, -1.500866542740060e+05,
- -1.513206227269286e+05, -1.524881877434990e+05, -1.535950839711835e+05, -1.546463788483413e+05, -1.556465642174406e+05,
- -1.565996350842523e+05, -1.575091568471356e+05, -1.583783224550635e+05, -1.592100009258461e+05, -1.600067785415453e+05,
- -1.607709938847533e+05, -1.615047677168201e+05, -1.622100285438484e+05, -1.628885345766148e+05, -1.635418926695276e+05,
- -1.641715747214484e+05, -1.647789319361728e+05, -1.653652072704993e+05, -1.659315463407502e+05, -1.664790070122234e+05,
- -1.670085678583481e+05, -1.675211356456612e+05, -1.680175519757266e+05, -1.684985991946770e+05, -1.689650056642468e+05,
- -1.694174504742921e+05, -1.698565676619770e+05, -1.702829500165253e+05, -1.706971524694175e+05, -1.710996951829763e+05,
- -1.714910663229649e+05, -1.718717245698852e+05, -1.722421013944474e+05, -1.726026031227035e+05, -1.729536128132394e+05,
- -1.732954919661290e+05, -1.736285820810446e+05, -1.739532060798781e+05, -1.742696696074928e+05, -1.745782622226658e+05,
- -1.748792584899510e+05, -1.751729189820124e+05, -1.754594912009318e+05, -1.757392104261009e+05, -1.760123004954799e+05,
- -1.762789745263257e+05, -1.765394355808304e+05, -1.767938772815863e+05, -1.770424843812770e+05, -1.772854332905680e+05,
- -1.775228925677768e+05, -1.777550233756857e+05, -1.779819798954096e+05, -1.782039097463909e+05, -1.784209542883608e+05,
- -1.786332490501238e+05, -1.788409239905655e+05, -1.790441038129289e+05, -1.792429082401014e+05, -1.794374522741037e+05,
- -1.796278463358749e+05, -1.798141968366677e+05, -1.799966059573288e+05, -1.801751720986711e+05, -1.803499900151110e+05,
- -1.805211509917585e+05, -1.806887430109635e+05, -1.808528509090657e+05, -1.810135565240198e+05, -1.811709388345225e+05,
- -1.813250740912184e+05, -1.814760359405163e+05, -1.816238955415028e+05, -1.817687216764119e+05, -1.819105808550658e+05,
- -1.820495374136741e+05, -1.821856536083536e+05, -1.823189897029294e+05, -1.824496040560271e+05, -1.825775531957813e+05,
- -1.827028918986711e+05, -1.828256732603121e+05, -1.829459487635053e+05, -1.830637683428893e+05, -1.831791804464009e+05,
- -1.832922320937270e+05, -1.834029689319249e+05, -1.835114352883700e+05, -1.836176742211854e+05, -1.837217275672922e+05,
- -1.838236359882177e+05, -1.839234390137782e+05, -1.840211750837625e+05, -1.841168815877140e+05, -1.842105949029228e+05,
- -1.843023504307182e+05, -1.843921826311524e+05, -1.844801250561622e+05, -1.845662103812840e+05, -1.846504704360005e+05,
- -1.847329362327853e+05, -1.848136379949180e+05, -1.848926051831207e+05, -1.849698665210887e+05, -1.850454500199572e+05,
- -1.851193830017652e+05, -1.851916921219617e+05, -1.852624033909994e+05, -1.853315421950649e+05, -1.853991333159806e+05,
- -1.854652009296209e+05, -1.855297687057628e+05, -1.855928597054403e+05, -1.856544964768539e+05, -1.857147010522622e+05,
- -1.857734949636799e+05, -1.858308992579836e+05, -1.858869345114503e+05, -1.859416208437561e+05, -1.859949779314578e+05,
- -1.860470250209787e+05, -1.860977809411234e+05, -1.861472641151395e+05, -1.861954925723456e+05, -1.862424839593469e+05,
- -1.862882555508518e+05, -1.863328242601097e+05, -1.863762066489848e+05, -1.864184189376791e+05, -1.864594770141231e+05,
- -1.864993964430441e+05, -1.865381924747253e+05, -1.865758800534730e+05, -1.866124738257976e+05, -1.866479881483217e+05,
- -1.866824370954290e+05, -1.867158344666611e+05, -1.867481937938723e+05, -1.867795283543933e+05, -1.868098511529491e+05,
- -1.868391749650453e+05, -1.868675123188318e+05, -1.868948755072437e+05, -1.869212765938877e+05, -1.869467274187525e+05,
- -1.869712396037353e+05, -1.869948245580028e+05, -1.870174934831855e+05, -1.870392573784153e+05, -1.870601270452084e+05,
- -1.870801130922044e+05, -1.870992259397619e+05, -1.871174758244179e+05, -1.871348728032150e+05, -1.871514267579024e+05,
- -1.871671473911178e+05, -1.871820442619823e+05, -1.871961267424416e+05, -1.872094040526889e+05, -1.872218852568722e+05,
- -1.872335792666177e+05, -1.872444948444572e+05, -1.872546406071582e+05, -1.872640250289608e+05, -1.872726564447269e+05,
- -1.872805430529982e+05, -1.872876929189766e+05, -1.872941139774171e+05, -1.872998140354463e+05, -1.873048007753048e+05,
- -1.873090817570127e+05, -1.873126644209683e+05, -1.873155560904742e+05, -1.873177639741993e+05, -1.873192951685760e+05,
- -1.873201566601313e+05, -1.873203553277632e+05, -1.873198979449535e+05, -1.873187911819253e+05, -1.873170416077464e+05,
- -1.873146556923776e+05, -1.873116398086695e+05, -1.873080002343101e+05, -1.873037431537221e+05, -1.872988746599146e+05,
- -1.872934007562859e+05, -1.872873273583870e+05, -1.872806602956359e+05, -1.872734053129938e+05, -1.872655680725999e+05,
- -1.872571541553658e+05, -1.872481690625315e+05, -1.872386182171872e+05, -1.872285069657520e+05, -1.872178405794258e+05,
- -1.872066242556004e+05, -1.871948631192413e+05, -1.871825622242360e+05, -1.871697265547089e+05, -1.871563610263102e+05,
- -1.871424704874703e+05, -1.871280597206297e+05, -1.871131334434364e+05, -1.870976963099215e+05, -1.870817529116411e+05,
- -1.870653077788003e+05, -1.870483653813465e+05, -1.870309301300392e+05, -1.870130063774989e+05, -1.869945984192289e+05,
- -1.869757104946170e+05, -1.869563467879159e+05, -1.869365114291987e+05, -1.869162084952976e+05, -1.868954420107206e+05,
- -1.868742159485466e+05, -1.868525342313070e+05, -1.868304007318395e+05, -1.868078192741339e+05, -1.867847936341513e+05,
- -1.867613275406324e+05, -1.867374246758845e+05, -1.867130886765537e+05, -1.866883231343836e+05, -1.866631315969517e+05,
- -1.866375175683975e+05, -1.866114845101337e+05, -1.865850358415382e+05, -1.865581749406394e+05, -1.865309051447817e+05,
- -1.865032297512821e+05, -1.864751520180682e+05, -1.864466751643099e+05, -1.864178023710321e+05, -1.863885367817207e+05,
- -1.863588815029124e+05, -1.863288396047758e+05, -1.862984141216790e+05, -1.862676080527481e+05, -1.862364243624122e+05,
- -1.862048659809411e+05, -1.861729358049697e+05, -1.861406366980135e+05, -1.861079714909742e+05, -1.860749429826374e+05,
- -1.860415539401557e+05, -1.860078070995294e+05, -1.859737051660719e+05, -1.859392508148708e+05, -1.859044466912401e+05,
- -1.858692954111580e+05, -1.858337995617068e+05, -1.857979617014939e+05, -1.857617843610745e+05, -1.857252700433591e+05,
- -1.856884212240180e+05, -1.856512403518768e+05, -1.856137298493046e+05, -1.855758921125964e+05, -1.855377295123465e+05,
- -1.854992443938173e+05, -1.854604390773002e+05, -1.854213158584703e+05, -1.853818770087358e+05, -1.853421247755791e+05,
- -1.853020613828943e+05, -1.852616890313165e+05, -1.852210098985474e+05, -1.851800261396735e+05, -1.851387398874805e+05,
- -1.850971532527600e+05, -1.850552683246123e+05, -1.850130871707448e+05, -1.849706118377646e+05, -1.849278443514635e+05,
- -1.848847867171024e+05, -1.848414409196885e+05, -1.847978089242484e+05, -1.847538926760960e+05, -1.847096941010970e+05,
- -1.846652151059268e+05, -1.846204575783283e+05, -1.845754233873592e+05, -1.845301143836419e+05, -1.844845323996033e+05,
- -1.844386792497170e+05, -1.843925567307337e+05, -1.843461666219158e+05, -1.842995106852614e+05, -1.842525906657311e+05,
- -1.842054082914630e+05, -1.841579652739944e+05, -1.841102633084717e+05, -1.840623040738576e+05, -1.840140892331426e+05,
- -1.839656204335424e+05, -1.839168993067006e+05, -1.838679274688838e+05, -1.838187065211750e+05, -1.837692380496637e+05,
- -1.837195236256341e+05, -1.836695648057477e+05, -1.836193631322260e+05, -1.835689201330283e+05, -1.835182373220294e+05,
- -1.834673161991897e+05, -1.834161582507275e+05, -1.833647649492880e+05, -1.833131377541056e+05, -1.832612781111692e+05,
- -1.832091874533817e+05, -1.831568672007167e+05, -1.831043187603766e+05, -1.830515435269436e+05, -1.829985428825303e+05,
- -1.829453181969306e+05, -1.828918708277638e+05, -1.828382021206199e+05, -1.827843134092007e+05, -1.827302060154624e+05,
- -1.826758812497494e+05, -1.826213404109335e+05, -1.825665847865470e+05, -1.825116156529133e+05, -1.824564342752785e+05,
- -1.824010419079390e+05, -1.823454397943679e+05, -1.822896291673378e+05, -1.822336112490474e+05, -1.821773872512380e+05,
- -1.821209583753155e+05, -1.820643258124669e+05, -1.820074907437754e+05, -1.819504543403366e+05, -1.818932177633690e+05,
- -1.818357821643253e+05, -1.817781486850037e+05, -1.817203184576535e+05, -1.816622926050819e+05, -1.816040722407594e+05,
- -1.815456584689240e+05, -1.814870523846812e+05, -1.814282550741063e+05, -1.813692676143427e+05, -1.813100910737001e+05,
- -1.812507265117500e+05, -1.811911749794234e+05, -1.811314375191015e+05, -1.810715151647104e+05, -1.810114089418124e+05,
- -1.809511198676945e+05, -1.808906489514593e+05, -1.808299971941105e+05, -1.807691655886423e+05, -1.807081551201216e+05,
- -1.806469667657745e+05, -1.805856014950692e+05, -1.805240602697970e+05, -1.804623440441533e+05, -1.804004537648181e+05,
- -1.803383903710349e+05, -1.802761547946880e+05, -1.802137479603798e+05, -1.801511707855047e+05, -1.800884241803275e+05,
- -1.800255090480532e+05, -1.799624262849024e+05, -1.798991767801825e+05, -1.798357614163588e+05, -1.797721810691241e+05,
- -1.797084366074679e+05, -1.796445288937457e+05, -1.795804587837452e+05, -1.795162271267536e+05, -1.794518347656228e+05,
- -1.793872825368342e+05, -1.793225712705649e+05, -1.792577017907462e+05, -1.791926749151319e+05, -1.791274914553550e+05,
- -1.790621522169922e+05, -1.789966579996210e+05, -1.789310095968827e+05, -1.788652077965371e+05, -1.787992533805241e+05,
- -1.787331471250175e+05, -1.786668898004853e+05, -1.786004821717415e+05, -1.785339249980038e+05, -1.784672190329490e+05,
- -1.784003650247635e+05, -1.783333637161991e+05, -1.782662158446250e+05, -1.781989221420791e+05, -1.781314833353188e+05,
- -1.780639001458740e+05, -1.779961732900941e+05, -1.779283034792000e+05, -1.778602914193312e+05, -1.777921378115948e+05,
- -1.777238433521132e+05, -1.776554087320710e+05, -1.775868346377615e+05, -1.775181217506340e+05, -1.774492707473365e+05,
- -1.773802822997636e+05, -1.773111570750989e+05, -1.772418957358602e+05, -1.771724989399422e+05, -1.771029673406591e+05,
- -1.770333015867879e+05, -1.769635023226098e+05, -1.768935701879513e+05, -1.768235058182248e+05, -1.767533098444726e+05,
- -1.766829828933995e+05, -1.766125255874210e+05, -1.765419385446954e+05, -1.764712223791672e+05, -1.764003777006024e+05
- },
- {
- 4.928132496476737e+04, 4.777203293313359e+04, 4.624540290027717e+04, 4.470090956698103e+04, 4.313800181603081e+04,
- 4.155610102177271e+04, 3.995459922068705e+04, 3.833285712742958e+04, 3.669020198271707e+04, 3.502592521460971e+04,
- 3.333927989432645e+04, 3.162947796497980e+04, 2.989568721911910e+04, 2.813702799808882e+04, 2.635256958297003e+04,
- 2.454132624323702e+04, 2.270225290519184e+04, 2.083424039770267e+04, 1.893611022773671e+04, 1.700660883263362e+04,
- 1.504440125001804e+04, 1.304806413974137e+04, 1.101607808538369e+04, 8.946819095758350e+03, 6.838549220376558e+03,
- 4.689406185617098e+03, 2.497391955268242e+03, 2.603601157363187e+02, -2.023998010172171e+03, -4.358168606928843e+03,
- -6.744832028406961e+03, -9.186880917310529e+03, -1.168743970976915e+04, -1.424988538274170e+04, -1.687786916278923e+04,
- -1.957533853609446e+04, -2.234655863454035e+04, -2.519613139260255e+04, -2.812900999641668e+04, -3.115050480276153e+04,
- -3.426627491974948e+04, -3.748229672137052e+04, -4.080479634440685e+04, -4.424012724202839e+04, -4.779456582243962e+04,
- -5.147398824087581e+04, -5.528338119375909e+04, -5.922613391058637e+04, -6.330306759427260e+04, -6.751119789129033e+04,
- -7.184230885389331e+04, -7.628153369929368e+04, -8.080623573679327e+04, -8.538549032342542e+04, -8.998038437622057e+04,
- -9.454529133717256e+04, -9.903032769044364e+04, -1.033851566025143e+05, -1.075638406624708e+05, -1.115296885773022e+05,
- -1.152592432366255e+05, -1.187423601683237e+05, -1.219794285199245e+05, -1.249790081188866e+05, -1.277547978171435e+05,
- -1.303231314489244e+05, -1.327012310178136e+05, -1.349061211140281e+05, -1.369540113270817e+05, -1.388599743621449e+05,
- -1.406378022329958e+05, -1.422999699628333e+05, -1.438576657482545e+05, -1.453208622833985e+05, -1.466984120535853e+05,
- -1.479981541737852e+05, -1.492270238125823e+05, -1.503911580808252e+05, -1.514959945872672e+05, -1.525463606593549e+05,
- -1.535465525161116e+05, -1.545004045312921e+05, -1.554113492331614e+05, -1.562824689472739e+05, -1.571165400818105e+05,
- -1.579160710442716e+05, -1.586833347088551e+05, -1.594203962561769e+05, -1.601291371005122e+05, -1.608112755158638e+05,
- -1.614683844770153e+05, -1.621019071478946e+05, -1.627131703776775e+05, -1.633033965044713e+05, -1.638737137159767e+05,
- -1.644251651748687e+05, -1.649587170823838e+05, -1.654752658255005e+05, -1.659756443267214e+05, -1.664606277200068e+05,
- -1.669309383893232e+05, -1.673872505141451e+05, -1.678301941329488e+05, -1.682603588014015e+05, -1.686782968891661e+05,
- -1.690845265565696e+05, -1.694795344470017e+05, -1.698637781263390e+05, -1.702376882967846e+05, -1.706016708091460e+05,
- -1.709561084946912e+05, -1.713013628352200e+05, -1.716377754878155e+05, -1.719656696788548e+05, -1.722853514802172e+05,
- -1.725971109791804e+05, -1.729012233522387e+05, -1.731979498519693e+05, -1.734875387150943e+05, -1.737702259990292e+05,
- -1.740462363534473e+05, -1.743157837327163e+05, -1.745790720544721e+05, -1.748362958090604e+05, -1.750876406241116e+05,
- -1.753332837900989e+05, -1.755733947381131e+05, -1.758081355191897e+05, -1.760376611535320e+05, -1.762621201199724e+05,
- -1.764816546540318e+05, -1.766964011063921e+05, -1.769064902613382e+05, -1.771120476306863e+05, -1.773131937306352e+05,
- -1.775100442357759e+05, -1.777027105727730e+05, -1.778912997025976e+05, -1.780759145908812e+05, -1.782566543520187e+05,
- -1.784336144375797e+05, -1.786068868134452e+05, -1.787765601264629e+05, -1.789427198613469e+05, -1.791054484884955e+05,
- -1.792648256033428e+05, -1.794209280578184e+05, -1.795738300844331e+05, -1.797236034134873e+05, -1.798703173838422e+05,
- -1.800140390476747e+05, -1.801548332687703e+05, -1.802927628197719e+05, -1.804278884658325e+05, -1.805602690524790e+05,
- -1.806899615845925e+05, -1.808170213022302e+05, -1.809415017526045e+05, -1.810634548584528e+05, -1.811829309830070e+05,
- -1.812999789917651e+05, -1.814146463112523e+05, -1.815269789849375e+05, -1.816370217264782e+05, -1.817448179704375e+05,
- -1.818504099206140e+05, -1.819538385961231e+05, -1.820551438753512e+05, -1.821543645378943e+05, -1.822515383045956e+05,
- -1.823467018757842e+05, -1.824398909678061e+05, -1.825311403479406e+05, -1.826204838677881e+05, -1.827079544952040e+05,
- -1.827935843448578e+05, -1.828774047074861e+05, -1.829594460779038e+05, -1.830397381818396e+05, -1.831183100016509e+05,
- -1.831951898009751e+05, -1.832704051483682e+05, -1.833439829399845e+05, -1.834159494213348e+05, -1.834863302081777e+05,
- -1.835551502860018e+05, -1.836224341102666e+05, -1.836882055053979e+05, -1.837524877609913e+05, -1.838153036296276e+05,
- -1.838766753433209e+05, -1.839366246293478e+05, -1.839951727254764e+05, -1.840523403946267e+05, -1.841081479389842e+05,
- -1.841626152135953e+05, -1.842157616394634e+05, -1.842676062161690e+05, -1.843181675340340e+05, -1.843674637858498e+05,
- -1.844155127781892e+05, -1.844623319423169e+05, -1.845079383447175e+05, -1.845523486972561e+05, -1.845955793669893e+05,
- -1.846376463856347e+05, -1.846785654587222e+05, -1.847183519744292e+05, -1.847570210121234e+05, -1.847945873506159e+05,
- -1.848310654761414e+05, -1.848664695900748e+05, -1.849008136163941e+05, -1.849341112089010e+05, -1.849663757582050e+05,
- -1.849976203984875e+05, -1.850278580210306e+05, -1.850571012527877e+05, -1.850853625038945e+05, -1.851126539462201e+05,
- -1.851389875259239e+05, -1.851643749690383e+05, -1.851888277868762e+05, -1.852123572812745e+05, -1.852349745496761e+05,
- -1.852566904900619e+05, -1.852775158057305e+05, -1.852974610099379e+05, -1.853165364303980e+05, -1.853347522136499e+05,
- -1.853521183293000e+05, -1.853686445656488e+05, -1.853843405676710e+05, -1.853992157898947e+05, -1.854132795341774e+05,
- -1.854265409448687e+05, -1.854390090123718e+05, -1.854506925765986e+05, -1.854616003303339e+05, -1.854717408225015e+05,
- -1.854811224613427e+05, -1.854897535175060e+05, -1.854976421270521e+05, -1.855047962943764e+05, -1.855112238950533e+05,
- -1.855169326786043e+05, -1.855219302711915e+05, -1.855262241782355e+05, -1.855298217869715e+05, -1.855327303689309e+05,
- -1.855349570823618e+05, -1.855365089745838e+05, -1.855373929842848e+05, -1.855376159437545e+05, -1.855371845810636e+05,
- -1.855361055221868e+05, -1.855343852930699e+05, -1.855320303216464e+05, -1.855290469398039e+05, -1.855254413852995e+05,
- -1.855212198036273e+05, -1.855163882498408e+05, -1.855109526903327e+05, -1.855049190045638e+05, -1.854982929867579e+05,
- -1.854910803475505e+05, -1.854832867155976e+05, -1.854749176391501e+05, -1.854659785875845e+05, -1.854564749529018e+05,
- -1.854464120511893e+05, -1.854357951240464e+05, -1.854246293399797e+05, -1.854129197957625e+05, -1.854006715177668e+05,
- -1.853878894632584e+05, -1.853745785216676e+05, -1.853607435158295e+05, -1.853463892031932e+05, -1.853315202770068e+05,
- -1.853161413674734e+05, -1.853002570428830e+05, -1.852838718107176e+05, -1.852669901187319e+05, -1.852496163560088e+05,
- -1.852317548539959e+05, -1.852134098875126e+05, -1.851945856757418e+05, -1.851752863831941e+05, -1.851555161206562e+05,
- -1.851352789461139e+05, -1.851145788656593e+05, -1.850934198343765e+05, -1.850718057572088e+05, -1.850497404898076e+05,
- -1.850272278393616e+05, -1.850042715654132e+05, -1.849808753806515e+05, -1.849570429516942e+05, -1.849327778998495e+05,
- -1.849080838018641e+05, -1.848829641906560e+05, -1.848574225560300e+05, -1.848314623453816e+05, -1.848050869643844e+05,
- -1.847782997776646e+05, -1.847511041094603e+05, -1.847235032442705e+05, -1.846955004274880e+05, -1.846670988660216e+05,
- -1.846383017289047e+05, -1.846091121478933e+05, -1.845795332180512e+05, -1.845495679983229e+05, -1.845192195120975e+05,
- -1.844884907477600e+05, -1.844573846592309e+05, -1.844259041664994e+05, -1.843940521561423e+05, -1.843618314818334e+05,
- -1.843292449648445e+05, -1.842962953945395e+05, -1.842629855288503e+05, -1.842293180947551e+05, -1.841952957887386e+05,
- -1.841609212772489e+05, -1.841261971971430e+05, -1.840911261561246e+05, -1.840557107331774e+05, -1.840199534789830e+05,
- -1.839838569163379e+05, -1.839474235405598e+05, -1.839106558198873e+05, -1.838735561958713e+05, -1.838361270837606e+05,
- -1.837983708728804e+05, -1.837602899270021e+05, -1.837218865847104e+05, -1.836831631597588e+05, -1.836441219414233e+05,
- -1.836047651948464e+05, -1.835650951613782e+05, -1.835251140589085e+05, -1.834848240821952e+05, -1.834442274031855e+05,
- -1.834033261713329e+05, -1.833621225139079e+05, -1.833206185363029e+05, -1.832788163223326e+05, -1.832367179345291e+05,
- -1.831943254144322e+05, -1.831516407828738e+05, -1.831086660402581e+05, -1.830654031668382e+05, -1.830218541229850e+05,
- -1.829780208494555e+05, -1.829339052676521e+05, -1.828895092798827e+05, -1.828448347696116e+05, -1.827998836017108e+05,
- -1.827546576227014e+05, -1.827091586609980e+05, -1.826633885271435e+05, -1.826173490140419e+05, -1.825710418971887e+05,
- -1.825244689348951e+05, -1.824776318685114e+05, -1.824305324226423e+05, -1.823831723053651e+05, -1.823355532084384e+05,
- -1.822876768075110e+05, -1.822395447623261e+05, -1.821911587169237e+05, -1.821425202998358e+05, -1.820936311242857e+05,
- -1.820444927883756e+05, -1.819951068752787e+05, -1.819454749534239e+05, -1.818955985766783e+05, -1.818454792845286e+05,
- -1.817951186022575e+05, -1.817445180411192e+05, -1.816936790985110e+05, -1.816426032581424e+05, -1.815912919902030e+05,
- -1.815397467515246e+05, -1.814879689857453e+05, -1.814359601234672e+05, -1.813837215824143e+05, -1.813312547675866e+05,
- -1.812785610714112e+05, -1.812256418738935e+05, -1.811724985427659e+05, -1.811191324336306e+05, -1.810655448901055e+05,
- -1.810117372439634e+05, -1.809577108152716e+05, -1.809034669125304e+05, -1.808490068328067e+05, -1.807943318618675e+05,
- -1.807394432743117e+05, -1.806843423336974e+05, -1.806290302926722e+05, -1.805735083930957e+05, -1.805177778661664e+05,
- -1.804618399325410e+05, -1.804056958024557e+05, -1.803493466758447e+05, -1.802927937424572e+05, -1.802360381819725e+05,
- -1.801790811641125e+05, -1.801219238487554e+05, -1.800645673860446e+05, -1.800070129164984e+05, -1.799492615711173e+05,
- -1.798913144714890e+05, -1.798331727298921e+05, -1.797748374494026e+05, -1.797163097239904e+05, -1.796575906386234e+05,
- -1.795986812693632e+05, -1.795395826834656e+05, -1.794802959394730e+05, -1.794208220873118e+05, -1.793611621683840e+05,
- -1.793013172156615e+05, -1.792412882537750e+05, -1.791810762991041e+05, -1.791206823598663e+05, -1.790601074362038e+05,
- -1.789993525202707e+05, -1.789384185963161e+05, -1.788773066407680e+05, -1.788160176223198e+05, -1.787545525020054e+05,
- -1.786929122332864e+05, -1.786310977621271e+05, -1.785691100270742e+05, -1.785069499593346e+05, -1.784446184828522e+05,
- -1.783821165143824e+05, -1.783194449635663e+05, -1.782566047330050e+05, -1.781935967183320e+05, -1.781304218082845e+05,
- -1.780670808847748e+05, -1.780035748229574e+05, -1.779399044913022e+05, -1.778760707516597e+05, -1.778120744593270e+05,
- -1.777479164631177e+05, -1.776835976054236e+05, -1.776191187222826e+05, -1.775544806434397e+05, -1.774896841924117e+05,
- -1.774247301865486e+05, -1.773596194370960e+05, -1.772943527492539e+05, -1.772289309222396e+05, -1.771633547493436e+05,
- -1.770976250179900e+05, -1.770317425097934e+05, -1.769657080006161e+05, -1.768995222606263e+05, -1.768331860543491e+05,
- -1.767667001407269e+05, -1.767000652731692e+05, -1.766332821996092e+05, -1.765663516625552e+05, -1.764992743991435e+05,
- -1.764320511411890e+05, -1.763646826152391e+05, -1.762971695426200e+05, -1.762295126394912e+05, -1.761617126168899e+05,
- -1.760937701807841e+05, -1.760256860321175e+05, -1.759574608668592e+05, -1.758890953760481e+05, -1.758205902458433e+05,
- -1.757519461575645e+05, -1.756831637877436e+05, -1.756142438081637e+05, -1.755451868859068e+05, -1.754759936833974e+05,
- -1.754066648584439e+05, -1.753372010642826e+05, -1.752676029496206e+05, -1.751978711586751e+05, -1.751280063312182e+05,
- -1.750580091026148e+05, -1.749878801038639e+05, -1.749176199616387e+05, -1.748472292983254e+05, -1.747767087320632e+05
- },
- {
- 5.018137975305086e+04, 4.868205780710693e+04, 4.716574822000760e+04, 4.563194504586121e+04, 4.408011797074359e+04,
- 4.250971075690060e+04, 4.092013956290370e+04, 3.931079112612073e+04, 3.768102079610123e+04, 3.603015040295141e+04,
- 3.435746594475340e+04, 3.266221507577393e+04, 3.094360437522843e+04, 2.920079637409106e+04, 2.743290631491141e+04,
- 2.563899861679251e+04, 2.381808301458931e+04, 2.196911033798767e+04, 2.009096789242591e+04, 1.818247439983564e+04,
- 1.624237445295792e+04, 1.426933243260701e+04, 1.226192583286121e+04, 1.021863793497993e+04, 8.137849767172018e+03,
- 6.017831285241561e+03, 3.856731707475447e+03, 1.652568941328035e+03, -5.967819547060031e+02, -2.893601315009715e+03,
- -5.240338431980699e+03, -7.639626112579272e+03, -1.009429615391863e+04, -1.260739548127037e+04, -1.518220270544600e+04,
- -1.782224442081657e+04, -2.053131039862966e+04, -2.331346625515400e+04, -2.617306148286074e+04, -2.911472969062485e+04,
- -3.214337639861444e+04, -3.526414758592656e+04, -3.848236915857267e+04, -4.180344333038462e+04, -4.523268241005363e+04,
- -4.877505378139192e+04, -5.243480297299970e+04, -5.621491743783836e+04, -6.011639791918639e+04, -6.413732651836679e+04,
- -6.827177070979550e+04, -7.250864077591240e+04, -7.683070060289549e+04, -8.121397094362394e+04, -8.562772719234832e+04,
- -9.003521501710413e+04, -9.439516860196443e+04, -9.866421829169214e+04, -1.028001595347562e+05, -1.067656921739018e+05,
- -1.105318311137916e+05, -1.140805355121557e+05, -1.174042518003322e+05, -1.205039823989707e+05, -1.233873107200600e+05,
- -1.260660303285404e+05, -1.285541692565334e+05, -1.308665817049535e+05, -1.330180493781456e+05, -1.350227546949136e+05,
- -1.368939951167088e+05, -1.386440448444601e+05, -1.402841061160829e+05, -1.418243163836226e+05, -1.432737912365391e+05,
- -1.446406897726777e+05, -1.459322927678452e+05, -1.471550863806857e+05, -1.483148460525070e+05, -1.494167169228027e+05,
- -1.504652884727611e+05, -1.514646622007118e+05, -1.524185119284320e+05, -1.533301368715070e+05, -1.542025079328599e+05,
- -1.550383078503989e+05, -1.558399658953101e+05, -1.566096878148915e+05, -1.573494816711502e+05, -1.580611801632375e+05,
- -1.587464599510900e+05, -1.594068584272375e+05, -1.600437883181236e+05, -1.606585504375914e+05, -1.612523448641124e+05,
- -1.618262807697489e+05, -1.623813850890655e+05, -1.629186102070130e+05, -1.634388407539795e+05, -1.639428996855533e+05,
- -1.644315536949617e+05, -1.649055180599616e+05, -1.653654609908163e+05, -1.658120075393444e+05, -1.662457431206519e+05,
- -1.666672166921477e+05, -1.670769436285081e+05, -1.674754083262551e+05, -1.678630665673288e+05, -1.682403476674071e+05,
- -1.686076564315774e+05, -1.689653749372771e+05, -1.693138641620947e+05, -1.696534654719780e+05, -1.699845019836611e+05,
- -1.703072798135607e+05, -1.706220892240618e+05, -1.709292056769201e+05, -1.712288908024781e+05, -1.715213932924696e+05,
- -1.718069497233818e+05, -1.720857853166279e+05, -1.723581146411462e+05, -1.726241422634849e+05, -1.728840633518021e+05,
- -1.731380642264242e+05, -1.733863228898473e+05, -1.736290095147286e+05, -1.738662868325831e+05, -1.740983106448695e+05,
- -1.743252301459792e+05, -1.745471883037829e+05, -1.747643221977528e+05, -1.749767633322846e+05, -1.751846379314537e+05,
- -1.753880671053320e+05, -1.755871674753889e+05, -1.757820509479062e+05, -1.759728252122110e+05, -1.761595938939572e+05,
- -1.763424567552572e+05, -1.765215098827865e+05, -1.766968458646978e+05, -1.768685539571350e+05, -1.770367202410595e+05,
- -1.772014277700483e+05, -1.773627567096797e+05, -1.775207844690636e+05, -1.776755858250394e+05, -1.778272330395188e+05,
- -1.779757959704248e+05, -1.781213421758364e+05, -1.782639370165615e+05, -1.784036437451866e+05, -1.785405235986427e+05,
- -1.786746358818137e+05, -1.788060380476881e+05, -1.789347857734235e+05, -1.790609330325773e+05, -1.791845321637225e+05,
- -1.793056339356716e+05, -1.794242876094954e+05, -1.795405409975335e+05, -1.796544405195579e+05, -1.797660312562613e+05,
- -1.798753570002129e+05, -1.799824603044280e+05, -1.800873825286813e+05, -1.801901638836879e+05, -1.802908434732679e+05,
- -1.803894593346037e+05, -1.804860484766910e+05, -1.805806469170815e+05, -1.806732897170034e+05, -1.807640110149478e+05,
- -1.808528440587985e+05, -1.809398212365808e+05, -1.810249741058968e+05, -1.811083334221191e+05, -1.811899291653990e+05,
- -1.812697905665514e+05, -1.813479461318721e+05, -1.814244236669368e+05, -1.814992502994345e+05, -1.815724525010801e+05,
- -1.816440561086498e+05, -1.817140863224130e+05, -1.817825678112384e+05, -1.818495246047096e+05, -1.819149801940852e+05,
- -1.819789575290930e+05, -1.820414790345068e+05, -1.821025666260897e+05, -1.821622417259409e+05, -1.822205252772671e+05,
- -1.822774377586053e+05, -1.823329991975237e+05, -1.823872291838191e+05, -1.824401468822363e+05, -1.824917710447290e+05,
- -1.825421200222815e+05, -1.825912117763094e+05, -1.826390638896594e+05, -1.826856935772212e+05, -1.827311176961722e+05,
- -1.827753527558666e+05, -1.828184149273846e+05, -1.828603200527564e+05, -1.829010836538737e+05, -1.829407209411011e+05,
- -1.829792468215993e+05, -1.830166759073707e+05, -1.830530225230434e+05, -1.830883007133944e+05, -1.831225242506322e+05,
- -1.831557066414418e+05, -1.831878611338037e+05, -1.832190007235937e+05, -1.832491381609751e+05, -1.832782859643587e+05,
- -1.833064563954935e+05, -1.833336615113558e+05, -1.833599131392488e+05, -1.833852228898384e+05, -1.834096021624462e+05,
- -1.834330621501733e+05, -1.834556138448772e+05, -1.834772680419917e+05, -1.834980353452088e+05, -1.835179261710178e+05,
- -1.835369507531123e+05, -1.835551191375772e+05, -1.835724412234030e+05, -1.835889267119977e+05, -1.836045851474206e+05,
- -1.836194259111168e+05, -1.836334582256129e+05, -1.836466911581069e+05, -1.836591336239574e+05, -1.836707943900776e+05,
- -1.836816820782290e+05, -1.836918051682298e+05, -1.837011720010714e+05, -1.837097907819511e+05, -1.837176695832206e+05,
- -1.837248163472567e+05, -1.837312388892529e+05, -1.837369448999361e+05, -1.837419419482140e+05, -1.837462374837469e+05,
- -1.837498388394564e+05, -1.837527532339658e+05, -1.837549877739778e+05, -1.837565494565906e+05, -1.837574451715526e+05,
- -1.837576817034612e+05, -1.837572657339039e+05, -1.837562038435465e+05, -1.837545025141672e+05, -1.837521681306384e+05,
- -1.837492069828628e+05, -1.837456252676567e+05, -1.837414290905901e+05, -1.837366244677790e+05, -1.837312173276349e+05,
- -1.837252135125718e+05, -1.837186187806714e+05, -1.837114388073065e+05, -1.837036791867287e+05, -1.836953454336151e+05,
- -1.836864429845788e+05, -1.836769771996445e+05, -1.836669533636890e+05, -1.836563766878467e+05, -1.836452523108831e+05,
- -1.836335853005383e+05, -1.836213806548339e+05, -1.836086433033564e+05, -1.835953781085068e+05, -1.835815898667223e+05,
- -1.835672833096723e+05, -1.835524631054243e+05, -1.835371338595868e+05, -1.835213001164224e+05, -1.835049663599410e+05,
- -1.834881370149651e+05, -1.834708164481727e+05, -1.834530089691172e+05, -1.834347188312246e+05, -1.834159502327703e+05,
- -1.833967073178328e+05, -1.833769941772279e+05, -1.833568148494215e+05, -1.833361733214258e+05, -1.833150735296724e+05,
- -1.832935193608707e+05, -1.832715146528437e+05, -1.832490631953515e+05, -1.832261687308926e+05, -1.832028349554929e+05,
- -1.831790655194721e+05, -1.831548640282026e+05, -1.831302340428442e+05, -1.831051790810723e+05, -1.830797026177818e+05,
- -1.830538080857836e+05, -1.830274988764868e+05, -1.830007783405612e+05, -1.829736497885939e+05, -1.829461164917275e+05,
- -1.829181816822869e+05, -1.828898485543961e+05, -1.828611202645786e+05, -1.828319999323492e+05, -1.828024906407929e+05,
- -1.827725954371334e+05, -1.827423173332871e+05, -1.827116593064130e+05, -1.826806242994448e+05, -1.826492152216167e+05,
- -1.826174349489799e+05, -1.825852863249048e+05, -1.825527721605801e+05, -1.825198952354950e+05, -1.824866582979200e+05,
- -1.824530640653712e+05, -1.824191152250717e+05, -1.823848144344020e+05, -1.823501643213421e+05, -1.823151674849042e+05,
- -1.822798264955604e+05, -1.822441438956605e+05, -1.822081221998420e+05, -1.821717638954330e+05, -1.821350714428488e+05,
- -1.820980472759792e+05, -1.820606938025718e+05, -1.820230134046037e+05, -1.819850084386526e+05, -1.819466812362560e+05,
- -1.819080341042671e+05, -1.818690693252033e+05, -1.818297891575879e+05, -1.817901958362883e+05, -1.817502915728439e+05,
- -1.817100785557936e+05, -1.816695589509931e+05, -1.816287349019291e+05, -1.815876085300276e+05, -1.815461819349565e+05,
- -1.815044571949219e+05, -1.814624363669646e+05, -1.814201214872427e+05, -1.813775145713179e+05, -1.813346176144318e+05,
- -1.812914325917791e+05, -1.812479614587769e+05, -1.812042061513280e+05, -1.811601685860813e+05, -1.811158506606870e+05,
- -1.810712542540469e+05, -1.810263812265631e+05, -1.809812334203787e+05, -1.809358126596181e+05, -1.808901207506232e+05,
- -1.808441594821810e+05, -1.807979306257545e+05, -1.807514359357048e+05, -1.807046771495122e+05, -1.806576559879897e+05,
- -1.806103741555018e+05, -1.805628333401683e+05, -1.805150352140748e+05, -1.804669814334730e+05, -1.804186736389822e+05,
- -1.803701134557857e+05, -1.803213024938240e+05, -1.802722423479855e+05, -1.802229345982946e+05, -1.801733808100952e+05,
- -1.801235825342336e+05, -1.800735413072373e+05, -1.800232586514903e+05, -1.799727360754081e+05, -1.799219750736071e+05,
- -1.798709771270732e+05, -1.798197437033286e+05, -1.797682762565938e+05, -1.797165762279472e+05, -1.796646450454861e+05,
- -1.796124841244805e+05, -1.795600948675276e+05, -1.795074786647017e+05, -1.794546368937048e+05, -1.794015709200125e+05,
- -1.793482820970189e+05, -1.792947717661779e+05, -1.792410412571450e+05, -1.791870918879153e+05, -1.791329249649586e+05,
- -1.790785417833555e+05, -1.790239436269279e+05, -1.789691317683705e+05, -1.789141074693786e+05, -1.788588719807758e+05,
- -1.788034265426364e+05, -1.787477723844117e+05, -1.786919107250490e+05, -1.786358427731117e+05, -1.785795697268969e+05,
- -1.785230927745525e+05, -1.784664130941899e+05, -1.784095318539990e+05, -1.783524502123581e+05, -1.782951693179437e+05,
- -1.782376903098395e+05, -1.781800143176420e+05, -1.781221424615673e+05, -1.780640758525530e+05, -1.780058155923614e+05,
- -1.779473627736801e+05, -1.778887184802234e+05, -1.778298837868274e+05, -1.777708597595482e+05, -1.777116474557579e+05,
- -1.776522479242384e+05, -1.775926622052742e+05, -1.775328913307436e+05, -1.774729363242101e+05, -1.774127982010116e+05,
- -1.773524779683464e+05, -1.772919766253628e+05, -1.772312951632433e+05, -1.771704345652897e+05, -1.771093958070045e+05,
- -1.770481798561771e+05, -1.769867876729616e+05, -1.769252202099577e+05, -1.768634784122910e+05, -1.768015632176904e+05,
- -1.767394755565636e+05, -1.766772163520768e+05, -1.766147865202258e+05, -1.765521869699124e+05, -1.764894186030162e+05,
- -1.764264823144688e+05, -1.763633789923228e+05, -1.763001095178232e+05, -1.762366747654766e+05, -1.761730756031205e+05,
- -1.761093128919889e+05, -1.760453874867822e+05, -1.759813002357311e+05, -1.759170519806613e+05, -1.758526435570593e+05,
- -1.757880757941359e+05, -1.757233495148870e+05, -1.756584655361578e+05, -1.755934246687026e+05, -1.755282277172463e+05,
- -1.754628754805423e+05, -1.753973687514333e+05, -1.753317083169085e+05, -1.752658949581612e+05, -1.751999294506455e+05,
- -1.751338125641327e+05, -1.750675450627665e+05, -1.750011277051170e+05, -1.749345612442363e+05, -1.748678464277113e+05,
- -1.748009839977149e+05, -1.747339746910602e+05, -1.746668192392509e+05, -1.745995183685330e+05, -1.745320727999436e+05,
- -1.744644832493621e+05, -1.743967504275582e+05, -1.743288750402411e+05, -1.742608577881068e+05, -1.741926993668859e+05,
- -1.741244004673898e+05, -1.740559617755582e+05, -1.739873839725030e+05, -1.739186677345549e+05, -1.738498137333071e+05,
- -1.737808226356595e+05, -1.737116951038641e+05, -1.736424317955641e+05, -1.735730333638414e+05, -1.735035004572542e+05,
- -1.734338337198819e+05, -1.733640337913652e+05, -1.732941013069446e+05, -1.732240368975034e+05, -1.731538411896089e+05
- },
- {
- 5.108239490956829e+04, 4.959293556066578e+04, 4.808683120517564e+04, 4.656359452700838e+04, 4.502271521440704e+04,
- 4.346365852908536e+04, 4.188586376486517e+04, 4.028874258386099e+04, 3.867167722076923e+04, 3.703401854154631e+04,
- 3.537508394307827e+04, 3.369415507850445e+04, 3.199047539131413e+04, 3.026324743956532e+04, 2.851162998963027e+04,
- 2.673473485675007e+04, 2.493162346737668e+04, 2.310130311580308e+04, 2.124272288495293e+04, 1.935476919845421e+04,
- 1.743626096832916e+04, 1.548594429989541e+04, 1.350248671296018e+04, 1.148447083634158e+04, 9.430387531535294e+03,
- 7.338628401418610e+03, 5.207477642553080e+03, 3.035103203995689e+03, 8.195472274818699e+02, -1.441284240543247e+03,
- -3.749632246347503e+03, -6.107896575488397e+03, -8.518647925475814e+03, -1.098464039081004e+04, -1.350882389931557e+04,
- -1.609435608040154e+04, -1.874461270676455e+04, -2.146319550767328e+04, -2.425393554787941e+04, -2.712088956823370e+04,
- -3.006832554194852e+04, -3.310069210691934e+04, -3.622256433942145e+04, -3.943855538240413e+04, -4.275317963270876e+04,
- -4.617064863018710e+04, -4.969457611587922e+04, -5.332756561324805e+04, -5.707065587239750e+04, -6.092261232385362e+04,
- -6.487908311684231e+04, -6.893168927428295e+04, -7.306718042100481e+04, -7.726683339823216e+04, -8.150626924734803e+04,
- -8.575581061959040e+04, -8.998143747204605e+04, -9.414636713472223e+04, -9.821325550096251e+04, -1.021468914303310e+05,
- -1.059170110326836e+05, -1.095006717073073e+05, -1.128839350279359e+05, -1.160612294005725e+05, -1.190339571190197e+05,
- -1.218088535830199e+05, -1.243961240482471e+05, -1.268078762745512e+05, -1.290569797917817e+05, -1.311563188613879e+05,
- -1.331183416744820e+05, -1.349548070150498e+05, -1.366766540507882e+05, -1.382939475646867e+05, -1.398158704761083e+05,
- -1.412507470935882e+05, -1.426060865696011e+05, -1.438886390605769e+05, -1.451044588429357e+05, -1.462589699361270e+05,
- -1.473570309250014e+05, -1.484029966942820e+05, -1.494007756545208e+05, -1.503538817253308e+05, -1.512654808471528e+05,
- -1.521384321374440e+05, -1.529753240213452e+05, -1.537785057828440e+05, -1.545501150292146e+05, -1.552921015627119e+05,
- -1.560062481270063e+05, -1.566941884545118e+05, -1.573574229931778e+05, -1.579973326399715e+05, -1.586151907843255e+05,
- -1.592121738569200e+05, -1.597893706548619e+05, -1.603477905686224e+05, -1.608883708786427e+05, -1.614119832431822e+05,
- -1.619194394833087e+05, -1.624114967549434e+05, -1.628888621845562e+05, -1.633521970339615e+05, -1.638021204503681e+05,
- -1.642392128500346e+05, -1.646640189773290e+05, -1.650770506754547e+05, -1.654787894004224e+05, -1.658696885058579e+05,
- -1.662501753228292e+05, -1.666206530559544e+05, -1.669815025145316e+05, -1.673330836952603e+05, -1.676757372312271e+05,
- -1.680097857201919e+05, -1.683355349437679e+05, -1.686532749878308e+05, -1.689632812733944e+05, -1.692658155062043e+05,
- -1.695611265524580e+05, -1.698494512472830e+05, -1.701310151439131e+05, -1.704060331969540e+05, -1.706747104150481e+05,
- -1.709372424459383e+05, -1.711938161459421e+05, -1.714446100237446e+05, -1.716897948213121e+05, -1.719295338840051e+05,
- -1.721639835919638e+05, -1.723932937466022e+05, -1.726176079286707e+05, -1.728370638316849e+05, -1.730517935098631e+05,
- -1.732619238801169e+05, -1.734675767383191e+05, -1.736688691617651e+05, -1.738659137185103e+05, -1.740588186933658e+05,
- -1.742476883001044e+05, -1.744326228808587e+05, -1.746137190936192e+05, -1.747910700886594e+05, -1.749647656746559e+05,
- -1.751348924752105e+05, -1.753015340764167e+05, -1.754647711660818e+05, -1.756246816651477e+05, -1.757813408518289e+05,
- -1.759348214781009e+05, -1.760851938841070e+05, -1.762325260978215e+05, -1.763768839381076e+05, -1.765183311079344e+05,
- -1.766569292836221e+05, -1.767927381994748e+05, -1.769258157280777e+05, -1.770562179565266e+05, -1.771839992588219e+05,
- -1.773092123646653e+05, -1.774319084248608e+05, -1.775521370735245e+05, -1.776699464872782e+05, -1.777853834416084e+05,
- -1.778984933645431e+05, -1.780093203878008e+05, -1.781179073955514e+05, -1.782242960709193e+05, -1.783285269403528e+05,
- -1.784306394159762e+05, -1.785306718360314e+05, -1.786286615035101e+05, -1.787246447230756e+05, -1.788186568363583e+05,
- -1.789107322557161e+05, -1.790009044965317e+05, -1.790892062081266e+05, -1.791756692033602e+05, -1.792603244869804e+05,
- -1.793432022827856e+05, -1.794243320596628e+05, -1.795037425565496e+05, -1.795814618063787e+05, -1.796575171590498e+05,
- -1.797319353034792e+05, -1.798047422671354e+05, -1.798759635215142e+05, -1.799456238759829e+05, -1.800137475790182e+05,
- -1.800803583159515e+05, -1.801454792263204e+05, -1.802091329205537e+05, -1.802713414960266e+05, -1.803321265525125e+05,
- -1.803915092070585e+05, -1.804495101083072e+05, -1.805061494502958e+05, -1.805614469857476e+05, -1.806154220388838e+05,
- -1.806680935177739e+05, -1.807194799262426e+05, -1.807695993753564e+05, -1.808184695945035e+05, -1.808661079420874e+05,
- -1.809125314158459e+05, -1.809577566628175e+05, -1.810017999889615e+05, -1.810446773684541e+05, -1.810864044526677e+05,
- -1.811269965788487e+05, -1.811664687785062e+05, -1.812048357855213e+05, -1.812421120439882e+05, -1.812783117158023e+05,
- -1.813134486879963e+05, -1.813475365798432e+05, -1.813805887497277e+05, -1.814126183018022e+05, -1.814436380924272e+05,
- -1.814736607364128e+05, -1.815026986130606e+05, -1.815307638806074e+05, -1.815578684477260e+05, -1.815840240300163e+05,
- -1.816092421215294e+05, -1.816335340083401e+05, -1.816569107735628e+05, -1.816793833022144e+05, -1.817009622859313e+05,
- -1.817216582275484e+05, -1.817414814358834e+05, -1.817604420686516e+05, -1.817785500788240e+05, -1.817958152571835e+05,
- -1.818122472266688e+05, -1.818278554462124e+05, -1.818426492144651e+05, -1.818566376734164e+05, -1.818698298119152e+05,
- -1.818822344690905e+05, -1.818938603376734e+05, -1.819047159672333e+05, -1.819148097673211e+05, -1.819241500105266e+05,
- -1.819327448354537e+05, -1.819406022496138e+05, -1.819477301322439e+05, -1.819541362370440e+05, -1.819598281948481e+05,
- -1.819648135162185e+05, -1.819690995939756e+05, -1.819726937056602e+05, -1.819756030159299e+05, -1.819778345788969e+05,
- -1.819793953404012e+05, -1.819802921402286e+05, -1.819805317142715e+05, -1.819801206966329e+05, -1.819790656216789e+05,
- -1.819773729260396e+05, -1.819750489505594e+05, -1.819720999421978e+05, -1.819685320558854e+05, -1.819643513563325e+05,
- -1.819595638197918e+05, -1.819541753357825e+05, -1.819481917087688e+05, -1.819416186597977e+05, -1.819344618280996e+05,
- -1.819267267726503e+05, -1.819184189736940e+05, -1.819095438342307e+05, -1.819001066814703e+05, -1.818901127682503e+05,
- -1.818795672744219e+05, -1.818684753082023e+05, -1.818568419074976e+05, -1.818446720411935e+05, -1.818319706104179e+05,
- -1.818187424497732e+05, -1.818049923285409e+05, -1.817907249518604e+05, -1.817759449618795e+05, -1.817606569388798e+05,
- -1.817448654023763e+05, -1.817285748121947e+05, -1.817117895695221e+05, -1.816945140179364e+05, -1.816767524444121e+05,
- -1.816585090803046e+05, -1.816397881023141e+05, -1.816205936334262e+05, -1.816009297438356e+05, -1.815808004518452e+05,
- -1.815602097247521e+05, -1.815391614797096e+05, -1.815176595845725e+05, -1.814957078587275e+05, -1.814733100739007e+05,
- -1.814504699549529e+05, -1.814271911806567e+05, -1.814034773844560e+05, -1.813793321552131e+05, -1.813547590379373e+05,
- -1.813297615344997e+05, -1.813043431043362e+05, -1.812785071651288e+05, -1.812522570934833e+05, -1.812255962255843e+05,
- -1.811985278578424e+05, -1.811710552475268e+05, -1.811431816133848e+05, -1.811149101362503e+05, -1.810862439596391e+05,
- -1.810571861903332e+05, -1.810277398989543e+05, -1.809979081205234e+05, -1.809676938550140e+05, -1.809371000678898e+05,
- -1.809061296906359e+05, -1.808747856212765e+05, -1.808430707248868e+05, -1.808109878340902e+05, -1.807785397495507e+05,
- -1.807457292404528e+05, -1.807125590449738e+05, -1.806790318707472e+05, -1.806451503953164e+05, -1.806109172665820e+05,
- -1.805763351032387e+05, -1.805414064952050e+05, -1.805061340040451e+05, -1.804705201633838e+05, -1.804345674793109e+05,
- -1.803982784307831e+05, -1.803616554700136e+05, -1.803247010228573e+05, -1.802874174891903e+05, -1.802498072432782e+05,
- -1.802118726341440e+05, -1.801736159859226e+05, -1.801350395982148e+05, -1.800961457464320e+05, -1.800569366821349e+05,
- -1.800174146333682e+05, -1.799775818049870e+05, -1.799374403789797e+05, -1.798969925147825e+05, -1.798562403495926e+05,
- -1.798151859986715e+05, -1.797738315556473e+05, -1.797321790928065e+05, -1.796902306613878e+05, -1.796479882918652e+05,
- -1.796054539942281e+05, -1.795626297582574e+05, -1.795195175537961e+05, -1.794761193310162e+05, -1.794324370206799e+05,
- -1.793884725343978e+05, -1.793442277648816e+05, -1.792997045861934e+05, -1.792549048539908e+05, -1.792098304057681e+05,
- -1.791644830610919e+05, -1.791188646218365e+05, -1.790729768724116e+05, -1.790268215799886e+05, -1.789804004947220e+05,
- -1.789337153499682e+05, -1.788867678625011e+05, -1.788395597327217e+05, -1.787920926448689e+05, -1.787443682672212e+05,
- -1.786963882523003e+05, -1.786481542370696e+05, -1.785996678431281e+05, -1.785509306769038e+05, -1.785019443298412e+05,
- -1.784527103785898e+05, -1.784032303851860e+05, -1.783535058972336e+05, -1.783035384480821e+05, -1.782533295570007e+05,
- -1.782028807293511e+05, -1.781521934567586e+05, -1.781012692172760e+05, -1.780501094755511e+05, -1.779987156829864e+05,
- -1.779470892779002e+05, -1.778952316856838e+05, -1.778431443189557e+05, -1.777908285777131e+05, -1.777382858494849e+05,
- -1.776855175094759e+05, -1.776325249207164e+05, -1.775793094342035e+05, -1.775258723890423e+05, -1.774722151125876e+05,
- -1.774183389205785e+05, -1.773642451172763e+05, -1.773099349955959e+05, -1.772554098372378e+05, -1.772006709128189e+05,
- -1.771457194819986e+05, -1.770905567936050e+05, -1.770351840857591e+05, -1.769796025859982e+05, -1.769238135113936e+05,
- -1.768678180686728e+05, -1.768116174543333e+05, -1.767552128547608e+05, -1.766986054463419e+05, -1.766417963955754e+05,
- -1.765847868591845e+05, -1.765275779842257e+05, -1.764701709081939e+05, -1.764125667591335e+05, -1.763547666557374e+05,
- -1.762967717074541e+05, -1.762385830145877e+05, -1.761802016683983e+05, -1.761216287512016e+05, -1.760628653364670e+05,
- -1.760039124889113e+05, -1.759447712645962e+05, -1.758854427110218e+05, -1.758259278672175e+05, -1.757662277638344e+05,
- -1.757063434232349e+05, -1.756462758595813e+05, -1.755860260789238e+05, -1.755255950792849e+05, -1.754649838507487e+05,
- -1.754041933755409e+05, -1.753432246281132e+05, -1.752820785752270e+05, -1.752207561760301e+05, -1.751592583821411e+05,
- -1.750975861377243e+05, -1.750357403795700e+05, -1.749737220371695e+05, -1.749115320327914e+05, -1.748491712815571e+05,
- -1.747866406915124e+05, -1.747239411637017e+05, -1.746610735922409e+05, -1.745980388643852e+05, -1.745348378606020e+05,
- -1.744714714546391e+05, -1.744079405135922e+05, -1.743442458979731e+05, -1.742803884617759e+05, -1.742163690525423e+05,
- -1.741521885114273e+05, -1.740878476732626e+05, -1.740233473666199e+05, -1.739586884138737e+05, -1.738938716312626e+05,
- -1.738288978289495e+05, -1.737637678110832e+05, -1.736984823758569e+05, -1.736330423155670e+05, -1.735674484166716e+05,
- -1.735017014598454e+05, -1.734358022200404e+05, -1.733697514665372e+05, -1.733035499630031e+05, -1.732371984675464e+05,
- -1.731706977327688e+05, -1.731040485058186e+05, -1.730372515284456e+05, -1.729703075370503e+05, -1.729032172627358e+05,
- -1.728359814313603e+05, -1.727686007635836e+05, -1.727010759749211e+05, -1.726334077757880e+05, -1.725655968715516e+05,
- -1.724976439625748e+05, -1.724295497442684e+05, -1.723613149071338e+05, -1.722929401368086e+05, -1.722244261141169e+05,
- -1.721557735151085e+05, -1.720869830111065e+05, -1.720180552687507e+05, -1.719489909500415e+05, -1.718797907123817e+05,
- -1.718104552086194e+05, -1.717409850870903e+05, -1.716713809916591e+05, -1.716016435617593e+05, -1.715317734324357e+05
- },
- {
- 5.198436891813945e+04, 5.050466635288760e+04, 4.900865389191164e+04, 4.749586215490290e+04, 4.596580006494057e+04,
- 4.441795353355158e+04, 4.285178404755135e+04, 4.126672714719625e+04, 3.966219078793075e+04, 3.803755357394519e+04,
- 3.639216285236784e+04, 3.472533265528574e+04, 3.303634147560907e+04, 3.132442986144292e+04, 2.958879781217015e+04,
- 2.782860195788491e+04, 2.604295250215495e+04, 2.423090990635589e+04, 2.239148129203981e+04, 2.052361653603173e+04,
- 1.862620403126492e+04, 1.669806608489245e+04, 1.473795392411773e+04, 1.274454227971820e+04, 1.071642351774802e+04,
- 8.652101291894583e+03, 6.549983693128698e+03, 4.408375880498234e+03, 2.225472189480957e+03, -6.522693718942207e-01,
- -2.272050478380635e+03, -4.590912766824449e+03, -6.959576311119047e+03, -9.380534664923945e+03, -1.185644693853808e+04,
- -1.439014622856431e+04, -1.698464639561314e+04, -1.964314626796559e+04, -2.236902966920086e+04, -2.516585913746470e+04,
- -2.803736030574881e+04, -3.098739272398119e+04, -3.401990129925421e+04, -3.713884042038076e+04, -4.034806016696902e+04,
- -4.365114086730103e+04, -4.705115907266087e+04, -5.055036580611918e+04, -5.414975886045396e+04, -5.784853846180581e+04,
- -6.164345429283773e+04, -6.552808471666666e+04, -6.949213294388499e+04, -7.352086577175674e+04, -7.759483608187687e+04,
- -8.169000557385641e+04, -8.577833032739411e+04, -8.982882152168704e+04, -9.380906378527751e+04, -9.768713218695958e+04,
- -1.014337460964565e+05, -1.050243496461944e+05, -1.084407468750799e+05, -1.116721347658890e+05, -1.147144645843050e+05,
- -1.175693887640633e+05, -1.202429069397989e+05, -1.227438938912961e+05, -1.250828497147594e+05, -1.272709719931017e+05,
- -1.293195327748359e+05, -1.312394918900178e+05, -1.330412723477924e+05, -1.347346393718176e+05, -1.363286433214832e+05,
- -1.378316031697431e+05, -1.392511162983431e+05, -1.405940861118569e+05, -1.418667615491009e+05, -1.430747839823900e+05,
- -1.442232379071750e+05, -1.453167025932198e+05, -1.463593025840985e+05, -1.473547555834407e+05, -1.483064168233927e+05,
- -1.492173194545790e+05, -1.500902108265038e+05, -1.509275847548045e+05, -1.517317100154495e+05, -1.525046553856405e+05,
- -1.532483115849058e+05, -1.539644104698576e+05, -1.546545418394642e+05, -1.553201681196047e+05, -1.559626372660034e+05,
- -1.565831940868419e+05, -1.571829902177302e+05, -1.577630929304964e+05, -1.583244929339134e+05, -1.588681113013083e+05,
- -1.593948056400339e+05, -1.599053756007754e+05, -1.604005678102132e+05, -1.608810802984341e+05, -1.613475664822174e+05,
- -1.618006387567370e+05, -1.622408717409619e+05, -1.626688052159325e+05, -1.630849467899246e+05, -1.634897743201277e+05,
- -1.638837381167454e+05, -1.642672629522222e+05, -1.646407498955864e+05, -1.650045779895314e+05, -1.653591057858297e+05,
- -1.657046727529055e+05, -1.660416005678591e+05, -1.663701943038873e+05, -1.666907435228748e+05, -1.670035232818936e+05,
- -1.673087950614400e+05, -1.676068076242596e+05, -1.678977977999101e+05, -1.681819912291636e+05, -1.684596030347686e+05,
- -1.687308384708817e+05, -1.689958934318890e+05, -1.692549551111412e+05, -1.695082024247748e+05, -1.697558065017929e+05,
- -1.699979311215250e+05, -1.702347331230047e+05, -1.704663627833964e+05, -1.706929641720517e+05, -1.709146754093859e+05,
- -1.711316292143568e+05, -1.713439528983523e+05, -1.715517688060351e+05, -1.717551945335175e+05, -1.719543431675625e+05,
- -1.721493235101537e+05, -1.723402402894692e+05, -1.725271943582285e+05, -1.727102828802899e+05, -1.728895995063136e+05,
- -1.730652345392386e+05, -1.732372750902650e+05, -1.734058052259786e+05, -1.735709061072052e+05, -1.737326561192537e+05,
- -1.738911309994728e+05, -1.740464039487713e+05, -1.741985457463168e+05, -1.743476248534381e+05, -1.744937075129805e+05,
- -1.746368578434466e+05, -1.747771379282530e+05, -1.749146079003973e+05, -1.750493260228117e+05, -1.751813487646600e+05,
- -1.753107308738248e+05, -1.754375254458006e+05, -1.755617839892070e+05, -1.756835564881170e+05, -1.758028914613787e+05,
- -1.759198360191064e+05, -1.760344359164966e+05, -1.761467356051168e+05, -1.762567782818114e+05, -1.763646059353516e+05,
- -1.764702593909513e+05, -1.765737783527675e+05, -1.766752014444897e+05, -1.767745662481216e+05, -1.768719093410462e+05,
- -1.769672663314715e+05, -1.770606718923310e+05, -1.771521597937262e+05, -1.772417629339801e+05, -1.773295133693750e+05,
- -1.774154423426386e+05, -1.774995803102423e+05, -1.775819569685659e+05, -1.776626012789932e+05, -1.777415414919791e+05,
- -1.778188051701472e+05, -1.778944191889703e+05, -1.779684098426193e+05, -1.780408027396031e+05, -1.781116229042888e+05,
- -1.781808947756351e+05, -1.782486422253399e+05, -1.783148885752945e+05, -1.783796566143717e+05, -1.784429686145802e+05,
- -1.785048463466127e+05, -1.785653110948139e+05, -1.786243836715967e+05, -1.786820844313287e+05, -1.787384332837111e+05,
- -1.787934497066745e+05, -1.788471527588114e+05, -1.788995610913634e+05, -1.789506929597865e+05, -1.790005662349041e+05,
- -1.790491984136763e+05, -1.790966066295904e+05, -1.791428076626950e+05, -1.791878179492909e+05, -1.792316535912895e+05,
- -1.792743303652587e+05, -1.793158637311617e+05, -1.793562688408065e+05, -1.793955605460134e+05, -1.794337534065151e+05,
- -1.794708616975982e+05, -1.795068994174945e+05, -1.795418802945372e+05, -1.795758177940824e+05, -1.796087251252143e+05,
- -1.796406152472365e+05, -1.796715008759572e+05, -1.797013944897800e+05, -1.797303083356031e+05, -1.797582544345398e+05,
- -1.797852445968863e+05, -1.798112903899434e+05, -1.798364031992995e+05, -1.798605941966785e+05, -1.798838743540970e+05,
- -1.799062544486179e+05, -1.799277450567696e+05, -1.799483565997370e+05, -1.799680992867630e+05, -1.799869831599031e+05,
- -1.800050180880178e+05, -1.800222137707507e+05, -1.800385797423965e+05, -1.800541253756555e+05, -1.800688598852844e+05,
- -1.800827923316424e+05, -1.800959316241404e+05, -1.801082865245913e+05, -1.801198656504696e+05, -1.801306774780818e+05,
- -1.801407303456472e+05, -1.801500324562979e+05, -1.801585918809962e+05, -1.801664165613730e+05, -1.801735143124908e+05,
- -1.801798928255341e+05, -1.801855596704262e+05, -1.801905222983784e+05, -1.801947880443728e+05, -1.801983641295797e+05,
- -1.802012576637118e+05, -1.802034756473187e+05, -1.802050249740219e+05, -1.802059124326924e+05, -1.802061447095747e+05,
- -1.802057283903534e+05, -1.802046699621719e+05, -1.802029758155995e+05, -1.802006522465461e+05, -1.801977054581351e+05,
- -1.801941415625251e+05, -1.801899665826907e+05, -1.801851864541573e+05, -1.801798070266941e+05, -1.801738340659680e+05,
- -1.801672732551551e+05, -1.801601301965159e+05, -1.801524104129318e+05, -1.801441193494047e+05, -1.801352623745227e+05,
- -1.801258447818893e+05, -1.801158717915229e+05, -1.801053485512189e+05, -1.800942801378830e+05, -1.800826715588343e+05,
- -1.800705277530778e+05, -1.800578535925461e+05, -1.800446538833161e+05, -1.800309333667953e+05, -1.800166967208835e+05,
- -1.800019485611072e+05, -1.799866934417288e+05, -1.799709358568317e+05, -1.799546802413809e+05, -1.799379309722602e+05,
- -1.799206923692881e+05, -1.799029686962088e+05, -1.798847641616636e+05, -1.798660829201415e+05, -1.798469290729086e+05,
- -1.798273066689167e+05, -1.798072197056945e+05, -1.797866721302180e+05, -1.797656678397652e+05, -1.797442106827477e+05,
- -1.797223044595304e+05, -1.796999529232313e+05, -1.796771597805051e+05, -1.796539286923098e+05, -1.796302632746581e+05,
- -1.796061670993553e+05, -1.795816436947173e+05, -1.795566965462803e+05, -1.795313290974899e+05, -1.795055447503802e+05,
- -1.794793468662383e+05, -1.794527387662549e+05, -1.794257237321629e+05, -1.793983050068615e+05, -1.793704857950299e+05,
- -1.793422692637293e+05, -1.793136585429893e+05, -1.792846567263876e+05, -1.792552668716156e+05, -1.792254920010326e+05,
- -1.791953351022124e+05, -1.791647991284755e+05, -1.791338869994136e+05, -1.791026016014033e+05, -1.790709457881099e+05,
- -1.790389223809826e+05, -1.790065341697385e+05, -1.789737839128390e+05, -1.789406743379569e+05, -1.789072081424349e+05,
- -1.788733879937346e+05, -1.788392165298786e+05, -1.788046963598842e+05, -1.787698300641874e+05, -1.787346201950614e+05,
- -1.786990692770268e+05, -1.786631798072524e+05, -1.786269542559525e+05, -1.785903950667728e+05, -1.785535046571731e+05,
- -1.785162854188012e+05, -1.784787397178588e+05, -1.784408698954647e+05, -1.784026782680079e+05, -1.783641671274961e+05,
- -1.783253387418991e+05, -1.782861953554827e+05, -1.782467391891412e+05, -1.782069724407199e+05, -1.781668972853362e+05,
- -1.781265158756911e+05, -1.780858303423775e+05, -1.780448427941847e+05, -1.780035553183928e+05, -1.779619699810681e+05,
- -1.779200888273482e+05, -1.778779138817263e+05, -1.778354471483286e+05, -1.777926906111857e+05, -1.777496462345046e+05,
- -1.777063159629293e+05, -1.776627017218033e+05, -1.776188054174222e+05, -1.775746289372873e+05, -1.775301741503511e+05,
- -1.774854429072615e+05, -1.774404370405986e+05, -1.773951583651124e+05, -1.773496086779520e+05, -1.773037897588953e+05,
- -1.772577033705689e+05, -1.772113512586725e+05, -1.771647351521941e+05, -1.771178567636222e+05, -1.770707177891565e+05,
- -1.770233199089143e+05, -1.769756647871338e+05, -1.769277540723735e+05, -1.768795893977097e+05, -1.768311723809302e+05,
- -1.767825046247246e+05, -1.767335877168720e+05, -1.766844232304261e+05, -1.766350127238974e+05, -1.765853577414324e+05,
- -1.765354598129885e+05, -1.764853204545106e+05, -1.764349411680974e+05, -1.763843234421762e+05, -1.763334687516635e+05,
- -1.762823785581293e+05, -1.762310543099606e+05, -1.761794974425169e+05, -1.761277093782878e+05, -1.760756915270463e+05,
- -1.760234452859994e+05, -1.759709720399396e+05, -1.759182731613892e+05, -1.758653500107466e+05, -1.758122039364290e+05,
- -1.757588362750108e+05, -1.757052483513661e+05, -1.756514414788017e+05, -1.755974169591921e+05, -1.755431760831147e+05,
- -1.754887201299758e+05, -1.754340503681435e+05, -1.753791680550732e+05, -1.753240744374303e+05, -1.752687707512177e+05,
- -1.752132582218937e+05, -1.751575380644936e+05, -1.751016114837474e+05, -1.750454796741954e+05, -1.749891438203038e+05,
- -1.749326050965783e+05, -1.748758646676731e+05, -1.748189236885053e+05, -1.747617833043587e+05, -1.747044446509929e+05,
- -1.746469088547490e+05, -1.745891770326532e+05, -1.745312502925193e+05, -1.744731297330494e+05, -1.744148164439346e+05,
- -1.743563115059526e+05, -1.742976159910644e+05, -1.742387309625119e+05, -1.741796574749095e+05, -1.741203965743404e+05,
- -1.740609492984453e+05, -1.740013166765158e+05, -1.739414997295812e+05, -1.738814994704999e+05, -1.738213169040434e+05,
- -1.737609530269839e+05, -1.737004088281783e+05, -1.736396852886534e+05, -1.735787833816851e+05, -1.735177040728836e+05,
- -1.734564483202721e+05, -1.733950170743644e+05, -1.733334112782473e+05, -1.732716318676535e+05, -1.732096797710409e+05,
- -1.731475559096661e+05, -1.730852611976598e+05, -1.730227965420990e+05, -1.729601628430815e+05, -1.728973609937945e+05,
- -1.728343918805872e+05, -1.727712563830398e+05, -1.727079553740320e+05, -1.726444897198119e+05, -1.725808602800612e+05,
- -1.725170679079631e+05, -1.724531134502671e+05, -1.723889977473537e+05, -1.723247216332971e+05, -1.722602859359292e+05,
- -1.721956914769018e+05, -1.721309390717465e+05, -1.720660295299380e+05, -1.720009636549510e+05, -1.719357422443210e+05,
- -1.718703660897026e+05, -1.718048359769264e+05, -1.717391526860566e+05, -1.716733169914472e+05, -1.716073296617972e+05,
- -1.715411914602068e+05, -1.714749031442286e+05, -1.714084654659251e+05, -1.713418791719186e+05, -1.712751450034450e+05,
- -1.712082636964048e+05, -1.711412359814147e+05, -1.710740625838579e+05, -1.710067442239332e+05, -1.709392816167049e+05,
- -1.708716754721508e+05, -1.708039264952133e+05, -1.707360353858410e+05, -1.706680028390419e+05, -1.705998295449252e+05,
- -1.705315161887503e+05, -1.704630634509686e+05, -1.703944720072733e+05, -1.703257425286385e+05, -1.702568756813670e+05,
- -1.701878721271300e+05, -1.701187325230132e+05, -1.700494575215569e+05, -1.699800477707980e+05, -1.699105039143123e+05
- },
- {
- 5.288730024875355e+04, 5.141725029408513e+04, 4.993121822624127e+04, 4.842875193481609e+04, 4.690937884257387e+04,
- 4.537260469806220e+04, 4.381791228113525e+04, 4.224476001222261e+04, 4.065258045914466e+04, 3.904077873137681e+04,
- 3.740873075252078e+04, 3.575578140037129e+04, 3.408124250308913e+04, 3.238439067898921e+04, 3.066446500638787e+04,
- 2.892066450884496e+04, 2.715214543999484e+04, 2.535801835101641e+04, 2.353734492268718e+04, 2.168913454295714e+04,
- 1.981234061015583e+04, 1.790585654142838e+04, 1.596851146595871e+04, 1.399906558321795e+04, 1.199620516820922e+04,
- 9.958537208919894e+03, 7.884583666577449e+03, 5.772775357699295e+03, 3.621445469400761e+03, 1.428822738579409e+03,
- -8.069756499402167e+02, -3.087951350570581e+03, -5.416232183760208e+03, -7.794079287141397e+03, -1.022389373737283e+04,
- -1.270822224355900e+04, -1.524976119512467e+04, -1.785135813428268e+04, -2.051600941861169e+04, -2.324685223532549e+04,
- -2.604714853154918e+04, -2.892025750260283e+04, -3.186959210204155e+04, -3.489855351419574e+04, -3.801043564519225e+04,
- -4.120828951072337e+04, -4.449473520205129e+04, -4.787170756319811e+04, -5.134012213120011e+04, -5.489945246157639e+04,
- -5.854722160101658e+04, -6.227843164109733e+04, -6.608498551839594e+04, -6.995518763989458e+04, -7.387343073212549e+04,
- -7.782017111083599e+04, -8.177226055552762e+04, -8.570365559971004e+04, -8.958648607092562e+04, -9.339243733579291e+04,
- -9.709436122989209e+04, -1.006679584694841e+05, -1.040932944682872e+05, -1.073559113228848e+05, -1.104474238987166e+05,
- -1.133649556596708e+05, -1.161103044902320e+05, -1.186888315421314e+05, -1.211082920128278e+05, -1.233778335891933e+05,
- -1.255072389462936e+05, -1.275064047828203e+05, -1.293850095832954e+05, -1.311523147094791e+05, -1.328170526661417e+05,
- -1.343873703423821e+05, -1.358708069562600e+05, -1.372742948077501e+05, -1.386041755708039e+05, -1.398662273700037e+05,
- -1.410656990866928e+05, -1.422073490329447e+05, -1.432954856546796e+05, -1.443340084115317e+05, -1.453264474490408e+05,
- -1.462760011077762e+05, -1.471855706813711e+05, -1.480577921291934e+05, -1.488950646661690e+05, -1.496995763256994e+05,
- -1.504733266279657e+05, -1.512181466460826e+05, -1.519357166808647e+05, -1.526275818230599e+05, -1.532951656495249e+05,
- -1.539397822846789e+05, -1.545626470362938e+05, -1.551648857912421e+05, -1.557475433338996e+05, -1.563115907285410e+05,
- -1.568579318877404e+05, -1.573874094317142e+05, -1.579008099286594e+05, -1.583988685933300e+05, -1.588822735101398e+05,
- -1.593516694377651e+05, -1.598076612443134e+05, -1.602508170154400e+05, -1.606816708721108e+05, -1.611007255299122e+05,
- -1.615084546276982e+05, -1.619053048499049e+05, -1.622916978638552e+05, -1.626680320908318e+05, -1.630346843274951e+05,
- -1.633920112323076e+05, -1.637403506899893e+05, -1.640800230655748e+05, -1.644113323584056e+05, -1.647345672671786e+05,
- -1.650500021626767e+05, -1.653578980052181e+05, -1.656585031732156e+05, -1.659520542396248e+05, -1.662387766891086e+05,
- -1.665188856003127e+05, -1.667925861911245e+05, -1.670600745031274e+05, -1.673215378575544e+05, -1.675771553711321e+05,
- -1.678270984189770e+05, -1.680715310661694e+05, -1.683106104675031e+05, -1.685444872422371e+05, -1.687733057412670e+05,
- -1.689972046508588e+05, -1.692163169497544e+05, -1.694307703976617e+05, -1.696406877604023e+05, -1.698461870625469e+05,
- -1.700473818245682e+05, -1.702443812856117e+05, -1.704372906129028e+05, -1.706262110987233e+05, -1.708112403458178e+05,
- -1.709924724420241e+05, -1.711699981248556e+05, -1.713439049367137e+05, -1.715142773704185e+05, -1.716811970113365e+05,
- -1.718447426621098e+05, -1.720049904702329e+05, -1.721620140438192e+05, -1.723158845621546e+05, -1.724666708803773e+05,
- -1.726144396286538e+05, -1.727592553061853e+05, -1.729011803703638e+05, -1.730402753213697e+05, -1.731765987824838e+05,
- -1.733102075763695e+05, -1.734411567975595e+05, -1.735694998813756e+05, -1.736952886694774e+05, -1.738185734722422e+05,
- -1.739394031281525e+05, -1.740578250603590e+05, -1.741738853305794e+05, -1.742876286904775e+05, -1.743990986306652e+05,
- -1.745083374274508e+05, -1.746153861874632e+05, -1.747202848902583e+05, -1.748230724290198e+05, -1.749237866494520e+05,
- -1.750224643869626e+05, -1.751191415022185e+05, -1.752138529151651e+05, -1.753066326375813e+05, -1.753975138042503e+05,
- -1.754865287028099e+05, -1.755737088023524e+05, -1.756590847808340e+05, -1.757426865513543e+05, -1.758245432873566e+05,
- -1.759046834468063e+05, -1.759831347953931e+05, -1.760599244060711e+05, -1.761350787699413e+05, -1.762086236846741e+05,
- -1.762805843609551e+05, -1.763509854201205e+05, -1.764198509124022e+05, -1.764872043344728e+05, -1.765530686463245e+05,
- -1.766174662875128e+05, -1.766804191927909e+05, -1.767419488071642e+05, -1.768020761003855e+05, -1.768608215809259e+05,
- -1.769182053094297e+05, -1.769742469116894e+05, -1.770289655911508e+05, -1.770823801409752e+05, -1.771345089556736e+05,
- -1.771853700423326e+05, -1.772349810314461e+05, -1.772833591873773e+05, -1.773305214184526e+05, -1.773764842867166e+05,
- -1.774212640173522e+05, -1.774648765077834e+05, -1.775073373364749e+05, -1.775486617714344e+05, -1.775888647784373e+05,
- -1.776279610289789e+05, -1.776659649079680e+05, -1.777028905211682e+05, -1.777387517024039e+05, -1.777735620205294e+05,
- -1.778073347861810e+05, -1.778400830583115e+05, -1.778718196505228e+05, -1.779025571371972e+05, -1.779323078594402e+05,
- -1.779610839308387e+05, -1.779888972430434e+05, -1.780157594711796e+05, -1.780416820893877e+05, -1.780666763348923e+05,
- -1.780907532742286e+05, -1.781139237673408e+05, -1.781361984715581e+05, -1.781575878892254e+05, -1.781781023075473e+05,
- -1.781977518457539e+05, -1.782165464485307e+05, -1.782344958900279e+05, -1.782516097777565e+05, -1.782678975563704e+05,
- -1.782833685113460e+05, -1.782980317725539e+05, -1.783118963177337e+05, -1.783249709758711e+05, -1.783372644304814e+05,
- -1.783487852228035e+05, -1.783595417549051e+05, -1.783695422927056e+05, -1.783787949689144e+05, -1.783873077858925e+05,
- -1.783950886184375e+05, -1.784021452164911e+05, -1.784084852077801e+05, -1.784141161003839e+05, -1.784190452852347e+05,
- -1.784232800385570e+05, -1.784268275242368e+05, -1.784296947961366e+05, -1.784318888003454e+05, -1.784334163773755e+05,
- -1.784342842643008e+05, -1.784344990968418e+05, -1.784340674114003e+05, -1.784329956470372e+05, -1.784312901474090e+05,
- -1.784289571626511e+05, -1.784260028512143e+05, -1.784224332816612e+05, -1.784182544344127e+05, -1.784134722034564e+05,
- -1.784080923980118e+05, -1.784021207441550e+05, -1.783955628864078e+05, -1.783884243892836e+05, -1.783807107388013e+05,
- -1.783724273439624e+05, -1.783635795381906e+05, -1.783541725807418e+05, -1.783442116580786e+05, -1.783337018852145e+05,
- -1.783226483070254e+05, -1.783110558995334e+05, -1.782989295711585e+05, -1.782862741639451e+05, -1.782730944547580e+05,
- -1.782593951564514e+05, -1.782451809190150e+05, -1.782304563306898e+05, -1.782152259190643e+05, -1.781994941521420e+05,
- -1.781832654393869e+05, -1.781665441327474e+05, -1.781493345276563e+05, -1.781316408640094e+05, -1.781134673271231e+05,
- -1.780948180486721e+05, -1.780756971076054e+05, -1.780561085310439e+05, -1.780360562951578e+05, -1.780155443260288e+05,
- -1.779945765004889e+05, -1.779731566469448e+05, -1.779512885461857e+05, -1.779289759321724e+05, -1.779062224928100e+05,
- -1.778830318707078e+05, -1.778594076639177e+05, -1.778353534266647e+05, -1.778108726700565e+05, -1.777859688627816e+05,
- -1.777606454317927e+05, -1.777349057629763e+05, -1.777087532018099e+05, -1.776821910540035e+05, -1.776552225861308e+05,
- -1.776278510262468e+05, -1.776000795644947e+05, -1.775719113536973e+05, -1.775433495099414e+05, -1.775143971131476e+05,
- -1.774850572076287e+05, -1.774553328026424e+05, -1.774252268729252e+05, -1.773947423592230e+05, -1.773638821688087e+05,
- -1.773326491759892e+05, -1.773010462226053e+05, -1.772690761185189e+05, -1.772367416420950e+05, -1.772040455406703e+05,
- -1.771709905310163e+05, -1.771375792997928e+05, -1.771038145039917e+05, -1.770696987713764e+05, -1.770352347009069e+05,
- -1.770004248631630e+05, -1.769652718007583e+05, -1.769297780287431e+05, -1.768939460350050e+05, -1.768577782806589e+05,
- -1.768212772004309e+05, -1.767844452030374e+05, -1.767472846715530e+05, -1.767097979637749e+05, -1.766719874125824e+05,
- -1.766338553262861e+05, -1.765954039889715e+05, -1.765566356608424e+05, -1.765175525785482e+05, -1.764781569555147e+05,
- -1.764384509822661e+05, -1.763984368267366e+05, -1.763581166345857e+05, -1.763174925295006e+05, -1.762765666134966e+05,
- -1.762353409672116e+05, -1.761938176501971e+05, -1.761519987012017e+05, -1.761098861384509e+05, -1.760674819599245e+05,
- -1.760247881436247e+05, -1.759818066478436e+05, -1.759385394114255e+05, -1.758949883540232e+05, -1.758511553763515e+05,
- -1.758070423604358e+05, -1.757626511698588e+05, -1.757179836499984e+05, -1.756730416282669e+05, -1.756278269143436e+05,
- -1.755823413004035e+05, -1.755365865613426e+05, -1.754905644550023e+05, -1.754442767223837e+05, -1.753977250878666e+05,
- -1.753509112594189e+05, -1.753038369288038e+05, -1.752565037717871e+05, -1.752089134483364e+05, -1.751610676028212e+05,
- -1.751129678642073e+05, -1.750646158462492e+05, -1.750160131476792e+05, -1.749671613523940e+05, -1.749180620296376e+05,
- -1.748687167341834e+05, -1.748191270065081e+05, -1.747692943729725e+05, -1.747192203459890e+05, -1.746689064241924e+05,
- -1.746183540926105e+05, -1.745675648228225e+05, -1.745165400731278e+05, -1.744652812886999e+05, -1.744137899017484e+05,
- -1.743620673316694e+05, -1.743101149852030e+05, -1.742579342565791e+05, -1.742055265276691e+05, -1.741528931681296e+05,
- -1.741000355355471e+05, -1.740469549755783e+05, -1.739936528220922e+05, -1.739401303973047e+05, -1.738863890119174e+05,
- -1.738324299652487e+05, -1.737782545453640e+05, -1.737238640292111e+05, -1.736692596827415e+05, -1.736144427610399e+05,
- -1.735594145084499e+05, -1.735041761586913e+05, -1.734487289349857e+05, -1.733930740501731e+05, -1.733372127068296e+05,
- -1.732811460973838e+05, -1.732248754042288e+05, -1.731684017998369e+05, -1.731117264468692e+05, -1.730548504982847e+05,
- -1.729977750974493e+05, -1.729405013782397e+05, -1.728830304651518e+05, -1.728253634734000e+05, -1.727675015090225e+05,
- -1.727094456689784e+05, -1.726511970412512e+05, -1.725927567049429e+05, -1.725341257303715e+05, -1.724753051791673e+05,
- -1.724162961043653e+05, -1.723570995504977e+05, -1.722977165536868e+05, -1.722381481417349e+05, -1.721783953342103e+05,
- -1.721184591425393e+05, -1.720583405700896e+05, -1.719980406122569e+05, -1.719375602565496e+05, -1.718769004826708e+05,
- -1.718160622626010e+05, -1.717550465606798e+05, -1.716938543336838e+05, -1.716324865309082e+05, -1.715709440942424e+05,
- -1.715092279582474e+05, -1.714473390502325e+05, -1.713852782903297e+05, -1.713230465915659e+05, -1.712606448599398e+05,
- -1.711980739944892e+05, -1.711353348873659e+05, -1.710724284239039e+05, -1.710093554826885e+05, -1.709461169356262e+05,
- -1.708827136480113e+05, -1.708191464785917e+05, -1.707554162796369e+05, -1.706915238970016e+05, -1.706274701701881e+05,
- -1.705632559324158e+05, -1.704988820106749e+05, -1.704343492257972e+05, -1.703696583925103e+05, -1.703048103195015e+05,
- -1.702398058094764e+05, -1.701746456592180e+05, -1.701093306596436e+05, -1.700438615958647e+05, -1.699782392472411e+05,
- -1.699124643874377e+05, -1.698465377844809e+05, -1.697804602008120e+05, -1.697142323933407e+05, -1.696478551135011e+05,
- -1.695813291073005e+05, -1.695146551153757e+05, -1.694478338730407e+05, -1.693808661103389e+05, -1.693137525520950e+05,
- -1.692464939179616e+05, -1.691790909224702e+05, -1.691115442750796e+05, -1.690438546802218e+05, -1.689760228373531e+05,
- -1.689080494409966e+05, -1.688399351807914e+05, -1.687716807415360e+05, -1.687032868032359e+05, -1.686347540411470e+05,
- -1.685660831258183e+05, -1.684972747231377e+05, -1.684283294943738e+05, -1.683592480962183e+05, -1.682900311808304e+05
- },
- {
- 5.379118735814024e+04, 5.233068744732587e+04, 5.085452606679797e+04, 4.936226773702975e+04, 4.785345767597408e+04,
- 4.632762069145877e+04, 4.478425999657267e+04, 4.322285594002286e+04, 4.164286464659928e+04, 4.004371655911829e+04,
- 3.842481487428589e+04, 3.678553386376602e+04, 3.512521707111545e+04, 3.344317537452702e+04, 3.173868490458740e+04,
- 3.001098480551163e+04, 2.825927482759457e+04, 2.648271273794483e+04, 2.468041153599033e+04, 2.285143645982596e+04,
- 2.099480176930471e+04, 1.910946729197255e+04, 1.719433471868200e+04, 1.524824363721610e+04, 1.326996729481845e+04,
- 1.125820808457466e+04, 9.211592756686854e+03, 7.128667364585354e+03, 5.007891968554592e+03, 2.847635137376500e+03,
- 6.461683142411090e+02, -1.598339854276670e+03, -3.887829076776871e+03, -6.224352656820571e+03, -8.610082085013310e+03,
- -1.104731062597262e+04, -1.353845523421001e+04, -1.608605608134420e+04, -1.869277251666221e+04, -2.136137405891443e+04,
- -2.409472436291365e+04, -2.689575550101736e+04, -2.976742899629839e+04, -3.271267894034141e+04, -3.573433118354299e+04,
- -3.883499106032593e+04, -4.201689059344206e+04, -4.528168504467124e+04, -4.863018887863543e+04, -5.206204405912039e+04,
- -5.557532098268929e+04, -5.916606610561153e+04, -6.282783085880367e+04, -6.655124062974534e+04, -7.032368254114113e+04,
- -7.412919571333370e+04, -7.794863075658103e+04, -8.176011028824786e+04, -8.553978351392846e+04, -8.926283814668233e+04,
- -9.290471016012890e+04, -9.644240134497621e+04, -9.985576995347416e+04, -1.031286210186468e+05, -1.062494491419619e+05,
- -1.092117492399932e+05, -1.120135471082024e+05, -1.146567131189946e+05, -1.171460537661463e+05, -1.194883779941730e+05,
- -1.216916907491087e+05, -1.237645723525678e+05, -1.257157418981743e+05, -1.275537715054290e+05, -1.292869102319567e+05,
- -1.309229815891094e+05, -1.324693283236724e+05, -1.339327873594203e+05, -1.353196845145101e+05, -1.366358427907864e+05,
- -1.378866002625281e+05, -1.390768347227298e+05, -1.402109928195139e+05, -1.412931217903579e+05, -1.423269022287538e+05,
- -1.433156806417369e+05, -1.442625008699294e+05, -1.451701337494118e+05, -1.460411045863833e+05, -1.468777183083919e+05,
- -1.476820822089421e+05, -1.484561263657424e+05, -1.492016218610903e+05, -1.499201969750842e+05, -1.506133515404294e+05,
- -1.512824696507913e+05, -1.519288309081261e+05, -1.525536203819909e+05, -1.531579374383926e+05, -1.537428035791350e+05,
- -1.543091694162058e+05, -1.548579208902056e+05, -1.553898848276346e+05, -1.559058339191567e+05, -1.564064911898095e+05,
- -1.568925340224033e+05, -1.573645977870133e+05, -1.578232791222627e+05, -1.582691389079847e+05, -1.587027049636074e+05,
- -1.591244745021478e+05, -1.595349163658934e+05, -1.599344730665966e+05, -1.603235626502172e+05, -1.607025804038549e+05,
- -1.610719004204516e+05, -1.614318770350586e+05, -1.617828461449178e+05, -1.621251264260267e+05, -1.624590204451183e+05,
- -1.627848157032519e+05, -1.631027855814375e+05, -1.634131902238790e+05, -1.637162773534554e+05, -1.640122830460429e+05,
- -1.643014323526392e+05, -1.645839400708536e+05, -1.648600112647760e+05, -1.651298418482525e+05, -1.653936191075294e+05,
- -1.656515221895891e+05, -1.659037225552166e+05, -1.661503844010843e+05, -1.663916650549393e+05, -1.666277152476310e+05,
- -1.668586797864609e+05, -1.670846974570173e+05, -1.673059015710538e+05, -1.675224201960321e+05, -1.677343764213336e+05,
- -1.679418886081427e+05, -1.681450706241609e+05, -1.683440320642236e+05, -1.685388784578044e+05, -1.687297114643146e+05,
- -1.689166290570305e+05, -1.690997256964239e+05, -1.692790924926286e+05, -1.694548173636616e+05, -1.696269851748188e+05,
- -1.697956778804619e+05, -1.699609746529089e+05, -1.701229520053642e+05, -1.702816839082428e+05, -1.704372418992999e+05,
- -1.705896951879483e+05, -1.707391107541284e+05, -1.708855534420586e+05, -1.710290860491781e+05, -1.711697694105720e+05,
- -1.713076624791448e+05, -1.714428224017918e+05, -1.715753045918091e+05, -1.717051627977517e+05, -1.718324491689498e+05,
- -1.719572143178696e+05, -1.720795073795000e+05, -1.721993760679289e+05, -1.723168667302677e+05, -1.724320243980673e+05,
- -1.725448928363657e+05, -1.726555145904914e+05, -1.727639310307478e+05, -1.728701823950876e+05, -1.729743078298848e+05,
- -1.730763454289062e+05, -1.731763322705712e+05, -1.732743044535930e+05, -1.733702971310815e+05, -1.734643445431871e+05,
- -1.735564800483569e+05, -1.736467361532771e+05, -1.737351445415611e+05, -1.738217361012496e+05, -1.739065409511796e+05,
- -1.739895884662756e+05, -1.740709073018159e+05, -1.741505253941374e+05, -1.742284700719003e+05, -1.743047679463296e+05,
- -1.743794450179574e+05, -1.744525266752583e+05, -1.745240377137078e+05, -1.745940023541095e+05, -1.746624442602212e+05,
- -1.747293865557142e+05, -1.747948518404932e+05, -1.748588622064086e+05, -1.749214392523852e+05, -1.749826040989922e+05,
- -1.750423774024842e+05, -1.751007793683280e+05, -1.751578297642457e+05, -1.752135479327882e+05, -1.752679528034616e+05,
- -1.753210629044276e+05, -1.753728963737899e+05, -1.754234709704916e+05, -1.754728040848316e+05, -1.755209127486208e+05,
- -1.755678136449931e+05, -1.756135231178816e+05, -1.756580571811754e+05, -1.757014315275711e+05, -1.757436615371295e+05,
- -1.757847622855484e+05, -1.758247485521642e+05, -1.758636348276943e+05, -1.759014353217259e+05, -1.759381639699641e+05,
- -1.759738344412496e+05, -1.760084601443506e+05, -1.760420542345429e+05, -1.760746296199794e+05, -1.761061989678653e+05,
- -1.761367747104380e+05, -1.761663690507633e+05, -1.761949939683556e+05, -1.762226612246243e+05, -1.762493823681573e+05,
- -1.762751687398444e+05, -1.763000314890164e+05, -1.763239815224185e+05, -1.763470296205911e+05, -1.763691863307075e+05,
- -1.763904620268367e+05, -1.764108669030529e+05, -1.764304109775920e+05, -1.764491040968919e+05, -1.764669559395104e+05,
- -1.764839760199404e+05, -1.765001736923089e+05, -1.765155581539790e+05, -1.765301384490476e+05, -1.765439234717452e+05,
- -1.765569219697451e+05, -1.765691425473781e+05, -1.765805936687618e+05, -1.765912836608435e+05, -1.766012207163621e+05,
- -1.766104128967274e+05, -1.766188681348267e+05, -1.766265942377532e+05, -1.766335988894640e+05, -1.766398896533675e+05,
- -1.766454739748425e+05, -1.766503591836930e+05, -1.766545524965387e+05, -1.766580610191433e+05, -1.766608917486830e+05,
- -1.766630515759597e+05, -1.766645472875541e+05, -1.766653855679266e+05, -1.766655730014669e+05, -1.766651160744872e+05,
- -1.766640211771725e+05, -1.766622946054773e+05, -1.766599425629780e+05, -1.766569711626797e+05, -1.766533864287779e+05,
- -1.766491942983797e+05, -1.766444006231797e+05, -1.766390111710997e+05, -1.766330316278864e+05, -1.766264675986726e+05,
- -1.766193246094995e+05, -1.766116081088049e+05, -1.766033234688782e+05, -1.765944759872740e+05, -1.765850708882036e+05,
- -1.765751133238844e+05, -1.765646083758650e+05, -1.765535610563164e+05, -1.765419763092945e+05, -1.765298590119746e+05,
- -1.765172139758573e+05, -1.765040459479480e+05, -1.764903596119085e+05, -1.764761595891838e+05, -1.764614504401060e+05,
- -1.764462366649685e+05, -1.764305227050827e+05, -1.764143129438060e+05, -1.763976117075520e+05, -1.763804232667765e+05,
- -1.763627518369413e+05, -1.763446015794589e+05, -1.763259766026167e+05, -1.763068809624813e+05, -1.762873186637829e+05,
- -1.762672936607816e+05, -1.762468098581159e+05, -1.762258711116323e+05, -1.762044812291983e+05, -1.761826439714992e+05,
- -1.761603630528156e+05, -1.761376421417890e+05, -1.761144848621674e+05, -1.760908947935398e+05, -1.760668754720518e+05,
- -1.760424303911084e+05, -1.760175630020654e+05, -1.759922767149010e+05, -1.759665748988785e+05, -1.759404608831949e+05,
- -1.759139379576146e+05, -1.758870093730936e+05, -1.758596783423890e+05, -1.758319480406572e+05, -1.758038216060411e+05,
- -1.757753021402453e+05, -1.757463927090994e+05, -1.757170963431116e+05, -1.756874160380115e+05, -1.756573547552818e+05,
- -1.756269154226806e+05, -1.755961009347517e+05, -1.755649141533298e+05, -1.755333579080303e+05, -1.755014349967347e+05,
- -1.754691481860643e+05, -1.754365002118461e+05, -1.754034937795690e+05, -1.753701315648331e+05, -1.753364162137885e+05,
- -1.753023503435697e+05, -1.752679365427172e+05, -1.752331773715951e+05, -1.751980753627996e+05, -1.751626330215608e+05,
- -1.751268528261367e+05, -1.750907372281996e+05, -1.750542886532173e+05, -1.750175095008248e+05, -1.749804021451931e+05,
- -1.749429689353877e+05, -1.749052121957223e+05, -1.748671342261080e+05, -1.748287373023933e+05, -1.747900236766995e+05,
- -1.747509955777516e+05, -1.747116552112015e+05, -1.746720047599458e+05, -1.746320463844390e+05, -1.745917822230019e+05,
- -1.745512143921219e+05, -1.745103449867525e+05, -1.744691760806019e+05, -1.744277097264241e+05, -1.743859479562978e+05,
- -1.743438927819053e+05, -1.743015461948046e+05, -1.742589101666993e+05, -1.742159866496999e+05, -1.741727775765844e+05,
- -1.741292848610541e+05, -1.740855103979831e+05, -1.740414560636662e+05, -1.739971237160609e+05, -1.739525151950261e+05,
- -1.739076323225577e+05, -1.738624769030189e+05, -1.738170507233678e+05, -1.737713555533809e+05, -1.737253931458738e+05,
- -1.736791652369173e+05, -1.736326735460492e+05, -1.735859197764872e+05, -1.735389056153313e+05, -1.734916327337709e+05,
- -1.734441027872809e+05, -1.733963174158221e+05, -1.733482782440306e+05, -1.732999868814143e+05, -1.732514449225341e+05,
- -1.732026539471944e+05, -1.731536155206206e+05, -1.731043311936409e+05, -1.730548025028626e+05, -1.730050309708433e+05,
- -1.729550181062656e+05, -1.729047654041027e+05, -1.728542743457851e+05, -1.728035463993649e+05, -1.727525830196753e+05,
- -1.727013856484891e+05, -1.726499557146768e+05, -1.725982946343579e+05, -1.725464038110532e+05, -1.724942846358352e+05,
- -1.724419384874737e+05, -1.723893667325809e+05, -1.723365707257550e+05, -1.722835518097196e+05, -1.722303113154632e+05,
- -1.721768505623755e+05, -1.721231708583810e+05, -1.720692735000734e+05, -1.720151597728451e+05, -1.719608309510166e+05,
- -1.719062882979620e+05, -1.718515330662373e+05, -1.717965664976997e+05, -1.717413898236323e+05, -1.716860042648623e+05,
- -1.716304110318808e+05, -1.715746113249565e+05, -1.715186063342547e+05, -1.714623972399455e+05, -1.714059852123199e+05,
- -1.713493714118977e+05, -1.712925569895366e+05, -1.712355430865383e+05, -1.711783308347558e+05, -1.711209213566967e+05,
- -1.710633157656245e+05, -1.710055151656628e+05, -1.709475206518924e+05, -1.708893333104514e+05, -1.708309542186320e+05,
- -1.707723844449763e+05, -1.707136250493707e+05, -1.706546770831395e+05, -1.705955415891366e+05, -1.705362196018373e+05,
- -1.704767121474249e+05, -1.704170202438833e+05, -1.703571449010825e+05, -1.702970871208615e+05, -1.702368478971190e+05,
- -1.701764282158919e+05, -1.701158290554417e+05, -1.700550513863339e+05, -1.699940961715189e+05, -1.699329643664130e+05,
- -1.698716569189739e+05, -1.698101747697810e+05, -1.697485188521107e+05, -1.696866900920112e+05, -1.696246894083778e+05,
- -1.695625177130252e+05, -1.695001759107619e+05, -1.694376648994605e+05, -1.693749855701294e+05, -1.693121388069801e+05,
- -1.692491254874996e+05, -1.691859464825155e+05, -1.691226026562656e+05, -1.690590948664621e+05, -1.689954239643587e+05,
- -1.689315907948142e+05, -1.688675961963568e+05, -1.688034410012469e+05, -1.687391260355403e+05, -1.686746521191487e+05,
- -1.686100200659006e+05, -1.685452306836011e+05, -1.684802847740922e+05, -1.684151831333107e+05, -1.683499265513457e+05,
- -1.682845158124955e+05, -1.682189516953249e+05, -1.681532349727207e+05, -1.680873664119462e+05, -1.680213467746957e+05,
- -1.679551768171490e+05, -1.678888572900229e+05, -1.678223889386261e+05, -1.677557725029078e+05, -1.676890087175123e+05,
- -1.676220983118260e+05, -1.675550420100306e+05, -1.674878405311515e+05, -1.674204945891046e+05, -1.673530048927469e+05,
- -1.672853721459238e+05, -1.672175970475152e+05, -1.671496802914831e+05, -1.670816225669164e+05, -1.670134245580768e+05,
- -1.669450869444453e+05, -1.668766104007641e+05, -1.668079955970815e+05, -1.667392431987964e+05, -1.666703538666989e+05
- },
- {
- 5.469602869033446e+04, 5.324497782993484e+04, 5.177857918750094e+04, 5.029641330099323e+04, 4.879804250826711e+04,
- 4.728300993203242e+04, 4.575083839693030e+04, 4.420102927171091e+04, 4.263306123282007e+04, 4.104638894204536e+04,
- 3.944044163212249e+04, 3.781462159322647e+04, 3.616830255285421e+04, 3.450082794112273e+04, 3.281150903303202e+04,
- 3.109962295879699e+04, 2.936441057296110e+04, 2.760507417270163e+04, 2.582077505556899e+04, 2.401063090693709e+04,
- 2.217371300776200e+04, 2.030904325397137e+04, 1.841559098009301e+04, 1.649226958178672e+04, 1.453793293504618e+04,
- 1.255137161436607e+04, 1.053130891860740e+04, 8.476396722313011e+03, 6.385211182689428e+03, 4.256248349550102e+03,
- 2.087919748627367e+03, -1.214519591767171e+02, -2.373637099734722e+03, -4.670502690631903e+03, -7.014015428571931e+03,
- -9.406243637337788e+03, -1.184935759357117e+04, -1.434562758297282e+04, -1.689741877055586e+04, -1.950718158989437e+04,
- -2.217743609167453e+04, -2.491074804486097e+04, -2.770969399795992e+04, -3.057681167563410e+04, -3.351453111877094e+04,
- -3.652508090078986e+04, -3.961036269769873e+04, -4.277178674571175e+04, -4.601006082682316e+04, -4.932492725975340e+04,
- -5.271484716085373e+04, -5.617664027098176e+04, -5.970510254636917e+04, -6.329264119448927e+04, -6.692898357214495e+04,
- -7.060102523137291e+04, -7.429287669781124e+04, -7.798614670055105e+04, -8.166046804780785e+04, -8.529424218117143e+04,
- -8.886555656107643e+04, -9.235321226468140e+04, -9.573777909438752e+04, -9.900257118029459e+04, -1.021344212986088e+05,
- -1.051241636121857e+05, -1.079667655853874e+05, -1.106609466511270e+05, -1.132085990859939e+05, -1.156140466842974e+05,
- -1.178832951996090e+05, -1.200233799470129e+05, -1.220418555875746e+05, -1.239464294844097e+05, -1.257447157700089e+05,
- -1.274440796025037e+05, -1.290515436035254e+05, -1.305737348873202e+05, -1.320168588522960e+05, -1.333866896952500e+05,
- -1.346885732384722e+05, -1.359274380643386e+05, -1.371078128292981e+05, -1.382338479165568e+05, -1.393093399280163e+05,
- -1.403377576853093e+05, -1.413222687227571e+05, -1.422657653829338e+05, -1.431708899020408e+05, -1.440400580514325e+05,
- -1.448754810742431e+05, -1.456791857921930e+05, -1.464530328604818e+05, -1.471987332215972e+05, -1.479178628567589e+05,
- -1.486118759618691e+05, -1.492821166882347e+05, -1.499298295912239e+05, -1.505561689258993e+05, -1.511622069202135e+05,
- -1.517489411455056e+05, -1.523173010922157e+05, -1.528681540468456e+05, -1.534023103548161e+05, -1.539205281433862e+05,
- -1.544235175692858e+05, -1.549119446472991e+05, -1.553864347086435e+05, -1.558475755315507e+05, -1.562959201809114e+05,
- -1.567319895890536e+05, -1.571562749056207e+05, -1.575692396409841e+05, -1.579713216246106e+05, -1.583629347971862e+05,
- -1.587444708530838e+05, -1.591163007496423e+05, -1.594787760850135e+05, -1.598322303846963e+05, -1.601769802681403e+05,
- -1.605133265343281e+05, -1.608415551623912e+05, -1.611619382366672e+05, -1.614747348233472e+05, -1.617801916787128e+05,
- -1.620785441163767e+05, -1.623700165987875e+05, -1.626548233951730e+05, -1.629331691713131e+05, -1.632052495392147e+05,
- -1.634712515695555e+05, -1.637313542668403e+05, -1.639857290139080e+05, -1.642345399193671e+05, -1.644779444295577e+05,
- -1.647160934092034e+05, -1.649491316432379e+05, -1.651771981195771e+05, -1.654004263274550e+05, -1.656189445372682e+05,
- -1.658328760632489e+05, -1.660423395101941e+05, -1.662474490053736e+05, -1.664483144166453e+05, -1.666450415577361e+05,
- -1.668377323815620e+05, -1.670264851613845e+05, -1.672113946667494e+05, -1.673925523191014e+05, -1.675700463491989e+05,
- -1.677439619404723e+05, -1.679143813655935e+05, -1.680813841156186e+05, -1.682450470221766e+05, -1.684054443731365e+05,
- -1.685626480221643e+05, -1.687167274925401e+05, -1.688677500755938e+05, -1.690157809240767e+05, -1.691608831407810e+05,
- -1.693031178626837e+05, -1.694425443408845e+05, -1.695792200165774e+05, -1.697132005932936e+05, -1.698445401056205e+05,
- -1.699732909846096e+05, -1.700995041200470e+05, -1.702232289197757e+05, -1.703445133662213e+05, -1.704634040702862e+05,
- -1.705799463227472e+05, -1.706941841432984e+05, -1.708061603273622e+05, -1.709159164907886e+05, -1.710234931125564e+05,
- -1.711289295755783e+05, -1.712322642057098e+05, -1.713335343090562e+05, -1.714327762076641e+05, -1.715300252736767e+05,
- -1.716253159620379e+05, -1.717186818418084e+05, -1.718101556261717e+05, -1.718997692011874e+05, -1.719875536533599e+05,
- -1.720735392960752e+05, -1.721577556949605e+05, -1.722402316697823e+05, -1.723209954061199e+05, -1.724000743474538e+05,
- -1.724774953022270e+05, -1.725532844435066e+05, -1.726274673288803e+05, -1.727000689195849e+05, -1.727711135989021e+05,
- -1.728406251898537e+05, -1.729086269722292e+05, -1.729751416989714e+05, -1.730401916119554e+05, -1.731037984571830e+05,
- -1.731659834994149e+05, -1.732267675362766e+05, -1.732861709118472e+05, -1.733442135297608e+05, -1.734009148658421e+05,
- -1.734562939802908e+05, -1.735103695294387e+05, -1.735631597770937e+05, -1.736146826054898e+05, -1.736649555258598e+05,
- -1.737139956886430e+05, -1.737618198933485e+05, -1.738084445980811e+05, -1.738538859287480e+05, -1.738981596879585e+05,
- -1.739412813636271e+05, -1.739832661372932e+05, -1.740241288921681e+05, -1.740638842209199e+05, -1.741025464332051e+05,
- -1.741401295629615e+05, -1.741766473754627e+05, -1.742121133741529e+05, -1.742465408072642e+05, -1.742799426742260e+05,
- -1.743123317318748e+05, -1.743437205004723e+05, -1.743741212695366e+05, -1.744035461034950e+05, -1.744320068471672e+05,
- -1.744595151310791e+05, -1.744860823766192e+05, -1.745117198010384e+05, -1.745364384223056e+05, -1.745602490638117e+05,
- -1.745831623589494e+05, -1.746051887555403e+05, -1.746263385201498e+05, -1.746466217422689e+05, -1.746660483383790e+05,
- -1.746846280558984e+05, -1.747023704770199e+05, -1.747192850224367e+05, -1.747353809549648e+05, -1.747506673830667e+05,
- -1.747651532642741e+05, -1.747788474085159e+05, -1.747917584813581e+05, -1.748038950071526e+05, -1.748152653721002e+05,
- -1.748258778272329e+05, -1.748357404913133e+05, -1.748448613536608e+05, -1.748532482768963e+05, -1.748609089996208e+05,
- -1.748678511390189e+05, -1.748740821933966e+05, -1.748796095446525e+05, -1.748844404606840e+05, -1.748885820977332e+05,
- -1.748920415026707e+05, -1.748948256152232e+05, -1.748969412701431e+05, -1.748983951993232e+05, -1.748991940338605e+05,
- -1.748993443060648e+05, -1.748988524514208e+05, -1.748977248104996e+05, -1.748959676308237e+05, -1.748935870686857e+05,
- -1.748905891909253e+05, -1.748869799766585e+05, -1.748827653189694e+05, -1.748779510265592e+05, -1.748725428253563e+05,
- -1.748665463600877e+05, -1.748599671958136e+05, -1.748528108194258e+05, -1.748450826411105e+05, -1.748367879957776e+05,
- -1.748279321444572e+05, -1.748185202756605e+05, -1.748085575067152e+05, -1.747980488850642e+05, -1.747869993895395e+05,
- -1.747754139316039e+05, -1.747632973565660e+05, -1.747506544447685e+05, -1.747374899127486e+05, -1.747238084143720e+05,
- -1.747096145419453e+05, -1.746949128272977e+05, -1.746797077428463e+05, -1.746640037026312e+05, -1.746478050633325e+05,
- -1.746311161252627e+05, -1.746139411333409e+05, -1.745962842780407e+05, -1.745781496963234e+05, -1.745595414725477e+05,
- -1.745404636393611e+05, -1.745209201785730e+05, -1.745009150220087e+05, -1.744804520523455e+05, -1.744595351039309e+05,
- -1.744381679635869e+05, -1.744163543713916e+05, -1.743940980214502e+05, -1.743714025626489e+05, -1.743482715993910e+05,
- -1.743247086923206e+05, -1.743007173590298e+05, -1.742763010747540e+05, -1.742514632730496e+05, -1.742262073464623e+05,
- -1.742005366471789e+05, -1.741744544876665e+05, -1.741479641413014e+05, -1.741210688429827e+05, -1.740937717897353e+05,
- -1.740660761413013e+05, -1.740379850207192e+05, -1.740095015148919e+05, -1.739806286751444e+05, -1.739513695177694e+05,
- -1.739217270245644e+05, -1.738917041433569e+05, -1.738613037885202e+05, -1.738305288414796e+05, -1.737993821512084e+05,
- -1.737678665347150e+05, -1.737359847775211e+05, -1.737037396341306e+05, -1.736711338284904e+05, -1.736381700544409e+05,
- -1.736048509761597e+05, -1.735711792285990e+05, -1.735371574179101e+05, -1.735027881218634e+05, -1.734680738902618e+05,
- -1.734330172453430e+05, -1.733976206821779e+05, -1.733618866690611e+05, -1.733258176478915e+05, -1.732894160345502e+05,
- -1.732526842192698e+05, -1.732156245669969e+05, -1.731782394177483e+05, -1.731405310869608e+05, -1.731025018658367e+05,
- -1.730641540216800e+05, -1.730254897982301e+05, -1.729865114159867e+05, -1.729472210725316e+05, -1.729076209428429e+05,
- -1.728677131796049e+05, -1.728274999135142e+05, -1.727869832535762e+05, -1.727461652874011e+05, -1.727050480814927e+05,
- -1.726636336815323e+05, -1.726219241126586e+05, -1.725799213797424e+05, -1.725376274676566e+05, -1.724950443415424e+05,
- -1.724521739470696e+05, -1.724090182106951e+05, -1.723655790399142e+05, -1.723218583235102e+05, -1.722778579317980e+05,
- -1.722335797168657e+05, -1.721890255128096e+05, -1.721441971359694e+05, -1.720990963851548e+05, -1.720537250418720e+05,
- -1.720080848705449e+05, -1.719621776187341e+05, -1.719160050173509e+05, -1.718695687808677e+05, -1.718228706075278e+05,
- -1.717759121795494e+05, -1.717286951633252e+05, -1.716812212096233e+05, -1.716334919537802e+05, -1.715855090158948e+05,
- -1.715372740010152e+05, -1.714887884993269e+05, -1.714400540863347e+05, -1.713910723230449e+05, -1.713418447561402e+05,
- -1.712923729181574e+05, -1.712426583276582e+05, -1.711927024893995e+05, -1.711425068944990e+05, -1.710920730206026e+05,
- -1.710414023320441e+05, -1.709904962800060e+05, -1.709393563026758e+05, -1.708879838254013e+05, -1.708363802608445e+05,
- -1.707845470091296e+05, -1.707324854579934e+05, -1.706801969829287e+05, -1.706276829473310e+05, -1.705749447026379e+05,
- -1.705219835884694e+05, -1.704688009327653e+05, -1.704153980519215e+05, -1.703617762509223e+05, -1.703079368234737e+05,
- -1.702538810521318e+05, -1.701996102084302e+05, -1.701451255530085e+05, -1.700904283357341e+05, -1.700355197958261e+05,
- -1.699804011619743e+05, -1.699250736524612e+05, -1.698695384752766e+05, -1.698137968282342e+05, -1.697578498990864e+05,
- -1.697016988656356e+05, -1.696453448958461e+05, -1.695887891479527e+05, -1.695320327705684e+05, -1.694750769027928e+05,
- -1.694179226743128e+05, -1.693605712055115e+05, -1.693030236075643e+05, -1.692452809825452e+05, -1.691873444235219e+05,
- -1.691292150146549e+05, -1.690708938312954e+05, -1.690123819400786e+05, -1.689536803990185e+05, -1.688947902576011e+05,
- -1.688357125568744e+05, -1.687764483295407e+05, -1.687169986000437e+05, -1.686573643846569e+05, -1.685975466915720e+05,
- -1.685375465209801e+05, -1.684773648651619e+05, -1.684170027085661e+05, -1.683564610278941e+05, -1.682957407921794e+05,
- -1.682348429628702e+05, -1.681737684939055e+05, -1.681125183317952e+05, -1.680510934156963e+05, -1.679894946774882e+05,
- -1.679277230418484e+05, -1.678657794263274e+05, -1.678036647414191e+05, -1.677413798906359e+05, -1.676789257705786e+05,
- -1.676163032710060e+05, -1.675535132749046e+05, -1.674905566585591e+05, -1.674274342916172e+05, -1.673641470371580e+05,
- -1.673006957517579e+05, -1.672370812855554e+05, -1.671733044823151e+05, -1.671093661794920e+05, -1.670452672082941e+05,
- -1.669810083937435e+05, -1.669165905547383e+05, -1.668520145041129e+05, -1.667872810486983e+05, -1.667223909893798e+05,
- -1.666573451211557e+05, -1.665921442331951e+05, -1.665267891088946e+05, -1.664612805259351e+05, -1.663956192563349e+05,
- -1.663298060665080e+05, -1.662638417173145e+05, -1.661977269641169e+05, -1.661314625568309e+05, -1.660650492399800e+05,
- -1.659984877527439e+05, -1.659317788290123e+05, -1.658649231974327e+05, -1.657979215814624e+05, -1.657307746994176e+05,
- -1.656634832645181e+05, -1.655960479849405e+05, -1.655284695638635e+05, -1.654607486995130e+05, -1.653928860852109e+05,
- -1.653248824094201e+05, -1.652567383557888e+05, -1.651884546031971e+05, -1.651200318257988e+05, -1.650514706930676e+05
- },
- {
- 5.560182267722881e+04, 5.416012141496845e+04, 5.270337928018007e+04, 5.123119223939248e+04, 4.974313910292042e+04,
- 4.823878059568405e+04, 4.671765836840340e+04, 4.517929394302872e+04, 4.362318758974281e+04, 4.204881712929553e+04,
- 4.045563665583739e+04, 3.884307517458804e+04, 3.721053514842916e+04, 3.555739094721946e+04, 3.388298719336688e+04,
- 3.218663699698600e+04, 3.046762007383806e+04, 2.872518073923768e+04, 2.695852577125734e+04, 2.516682213693468e+04,
- 2.334919457586985e+04, 2.150472303670022e+04, 1.963243996360568e+04, 1.773132743241432e+04, 1.580031413930378e+04,
- 1.383827224984891e+04, 1.184401412269155e+04, 9.816288930963990e+03, 7.753779216531502e+03, 5.655097428101974e+03,
- 3.518782515559472e+03, 1.343296681056380e+03, -8.729775744144704e+02, -3.131739922821129e+03, -5.434773951357826e+03,
- -7.783947803475278e+03, -1.018121334853291e+04, -1.262860318542353e+04, -1.512822476456390e+04, -1.768225056366767e+04,
- -2.029290302664068e+04, -2.296243241892426e+04, -2.569308549745915e+04, -2.848706207061731e+04, -3.134645594922343e+04,
- -3.427317598280623e+04, -3.726884214593892e+04, -4.033465112862595e+04, -4.347120595511513e+04, -4.667830537808449e+04,
- -4.995469196737470e+04, -5.329776382652707e+04, -5.670326431403836e+04, -6.016497657697575e+04, -6.367446282377231e+04,
- -6.722089768042762e+04, -7.079104543967577e+04, -7.436941929822680e+04, -7.793863832912251e+04, -8.147997169092923e+04,
- -8.497403717915074e+04, -8.840160617337043e+04, -9.174445635710754e+04, -9.498620247576693e+04, -9.811302436751952e+04,
- -1.011142090902158e+05, -1.039824508925680e+05, -1.067138776810138e+05, -1.093077406543157e+05, -1.117659192323605e+05,
- -1.140923161456786e+05, -1.162922524931817e+05, -1.183719375269228e+05, -1.203380477981738e+05, -1.221974186679407e+05,
- -1.239568325279446e+05, -1.256228811895179e+05, -1.272018807322823e+05, -1.286998215665145e+05, -1.301223414316599e+05,
- -1.314747139577539e+05, -1.327618472501671e+05, -1.339882902852138e+05, -1.351582446736654e+05, -1.362755805174062e+05,
- -1.373438550898832e+05, -1.383663333075094e+05, -1.393460090897868e+05, -1.402856268619475e+05, -1.411877026121837e+05,
- -1.420545440689311e+05, -1.428882697026360e+05, -1.436908263746231e+05, -1.444640055505285e+05, -1.452094580677148e+05,
- -1.459287074974647e+05, -1.466231621768562e+05, -1.472941260056233e+05, -1.479428081132768e+05, -1.485703315043056e+05,
- -1.491777407866718e+05, -1.497660090830062e+05, -1.503360442162445e+05, -1.508886942529326e+05, -1.514247524787640e+05,
- -1.519449618725334e+05, -1.524500191368485e+05, -1.529405783368117e+05, -1.534172541914701e+05, -1.538806250571817e+05,
- -1.543312356370681e+05, -1.547695994464066e+05, -1.551962010600705e+05, -1.556114981648771e+05, -1.560159234388148e+05,
- -1.564098862631378e+05, -1.567937743126266e+05, -1.571679549973280e+05, -1.575327767989391e+05, -1.578885705000177e+05,
- -1.582356503178393e+05, -1.585743149515186e+05, -1.589048485722491e+05, -1.592275216278411e+05, -1.595425918150242e+05,
- -1.598503047510046e+05, -1.601508947138085e+05, -1.604445853064050e+05, -1.607315900745725e+05, -1.610121130832723e+05,
- -1.612863494515012e+05, -1.615544858509925e+05, -1.618167009722755e+05, -1.620731658737751e+05, -1.623240446797505e+05,
- -1.625694945858536e+05, -1.628096664338679e+05, -1.630447049969306e+05, -1.632747492923318e+05, -1.634999328749441e+05,
- -1.637203841126672e+05, -1.639362264451612e+05, -1.641475786270475e+05, -1.643545549566539e+05, -1.645572654913017e+05,
- -1.647558162490040e+05, -1.649503094038290e+05, -1.651408434593792e+05, -1.653275134233294e+05, -1.655104109666774e+05,
- -1.656896245752797e+05, -1.658652396930627e+05, -1.660373388574394e+05, -1.662060018274260e+05, -1.663713057049157e+05,
- -1.665333250495359e+05, -1.666921319874827e+05, -1.668477963147016e+05, -1.670003855947583e+05, -1.671499652517119e+05,
- -1.672965986582983e+05, -1.674403472196889e+05, -1.675812704530920e+05, -1.677194260634347e+05, -1.678548700153491e+05,
- -1.679876566016757e+05, -1.681178385086828e+05, -1.682454668781789e+05, -1.683705913667016e+05, -1.684932602019325e+05,
- -1.686135202365006e+05, -1.687314169993078e+05, -1.688469947445155e+05, -1.689602964983137e+05, -1.690713641035915e+05,
- -1.691802382626215e+05, -1.692869585778562e+05, -1.693915635909397e+05, -1.694940908200251e+05, -1.695945767954805e+05,
- -1.696930570940700e+05, -1.697895663716837e+05, -1.698841383946890e+05, -1.699768060699716e+05, -1.700676014737328e+05,
- -1.701565558790989e+05, -1.702436997826054e+05, -1.703290629296063e+05, -1.704126743149165e+05, -1.704945622997054e+05,
- -1.705747544959659e+05, -1.706532778786922e+05, -1.707301587843441e+05, -1.708054229307992e+05, -1.708790954365365e+05,
- -1.709512008390887e+05, -1.710217631127933e+05, -1.710908056858738e+05, -1.711583514568854e+05, -1.712244228105452e+05,
- -1.712890416329824e+05, -1.713522293264269e+05, -1.714140068233662e+05, -1.714743946001878e+05, -1.715334126903353e+05,
- -1.715910806969933e+05, -1.716474178053240e+05, -1.717024427942730e+05, -1.717561740479647e+05, -1.718086295666997e+05,
- -1.718598269775752e+05, -1.719097835447400e+05, -1.719585161793033e+05, -1.720060414489052e+05, -1.720523755869692e+05,
- -1.720975345016428e+05, -1.721415337844462e+05, -1.721843887186304e+05, -1.722261142872671e+05, -1.722667251810713e+05,
- -1.723062358059757e+05, -1.723446602904562e+05, -1.723820124926287e+05, -1.724183060071180e+05, -1.724535541717110e+05,
- -1.724877700738003e+05, -1.725209665566302e+05, -1.725531562253454e+05, -1.725843514528569e+05, -1.726145643855260e+05,
- -1.726438069486776e+05, -1.726720908519452e+05, -1.726994275944566e+05, -1.727258284698636e+05, -1.727513045712240e+05,
- -1.727758667957368e+05, -1.727995258493412e+05, -1.728222922511806e+05, -1.728441763379338e+05, -1.728651882680317e+05,
- -1.728853380257347e+05, -1.729046354251131e+05, -1.729230901139028e+05, -1.729407115772556e+05, -1.729575091413851e+05,
- -1.729734919771096e+05, -1.729886691032980e+05, -1.730030493902178e+05, -1.730166415627956e+05, -1.730294542037850e+05,
- -1.730414957568508e+05, -1.730527745295672e+05, -1.730632986963388e+05, -1.730730763012417e+05, -1.730821152607891e+05,
- -1.730904233666238e+05, -1.730980082881414e+05, -1.731048775750431e+05, -1.731110386598216e+05, -1.731164988601863e+05,
- -1.731212653814209e+05, -1.731253453186851e+05, -1.731287456592548e+05, -1.731314732847065e+05, -1.731335349730474e+05,
- -1.731349374007897e+05, -1.731356871449756e+05, -1.731357906851512e+05, -1.731352544052904e+05, -1.731340845956720e+05,
- -1.731322874547129e+05, -1.731298690907539e+05, -1.731268355238025e+05, -1.731231926872353e+05, -1.731189464294585e+05,
- -1.731141025155291e+05, -1.731086666287350e+05, -1.731026443721432e+05, -1.730960412701060e+05, -1.730888627697345e+05,
- -1.730811142423377e+05, -1.730728009848277e+05, -1.730639282210917e+05, -1.730545011033340e+05, -1.730445247133873e+05,
- -1.730340040639903e+05, -1.730229441000423e+05, -1.730113496998254e+05, -1.729992256761990e+05, -1.729865767777704e+05,
- -1.729734076900368e+05, -1.729597230365029e+05, -1.729455273797739e+05, -1.729308252226238e+05, -1.729156210090411e+05,
- -1.728999191252514e+05, -1.728837239007181e+05, -1.728670396091194e+05, -1.728498704693088e+05, -1.728322206462500e+05,
- -1.728140942519350e+05, -1.727954953462809e+05, -1.727764279380101e+05, -1.727568959855095e+05, -1.727369033976724e+05,
- -1.727164540347234e+05, -1.726955517090264e+05, -1.726742001858747e+05, -1.726524031842644e+05, -1.726301643776551e+05,
- -1.726074873947109e+05, -1.725843758200289e+05, -1.725608331948526e+05, -1.725368630177701e+05, -1.725124687453993e+05,
- -1.724876537930572e+05, -1.724624215354197e+05, -1.724367753071643e+05, -1.724107184036017e+05, -1.723842540812969e+05,
- -1.723573855586739e+05, -1.723301160166121e+05, -1.723024485990293e+05, -1.722743864134554e+05, -1.722459325315913e+05,
- -1.722170899898607e+05, -1.721878617899498e+05, -1.721582508993364e+05, -1.721282602518099e+05, -1.720978927479805e+05,
- -1.720671512557783e+05, -1.720360386109454e+05, -1.720045576175167e+05, -1.719727110482910e+05, -1.719405016452968e+05,
- -1.719079321202449e+05, -1.718750051549771e+05, -1.718417234019028e+05, -1.718080894844302e+05, -1.717741059973891e+05,
- -1.717397755074449e+05, -1.717051005535053e+05, -1.716700836471224e+05, -1.716347272728830e+05, -1.715990338887954e+05,
- -1.715630059266681e+05, -1.715266457924818e+05, -1.714899558667544e+05, -1.714529385049012e+05, -1.714155960375851e+05,
- -1.713779307710661e+05, -1.713399449875391e+05, -1.713016409454705e+05, -1.712630208799244e+05, -1.712240870028881e+05,
- -1.711848415035882e+05, -1.711452865488018e+05, -1.711054242831659e+05, -1.710652568294742e+05, -1.710247862889784e+05,
- -1.709840147416761e+05, -1.709429442465982e+05, -1.709015768420894e+05, -1.708599145460874e+05, -1.708179593563929e+05,
- -1.707757132509367e+05, -1.707331781880455e+05, -1.706903561066980e+05, -1.706472489267811e+05, -1.706038585493400e+05,
- -1.705601868568234e+05, -1.705162357133275e+05, -1.704720069648327e+05, -1.704275024394387e+05, -1.703827239475955e+05,
- -1.703376732823291e+05, -1.702923522194666e+05, -1.702467625178545e+05, -1.702009059195748e+05, -1.701547841501587e+05,
- -1.701083989187952e+05, -1.700617519185382e+05, -1.700148448265081e+05, -1.699676793040912e+05, -1.699202569971384e+05,
- -1.698725795361565e+05, -1.698246485364992e+05, -1.697764655985543e+05, -1.697280323079300e+05, -1.696793502356342e+05,
- -1.696304209382551e+05, -1.695812459581371e+05, -1.695318268235532e+05, -1.694821650488778e+05, -1.694322621347532e+05,
- -1.693821195682565e+05, -1.693317388230625e+05, -1.692811213596046e+05, -1.692302686252323e+05, -1.691791820543679e+05,
- -1.691278630686612e+05, -1.690763130771391e+05, -1.690245334763554e+05, -1.689725256505386e+05, -1.689202909717355e+05,
- -1.688678307999538e+05, -1.688151464833045e+05, -1.687622393581380e+05, -1.687091107491822e+05, -1.686557619696770e+05,
- -1.686021943215054e+05, -1.685484090953263e+05, -1.684944075707020e+05, -1.684401910162241e+05, -1.683857606896423e+05,
- -1.683311178379834e+05, -1.682762636976758e+05, -1.682211994946675e+05, -1.681659264445462e+05, -1.681104457526548e+05,
- -1.680547586142054e+05, -1.679988662143945e+05, -1.679427697285129e+05, -1.678864703220566e+05, -1.678299691508362e+05,
- -1.677732673610814e+05, -1.677163660895506e+05, -1.676592664636312e+05, -1.676019696014446e+05, -1.675444766119467e+05,
- -1.674867885950283e+05, -1.674289066416129e+05, -1.673708318337549e+05, -1.673125652447343e+05, -1.672541079391533e+05,
- -1.671954609730272e+05, -1.671366253938785e+05, -1.670776022408264e+05, -1.670183925446776e+05, -1.669589973280133e+05,
- -1.668994176052781e+05, -1.668396543828649e+05, -1.667797086592002e+05, -1.667195814248292e+05, -1.666592736624954e+05,
- -1.665987863472261e+05, -1.665381204464097e+05, -1.664772769198786e+05, -1.664162567199841e+05, -1.663550607916762e+05,
- -1.662936900725796e+05, -1.662321454930694e+05, -1.661704279763453e+05, -1.661085384385041e+05, -1.660464777886149e+05,
- -1.659842469287888e+05, -1.659218467542501e+05, -1.658592781534065e+05, -1.657965420079181e+05, -1.657336391927646e+05,
- -1.656705705763145e+05, -1.656073370203892e+05, -1.655439393803309e+05, -1.654803785050642e+05, -1.654166552371654e+05,
- -1.653527704129187e+05, -1.652887248623848e+05, -1.652245194094587e+05, -1.651601548719318e+05, -1.650956320615524e+05,
- -1.650309517840848e+05, -1.649661148393665e+05, -1.649011220213683e+05, -1.648359741182509e+05, -1.647706719124201e+05,
- -1.647052161805837e+05, -1.646396076938072e+05, -1.645738472175674e+05, -1.645079355118050e+05, -1.644418733309812e+05,
- -1.643756614241269e+05, -1.643093005348962e+05, -1.642427914016175e+05, -1.641761347573441e+05, -1.641093313299036e+05,
- -1.640423818419492e+05, -1.639752870110051e+05, -1.639080475495202e+05, -1.638406641649107e+05, -1.637731375596095e+05,
- -1.637054684311131e+05, -1.636376574720271e+05, -1.635697053701115e+05, -1.635016128083265e+05, -1.634333804648770e+05
- },
- {
- 5.650856773911305e+04, 5.507611813265464e+04, 5.362892795713789e+04, 5.216660804211457e+04, 5.068875304946429e+04,
- 4.919494062384540e+04, 4.768473049098781e+04, 4.615766349845439e+04, 4.461326059710691e+04, 4.305102175799836e+04,
- 4.147042482095304e+04, 3.987092427038329e+04, 3.825194993378627e+04, 3.661290559822469e+04, 3.495316754000566e+04,
- 3.327208296274890e+04, 3.156896833911293e+04, 2.984310765165276e+04, 2.809375052866956e+04, 2.632011027153549e+04,
- 2.452136177091806e+04, 2.269663931068698e+04, 2.084503426019686e+04, 1.896559265827250e+04, 1.705731269579969e+04,
- 1.511914210863934e+04, 1.314997549900212e+04, 1.114865161193647e+04, 9.113950604819878e+03, 7.044591362515169e+03,
- 4.939228930207950e+03, 2.796452161234246e+03, 6.147817101739931e+02, -1.607331455831471e+03, -3.871506803465550e+03,
- -6.179433907615366e+03, -8.532870729241768e+03, -1.093363989658008e+04, -1.338362238554822e+04, -1.588474771595184e+04,
- -1.843897955345714e+04, -2.104829535304054e+04, -2.371465815691403e+04, -2.643997844263183e+04, -2.922606319467117e+04,
- -3.207454894156400e+04, -3.498681495222524e+04, -3.796387243847050e+04, -4.100622567096080e+04, -4.411370175587559e+04,
- -4.728524796947298e+04, -5.051869961622734e+04, -5.381052783935015e+04, -5.715558559187029e+04, -6.054687989351335e+04,
- -6.397540693331555e+04, -6.743008986809517e+04, -7.089785408264890e+04, -7.436386049265135e+04, -7.781189720047444e+04,
- -8.122490923829605e+04, -8.458563039557524e+04, -8.787727180122792e+04, -9.108421642167872e+04, -9.419266401323261e+04,
- -9.719116782351924e+04, -1.000710075106382e+05, -1.028263612136320e+05, -1.054542757452662e+05, -1.079544083056938e+05,
- -1.103286019096379e+05, -1.125803909654438e+05, -1.147145104872807e+05, -1.167364632081599e+05, -1.186521712747908e+05,
- -1.204677161870929e+05, -1.221891563393953e+05, -1.238224055547129e+05, -1.253731558617401e+05, -1.268468306559529e+05,
- -1.282485581081486e+05, -1.295831579725005e+05, -1.308551379287884e+05, -1.320686961516094e+05, -1.332277290887990e+05,
- -1.343358428198480e+05, -1.353963671488691e+05, -1.364123715686302e+05, -1.373866823535142e+05, -1.383219001432997e+05,
- -1.392204174907733e+05, -1.400844359602006e+05, -1.409159824730884e+05, -1.417169246960415e+05, -1.424889853489276e+05,
- -1.432337553785198e+05, -1.439527059937697e+05, -1.446471995955117e+05, -1.453184996579740e+05, -1.459677796343690e+05,
- -1.465961309663676e+05, -1.472045702793706e+05, -1.477940458438922e+05, -1.483654433793481e+05, -1.489195912710496e+05,
- -1.494572652650664e+05, -1.499791926992308e+05, -1.504860563223395e+05, -1.509784977477389e+05, -1.514571205820556e+05,
- -1.519224932649554e+05, -1.523751516514533e+05, -1.528156013644325e+05, -1.532443199434154e+05, -1.536617588002004e+05,
- -1.540683450274520e+05, -1.544644830396188e+05, -1.548505560892352e+05, -1.552269276599042e+05, -1.555939427494011e+05,
- -1.559519290530982e+05, -1.563011980804940e+05, -1.566420460675195e+05, -1.569747550640650e+05, -1.572995936949267e+05,
- -1.576168179909375e+05, -1.579266721350948e+05, -1.582293891559923e+05, -1.585251915738415e+05, -1.588142920009422e+05,
- -1.590968937001846e+05, -1.593731911067566e+05, -1.596433702486756e+05, -1.599076094233746e+05, -1.601660793400004e+05,
- -1.604189436809171e+05, -1.606663594380000e+05, -1.609084772615368e+05, -1.611454417873285e+05, -1.613773919435662e+05,
- -1.616044612389318e+05, -1.618267780332455e+05, -1.620444657918864e+05, -1.622576433251104e+05, -1.624664250122254e+05,
- -1.626709210181687e+05, -1.628712374865701e+05, -1.630674767329783e+05, -1.632597374214950e+05, -1.634481147326702e+05,
- -1.636327005220893e+05, -1.638135834702470e+05, -1.639908492242645e+05, -1.641645805319660e+05, -1.643348573687933e+05,
- -1.645017570579998e+05, -1.646653543845405e+05, -1.648257217030435e+05, -1.649829290402147e+05, -1.651370441920173e+05,
- -1.652881328159301e+05, -1.654362585185783e+05, -1.655814829390053e+05, -1.657238658278404e+05, -1.658634651225948e+05,
- -1.660003370193079e+05, -1.661345360407548e+05, -1.662661151013974e+05, -1.663951255692725e+05, -1.665216173249744e+05,
- -1.666456388179024e+05, -1.667672371199090e+05, -1.668864579765012e+05, -1.670033458557174e+05, -1.671179439948059e+05,
- -1.672302944448213e+05, -1.673404381132459e+05, -1.674484148047404e+05, -1.675542632601183e+05, -1.676580211936368e+05,
- -1.677597253286851e+05, -1.678594114319571e+05, -1.679571143461793e+05, -1.680528680214662e+05, -1.681467055453730e+05,
- -1.682386591717066e+05, -1.683287603481564e+05, -1.684170397428018e+05, -1.685035272459442e+05, -1.685882520874418e+05,
- -1.686712427229821e+05, -1.687525269466217e+05, -1.688321318902684e+05, -1.689100840444775e+05, -1.689864092784447e+05,
- -1.690611328592317e+05, -1.691342794702594e+05, -1.692058732291039e+05, -1.692759377046201e+05, -1.693444959334302e+05,
- -1.694115704358000e+05, -1.694771832309327e+05, -1.695413558517013e+05, -1.696041093588500e+05, -1.696654643546821e+05,
- -1.697254409962578e+05, -1.697840590081236e+05, -1.698413376945928e+05, -1.698972959515929e+05, -1.699519522781047e+05,
- -1.700053247871997e+05, -1.700574312167035e+05, -1.701082889394918e+05, -1.701579149734361e+05, -1.702063259910189e+05,
- -1.702535383286203e+05, -1.702995679955004e+05, -1.703444306824824e+05, -1.703881417703511e+05, -1.704307163379761e+05,
- -1.704721691701727e+05, -1.705125147653080e+05, -1.705517673426645e+05, -1.705899408495675e+05, -1.706270489682883e+05,
- -1.706631051227287e+05, -1.706981224848982e+05, -1.707321139811892e+05, -1.707650922984561e+05, -1.707970698899117e+05,
- -1.708280589808397e+05, -1.708580715741369e+05, -1.708871194556858e+05, -1.709152141995664e+05, -1.709423671731153e+05,
- -1.709685895418304e+05, -1.709938922741342e+05, -1.710182861459967e+05, -1.710417817454228e+05, -1.710643894768107e+05,
- -1.710861195651844e+05, -1.711069820603025e+05, -1.711269868406594e+05, -1.711461436173565e+05, -1.711644619378791e+05,
- -1.711819511897626e+05, -1.711986206041542e+05, -1.712144792592787e+05, -1.712295360838079e+05, -1.712437998601383e+05,
- -1.712572792275778e+05, -1.712699826854471e+05, -1.712819185960988e+05, -1.712930951878527e+05, -1.713035205578535e+05,
- -1.713132026748557e+05, -1.713221493819304e+05, -1.713303683991039e+05, -1.713378673259265e+05, -1.713446536439755e+05,
- -1.713507347192905e+05, -1.713561178047509e+05, -1.713608100423871e+05, -1.713648184656367e+05, -1.713681500015433e+05,
- -1.713708114728974e+05, -1.713728096003249e+05, -1.713741510043252e+05, -1.713748422072559e+05, -1.713748896352702e+05,
- -1.713742996202055e+05, -1.713730784014277e+05, -1.713712321276272e+05, -1.713687668585763e+05, -1.713656885668384e+05,
- -1.713620031394415e+05, -1.713577163795076e+05, -1.713528340078468e+05, -1.713473616645108e+05, -1.713413049103109e+05,
- -1.713346692283020e+05, -1.713274600252292e+05, -1.713196826329428e+05, -1.713113423097792e+05, -1.713024442419116e+05,
- -1.712929935446691e+05, -1.712829952638239e+05, -1.712724543768533e+05, -1.712613757941695e+05, -1.712497643603226e+05,
- -1.712376248551789e+05, -1.712249619950695e+05, -1.712117804339162e+05, -1.711980847643310e+05, -1.711838795186924e+05,
- -1.711691691701966e+05, -1.711539581338881e+05, -1.711382507676653e+05, -1.711220513732674e+05, -1.711053641972369e+05,
- -1.710881934318636e+05, -1.710705432161078e+05, -1.710524176365040e+05, -1.710338207280454e+05, -1.710147564750496e+05,
- -1.709952288120069e+05, -1.709752416244098e+05, -1.709547987495656e+05, -1.709339039773936e+05, -1.709125610512035e+05,
- -1.708907736684587e+05, -1.708685454815257e+05, -1.708458800984053e+05, -1.708227810834512e+05, -1.707992519580736e+05,
- -1.707752962014278e+05, -1.707509172510896e+05, -1.707261185037181e+05, -1.707009033157027e+05, -1.706752750038010e+05,
- -1.706492368457615e+05, -1.706227920809342e+05, -1.705959439108697e+05, -1.705686954999077e+05, -1.705410499757525e+05,
- -1.705130104300382e+05, -1.704845799188822e+05, -1.704557614634297e+05, -1.704265580503854e+05, -1.703969726325385e+05,
- -1.703670081292729e+05, -1.703366674270740e+05, -1.703059533800188e+05, -1.702748688102636e+05, -1.702434165085181e+05,
- -1.702115992345120e+05, -1.701794197174538e+05, -1.701468806564801e+05, -1.701139847210963e+05, -1.700807345516113e+05,
- -1.700471327595612e+05, -1.700131819281281e+05, -1.699788846125490e+05, -1.699442433405200e+05, -1.699092606125904e+05,
- -1.698739389025508e+05, -1.698382806578162e+05, -1.698022882997982e+05, -1.697659642242746e+05, -1.697293108017505e+05,
- -1.696923303778131e+05, -1.696550252734803e+05, -1.696173977855438e+05, -1.695794501869061e+05, -1.695411847269108e+05,
- -1.695026036316681e+05, -1.694637091043746e+05, -1.694245033256262e+05, -1.693849884537295e+05, -1.693451666250018e+05,
- -1.693050399540719e+05, -1.692646105341723e+05, -1.692238804374277e+05, -1.691828517151385e+05, -1.691415263980590e+05,
- -1.690999064966718e+05, -1.690579940014576e+05, -1.690157908831600e+05, -1.689732990930449e+05, -1.689305205631586e+05,
- -1.688874572065788e+05, -1.688441109176629e+05, -1.688004835722914e+05, -1.687565770281088e+05, -1.687123931247584e+05,
- -1.686679336841163e+05, -1.686232005105177e+05, -1.685781953909828e+05, -1.685329200954384e+05, -1.684873763769356e+05,
- -1.684415659718624e+05, -1.683954906001567e+05, -1.683491519655122e+05, -1.683025517555833e+05, -1.682556916421865e+05,
- -1.682085732814969e+05, -1.681611983142448e+05, -1.681135683659062e+05, -1.680656850468908e+05, -1.680175499527304e+05,
- -1.679691646642600e+05, -1.679205307477982e+05, -1.678716497553244e+05, -1.678225232246544e+05, -1.677731526796121e+05,
- -1.677235396301980e+05, -1.676736855727579e+05, -1.676235919901458e+05, -1.675732603518858e+05, -1.675226921143326e+05,
- -1.674718887208274e+05, -1.674208516018534e+05, -1.673695821751881e+05, -1.673180818460539e+05, -1.672663520072646e+05,
- -1.672143940393720e+05, -1.671622093108110e+05, -1.671097991780385e+05, -1.670571649856754e+05, -1.670043080666419e+05,
- -1.669512297422937e+05, -1.668979313225567e+05, -1.668444141060571e+05, -1.667906793802515e+05, -1.667367284215543e+05,
- -1.666825624954650e+05, -1.666281828566906e+05, -1.665735907492700e+05, -1.665187874066928e+05, -1.664637740520194e+05,
- -1.664085518979981e+05, -1.663531221471809e+05, -1.662974859920371e+05, -1.662416446150656e+05, -1.661855991889072e+05,
- -1.661293508764519e+05, -1.660729008309484e+05, -1.660162501961091e+05, -1.659594001062171e+05, -1.659023516862260e+05,
- -1.658451060518659e+05, -1.657876643097414e+05, -1.657300275574315e+05, -1.656721968835880e+05, -1.656141733680324e+05,
- -1.655559580818489e+05, -1.654975520874804e+05, -1.654389564388221e+05, -1.653801721813102e+05, -1.653212003520146e+05,
- -1.652620419797255e+05, -1.652026980850450e+05, -1.651431696804692e+05, -1.650834577704776e+05, -1.650235633516155e+05,
- -1.649634874125778e+05, -1.649032309342911e+05, -1.648427948899955e+05, -1.647821802453238e+05, -1.647213879583804e+05,
- -1.646604189798215e+05, -1.645992742529283e+05, -1.645379547136868e+05, -1.644764612908604e+05, -1.644147949060655e+05,
- -1.643529564738424e+05, -1.642909469017303e+05, -1.642287670903370e+05, -1.641664179334095e+05, -1.641039003179030e+05,
- -1.640412151240500e+05, -1.639783632254295e+05, -1.639153454890301e+05, -1.638521627753191e+05, -1.637888159383080e+05,
- -1.637253058256144e+05, -1.636616332785276e+05, -1.635977991320703e+05, -1.635338042150615e+05, -1.634696493501774e+05,
- -1.634053353540117e+05, -1.633408630371354e+05, -1.632762332041561e+05, -1.632114466537758e+05, -1.631465041788495e+05,
- -1.630814065664403e+05, -1.630161545978776e+05, -1.629507490488109e+05, -1.628851906892663e+05, -1.628194802836993e+05,
- -1.627536185910490e+05, -1.626876063647899e+05, -1.626214443529870e+05, -1.625551332983438e+05, -1.624886739382561e+05,
- -1.624220670048602e+05, -1.623553132250842e+05, -1.622884133206979e+05, -1.622213680083585e+05, -1.621541779996621e+05,
- -1.620868440011892e+05, -1.620193667145515e+05, -1.619517468364395e+05, -1.618839850586674e+05, -1.618160820682193e+05
- },
- {
- 5.741626228520098e+04, 5.599296787179508e+04, 5.455522675363980e+04, 5.310266408009524e+04, 5.163488976903445e+04,
- 5.015149773113826e+04, 4.865206504877997e+04, 4.713615110479181e+04, 4.560329666013728e+04, 4.405302287604062e+04,
- 4.248483027778000e+04, 4.089819765673283e+04, 3.929258090727025e+04, 3.766741179508180e+04, 3.602209665355594e+04,
- 3.435601500496624e+04, 3.266851810344643e+04, 3.095892739711074e+04, 2.922653290723699e+04, 2.747059152323202e+04,
- 2.569032521321649e+04, 2.388491915159335e+04, 2.205351976701679e+04, 2.019523271691422e+04, 1.830912079832606e+04,
- 1.639420180956868e+04, 1.444944638341992e+04, 1.247377582058252e+04, 1.046605996263347e+04, 8.425115157182943e+03,
- 6.349702385418599e+03, 4.238525644683012e+03, 2.090230707629011e+03, -9.659558343118135e+01, -2.323425286246430e+03,
- -4.591788296570403e+03, -6.903269977598807e+03, -9.259506956067309e+03, -1.166218057804869e+04, -1.411300728255687e+04,
- -1.661372498412828e+04, -1.916607430805103e+04, -2.177177328961081e+04, -2.443248367405961e+04, -2.714976679641737e+04,
- -2.992502642566632e+04, -3.275943570700898e+04, -3.565384506931819e+04, -3.860866802100338e+04, -4.162374235605820e+04,
- -4.469816578111260e+04, -4.783010777309738e+04, -5.101660394554744e+04, -5.425334540140365e+04, -5.753448289741818e+04,
- -6.085247261380511e+04, -6.419799449861069e+04, -6.755997293228804e+04, -7.092572131586999e+04, -7.428121793428986e+04,
- -7.761150343576216e+04, -8.090117500902405e+04, -8.413494210400955e+04, -8.729820365283200e+04, -9.037760507518030e+04,
- -9.336153283096445e+04, -9.624050510447998e+04, -9.900742225889362e+04, -1.016576502009381e+05, -1.041889659033896e+05,
- -1.066013347917434e+05, -1.088965478858790e+05, -1.110778164028392e+05, -1.131493715212430e+05, -1.151161093626967e+05,
- -1.169833017467753e+05, -1.187563765289645e+05, -1.204407603134150e+05, -1.220417713384050e+05, -1.235645496470805e+05,
- -1.250140134503774e+05, -1.263948332801349e+05, -1.277114181542907e+05, -1.289679098353395e+05, -1.301681833171580e+05,
- -1.313158512278023e+05, -1.324142719005034e+05, -1.334665598462885e+05, -1.344755980886968e+05, -1.354440517384964e+05,
- -1.363743822726692e+05, -1.372688620591772e+05, -1.381295887510403e+05, -1.389584992564265e+05, -1.397573830703926e+05,
- -1.405278948243682e+05, -1.412715659690346e+05, -1.419898155540813e+05, -1.426839601048643e+05, -1.433552226224174e+05,
- -1.440047407511566e+05, -1.446335741696029e+05, -1.452427112651524e+05, -1.458330751556783e+05, -1.464055291197678e+05,
- -1.469608814945827e+05, -1.474998900964033e+05, -1.480232662144080e+05, -1.485316782235339e+05, -1.490257548576008e+05,
- -1.495060881794549e+05, -1.499732362825684e+05, -1.504277257418864e+05, -1.508700538676865e+05, -1.513006907464742e+05,
- -1.517200811182162e+05, -1.521286460953713e+05, -1.525267847412331e+05, -1.529148755212668e+05, -1.532932776395583e+05,
- -1.536623322963819e+05, -1.540223637215716e+05, -1.543736803886949e+05, -1.547165758760137e+05, -1.550513297977422e+05,
- -1.553782086406244e+05, -1.556974665407002e+05, -1.560093460059896e+05, -1.563140785883720e+05, -1.566118855079601e+05,
- -1.569029782357542e+05, -1.571875590371517e+05, -1.574658213882255e+05, -1.577379507626675e+05, -1.580041246658122e+05,
- -1.582645132905500e+05, -1.585192798515840e+05, -1.587685809492447e+05, -1.590125669106310e+05, -1.592513821097064e+05,
- -1.594851652678531e+05, -1.597140497362588e+05, -1.599381637614078e+05, -1.601576307337387e+05, -1.603725694272915e+05,
- -1.605830942141386e+05, -1.607893152779234e+05, -1.609913388094253e+05, -1.611892671922622e+05, -1.613831991782108e+05,
- -1.615732300528134e+05, -1.617594517918968e+05, -1.619419532095786e+05, -1.621208200982985e+05, -1.622961353613731e+05,
- -1.624679791385358e+05, -1.626364289248925e+05, -1.628015596836946e+05, -1.629634439533024e+05, -1.631221519486850e+05,
- -1.632777516577799e+05, -1.634303089330216e+05, -1.635798875783083e+05, -1.637265494316851e+05, -1.638703544439768e+05,
- -1.640113607536111e+05, -1.641496247578383e+05, -1.642852011805583e+05, -1.644181431369343e+05, -1.645485021949773e+05,
- -1.646763284342649e+05, -1.648016705019492e+05, -1.649245756661976e+05, -1.650450898672099e+05, -1.651632577659353e+05,
- -1.652791227906099e+05, -1.653927271812327e+05, -1.655041120320814e+05, -1.656133173323753e+05, -1.657203820051736e+05,
- -1.658253439446020e+05, -1.659282400514923e+05, -1.660291062675110e+05, -1.661279776078555e+05, -1.662248881925858e+05,
- -1.663198712766597e+05, -1.664129592787335e+05, -1.665041838087880e+05, -1.665935756711687e+05, -1.666811649824038e+05,
- -1.667669810592652e+05, -1.668510525317119e+05, -1.669334073434052e+05, -1.670140727733665e+05, -1.670930754567963e+05,
- -1.671704414050909e+05, -1.672461960250950e+05, -1.673203641376248e+05, -1.673929699952888e+05, -1.674640372996482e+05,
- -1.675335892177329e+05, -1.676016483979541e+05, -1.676682369854280e+05, -1.677333766367458e+05, -1.677970885342078e+05,
- -1.678593933995460e+05, -1.679203115071571e+05, -1.679798626968695e+05, -1.680380663862542e+05, -1.680949415825134e+05,
- -1.681505068939491e+05, -1.682047805410400e+05, -1.682577803671369e+05, -1.683095238487933e+05, -1.683600281057482e+05,
- -1.684093099105704e+05, -1.684573856979835e+05, -1.685042715738782e+05, -1.685499833240291e+05, -1.685945364225253e+05,
- -1.686379460399259e+05, -1.686802270511522e+05, -1.687213940431238e+05, -1.687614613221528e+05, -1.688004429211014e+05,
- -1.688383526063156e+05, -1.688752038843357e+05, -1.689110100084046e+05, -1.689457839847685e+05, -1.689795385787858e+05,
- -1.690122863208477e+05, -1.690440395121193e+05, -1.690748102301052e+05, -1.691046103340491e+05, -1.691334514701713e+05,
- -1.691613450767478e+05, -1.691883023890440e+05, -1.692143344440977e+05, -1.692394520853666e+05, -1.692636659672365e+05,
- -1.692869865594032e+05, -1.693094241511255e+05, -1.693309888553570e+05, -1.693516906127606e+05, -1.693715391956086e+05,
- -1.693905442115795e+05, -1.694087151074338e+05, -1.694260611726027e+05, -1.694425915426702e+05, -1.694583152027605e+05,
- -1.694732409908322e+05, -1.694873776008841e+05, -1.695007335860731e+05, -1.695133173617480e+05, -1.695251372084024e+05,
- -1.695362012745494e+05, -1.695465175795194e+05, -1.695560940161841e+05, -1.695649383536078e+05, -1.695730582396331e+05,
- -1.695804612033964e+05, -1.695871546577774e+05, -1.695931459017905e+05, -1.695984421229086e+05, -1.696030503993342e+05,
- -1.696069777022064e+05, -1.696102308977591e+05, -1.696128167494205e+05, -1.696147419198609e+05, -1.696160129729903e+05,
- -1.696166363759084e+05, -1.696166185008026e+05, -1.696159656268036e+05, -1.696146839417932e+05, -1.696127795441700e+05,
- -1.696102584445705e+05, -1.696071265675528e+05, -1.696033897532344e+05, -1.695990537588969e+05, -1.695941242605481e+05,
- -1.695886068544502e+05, -1.695825070586121e+05, -1.695758303142449e+05, -1.695685819871848e+05, -1.695607673692848e+05,
- -1.695523916797703e+05, -1.695434600665686e+05, -1.695339776076044e+05, -1.695239493120667e+05, -1.695133801216493e+05,
- -1.695022749117601e+05, -1.694906384927059e+05, -1.694784756108494e+05, -1.694657909497408e+05, -1.694525891312255e+05,
- -1.694388747165258e+05, -1.694246522073009e+05, -1.694099260466796e+05, -1.693947006202780e+05, -1.693789802571873e+05,
- -1.693627692309459e+05, -1.693460717604875e+05, -1.693288920110705e+05, -1.693112340951886e+05, -1.692931020734586e+05,
- -1.692744999554937e+05, -1.692554317007557e+05, -1.692359012193916e+05, -1.692159123730489e+05, -1.691954689756791e+05,
- -1.691745747943223e+05, -1.691532335498735e+05, -1.691314489178368e+05, -1.691092245290634e+05, -1.690865639704723e+05,
- -1.690634707857596e+05, -1.690399484760909e+05, -1.690160005007826e+05, -1.689916302779673e+05, -1.689668411852452e+05,
- -1.689416365603274e+05, -1.689160197016603e+05, -1.688899938690422e+05, -1.688635622842257e+05, -1.688367281315095e+05,
- -1.688094945583188e+05, -1.687818646757720e+05, -1.687538415592398e+05, -1.687254282488931e+05, -1.686966277502368e+05,
- -1.686674430346392e+05, -1.686378770398456e+05, -1.686079326704878e+05, -1.685776127985784e+05, -1.685469202639993e+05,
- -1.685158578749828e+05, -1.684844284085778e+05, -1.684526346111124e+05, -1.684204791986480e+05, -1.683879648574202e+05,
- -1.683550942442776e+05, -1.683218699871089e+05, -1.682882946852637e+05, -1.682543709099636e+05, -1.682201012047105e+05,
- -1.681854880856806e+05, -1.681505340421194e+05, -1.681152415367225e+05, -1.680796130060143e+05, -1.680436508607168e+05,
- -1.680073574861147e+05, -1.679707352424134e+05, -1.679337864650873e+05, -1.678965134652281e+05, -1.678589185298814e+05,
- -1.678210039223811e+05, -1.677827718826764e+05, -1.677442246276529e+05, -1.677053643514489e+05, -1.676661932257678e+05,
- -1.676267134001807e+05, -1.675869270024295e+05, -1.675468361387191e+05, -1.675064428940109e+05, -1.674657493323049e+05,
- -1.674247574969228e+05, -1.673834694107821e+05, -1.673418870766681e+05, -1.673000124775003e+05, -1.672578475765957e+05,
- -1.672153943179245e+05, -1.671726546263663e+05, -1.671296304079588e+05, -1.670863235501424e+05, -1.670427359220032e+05,
- -1.669988693745098e+05, -1.669547257407468e+05, -1.669103068361459e+05, -1.668656144587102e+05, -1.668206503892398e+05,
- -1.667754163915472e+05, -1.667299142126778e+05, -1.666841455831167e+05, -1.666381122170009e+05, -1.665918158123250e+05,
- -1.665452580511415e+05, -1.664984405997622e+05, -1.664513651089518e+05, -1.664040332141240e+05, -1.663564465355295e+05,
- -1.663086066784417e+05, -1.662605152333445e+05, -1.662121737761115e+05, -1.661635838681844e+05, -1.661147470567497e+05,
- -1.660656648749111e+05, -1.660163388418612e+05, -1.659667704630485e+05, -1.659169612303424e+05, -1.658669126221984e+05,
- -1.658166261038158e+05, -1.657661031272977e+05, -1.657153451318064e+05, -1.656643535437156e+05, -1.656131297767638e+05,
- -1.655616752322017e+05, -1.655099912989389e+05, -1.654580793536892e+05, -1.654059407611130e+05, -1.653535768739572e+05,
- -1.653009890331931e+05, -1.652481785681550e+05, -1.651951467966722e+05, -1.651418950252022e+05, -1.650884245489612e+05,
- -1.650347366520537e+05, -1.649808326075975e+05, -1.649267136778504e+05, -1.648723811143327e+05, -1.648178361579484e+05,
- -1.647630800391058e+05, -1.647081139778346e+05, -1.646529391839028e+05, -1.645975568569328e+05, -1.645419681865112e+05,
- -1.644861743523042e+05, -1.644301765241653e+05, -1.643739758622454e+05, -1.643175735170972e+05, -1.642609706297844e+05,
- -1.642041683319826e+05, -1.641471677460842e+05, -1.640899699852986e+05, -1.640325761537520e+05, -1.639749873465867e+05,
- -1.639172046500572e+05, -1.638592291416279e+05, -1.638010618900650e+05, -1.637427039555330e+05, -1.636841563896841e+05,
- -1.636254202357500e+05, -1.635664965286329e+05, -1.635073862949915e+05, -1.634480905533301e+05, -1.633886103140833e+05,
- -1.633289465797032e+05, -1.632691003447404e+05, -1.632090725959289e+05, -1.631488643122670e+05, -1.630884764650976e+05,
- -1.630279100181895e+05, -1.629671659278122e+05, -1.629062451428180e+05, -1.628451486047158e+05, -1.627838772477461e+05,
- -1.627224319989578e+05, -1.626608137782800e+05, -1.625990234985958e+05, -1.625370620658128e+05, -1.624749303789346e+05,
- -1.624126293301320e+05, -1.623501598048090e+05, -1.622875226816741e+05, -1.622247188328057e+05, -1.621617491237190e+05,
- -1.620986144134322e+05, -1.620353155545309e+05, -1.619718533932313e+05, -1.619082287694452e+05, -1.618444425168403e+05,
- -1.617804954629040e+05, -1.617163884290034e+05, -1.616521222304438e+05, -1.615876976765313e+05, -1.615231155706285e+05,
- -1.614583767102148e+05, -1.613934818869419e+05, -1.613284318866917e+05, -1.612632274896306e+05, -1.611978694702662e+05,
- -1.611323585975020e+05, -1.610666956346886e+05, -1.610008813396812e+05, -1.609349164648881e+05, -1.608688017573257e+05,
- -1.608025379586670e+05, -1.607361258052957e+05, -1.606695660283536e+05, -1.606028593537911e+05, -1.605360065024160e+05,
- -1.604690081899425e+05, -1.604018651270380e+05, -1.603345780193713e+05, -1.602671475676586e+05, -1.601995744677101e+05
- }
-};
-
-typedef TabulatedCO2Properties< TabulatedEnthalpyTraits > TabulatedEnthalpy;
-
-
-// this class collects all the tabulated quantities in one convenient place
-struct CO2Tables {
- static const TabulatedEnthalpy tabulatedEnthalpy;
- static const TabulatedDensity tabulatedDensity;
-};
-
-const TabulatedEnthalpy CO2Tables::tabulatedEnthalpy;
-const TabulatedDensity CO2Tables::tabulatedDensity;
-
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
deleted file mode 100644
index f87399f2e411b405035e2678850471f5f6ffaa60..0000000000000000000000000000000000000000
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ /dev/null
@@ -1,858 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/**
- * \file
- * \brief Definition of a problem, for the two-phase flow linear elasticity problem:
- * Problem definition for the deformation of an elastic solid.
- */
-#ifndef DUMUX_EL2P_TESTPROBLEM_HH
-#define DUMUX_EL2P_TESTPROBLEM_HH
-
-#include <dune/pdelab/finiteelementmap/qkfem.hh>
-
-#include <dumux/material/fluidsystems/brineco2.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/geomechanics/el2p/model.hh>
-#include <dumux/geomechanics/el2p/amgbackend.hh>
-
-#include "el2pco2tables.hh"
-#include "el2pspatialparams.hh"
-
-#include <dune/common/version.hh>
-
-namespace Dumux
-{
-template<class TypeTag>
-class El2P_TestProblem;
-
-
-// initial conditions for momentum balance equation
-template<class TypeTag, int dim>
-class InitialDisplacement;
-
-// initial conditions for mass balance equations
-template<class TypeTag>
-class InitialPressSat;
-
-namespace Properties {
-NEW_TYPE_TAG(El2P_TestProblem, INHERITS_FROM(BoxModel, BoxElasticTwoP, El2PSpatialParams));
-NEW_PROP_TAG(InitialDisplacement); //!< The initial displacement function
-NEW_PROP_TAG(InitialPressSat); //!< The initial pressure and saturation function
-
-// Set the grid type
-SET_TYPE_PROP(El2P_TestProblem, Grid, Dune::YaspGrid<3>);
-
-
-SET_PROP(El2P_TestProblem, PressureFEM)
-{
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
-public:
- typedef Dune::PDELab::QkLocalFiniteElementMap<GridView,Scalar,Scalar,1> type;
-};
-
-SET_PROP(El2P_TestProblem, DisplacementFEM)
-{
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
-public:
- typedef Dune::PDELab::QkLocalFiniteElementMap<GridView,Scalar,Scalar,1> type;
-};
-
-// Set the problem property
-SET_TYPE_PROP(El2P_TestProblem, Problem, El2P_TestProblem<TypeTag>);
-
-// Set fluid configuration
-SET_PROP(El2P_TestProblem, FluidSystem)
-{
- typedef BrineCO2FluidSystem<TypeTag> type;
-};
-
-// Set the CO2 table to be used; in this case not the the default table
-SET_TYPE_PROP(El2P_TestProblem, CO2Table, El2P::CO2Tables);
-// Set the salinity mass fraction of the brine in the reservoir
-SET_SCALAR_PROP(El2P_TestProblem, ProblemSalinity, 1e-1);
-
-// Set the soil properties
-SET_TYPE_PROP(El2P_TestProblem, SpatialParams, El2PSpatialParams<TypeTag>);
-
-// Set the initial displacement function
-SET_PROP(El2P_TestProblem, InitialDisplacement)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- enum{dim = GridView::dimension};
-public:
- typedef InitialDisplacement<TypeTag, dim> type;
-};
-
-// Set the initial pressure and saturation function
-SET_PROP(El2P_TestProblem, InitialPressSat)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-public:
- typedef InitialPressSat<TypeTag> type;
-};
-
-SET_SCALAR_PROP(El2P_TestProblem, NewtonMaxRelativeShift, 1e-5);
-
-// use the algebraic multigrid
-SET_TYPE_PROP(El2P_TestProblem, LinearSolver, El2PAMGBackend<TypeTag>);
-
-// central differences to calculate the jacobian by default
-SET_INT_PROP(El2P_TestProblem, ImplicitNumericDifferenceMethod, 0);
-
-// write the stress and displacement output according to rock mechanics
-// sign convention (compressive stresses > 0)
-SET_BOOL_PROP(El2P_TestProblem, VtkRockMechanicsSignConvention, true);
-}
-
-/*!
- * \ingroup ElTwoPBoxProblems
- *
- * \brief Problem definition for a two-phase flow process
- * in an elastic deformable matrix.
- *
- * This problem simulates an injection of CO2 into the center of a cube with 1000 m x 1000 m x 1000 m
- * dimension. The bottom boundary of this cube is in 2000 m depth. The initialization period is 1e6 s,
- * the real injection period is 1e6 s, the initial timestep is 10 s.
- * Apart from the pressure and the saturation distribution this problems solves for the changes in
- * solid displacement (ux, uy, uz [m]) due to injection. Based on the solid displacement vector
- * the injection-induced changes in the strain and stress tensors are evaluated.
- * Further the porosity and permeability are functions of the solid displacement.
- *
- * During an initialization period of length tInit [s] the pressure field is initialized.
- *
- * After the initialization the real simulation starts and the pressure field from the initialization
- * period is applied as initial condition and for the definition of the lateral Dirichlet
- * boundary conditions. The solid displacement field is set to zero and the CO2 injection is started.
- */
-template<class TypeTag = TTAG(El2P_TestProblem)>
-class El2P_TestProblem : public ImplicitPorousMediaProblem<TypeTag>
-{
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- enum {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
- };
-
- enum {
- // indices of the primary variables
- pressureIdx = Indices::pwIdx,
- saturationIdx = Indices::snIdx,
- uxIdx = Indices::uxIdx,
- uyIdx = Indices::uyIdx,
- uzIdx = Indices::uzIdx
-
- };
- enum {
- // indices of the equations+
- contiWEqIdx = Indices::contiWEqIdx,
- contiNEqIdx = Indices::contiNEqIdx
- };
-
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, GridCreator) GridCreator;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::Intersection Intersection;
- typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename Grid::ctype CoordScalar;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
- typedef Dune::BlockVector<GlobalPosition> InitialStressField;
-
- typedef typename GET_PROP_TYPE(TypeTag, LocalFEMSpace) LocalFEMSpace;
- typedef typename GET_PROP_TYPE(TypeTag, PTAG(Problem)) Problem;
-
- typedef typename GET_PROP_TYPE(TypeTag, CO2Table) CO2Table;
- typedef Dumux::CO2<Scalar, CO2Table> CO2;
-
-public:
- /*!
- * \brief The constructor
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- */
- El2P_TestProblem(TimeManager &timeManager,
- const GridView &gridView)
- : ParentType(timeManager, gridView),
- gridView_(gridView)
- {
- std::cout << "El2P_TestProblem: Initializing the fluid system for the el2p model\n";
-
- // initialize the tables of the fluid system
-// FluidSystem::init(/*Tmin=*/273,
-// /*Tmax=*/400,
-// /*nT=*/120,
-// /*pmin=*/1e5,
-// /*pmax=*/1e8,
-// /*np=*/200);
-
- // resize the pressure field vector with the number of vertices
- pInit_.resize(gridView.size(dim));
- // fill the pressure field vector with zeros
- std::fill( pInit_.begin(), pInit_.end(), 0.0 );
-
- // variable which determines if output should be written (initially set to false)
- output_ = false;
- // define if current run is initialization run
- // (initially set to true, will be set to false if initialization is over)
- initializationRun_ = true;
- // defines if feedback from geomechanics on flow is taken into account or not
- // (usually the coupling is switched off for the initialization run)
- coupled_ = false;
- // set initial episode length equal to length of initialization period
- Scalar tInitEnd = GET_RUNTIME_PARAM(TypeTag, Scalar,TimeManager.TInitEnd);
- this->timeManager().startNextEpisode(tInitEnd);
- // transfer the episode index to spatial parameters
- // (during intialization episode hydraulic different parameters might be applied)
- this->spatialParams().setEpisode(this->timeManager().episodeIndex());
-
- depthBOR_ = GET_RUNTIME_PARAM(TypeTag, Scalar, Injection.DepthBOR);
- episodeLength_ = GET_RUNTIME_PARAM(TypeTag, Scalar, TimeManager.EpisodeLength);
-
- dt_ = GET_RUNTIME_PARAM(TypeTag, Scalar, TimeManager.DtInitial);
- }
-
- void init()
- {
- if (this->timeManager().time() < 1e-8)
- {
- // set the initial approximated hydrostatic pressure distribution
- // based on an averaged brine density
- // or based on a pressure polynomial
- this->initializePressure();
- // output is written
- this->setOutput(true);
- }
-
- ParentType::init();
- }
-
- // note: pInit is < 0 (just due to geomechanics sign convention applied here)
- // initialize the pressure field for initialization run
- // first an approximate hydrostatic pressure field is calculated based on an
- // averaged density. Then the model runs for the initialization period and
- // calculates the real hydrostatic pressure distribution based on the real
- // density distribution. The calculated pressure field is than applied for
- // initialization of the actual model run and for the pressure Dirichlet boundary values.
-
- void initializePressure()
- {
- for(const auto& vertex : vertices(gridView_))
- {
- int vIdxGlobal = this->vertexMapper().index(vertex);
- GlobalPosition globalPos = vertex.geometry().corner(0);
-
- // initial approximate pressure distribution at start of initialization run
- pInit_[vIdxGlobal] = -(1.013e5 + (depthBOR_ - globalPos[dimWorld-1]) * brineDensity_ * 9.81);
- }
- }
-
- // allows to change the coupled_ variable which defines if geomechanical feedback on flow is taken
- // into account
- void setCoupled(bool coupled)
- {
- coupled_ = coupled;
- }
-
- // returns the coupled_ variable which defines if geomechanical feedback on flow is taken
- // into account
- bool coupled() const
- {
- return coupled_;
- }
-
- // allows to change the output_ variable which defines if output is written
- void setOutput(bool output)
- {
- output_ = output;
- }
-
- // note: pInit is < 0 (just due to geomechanics sign convention applied here)
- // function which is called after the initialization run in
- // order to fill the pressure field vector pInit_ with the
- // pressure result of the initialization
- void setPressure()
- {
- initializationRun_ = false; // initialization run is now finished
-
- this->setInitializationRun(initializationRun_);
- std::cout<<"El2P_TestProblem: initialized pressure field copied to pInit_"<<std::endl;
- for(const auto& vertex : vertices(gridView_))
- {
- int vIdxGlobal = this->vertexMapper().index(vertex);
- pInit_[vIdxGlobal] = -this->model().curSol().base()[vIdxGlobal*2][0];
- }
- }
-
- // returns the initializationRun_ variable which defines if this is an initialization run
- bool initializationRun()
- {
- return initializationRun_;
- }
-
- // allows to set the initializationRun_ variable which defines if this is an initialization run
- void setInitializationRun(bool initializationRun)
- {
- initializationRun_ = initializationRun;
- }
-
- // function which returns an in-situ stress field that needs to be provided
- // for the principal stress calculation
- GlobalPosition initialStress(const GlobalPosition globalPos, const int dofIdxGlobal) const
- {
- GlobalPosition stress;
- Scalar porosity, rockDensity, gravity;
- gravity = -this->gravity()[dimWorld-1];
- porosity = this->spatialParams().porosity(globalPos);
- rockDensity = this->spatialParams().rockDensity(globalPos);
-
- // initial total stress field here assumed to be isotropic, lithostatic
- stress[0] = brineDensity_ * porosity * gravity * (depthBOR_ - globalPos[dim-1])
- + (1 - porosity) * rockDensity * gravity * (depthBOR_ - globalPos[dim-1]);
- if(dim >=2)
- stress[1] = brineDensity_ * porosity * gravity * (depthBOR_ - globalPos[dim-1])
- + (1 - porosity) * rockDensity * gravity * (depthBOR_ - globalPos[dim-1]);
- if(dim == 3)
- stress[2] = brineDensity_ * porosity * gravity * (depthBOR_ - globalPos[dim-1])
- + (1 - porosity) * rockDensity * gravity * (depthBOR_ - globalPos[dim-1]);
-
- return stress;
- }
- /*!
- * \name Problem parameters
- */
- // \{
-
- /*!
- * \brief The problem name.
- *
- * This is used as a prefix for files generated by the simulation.
- */
- std::string name() const
- {
- return "el2p";
- }
-
- /*!
- * \brief Returns the temperature within the domain.
- *
- * This problem assumes a temperature of 10 degrees Celsius at the ground surface
- * and a geothermal gradient of 0.03 K/m.
- */
- Scalar temperatureAtPos(const GlobalPosition &globalPos) const
- {
- Scalar T;
- T = 283.15 + (depthBOR_ - globalPos[dimWorld-1]) * 0.03;
-
- return T;
- };
-
-
- // returns the bottom of reservoir value (depth in m)
- const Scalar depthBOR() const
- {
- return depthBOR_;
- }
-
- // note: pInit is < 0 (just due to geomechanics sign convention applied here)
- // function which returns the initialized pressure at an arbitrary location within the element
- // called from finite element method (el2plocaloperator.hh) and evaluated at Gauss points
- Scalar pInit(const GlobalPosition& globalPos, const GlobalPosition& localPos, const Element& element) const
- {
- Scalar pValue = 0.0;
-
- typename El2P_TestProblem<TypeTag>::LocalFEMSpace feMap(this->gridView());
- const typename LocalFEMSpace::Traits::FiniteElementType
- &localFiniteElement = feMap.find(element.geometry().type());
- typedef Dune::FieldVector<CoordScalar, 1> ShapeValue;
- std::vector<ShapeValue> shapeVal;
- localFiniteElement.localBasis().evaluateFunction(localPos, shapeVal);
-
- for (int i = 0; i < element.subEntities(dim); i++)
- {
- int vIdxGlobal = this->vertexMapper().subIndex(element, i, dim);
- pValue += pInit_[vIdxGlobal] * shapeVal[i];
- }
-
- return pValue;
- }
-
- // note: pInit is < 0
- // function which returns initial pressure distribution
- std::vector<Scalar> pInit()
- {
- return pInit_;
- }
-
- // returns true if the current solution should be written to
- // disk (i.e. as a VTK file)
- // during initialization no output is written
- // during actual simulation output is written initially and
- // at episode/simulation end
- bool shouldWriteOutput()
- {
- return output_;
- }
-
- // returns true if the current solution should be written to
- // disk (i.e. as a drs file)
- bool shouldWriteRestartFile() const
- {
- return output_;
- }
-
- // \}
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- /*!
- * \brief Specifies which kind of boundary condition should be
- * used for which equation on a given boundary control volume.
- *
- * \param values The boundary types for the conservation equations
- * \param globalPos The center of the finite volume which ought to be set.
- *
- * This function is called directly from dumux/geomechanics/el2p/localoperator.hh
- * If it is renamed to boundaryTypesAtPos it should be adjusted there as well.
- */
- void boundaryTypesAtPos(BoundaryTypes &values, const GlobalPosition& globalPos) const
- {
- values.setAllNeumann();
-
- // The solid displacement normal to the lateral boundaries is fixed.
- if(globalPos[0] < eps_ || globalPos[0] > this->bBoxMax()[0]-eps_)
- {
- values.setDirichlet(uxIdx);
- if(initializationRun_ == false)
- {
- values.setDirichlet(pressureIdx);
- values.setDirichlet(saturationIdx);
- }
- }
- // The solid displacement normal to the lateral boundaries is fixed.
- if(globalPos[1] < eps_ || globalPos[1] > this->bBoxMax()[1]-eps_)
- {
- values.setDirichlet(uyIdx);
- if(initializationRun_ == false)
- {
- values.setDirichlet(pressureIdx);
- values.setDirichlet(saturationIdx);
- }
- }
-
- // Lower boundary closed for brine and CO2 flux, uz is fixed.
- if(globalPos[dimWorld-1] < eps_)
- {
- values.setDirichlet(uzIdx);
- }
-
- // for the initialization run the pressure and saturation
- // values are only given at the top boundary.
- if(globalPos[dimWorld-1] > this->bBoxMax()[dimWorld-1]-eps_)
- {
- values.setDirichlet(pressureIdx);
- values.setDirichlet(saturationIdx);
- }
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a dirichlet
- * control volume.
- *
- * \param values The dirichlet values for the primary variables
- * \param vertex The vertex representing the "half volume on the boundary"
- *
- * For this method, the \a values parameter stores primary variables.
- */
- void dirichlet(PrimaryVariables &values, const Vertex &vertex) const
- {
- const GlobalPosition globalPos = vertex.geometry().center();
-
- dirichletAtPos(values, globalPos);
- values[0] = -pInit_[this->vertexMapper().index(vertex)];
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a dirichlet
- * control volume.
- *
- * \param values The dirichlet values for the primary variables
- * \param globalPos The center of the finite volume which ought to be set.
- *
- * This function is called directly from dumux/geomechanics/el2p/localoperator.hh
- * If it is renamed to dirichletAtPos it should be adjusted there as well.
- */
- void dirichletAtPos(PrimaryVariables &values, const GlobalPosition& globalPos) const
- {
- values = 0.0;
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a neumann
- * boundary segment.
- *
- * \param values The neumann values for the conservation equations in units of
- * \f$ [ \textnormal{unit of conserved quantity} / (m^2 \cdot s )] \f$
- * \param globalPos The position of the integration point of the boundary segment.
- *
- * This function is called directly from dumux/geomechanics/el2p/localoperator.hh
- * If it is renamed to neumannAtPos it should be adjusted there as well.
- * For this method, the \a values parameter stores the mass flux
- * in normal direction of each phase. Negative values mean influx.
- */
- void neumannAtPos(PrimaryVariables &values, const GlobalPosition& globalPos) const
- {
- values = 0;
- }
- // \}
-
- /*!
- * \name Volume terms
- */
- // \{
-
- /*!
- * \brief Evaluate the source term for all phases within a given
- * sub-control-volume.
- *
- * \param values The source values for the conservation equations in units of
- * \f$ [ \textnormal{unit of conserved quantity} / (m^3 \cdot s )] \f$
- * \param element The finite element
- * \param fvGeometry The finite-volume geometry in the box scheme
- * \param scvIdx The local vertex index
- *
- * For this method, the \a values parameter stores the rate mass
- * generated or annihilate per volume unit. Positive values mean
- * that mass is created, negative ones mean that it vanishes.
- */
- void source(PrimaryVariables &values,
- const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx) const
- {
- const GlobalPosition globalPos = element.geometry().corner(scvIdx);
-
- source(values, globalPos);
- }
-
- /*!
- * \brief Evaluate the source term for all phases within a given
- * sub-control-volume.
- *
- * \param values The source values for the conservation equations in units of
- * \f$ [ \textnormal{unit of conserved quantity} / (m^3 \cdot s )] \f$
- * \param globalPos The position of the integration point of the boundary segment.
- *
- * For this method, the \a values parameter stores the rate mass
- * generated or annihilate per volume unit. Positive values mean
- * that mass is created, negative ones mean that it vanishes.
- */
- void source(PrimaryVariables &values, const GlobalPosition& globalPos) const
- {
- values = 0.0;
- if(initializationRun_ == false){
- if(globalPos[0] > 490-eps_ && globalPos[0] < 510+eps_
- && globalPos[1] > 490-eps_ && globalPos[1] < 510+eps_
- && globalPos[dimWorld-1] > 490-eps_ && globalPos[dimWorld-1] < 510+eps_)
- values[saturationIdx] = 1.e-5; // injection
- }
- }
-
- // \}
-
- /*!
- * \brief Transfer episode index to spatial parameters in order to apply different
- * hydraulic parameters during pressure initialization
- */
- void preTimeStep()
- {
- this->spatialParams().setEpisode(this->timeManager().episodeIndex());
- }
-
- /*!
- * \brief Write mass balance information for both fluid phases
- */
- void postTimeStep()
- {
- PrimaryVariables mass;
- this->model().globalStorage(mass);
- double time = this->timeManager().time()+this->timeManager().timeStepSize();
-
- // Write mass balance information for rank 0
- if (this->gridView().comm().rank() == 0) {
- std::cout << "TIME, MASS NPhase (kg), MASS WPhase (kg): \n"
- <<"mass: "
- <<time<< " , "
- <<mass[1] << " , "
- <<mass[0]
- <<"\n"
- <<"***************************************" <<std::endl;
- }
-
-
- }
-
- /*!
- * \brief Define length of next episode
- */
- void episodeEnd()
- {
- this->timeManager().startNextEpisode(episodeLength_);
- // At the end of the initializationRun
- if (this->timeManager().time() == GET_RUNTIME_PARAM(TypeTag, Scalar,TimeManager.TInitEnd))
- {
- this->timeManager().setTimeStepSize(dt_);
-
- this->setCoupled(true);
- // pressure field resulting from the initialization period is applied for the initial
- // and the Dirichlet boundary conditions
- this->setPressure();
- // output is written
- this->setOutput(true);
- }
- }
-
-private:
- static constexpr Scalar eps_ = 3e-6;
- Scalar depthBOR_;
- static constexpr Scalar brineDensity_ = 1059;
- Scalar episodeLength_;// = GET_RUNTIME_PARAM(TypeTag, Scalar, TimeManager.EpisodeLength);
-
- std::vector<Scalar> pInit_;
- GridView gridView_;
- Scalar dt_;
-public:
- bool initializationRun_, coupled_, output_;
- InitialStressField initialStressField_;
-};
-
-
-/*!
- * \ingroup ElTwoPBoxProblems
- *
- * \brief Initial conditions for momentum balance equation.
- *
- * Set initial conditions for solution of momentum balance equation
- * i.e. initialize solid displacement
- * This function is called from dumux/geomechanics/el2p/model.hh
- * * This function is called from dumux/geomechanics/el2p/model.hh.
- *
- * The primary variables are initialized two times:
- * 1. before the initialization run.
- * 2. at the start of the actual simulation the solid displacement values which have
- * changed during initialization of the pressure field are set to zero again.
- *
- */
-template<class TypeTag, int dim>
-class InitialDisplacement :
-public Dune::PDELab::AnalyticGridFunctionBase<
- Dune::PDELab::AnalyticGridFunctionTraits<typename GET_PROP_TYPE(TypeTag, GridView),typename GET_PROP_TYPE(TypeTag, Scalar),dim>,
- InitialDisplacement<TypeTag,dim> >
-{
-public:
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::PDELab::AnalyticGridFunctionTraits<typename GET_PROP_TYPE(TypeTag, GridView),typename GET_PROP_TYPE(TypeTag, Scalar),dim> Traits;
- typedef Dune::PDELab::AnalyticGridFunctionBase<Traits, InitialDisplacement<TypeTag,dim> > BaseT;
-
- typedef typename Traits::DomainType DomainType;
- typedef typename Traits::RangeType RangeType;
-
- /*!
- * \brief The constructor
- *
- * \param gridView The grid view
- */
- InitialDisplacement(const GridView & gridView) : BaseT(gridView) {}
-
- /*!
- * \brief Evaluate initial conditions for the momentum balance equation.
- *
- * \param position The position of the vertex
- * \param values The initial solid displacement vector at the vertex
- */
- inline void evaluateGlobal(const DomainType & position, RangeType & values) const
- {
- values = 0;
- }
-};
-
-/*!
- * \ingroup ElTwoPBoxProblems
- *
- * \brief Initial conditions for mass balance equations.
- *
- * Set initial conditions for solution of the mass balance equations
- * i.e. initialize wetting phase pressure and nonwetting phase saturation
- *
- * This function is called from dumux/geomechanics/el2p/model.hh.
- * The primary variables are initialized two times:
- * 1. before the initialization run.
- * 2. at the start of the actual simulation applying pressure field
- * calculated during initialization
- *
- */
-template<class TypeTag>
-class InitialPressSat :
-public Dune::PDELab::AnalyticGridFunctionBase<
- Dune::PDELab::AnalyticGridFunctionTraits<typename GET_PROP_TYPE(TypeTag, GridView),typename GET_PROP_TYPE(TypeTag, Scalar),2>,
- InitialPressSat<TypeTag> >
-{
-public:
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::PDELab::AnalyticGridFunctionTraits<GridView,Scalar,2> Traits;
- typedef Dune::PDELab::AnalyticGridFunctionBase<Traits, InitialPressSat<TypeTag>> BaseT;
-
- typedef typename Traits::DomainType DomainType;
- typedef typename Traits::RangeType RangeType;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum {
- // indices of the primary variables
- pressureIdx = Indices::pwIdx,
- saturationIdx = Indices::snIdx,
-
- dimWorld = GridView::dimensionworld
- };
-
- typedef typename Dune::MultipleCodimMultipleGeomTypeMapper<GridView,
- Dune::MCMGVertexLayout> VertexMapper;
-
- /*!
- * \brief The constructor
- *
- * \param gridView The grid view
- */
- InitialPressSat(const GridView & gridView)
- : BaseT(gridView)
- , gridView_(gridView)
-#if DUNE_VERSION_NEWER(DUNE_COMMON,2,6)
- , vertexMapper_(gridView, Dune::mcmgVertexLayout())
-#else
- , vertexMapper_(gridView)
-#endif
- {
- // resize the pressure field vector with the number of vertices
- pInit_.resize(gridView.size(GridView::dimension));
- // fill the pressure field vector with zeros
- std::fill(pInit_.begin(), pInit_.end(), 0.0);
- }
-
- /*!
- * \brief Evaluate initial conditions for the mass balance equations.
- *
- * \param position The position of the vertex
- * \param values The initial pressure and saturation values at the vertex
- *
- * This function applies the pressure field pInit_ which is defined
- * in the problem.
- */
- inline void evaluateGlobal(const DomainType & position, RangeType & values) const
- {
- bool valueSet;
- valueSet = false;
-
- // loop over all vertices
- for (const auto& vertex : vertices(gridView_))
- {
- // get global index of current vertex
- int vIdxGlobal = vertexMapper_.index(vertex);
- Dune::FieldVector<double, dimWorld> globalPos =
- (vertex).geometry().corner(0);
-
- // compare coordinates of current vertex with position coordinates
- if (globalPos[0] >= position[0] - eps_ && globalPos[0] <= position[0] + eps_
- && globalPos[1] >= position[1] - eps_ && globalPos[1]
- <= position[1] + eps_ && globalPos[dimWorld-1] >= position[dimWorld-1] - eps_
- && globalPos[dimWorld-1] <= position[dimWorld-1] + eps_)
- {
- // if coordinates are identical write the pressure value for this
- // vertex (with index vIdxGlobal) into the values vector
- values[pressureIdx] = pInit_[vIdxGlobal];
- // the value of this vertex is set
- valueSet = true;
- }
- }
-
- // check if the pressure value for this vertex has been initialized
- if (valueSet == false)
- {
- std::cout << " pressure value not initialized correctly "
- << std::endl;
- }
-
- // initialize saturation values
- values[saturationIdx] = 0;
- }
-
- /*!
- * \brief Fill the vector pInit_ for initialization
- *
- * \param pInit The pressure field vector defined in the problem class
- *
- * This function is called from dumux/geomechanics/el2p/model.hh.
- */
- void setPressure(std::vector<Scalar> pInit)
- {
- std::cout << "InitialPressSat: setPressure function called" << std::endl;
- for (const auto& vertex : vertices(gridView_))
- {
- int vIdxGlobal = vertexMapper_.index(vertex);
- pInit_[vIdxGlobal] = -pInit[vIdxGlobal];
- }
- }
-
-private:
- static constexpr Scalar eps_ = 3e-6;
- Scalar depthBOR_;
- std::vector<Scalar> pInit_;
- GridView gridView_;
- VertexMapper vertexMapper_;
-};
-
-} //end namespace
-
-#endif
diff --git a/test/geomechanics/el2p/el2pspatialparams.hh b/test/geomechanics/el2p/el2pspatialparams.hh
deleted file mode 100644
index 86f5e05addea4a0ce4b7abb91f55fce8c3498482..0000000000000000000000000000000000000000
--- a/test/geomechanics/el2p/el2pspatialparams.hh
+++ /dev/null
@@ -1,276 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief The spatial parameters for the El2P_TestProblem which uses the
- * linear elastic two-phase model
- */
-#ifndef DUMUX_ELTWOPSPARAMETERS_HH
-#define DUMUX_ELTWOPSPARAMETERS_HH
-
-#include <dumux/material/spatialparams/implicit.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-
-#include <dumux/geomechanics/el2p/model.hh>
-
-namespace Dumux
-{
-
-//forward declaration
-template<class TypeTag>
-class El2PSpatialParams;
-
-namespace Properties
-{
-// The spatial parameters TypeTag
-NEW_TYPE_TAG(El2PSpatialParams);
-
-// Set the spatial parameters
-SET_TYPE_PROP(El2PSpatialParams, SpatialParams, El2PSpatialParams<TypeTag>);
-
-// Set the material Law
-SET_PROP(El2PSpatialParams, MaterialLaw)
-{
-private:
- // define the material law which is parameterized by effective
- // saturations
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef RegularizedBrooksCorey<Scalar> EffectiveLaw;
-public:
- // define the material law parameterized by absolute saturations
- typedef EffToAbsLaw<EffectiveLaw> type;
-};
-}
-/*!
- * \ingroup ElTwoPBoxModel
- * \brief The spatial parameters for the El2P_TestProblem which uses the
- * linear elastic two-phase model
- */
-template<class TypeTag>
-class El2PSpatialParams : public ImplicitSpatialParams<TypeTag>
-{
- typedef ImplicitSpatialParams<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename Grid::ctype CoordScalar;
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld,
- };
-
- typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
- typedef Dune::FieldMatrix<Scalar,dim,dim> DimMatrix;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GridView::template Codim<0>::Entity Element;
-
-public:
- //get the material law from the property system
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
- typedef typename MaterialLaw::Params MaterialLawParams;
-
-
- El2PSpatialParams(const GridView &gridView)
- : ParentType(gridView)
- {
- // episode index
- episode_ = 0;
- // intrinsic permeabilities [m^2]
- Kinit_ = Scalar(0.0); // init permeability
- K_ = Scalar(0.0); // permeability
- for (int i = 0; i < dim; i++){
- Kinit_[i][i] = 1.E-12; //[m²]
- K_[i][i] = 1.E-14; //[m²]
- }
-
- // porosities [-]
- phi_ = 0.2;
-
- // rock density [kg/m^3]
- rockDensity_ = 2650.0;
-
- // Young's modulus [Pa]
- E_ = 6e9;
- // Poisson's ratio [-]
- nu_ = 0.2;
- // Lame parameters [Pa]
- lambda_ = (E_ * nu_) / ((1 + nu_)*(1 - 2 * nu_));
- mu_ = E_ / (2 * (1 + nu_));
-
-
- // given Van Genuchten m
- m_ = 0.457;
- // Brooks Corey lambda
- using std::pow;
- BrooksCoreyLambda_ = m_ / (1 - m_) * (1 - pow(0.5,1/m_));
-
- // residual saturations
- MaterialParams_.setSwr(0.3);
- MaterialParams_.setSnr(0.05);
-
- // parameters for the Brooks Corey law
- MaterialParams_.setPe(1.99e4);
- MaterialParams_.setLambda(BrooksCoreyLambda_);
-
-
- }
-
- ~El2PSpatialParams()
- {}
-
- /*!
- * \brief This function sets the private variable episode_ to the current episode index
- * which is checked in the hydraulic parameter functions to identify if we are still in the
- * initialization run (episode_ == 1)
- *
- * \param episode The episode index
- */
- void setEpisode(const int& episode)
- {
- episode_ = episode;
- std::cout<< "episode set to: "<< episode_<<std::endl;
- }
-
- /*!
- * \brief Apply the intrinsic permeability tensor \f$[m^2]\f$ to a pressure
- * potential gradient.
- *
- * \param element The current finite element
- * \param fvGeometry The current finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume where
- * the porosity needs to be defined
- *
- * During the initialization period the intrinsic permeability can be set to a larger
- * value in order to accelerate the calculation of the hydrostatic pressure distribution.
- */
- const DimMatrix intrinsicPermeability(const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx) const
- {
- if(episode_ <= 1)
- return Kinit_; // intrinsic permeability applied during initialization
- else
- return K_; // intrinsic permeability
- }
-
- /*!
- * \brief Define the porosity \f$[-]\f$ of the soil
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry
- * \param scvIdx The local index of the sub-control volume where
- * the porosity needs to be defined
- */
- double porosity(const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx) const
- {
- return phi_;
- }
-
- /*!
- * \brief Define the porosity \f$[-]\f$ of the soil
- *
- * \param globalPos The global position of the vertex
- */
- double porosity(const GlobalPosition& globalPos) const
- {
- return phi_;
- }
-
- /*!
- * \brief Define the density \f$[kg/m^3]\f$ of the rock
- *
- * \param element The finite element
- * \param scvIdx The local index of the sub-control volume where
- * the porosity needs to be defined
- */
- const Scalar rockDensity(const Element &element,
- int scvIdx) const
- {
- return rockDensity_;
- }
-
- /*!
- * \brief Define the density \f$[kg/m^3]\f$ of the rock
- *
- * \param globalPos The global position of the vertex
- */
- const Scalar rockDensity(const GlobalPosition &globalPos) const
- {
- return rockDensity_;
- }
-
- /*!
- * \brief Define the Lame parameters \f$[Pa]\f$ linear elastic rock
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry
- * \param scvIdx The local index of the sub-control volume where
- * the porosity needs to be defined
- */
- const Dune::FieldVector<Scalar,2> lameParams(const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx) const
- {
- // Lame parameters
- Dune::FieldVector<Scalar, 2> param;
-
- param[0] = lambda_;
- param[1] = mu_;
-
- return param;
- }
-
- /*!
- * \brief Function for defining the parameters needed by constitutive relationships (kr-Sw, pc-Sw, etc.).
- *
- * \param element The current element
- * \param fvGeometry The current finite volume geometry of the element
- * \param scvIdx The index of the sub-control volume.
- * \return the material parameters object
- */
- const MaterialLawParams& materialLawParams(const Element &element,
- const FVElementGeometry &fvGeometry,
- int scvIdx) const
- {
- return MaterialParams_;
- }
-
-private:
- Dune::FieldMatrix<Scalar,dim,dim> K_, Kinit_;
- Scalar layerBottom_;
- Scalar rockDensity_;
- Scalar phi_, phiInit_;
- Scalar lambda_;
- Scalar mu_;
- Scalar E_;
- Scalar nu_;
- Scalar BrooksCoreyLambda_, m_;
- MaterialLawParams MaterialParams_;
- static constexpr Scalar eps_ = 3e-6;
- int episode_;
-
-};
-}
-#endif
diff --git a/test/geomechanics/el2p/test_el2p.cc b/test/geomechanics/el2p/test_el2p.cc
deleted file mode 100644
index 3b02a3c00af484c84aa9fc245f96e1acef3b152c..0000000000000000000000000000000000000000
--- a/test/geomechanics/el2p/test_el2p.cc
+++ /dev/null
@@ -1,75 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Test for the el2p cell centered model
- */
-#include <config.h>
-
-#include <dune/common/precision.hh>
-#include <dune/common/version.hh>
-#if HAVE_DUNE_PDELAB
-#include "el2pproblem.hh"
-#endif
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TInitEnd End of the initialization [s] \n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n"
- "\t-Problem.Name String for naming of the output files \n"
- "\n";
-
- std::cout << errorMessageOut << std::endl;
- }
-}
-
-////////////////////////
-// the main function
-////////////////////////
-int main(int argc, char** argv)
-{
-#if HAVE_DUNE_PDELAB
- typedef TTAG(El2P_TestProblem) TypeTag;
- return Dumux::start<TypeTag>(argc, argv, usage);
-
-#else // HAVE_DUNE_PDELAB
-#warning You need to have dune-pdelab to run this test.
- std::cerr << "You need to have dune-pdelab to run this test." << std::endl;
- return 77;
-#endif // HAVE_DUNE_PDELAB
-}
diff --git a/test/geomechanics/el2p/test_el2p.input b/test/geomechanics/el2p/test_el2p.input
deleted file mode 100644
index f7432f9007cb6508c6d842c6c987ff19fa705fef..0000000000000000000000000000000000000000
--- a/test/geomechanics/el2p/test_el2p.input
+++ /dev/null
@@ -1,13 +0,0 @@
-[TimeManager]
-TInitEnd = 1e6 # [s]
-TEnd = 2e6 # [s]
-DtInitial = 10 # [s]
-EpisodeLength = 1e6 # [s]
-
-[Grid]
-UpperRight = 1000 1000 1000
-Cells = 4 4 4
-Refinement = 0
-
-[Injection]
-DepthBOR = 2000 # Depth at the bottom of the scenario [m]
diff --git a/test/geomechanics/elastic/CMakeLists.txt b/test/geomechanics/elastic/CMakeLists.txt
deleted file mode 100644
index 8e4bc67635aaeb77375e6335d2ec99f5bd1f626e..0000000000000000000000000000000000000000
--- a/test/geomechanics/elastic/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-add_input_file_links()
-
-add_dumux_test(test_elastic test_elastic test_elastic.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/elasticmatrix-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/elasticmatrix-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_elastic"
- --zeroThreshold {"uy":1e-15,"uz":1e-15,"stress X":1e-8,"stress Y":1e-8,"stress Z":1e-8})
-
-#install sources
-install(FILES
-elasticmatrixproblem.hh
-elasticspatialparams.hh
-test_elastic.cc
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/geomechanics/elastic)
diff --git a/test/geomechanics/elastic/elasticmatrixproblem.hh b/test/geomechanics/elastic/elasticmatrixproblem.hh
deleted file mode 100644
index 9a88e31e5df13cf832e73f0d4ec6f0b59da21f85..0000000000000000000000000000000000000000
--- a/test/geomechanics/elastic/elasticmatrixproblem.hh
+++ /dev/null
@@ -1,265 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/**
- * \file
- * \brief Definition of a problem, for the linear elasticity problem:
- * Problem definition for the deformation of an elastic solid.
- */
-#ifndef DUMUX_ELASTICMATRIXPROBLEM_HH
-#define DUMUX_ELASTICMATRIXPROBLEM_HH
-
-#include <dumux/geomechanics/elastic/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-
-#include "elasticspatialparams.hh"
-
-namespace Dumux
-{
-
-template <class TypeTag>
-class ElasticMatrixProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(ElasticMatrixProblem, INHERITS_FROM(CCTpfaModel, Elastic, ElSpatialParams));
-
-// Set the grid type
-SET_TYPE_PROP(ElasticMatrixProblem, Grid, Dune::YaspGrid<2>);
-
-// Set the problem property
-SET_TYPE_PROP(ElasticMatrixProblem, Problem, ElasticMatrixProblem<TypeTag>);
-
-}
-
-/*!
- * \ingroup ElasticBoxProblems
- * \ingroup ImplicitTestProblems
- *
- * \brief Problem definition for the deformation of an elastic matrix.
- *
- * The problem defined here leads to the following linear distribution of the
- * solid displacement: u(x,y,z) = 1/E * (x,0,-nu*z) which for the given grid
- * The numerical results can be verified analytically.
- *
- * The 3D domain given in linearelastic.dgf spans from (0,0,0) to (10,1,10).
- *
- * Dirichlet boundary conditions (u=0.0) are applied for the displacement in y-direction
- * in the whole domain, for the displacement in x-direction on the left boundary (x < eps)
- * and for the displacement in z-direction for the lower left edge (x<eps && z<eps).
- * On the remaining boundaries Neumann boundary conditions are applied.
- * The normal stress applied on each boundary results from solving the momentum balance
- * analytically for the solid displacement function u(x,y,z) = 1/E * (x,0,-nu*z).
- * This leads to the normal stresses: \f$ \boldsymbol{\sigma_{xx}} = 2\,\frac{\mu}{E} + \frac{\lambda}{E} ( 1-\nu)\f$,
- * \f$ \boldsymbol{\sigma_{yy}} = \frac{\lambda}{E} ( 1-\nu)\f$,
- * \f$ \boldsymbol{\sigma_{zz}} = -2\,\frac{\mu \nu}{E} + \frac{\lambda}{E}\f$.
- * The shear stresses are set to zero.
- *
- * This problem uses the \ref ElasticModel model.
- *
- * To run the simulation execute the following line in shell:
- * <tt>./test_elastic -parameterFile ./test_elastic.input</tt>
- */
-
-template <class TypeTag>
-class ElasticMatrixProblem: public ImplicitPorousMediaProblem<TypeTag>
-{
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace) SubControlVolumeFace;
-
- // copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld,
- };
- enum {
- // indices of the primary variables
- uxIdx = Indices::uxIdx,
- uyIdx = Indices::uyIdx,
- uzIdx = Indices::uzIdx,
- };
- enum {
- // indices of the equations
- momentumXEqIdx = Indices::momentumXEqIdx,
- momentumYEqIdx = Indices::momentumYEqIdx,
- momentumZEqIdx = Indices::momentumZEqIdx,
- };
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::Intersection Intersection;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
-public:
- ElasticMatrixProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
- {}
-
- /*!
- * \name Problem parameters
- */
- // \{
-
- /*!
- * \brief The problem name.
- *
- * This is used as a prefix for files generated by the simulation.
- */
- std::string name() const
- { return "elasticmatrix";}
- // \}
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- /*!
- * \brief Specifies which kind of boundary condition should be
- * used for which equation on a given boundary segment.
- *
- * \param values The boundary types for the conservation equations
- * \param globalPos The global position
- */
- BoundaryTypes boundaryTypesAtPos(const GlobalPosition &globalPos) const
- {
- BoundaryTypes values;
-
- values.setAllNeumann();
-
- if(globalPos[0] < eps_)
- {
- values.setDirichlet(uyIdx);
- values.setDirichlet(uxIdx);
- if(globalPos[2] < eps_)
- values.setDirichlet(uzIdx);
- }
-
- return values;
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a Dirichlet
- * boundary segment.
- *
- * \param values The Dirichlet values for the primary variables
- * \param vertex The vertex for which the boundary type is set
- *
- * For this method, the \a values parameter stores primary variables.
- */
- PrimaryVariables dirichletAtPos(const GlobalPosition& globalPos) const
- {
- return PrimaryVariables(0.0);
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a Neumann
- * boundary segment.
- *
- * For this method, the \a values parameter stores the mass flux
- * in normal direction of each phase. Negative values mean influx.
- */
- PrimaryVariables neumann(const Element &element, const SubControlVolumeFace &scvFace) const
- {
- PrimaryVariables values(0.0);
-
- // inside scv
- auto&& scv = this->model().fvGeometries().subControlVolume(scvFace.insideScvIdx());
-
- // get Lame parameters
- Scalar lambda = this->spatialParams().lameParams(element, scv)[0];
- Scalar mu = this->spatialParams().lameParams(element, scv)[1];
- Scalar E = this->spatialParams().E(element, scv);
- Scalar nu = this->spatialParams().nu(element, scv);
-
- // calculate values of sigma in normal direction
- Dune::FieldMatrix<Scalar, dim, dim> sigma(0);
- sigma[0][0] = 2.0*mu + lambda*(1 - nu);
- sigma[1][1] = lambda*(1 - nu);
- sigma[2][2] = -2.0*mu*nu + lambda*(1 - nu);
-
- sigma *= -1.0/E;
-
- // determine normal vector of current face
- Dune::FieldVector<Scalar,dim> normal = scvFace.unitOuterNormal();
-
- // use stress in normal direction as boundary condition
- sigma.mv(normal, values);
-
- return values;
- }
- // \}
-
- /*!
- * \name Volume terms
- */
- // \{
-
- /*!
- * \brief Evaluate the source term for all phases within a given
- * sub-control-volume.
- *
- * For this method, the \a priVars parameter stores the rate momentum
- * is generated or annihilate per volume
- * unit. Positive values mean that momentum is created, negative ones
- * mean that it vanishes.
- */
- PrimaryVariables sourceAtPos(const GlobalPosition &globalPos) const
- {
- return PrimaryVariables(0.0);
- }
-
- /*!
- * \brief Evaluate the initial value for a control volume.
- *
- * \param values The initial values for the primary variables
- * \param globalPos The position for which the initial condition should be evaluated
- *
- * For this method, the \a values parameter stores primary
- * variables.
- */
- PrimaryVariables initialAtPos(const GlobalPosition &globalPos) const
- {
- return initial_(globalPos);
- }
-
- // \}
-
-
-private:
- // the internal method for the initial condition
- PrimaryVariables initial_(const GlobalPosition &globalPos) const
- {
- return PrimaryVariables(0.0); // initial condition for the solid displacement
- }
-
- static constexpr Scalar eps_ = 3e-6;
-};
-} //end namespace
-
-#endif
diff --git a/test/geomechanics/elastic/elasticspatialparams.hh b/test/geomechanics/elastic/elasticspatialparams.hh
deleted file mode 100644
index 3fe626f3b4133776ace21ad6dd4a3294ca229b1f..0000000000000000000000000000000000000000
--- a/test/geomechanics/elastic/elasticspatialparams.hh
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Definition of the spatial parameters for the linear elasticity problem.
- */
-#ifndef DUMUX_ELASTIC_SPATIAL_PARAMS_HH
-#define DUMUX_ELASTIC_SPATIAL_PARAMS_HH
-
-#include <dumux/geomechanics/el2p/properties.hh>
-
-namespace Dumux
-{
-
-/*!
- * \ingroup ElasticBoxModel
- * \ingroup ImplicitTestProblems
- *
- * \brief Definition of the spatial parameters for the linear elasticity
- * problem.
- */
-
-template<class TypeTag>
-class ElSpatialParams;
-
-namespace Properties
-{
-// The spatial parameters TypeTag
-NEW_TYPE_TAG(ElSpatialParams);
-
-// Set the spatial parameters
-SET_TYPE_PROP(ElSpatialParams, SpatialParams, ElSpatialParams<TypeTag>);
-
-}
-
-template<class TypeTag>
-class ElSpatialParams
-{
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename Grid::ctype CoordScalar;
-
- enum { dimWorld=GridView::dimensionworld };
-
- typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
-
-public:
-
- ElSpatialParams(const Problem& problem, const GridView &gridView)
- {
- // rock density
- rockDensity_ = 2650.0;
- // Lame Parameters
- lambda_ = 3e9;
- mu_ = 3e9;
- // Young's modulus
- E_ = 1e7;
- // Poisson's ration
- nu_ = 0.3;
- }
-
- ~ElSpatialParams()
- {}
-
- /*!
- * \brief Define the rock density \f$\mathrm{[kg/m^3]}\f$.
- *
- * \param element The finite element
- * \param scvIdx The local index of the sub-control volume where
- */
- const Scalar rockDensity(const Element &element, const SubControlVolume& scv) const
- {
- return rockDensity_;
- }
-
- /*!
- * \brief Define the rock density \f$\mathrm{[kg/m^3]}\f$.
- *
- * \param globalPos The position for which the rock density should be returned
- */
- const Scalar rockDensity(const GlobalPosition &globalPos) const
- {
- return rockDensity_;
- }
-
- /*!
- * \brief Define the Lame parameters \f$\mathrm{[Pa]}\f$.
- *
- * \param element The finite element
- * \param fvGeometry The current finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume where
- */
- const Dune::FieldVector<Scalar,2> lameParams(const Element &element, const SubControlVolume& scv) const
- {
- // Lame parameters
- Dune::FieldVector<Scalar, 2> param;
-
- param[0] = lambda_;
- param[1] = mu_;
-
- return param;
- }
-
- /*!
- * \brief Define Young's modulus E \f$\mathrm{[Pa]}\f$.
- *
- * \param element The finite element
- * \param fvGeometry The current finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume where
- */
- const Scalar E(const Element &element, const SubControlVolume& scv) const
- {
- return E_;
- }
-
- /*!
- * \brief Define Poisson's ratio \f$\mathrm{[-]}\f$.
- *
- * \param element The finite element
- * \param fvGeometry The current finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume where
- */
- const Scalar nu(const Element &element, const SubControlVolume& scv) const
- {
- return nu_;
- }
-
-private:
- Scalar rockDensity_;
- Scalar lambda_;
- Scalar mu_;
- Scalar E_;
- Scalar nu_;
- static constexpr Scalar eps_ = 3e-6;
-};
-}
-#endif
diff --git a/test/geomechanics/elastic/test_elastic.cc b/test/geomechanics/elastic/test_elastic.cc
deleted file mode 100644
index eec98819a6d0e48472fa2b0e570693d50b0e15bb..0000000000000000000000000000000000000000
--- a/test/geomechanics/elastic/test_elastic.cc
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Test for the elastic model.
- */
-#include <config.h>
-
-#include "elasticmatrixproblem.hh"
-
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe List of Mandatory arguments for this program is:\n"
- "\t-tEnd The end of the simulation. [s] \n"
- "\t-dtInitial The initial timestep size. [s] \n"
- "\t-gridFile The file name of the file containing the grid \n"
- "\t definition in DGF format\n"
- "\t-FluidSystem.nTemperature Number of tabularization entries [-] \n"
- "\t-FluidSystem.nPressure Number of tabularization entries [-] \n"
- "\t-FluidSystem.pressureLow Low end for tabularization of fluid properties [Pa] \n"
- "\t-FluidSystem.pressureHigh High end for tabularization of fluid properties [Pa] \n"
- "\t-FluidSystem.temperatureLow Low end for tabularization of fluid properties [Pa] \n"
- "\t-FluidSystem.temperatureHigh High end for tabularization of fluid properties [Pa] \n"
- "\t-SimulationControl.name The name of the output files [-] \n"
- "\t-InitialConditions.temperature Initial temperature in the reservoir [K] \n"
- "\t-InitialConditions.depthBOR Depth below ground surface [m] \n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(ElasticMatrixProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/geomechanics/elastic/test_elastic.input b/test/geomechanics/elastic/test_elastic.input
deleted file mode 100644
index 1090dd16e742cb318289a045e642b1a9c1d7d839..0000000000000000000000000000000000000000
--- a/test/geomechanics/elastic/test_elastic.input
+++ /dev/null
@@ -1,10 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1 # [s]
-
-[Problem]
-EnableGravity = 0
-
-[Grid]
-UpperRight = 10 1 10
-Cells = 10 10 10
diff --git a/test/io/gridcreator/CMakeLists.txt b/test/io/gridcreator/CMakeLists.txt
index 812b7f044173c634237e91ae0840c79079a1248e..0662ebe46636af84a8a336376d1192068069e2ad 100644
--- a/test/io/gridcreator/CMakeLists.txt
+++ b/test/io/gridcreator/CMakeLists.txt
@@ -1,15 +1,19 @@
-add_dumux_test(test_gridcreator_gmsh test_gridcreator_gmsh test_gridcreator_gmsh.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh"
- --files ${CMAKE_SOURCE_DIR}/test/references/bifurcation-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/bifurcation-00000.vtu
- ${CMAKE_SOURCE_DIR}/test/references/bifurcation-reference-refined.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/bifurcation-00001.vtu)
+dune_symlink_to_source_files(FILES grids test_gridcreator_gmsh.input test_gridcreator_cake.input)
+
+dune_add_test(NAME test_gridcreator_gmsh
+ SOURCES test_gridcreator_gmsh.cc
+ CMAKE_GUARD dune-uggrid_FOUND
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_gmsh"
+ --files ${CMAKE_SOURCE_DIR}/test/references/bifurcation-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/bifurcation-00000.vtu
+ ${CMAKE_SOURCE_DIR}/test/references/bifurcation-reference-refined.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/bifurcation-00001.vtu)
add_dumux_test(test_gridcreator_cake test_gridcreator_cake test_gridcreator_cake.cc
python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
--script fuzzy
--command "${CMAKE_CURRENT_BINARY_DIR}/test_gridcreator_cake"
--files ${CMAKE_SOURCE_DIR}/test/references/cake-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/cake-00000.vtu)
\ No newline at end of file
+ ${CMAKE_CURRENT_BINARY_DIR}/cake-00000.vtu)
diff --git a/test/io/gridcreator/test_gridcreator_gmsh.cc b/test/io/gridcreator/test_gridcreator_gmsh.cc
index 1b37ca2a3380be2be3338280a041b652e5014d26..679faedf70d69d87786fb909ed8f33a38cbc4339 100644
--- a/test/io/gridcreator/test_gridcreator_gmsh.cc
+++ b/test/io/gridcreator/test_gridcreator_gmsh.cc
@@ -21,13 +21,16 @@
*/
#include <config.h>
#include <iostream>
-#include <dune/common/parametertreeparser.hh>
+
#include <dune/geometry/referenceelements.hh>
#include <dune/grid/io/file/vtk.hh>
#include <dune/grid/common/mcmgmapper.hh>
#include <dune/common/parallel/mpihelper.hh>
+
+#include <dumux/common/properties.hh>
+#include <dumux/common/parameters.hh>
#include <dumux/io/gridcreator.hh>
-#include <dumux/common/basicproperties.hh>
+#include <dumux/discretization/methods.hh>
namespace Dumux {
@@ -36,33 +39,31 @@ class GridCreatorGmshTest;
namespace Properties
{
- NEW_TYPE_TAG(GridCreatorGmshTest, INHERITS_FROM(NumericModel));
-#if HAVE_UG
+ NEW_TYPE_TAG(GridCreatorGmshTest);
SET_TYPE_PROP(GridCreatorGmshTest, Grid, Dune::UGGrid<3>);
-#else
- SET_TYPE_PROP(GridCreatorGmshTest, Grid, Dune::YaspGrid<3>);
-#endif
- // Change the default "Grid" to customized "BifurcationGrid", merely for demonstration purposes.
- SET_STRING_PROP(GridCreatorGmshTest, GridParameterGroup, "BifurcationGrid");
+ SET_TYPE_PROP(GridCreatorGmshTest, Scalar, double);
+ SET_STRING_PROP(GridCreatorGmshTest, ModelParameterGroup, "Bifurcation");
+ SET_PROP(GridCreatorGmshTest, DiscretizationMethod) {
+ static constexpr DiscretizationMethods value = DiscretizationMethods::CCTpfa;
+ };
}
template<class TypeTag>
class GridCreatorGmshTest
{
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
static const int dim = Grid::dimension;
- typedef typename Dumux::GridCreator<TypeTag> GridCreator;
- typedef typename Dune::ReferenceElements<Scalar, dim> ReferenceElements;
- typedef typename Dune::ReferenceElement<Scalar, dim> ReferenceElement;
- typedef typename Dune::LeafMultipleCodimMultipleGeomTypeMapper<Grid, Dune::MCMGVertexLayout> VertexMapper;
+ using GridCreator = typename Dumux::GridCreator<TypeTag>;
+ using ReferenceElements = typename Dune::ReferenceElements<Scalar, dim>;
+ using VertexMapper = typename Dune::LeafMultipleCodimMultipleGeomTypeMapper<Grid>;
public:
static void getBoundaryDomainMarkers(std::vector<int>& boundaryMarker)
{
const auto& gridView = GridCreator::grid().leafGridView();
- VertexMapper vertexMapper(GridCreator::grid());
+ VertexMapper vertexMapper(GridCreator::grid(), Dune::mcmgVertexLayout());
boundaryMarker.clear();
boundaryMarker.resize(gridView.size(dim));
for(auto eIt = gridView.template begin<0>(); eIt != gridView.template end<0>(); ++eIt)
@@ -72,7 +73,7 @@ public:
if(!isIt->boundary())
continue;
- const ReferenceElement &refElement = ReferenceElements::general(eIt->geometry().type());
+ const auto refElement = ReferenceElements::general(eIt->geometry().type());
// loop over vertices of the intersection facet
for(int vIdx = 0; vIdx < refElement.size(isIt->indexInInside(), 1, dim); vIdx++)
{
@@ -96,24 +97,23 @@ public:
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
{
-#if HAVE_UG
-try {
+
// initialize MPI, finalize is done automatically on exit
Dune::MPIHelper::instance(argc, argv);
// Some typedefs
- typedef typename TTAG(GridCreatorGmshTest) TypeTag;
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename Dumux::GridCreator<TypeTag> GridCreator;
+ using TypeTag = TTAG(GridCreatorGmshTest);
+ using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
+ using GridCreator = typename Dumux::GridCreator<TypeTag>;
// Read the parameters from the input file
- typedef typename GET_PROP(TypeTag, ParameterTree) ParameterTree;
- Dune::ParameterTreeParser::readINITree("test_gridcreator_gmsh.input", ParameterTree::tree());
+ Dumux::Parameters::init(argc, argv, "test_gridcreator_gmsh.input");
// Make the grid
- GridCreator::makeGrid();
+ const std::string modelParamGroup = GET_PROP_VALUE(TypeTag, ModelParameterGroup);
+ GridCreator::makeGrid(modelParamGroup);
// Read the boundary markers and convert them to vertex flags (e.g. for use in a box method)
// Write a map from vertex position to boundaryMarker
@@ -131,8 +131,6 @@ try {
vtkWriter.write(1);
}
catch (Dumux::ParameterException &e) {
- typedef typename TTAG(GridCreatorGmshTest) TypeTag;
- Dumux::Parameters::print<TypeTag>();
std::cerr << e << ". Abort!\n";
return 1;
}
@@ -144,9 +142,3 @@ catch (...) {
std::cerr << "Unknown exception thrown!\n";
return 4;
}
-#else
-#warning "You need to have UGGrid installed to run this test."
- std::cerr << "You need to have UGGrid installed to run this test\n";
- return 77;
-#endif
-}
diff --git a/test/io/gridcreator/test_gridcreator_gmsh.input b/test/io/gridcreator/test_gridcreator_gmsh.input
index f205e2fdca34811a330dc78f4acfd61341032777..3dac14b3b677d29a6a3bcb86a32371131f0dc7e7 100644
--- a/test/io/gridcreator/test_gridcreator_gmsh.input
+++ b/test/io/gridcreator/test_gridcreator_gmsh.input
@@ -1,4 +1,4 @@
-[BifurcationGrid]
+[Bifurcation.Grid]
File = ./grids/bifurcation.msh
Verbosity = 1 # verbose grid file parsing
BoundarySegments = 1 # read parametrized boundary segments
diff --git a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
deleted file mode 100644
index 78333f809b408c4b38e92e00847329c14d7de94f..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
+++ /dev/null
@@ -1,259 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief The problem class for the coupling of a non-isothermal two-component Stokes
- * and a non-isothermal two-phase two-component Darcy model.
- *
- * The problem class for the coupling of a non-isothermal two-component Stokes (stokes2cn)
- * and a non-isothermal two-phase two-component Darcy model (2p2cni).
- * It uses the 2p2cniCoupling model and the Stokes2cnicoupling model and provides
- * the problem specifications for common parameters of the two submodels.
- * The initial and boundary conditions of the submodels are specified in the two subproblems,
- * 2p2cnisubproblem.hh and stokes2cnisubproblem.hh, which are accessible via the coupled problem.
- */
-
-#ifndef DUMUX_2CNISTOKES2P2CNIPROBLEM_HH
-#define DUMUX_2CNISTOKES2P2CNIPROBLEM_HH
-
-#include <dune/common/float_cmp.hh>
-#include <dune/grid/common/gridinfo.hh>
-#include <dune/grid/multidomaingrid.hh>
-
-#include <dumux/material/fluidsystems/h2oair.hh>
-#include <dumux/multidomain/2cnistokes2p2cni/localoperator.hh>
-#include <dumux/multidomain/2cnistokes2p2cni/problem.hh>
-#include <dumux/multidomain/2cnistokes2p2cni/propertydefaults.hh>
-
-#include <dumux/linear/seqsolverbackend.hh>
-#ifdef HAVE_PARDISO
-#include <dumux/linear/pardisobackend.hh>
-#endif // HAVE_PARDISO
-
-#include "stokes2cnisubproblem.hh"
-#include "2p2cnisubproblem.hh"
-
-namespace Dumux
-{
-template <class TypeTag>
-class TwoCNIStokesTwoPTwoCNITestProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(TwoCNIStokesTwoPTwoCNITestProblem, INHERITS_FROM(TwoCNIStokesTwoPTwoCNI));
-
-// Set the grid type
-SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, Grid, Dune::YaspGrid<2, Dune::TensorProductCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
-
-// Set the global problem
-SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, Problem, TwoCNIStokesTwoPTwoCNITestProblem<TypeTag>);
-
-// Set the local coupling operator
-SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, MultiDomainCouplingLocalOperator,
- TwoCNIStokesTwoPTwoCNILocalOperator<TypeTag>);
-
-// Set the two sub-problems of the global problem
-SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, SubDomain1TypeTag, TTAG(Stokes2cniSubProblem));
-SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, SubDomain2TypeTag, TTAG(TwoPTwoCNISubProblem));
-
-// Set the global problem in the context of the two sub-problems
-SET_TYPE_PROP(Stokes2cniSubProblem, MultiDomainTypeTag, TTAG(TwoCNIStokesTwoPTwoCNITestProblem));
-SET_TYPE_PROP(TwoPTwoCNISubProblem, MultiDomainTypeTag, TTAG(TwoCNIStokesTwoPTwoCNITestProblem));
-
-// Set the other sub-problem for each of the two sub-problems
-SET_TYPE_PROP(Stokes2cniSubProblem, OtherSubDomainTypeTag, TTAG(TwoPTwoCNISubProblem));
-SET_TYPE_PROP(TwoPTwoCNISubProblem, OtherSubDomainTypeTag, TTAG(Stokes2cniSubProblem));
-
-// Set the spatial parameters used for the problems
-SET_TYPE_PROP(TwoPTwoCNISubProblem, SpatialParams, TwoCNIStokesTwoPTwoCNISpatialParams<TypeTag>);
-
-// Set the fluid system to use complex relations (last argument)
-SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, FluidSystem,
- FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
-
-#ifdef HAVE_PARDISO
-SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, LinearSolver, PardisoBackend<TypeTag>);
-#else
-SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNITestProblem, LinearSolver, SuperLUBackend<TypeTag>);
-#endif // HAVE_PARDISO
-}
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCNIStokesTwoCNIModel
- * \brief The problem class for the coupling of a non-isothermal two-component Stokes
- * and a non-isothermal two-phase two-component Darcy model.
- *
- * The problem class for the coupling of a non-isothermal two-component Stokes (stokes2cn)
- * and a non-isothermal two-phase two-component Darcy model (2p2cni).
- * It uses the 2p2cniCoupling model and the Stokes2cnicoupling model and provides
- * the problem specifications for common parameters of the two submodels.
- * The initial and boundary conditions of the submodels are specified in the two subproblems,
- * 2p2cnisubproblem.hh and stokes2cnisubproblem.hh, which are accessible via the coupled problem.
- */
-template <class TypeTag = TTAG(TwoCNIStokesTwoPTwoCNITestProblem) >
-class TwoCNIStokesTwoPTwoCNITestProblem : public TwoCNIStokesTwoPTwoCNIProblem<TypeTag>
-{
- typedef TwoCNIStokesTwoPTwoCNITestProblem<TypeTag> ThisType;
- typedef TwoCNIStokesTwoPTwoCNIProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MDGrid;
- typedef typename MDGrid::LeafGridView MDGridView;
- enum { dim = MDGridView::dimension };
- typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
-
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
-
-public:
- /*!
- * \brief The problem for the coupling of Stokes and Darcy flow
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- */
- template<class GridView>
- TwoCNIStokesTwoPTwoCNITestProblem(TimeManager &timeManager,
- GridView gridView)
- : ParentType(timeManager, gridView)
- {
- interfacePosY_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
- noDarcyX_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, NoDarcyX);
- episodeLength_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, EpisodeLength);
- initializationTime_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, InitTime);
- dtInit_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, DtInitial);
-
- // define output options
- freqRestart_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqRestart);
- freqOutput_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqOutput);
-
- stokes2cni_ = this->sdID1();
- twoPtwoCNI_ = this->sdID2();
-
- initializeGrid();
-
- // initialize the tables of the fluid system
- FluidSystem::init(/*tempMin=*/273.15, /*tempMax=*/323.15, /*numTemp=*/50,
- /*pMin=*/5e4, /*pMax=*/1.5e5, /*numP=*/100);
-
- if (initializationTime_ > 0.0)
- this->timeManager().startNextEpisode(initializationTime_);
- else
- this->timeManager().startNextEpisode(episodeLength_);
- }
-
- /*!
- * \brief Initialization of the grids
- *
- * This function splits the multidomain grid in the two
- * individual subdomain grids and takes care of parallelization.
- */
- void initializeGrid()
- {
- MDGrid& mdGrid = this->mdGrid();
- mdGrid.startSubDomainMarking();
-
- // subdivide grid in two subdomains
- for (const auto& element : elements(mdGrid.leafGridView(), Dune::Partitions::interior))
- {
- GlobalPosition globalPos = element.geometry().center();
-
- if (globalPos[1] > interfacePosY_)
- mdGrid.addToSubDomain(stokes2cni_,element);
- else
- if(globalPos[0] > noDarcyX_)
- mdGrid.addToSubDomain(twoPtwoCNI_,element);
- }
- mdGrid.preUpdateSubDomains();
- mdGrid.updateSubDomains();
- mdGrid.postUpdateSubDomains();
-
- gridinfo(this->sdGrid1());
- gridinfo(this->sdGrid2());
- }
-
- /*!
- * \brief Called by the time manager after the time integration to
- * do some post processing on the solution.
- */
- void postTimeStep()
- {
- // call the postTimeStep function of the subproblems
- this->sdProblem1().postTimeStep();
- this->sdProblem2().postTimeStep();
- }
-
- /*!
- * \brief Called when the end of an simulation episode is reached.
- *
- * Typically a new episode should be started in this method.
- */
- void episodeEnd()
- { this->timeManager().startNextEpisode(episodeLength_); }
-
- /*!
- * \brief Returns true if a restart file should be written to
- * disk.
- *
- * The default behavior is to write one restart file every 5 time
- * steps. This file is intended to be overwritten by the
- * implementation.
- */
- bool shouldWriteRestartFile() const
- {
- return (this->timeManager().timeStepIndex() % freqRestart_ == 0
- || this->timeManager().episodeWillBeFinished()
- || this->timeManager().willBeFinished());
- }
-
- /*!
- * \brief Returns true if the current solution should be written to
- * disk (i.e. as a VTK file)
- *
- * The default behavior is to write out the solution for
- * every time step. This function is intended to be overwritten by the
- * implementation.
- */
- bool shouldWriteOutput() const
- {
- return (this->timeManager().timeStepIndex() % freqOutput_ == 0
- || this->timeManager().episodeWillBeFinished()
- || this->timeManager().willBeFinished());
- }
-
-private:
- typename MDGrid::SubDomainIndex stokes2cni_;
- typename MDGrid::SubDomainIndex twoPtwoCNI_;
-
- unsigned freqRestart_;
- unsigned freqOutput_;
-
- Scalar interfacePosY_;
- Scalar noDarcyX_;
- Scalar episodeLength_;
- Scalar initializationTime_;
- Scalar dtInit_;
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_2CNISTOKES2P2CNIPROBLEM_HH
diff --git a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cnispatialparams.hh b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cnispatialparams.hh
deleted file mode 100644
index 84f166fbb9b97ee042ced23026326a1625626b76..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cnispatialparams.hh
+++ /dev/null
@@ -1,221 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Spatial parameters for the
- * coupling of an non-isothermal two-component Stokes
- * and an non-isothermal two-phase two-component Darcy model.
- */
-
-#ifndef DUMUX_TWOCNISTOKES2P2CNISPATIALPARAMS_HH
-#define DUMUX_TWOCNISTOKES2P2CNISPATIALPARAMS_HH
-
-#include <dumux/material/spatialparams/implicit.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-
-namespace Dumux
-{
-//forward declaration
-template<class TypeTag>
-class TwoCNIStokesTwoPTwoCNISpatialParams;
-
-namespace Properties
-{
-// The spatial parameters TypeTag
-NEW_TYPE_TAG(TwoCNIStokesTwoPTwoCNISpatialParams);
-
-// Set the spatial parameters
-SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNISpatialParams, SpatialParams,
- TwoCNIStokesTwoPTwoCNISpatialParams<TypeTag>);
-
-// Set the material law parametrized by absolute saturations
-SET_TYPE_PROP(TwoCNIStokesTwoPTwoCNISpatialParams,
- MaterialLaw,
- EffToAbsLaw<RegularizedVanGenuchten<typename GET_PROP_TYPE(TypeTag, Scalar)>>);
-// EffToAbsLaw<RegularizedBrooksCorey<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
-}
-
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCNIStokesTwoCNIModel
- * \brief Definition of the spatial parameters for
- * the coupling of an non-isothermal two-component Stokes
- * and an non-isothermal two-phase two-component Darcy model.
- */
-template<class TypeTag>
-class TwoCNIStokesTwoPTwoCNISpatialParams : public ImplicitSpatialParams<TypeTag>
-{
- typedef ImplicitSpatialParams<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GridView::ctype CoordScalar;
-
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
- typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
- typedef typename MaterialLaw::Params MaterialLawParams;
-
-public:
- /*!
- * \brief Spatial parameters for the
- * coupling of an isothermal two-component Stokes
- * and an isothermal two-phase two-component Darcy model.
- *
- * \param gridView The GridView which is used by the problem
- */
- TwoCNIStokesTwoPTwoCNISpatialParams(const GridView& gridView)
- : ParentType(gridView)
- {
- porosity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Porosity);
- permeability_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Permeability);
- lambdaSolid_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, LambdaSolid);
- alphaBJ_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, AlphaBJ);
-
- // residual saturations
- params_.setSwr(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Swr));
- params_.setSnr(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Snr));
- // parameters for the vanGenuchten law
- params_.setVgAlpha(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, VgAlpha));
- params_.setVgn(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, VgN));
- }
-
- /*!
- * \brief Returns the intrinsic permeability tensor \f$[m^2]\f$
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- const Scalar intrinsicPermeability(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return permeability_;
- }
-
- /*!
- * \brief Returns the porosity \f$[-]\f$
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- Scalar porosity(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return porosity_;
- }
-
- /*!
- * \brief Returns the parameter object for the material law
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- const MaterialLawParams& materialLawParams(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return params_;
- }
-
- /*!
- * \brief Returns the heat capacity \f$[J / (kg K)]\f$ of the rock matrix.
- *
- * This is only required for non-isothermal models.
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry
- * \param scvIdx The local index of the sub-control volume
- */
- Scalar solidHeatCapacity(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return 790;
- }
-
- /*!
- * \brief Returns the mass density \f$[kg / m^3]\f$ of the rock matrix.
- *
- * This is only required for non-isothermal models.
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry
- * \param scvIdx The local index of the sub-control volume
- */
- Scalar solidDensity(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return 2700; // density of granite [kg/m^3]
- }
-
- /*!
- * \brief Returns the thermal conductivity \f$\mathrm{[W/(m K)]}\f$ of the solid
- *
- * This is only required for non-isothermal models.
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- Scalar solidThermalConductivity(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return lambdaSolid_;
- }
-
- /*!
- * \brief Evaluate the Beavers-Joseph coefficient at given position
- *
- * \param globalPos The global position
- *
- * \return Beavers-Joseph coefficient
- */
- Scalar beaversJosephCoeffAtPos(const GlobalPosition &globalPos) const
- {
- return alphaBJ_;
- }
-
-private:
- Scalar permeability_;
- Scalar porosity_;
- Scalar lambdaSolid_;
- Scalar alphaBJ_;
- MaterialLawParams params_;
-};
-
-} // end namespace Dumux
-
-#endif // DUMUX_TWOCNISTOKES2P2CNISPATIALPARAMS_HH
diff --git a/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh b/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh
deleted file mode 100644
index 4682537c38fcabe7be99dce4d323cc0613b84310..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnistokes2p2cni/2p2cnisubproblem.hh
+++ /dev/null
@@ -1,458 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Non-isothermal two-phase two-component porous-medium subproblem
- * with coupling at the top boundary.
- */
-#ifndef DUMUX_2P2CNISUB_PROBLEM_HH
-#define DUMUX_2P2CNISUB_PROBLEM_HH
-
-#include <dune/common/float_cmp.hh>
-
-#include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/porousmediumflow/2p2c/implicit/model.hh>
-#include <dumux/io/gnuplotinterface.hh>
-#include <dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh>
-#include <dumux/multidomain/subdomainpropertydefaults.hh>
-#include <dumux/multidomain/localoperator.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
-
-#include "2cnistokes2p2cnispatialparams.hh"
-
-namespace Dumux
-{
-template <class TypeTag>
-class TwoPTwoCNISubProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(TwoPTwoCNISubProblem,
- INHERITS_FROM(BoxTwoPTwoCNI, SubDomain, TwoCNIStokesTwoPTwoCNISpatialParams));
-
-// Set the problem property
-SET_TYPE_PROP(TwoPTwoCNISubProblem, Problem, TwoPTwoCNISubProblem<TTAG(TwoPTwoCNISubProblem)>);
-
-// Use the 2p2cni local jacobian operator for the 2p2cniCoupling model
-SET_TYPE_PROP(TwoPTwoCNISubProblem, LocalResidual, TwoPTwoCNICouplingLocalResidual<TypeTag>);
-
-// choose pn and Sw as primary variables
-SET_INT_PROP(TwoPTwoCNISubProblem, Formulation, TwoPTwoCFormulation::pnsw);
-
-// the gas component balance (air) is replaced by the total mass balance
-SET_INT_PROP(TwoPTwoCNISubProblem, ReplaceCompEqIdx, GET_PROP_TYPE(TypeTag, Indices)::contiNEqIdx);
-
-// Used the fluid system from the coupled problem
-SET_TYPE_PROP(TwoPTwoCNISubProblem,
- FluidSystem,
- typename GET_PROP_TYPE(typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag), FluidSystem));
-
-// Somerton is used as model to compute the effective thermal heat conductivity
-SET_TYPE_PROP(TwoPTwoCNISubProblem, ThermalConductivityModel,
- ThermalConductivitySomerton<typename GET_PROP_TYPE(TypeTag, Scalar)>);
-
-// use formulation based on mass fractions
-SET_BOOL_PROP(TwoPTwoCNISubProblem, UseMoles, false);
-
-// enable/disable velocity output
-SET_BOOL_PROP(TwoPTwoCNISubProblem, VtkAddVelocity, true);
-
-// Enable gravity
-SET_BOOL_PROP(TwoPTwoCNISubProblem, ProblemEnableGravity, true);
-}
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCNIStokesTwoCNIModel
- * \brief Non-isothermal two-phase two-component porous-medium subproblem
- * with coupling at the top boundary.
- *
- * The Darcy subdomain is sized 0.25m times 0.25m. All BCs for the balance
- * equations are set to Neumann no-flow, except for the top, where couplingInflow
- * conditions are applied.
- *
- * This sub problem uses the \ref TwoPTwoCNIModel. It is part of the 2p2cni model and
- * is combined with the stokes2cnisubproblem for the free flow domain.
- */
-template <class TypeTag = TTAG(TwoPTwoCNISubProblem) >
-class TwoPTwoCNISubProblem : public ImplicitPorousMediaProblem<TypeTag>
-{
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-
- typedef TwoPTwoCNISubProblem<TypeTag> ThisType;
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
-
- // copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
- enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
- enum { // the equation indices
- contiTotalMassIdx = Indices::contiNEqIdx,
- contiWEqIdx = Indices::contiWEqIdx,
- energyEqIdx = Indices::energyEqIdx
- };
- enum { // the indices of the primary variables
- pNIdx = Indices::pressureIdx,
- sWIdx = Indices::switchIdx,
- temperatureIdx = Indices::temperatureIdx
- };
- enum { // the indices for the phase presence
- wCompIdx = Indices::wCompIdx,
- nCompIdx = Indices::nCompIdx
- };
- enum { // the indices for the phase presence
- wPhaseOnly = Indices::wPhaseOnly,
- nPhaseOnly = Indices::nPhaseOnly,
- bothPhases = Indices::bothPhases
- };
- enum {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
- };
- enum { // grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::Intersection Intersection;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
-public:
- /*!
- * \brief The sub-problem for the porous-medium subdomain
- *
- * \param timeManager The TimeManager which is used by the simulation
- * \param gridView The simulation's idea about physical space
- */
- TwoPTwoCNISubProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
- {
- Scalar noDarcyX = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, NoDarcyX);
- std::vector<Scalar> positions0 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions0);
- std::vector<Scalar> positions1 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions1);
-
- using std::max;
- bBoxMin_[0] = max(positions0.front(),noDarcyX);
- bBoxMax_[0] = positions0.back();
-
- bBoxMin_[1] = positions1.front();
- bBoxMax_[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
-
- runUpDistanceX_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, RunUpDistanceX); // first part of the interface without coupling
- initializationTime_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, InitTime);
-
- refTemperature_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, RefTemperature);
- refPressure_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, RefPressure);
- initialSw_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, InitialSw);
-
- freqMassOutput_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqMassOutput);
-
- storageLastTimestep_ = Scalar(0);
- lastMassOutputTime_ = Scalar(0);
-
- evaporationFile.open("evaporation.out");
- evaporationFile << "#Time[d]" << " "
- << "WaterMass[kg]"
- << std::endl;
- liveEvaporationRates_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, Output, LiveEvaporationRates);
-
- outfile.open("storage.out");
- outfile << "Time;"
- << "TotalMassChange;"
- << "WaterMassChange;"
- << "IntEnergyChange;"
- << "WaterMass"
- << std::endl;
- }
- //! \brief The destructor
- ~TwoPTwoCNISubProblem()
- {
- evaporationFile.close();
- outfile.close();
- }
-
- // functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc ImplicitProblem::bBoxMin()
- const GlobalPosition &bBoxMin() const
- { return bBoxMin_; }
-
- //! \copydoc ImplicitProblem::bBoxMax()
- const GlobalPosition &bBoxMax() const
- { return bBoxMax_; }
-
- /*!
- * \name Problem parameters
- */
- // \{
-
- /*!
- * \brief Returns the problem name
- *
- * This is used as a prefix for files generated by the simulation.
- */
- const std::string &name() const
- { return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NamePM); }
-
- /*!
- * \brief Called by the TimeManager in order to
- * initialize the problem.
- *
- * If you overload this method don't forget to call
- * ParentType::init()
- */
- void init()
- {
- ParentType::init();
-
- this->model().globalStorage(storageLastTimestep_);
- }
- // \}
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- /*!
- * \brief Specifies which kind of boundary condition should be
- * used for which equation on a given boundary segment
- *
- * \param values Stores the value of the boundary type
- * \param globalPos The global position
- */
- void boundaryTypesAtPos(BoundaryTypes &values,
- const GlobalPosition &globalPos) const
- {
- Scalar time = this->timeManager().time();
-
- values.setAllNeumann();
-
- if (onLowerBoundary_(globalPos))
- {
- values.setDirichlet(temperatureIdx);
- }
- else if (onUpperBoundary_(globalPos)
- && (globalPos[0] > runUpDistanceX_ - eps_)
- && (time > initializationTime_))
- {
- values.setAllCouplingNeumann();
- }
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a Dirichlet
- * boundary segment
- *
- * \param values Stores the Dirichlet values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} ] \f$
- * \param globalPos The global position
- */
- void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- initial_(values, globalPos);
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a Neumann
- * boundary segment.
- *
- * \param values The Neumann values for the conservation equations in units of
- * \f$ [ \textnormal{unit of conserved quantity} / (m^{\textrm{dim}-1} \cdot s )] \f$
- * \param globalPos The global position
- */
- void neumannAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- values = 0.;
- }
-
- // \}
-
- /*!
- * \name Volume terms
- */
- // \{
-
- /*!
- * \brief Returns the source term
- *
- * \param values Stores the source values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} / (m^\textrm{dim} \cdot s )] \f$
- * \param globalPos The global position
- */
- void sourceAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values = Scalar(0);
- }
-
- /*!
- * \brief Evaluates the initial values for a control volume
- *
- * \param values Stores the initial values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variables} ] \f$
- * \param globalPos The global position
- */
- void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- values = 0.;
-
- initial_(values, globalPos);
- }
-
- /*!
- * \brief Return the initial phase state inside a control volume.
- *
- * \param vertex The vertex
- * \param vIdxGlobal The global index of the vertex
- * \param globalPos The global position
- */
- int initialPhasePresence(const Vertex &vertex,
- const int &vIdxGlobal,
- const GlobalPosition &globalPos) const
- {
- return bothPhases;
- }
-
- /*!
- * \brief Called by the time manager after the time integration to
- * do some post processing on the solution.
- */
- void postTimeStep()
- {
- // Calculate masses
- PrimaryVariables storage;
-
- this->model().globalStorage(storage);
- const Scalar time = this->timeManager().time() + this->timeManager().timeStepSize();
-
- // Write mass balance information for rank 0
- if (this->gridView().comm().rank() == 0)
- {
- if (this->timeManager().timeStepIndex() % freqMassOutput_ == 0
- || this->timeManager().episodeWillBeFinished())
- {
- PrimaryVariables storageChange(0.);
- storageChange = storageLastTimestep_ - storage;
-
- assert( (Dune::FloatCmp::ne<Scalar, Dune::FloatCmp::absolute>(time - lastMassOutputTime_, 0.0, 1.0e-30)) );
- storageChange /= (time - lastMassOutputTime_);
- // 2d: interface length has to be accounted for
- // in order to obtain kg/m²s
- storageChange /= (bBoxMax_[0]-bBoxMin_[0]);
-
- std::cout << "Time: " << time
- << " TotalMass: " << storage[contiTotalMassIdx]
- << " WaterMass: " << storage[contiWEqIdx]
- << " IntEnergy: " << storage[energyEqIdx]
- << " WaterMassChange: " << storageChange[contiWEqIdx]
- << std::endl;
- if (Dune::FloatCmp::ne<Scalar, Dune::FloatCmp::absolute>(this->timeManager().time(), 0.0, 1.0e-30))
- {
- outfile << time << ";"
- << storageChange[contiTotalMassIdx] << ";"
- << storageChange[contiWEqIdx] << ";"
- << storageChange[energyEqIdx] << ";"
- << storage[contiWEqIdx]
- << std::endl;
-
- evaporationFile << time/86400.0 << " " << storageChange[contiWEqIdx]*86400.0 << std::endl;
- gnuplot_.resetPlot();
- gnuplot_.setOpenPlotWindow(liveEvaporationRates_);
- gnuplot_.setXRange(0.0, time/86400.0);
- gnuplot_.setYRange(0.0, 12.0);
- gnuplot_.setXlabel("time [d]");
- gnuplot_.setYlabel("evaporation rate [mm/d]");
- gnuplot_.addFileToPlot("evaporation.out", "evaporation.out");
- gnuplot_.plot("evaporation");
- }
-
- storageLastTimestep_ = storage;
- lastMassOutputTime_ = time;
- }
- }
- }
-
- // \}
-
-private:
- /*!
- * \brief Internal method for the initial condition
- * (reused for the dirichlet conditions!)
- */
- void initial_(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values[pNIdx] = refPressure_
- + 1000.*this->gravity()[1]*(globalPos[1]-bBoxMax_[1]);
- values[sWIdx] = initialSw_;
- values[temperatureIdx] = refTemperature_;
- }
-
- bool onLeftBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] < bBoxMin_[0] + eps_; }
-
- bool onRightBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] > bBoxMax_[0] - eps_; }
-
- bool onLowerBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] < bBoxMin_[1] + eps_; }
-
- bool onUpperBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] > bBoxMax_[1] - eps_; }
-
- static constexpr Scalar eps_ = 1e-8;
- GlobalPosition bBoxMin_;
- GlobalPosition bBoxMax_;
-
- int freqMassOutput_;
-
- PrimaryVariables storageLastTimestep_;
- Scalar lastMassOutputTime_;
-
- Scalar refTemperature_;
- Scalar refPressure_;
- Scalar initialSw_;
-
- Scalar runUpDistanceX_;
- Scalar initializationTime_;
- std::ofstream outfile;
-
- GnuplotInterface<Scalar> gnuplot_;
- std::ofstream evaporationFile;
- bool liveEvaporationRates_;
-};
-} //end namespace Dumux
-
-#endif
diff --git a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt b/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
deleted file mode 100644
index bd2a5c84800930a42f82f147ff1f45f4c9334384..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-add_input_file_links()
-
-add_dumux_test(test_2cnistokes2p2cni test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_reference.input"
- --files ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-ff-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00007.vtu
- ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-pm-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00007.vtu
- --zeroThreshold {"v_1":1e-6,"velocityN_0":5e-11,"velocityW_0":5e-10,"velocityW_1":5e-9})
-
-add_dumux_test(test_2cnistokes2p2cni_boundarylayer test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_boundarylayer.input"
- --files ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni_boundarylayer-00008.vtu
- ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-pm-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p2cni_boundarylayer-00008.vtu
- --zeroThreshold {"v_1":1e-6,"velocityN_0":1e-8,"velocityN_1":1e-8,"velocityW_0":1e-8,"velocityW_1":1e-8,"pc":1e2,"mobN":1e-2})
-
-#install sources
-install(FILES
-2cnistokes2p2cniproblem.hh
-2cnistokes2p2cnispatialparams.hh
-2p2cnisubproblem.hh
-stokes2cnisubproblem.hh
-test_2cnistokes2p2cni.cc
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/multidomain/2cnistokes2p2cni)
diff --git a/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh b/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh
deleted file mode 100644
index 0413c125ced24cd581a923fcf04531e9ba30f128..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnistokes2p2cni/stokes2cnisubproblem.hh
+++ /dev/null
@@ -1,483 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/**
- * \file
- * \brief Non-isothermal two-component stokes subproblem with air flowing
- * from the left to the right and coupling at the bottom.
- */
-#ifndef DUMUX_STOKES2CNI_SUBPROBLEM_HH
-#define DUMUX_STOKES2CNI_SUBPROBLEM_HH
-
-#include <dumux/freeflow/stokesncni/model.hh>
-#include <dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh>
-#include <dumux/multidomain/subdomainpropertydefaults.hh>
-
-namespace Dumux
-{
-
-template <class TypeTag>
-class Stokes2cniSubProblem;
-
-//////////
-// Specify the properties for the Stokes problem
-//////////
-namespace Properties
-{
-NEW_TYPE_TAG(Stokes2cniSubProblem,
- INHERITS_FROM(BoxStokesncni, SubDomain));
-
-// Set the problem property
-SET_TYPE_PROP(Stokes2cniSubProblem, Problem, Stokes2cniSubProblem<TypeTag>);
-
-// Use the Stokes2cniCouplingLocalResidual for the computation of the local residual in the Stokes domain
-SET_TYPE_PROP(Stokes2cniSubProblem, LocalResidual, StokesncniCouplingLocalResidual<TypeTag>);
-
-// Used the fluid system from the coupled problem
-SET_TYPE_PROP(Stokes2cniSubProblem,
- FluidSystem,
- typename GET_PROP_TYPE(typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag), FluidSystem));
-
-// use formulation based on mass fractions
-SET_BOOL_PROP(Stokes2cniSubProblem, UseMoles, false);
-
-// Disable gravity in the Stokes domain
-SET_BOOL_PROP(Stokes2cniSubProblem, ProblemEnableGravity, false);
-
-// switch inertia term on or off
-SET_BOOL_PROP(Stokes2cniSubProblem, EnableNavierStokes, false);
-}
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCNIStokesTwoCNIModel
- * \brief Non-isothermal two-component stokes subproblem with air flowing
- * from the left to the right and coupling at the bottom.
- *
- * The Stokes subdomain is sized 0.25m times 0.25m. The boundary conditions
- * for the momentum balances are all set to Dirichlet, except on the right
- * boundary, where outflow conditions are set. The mass balance receives
- * outflow BCs, which are replaced in the localresidual by the sum
- * of the two momentum balances. In the middle of the right boundary,
- * one vertex receives Dirichlet BCs, to set the pressure level.
- *
- * This sub problem uses the \ref StokesncniModel. It is part of the
- * 2cnistokes2p2cni model and is combined with the 2p2cnisubproblem for
- * the Darcy domain.
- */
-template <class TypeTag>
-class Stokes2cniSubProblem : public StokesProblem<TypeTag>
-{
- typedef Stokes2cniSubProblem<TypeTag> ThisType;
- typedef StokesProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- enum {
- // Number of equations and grid dimension
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
- dim = GridView::dimension
- };
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum {
- // equation indices
- massBalanceIdx = Indices::massBalanceIdx,
- momentumXIdx = Indices::momentumXIdx, //!< Index of the x-component of the momentum balance
- momentumYIdx = Indices::momentumYIdx, //!< Index of the y-component of the momentum balance
- momentumZIdx = Indices::momentumZIdx, //!< Index of the z-component of the momentum balance
- transportEqIdx = Indices::transportEqIdx, //!< Index of the transport equation (massfraction)
- energyEqIdx = Indices::energyEqIdx //!< Index of the energy equation (temperature)
- };
- enum { // primary variable indices
- pressureIdx = Indices::pressureIdx,
- velocityXIdx = Indices::velocityXIdx,
- velocityYIdx = Indices::velocityYIdx,
- velocityZIdx = Indices::velocityZIdx,
- massOrMoleFracIdx = Indices::massOrMoleFracIdx,
- temperatureIdx = Indices::temperatureIdx
- };
- enum { phaseIdx = Indices::phaseIdx };
- enum { numComponents = Indices::numComponents };
- enum {
- transportCompIdx = Indices::transportCompIdx, //!< water component index
- phaseCompIdx = Indices::phaseCompIdx //!< air component index
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::ctype CoordScalar;
- typedef typename GridView::Intersection Intersection;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<CoordScalar, dim> GlobalPosition;
-
-public:
- /*!
- * \brief The sub-problem for the Stokes subdomain
- *
- * \param timeManager The TimeManager which is used by the simulation
- * \param gridView The simulation's idea about physical space
- */
- Stokes2cniSubProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
- {
- std::vector<Scalar> positions0 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions0);
- std::vector<Scalar> positions1 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions1);
-
- bBoxMin_[0] = positions0.front();
- bBoxMax_[0] = positions0.back();
- bBoxMin_[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
- bBoxMax_[1] = positions1.back();
- runUpDistanceX_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, RunUpDistanceX); // first part of the interface without coupling
-
- refVelocity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefVelocity);
- refPressure_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefPressure);
- refMassfrac_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefMassfrac);
- refTemperature_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefTemperature);
-
- sinusVAmplitude_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusVelAmplitude);
- sinusVPeriod_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusVelPeriod);
- sinusPAmplitude_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusPressureAmplitude);
- sinusPPeriod_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusPressurePeriod);
- sinusXAmplitude_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusConcentrationAmplitude);
- sinusXPeriod_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusConcentrationPeriod);
- sinusTAmplitude_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusTemperatureAmplitude);
- sinusTPeriod_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusTemperaturePeriod);
- useDirichletBC_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, FreeFlow, UseDirichletBC);
-
- initializationTime_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, InitTime);
- }
-
- // functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc ImplicitProblem::bBoxMin()
- const GlobalPosition &bBoxMin() const
- { return bBoxMin_; }
-
- //! \copydoc ImplicitProblem::bBoxMax()
- const GlobalPosition &bBoxMax() const
- { return bBoxMax_; }
-
- /*!
- * \name Problem parameters
- */
- // \{
-
- /*!
- * \brief Returns the problem name
- *
- * This is used as a prefix for files generated by the simulation.
- */
- const std::string &name() const
- { return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NameFF); }
-
- // \}
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- /*!
- * \brief Specifies which kind of boundary condition should be
- * used for which equation on a given boundary segment
- *
- * \param values Stores the value of the boundary type
- * \param globalPos The global position
- */
- void boundaryTypesAtPos(BoundaryTypes &values,
- const GlobalPosition &globalPos) const
- {
- const Scalar time = this->timeManager().time();
-
- values.setAllDirichlet();
-
- if (onUpperBoundary_(globalPos))
- {
- if (useDirichletBC_)
- {
- values.setNeumann(transportEqIdx);
- values.setDirichlet(temperatureIdx);
- }
- else
- {
- values.setNeumann(transportEqIdx);
- values.setNeumann(energyEqIdx);
- }
- }
-
- // Left inflow boundaries should be Neumann, otherwise the
- // evaporative fluxes are much more grid dependent
- if (onLeftBoundary_(globalPos))
- {
- if (useDirichletBC_)
- {
- values.setDirichlet(massOrMoleFracIdx);
- values.setDirichlet(temperatureIdx);
- }
- else
- {
- values.setNeumann(transportEqIdx);
- values.setNeumann(energyEqIdx);
- if (onUpperBoundary_(globalPos)) // corner point
- values.setAllDirichlet();
- }
- }
-
- if (onRightBoundary_(globalPos))
- {
- values.setAllOutflow();
-
- if (onUpperBoundary_(globalPos)) // corner point
- values.setAllDirichlet();
- }
-
- if (onLowerBoundary_(globalPos))
- {
- values.setAllDirichlet();
- if (useDirichletBC_)
- {
- values.setNeumann(transportEqIdx);
- values.setDirichlet(temperatureIdx);
- }
- else
- {
- values.setNeumann(transportEqIdx);
- values.setNeumann(energyEqIdx);
- if (onLeftBoundary_(globalPos)) // corner point
- values.setAllDirichlet();
- }
-
- if (globalPos[0] > runUpDistanceX_-eps_ && time > initializationTime_)
- {
- values.setAllCouplingDirichlet();
- values.setCouplingNeumann(momentumXIdx);
- values.setCouplingNeumann(momentumYIdx);
- }
- }
-
- // the mass balance has to be of type outflow
- // it does not get a coupling condition, since pn is a condition for stokes
- values.setOutflow(massBalanceIdx);
-
- // set pressure at one point, do NOT specify this
- // if the Darcy domain has a Dirichlet condition for pressure
- if (onRightBoundary_(globalPos))
- {
- if (time > initializationTime_)
- values.setDirichlet(pressureIdx);
- else
- if (!onLowerBoundary_(globalPos) && !onUpperBoundary_(globalPos))
- values.setDirichlet(pressureIdx);
- }
- }
-
- /*!
- * \brief Evaluates the boundary conditions for a Dirichlet
- * boundary segment
- *
- * \param values Stores the Dirichlet values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} ] \f$
- * \param globalPos The global position
- */
- void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- values = 0.0;
-
- FluidState fluidState;
- updateFluidStateForBC_(fluidState);
-
- const Scalar density =
- FluidSystem::density(fluidState, phaseIdx);
-
- values[velocityXIdx] = xVelocity_(globalPos);
- values[velocityYIdx] = 0.0;
- values[pressureIdx] = refPressure() +
- density*this->gravity()[1]*(globalPos[1] - bBoxMin_[1]);
- values[massOrMoleFracIdx] = refMassfrac();
- values[temperatureIdx] = refTemperature();
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a Neumann
- * boundary segment.
- *
- * \param values The Neumann values for the conservation equations in units of
- * \f$ [ \textnormal{unit of conserved quantity} / (m^{\textrm{dim}-1} \cdot s )] \f$
- * \param globalPos The global position
- */
- void neumannAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- values = 0.;
-
- FluidState fluidState;
- updateFluidStateForBC_(fluidState);
-
- const Scalar density =
- FluidSystem::density(fluidState, phaseIdx);
- const Scalar enthalpy =
- FluidSystem::enthalpy(fluidState, phaseIdx);
- const Scalar xVelocity = xVelocity_(globalPos);
-
- if (onLeftBoundary_(globalPos)
- && globalPos[1] > bBoxMin_[1] - eps_ && globalPos[1] < bBoxMax_[1] + eps_)
- {
- values[transportEqIdx] = -xVelocity*density*refMassfrac();
- values[energyEqIdx] = -xVelocity*density*enthalpy;
- }
- }
-
- // \}
-
- /*!
- * \brief Returns the source term
- *
- * \param values Stores the source values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} / (m^\textrm{dim} \cdot s )] \f$
- * \param globalPos The global position
- */
- void sourceAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- // The source term of the mass balance has to be chosen as
- // div (q_momentum) in the problem file
- values = Scalar(0);
- }
-
- /*!
- * \brief Evaluate the initial value for a control volume.
- *
- * \param values Stores the initial values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variables} ] \f$
- * \param globalPos The global position
- */
- void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- initial_(values, globalPos);
- }
- // \}
-
- //! \brief Returns the reference velocity.
- const Scalar refVelocity() const
- { return refVelocity_ + variation_(sinusVAmplitude_, sinusVPeriod_); }
-
- //! \brief Returns the reference pressure.
- const Scalar refPressure() const
- { return refPressure_ + variation_(sinusPAmplitude_, sinusPPeriod_); }
-
- //! \brief Returns the reference mass fraction.
- const Scalar refMassfrac() const
- { return refMassfrac_ + variation_(sinusXAmplitude_, sinusXPeriod_); }
-
- //! \brief Returns the reference temperature.
- const Scalar refTemperature() const
- { return refTemperature_+ variation_(sinusTAmplitude_, sinusTPeriod_); }
-
-private:
- /*!
- * \brief Internal method for the initial condition
- * (reused for the dirichlet conditions!)
- */
- void initial_(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- FluidState fluidState;
- updateFluidStateForBC_(fluidState);
-
- const Scalar density =
- FluidSystem::density(fluidState, phaseIdx);
-
- values[velocityXIdx] = xVelocity_(globalPos);
- values[velocityYIdx] = 0.;
-
- values[pressureIdx] = refPressure()
- + density*this->gravity()[1]*(globalPos[1] - bBoxMin_[1]);
- values[massOrMoleFracIdx] = refMassfrac();
- values[temperatureIdx] = refTemperature();
- }
-
- //! \brief set the profile of the inflow velocity (horizontal direction)
- const Scalar xVelocity_(const GlobalPosition &globalPos) const
- {
- const Scalar vmax = refVelocity();
- return 4*vmax*(globalPos[1] - bBoxMin_[1])*(bBoxMax_[1] - globalPos[1])
- / (height_()*height_()) + 0.00134;
- }
-
- //! \brief updates the fluid state to obtain required quantities for IC/BC
- void updateFluidStateForBC_(FluidState& fluidState) const
- {
- fluidState.setTemperature(refTemperature());
- fluidState.setPressure(phaseIdx, refPressure());
- // setMassFraction() has only to be called 1-numComponents times
- fluidState.setMassFraction(phaseIdx, transportCompIdx, refMassfrac());
- }
-
- // can be used for the variation of a boundary condition
- const Scalar variation_(const Scalar amplitude, const Scalar period) const
- { return sin(2*M_PI*this->timeManager().time()/period) * amplitude; }
-
- bool onLeftBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] < bBoxMin_[0] + eps_; }
-
- bool onRightBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] > bBoxMax_[0] - eps_; }
-
- bool onLowerBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] < bBoxMin_[1] + eps_; }
-
- bool onUpperBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] > bBoxMax_[1] - eps_; }
-
- const Scalar height_() const
- { return bBoxMax_[1] - bBoxMin_[1]; }
-
- static constexpr Scalar eps_ = 1e-8;
-
- GlobalPosition bBoxMin_;
- GlobalPosition bBoxMax_;
-
- Scalar refVelocity_;
- Scalar refPressure_;
- Scalar refMassfrac_;
- Scalar refTemperature_;
-
- Scalar sinusVAmplitude_;
- Scalar sinusVPeriod_;
- Scalar sinusPAmplitude_;
- Scalar sinusPPeriod_;
- Scalar sinusXAmplitude_;
- Scalar sinusXPeriod_;
- Scalar sinusTAmplitude_;
- Scalar sinusTPeriod_;
-
- bool useDirichletBC_;
-
- Scalar runUpDistanceX_;
- Scalar initializationTime_;
-};
-} //end namespace
-
-#endif // DUMUX_STOKES2CNI_SUBPROBLEM_HH
diff --git a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.cc b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.cc
deleted file mode 100644
index 3718717de818bd6f78ee264f01d94ed02c843720..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Test for the coupled non-isothermal two-component Stokes and
- * non-isothermal two-phase two-component Darcy model
- */
-
-#include <config.h>
-#include <iostream>
-
-#include <dune/common/parallel/mpihelper.hh>
-
-#if HAVE_DUNE_MULTIDOMAIN
-
-#include <dumux/common/start.hh>
-
-#include "2cnistokes2p2cniproblem.hh"
-
-/*!
- * \brief Print a usage string for simulations.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void printUsage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of optional options for this program is:\n"
- "[BoundaryLayer]\n"
- "Model Number/ID of the used model\n"
- "Offset Virtual run-up distance for BL models [m]\n"
- "ConstThickness Constant BL thickness (model 1) [m]\n"
- "YPlus Conversion value (model 4-6) [-]\n"
- "RoughnessLength Characteristic roughness length (model 6)\n"
- "\n"
- "[MassTransferModel]\n"
- "Coefficient Coeffient used for the exponential law (model 1) [-]\n"
- "CharPoreRadius Characteristic pore radius for Schluender model (model 2+4) [m]\n"
- "\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
-#if (HAVE_SUPERLU || HAVE_UMFPACK)
- typedef TTAG(TwoCNIStokesTwoPTwoCNITestProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, printUsage);
-#else
-#warning "You need to have SuperLU or UMFPack installed to run this test."
- std::cerr << "You need to have SuperLU or UMFPack installed to run this test\n";
- return 77;
-#endif
-}
-
-#else
-int main(int argc, char** argv)
-{
-#warning You need to have dune-multidomain installed to run this test
- std::cerr << "You need to have dune-multidomain installed to run this test\n";
- return 77;
-}
-#endif
diff --git a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.input b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.input
deleted file mode 100644
index d15c13e65e334c9cefec74a69ce5d615e7ab803d..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.input
+++ /dev/null
@@ -1,76 +0,0 @@
-[TimeManager]
-DtInitial = 5e-1 # [s]
-MaxTimeStepSize = 360 # [s]
-InitTime = 864 # [s] Initialization time without coupling
-TEnd= 0.864e6 # [s]
-EpisodeLength = 43200 # [s]
-
-[Grid]
-Cells0 = 30
-Cells1 = 30 30
-Grading0 = 1.0
-Grading1 = -1.1 1.1
-Positions0 = 0.0 0.25
-Positions1 = 0.0 0.25 0.5
-
-RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
-NoDarcyX = 0.0 # [m] Horizontal position without PM below
-InterfacePosY = 0.25 # [m] Vertical position of coupling interface
-
-[Output]
-NameFF = stokes2cni
-NamePM = 2p2cni
-#Frequency of restart file, flux and VTK output
-FreqRestart = 1000 # how often restart files are written out
-FreqOutput = 10 # frequency of VTK output
-FreqMassOutput = 2 # frequency of mass and evaporation rate output (Darcy)
-LiveEvaporationRates = true # plot evaporation rates using gnuplot interface
-
-[Stokes]
-StabilizationAlpha = -1.0
-
-[FreeFlow]
-UseDirichletBC = true # dirichlet values are set at the inflow boundary
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-SinusVelAmplitude = 0.0 # [m/s]
-SinusVelPeriod = 3600 # [s]
-SinusPressureAmplitude = 0.0 # [Pa]
-SinusPressurePeriod = 3600 # [s]
-SinusConcentrationAmplitude = 0.0 # [-]
-SinusConcentrationPeriod = 3600 # [s]
-SinusTemperatureAmplitude = 0.0 # [K]
-SinusTemperaturePeriod = 3600 # [s]
-
-[BoundaryLayer]
-Model = 0
-
-[MassTransfer]
-Model = 0
-
-[PorousMedium]
-RefPressure = 1e5 # [Pa]
-RefTemperature = 298.15 # [K]
-InitialSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 8.0 # [-]
-LambdaSolid = 5.26 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
diff --git a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_boundarylayer.input b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_boundarylayer.input
deleted file mode 100644
index 17f916f6a62dbe7650c7726ccbd3fac938dafad1..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_boundarylayer.input
+++ /dev/null
@@ -1,79 +0,0 @@
-[TimeManager]
-DtInitial = 50 # [s]
-MaxTimeStepSize = 360 # [s]
-InitTime = 0 # [s] Initialization time without coupling
-TEnd= 3600 # [s]
-EpisodeLength = 43200 # [s]
-
-[Grid]
-Cells0 = 6
-Cells1 = 4 4 4
-Grading0 = 1.0
-Grading1 = -1.5 1.5 -1.5
-Positions0 = 0.0 0.25
-Positions1 = 0.0 0.25 0.375 0.5
-
-RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
-NoDarcyX = 0.0 # [m] Horizontal position without PM below
-InterfacePosY = 0.25 # [m] Vertical position of coupling interface
-
-[Output]
-NameFF = stokes2cni_boundarylayer
-NamePM = 2p2cni_boundarylayer
-#Frequency of restart file, flux and VTK output
-FreqRestart = 1000 # how often restart files are written out
-FreqOutput = 2 # frequency of VTK output
-FreqMassOutput = 2 # frequency of mass and evaporation rate output (Darcy)
-LiveEvaporationRates = false # plot evaporation rates using gnuplot interface
-
-[Stokes]
-StabilizationAlpha = -1.0
-
-[FreeFlow]
-UseDirichletBC = true # dirichlet values are set at the inflow boundary
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-SinusVelAmplitude = 0.0 # [m/s]
-SinusVelPeriod = 3600 # [s]
-SinusPressureAmplitude = 0.0 # [Pa]
-SinusPressurePeriod = 3600 # [s]
-SinusConcentrationAmplitude = 0.0 # [-]
-SinusConcentrationPeriod = 3600 # [s]
-SinusTemperatureAmplitude = 0.0 # [K]
-SinusTemperaturePeriod = 3600 # [s]
-
-[BoundaryLayer]
-Model = 4 # Number/ID of the used model
-Offset = 0.25 # Virtual run-up distance for BL models [m]
-YPlus = 10 # Conversion value (model 4-6) [-]
-
-[MassTransfer]
-Model = 4
-CharPoreRadius = 0.001 # Characteristic pore radius for Schluender model (model 2+4) [m]
-
-[PorousMedium]
-RefPressure = 1e5 # [Pa]
-RefTemperature = 298.15 # [K]
-InitialSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 8.0 # [-]
-LambdaSolid = 5.26 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
diff --git a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_reference.input b/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_reference.input
deleted file mode 100644
index 71f10f74ef6ed4b9ce9a237bd5b2a7110ecbd3fd..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_reference.input
+++ /dev/null
@@ -1,76 +0,0 @@
-[TimeManager]
-DtInitial = 50 # [s]
-MaxTimeStepSize = 360 # [s]
-InitTime = 0 # [s] Initialization time without coupling
-TEnd= 3600 # [s]
-EpisodeLength = 43200 # [s]
-
-[Grid]
-Cells0 = 6
-Cells1 = 4 4 4
-Grading0 = 1.0
-Grading1 = -1.5 1.5 -1.5
-Positions0 = 0.0 0.25
-Positions1 = 0.0 0.25 0.375 0.5
-
-RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
-NoDarcyX = 0.0 # [m] Horizontal position without PM below
-InterfacePosY = 0.25 # [m] Vertical position of coupling interface
-
-[Output]
-NameFF = stokes2cni
-NamePM = 2p2cni
-#Frequency of restart file, flux and VTK output
-FreqRestart = 1000 # how often restart files are written out
-FreqOutput = 2 # frequency of VTK output
-FreqMassOutput = 2 # frequency of mass and evaporation rate output (Darcy)
-LiveEvaporationRates = false # plot evaporation rates using gnuplot interface
-
-[Stokes]
-StabilizationAlpha = -1.0
-
-[FreeFlow]
-UseDirichletBC = true # dirichlet values are set at the inflow boundary
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-SinusVelAmplitude = 0.0 # [m/s]
-SinusVelPeriod = 3600 # [s]
-SinusPressureAmplitude = 0.0 # [Pa]
-SinusPressurePeriod = 3600 # [s]
-SinusConcentrationAmplitude = 0.0 # [-]
-SinusConcentrationPeriod = 3600 # [s]
-SinusTemperatureAmplitude = 0.0 # [K]
-SinusTemperaturePeriod = 3600 # [s]
-
-[BoundaryLayer]
-Model = 0
-
-[MassTransfer]
-Model = 0
-
-[PorousMedium]
-RefPressure = 1e5 # [Pa]
-RefTemperature = 298.15 # [K]
-InitialSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 8.0 # [-]
-LambdaSolid = 5.26 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
diff --git a/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh b/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh
deleted file mode 100644
index 5584e7b172be73018b588bfa82c5c5a4fa6ff6c4..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh
+++ /dev/null
@@ -1,216 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/**
- * \file
- * \brief The problem which couples a non-isothermal two-component ZeroEq
- * and a non-isothermal two-phase two-component Darcy model.
- */
-#ifndef DUMUX_TWOCNIZEROEQTWOPTWOCNIPROBLEM_HH
-#define DUMUX_TWOCNIZEROEQTWOPTWOCNIPROBLEM_HH
-
-#include <dune/grid/multidomaingrid.hh>
-#include <dune/grid/common/gridinfo.hh>
-
-#include <dumux/material/fluidsystems/h2oair.hh>
-#include <dumux/multidomain/2cnistokes2p2cni/localoperator.hh>
-#include <dumux/multidomain/2cnistokes2p2cni/problem.hh>
-#include <dumux/multidomain/2cnistokes2p2cni/propertydefaults.hh>
-
-#include "2cnizeroeq2p2cnispatialparameters.hh"
-#include "zeroeq2cnisubproblem.hh"
-#include "2p2cnisubproblem.hh"
-
-namespace Dumux
-{
-template <class TypeTag>
-class TwoCNIZeroEqTwoPTwoCNITestProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(TwoCNIZeroEqTwoPTwoCNITestProblem, INHERITS_FROM(TwoCNIStokesTwoPTwoCNI));
-
-// Set the grid type
-SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, Grid, Dune::YaspGrid<2, Dune::TensorProductCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
-
-// Set the global problem
-SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, Problem, TwoCNIZeroEqTwoPTwoCNITestProblem<TypeTag>);
-
-// Set the local coupling operator
-SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, MultiDomainCouplingLocalOperator,
- TwoCNIStokesTwoPTwoCNILocalOperator<TypeTag>);
-
-// Set the two sub-problems of the global problem
-SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, SubDomain1TypeTag, TTAG(ZeroEq2cniSubProblem));
-SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, SubDomain2TypeTag, TTAG(TwoPTwoCNISubProblem));
-
-// Set the global problem in the context of the two sub-problems
-SET_TYPE_PROP(ZeroEq2cniSubProblem, MultiDomainTypeTag, TTAG(TwoCNIZeroEqTwoPTwoCNITestProblem));
-SET_TYPE_PROP(TwoPTwoCNISubProblem, MultiDomainTypeTag, TTAG(TwoCNIZeroEqTwoPTwoCNITestProblem));
-
-// Set the other sub-problem for each of the two sub-problems
-SET_TYPE_PROP(ZeroEq2cniSubProblem, OtherSubDomainTypeTag, TTAG(TwoPTwoCNISubProblem));
-SET_TYPE_PROP(TwoPTwoCNISubProblem, OtherSubDomainTypeTag, TTAG(ZeroEq2cniSubProblem));
-
-// Set the same spatial parameters for both sub-problems
-SET_TYPE_PROP(TwoPTwoCNISubProblem, SpatialParams, TwoCNIZeroEqTwoPTwoCNISpatialParams<TypeTag>);
-
-// Set the fluid system to use complex relations (last argument)
-SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, FluidSystem,
- FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
-
-// If SuperLU is not available, the UMFPack solver is used:
-#ifdef HAVE_SUPERLU
-SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, LinearSolver, SuperLUBackend<TypeTag>);
-#else
-SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNITestProblem, LinearSolver, UMFPackBackend<TypeTag>);
-#endif
-}
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCNIZeroEqTwoCNIModel
- *
- * \brief The problem which couples a non-isothermal two-component ZeroEq (zeroeq2cni)
- * and a non-isothermal two-phase two-component Darcy model (2p2cni).
- *
- * It uses the multidomain problem and specifies parameters for the two submodels.
- * The initial and boundary conditions of the submodels are specified in the two subproblems,
- * 2p2csubproblem.hh and zeroeq2csubproblem.hh, which are accessible via the coupled problem.
- */
-template <class TypeTag = TTAG(TwoCNIZeroEqTwoPTwoCNITestProblem) >
-class TwoCNIZeroEqTwoPTwoCNITestProblem : public TwoCNIStokesTwoPTwoCNIProblem<TypeTag>
-{
- typedef TwoCNIZeroEqTwoPTwoCNITestProblem<TypeTag> ThisType;
- typedef TwoCNIStokesTwoPTwoCNIProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridCreator) GridCreator;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MDGrid;
- typedef typename MDGrid::LeafGridView MDGridView;
- enum { dim = MDGridView::dimension };
- typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
-
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
-public:
- /*!
- * \brief The problem for the coupling of Stokes and Darcy flow
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- */
- template<class GridView>
- TwoCNIZeroEqTwoPTwoCNITestProblem(TimeManager &timeManager,
- GridView gridView)
- : ParentType(timeManager, gridView)
- {
- dtInit_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, DtInitial);
- episodeLength_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, EpisodeLength);
-
- // define location of the interface
- interfacePosY_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
- noDarcyX1_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, NoDarcyX1);
- noDarcyX2_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, NoDarcyX2);
-
- // define output options
- freqRestart_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqRestart);
- freqOutput_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqOutput);
-
- zeroeq2cni_ = this->sdID1();
- twoPtwoCNI_ = this->sdID2();
-
- initializeGrid();
-
- // initialize the tables of the fluid system
- FluidSystem::init(/*tempMin=*/273.15, /*tempMax=*/323.15, /*numTemp=*/50,
- /*pMin=*/5e4, /*pMax=*/1.5e5, /*numP=*/100);
-
- this->timeManager().startNextEpisode(episodeLength_);
- }
-
- /*!
- * \brief Initialization of the grids
- *
- * This function splits the multidomain grid in the two
- * individual subdomain grids and takes care of parallelization.
- */
- void initializeGrid()
- {
- MDGrid& mdGrid = this->mdGrid();
- mdGrid.startSubDomainMarking();
-
- // subdivide grid in two subdomains
- for (const auto& element : elements(mdGrid.leafGridView(), Dune::Partitions::interior))
- {
- GlobalPosition globalPos = element.geometry().center();
-
- if (globalPos[1] > interfacePosY_)
- mdGrid.addToSubDomain(zeroeq2cni_,element);
- else
- if(globalPos[0] > noDarcyX1_ && globalPos[0] < noDarcyX2_)
- mdGrid.addToSubDomain(twoPtwoCNI_,element);
- }
- mdGrid.preUpdateSubDomains();
- mdGrid.updateSubDomains();
- mdGrid.postUpdateSubDomains();
-
- gridinfo(this->sdGrid1());
- gridinfo(this->sdGrid2());
- }
-
- //! \copydoc ImplicitProblem::episodeEnd()
- void episodeEnd()
- { this->timeManager().startNextEpisode(episodeLength_); }
-
- //! \copydoc ImplicitProblem::shouldWriteRestartFile()
- bool shouldWriteRestartFile() const
- {
- return (((this->timeManager().timeStepIndex() > 0)
- && (this->timeManager().timeStepIndex() % freqRestart_ == 0))
- || this->timeManager().episodeWillBeFinished()
- || this->timeManager().willBeFinished());
- }
-
- //! \copydoc ImplicitProblem::shouldWriteOutput()
- bool shouldWriteOutput() const
- {
- return (this->timeManager().timeStepIndex() % freqOutput_ == 0
- || this->timeManager().episodeWillBeFinished()
- || this->timeManager().willBeFinished());
- }
-
-private:
- typename MDGrid::SubDomainType zeroeq2cni_;
- typename MDGrid::SubDomainType twoPtwoCNI_;
-
- unsigned freqRestart_;
- unsigned freqOutput_;
-
- Scalar interfacePosY_;
- Scalar noDarcyX1_;
- Scalar noDarcyX2_;
- Scalar episodeLength_;
- Scalar dtInit_;
-};
-
-} //end namespace
-
-#endif // DUMUX_TWOCNIZEROEQTWOPTWOCNIPROBLEM_HH
diff --git a/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cnispatialparameters.hh b/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cnispatialparameters.hh
deleted file mode 100644
index 55a885c9f9d0c694f799c75d61c8514c07b85f81..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cnispatialparameters.hh
+++ /dev/null
@@ -1,217 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Spatial parameters for the
- * coupling of a non-isothermal two-component ZeroEq
- * and a non-isothermal two-phase two-component Darcy model.
- */
-#ifndef DUMUX_TWOCNIZEROEQTWOPTWOCNISPATIALPARAMS_HH
-#define DUMUX_TWOCNIZEROEQTWOPTWOCNISPATIALPARAMS_HH
-
-#include <dumux/material/spatialparams/implicit.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-
-namespace Dumux
-{
-//forward declaration
-template<class TypeTag>
-class TwoCNIZeroEqTwoPTwoCNISpatialParams;
-
-namespace Properties
-{
-// The spatial parameters TypeTag
-NEW_TYPE_TAG(TwoCNIZeroEqTwoPTwoCNISpatialParams);
-
-// Set the spatial parameters
-SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNISpatialParams, SpatialParams,
- TwoCNIZeroEqTwoPTwoCNISpatialParams<TypeTag>);
-
-// Set the material law parameterized by absolute saturations
-SET_TYPE_PROP(TwoCNIZeroEqTwoPTwoCNISpatialParams,
- MaterialLaw,
- EffToAbsLaw<RegularizedVanGenuchten<typename GET_PROP_TYPE(TypeTag, Scalar)>>);
-// EffToAbsLaw<RegularizedBrooksCorey<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
-}
-
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCNIZeroEqTwoCNIModel
- * \brief Definition of the spatial parameters for
- * the coupling of a non-isothermal two-component ZeroEq
- * and a non-isothermal two-phase two-component Darcy model.
- */
-template<class TypeTag>
-class TwoCNIZeroEqTwoPTwoCNISpatialParams : public ImplicitSpatialParams<TypeTag>
-{
- typedef ImplicitSpatialParams<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GridView::ctype CoordScalar;
-
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
- typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
- typedef typename MaterialLaw::Params MaterialLawParams;
-
-public:
- /*!
- * \brief Spatial parameters for the
- * coupling of a non-isothermal two-component ZeroEq
- * and a non-isothermal two-phase two-component Darcy model.
- *
- * \param gridView The GridView which is used by the problem
- */
- TwoCNIZeroEqTwoPTwoCNISpatialParams(const GridView& gridView)
- : ParentType(gridView)
- {
- permeability_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Permeability);
- porosity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Porosity);
- thermalConductivitySolid_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, ThermalConductivitySolid);
- alphaBJ_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, AlphaBJ);
-
- spatialParams_.setSwr(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Swr));
- spatialParams_.setSnr(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Snr));
- spatialParams_.setVgAlpha(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, VgAlpha));
- spatialParams_.setVgn(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, VgN));
- }
-
- /*!
- * \brief Returns the intrinsic permeability tensor \f$[m^2]\f$
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- Scalar intrinsicPermeability(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return permeability_;
- }
-
- /*!
- * \brief Returns the porosity \f$[-]\f$
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- Scalar porosity(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return porosity_;
- }
-
- /*!
- * \brief Returns the parameter object for the material law
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- const MaterialLawParams& materialLawParams(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return spatialParams_;
- }
-
- /*!
- * \brief Returns the heat capacity \f$[J / (kg K)]\f$ of the rock matrix.
- *
- * This is only required for non-isothermal models.
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry
- * \param scvIdx The local index of the sub-control volume
- */
- Scalar solidHeatCapacity(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return 790.0;
- }
-
- /*!
- * \brief Returns the density of the solid material (not the bulk density) \f$[kg/m^3]\f$
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- Scalar solidDensity(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return 2650.0;
- }
-
- /*!
- * \brief Returns the thermal conductivity \f$[W/(m*K)]\f$ of the solid
- *
- * This is only required for non-isothermal models.
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- Scalar solidThermalConductivity(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return thermalConductivitySolid_;
- }
-
- /*!
- * \brief Evaluate the Beavers-Joseph coefficient at given position
- *
- * \param globalPos The global position
- *
- * \return Beavers-Joseph coefficient
- */
- Scalar beaversJosephCoeffAtPos(const GlobalPosition &globalPos) const
- {
- return alphaBJ_;
- }
-
-private:
- Scalar permeability_;
- Scalar porosity_;
- Scalar thermalConductivitySolid_;
- Scalar alphaBJ_;
-
- MaterialLawParams spatialParams_;
-};
-} // end namespace
-
-#endif // DUMUX_TWOCNIZEROEQTWOPTWOCNISPATIALPARAMS_HH
diff --git a/test/multidomain/2cnizeroeq2p2cni/2p2cnisubproblem.hh b/test/multidomain/2cnizeroeq2p2cni/2p2cnisubproblem.hh
deleted file mode 100644
index 8b89135c31e8daa95ca5922a0466a7f8e2004e86..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnizeroeq2p2cni/2p2cnisubproblem.hh
+++ /dev/null
@@ -1,390 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Non-isothermal two-phase two-component porous-medium subproblem
- * with coupling at the top boundary.
- */
-#ifndef DUMUX_2P2CNISUB_PROBLEM_HH
-#define DUMUX_2P2CNISUB_PROBLEM_HH
-
-#include <dumux/porousmediumflow/2p2c/implicit/indices.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
-#include <dumux/multidomain/subdomainpropertydefaults.hh>
-#include <dumux/multidomain/localoperator.hh>
-#include <dumux/multidomain/2cnistokes2p2cni/2p2cnicouplinglocalresidual.hh>
-
-#include "2cnizeroeq2p2cnispatialparameters.hh"
-
-namespace Dumux
-{
-template <class TypeTag>
-class TwoPTwoCNISubProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(TwoPTwoCNISubProblem,
- INHERITS_FROM(BoxTwoPTwoCNI, SubDomain, TwoCNIZeroEqTwoPTwoCNISpatialParams));
-
-// Set the problem property
-SET_TYPE_PROP(TwoPTwoCNISubProblem, Problem, TwoPTwoCNISubProblem<TTAG(TwoPTwoCNISubProblem)>);
-
-// Use the 2p2cni local jacobian operator for the 2p2cniCoupling model
-SET_TYPE_PROP(TwoPTwoCNISubProblem, LocalResidual, TwoPTwoCNICouplingLocalResidual<TypeTag>);
-
-// Choose pn and Sw as primary variables
-SET_INT_PROP(TwoPTwoCNISubProblem, Formulation, TwoPTwoCFormulation::pnsw);
-
-// The gas component balance (air) is replaced by the total mass balance
-SET_INT_PROP(TwoPTwoCNISubProblem, ReplaceCompEqIdx, GET_PROP_TYPE(TypeTag, Indices)::contiNEqIdx);
-
-// Use the fluid system from the coupled problem
-SET_TYPE_PROP(TwoPTwoCNISubProblem,
- FluidSystem,
- typename GET_PROP_TYPE(typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag), FluidSystem));
-
-// Johanson is used as model to compute the effective thermal heat conductivity
-SET_TYPE_PROP(TwoPTwoCNISubProblem, ThermalConductivityModel,
- ThermalConductivityJohansen<typename GET_PROP_TYPE(TypeTag, Scalar)>);
-
-// Use formulation based on mass fractions
-SET_BOOL_PROP(TwoPTwoCNISubProblem, UseMoles, false);
-
-// Enable/disable velocity output
-SET_BOOL_PROP(TwoPTwoCNISubProblem, VtkAddVelocity, true);
-
-// Enable gravity
-SET_BOOL_PROP(TwoPTwoCNISubProblem, ProblemEnableGravity, true);
-}
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCNIZeroEqTwoCNIModel
- * \brief Non-isothermal two-phase two-component porous-medium subproblem
- * with coupling at the top boundary.
- *
- * The porous-medium subdomain is sized 0.25m times 0.25m. The boundary conditions
- * are Neumann no-flow everywhere, except at the top, where coupling conditions
- * are applied to all balance equations. They handle the exchange to the free-flow
- * subdomain. At the bottom of the porous-medium subdomain a constant temperature is
- * set.
- *
- * This subproblem uses the \ref TwoPTwoCModel. It is part of a multidomain model and
- * combined with the zeroeq2cnisubproblem for the free flow domain.
- */
-template <class TypeTag = TTAG(TwoPTwoCNISubProblem) >
-class TwoPTwoCNISubProblem : public ImplicitPorousMediaProblem<TypeTag>
-{
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-
- typedef TwoPTwoCNISubProblem<TypeTag> ThisType;
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
-
- // copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- // the type tag of the coupled problem
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag) CoupledTypeTag;
-
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
- enum { numPhases = GET_PROP_VALUE(TypeTag, NumPhases) };
- enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
- enum { // the equation indices
- contiTotalMassIdx = Indices::contiNEqIdx,
- contiWEqIdx = Indices::contiWEqIdx,
- energyEqIdx = Indices::energyEqIdx
- };
- enum { // the indices of the primary variables
- pressureIdx = Indices::pressureIdx,
- switchIdx = Indices::switchIdx,
- temperatureIdx = Indices::temperatureIdx
- };
- enum {
- wPhaseOnly = Indices::wPhaseOnly,
- nPhaseOnly = Indices::nPhaseOnly,
- bothPhases = Indices::bothPhases
- };
- enum {
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx
- };
- enum { // grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::Intersection Intersection;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
-public:
- /*!
- * \brief The sub-problem for the porous-medium subdomain
- *
- * \param timeManager The TimeManager which is used by the simulation
- * \param gridView The simulation's idea about physical space
- */
- TwoPTwoCNISubProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
- {
- Scalar noDarcyX1 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, NoDarcyX1);
- Scalar noDarcyX2 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, NoDarcyX2);
- std::vector<Scalar> positions0 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions0);
- std::vector<Scalar> positions1 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions1);
-
- using std::max;
- using std::min;
- bBoxMin_[0] = max(positions0.front(),noDarcyX1);
- bBoxMax_[0] = min(positions0.back(),noDarcyX2);
-
- bBoxMin_[1] = positions1.front();
- bBoxMax_[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
- runUpDistanceX1_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, RunUpDistanceX1); // first part of the interface without coupling
- runUpDistanceX2_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, RunUpDistanceX2); // second part of the interface without coupling
-
- refTemperature_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, RefTemperaturePM);
- refPressure_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, RefPressurePM);
- refSw_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, RefSw);
-
- freqMassOutput_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqMassOutput);
-
- storageLastTimestep_ = Scalar(0);
- lastMassOutputTime_ = Scalar(0);
-
- outfile.open("storage.out");
- outfile << "Time[s]" << ";"
- << "TotalMassChange[kg/(s*mDepth)]" << ";"
- << "WaterMassChange[kg/(s*mDepth))]" << ";"
- << "IntEnergyChange[J/(m^3*s*mDepth)]" << ";"
- << "WaterMass[kg/mDepth]" << ";"
- << "WaterMassLoss[kg/mDepth]" << ";"
- << "EvaporationRate[mm/s]"
- << std::endl;
- }
-
- //! \brief The destructor
- ~TwoPTwoCNISubProblem()
- {
- outfile.close();
- }
-
- // functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc ImplicitProblem::bBoxMin()
- const GlobalPosition &bBoxMin() const
- { return bBoxMin_; }
-
- //! \copydoc ImplicitProblem::bBoxMax()
- const GlobalPosition &bBoxMax() const
- { return bBoxMax_; }
-
- /*!
- * \name Problem parameters
- */
- // \{
-
- //! \copydoc ImplicitProblem::name()
- const std::string &name() const
- { return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NamePM); }
-
- //! \copydoc ImplicitProblem::init()
- void init()
- {
- ParentType::init();
- this->model().globalStorage(storageLastTimestep_);
- }
-
- // \}
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- //! \copydoc ImplicitProblem::boundaryTypesAtPos()
- void boundaryTypesAtPos(BoundaryTypes &values,
- const GlobalPosition &globalPos) const
- {
- values.setAllNeumann();
-
- if (onLowerBoundary_(globalPos))
- {
- values.setDirichlet(temperatureIdx);
- }
- else if (onUpperBoundary_(globalPos)
- && (globalPos[0] > runUpDistanceX1_ - eps_)
- && (globalPos[0] < runUpDistanceX2_ + eps_))
- {
- values.setAllCouplingNeumann();
- }
- }
-
- //! \copydoc ImplicitProblem::dirichletAtPos()
- void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- initial_(values, globalPos);
- }
-
- //! \copydoc ImplicitProblem::neumannAtPos()
- void neumannAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- values = 0.;
- }
-
- // \}
-
- /*!
- * \name Volume terms
- */
- // \{
- //! \copydoc ImplicitProblem::sourceAtPos()
- void sourceAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- values = 0.;
- }
-
- //! \copydoc ImplicitProblem::initialAtPos()
- void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- initial_(values, globalPos);
- }
-
- /*!
- * \brief Return the initial phase state inside a control volume.
- *
- * \param vertex The vertex
- * \param vIdxGlobal The global index of the vertex
- * \param globalPos The global position
- */
- int initialPhasePresence(const Vertex &vertex,
- const int &vIdxGlobal,
- const GlobalPosition &globalPos) const
- {
- return bothPhases;
- }
-
- /*!
- * \brief Called by the time manager after the time integration to
- * do some post processing on the solution.
- */
- void postTimeStep()
- {
- // Calculate masses
- PrimaryVariables storage;
-
- this->model().globalStorage(storage);
- const Scalar time = this->timeManager().time() + this->timeManager().timeStepSize();
-
- static Scalar initialWaterContent = 0.0; ;
- if (this->timeManager().time() < this->timeManager().timeStepSize() + 1e-10)
- initialWaterContent = storage[contiWEqIdx];
-
- // Write mass balance information for rank 0
- if (this->gridView().comm().rank() == 0)
- {
- if (this->timeManager().timeStepIndex() % freqMassOutput_ == 0
- || this->timeManager().episodeWillBeFinished())
- {
- PrimaryVariables storageChange(0.);
- storageChange = storageLastTimestep_ - storage;
-
- assert(time - lastMassOutputTime_ != 0);
- storageChange /= (time - lastMassOutputTime_);
-
- std::cout << "Time[s]: " << time
- << " TotalMass[kg]: " << storage[contiTotalMassIdx]
- << " WaterMass[kg]: " << storage[contiWEqIdx]
- << " IntEnergy[J/m^3]: " << storage[energyEqIdx]
- << " WaterMassChange[kg/s]: " << storageChange[contiWEqIdx]
- << std::endl;
- if (this->timeManager().time() != 0.)
- outfile << time << ";"
- << storageChange[contiTotalMassIdx] << ";"
- << storageChange[contiWEqIdx] << ";"
- << storageChange[energyEqIdx] << ";"
- << storage[contiWEqIdx] << ";"
- << initialWaterContent - storage[contiWEqIdx] << ";"
- << storageChange[contiWEqIdx] / (bBoxMax_[0]-bBoxMin_[0])
- << std::endl;
-
- storageLastTimestep_ = storage;
- lastMassOutputTime_ = time;
- }
- }
- }
-
- // \}
-
-private:
- /*!
- * \brief Internal method for the initial condition
- * (reused for the dirichlet conditions!)
- */
- void initial_(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values[pressureIdx] = refPressure_
- + 1000. * this->gravity()[1] * (globalPos[1] - bBoxMax_[1]);
- values[switchIdx] = refSw_;
- values[temperatureIdx] = refTemperature_;
- }
-
- bool onLeftBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] < bBoxMin_[0] + eps_; }
-
- bool onRightBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] > bBoxMax_[0] - eps_; }
-
- bool onLowerBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] < bBoxMin_[1] + eps_; }
-
- bool onUpperBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] > bBoxMax_[1] - eps_; }
-
- static constexpr Scalar eps_ = 1e-8;
- GlobalPosition bBoxMin_;
- GlobalPosition bBoxMax_;
-
- int freqMassOutput_;
-
- PrimaryVariables storageLastTimestep_;
- Scalar lastMassOutputTime_;
-
- Scalar refTemperature_;
- Scalar refPressure_;
- Scalar refSw_;
-
- Scalar runUpDistanceX1_;
- Scalar runUpDistanceX2_;
- std::ofstream outfile;
-};
-} //end namespace Dumux
-
-#endif // DUMUX_TWOPTWOCNI_SUBPROBLEM_HH
diff --git a/test/multidomain/2cnizeroeq2p2cni/CMakeLists.txt b/test/multidomain/2cnizeroeq2p2cni/CMakeLists.txt
deleted file mode 100644
index 09a2dea7f78f0f181f4417efec9f5a6f7eb3a80c..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnizeroeq2p2cni/CMakeLists.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-add_input_file_links()
-
-dune_symlink_to_source_files(FILES evaporationRates.gp)
-
-add_dumux_test(test_2cnizeroeq2p2cni test_2cnizeroeq2p2cni test_2cnizeroeq2p2cni.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cnizeroeq2p2cni -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnizeroeq2p2cni_reference.input"
- --files ${CMAKE_SOURCE_DIR}/test/references/2cnizeroeq2p2cni-ff-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2cni-00007.vtu
- ${CMAKE_SOURCE_DIR}/test/references/2cnizeroeq2p2cni-pm-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00007.vtu)
-
-#install sources
-install(FILES
-2cnizeroeq2p2cniproblem.hh
-2cnizeroeq2p2cnispatialparameters.hh
-2p2cnisubproblem.hh
-test_2cnizeroeq2p2cni.cc
-zeroeq2cnisubproblem.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/multidomain/2cnizeroeq2p2cni)
diff --git a/test/multidomain/2cnizeroeq2p2cni/evaporationRates.gp b/test/multidomain/2cnizeroeq2p2cni/evaporationRates.gp
deleted file mode 100644
index 3b50921549ee3a0bf0932867c513b922b87c3462..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnizeroeq2p2cni/evaporationRates.gp
+++ /dev/null
@@ -1,13 +0,0 @@
-reset
-set datafile separator ';'
-
-set xlabel 'Time [d]'
-set ylabel 'Evaporation rate [mm/d]'
-set xrange [0:5]
-set yrange [0:5]
-plot \
-'storage.out' u ($1/86400):($3*86400) w l lw 2 t 'current'
-
-set terminal pngcairo size 1200,900
-set output 'evaporationRates.png'
-replot
\ No newline at end of file
diff --git a/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni.cc b/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni.cc
deleted file mode 100644
index d7d4d24f70e5421282dbd9f22c273c3940278b89..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni.cc
+++ /dev/null
@@ -1,123 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Test for the coupled non-isothermal two-component ZeroEq and
- * non-isothermal two-phase two-component Darcy model
- */
-
-#include <config.h>
-#include <iostream>
-
-#include <dune/common/parallel/mpihelper.hh>
-
-#if HAVE_DUNE_MULTIDOMAIN
-
-#include <dumux/common/start.hh>
-
-#include "2cnizeroeq2p2cniproblem.hh"
-
-/*!
- * \brief Print a usage string for simulations.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void printUsage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\nThe list of mandatory options for this program is:\n"
- "[Grid]\n"
- "InterfacePosY Vertical position of the interface [m]\n"
- "NoDarcyX1 Horizontal position where the porous medium starts [m]\n"
- "NoDarcyX2 Horizontal position where the porous medium ends [m]\n"
- "RunUpDistanceX1 Horizontal position where the coupling starts [m]\n"
- "RunUpDistanceX2 Horizontal position where the coupling ends [m]\n"
- "\n"
- "[SpatialParams]\n"
- "AlphaBJ Beavers-Joseph coefficient [-]\n"
- "Permeability Hydraulic conductivity [m^2]\n"
- "Porosity Porosity [-]\n"
- "Swr Residual water saturation [-]\n"
- "Snr Residual gas saturation [-]\n"
- "VgAlpha Van-Genuchten parameter [1/Pa]\n"
- "VgN Van-Genuchten parameter [-]\n"
- "ThermalConductivitySolid Thermal conductivity of the solid material [W/(m*K)]\n"
- "\n"
- "[FreeFlow]\n"
- "RefVelocity Inflow velocity [m/s]\n"
- "RefPressure Reference pressure [Pa]\n"
- "RefMassfrac Inflow water mass fraction [-]\n"
- "RefTemperature Inflow temperature [K]\n"
- "\n"
- "[PorousMedium]\n"
- "RefSw Initial water saturation [-]\n"
- "RefPressurePM Initial pressure [Pa]\n"
- "RefTemperaturePM Initial temperature [K]\n"
- "\n"
- "[Output]\n"
- "NameFF Name free flow .vtu files\n"
- "NamePM Name porous medium .vtu files\n"
- "FreqRestart Frequency of writting restart information\n"
- "FreqOutput Frequency of writting vtu output\n"
- "FreqMassOutput Frequency of writting storage output\n"
- "FreqFluxOutput Frequency of writting flux output\n"
- "FreqVaporFluxOutput Frequency of writting vapor flux output\n"
- "\n"
- "[TimeManager]\n"
- "EpisodeLength Length of one episode [s]\n"
- "\n"
- "[BoundaryLayer]\n"
- "Model Enable use of boundary layer models (discouraged)\n"
- "\n"
- "[MassTransfer]\n"
- "Model Enable use of mass transfer models (discouraged)\n"
- "\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
-#if (HAVE_SUPERLU || HAVE_UMFPACK)
- typedef TTAG(TwoCNIZeroEqTwoPTwoCNITestProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, printUsage);
-#else
-#warning "You need to have SuperLU or UMFPack installed to run this test."
- std::cerr << "You need to have SuperLU or UMFPack installed to run this test\n";
- return 77;
-#endif
-}
-
-#else
-int main(int argc, char** argv)
-{
-#warning You need to have dune-multidomain installed to run this test
- std::cerr << "You need to have dune-multidomain installed to run this test\n";
- return 77;
-}
-#endif
diff --git a/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni.input b/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni.input
deleted file mode 100644
index 50d97654203a3b0db56e1ee4b2ed8cf446901538..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni.input
+++ /dev/null
@@ -1,81 +0,0 @@
-[TimeManager]
-DtInitial = 5e-5 # [s]
-MaxTimeStepSize = 360 # [s]
-TEnd = 3600 # [s]
-EpisodeLength = 14400 # [s] # 14400s = 4h
-
-[Grid]
-Cells0 = 15
-Cells1 = 10 10 10
-Grading0 = 1.0
-Grading1 = -1.1 1.1 -1.1
-Positions0 = 0.0 0.75
-Positions1 = 0.0 0.25 0.5 0.75
-
-NoDarcyX1 = 0.25 # [m] # Beginning of PM below
-NoDarcyX2 = 0.5 # [m] # End of PM below
-RunUpDistanceX1 = 0.251 # [m] # Beginning of without Coupling to PM (x-coordinate)
-RunUpDistanceX2 = 0.499 # [m] # End of without Coupling to PM (x-coordinate)
-InterfacePosY = 0.25 # [m] # Vertical position of coupling interface
-
-[Output]
-NameFF = zeroeq2cni
-NamePM = 2p2cni
-# Frequency of restart file, flux and VTK output
-FreqRestart = 5 # how often restart files are written out
-FreqOutput = 5 # 10 # frequency of VTK output
-FreqMassOutput = 5 # 20 # frequency of mass and evaporation rate output (Darcy)
-
-[FreeFlow]
-RefVelocity = 1.0 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-
-[BoundaryLayer]
-Model = 0 # disable boundary layer models
-
-[MassTransfer]
-Model = 0 # disable mass transfer models
-
-[PorousMedium]
-RefPressurePM = 1e5 # [Pa]
-RefTemperaturePM = 298.15 # [K]
-RefSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 8.0 # [-]
-ThermalConductivitySolid = 5.26 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-
-[LinearSolver]
-Verbosity = 0
-
-[ZeroEq]
-# Eddy Viscosity Models
-# 0 = none
-# 1 = Prandtl
-# 2 = modified Van Driest
-# 3 = Baldwin Lomax
-EddyViscosityModel = 2
-# Eddy Diffusivity and Eddy Conductivity Models
-# 0 = none
-# 1 = Reynolds analogy
-# 2 = modified Van Driest
-# 3 = Deissler
-# 4 = Meier and Rotta
-EddyDiffusivityModel = 3
-EddyConductivityModel = 3
-BBoxMinSandGrainRoughness = 0.0 # [m]
-BBoxMaxSandGrainRoughness = 0.0 # [m]
diff --git a/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni_reference.input b/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni_reference.input
deleted file mode 100644
index 8813143a278014bbf15a173bd62a4698173185f6..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnizeroeq2p2cni/test_2cnizeroeq2p2cni_reference.input
+++ /dev/null
@@ -1,81 +0,0 @@
-[TimeManager]
-DtInitial = 1e1 # [s]
-MaxTimeStepSize = 360 # [s]
-TEnd = 1800 # [s]
-EpisodeLength = 14400 # [s] # 14400s = 4h
-
-[Grid]
-Cells0 = 7
-Cells1 = 4 4 4
-Grading0 = 1.0
-Grading1 = -1.5 1.5 -1.5
-Positions0 = 0.0 0.35
-Positions1 = 0.0 0.25 0.375 0.5
-
-NoDarcyX1 = 0.05 # [m] # Beginning of PM below
-NoDarcyX2 = 0.30 # [m] # End of PM below
-RunUpDistanceX1 = 0.051 # [m] # Beginning of without Coupling to PM (x-coordinate)
-RunUpDistanceX2 = 0.299 # [m] # End of without Coupling to PM (x-coordinate)
-InterfacePosY = 0.25 # [m] # Vertical position of coupling interface
-
-[Output]
-NameFF = zeroeq2cni
-NamePM = 2p2cni
-# Frequency of restart file, flux and VTK output
-FreqRestart = 1000 # how often restart files are written out
-FreqOutput = 2 # 10 # frequency of VTK output
-FreqMassOutput = 2 # 20 # frequency of mass and evaporation rate output (Darcy)
-
-[FreeFlow]
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-
-[BoundaryLayer]
-Model = 0 # disable boundary layer models
-
-[MassTransfer]
-Model = 0 # disable mass transfer models
-
-[PorousMedium]
-RefPressurePM = 1e5 # [Pa]
-RefTemperaturePM = 298.15 # [K]
-RefSw = 0.28 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 8.0 # [-]
-ThermalConductivitySolid = 5.26 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-
-[LinearSolver]
-Verbosity = 0
-
-[ZeroEq]
-# Eddy Viscosity Models
-# 0 = none
-# 1 = Prandtl
-# 2 = modified Van Driest
-# 3 = Baldwin Lomax
-EddyViscosityModel = 2
-# Eddy Diffusivity and Eddy Conductivity Models
-# 0 = none
-# 1 = Reynolds analogy
-# 2 = modified Van Driest
-# 3 = Deissler
-# 4 = Meier and Rotta
-EddyDiffusivityModel = 3
-EddyConductivityModel = 3
-BBoxMinSandGrainRoughness = 0.0 # [m]
-BBoxMaxSandGrainRoughness = 0.0 # [m]
diff --git a/test/multidomain/2cnizeroeq2p2cni/zeroeq2cnisubproblem.hh b/test/multidomain/2cnizeroeq2p2cni/zeroeq2cnisubproblem.hh
deleted file mode 100644
index aa1297d854021ab0ae5fe47c86c0915e60985265..0000000000000000000000000000000000000000
--- a/test/multidomain/2cnizeroeq2p2cni/zeroeq2cnisubproblem.hh
+++ /dev/null
@@ -1,362 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/**
- * \file
- * \brief Non-isothermal two-component ZeroEq subproblem with air flowing
- * from the left to the right and coupling at the bottom.
- */
-#ifndef DUMUX_ZEROEQTWOCNI_SUBPROBLEM_HH
-#define DUMUX_ZEROEQTWOCNI_SUBPROBLEM_HH
-
-#include <dumux/freeflow/zeroeqncni/model.hh>
-#include <dumux/multidomain/subdomainpropertydefaults.hh>
-#include <dumux/multidomain/2cnistokes2p2cni/stokesncnicouplinglocalresidual.hh>
-
-namespace Dumux
-{
-
-template <class TypeTag>
-class ZeroEq2cniSubProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(ZeroEq2cniSubProblem,
- INHERITS_FROM(BoxZeroEqncni, SubDomain));
-
-// Set the problem property
-SET_TYPE_PROP(ZeroEq2cniSubProblem, Problem, ZeroEq2cniSubProblem<TypeTag>);
-
-// Use the StokesncniCouplingLocalResidual for the computation of the local residual in the ZeroEq domain
-SET_TYPE_PROP(ZeroEq2cniSubProblem, LocalResidual, StokesncniCouplingLocalResidual<TypeTag>);
-
-// Use the fluid system from the coupled problem
-SET_TYPE_PROP(ZeroEq2cniSubProblem,
- FluidSystem,
- typename GET_PROP_TYPE(typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag), FluidSystem));
-
-// Disable use of mole formulation
-SET_BOOL_PROP(ZeroEq2cniSubProblem, UseMoles, false);
-
-// Disable gravity
-SET_BOOL_PROP(ZeroEq2cniSubProblem, ProblemEnableGravity, false);
-
-// Enable Navier-Stokes
-SET_BOOL_PROP(ZeroEq2cniSubProblem, EnableNavierStokes, true);
-
-// Set the properties for variable inflow BC
-NEW_PROP_TAG(FreeFlowSinusVelocityAmplitude);
-NEW_PROP_TAG(FreeFlowSinusVelocityPeriod);
-SET_SCALAR_PROP(ZeroEq2cniSubProblem, FreeFlowSinusVelocityAmplitude, 0.0);
-SET_SCALAR_PROP(ZeroEq2cniSubProblem, FreeFlowSinusVelocityPeriod, 3600.0);
-NEW_PROP_TAG(FreeFlowSinusPressureAmplitude);
-NEW_PROP_TAG(FreeFlowSinusPressurePeriod);
-SET_SCALAR_PROP(ZeroEq2cniSubProblem, FreeFlowSinusPressureAmplitude, 0.0);
-SET_SCALAR_PROP(ZeroEq2cniSubProblem, FreeFlowSinusPressurePeriod, 3600.0);
-NEW_PROP_TAG(FreeFlowSinusConcentrationAmplitude);
-NEW_PROP_TAG(FreeFlowSinusConcentrationPeriod);
-SET_SCALAR_PROP(ZeroEq2cniSubProblem, FreeFlowSinusConcentrationAmplitude, 0.0);
-SET_SCALAR_PROP(ZeroEq2cniSubProblem, FreeFlowSinusConcentrationPeriod, 3600.0);
-NEW_PROP_TAG(FreeFlowSinusTemperatureAmplitude);
-NEW_PROP_TAG(FreeFlowSinusTemperaturePeriod);
-SET_SCALAR_PROP(ZeroEq2cniSubProblem, FreeFlowSinusTemperatureAmplitude, 0.0);
-SET_SCALAR_PROP(ZeroEq2cniSubProblem, FreeFlowSinusTemperaturePeriod, 3600.0);
-}
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCNIZeroEqTwoCNIModel
- * \brief Non-isothermal two-component ZeroEq subproblem with air flowing
- * from the left to the right and coupling at the bottom.
- *
- * The free-flow subdomain is sized 0.75m times 0.5m. Dry and hot air is flowing from left (Dirichlet)
- * to right (outflow), at the middle third of the bottom the coupling conditions
- * are applied to all balance equations. They handle the exchange to the porous-medium
- * subdomain.
- *
- * This subproblem uses the \ref ZeroEqncniModel. It is part of a multidomain model and
- * combined with the 2p2cnisubproblem for the porous-medium domain.
- */
-template <class TypeTag>
-class ZeroEq2cniSubProblem : public ZeroEqProblem<TypeTag>
-{
- typedef ZeroEq2cniSubProblem<TypeTag> ThisType;
- typedef ZeroEqProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum {
- dim = GridView::dimension
- };
- enum { // equation indices
- massBalanceIdx = Indices::massBalanceIdx,
- momentumXIdx = Indices::momentumXIdx, // Index of the x-component of the momentum balance
- momentumYIdx = Indices::momentumYIdx, // Index of the y-component of the momentum balance
- momentumZIdx = Indices::momentumZIdx, // Index of the z-component of the momentum balance
- transportEqIdx = Indices::transportEqIdx, // Index of the transport equation (massfraction)
- energyEqIdx = Indices::energyEqIdx // Index of the energy equation (temperature)
- };
- enum { // primary variable indices
- pressureIdx = Indices::pressureIdx,
- velocityXIdx = Indices::velocityXIdx,
- velocityYIdx = Indices::velocityYIdx,
- velocityZIdx = Indices::velocityZIdx,
- massOrMoleFracIdx = Indices::massOrMoleFracIdx,
- temperatureIdx = Indices::temperatureIdx
- };
- enum {
- transportCompIdx = Indices::transportCompIdx, // water component index
- phaseCompIdx = Indices::phaseCompIdx // air component index
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::ctype CoordScalar;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<CoordScalar, dim> GlobalPosition;
-
-
-public:
- /*!
- * \brief The sub-problem for the ZeroEq subdomain
- *
- * \param timeManager The TimeManager which is used by the simulation
- * \param gridView The simulation's idea about physical space
- */
- ZeroEq2cniSubProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
- {
- std::vector<Scalar> positions0 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions0);
- std::vector<Scalar> positions1 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions1);
-
- bBoxMin_[0] = positions0.front();
- bBoxMax_[0] = positions0.back();
- bBoxMin_[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
- bBoxMax_[1] = positions1.back();
- runUpDistanceX1_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, RunUpDistanceX1); // first part of the interface without coupling
- runUpDistanceX2_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, RunUpDistanceX2); // second part of the interface without coupling
-
- refVelocity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefVelocity);
- refPressure_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefPressure);
- refMassfrac_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefMassfrac);
- refTemperature_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefTemperature);
- }
-
- // functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc ImplicitProblem::bBoxMin()
- const GlobalPosition &bBoxMin() const
- { return bBoxMin_; }
-
- //! \copydoc ImplicitProblem::bBoxMax()
- const GlobalPosition &bBoxMax() const
- { return bBoxMax_; }
-
- /*!
- * \name Problem parameters
- */
- // \{
-
- //! \copydoc ImplicitProblem::name()
- const std::string &name() const
- { return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NameFF); }
-
- // \}
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- //! \copydoc ImplicitProblem::boundaryTypesAtPos()
- void boundaryTypesAtPos(BoundaryTypes &values,
- const GlobalPosition &globalPos) const
- {
- values.setAllDirichlet();
-
-
- if (onUpperBoundary_(globalPos))
- {
- values.setNeumann(transportEqIdx);
- values.setDirichlet(temperatureIdx);
- }
-
- if (onLowerBoundary_(globalPos))
- {
- values.setNeumann(transportEqIdx);
- values.setDirichlet(temperatureIdx);
-
- if (globalPos[0] > runUpDistanceX1_ - eps_
- && globalPos[0] < runUpDistanceX2_ + eps_)
- {
- values.setAllCouplingDirichlet();
- values.setCouplingNeumann(momentumXIdx);
- values.setCouplingNeumann(momentumYIdx);
- }
- }
-
- if (onRightBoundary_(globalPos))
- {
- values.setAllOutflow();
-
- if (onUpperBoundary_(globalPos) || onLowerBoundary_(globalPos)) // corner points
- values.setAllDirichlet();
- }
-
- if (onLeftBoundary_(globalPos))
- {
- values.setAllDirichlet();
- }
-
- // the mass balance has to be of type outflow
- // it does not get a coupling condition, since pn is a condition for stokes
- values.setOutflow(massBalanceIdx);
-
- if (onRightBoundary_(globalPos))
- {
- values.setAllOutflow();
- values.setDirichlet(pressureIdx);
- }
- }
-
- //! \copydoc ImplicitProblem::dirichletAtPos()
- void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- values = 0.0;
-
- values[velocityXIdx] = xVelocity_(globalPos);
- values[velocityYIdx] = 0.0;
- values[pressureIdx] = refPressure()
- + 1.189 * this->gravity()[1] * (globalPos[1] - bBoxMin_[1]);
- values[massOrMoleFracIdx] = refMassfrac();
- values[temperatureIdx] = refTemperature();
- }
-
- //! \copydoc ImplicitProblem::neumannAtPos()
- void neumannAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- values = 0.;
- }
-
- //! \copydoc ImplicitProblem::sourceAtPos()
- void sourceAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- // The source term of the mass balance has to be chosen as
- // div (q_momentum) in the problem file
- values = 0.0;
- }
-
- //! \copydoc ImplicitProblem::initialAtPos()
- void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- initial_(values, globalPos);
- }
-
- // \}
-
- //! \brief Returns the velocity at the inflow.
- const Scalar refVelocity() const
- {
- return refVelocity_ + variation_(GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusVelocityAmplitude),
- GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusVelocityPeriod));
- }
-
- //! \brief Returns the pressure at the inflow.
- const Scalar refPressure() const
- {
- return refPressure_ + variation_(GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusPressureAmplitude),
- GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusPressurePeriod));
- }
-
- //! \brief Returns the mass fraction at the inflow.
- const Scalar refMassfrac() const
- {
- return refMassfrac_ + variation_(GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusConcentrationAmplitude),
- GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusConcentrationPeriod));
- }
-
- //! \brief Returns the temperature at the inflow.
- const Scalar refTemperature() const
- {
- return refTemperature_ + variation_(GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusTemperatureAmplitude),
- GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusTemperaturePeriod));
- }
-
-private:
- // Internal method for the initial and Dirichlet conditions
- void initial_(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values[velocityXIdx] = xVelocity_(globalPos);
- values[velocityYIdx] = 0.;
-
- values[pressureIdx] = refPressure() + 1.189 * this->gravity()[1] * (globalPos[1] - bBoxMin_[1]);
- values[massOrMoleFracIdx] = refMassfrac();
- values[temperatureIdx] = refTemperature();
- }
-
- // returns the inflow velocity profile
- const Scalar xVelocity_(const GlobalPosition &globalPos) const
- {
- if (onUpperBoundary_(globalPos) || onLowerBoundary_(globalPos))
- return 0.0;
- return refVelocity();
- }
-
- // can be used for the variation of a boundary condition
- const Scalar variation_(const Scalar amplitude, const Scalar period) const
- { return sin(2*M_PI*this->timeManager().time()/period) * amplitude; }
-
- bool onLeftBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] < bBoxMin_[0] + eps_; }
-
- bool onRightBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] > bBoxMax_[0] - eps_; }
-
- bool onLowerBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] < bBoxMin_[1] + eps_; }
-
- bool onUpperBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] > bBoxMax_[1] - eps_; }
-
- static constexpr Scalar eps_ = 1e-8;
- GlobalPosition bBoxMin_;
- GlobalPosition bBoxMax_;
-
- Scalar refVelocity_;
- Scalar refPressure_;
- Scalar refMassfrac_;
- Scalar refTemperature_;
-
- Scalar runUpDistanceX1_;
- Scalar runUpDistanceX2_;
-};
-} //end namespace
-
-#endif // DUMUX_ZEROEQTWOCNI_SUBPROBLEM_HH
diff --git a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh b/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
deleted file mode 100644
index d7c5260a54d95af5920a3cb6d40d3f11cbd1049d..0000000000000000000000000000000000000000
--- a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
+++ /dev/null
@@ -1,259 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief The problem class for the coupling of an isothermal two-component Stokes
- * and an isothermal two-phase two-component Darcy model.
- *
- * The problem class for the coupling of an isothermal two-component Stokes (stokes2c)
- * and an isothermal two-phase two-component Darcy model (2p2c).
- * It uses the 2p2cCoupling model and the Stokes2ccoupling model and provides
- * the problem specifications for common parameters of the two submodels.
- * The initial and boundary conditions of the submodels are specified in the two subproblems,
- * 2p2csubproblem.hh and stokes2csubproblem.hh, which are accessible via the coupled problem.
- */
-
-#ifndef DUMUX_2CSTOKES2P2CPROBLEM_HH
-#define DUMUX_2CSTOKES2P2CPROBLEM_HH
-
-#include <dune/common/float_cmp.hh>
-#include <dune/grid/common/gridinfo.hh>
-#include <dune/grid/multidomaingrid.hh>
-
-#include <dumux/material/fluidsystems/h2oair.hh>
-#include <dumux/multidomain/2cstokes2p2c/localoperator.hh>
-#include <dumux/multidomain/2cstokes2p2c/problem.hh>
-#include <dumux/multidomain/2cstokes2p2c/propertydefaults.hh>
-
-#ifdef HAVE_PARDISO
-#include <dumux/linear/pardisobackend.hh>
-#endif // HAVE_PARDISO
-
-#include "2cstokes2p2cspatialparams.hh"
-#include "stokes2csubproblem.hh"
-#include "2p2csubproblem.hh"
-
-namespace Dumux
-{
-template <class TypeTag>
-class TwoCStokesTwoPTwoCTestProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(TwoCStokesTwoPTwoCTestProblem, INHERITS_FROM(TwoCStokesTwoPTwoC));
-
-// Set the grid type
-SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, Grid, Dune::YaspGrid<2, Dune::TensorProductCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
-
-// Set the global problem
-SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, Problem, TwoCStokesTwoPTwoCTestProblem<TypeTag>);
-
-// Set the local coupling operator
-SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, MultiDomainCouplingLocalOperator,
- TwoCStokesTwoPTwoCLocalOperator<TypeTag>);
-
-// Set the two sub-problems of the global problem
-SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, SubDomain1TypeTag, TTAG(Stokes2cSubProblem));
-SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, SubDomain2TypeTag, TTAG(TwoPTwoCSubProblem));
-
-// Set the global problem in the context of the two sub-problems
-SET_TYPE_PROP(Stokes2cSubProblem, MultiDomainTypeTag, TTAG(TwoCStokesTwoPTwoCTestProblem));
-SET_TYPE_PROP(TwoPTwoCSubProblem, MultiDomainTypeTag, TTAG(TwoCStokesTwoPTwoCTestProblem));
-
-// Set the other sub-problem for each of the two sub-problems
-SET_TYPE_PROP(Stokes2cSubProblem, OtherSubDomainTypeTag, TTAG(TwoPTwoCSubProblem));
-SET_TYPE_PROP(TwoPTwoCSubProblem, OtherSubDomainTypeTag, TTAG(Stokes2cSubProblem));
-
-// Set the spatial parameters used for the problems
-SET_TYPE_PROP(TwoPTwoCSubProblem, SpatialParams, TwoCStokesTwoPTwoCSpatialParams<TypeTag>);
-
-// Set the fluid system to use simple relations (last argument)
-SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, FluidSystem,
- FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
-
-// if you do not have PARDISO, the SuperLU solver is used:
-#ifdef HAVE_PARDISO
-SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, LinearSolver, PardisoBackend<TypeTag>);
-#else
-SET_TYPE_PROP(TwoCStokesTwoPTwoCTestProblem, LinearSolver, SuperLUBackend<TypeTag>);
-#endif // HAVE_PARDISO
-}
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCStokesTwoCModel
- * \brief The problem class for the coupling of an isothermal two-component Stokes
- * and an isothermal two-phase two-component Darcy model.
- *
- * The problem class for the coupling of an isothermal two-component Stokes (stokes2c)
- * and an isothermal two-phase two-component Darcy model (2p2c).
- * It uses the 2p2cCoupling model and the Stokes2ccoupling model and provides
- * the problem specifications for common parameters of the two submodels.
- * The initial and boundary conditions of the submodels are specified in the two subproblems,
- * 2p2csubproblem.hh and stokes2csubproblem.hh, which are accessible via the coupled problem.
- */
-template <class TypeTag = TTAG(TwoCStokesTwoPTwoCTestProblem) >
-class TwoCStokesTwoPTwoCTestProblem : public TwoCStokesTwoPTwoCProblem<TypeTag>
-{
- typedef TwoCStokesTwoPTwoCTestProblem<TypeTag> ThisType;
- typedef TwoCStokesTwoPTwoCProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MDGrid;
- typedef typename MDGrid::LeafGridView MDGridView;
- enum { dim = MDGridView::dimension };
- typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
-
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
-public:
- /*!
- * \brief The problem for the coupling of Stokes and Darcy flow
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- */
- template<class GridView>
- TwoCStokesTwoPTwoCTestProblem(TimeManager &timeManager,
- GridView gridView)
- : ParentType(timeManager, gridView)
- {
- interfacePosY_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
- noDarcyX_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, NoDarcyX);
- episodeLength_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, EpisodeLength);
- initializationTime_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, InitTime);
-
- // define output options
- freqRestart_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqRestart);
- freqOutput_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqOutput);
-
- stokes2c_ = this->sdID1();
- twoPtwoC_ = this->sdID2();
-
- initializeGrid();
-
- // initialize the tables of the fluid system
- FluidSystem::init(/*tempMin=*/273.15, /*tempMax=*/323.15, /*numTemp=*/50,
- /*pMin=*/5e4, /*pMax=*/1.5e5, /*numP=*/100);
-
- if (initializationTime_ > 0.0)
- this->timeManager().startNextEpisode(initializationTime_);
- else
- this->timeManager().startNextEpisode(episodeLength_);
- }
-
- /*!
- * \brief Initialization of the grids
- *
- * This function splits the multidomain grid in the two
- * individual subdomain grids and takes care of parallelization.
- */
- void initializeGrid()
- {
- MDGrid& mdGrid = this->mdGrid();
- mdGrid.startSubDomainMarking();
-
- // subdivide grid in two subdomains
- for (const auto& element : elements(mdGrid.leafGridView(), Dune::Partitions::interior))
- {
- GlobalPosition globalPos = element.geometry().center();
-
- if (globalPos[1] > interfacePosY_ - eps_)
- mdGrid.addToSubDomain(stokes2c_,element);
- else
- if(globalPos[0] > noDarcyX_ - eps_)
- mdGrid.addToSubDomain(twoPtwoC_,element);
- }
- mdGrid.preUpdateSubDomains();
- mdGrid.updateSubDomains();
- mdGrid.postUpdateSubDomains();
-
- gridinfo(this->sdGrid1());
- gridinfo(this->sdGrid2());
- }
-
- /*!
- * \brief Called by the time manager after the time integration to
- * do some post processing on the solution.
- */
- void postTimeStep()
- {
- // call the postTimeStep function of the subproblems
- this->sdProblem1().postTimeStep();
- this->sdProblem2().postTimeStep();
- }
-
- /*!
- * \brief Called when the end of an simulation episode is reached.
- *
- * Typically a new episode should be started in this method.
- */
- void episodeEnd()
- { this->timeManager().startNextEpisode(episodeLength_); }
-
- /*!
- * \brief Returns true if a restart file should be written to
- * disk.
- *
- * The default behavior is to write one restart file every 5 time
- * steps. This file is intended to be overwritten by the
- * implementation.
- */
- bool shouldWriteRestartFile() const
- {
- return (this->timeManager().timeStepIndex() % freqRestart_ == 0
- || this->timeManager().episodeWillBeFinished()
- || this->timeManager().willBeFinished());
- }
-
- /*!
- * \brief Returns true if the current solution should be written to
- * disk (i.e. as a VTK file)
- *
- * The default behavior is to write out the solution for
- * every time step. This function is intended to be overwritten by the
- * implementation.
- */
- bool shouldWriteOutput() const
- {
- return (this->timeManager().timeStepIndex() % freqOutput_ == 0
- || this->timeManager().episodeWillBeFinished()
- || this->timeManager().willBeFinished());
- }
-
-private:
- typename MDGrid::SubDomainIndex stokes2c_;
- typename MDGrid::SubDomainIndex twoPtwoC_;
-
- unsigned freqRestart_;
- unsigned freqOutput_;
-
- Scalar interfacePosY_;
- Scalar noDarcyX_;
- Scalar episodeLength_;
- Scalar initializationTime_;
-
- static constexpr Scalar eps_ = 1e-8;
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_2CSTOKES2P2CPROBLEM_HH
diff --git a/test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh b/test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh
deleted file mode 100644
index 1cc4fab22c0939517f8064c4492085cc6d768432..0000000000000000000000000000000000000000
--- a/test/multidomain/2cstokes2p2c/2cstokes2p2cspatialparams.hh
+++ /dev/null
@@ -1,174 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Spatial parameters for the
- * coupling of an isothermal two-component Stokes
- * and an isothermal two-phase two-component Darcy model.
- */
-
-#ifndef DUMUX_TWOCSTOKES_2P2C_SPATIALPARAMS_HH
-#define DUMUX_TWOCSTOKES_2P2C_SPATIALPARAMS_HH
-
-#include <dune/grid/io/file/vtk/common.hh>
-
-#include <dumux/material/spatialparams/implicit.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-
-namespace Dumux
-{
-//forward declaration
-template<class TypeTag>
-class TwoCStokesTwoPTwoCSpatialParams;
-
-namespace Properties
-{
-// The spatial parameters TypeTag
-NEW_TYPE_TAG(TwoCStokesTwoPTwoCSpatialParams);
-
-// Set the spatial parameters
-SET_TYPE_PROP(TwoCStokesTwoPTwoCSpatialParams, SpatialParams,
- TwoCStokesTwoPTwoCSpatialParams<TypeTag>);
-
-// Set the material law parameterized by absolute saturations
-SET_TYPE_PROP(TwoCStokesTwoPTwoCSpatialParams,
- MaterialLaw,
- EffToAbsLaw<RegularizedVanGenuchten<typename GET_PROP_TYPE(TypeTag, Scalar)>>);
-// EffToAbsLaw<RegularizedBrooksCorey<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
-}
-
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCStokesTwoCModel
- * \brief Definition of the spatial parameters for
- * the coupling of an isothermal two-component Stokes
- * and an isothermal two-phase two-component Darcy model.
- */
-template<class TypeTag>
-class TwoCStokesTwoPTwoCSpatialParams : public ImplicitSpatialParams<TypeTag>
-{
- typedef ImplicitSpatialParams<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GridView::ctype CoordScalar;
-
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
- typedef Dune::FieldVector<CoordScalar, dimWorld> GlobalPosition;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
- typedef typename MaterialLaw::Params MaterialLawParams;
-
-public:
- /*!
- * \brief Spatial parameters for the
- * coupling of an isothermal two-component Stokes
- * and an isothermal two-phase two-component Darcy model.
- *
- * \param gridView The GridView which is used by the problem
- */
- TwoCStokesTwoPTwoCSpatialParams(const GridView& gridView)
- : ParentType(gridView)
- {
- porosity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Porosity);
- permeability_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Permeability);
- alphaBJ_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, AlphaBJ);
-
- // residual saturations
- params_.setSwr(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Swr));
- params_.setSnr(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Snr));
- // parameters for the vanGenuchten law
- params_.setVgAlpha(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, VgAlpha));
- params_.setVgn(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, VgN));
- }
-
- /*!
- * \brief Returns the intrinsic permeability tensor \f$[m^2]\f$
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- const Scalar intrinsicPermeability(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return permeability_;
- }
-
- /*!
- * \brief Returns the porosity \f$[-]\f$
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- Scalar porosity(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return porosity_;
- }
-
- /*!
- * \brief Returns the parameter object for the material law
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- const MaterialLawParams& materialLawParams(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return params_;
- }
-
- /*!
- * \brief Evaluate the Beavers-Joseph coefficient at given position
- *
- * \param globalPos The global position
- *
- * \return Beavers-Joseph coefficient
- */
- Scalar beaversJosephCoeffAtPos(const GlobalPosition &globalPos) const
- {
- return alphaBJ_;
- }
-
-private:
- Scalar permeability_;
- Scalar porosity_;
- Scalar alphaBJ_;
- MaterialLawParams params_;
-};
-
-} // end namespace Dumux
-
-#endif // DUMUX_TWOCSTOKES_2P2C_SPATIALPARAMS_HH
diff --git a/test/multidomain/2cstokes2p2c/2p2csubproblem.hh b/test/multidomain/2cstokes2p2c/2p2csubproblem.hh
deleted file mode 100644
index cbae1065eb39957d6c5fe1c5ac8cf805db542977..0000000000000000000000000000000000000000
--- a/test/multidomain/2cstokes2p2c/2p2csubproblem.hh
+++ /dev/null
@@ -1,415 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- * \brief Isothermal two-phase two-component porous-medium subproblem
- * with coupling at the top boundary.
- */
-#ifndef DUMUX_2P2C_SUBPROBLEM_HH
-#define DUMUX_2P2C_SUBPROBLEM_HH
-
-#include <dune/common/float_cmp.hh>
-
-#include <dumux/porousmediumflow/2p2c/implicit/indices.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh>
-#include <dumux/multidomain/subdomainpropertydefaults.hh>
-#include <dumux/multidomain/localoperator.hh>
-
-#include "2cstokes2p2cspatialparams.hh"
-
-namespace Dumux
-{
-template <class TypeTag>
-class TwoPTwoCSubProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(TwoPTwoCSubProblem,
- INHERITS_FROM(BoxTwoPTwoC, SubDomain, TwoCStokesTwoPTwoCSpatialParams));
-
-// Set the problem property
-SET_TYPE_PROP(TwoPTwoCSubProblem, Problem, TwoPTwoCSubProblem<TTAG(TwoPTwoCSubProblem)>);
-
-// Use the local residual extended for the coupling
-SET_TYPE_PROP(TwoPTwoCSubProblem, LocalResidual, TwoPTwoCCouplingLocalResidual<TypeTag>);
-
-// Choose pn and Sw as primary variables
-SET_INT_PROP(TwoPTwoCSubProblem, Formulation, TwoPTwoCFormulation::pnsw);
-
-// The gas component balance (air) is replaced by the total mass balance
-SET_INT_PROP(TwoPTwoCSubProblem, ReplaceCompEqIdx, GET_PROP_TYPE(TypeTag, Indices)::contiNEqIdx);
-
-// Used the fluid system from the coupled problem
-SET_TYPE_PROP(TwoPTwoCSubProblem,
- FluidSystem,
- typename GET_PROP_TYPE(typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag), FluidSystem));
-
-// Use formulation based on mass fractions
-SET_BOOL_PROP(TwoPTwoCSubProblem, UseMoles, false);
-
-// Enable velocity output
-SET_BOOL_PROP(TwoPTwoCSubProblem, VtkAddVelocity, true);
-
-// Enable gravity
-SET_BOOL_PROP(TwoPTwoCSubProblem, ProblemEnableGravity, true);
-}
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCStokesTwoCModel
- * \brief Isothermal two-phase two-component porous-medium subproblem
- * with coupling at the top boundary.
- *
- * The Darcy subdomain is sized 0.25m times 0.25m. All BCs for the balance
- * equations are set to Neumann no-flow, except for the top, where couplingInflow
- * conditions are applied.
- *
- * This sub problem uses the \ref TwoPTwoCModel. It is part of the 2p2c model and
- * is combined with the stokes2csubproblem for the free flow domain.
- */
-template <class TypeTag = TTAG(TwoPTwoCSubProblem) >
-class TwoPTwoCSubProblem : public ImplicitPorousMediaProblem<TypeTag>
-{
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-
- typedef TwoPTwoCSubProblem<TypeTag> ThisType;
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
-
- // copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq)};
- enum { // the equation indices
- contiTotalMassIdx = Indices::contiNEqIdx,
- contiWEqIdx = Indices::contiWEqIdx,
- };
- enum { // the indices of the primary variables
- pressureIdx = Indices::pressureIdx,
- switchIdx = Indices::switchIdx,
- };
- enum { // the indices for the phase presence
- wPhaseOnly = Indices::wPhaseOnly,
- nPhaseOnly = Indices::nPhaseOnly,
- bothPhases = Indices::bothPhases
- };
- enum { // grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::Intersection Intersection;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
-public:
- /*!
- * \brief The sub-problem for the porous-medium subdomain
- *
- * \param timeManager The TimeManager which is used by the simulation
- * \param gridView The simulation's idea about physical space
- */
- TwoPTwoCSubProblem(TimeManager &timeManager, const GridView gridView)
- : ParentType(timeManager, gridView)
- {
- Scalar noDarcyX = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, NoDarcyX);
- std::vector<Scalar> positions0 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions0);
- std::vector<Scalar> positions1 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions1);
-
- using std::max;
- bBoxMin_[0] = max(positions0.front(),noDarcyX);
- bBoxMax_[0] = positions0.back();
-
- bBoxMin_[1] = positions1.front();
- bBoxMax_[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
-
- runUpDistanceX_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, RunUpDistanceX); // first part of the interface without coupling
- initializationTime_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, InitTime);
-
- refTemperature_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, RefTemperature);
- refPressure_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, RefPressure);
- initialSw_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, InitialSw);
-
- freqMassOutput_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqMassOutput);
-
- storageLastTimestep_ = Scalar(0);
- lastMassOutputTime_ = Scalar(0);
-
- outfile.open("storage.out");
- outfile << "Time;"
- << "TotalMassChange;"
- << "WaterMassChange;"
- << "WaterMass"
- << std::endl;
- }
-
- ~TwoPTwoCSubProblem()
- {
- outfile.close();
- }
-
- // functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc ImplicitProblem::bBoxMin()
- const GlobalPosition &bBoxMin() const
- { return bBoxMin_; }
-
- //! \copydoc ImplicitProblem::bBoxMax()
- const GlobalPosition &bBoxMax() const
- { return bBoxMax_; }
-
- /*!
- * \name Problem parameters
- */
- // \{
-
- /*!
- * \brief Returns the problem name
- *
- * This is used as a prefix for files generated by the simulation.
- */
- const std::string &name() const
- { return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NamePM); }
-
- /*!
- * \brief Called by the TimeManager in order to
- * initialize the problem.
- *
- * If you overload this method don't forget to call
- * ParentType::init()
- */
- void init()
- {
- ParentType::init();
-
- this->model().globalStorage(storageLastTimestep_);
- }
-
- /*!
- * \brief Returns the temperature \f$ K \f$
- *
- * \param globalPos The global position
- */
- Scalar temperatureAtPos(const GlobalPosition &globalPos) const
- {
- return refTemperature_;
- }
- // \}
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- /*!
- * \brief Specifies which kind of boundary condition should be
- * used for which equation on a given boundary segment
- *
- * \param values Stores the value of the boundary type
- * \param globalPos The global position
- */
- void boundaryTypesAtPos(BoundaryTypes &values,
- const GlobalPosition &globalPos) const
- {
- Scalar time = this->timeManager().time();
-
- values.setAllNeumann();
-
- if (onUpperBoundary_(globalPos)
- && (globalPos[0] > runUpDistanceX_ - eps_)
- && (time > initializationTime_))
- {
- values.setAllCouplingNeumann();
- }
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a Dirichlet
- * boundary segment
- *
- * \param values Stores the Dirichlet values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} ] \f$
- * \param globalPos The global position
- */
- void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- initial_(values, globalPos);
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a Neumann
- * boundary segment.
- *
- * \param values The Neumann values for the conservation equations in units of
- * \f$ [ \textnormal{unit of conserved quantity} / (m^{\textrm{dim}-1} \cdot s )] \f$
- * \param globalPos The global position
- */
- void neumannAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- values = Scalar(0);
- }
-
- // \}
-
- /*!
- * \name Volume terms
- */
- // \{
-
- /*!
- * \brief Returns the source term
- *
- * \param values Stores the source values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} / (m^\textrm{dim} \cdot s )] \f$
- * \param globalPos The global position
- */
- void sourceAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values = Scalar(0);
- }
-
- /*!
- * \brief Evaluates the initial values for a control volume
- *
- * \param values Stores the initial values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variables} ] \f$
- * \param globalPos The global position
- */
- void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- values = Scalar(0);
-
- initial_(values, globalPos);
- }
-
- /*!
- * \brief Return the initial phase state inside a control volume.
- *
- * \param vertex The vertex
- * \param vIdxGlobal The global index of the vertex
- * \param globalPos The global position
- */
- int initialPhasePresence(const Vertex &vertex,
- const int &vIdxGlobal,
- const GlobalPosition &globalPos) const
- {
- return bothPhases;
- }
-
- /*!
- * \brief Called by the time manager after the time integration to
- * do some post processing on the solution.
- */
- void postTimeStep()
- {
- // Calculate masses
- PrimaryVariables storage;
-
- this->model().globalStorage(storage);
- const Scalar time = this->timeManager().time() + this->timeManager().timeStepSize();
-
- // Write mass balance information for rank 0
- if (this->gridView().comm().rank() == 0)
- {
- if (this->timeManager().timeStepIndex() % freqMassOutput_ == 0
- || this->timeManager().episodeWillBeFinished())
- {
- PrimaryVariables storageChange(0.);
- storageChange = storageLastTimestep_ - storage;
-
- assert( (Dune::FloatCmp::ne<Scalar, Dune::FloatCmp::absolute>(time - lastMassOutputTime_, 0.0, 1.0e-30)) );
- storageChange /= (time - lastMassOutputTime_);
- // 2d: interface length has to be accounted for
- // in order to obtain kg/m²s
- storageChange /= (bBoxMax_[0]-bBoxMin_[0]);
-
- std::cout << "Time: " << time
- << " TotalMass: " << storage[contiTotalMassIdx]
- << " WaterMass: " << storage[contiWEqIdx]
- << " WaterMassChange: " << storageChange[contiWEqIdx]
- << std::endl;
- if (Dune::FloatCmp::ne<Scalar, Dune::FloatCmp::absolute>(this->timeManager().time(), 0.0, 1.0e-30))
- outfile << time << ";"
- << storageChange[contiTotalMassIdx] << ";"
- << storageChange[contiWEqIdx] << ";"
- << storage[contiWEqIdx]
- << std::endl;
-
- storageLastTimestep_ = storage;
- lastMassOutputTime_ = time;
- }
- }
- }
-
- // \}
-private:
- /*!
- * \brief Internal method for the initial condition
- * (reused for the dirichlet conditions!)
- */
- void initial_(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values[pressureIdx] = refPressure_
- + 1000.*this->gravity()[1]*(globalPos[1]-bBoxMax_[1]);
- values[switchIdx] = initialSw_;
- }
-
- bool onLeftBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] < bBoxMin_[0] + eps_; }
-
- bool onRightBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] > bBoxMax_[0] - eps_; }
-
- bool onLowerBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] < bBoxMin_[1] + eps_; }
-
- bool onUpperBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] > bBoxMax_[1] - eps_; }
-
- static constexpr Scalar eps_ = 1e-8;
- GlobalPosition bBoxMin_;
- GlobalPosition bBoxMax_;
-
- int freqMassOutput_;
-
- PrimaryVariables storageLastTimestep_;
- Scalar lastMassOutputTime_;
-
- Scalar refTemperature_;
- Scalar refPressure_;
- Scalar initialSw_;
-
- Scalar runUpDistanceX_;
- Scalar initializationTime_;
- std::ofstream outfile;
-};
-} //end namespace Dumux
-
-#endif // DUMUX_2P2C_SUBPROBLEM_HH
diff --git a/test/multidomain/2cstokes2p2c/CMakeLists.txt b/test/multidomain/2cstokes2p2c/CMakeLists.txt
deleted file mode 100644
index db793194a125c8c099a9cdc104154d614d704fe1..0000000000000000000000000000000000000000
--- a/test/multidomain/2cstokes2p2c/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-add_input_file_links()
-
-add_dumux_test(test_2cstokes2p2c test_2cstokes2p2c test_2cstokes2p2c.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cstokes2p2c -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cstokes2p2c_reference.input"
- --files ${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-ff-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu
- ${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-pm-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00007.vtu
- --zeroThreshold {"velocityN_0":1e-8,"velocityN_1":1e-8,"velocityW_0":1e-8,"velocityW_1":1e-8,"pc":1e2})
-#install sources
-install(FILES
-2cstokes2p2cproblem.hh
-2cstokes2p2cspatialparams.hh
-2p2csubproblem.hh
-stokes2csubproblem.hh
-test_2cstokes2p2c.cc
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/multidomain/2cstokes2p2c)
diff --git a/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh b/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh
deleted file mode 100644
index e6e61f16bad63d1601942a01b48cfd5d6b0f4c0a..0000000000000000000000000000000000000000
--- a/test/multidomain/2cstokes2p2c/stokes2csubproblem.hh
+++ /dev/null
@@ -1,456 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/**
- * \file
- * \brief Isothermal two-component stokes subproblem with air flowing
- * from the left to the right and coupling at the bottom.
- */
-#ifndef DUMUX_STOKES2C_SUBPROBLEM_HH
-#define DUMUX_STOKES2C_SUBPROBLEM_HH
-
-#include <dumux/freeflow/stokesnc/model.hh>
-#include <dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh>
-#include <dumux/multidomain/subdomainpropertydefaults.hh>
-
-namespace Dumux
-{
-
-template <class TypeTag>
-class Stokes2cSubProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(Stokes2cSubProblem,
- INHERITS_FROM(BoxStokesnc, SubDomain));
-
-// Set the problem property
-SET_TYPE_PROP(Stokes2cSubProblem, Problem, Stokes2cSubProblem<TypeTag>);
-
-// Use the local residual extended for the coupling the local residual extended for the coupling
-SET_TYPE_PROP(Stokes2cSubProblem, LocalResidual, StokesncCouplingLocalResidual<TypeTag>);
-
-// Used the fluid system from the coupled problem
-SET_TYPE_PROP(Stokes2cSubProblem,
- FluidSystem,
- typename GET_PROP_TYPE(typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag), FluidSystem));
-
-// Use formulation based on mass fractions
-SET_BOOL_PROP(Stokes2cSubProblem, UseMoles, false);
-
-// Disable gravity
-SET_BOOL_PROP(Stokes2cSubProblem, ProblemEnableGravity, false);
-
-// Switch inertia term off
-SET_BOOL_PROP(Stokes2cSubProblem, EnableNavierStokes, false);
-}
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCStokesTwoCModel
- * \brief Isothermal two-component stokes subproblem with air flowing
- * from the left to the right and coupling at the bottom.
- *
- * The Stokes subdomain is sized 0.25m times 0.25m. The boundary conditions
- * for the momentum balances are all set to Dirichlet, except on the right
- * boundary, where outflow conditions are set. The mass balance receives
- * outflow BCs, which are replaced in the localresidual by the sum
- * of the two momentum balances. On the right boundary Dirichlet BCs are
- * set for the pressure.
- *
- * This sub problem uses the \ref StokesncModel. It is part of the
- * 2cstokes2p2c model and is combined with the 2p2csubproblem for
- * the Darcy domain.
- */
-template <class TypeTag>
-class Stokes2cSubProblem : public StokesProblem<TypeTag>
-{
- typedef Stokes2cSubProblem<TypeTag> ThisType;
- typedef StokesProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum {
- // Number of equations and grid dimension
- numEq = GET_PROP_VALUE(TypeTag, NumEq),
- dim = GridView::dimension
- };
- enum { // equation indices
- massBalanceIdx = Indices::massBalanceIdx,
-
- momentumXIdx = Indices::momentumXIdx, //!< Index of the x-component of the momentum balance
- momentumYIdx = Indices::momentumYIdx, //!< Index of the y-component of the momentum balance
- momentumZIdx = Indices::momentumZIdx, //!< Index of the z-component of the momentum balance
-
- transportEqIdx = Indices::transportEqIdx //!< Index of the transport equation (massfraction)
- };
- enum { // primary variable indices
- pressureIdx = Indices::pressureIdx,
- velocityXIdx = Indices::velocityXIdx,
- velocityYIdx = Indices::velocityYIdx,
- velocityZIdx = Indices::velocityZIdx,
- massOrMoleFracIdx = Indices::massOrMoleFracIdx
- };
- enum { phaseIdx = Indices::phaseIdx };
- enum { numComponents = Indices::numComponents };
- enum {
- transportCompIdx = Indices::transportCompIdx, //!< water component index
- phaseCompIdx = Indices::phaseCompIdx //!< air component index
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::ctype CoordScalar;
- typedef typename GridView::Intersection Intersection;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<CoordScalar, dim> GlobalPosition;
-
-public:
- /*!
- * \brief The sub-problem for the Stokes subdomain
- *
- * \param timeManager The TimeManager which is used by the simulation
- * \param gridView The simulation's idea about physical space
- */
- Stokes2cSubProblem(TimeManager &timeManager, const GridView gridView)
- : ParentType(timeManager, gridView)
- {
- std::vector<Scalar> positions0 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions0);
- std::vector<Scalar> positions1 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions1);
-
- bBoxMin_[0] = positions0.front();
- bBoxMax_[0] = positions0.back();
- bBoxMin_[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
- bBoxMax_[1] = positions1.back();
- runUpDistanceX_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, RunUpDistanceX); // first part of the interface without coupling
-
- refVelocity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefVelocity);
- refPressure_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefPressure);
- refMassfrac_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefMassfrac);
- refTemperature_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefTemperature);
-
- sinusVAmplitude_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusVelAmplitude);
- sinusVPeriod_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusVelPeriod);
- sinusPAmplitude_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusPressureAmplitude);
- sinusPPeriod_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusPressurePeriod);
- sinusXAmplitude_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusConcentrationAmplitude);
- sinusXPeriod_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusConcentrationPeriod);
- sinusTAmplitude_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusTemperatureAmplitude);
- sinusTPeriod_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusTemperaturePeriod);
-
- initializationTime_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, InitTime);
- }
-
- // functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc ImplicitProblem::bBoxMin()
- const GlobalPosition &bBoxMin() const
- { return bBoxMin_; }
-
- //! \copydoc ImplicitProblem::bBoxMax()
- const GlobalPosition &bBoxMax() const
- { return bBoxMax_; }
-
- /*!
- * \name Problem parameters
- */
- // \{
-
- /*!
- * \brief Returns the problem name
- *
- * This is used as a prefix for files generated by the simulation.
- */
- const std::string &name() const
- { return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NameFF); }
-
- /*!
- * \brief Returns the temperature within the domain.
- *
- * This problem assumes a constant temperature, which can
- * be set in the parameter file.
- */
- Scalar temperature() const
- {
- return refTemperature_;
- };
-
- // \}
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- /*!
- * \brief Specifies which kind of boundary condition should be
- * used for which equation on a given boundary segment
- *
- * \param values Stores the value of the boundary type
- * \param globalPos The global position
- */
- void boundaryTypesAtPos(BoundaryTypes &values,
- const GlobalPosition &globalPos) const
- {
- const Scalar time = this->timeManager().time();
-
- values.setAllDirichlet();
-
- if (onUpperBoundary_(globalPos))
- values.setNeumann(transportEqIdx);
-
- // Left inflow boundaries should be Neumann, otherwise the
- // evaporative fluxes are much more grid dependent
- if (onLeftBoundary_(globalPos))
- {
- values.setNeumann(transportEqIdx);
-
- if (onUpperBoundary_(globalPos)) // corner point
- values.setAllDirichlet();
- }
-
- if (onRightBoundary_(globalPos))
- {
- values.setAllOutflow();
-
- if (onUpperBoundary_(globalPos)) // corner point
- values.setAllDirichlet();
- }
-
- if (onLowerBoundary_(globalPos))
- {
- values.setAllDirichlet();
- values.setNeumann(transportEqIdx);
-
- if (globalPos[0] > runUpDistanceX_-eps_ && time > initializationTime_)
- {
- values.setAllCouplingDirichlet();
- values.setCouplingNeumann(momentumXIdx);
- values.setCouplingNeumann(momentumYIdx);
- }
- }
-
- // the mass balance has to be of type outflow
- // it does not get a coupling condition, since pn is a condition for stokes
- values.setOutflow(massBalanceIdx);
-
- // set pressure at one point, do NOT specify this
- // if the Darcy domain has a Dirichlet condition for pressure
- if (onRightBoundary_(globalPos))
- {
- if (time > initializationTime_)
- values.setDirichlet(pressureIdx);
- else
- if (!onLowerBoundary_(globalPos) && !onUpperBoundary_(globalPos))
- values.setDirichlet(pressureIdx);
- }
- }
-
- /*!
- * \brief Evaluates the boundary conditions for a Dirichlet
- * boundary segment
- *
- * \param values Stores the Dirichlet values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} ] \f$
- * \param globalPos The global position
- */
- void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- FluidState fluidState;
- updateFluidStateForBC_(fluidState);
-
- const Scalar density =
- FluidSystem::density(fluidState, phaseIdx);
-
- values[velocityXIdx] = xVelocity_(globalPos);
- values[velocityYIdx] = 0.0;
- values[pressureIdx] = refPressure()
- + density*this->gravity()[1]*(globalPos[1] - bBoxMin_[1]);
- values[massOrMoleFracIdx] = refMassfrac();
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a Neumann
- * boundary segment.
- *
- * \param values The Neumann values for the conservation equations in units of
- * \f$ [ \textnormal{unit of conserved quantity} / (m^{\textrm{dim}-1} \cdot s )] \f$
- * \param globalPos The global position
- */
- void neumannAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- values = 0.;
-
- FluidState fluidState;
- updateFluidStateForBC_(fluidState);
-
- const Scalar density =
- FluidSystem::density(fluidState, phaseIdx);
- const Scalar xVelocity = xVelocity_(globalPos);
-
- if (onLeftBoundary_(globalPos)
- && globalPos[1] > bBoxMin_[1] - eps_ && globalPos[1] < bBoxMax_[1] + eps_)
- {
- // rho*v*X at inflow
- values[transportEqIdx] = -xVelocity * density * refMassfrac();
- }
- }
-
- // \}
-
- /*!
- * \name Volume terms
- */
- // \{
-
- /*!
- * \brief Returns the source term
- *
- * \param values Stores the source values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} / (m^\textrm{dim} \cdot s )] \f$
- * \param globalPos The global position
- */
- void sourceAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- // The source term of the mass balance has to be chosen as
- // div (q_momentum) in the problem file
- values = Scalar(0);
- }
-
- /*!
- * \brief Evaluate the initial value for a control volume.
- *
- * \param values Stores the initial values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variables} ] \f$
- * \param globalPos The global position
- */
- void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
- {
- initial_(values, globalPos);
- }
- // \}
-
- //! \brief Returns the reference velocity.
- const Scalar refVelocity() const
- { return refVelocity_ + variation_(sinusVAmplitude_, sinusVPeriod_); }
-
- //! \brief Returns the reference pressure.
- const Scalar refPressure() const
- { return refPressure_ + variation_(sinusPAmplitude_, sinusPPeriod_); }
-
- //! \brief Returns the reference mass fraction.
- const Scalar refMassfrac() const
- { return refMassfrac_ + variation_(sinusXAmplitude_, sinusXPeriod_); }
-
- //! \brief Returns the reference temperature.
- const Scalar refTemperature() const
- { return refTemperature_+ variation_(sinusTAmplitude_, sinusTPeriod_); }
-
-private:
- /*!
- * \brief Internal method for the initial condition
- * (reused for the dirichlet conditions!)
- */
- void initial_(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- FluidState fluidState;
- updateFluidStateForBC_(fluidState);
-
- const Scalar density =
- FluidSystem::density(fluidState, phaseIdx);
-
- values[velocityXIdx] = xVelocity_(globalPos);
- values[velocityYIdx] = 0.;
-
- values[pressureIdx] = refPressure()
- + density*this->gravity()[1]*(globalPos[1] - bBoxMin_[1]);
- values[massOrMoleFracIdx] = refMassfrac();
- }
-
- //! \brief set the profile of the inflow velocity (horizontal direction)
- const Scalar xVelocity_(const GlobalPosition &globalPos) const
- {
- const Scalar vmax = refVelocity();
- return 4*vmax*(globalPos[1] - bBoxMin_[1])*(bBoxMax_[1] - globalPos[1])
- / (height_()*height_()) + 0.00134;
- }
-
- //! \brief updates the fluid state to obtain required quantities for IC/BC
- void updateFluidStateForBC_(FluidState& fluidState) const
- {
- fluidState.setTemperature(refTemperature());
- fluidState.setPressure(phaseIdx, refPressure());
- // setMassFraction() has only to be called 1-numComponents times
- fluidState.setMassFraction(phaseIdx, transportCompIdx, refMassfrac());
- }
-
- // can be used for the variation of a boundary condition
- const Scalar variation_(const Scalar amplitude, const Scalar period) const
- { return sin(2*M_PI*this->timeManager().time()/period) * amplitude; }
-
- bool onLeftBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] < bBoxMin_[0] + eps_; }
-
- bool onRightBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] > bBoxMax_[0] - eps_; }
-
- bool onLowerBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] < bBoxMin_[1] + eps_; }
-
- bool onUpperBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] > bBoxMax_[1] - eps_; }
-
- // the height of the free-flow domain
- const Scalar height_() const
- { return bBoxMax_[1] - bBoxMin_[1]; }
-
- static constexpr Scalar eps_ = 1e-8;
- GlobalPosition bBoxMin_;
- GlobalPosition bBoxMax_;
-
- Scalar refVelocity_;
- Scalar refPressure_;
- Scalar refMassfrac_;
- Scalar refTemperature_;
-
- Scalar sinusVAmplitude_;
- Scalar sinusVPeriod_;
- Scalar sinusPAmplitude_;
- Scalar sinusPPeriod_;
- Scalar sinusXAmplitude_;
- Scalar sinusXPeriod_;
- Scalar sinusTAmplitude_;
- Scalar sinusTPeriod_;
-
- Scalar runUpDistanceX_;
- Scalar initializationTime_;
-};
-} //end namespace Dumux
-
-#endif // DUMUX_STOKES2C_SUBPROBLEM_HH
diff --git a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.cc b/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.cc
deleted file mode 100644
index e9deb26bca2b27a5db4f9d3d7da4ba6a5c6f8144..0000000000000000000000000000000000000000
--- a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.cc
+++ /dev/null
@@ -1,88 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Test for the coupled isothermal two-component Stokes and
- * isothermal two-phase two-component Darcy model
- */
-
-#include <config.h>
-#include <iostream>
-
-#include <dune/common/parallel/mpihelper.hh>
-
-#if HAVE_DUNE_MULTIDOMAIN
-
-#include <dumux/common/start.hh>
-
-#include "2cstokes2p2cproblem.hh"
-
-/*!
- * \brief Print a usage string for simulations.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void printUsage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of optional options for this program is:\n"
- "[BoundaryLayer]\n"
- "Model Number/ID of the used model\n"
- "Offset Virtual run-up distance for BL models [m]\n"
- "ConstThickness Constant BL thickness (model 1) [m]\n"
- "YPlus Conversion value (model 4-6) [-]\n"
- "RoughnessLength Characteristic roughness length (model 6)\n"
- "\n"
- "[MassTransferModel]\n"
- "Coefficient Coeffient used for the exponential law (model 1) [-]\n"
- "CharPoreRadius Characteristic pore radius for Schluender model (model 2+4) [m]\n"
- "\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
-#if (HAVE_SUPERLU || HAVE_PARDISO)
- typedef TTAG(TwoCStokesTwoPTwoCTestProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, printUsage);
-#else
-#warning "You need to have SuperLU or Pardiso installed to run this test."
- std::cerr << "You need to have SuperLU or Pardiso installed to run this test\n";
- return 77;
-#endif
-}
-
-#else
-int main(int argc, char** argv)
-{
-#warning You need to have dune-multidomain installed to run this test
- std::cerr << "You need to have dune-multidomain installed to run this test\n";
- return 77;
-}
-#endif
diff --git a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.input b/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.input
deleted file mode 100644
index 6f611d5885d316d2a434f7983fada2f2d837854a..0000000000000000000000000000000000000000
--- a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c.input
+++ /dev/null
@@ -1,74 +0,0 @@
-[TimeManager]
-DtInitial = 5e-1 # [s]
-MaxTimeStepSize = 360 # [s]
-InitTime = 0 # [s] Initialization time without coupling
-TEnd = 7200 # [s]
-EpisodeLength = 3600 # [s]
-
-[Grid]
-Cells0 = 30
-Cells1 = 30 30
-Grading0 = 1.0
-Grading1 = -1.2 1.2
-Positions0 = 0.0 0.25
-Positions1 = 0.0 0.25 0.5
-
-RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
-NoDarcyX = 0.0 # [m] Horizontal position without PM below
-InterfacePosY = 0.25 # [m] Vertical position of coupling interface
-
-[Output]
-NameFF = stokes2c
-NamePM = 2p2c
-#Frequency of restart file, flux and VTK output
-FreqRestart = 1000 # how often restart files are written out
-FreqOutput = 50 # frequency of VTK output
-FreqMassOutput = 2 # frequency of mass and evaporation rate output (Darcy)
-
-[Stokes]
-StabilizationAlpha = -1.0
-
-[FreeFlow]
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-SinusVelAmplitude = 0.0 # [m/s]
-SinusVelPeriod = 3600 # [s]
-SinusPressureAmplitude = 0.0 # [Pa]
-SinusPressurePeriod = 3600 # [s]
-SinusConcentrationAmplitude = 0.0 # [-]
-SinusConcentrationPeriod = 3600 # [s]
-SinusTemperatureAmplitude = 0.0 # [K]
-SinusTemperaturePeriod = 3600 # [s]
-
-[BoundaryLayer]
-Model = 0
-
-[MassTransfer]
-Model = 0
-
-[PorousMedium]
-RefPressure = 1e5 # [Pa]
-RefTemperature = 298.15 # [K]
-InitialSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 6.9 # [-]
-LambdaSolid = 5.3 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
diff --git a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c_reference.input b/test/multidomain/2cstokes2p2c/test_2cstokes2p2c_reference.input
deleted file mode 100644
index 7ecf5e7758a1d5427a1fff0562765d9a808c308a..0000000000000000000000000000000000000000
--- a/test/multidomain/2cstokes2p2c/test_2cstokes2p2c_reference.input
+++ /dev/null
@@ -1,74 +0,0 @@
-[TimeManager]
-DtInitial = 5e-1 # [s]
-MaxTimeStepSize = 240 # [s]
-InitTime = 0 # [s] Initialization time without coupling
-TEnd = 7200 # [s]
-EpisodeLength = 3600 # [s]
-
-[Grid]
-Cells0 = 10
-Cells1 = 12 12
-Grading0 = 1.0
-Grading1 = -1.2 1.2
-Positions0 = 0.0 0.25
-Positions1 = 0.0 0.25 0.5
-
-RunUpDistanceX = 0.0 # [m] Horizontal position without coupling to PM
-NoDarcyX = 0.0 # [m] Horizontal position without PM below
-InterfacePosY = 0.25 # [m] Vertical position of coupling interface
-
-[Output]
-NameFF = stokes2c
-NamePM = 2p2c
-#Frequency of restart file, flux and VTK output
-FreqRestart = 1000 # how often restart files are written out
-FreqOutput = 10 # frequency of VTK output
-FreqMassOutput = 2 # frequency of mass and evaporation rate output (Darcy)
-
-[Stokes]
-StabilizationAlpha = -1.0
-
-[FreeFlow]
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-SinusVelAmplitude = 0.0 # [m/s]
-SinusVelPeriod = 3600 # [s]
-SinusPressureAmplitude = 0.0 # [Pa]
-SinusPressurePeriod = 3600 # [s]
-SinusConcentrationAmplitude = 0.0 # [-]
-SinusConcentrationPeriod = 3600 # [s]
-SinusTemperatureAmplitude = 0.0 # [K]
-SinusTemperaturePeriod = 3600 # [s]
-
-[BoundaryLayer]
-Model = 0
-
-[MassTransfer]
-Model = 0
-
-[PorousMedium]
-RefPressure = 1e5 # [Pa]
-RefTemperature = 298.15 # [K]
-InitialSw = 0.98 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 6.9 # [-]
-LambdaSolid = 5.26 # [W/(m*K)]
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
diff --git a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh b/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh
deleted file mode 100644
index 72d43c90281fb8977c3983e698e37c1cdee0ac5b..0000000000000000000000000000000000000000
--- a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh
+++ /dev/null
@@ -1,221 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/**
- * \file
- * \brief The problem which couples an isothermal two-component ZeroEq
- * and an isothermal two-phase two-component Darcy model.
- */
-#ifndef DUMUX_TWOCZEROEQTWOPTWOCPROBLEM_HH
-#define DUMUX_TWOCZEROEQTWOPTWOCPROBLEM_HH
-
-#include <dune/grid/multidomaingrid.hh>
-#include <dune/grid/common/gridinfo.hh>
-
-#include <dumux/material/fluidsystems/h2oair.hh>
-#include <dumux/multidomain/2cstokes2p2c/localoperator.hh>
-#include <dumux/multidomain/2cstokes2p2c/problem.hh>
-#include <dumux/multidomain/2cstokes2p2c/propertydefaults.hh>
-
-#include "2czeroeq2p2cspatialparameters.hh"
-#include "zeroeq2csubproblem.hh"
-#include "2p2csubproblem.hh"
-
-namespace Dumux
-{
-template <class TypeTag>
-class TwoCZeroEqTwoPTwoCTestProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(TwoCZeroEqTwoPTwoCTestProblem, INHERITS_FROM(TwoCStokesTwoPTwoC));
-
-// Set the grid type
-SET_TYPE_PROP(TwoCZeroEqTwoPTwoCTestProblem, Grid, Dune::YaspGrid<2, Dune::TensorProductCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
-
-// Set the global problem
-SET_TYPE_PROP(TwoCZeroEqTwoPTwoCTestProblem, Problem, TwoCZeroEqTwoPTwoCTestProblem<TypeTag>);
-
-// Set the two sub-problems of the global problem
-SET_TYPE_PROP(TwoCZeroEqTwoPTwoCTestProblem, SubDomain1TypeTag, TTAG(ZeroEq2cSubProblem));
-SET_TYPE_PROP(TwoCZeroEqTwoPTwoCTestProblem, SubDomain2TypeTag, TTAG(TwoPTwoCSubProblem));
-
-// Set the local coupling operator
-SET_TYPE_PROP(TwoCZeroEqTwoPTwoCTestProblem, MultiDomainCouplingLocalOperator,
- TwoCStokesTwoPTwoCLocalOperator<TypeTag>);
-
-// Set the global problem in the context of the two sub-problems
-SET_TYPE_PROP(ZeroEq2cSubProblem, MultiDomainTypeTag, TTAG(TwoCZeroEqTwoPTwoCTestProblem));
-SET_TYPE_PROP(TwoPTwoCSubProblem, MultiDomainTypeTag, TTAG(TwoCZeroEqTwoPTwoCTestProblem));
-
-// Set the other sub-problem for each of the two sub-problems
-SET_TYPE_PROP(ZeroEq2cSubProblem, OtherSubDomainTypeTag, TTAG(TwoPTwoCSubProblem));
-SET_TYPE_PROP(TwoPTwoCSubProblem, OtherSubDomainTypeTag, TTAG(ZeroEq2cSubProblem));
-
-// Set the same spatial parameters for both sub-problems
-SET_TYPE_PROP(TwoPTwoCSubProblem, SpatialParams, TwoCZeroEqTwoPTwoCSpatialParams<TypeTag>);
-
-// Set the fluid system to use simple relations (last argument)
-SET_TYPE_PROP(TwoCZeroEqTwoPTwoCTestProblem, FluidSystem,
- FluidSystems::H2OAir<typename GET_PROP_TYPE(TypeTag, Scalar)>);
-
-// If SuperLU is not available, the UMFPack solver is used:
-#ifdef HAVE_SUPERLU
-SET_TYPE_PROP(TwoCZeroEqTwoPTwoCTestProblem, LinearSolver, SuperLUBackend<TypeTag>);
-#else
-SET_TYPE_PROP(TwoCZeroEqTwoPTwoCTestProblem, LinearSolver, UMFPackBackend<TypeTag>);
-#endif
-}
-
-
-/*!
- * \ingroup TwoPTwoCZeroEqTwoCModel
- * \ingroup ImplicitTestProblems
- * \brief The problem which couples an isothermal two-component ZeroEq (zeroeq2c)
- * and an isothermal two-phase two-component Darcy model (2p2c).
- *
- * It uses the multidomain problem and specifies parameters for the two submodels.
- * The initial and boundary conditions of the submodels are specified in the two subproblems,
- * 2p2csubproblem.hh and zeroeq2csubproblem.hh, which are accessible via the coupled problem.
- */
-template <class TypeTag = TTAG(TwoCZeroEqTwoPTwoCTestProblem) >
-class TwoCZeroEqTwoPTwoCTestProblem : public TwoCStokesTwoPTwoCProblem<TypeTag>
-{
- typedef TwoCStokesTwoPTwoCProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridCreator) GridCreator;
- typedef typename GET_PROP_TYPE(TypeTag, MultiDomainGrid) MDGrid;
- typedef typename MDGrid::LeafGridView MDGridView;
- enum { dim = MDGridView::dimension };
- typedef Dune::FieldVector<Scalar, dim> GlobalPosition;
-
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
-public:
- /*!
- * \brief The problem for the coupling of Stokes and Darcy flow
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- */
- template<class GridView>
- TwoCZeroEqTwoPTwoCTestProblem(TimeManager &timeManager,
- GridView gridView)
- : ParentType(timeManager, gridView)
- {
- dtInit_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, DtInitial);
- episodeLength_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeManager, EpisodeLength);
-
- // define location of the interface
- interfacePosY_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
- noDarcyX_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, NoDarcyX);
-
- // define output options
- freqRestart_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqRestart);
- freqOutput_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqOutput);
-
- zeroeq2c_ = this->sdID1();
- twoPtwoC_ = this->sdID2();
-
- initializeGrid();
-
- // initialize the tables of the fluid system
- FluidSystem::init(/*tempMin=*/273.15, /*tempMax=*/323.15, /*numTemp=*/50,
- /*pMin=*/5e4, /*pMax=*/1.5e5, /*numP=*/100);
-
- this->timeManager().startNextEpisode(episodeLength_);
- }
-
- /*!
- * \brief Initialization of the grids
- *
- * This function splits the multidomain grid in the two
- * individual subdomain grids and takes care of parallelization.
- */
- void initializeGrid()
- {
- MDGrid& mdGrid = this->mdGrid();
- mdGrid.startSubDomainMarking();
-
- // subdivide grid in two subdomains
- for (const auto& element : elements(mdGrid.leafGridView(), Dune::Partitions::interior))
- {
- GlobalPosition globalPos = element.geometry().center();
-
- if (globalPos[1] > interfacePosY_ - eps_)
- mdGrid.addToSubDomain(zeroeq2c_,element);
- else
- if(globalPos[0] > noDarcyX_ - eps_)
- mdGrid.addToSubDomain(twoPtwoC_,element);
- }
- mdGrid.preUpdateSubDomains();
- mdGrid.updateSubDomains();
- mdGrid.postUpdateSubDomains();
-
- gridinfo(this->sdGrid1());
- gridinfo(this->sdGrid2());
- }
-
- /*!
- * \brief Called when the end of an simulation episode is reached.
- *
- * Typically a new episode should be started in this method.
- */
- void episodeEnd()
- { this->timeManager().startNextEpisode(episodeLength_); }
-
- //! \copydoc ImplicitProblem::shouldWriteRestartFile()
- bool shouldWriteRestartFile() const
- {
- return ( ((this->timeManager().timeStepIndex() > 0)
- && (this->timeManager().timeStepIndex() % freqRestart_ == 0))
- // also write a restart file at the end of each episode
- || this->timeManager().episodeWillBeFinished()
- || this->timeManager().willBeFinished());
- }
-
- //! \copydoc ImplicitProblem::shouldWriteOutput()
- bool shouldWriteOutput() const
- {
- return (this->timeManager().timeStepIndex() % freqOutput_ == 0
- || this->timeManager().episodeWillBeFinished()
- || this->timeManager().willBeFinished());
- }
-
-private:
- typename MDGrid::SubDomainType zeroeq2c_;
- typename MDGrid::SubDomainType twoPtwoC_;
-
- unsigned freqRestart_;
- unsigned freqOutput_;
-
- Scalar interfacePosY_;
- Scalar noDarcyX_;
- Scalar episodeLength_;
- Scalar initializationTime_;
- Scalar dtInit_;
-
- static constexpr Scalar eps_ = 1e-8;
-};
-
-} // namespace Dumux
-
-#endif // DUMUX_TWOCZEROEQTWOPTWOCPROBLEM_HH
diff --git a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cspatialparameters.hh b/test/multidomain/2czeroeq2p2c/2czeroeq2p2cspatialparameters.hh
deleted file mode 100644
index d17a33b127a74927f559101eaddaf7108413fb69..0000000000000000000000000000000000000000
--- a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cspatialparameters.hh
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Spatial parameters for the
- * coupling of an isothermal two-component ZeroEq
- * and an isothermal two-phase two-component Darcy model.
- */
-
-#ifndef DUMUX_TWOCZEROEQTWOPTWOCSPATIALPARAMS_HH
-#define DUMUX_TWOCZEROEQTWOPTWOCSPATIALPARAMS_HH
-
-#include <dumux/material/spatialparams/implicit.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-
-namespace Dumux
-{
-
-//forward declaration
-template<class TypeTag>
-class TwoCZeroEqTwoPTwoCSpatialParams;
-
-namespace Properties
-{
-// The spatial parameters TypeTag
-NEW_TYPE_TAG(TwoCZeroEqTwoPTwoCSpatialParams);
-
-// Set the spatial parameters
-SET_TYPE_PROP(TwoCZeroEqTwoPTwoCSpatialParams, SpatialParams, TwoCZeroEqTwoPTwoCSpatialParams<TypeTag>);
-
-// Set the material law parameterized by absolute saturations
-SET_TYPE_PROP(TwoCZeroEqTwoPTwoCSpatialParams,
- MaterialLaw,
- EffToAbsLaw<RegularizedVanGenuchten<typename GET_PROP_TYPE(TypeTag, Scalar)>>);
-// EffToAbsLaw<RegularizedBrooksCorey<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
-}
-
-
-/*!
- * \ingroup TwoPTwoCZeroEqTwoCModel
- * \ingroup ImplicitTestProblems
- * \brief Definition of the spatial parameters for
- * the coupling of an isothermal two-component ZeroEq
- * and an isothermal two-phase two-component Darcy model.
- */
-template<class TypeTag>
-class TwoCZeroEqTwoPTwoCSpatialParams : public ImplicitSpatialParams<TypeTag>
-{
- typedef ImplicitSpatialParams<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GridView::ctype CoordScalar;
-
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
- typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
- typedef typename MaterialLaw::Params MaterialLawParams;
-
-public:
- /*!
- * \brief Spatial parameters for the
- * coupling of an isothermal two-component ZeroEq
- * and an isothermal two-phase two-component Darcy model.
- *
- * \param gridView The GridView which is used by the problem
- */
- TwoCZeroEqTwoPTwoCSpatialParams(const GridView& gridView)
- : ParentType(gridView)
- {
- permeability_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Permeability);
- porosity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Porosity);
- alphaBJ_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, AlphaBJ);
-
- spatialParams_.setSwr(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Swr));
- spatialParams_.setSnr(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Snr));
- spatialParams_.setVgAlpha(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, VgAlpha));
- spatialParams_.setVgn(GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, VgN));
- }
-
- /*!
- * \brief Returns the intrinsic permeability tensor \f$[m^2]\f$
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- const Scalar intrinsicPermeability(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return permeability_;
- }
-
- /*!
- * \brief Returns the porosity \f$[-]\f$
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- Scalar porosity(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return porosity_;
- }
-
- /*!
- * \brief Returns the parameter object for the material law
- *
- * \param element The finite element
- * \param fvGeometry The finite volume geometry of the element
- * \param scvIdx The local index of the sub-control volume
- */
- const MaterialLawParams& materialLawParams(const Element &element,
- const FVElementGeometry &fvGeometry,
- const int scvIdx) const
- {
- return spatialParams_;
- }
-
- /*!
- * \brief Evaluate the Beavers-Joseph coefficient at given position
- *
- * \param globalPos The global position
- *
- * \return Beavers-Joseph coefficient
- */
- Scalar beaversJosephCoeffAtPos(const GlobalPosition &globalPos) const
- {
- return alphaBJ_;
- }
-
-private:
- Scalar permeability_;
- Scalar porosity_;
- Scalar alphaBJ_;
- MaterialLawParams spatialParams_;
-};
-
-} // end namespace Dumux
-
-#endif // DUMUX_TWOCZEROEQTWOPTWOCSPATIALPARAMS_HH
diff --git a/test/multidomain/2czeroeq2p2c/2p2csubproblem.hh b/test/multidomain/2czeroeq2p2c/2p2csubproblem.hh
deleted file mode 100644
index 0a2dc0111ccb9805f9ffea4db7c94196a5044f97..0000000000000000000000000000000000000000
--- a/test/multidomain/2czeroeq2p2c/2p2csubproblem.hh
+++ /dev/null
@@ -1,374 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Isothermal two-phase two-component porous-medium subproblem
- * with coupling at the top boundary.
- */
-#ifndef DUMUX_TWOPTWOC_SUBPROBLEM_HH
-#define DUMUX_TWOPTWOC_SUBPROBLEM_HH
-
-#include <dumux/porousmediumflow/2p2c/implicit/indices.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/multidomain/subdomainpropertydefaults.hh>
-#include <dumux/multidomain/localoperator.hh>
-#include <dumux/multidomain/2cstokes2p2c/2p2ccouplinglocalresidual.hh>
-
-#include "2czeroeq2p2cspatialparameters.hh"
-
-namespace Dumux
-{
-template <class TypeTag>
-class TwoPTwoCSubProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(TwoPTwoCSubProblem,
- INHERITS_FROM(BoxTwoPTwoC, SubDomain, TwoCZeroEqTwoPTwoCSpatialParams));
-
-// Set the problem property
-SET_TYPE_PROP(TwoPTwoCSubProblem, Problem, TwoPTwoCSubProblem<TTAG(TwoPTwoCSubProblem)>);
-
-// Set the local residual extended for the coupling
-SET_TYPE_PROP(TwoPTwoCSubProblem, LocalResidual, TwoPTwoCCouplingLocalResidual<TypeTag>);
-
-// Set pn and Sw as primary variables
-SET_INT_PROP(TwoPTwoCSubProblem, Formulation, TwoPTwoCFormulation::pnsw);
-
-// Set the gas component balance (air) to be replaced by the total mass balance
-SET_INT_PROP(TwoPTwoCSubProblem, ReplaceCompEqIdx, GET_PROP_TYPE(TypeTag, Indices)::contiNEqIdx);
-
-// Used the fluid system from the coupled problem
-SET_TYPE_PROP(TwoPTwoCSubProblem,
- FluidSystem,
- typename GET_PROP_TYPE(typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag), FluidSystem));
-
-// Disable use of mole formulation
-SET_BOOL_PROP(TwoPTwoCSubProblem, UseMoles, false);
-
-// Enable velocity output
-SET_BOOL_PROP(TwoPTwoCSubProblem, VtkAddVelocity, true);
-
-// Enable gravity
-SET_BOOL_PROP(TwoPTwoCSubProblem, ProblemEnableGravity, true);
-}
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCZeroEqTwoCModel
- * \brief Isothermal two-phase two-component porous-medium subproblem
- * with coupling at the top boundary.
- *
- * The porous-medium subdomain is sized 0.25m times 0.25m. The boundary conditions
- * are Neumann no-flow everywhere, except at the top, where coupling conditions
- * are applied to all balance equations. They handle the exchange to the free-flow
- * subdomain.
- *
- * This subproblem uses the \ref TwoPTwoCModel. It is part of a multidomain model and
- * combined with the zeroeq2csubproblem for the free flow domain.
- */
-template <class TypeTag = TTAG(TwoPTwoCSubProblem) >
-class TwoPTwoCSubProblem : public ImplicitPorousMediaProblem<TypeTag>
-{
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-
- typedef TwoPTwoCSubProblem<TypeTag> ThisType;
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
-
- // copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum { numEq = GET_PROP_VALUE(TypeTag, NumEq)};
- enum { // the equation indices
- contiTotalMassIdx = Indices::contiNEqIdx,
- contiWEqIdx = Indices::contiWEqIdx,
- };
- enum { // the indices of the primary variables
- pressureIdx = Indices::pressureIdx,
- switchIdx = Indices::switchIdx,
- };
- enum { // the indices for the phase presence
- wPhaseOnly = Indices::wPhaseOnly,
- nPhaseOnly = Indices::nPhaseOnly,
- bothPhases = Indices::bothPhases
- };
- enum { // grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::Intersection Intersection;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
-public:
- /*!
- * \brief The sub-problem for the porous-medium subdomain
- *
- * \param timeManager The TimeManager which is used by the simulation
- * \param gridView The simulation's idea about physical space
- */
- TwoPTwoCSubProblem(TimeManager &timeManager, const GridView gridView)
- : ParentType(timeManager, gridView)
- {
- Scalar noDarcyX = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, NoDarcyX);
- std::vector<Scalar> positions0 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions0);
- std::vector<Scalar> positions1 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions1);
-
- using std::max;
- bBoxMin_[0] = max(positions0.front(),noDarcyX);
- bBoxMax_[0] = positions0.back();
- bBoxMin_[1] = positions1.front();
- bBoxMax_[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
- runUpDistanceX_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, RunUpDistanceX); // first part of the interface without coupling
-
- refTemperature_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, RefTemperaturePM);
- refPressure_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, RefPressurePM);
- refSw_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, PorousMedium, RefSw);
-
- freqMassOutput_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Output, FreqMassOutput);
-
- storageLastTimestep_ = Scalar(0);
- lastMassOutputTime_ = Scalar(0);
-
- outfile.open("storage.out");
- outfile << "Time;"
- << "TotalMassChange;"
- << "WaterMassChange;"
- << "WaterMass"
- << std::endl;
- }
-
- //! \brief The destructor
- ~TwoPTwoCSubProblem()
- {
- outfile.close();
- }
-
- // functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc ImplicitProblem::bBoxMin()
- const GlobalPosition &bBoxMin() const
- { return bBoxMin_; }
-
- //! \copydoc ImplicitProblem::bBoxMax()
- const GlobalPosition &bBoxMax() const
- { return bBoxMax_; }
-
- /*!
- * \name Problem parameters
- */
- // \{
-
- /*!
- * \brief Returns the problem name
- *
- * This is used as a prefix for files generated by the simulation.
- */
- const std::string &name() const
- { return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NamePM); }
-
- /*!
- * \brief Called by the TimeManager in order to
- * initialize the problem.
- *
- * If you overload this method don't forget to call
- * ParentType::init()
- */
- void init()
- {
- ParentType::init();
- this->model().globalStorage(storageLastTimestep_);
- }
-
- /*!
- * \brief Returns the temperature \f$ K \f$
- *
- * \param globalPos The global position
- */
- Scalar temperatureAtPos(const GlobalPosition &globalPos) const
- {
- return refTemperature_;
- }
-
- // \}
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- //! \copydoc ImplicitProblem::boundaryTypesAtPos()
- void boundaryTypesAtPos(BoundaryTypes &values,
- const GlobalPosition &globalPos) const
- {
- values.setAllNeumann();
-
- if (onUpperBoundary_(globalPos)
- && (globalPos[0] > runUpDistanceX_ - eps_))
- {
- values.setAllCouplingNeumann();
- }
- }
-
- //! \copydoc ImplicitProblem::dirichletAtPos()
- void dirichletAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- initial_(values, globalPos);
- }
-
- //! \copydoc ImplicitProblem::neumannAtPos()
- void neumannAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values = 0.;
- }
-
- // \}
-
- /*!
- * \name Volume terms
- */
- // \{
-
- //! \copydoc ImplicitProblem::sourceAtPos()
- void sourceAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values = Scalar(0);
- }
-
- //! \copydoc ImplicitProblem::initialAtPos()
- void initialAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- initial_(values, globalPos);
- }
-
- // \}
-
- /*!
- * \brief Return the initial phase state inside a control volume.
- *
- * \param vertex The vertex
- * \param vIdxGlobal The global index of the vertex
- * \param globalPos The global position
- */
- int initialPhasePresence(const Vertex &vertex,
- const int &vIdxGlobal,
- const GlobalPosition &globalPos) const
- {
- return bothPhases;
- }
-
- /*!
- * \brief Called by the time manager after the time integration to
- * do some post processing on the solution.
- */
- void postTimeStep()
- {
- // Calculate masses
- PrimaryVariables storage;
-
- this->model().globalStorage(storage);
- const Scalar time = this->timeManager().time() + this->timeManager().timeStepSize();
-
- // Write mass balance information for rank 0
- if (this->gridView().comm().rank() == 0)
- {
- if (this->timeManager().timeStepIndex() % freqMassOutput_ == 0
- || this->timeManager().episodeWillBeFinished())
- {
- PrimaryVariables storageChange(0.);
- storageChange = storageLastTimestep_ - storage;
-
- assert(time - lastMassOutputTime_ != 0);
- storageChange /= (time - lastMassOutputTime_);
- // 2d: interface length has to be accounted for
- // in order to obtain kg/m²s
- storageChange /= (bBoxMax_[0]-bBoxMin_[0]);
-
- std::cout << "Time: " << time
- << " TotalMass: " << storage[contiTotalMassIdx]
- << " WaterMass: " << storage[contiWEqIdx]
- << " WaterMassChange: " << storageChange[contiWEqIdx]
- << std::endl;
- if (this->timeManager().time() != 0.)
- outfile << time << ";"
- << storageChange[contiTotalMassIdx] << ";"
- << storageChange[contiWEqIdx] << ";"
- << storage[contiWEqIdx]
- << std::endl;
-
- storageLastTimestep_ = storage;
- lastMassOutputTime_ = time;
- }
- }
- }
-
-private:
- // Internal method for the initial condition (reused for the dirichlet conditions!)
- void initial_(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values[pressureIdx] = refPressure_
- + 1000. * this->gravity()[1] * (globalPos[1] - bBoxMax_[1]);
- values[switchIdx] = refSw_;
- }
-
- bool onLeftBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] < bBoxMin_[0] + eps_; }
-
- bool onRightBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] > bBoxMax_[0] - eps_; }
-
- bool onLowerBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] < bBoxMin_[1] + eps_; }
-
- bool onUpperBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] > bBoxMax_[1] - eps_; }
-
- static constexpr Scalar eps_ = 1e-8;
- GlobalPosition bBoxMin_;
- GlobalPosition bBoxMax_;
- Scalar runUpDistanceX_;
-
- Scalar refTemperature_;
- Scalar refPressure_;
- Scalar refSw_;
-
- PrimaryVariables storageLastTimestep_;
- Scalar lastMassOutputTime_;
- int freqMassOutput_;
- std::ofstream outfile;
-};
-} //end namespace Dumux
-
-#endif // DUMUX_TWOPTWOC_SUBPROBLEM_HH
diff --git a/test/multidomain/2czeroeq2p2c/CMakeLists.txt b/test/multidomain/2czeroeq2p2c/CMakeLists.txt
deleted file mode 100644
index af9219e623f30d6fc2a21becac6adc3b66d44722..0000000000000000000000000000000000000000
--- a/test/multidomain/2czeroeq2p2c/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-add_input_file_links()
-
-add_dumux_test(test_2czeroeq2p2c test_2czeroeq2p2c test_2czeroeq2p2c.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_2czeroeq2p2c -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2czeroeq2p2c_reference.input"
- --files ${CMAKE_SOURCE_DIR}/test/references/2czeroeq2p2c-ff-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2c-00028.vtu
- ${CMAKE_SOURCE_DIR}/test/references/2czeroeq2p2c-pm-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00028.vtu)
-
-#install sources
-install(FILES
-2czeroeq2p2cproblem.hh
-2czeroeq2p2cspatialparameters.hh
-2p2csubproblem.hh
-test_2czeroeq2p2c.cc
-zeroeq2csubproblem.hh
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/multidomain/2czeroeq2p2c)
diff --git a/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c.cc b/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c.cc
deleted file mode 100644
index 4f006e2b352026086c02350f2c12fe8c1d7dc4aa..0000000000000000000000000000000000000000
--- a/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c.cc
+++ /dev/null
@@ -1,113 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Test for the coupled isothermal two-component ZeroEq and
- * isothermal two-phase two-component Darcy model
- */
-
-#include <config.h>
-#include <iostream>
-
-#include <dune/common/parallel/mpihelper.hh>
-
-#if HAVE_DUNE_MULTIDOMAIN
-
-#include <dumux/common/start.hh>
-
-#include "2czeroeq2p2cproblem.hh"
-
-/*!
- * \brief Print a usage string for simulations.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void printUsage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\nThe list of mandatory options for this program is:\n"
- "[Grid]\n"
- "InterfacePosY Vertical position of the interface [m]\n"
- "NoDarcyX Horizontal position where the porous medium starts [m]\n"
- "\n"
- "[SpatialParams]\n"
- "AlphaBJ Beavers-Joseph coefficient [-]\n"
- "Permeability Hydraulic conductivity [m^2]\n"
- "Porosity Porosity [-]\n"
- "Swr Residual water saturation [-]\n"
- "Snr Residual gas saturation [-]\n"
- "VgAlpha Van-Genuchten parameter [1/Pa]\n"
- "VgN Van-Genuchten parameter [-]\n"
- "\n"
- "[FreeFlow]\n"
- "RefVelocity Inflow velocity [m/s]\n"
- "RefPressure Reference pressure [Pa]\n"
- "RefMassfrac Inflow water mass fraction [-]\n"
- "RefTemperature Inflow temperature [K]\n"
- "\n"
- "[PorousMedium]\n"
- "RefSw Initial water saturation [-]\n"
- "RefPressurePM Initial pressure [Pa]\n"
- "RefTemperaturePM Initial temperature [K]\n"
- "\n"
- "[Output]\n"
- "NameFF Name free flow .vtu files\n"
- "NamePM Name porous medium .vtu files\n"
- "FreqRestart Frequency of writting restart information\n"
- "FreqOutput Frequency of writting vtu output\n"
- "FreqMassOutput Frequency of writting storage output\n"
- "FreqFluxOutput Frequency of writting flux output\n"
- "FreqVaporFluxOutput Frequency of writting vapor flux output\n"
- "\n"
- "[TimeManager]\n"
- "EpisodeLength Length of one episode [s]\n"
- "\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
-#if (HAVE_SUPERLU || HAVE_UMFPACK)
- typedef TTAG(TwoCZeroEqTwoPTwoCTestProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, printUsage);
-#else
-#warning "You need to have SuperLU or UMFPack installed to run this test."
- std::cerr << "You need to have SuperLU or UMFPack installed to run this test\n";
- return 77;
-#endif
-}
-
-#else
-int main(int argc, char** argv)
-{
-#warning You need to have dune-multidomain installed to run this test
- std::cerr << "You need to have dune-multidomain installed to run this test\n";
- return 77;
-}
-#endif
diff --git a/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c.input b/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c.input
deleted file mode 100644
index b7b923d163f769b8539d7400c6a81558f27a8b19..0000000000000000000000000000000000000000
--- a/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c.input
+++ /dev/null
@@ -1,72 +0,0 @@
-[TimeManager]
-DtInitial = 5e-5 # [s]
-MaxTimeStepSize = 900 # [s]
-TEnd = 518400 # [s] # 518400 = 6 days
-EpisodeLength = 8e5 # [s] # 43200
-
-[Grid]
-Cells0 = 40
-Cells1 = 20 20
-Grading0 = 1.0
-Grading1 = -1.2 1.25
-Positions0 = 0.0 0.5
-Positions1 = 0.0 0.25 0.75
-
-NoDarcyX = 0.25 # [m] # Horizontal position without PM below
-RunUpDistanceX = 0.26 # [m] # Horizontal position without Coupling to PM
-InterfacePosY = 0.25 # [m] # Vertical position of coupling interface
-
-[Output]
-NameFF = zeroeq2c
-NamePM = 2p2c
-# Frequency of restart file, flux and VTK output
-FreqRestart = 50 # 500 # how often restart files are written out
-FreqOutput = 5 # 10 # frequency of VTK output
-FreqMassOutput = 5 # 20 # frequency of mass and evaporation rate output (Darcy)
-
-[FreeFlow]
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-
-[PorousMedium]
-RefPressurePM = 1e5 # [Pa]
-RefTemperaturePM = 298.15 # [K]
-RefSw = 0.9 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 6.9 # [-]
-
-# optional parameters
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 10
-MaxSteps = 15
-WriteConvergence = false
-
-[LinearSolver]
-Verbosity = 0
-
-[ZeroEq]
-# Eddy Viscosity Models
-# 0 = none
-# 1 = Prandtl
-# 2 = modified Van Driest
-# 3 = Baldwin Lomax
-EddyViscosityModel = 3
-# Eddy Diffusivity Models
-# 0 = none
-# 1 = Reynolds analogy
-# 2 = modified Van Driest
-# 3 = Deissler
-# 4 = Meier and Rotta
-EddyDiffusivityModel = 3
-BBoxMinSandGrainRoughness = 0.0 # [m] # 0.6e-3
-BBoxMaxSandGrainRoughness = 0.0 # [m] # 0
diff --git a/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c_reference.input b/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c_reference.input
deleted file mode 100644
index 0c3b6ec0e85705c0ab5e627a5ae8314b61d79c4a..0000000000000000000000000000000000000000
--- a/test/multidomain/2czeroeq2p2c/test_2czeroeq2p2c_reference.input
+++ /dev/null
@@ -1,73 +0,0 @@
-[TimeManager]
-DtInitial = 5e-5 # [s]
-MaxTimeStepSize = 900 # [s]
-TEnd = 86400 # [s]
-EpisodeLength = 8e5 # [s]
-
-[Grid]
-Cells0 = 10
-Cells1 = 12 12
-Grading0 = 1.0
-Grading1 = -1.1 1.1
-Positions0 = 0.0 0.5
-Positions1 = 0.0 0.25 0.5
-
-NoDarcyX = 0.25 # [m] # Horizontal position without PM below
-RunUpDistanceX = 0.26 # [m] # Horizontal position without Coupling to PM
-InterfacePosY = 0.25 # [m] # Vertical position of coupling interface
-
-[Output]
-NameFF = zeroeq2c
-NamePM = 2p2c
-# Frequency of restart file, flux and VTK output
-FreqRestart = 100 # 500 # how often restart files are written out
-FreqOutput = 5 # 10 # frequency of VTK output
-FreqMassOutput = 5 # 20 # frequency of mass and evaporation rate output (Darcy)
-
-[FreeFlow]
-RefVelocity = 3.5 # [m/s]
-RefPressure = 1e5 # [Pa]
-RefMassfrac = 0.008 # [-]
-RefTemperature = 298.15 # [K]
-
-[PorousMedium]
-RefPressurePM = 1e5 # [Pa]
-RefTemperaturePM = 298.15 # [K]
-RefSw = 0.9 # [-]
-
-[SpatialParams]
-AlphaBJ = 1.0 # [-]
-Permeability = 2.65e-10 # [m^2]
-Porosity = 0.41 # [-]
-Swr = 0.005 # [-]
-Snr = 0.01 # [-]
-VgAlpha = 6.371e-4 # [1/Pa]
-VgN = 6.9 # [-]
-
-# optional parameters
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 10
-MaxSteps = 15
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-Verbosity = 0
-
-[ZeroEq]
-# Eddy Viscosity Models
-# 0 = none
-# 1 = Prandtl
-# 2 = modified Van Driest
-# 3 = Baldwin Lomax
-EddyViscosityModel = 3
-# Eddy Diffusivity Models
-# 0 = none
-# 1 = Reynolds analogy
-# 2 = modified Van Driest
-# 3 = Deissler
-# 4 = Meier and Rotta
-EddyDiffusivityModel = 3
-BBoxMinSandGrainRoughness = 0.0 # [m] # 0.6e-3
-BBoxMaxSandGrainRoughness = 0.0 # [m] # 0
diff --git a/test/multidomain/2czeroeq2p2c/zeroeq2csubproblem.hh b/test/multidomain/2czeroeq2p2c/zeroeq2csubproblem.hh
deleted file mode 100644
index 806c1c55ebea308e2eb293f30843414f349caf21..0000000000000000000000000000000000000000
--- a/test/multidomain/2czeroeq2p2c/zeroeq2csubproblem.hh
+++ /dev/null
@@ -1,391 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/**
- * \file
- * \brief Isothermal two-component ZeroEq subproblem with air flowing
- * from the left to the right and coupling at the bottom.
- */
-#ifndef DUMUX_ZEROEQTWOCSUBPROBLEM_HH
-#define DUMUX_ZEROEQTWOCSUBPROBLEM_HH
-
-#include <dumux/freeflow/zeroeqnc/model.hh>
-#include <dumux/multidomain/subdomainpropertydefaults.hh>
-#include <dumux/multidomain/2cstokes2p2c/stokesnccouplinglocalresidual.hh>
-
-namespace Dumux
-{
-
-template <class TypeTag>
-class ZeroEq2cSubProblem;
-
-namespace Properties
-{
-NEW_TYPE_TAG(ZeroEq2cSubProblem,
- INHERITS_FROM(BoxZeroEqnc, SubDomain));
-
-// Set the problem property
-SET_TYPE_PROP(ZeroEq2cSubProblem, Problem, ZeroEq2cSubProblem<TypeTag>);
-
-// Use the StokencCouplingLocalResidual for the computation of the local residual in the ZeroEq domain
-SET_TYPE_PROP(ZeroEq2cSubProblem, LocalResidual,
- StokesncCouplingLocalResidual<TypeTag>);
-
-// Used the fluid system from the coupled problem
-SET_TYPE_PROP(ZeroEq2cSubProblem,
- FluidSystem,
- typename GET_PROP_TYPE(typename GET_PROP_TYPE(TypeTag, MultiDomainTypeTag), FluidSystem));
-
-// Disable use of mole formulation
-SET_BOOL_PROP(ZeroEq2cSubProblem, UseMoles, false);
-
-// Disable gravity
-SET_BOOL_PROP(ZeroEq2cSubProblem, ProblemEnableGravity, false);
-
-// Enable Navier-Stokes
-SET_BOOL_PROP(ZeroEq2cSubProblem, EnableNavierStokes, true);
-
-// Set the properties for variable inflow BC
-NEW_PROP_TAG(FreeFlowSinusVelocityAmplitude);
-NEW_PROP_TAG(FreeFlowSinusVelocityPeriod);
-SET_SCALAR_PROP(ZeroEq2cSubProblem, FreeFlowSinusVelocityAmplitude, 0.0);
-SET_SCALAR_PROP(ZeroEq2cSubProblem, FreeFlowSinusVelocityPeriod, 3600.0);
-NEW_PROP_TAG(FreeFlowSinusPressureAmplitude);
-NEW_PROP_TAG(FreeFlowSinusPressurePeriod);
-SET_SCALAR_PROP(ZeroEq2cSubProblem, FreeFlowSinusPressureAmplitude, 0.0);
-SET_SCALAR_PROP(ZeroEq2cSubProblem, FreeFlowSinusPressurePeriod, 3600.0);
-NEW_PROP_TAG(FreeFlowSinusConcentrationAmplitude);
-NEW_PROP_TAG(FreeFlowSinusConcentrationPeriod);
-SET_SCALAR_PROP(ZeroEq2cSubProblem, FreeFlowSinusConcentrationAmplitude, 0.0);
-SET_SCALAR_PROP(ZeroEq2cSubProblem, FreeFlowSinusConcentrationPeriod, 3600.0);
-NEW_PROP_TAG(FreeFlowSinusTemperatureAmplitude);
-NEW_PROP_TAG(FreeFlowSinusTemperaturePeriod);
-SET_SCALAR_PROP(ZeroEq2cSubProblem, FreeFlowSinusTemperatureAmplitude, 0.0);
-SET_SCALAR_PROP(ZeroEq2cSubProblem, FreeFlowSinusTemperaturePeriod, 3600.0);
-}
-
-/*!
- * \ingroup ImplicitTestProblems
- * \ingroup TwoPTwoCZeroEqTwoCModel
- * \brief Isothermal two-component ZeroEq subproblem with air flowing
- * from the left to the right and coupling at the bottom.
- *
- * The free-flow subdomain is sized 0.5m times 0.5m. Dry air is flowing from left (Dirichlet)
- * to right (outflow), at the right half of the bottom the coupling conditions
- * are applied to all balance equations. They handle the exchange to the porous-medium
- * subdomain.
- *
- * This subproblem uses the \ref ZeroEqncModel. It is part of a multidomain model and
- * combined with the 2p2csubproblem for the porous-medium domain.
- */
-template <class TypeTag>
-class ZeroEq2cSubProblem : public ZeroEqProblem<TypeTag>
-{
- typedef ZeroEq2cSubProblem<TypeTag> ThisType;
- typedef ZeroEqProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum {
- dim = GridView::dimension
- };
- enum { // equation indices
- massBalanceIdx = Indices::massBalanceIdx,
- momentumXIdx = Indices::momentumXIdx, // Index of the x-component of the momentum balance
- momentumYIdx = Indices::momentumYIdx, // Index of the y-component of the momentum balance
- momentumZIdx = Indices::momentumZIdx, // Index of the z-component of the momentum balance
- transportEqIdx = Indices::transportEqIdx // Index of the transport equation (massfraction)
- };
- enum { // primary variable indices
- pressureIdx = Indices::pressureIdx,
- velocityXIdx = Indices::velocityXIdx,
- velocityYIdx = Indices::velocityYIdx,
- velocityZIdx = Indices::velocityZIdx,
- massOrMoleFracIdx = Indices::massOrMoleFracIdx
- };
- enum { phaseIdx = Indices::phaseIdx };
- enum { numComponents = Indices::numComponents };
- enum {
- transportCompIdx = Indices::transportCompIdx, // water component index
- phaseCompIdx = Indices::phaseCompIdx // air component index
- };
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::ctype CoordScalar;
- typedef typename GridView::Intersection Intersection;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, FluidState) FluidState;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<CoordScalar, dim> GlobalPosition;
-
-
-public:
- /*!
- * \brief The sub-problem for the ZeroEq subdomain
- *
- * \param timeManager The TimeManager which is used by the simulation
- * \param gridView The simulation's idea about physical space
- */
- ZeroEq2cSubProblem(TimeManager &timeManager, const GridView gridView)
- : ParentType(timeManager, gridView)
- {
- std::vector<Scalar> positions0 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions0);
- std::vector<Scalar> positions1 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::vector<Scalar>, Grid, Positions1);
-
- bBoxMin_[0] = positions0.front();
- bBoxMax_[0] = positions0.back();
- bBoxMin_[1] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, InterfacePosY);
- bBoxMax_[1] = positions1.back();
- runUpDistanceX_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Grid, RunUpDistanceX); // first part of the interface without coupling
-
- refVelocity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefVelocity);
- refPressure_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefPressure);
- refMassfrac_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefMassfrac);
- refTemperature_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, RefTemperature);
- }
-
- // functions have to be overwritten, otherwise they remain uninitialized
- //! \copydoc ImplicitProblem::bBoxMin()
- const GlobalPosition &bBoxMin() const
- { return bBoxMin_; }
-
- //! \copydoc ImplicitProblem::bBoxMax()
- const GlobalPosition &bBoxMax() const
- { return bBoxMax_; }
-
- /*!
- * \brief Returns the problem name
- *
- * This is used as a prefix for files generated by the simulation.
- */
- const std::string &name() const
- { return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Output, NameFF); }
-
- /*!
- * \brief Returns the temperature \f$ K \f$
- *
- * \param globalPos The global position
- */
- Scalar temperatureAtPos(const GlobalPosition &globalPos) const
- {
- return refTemperature_;
- }
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- //! \copydoc ImplicitProblem::boundaryTypesAtPos()
- void boundaryTypesAtPos(BoundaryTypes &values,
- const GlobalPosition &globalPos) const
- {
- values.setAllDirichlet();
-
- if (onUpperBoundary_(globalPos))
- {
- values.setNeumann(transportEqIdx);
- }
-
- if (onRightBoundary_(globalPos))
- {
- values.setAllOutflow();
-
- if (onUpperBoundary_(globalPos)) // corner point
- values.setAllDirichlet();
- }
-
- if (onLowerBoundary_(globalPos))
- {
- values.setAllDirichlet();
- values.setNeumann(transportEqIdx);
-
- if (globalPos[0] > runUpDistanceX_-eps_)
- {
- values.setAllCouplingDirichlet();
- values.setCouplingNeumann(momentumXIdx);
- values.setCouplingNeumann(momentumYIdx);
- }
- }
- if (onLeftBoundary_(globalPos))
- {
- // Left inflow boundaries should be Neumann, otherwise the
- // evaporative fluxes are much more grid dependent
- values.setNeumann(transportEqIdx);
-
- if (onUpperBoundary_(globalPos) || onLowerBoundary_(globalPos)) // corner point
- values.setAllDirichlet();
- }
-
- // the mass balance has to be of type outflow
- // it does not get a coupling condition, since pn is a condition for ZeroEq
- values.setOutflow(massBalanceIdx);
-
- if (onRightBoundary_(globalPos))
- values.setDirichlet(pressureIdx);
- }
-
- //! \copydoc ImplicitProblem::dirichletAtPos()
- void dirichletAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- initial_(values, globalPos);
- }
-
- //! \copydoc ImplicitProblem::neumannAtPos()
- void neumannAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values = 0.0;
-
- FluidState fluidState;
- updateFluidStateForBC_(fluidState);
- const Scalar density = FluidSystem::density(fluidState, phaseIdx);
-
- // rho*v*X at inflow
- if (onLeftBoundary_(globalPos)
- && globalPos[1] > bBoxMin_[1] - eps_ && globalPos[1] < bBoxMax_[1] + eps_)
- {
- values[transportEqIdx] = -xVelocity_(globalPos) * density * refMassfrac();
- }
- }
-
- // \}
-
- /*!
- * \name Volume terms
- */
- // \{
-
- //! \copydoc ImplicitProblem::sourceAtPos()
- void sourceAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- // The source term of the mass balance has to be chosen as
- // div (q_momentum) in the problem file
- values = Scalar(0);
- }
-
- //! \copydoc ImplicitProblem::initialAtPos()
- void initialAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- initial_(values, globalPos);
- }
-
- // \}
-
- //! \brief Returns the velocity at the inflow.
- const Scalar refVelocity() const
- {
- return refVelocity_ + variation_(GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusVelocityAmplitude),
- GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusVelocityPeriod));
- }
-
- //! \brief Returns the pressure at the inflow.
- const Scalar refPressure() const
- {
- return refPressure_ + variation_(GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusPressureAmplitude),
- GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusPressurePeriod));
- }
-
- //! \brief Returns the mass fraction at the inflow.
- const Scalar refMassfrac() const
- {
- return refMassfrac_ + variation_(GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusConcentrationAmplitude),
- GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusConcentrationPeriod));
- }
-
- //! \brief Returns the temperature at the inflow.
- const Scalar refTemperature() const
- {
- return refTemperature_ + variation_(GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusTemperatureAmplitude),
- GET_PARAM_FROM_GROUP(TypeTag, Scalar, FreeFlow, SinusTemperaturePeriod));
- }
-
-private:
- // Internal method for the initial condition (reused for the dirichlet conditions!)
- void initial_(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- FluidState fluidState;
- updateFluidStateForBC_(fluidState);
- const Scalar density = FluidSystem::density(fluidState, phaseIdx);
-
- values[velocityXIdx] = xVelocity_(globalPos);
- values[velocityYIdx] = 0.0;
- values[pressureIdx] = refPressure()
- + density * this->gravity()[1] * (globalPos[1] - bBoxMin_[1]);
- values[massOrMoleFracIdx] = refMassfrac();
- }
-
- // Set the profile of the inflow velocity (horizontal direction)
- const Scalar xVelocity_(const GlobalPosition &globalPos) const
- {
- if (onUpperBoundary_(globalPos) || onLowerBoundary_(globalPos))
- return 0.0;
- return refVelocity();
- }
-
- // Updates the fluid state to obtain required quantities for IC/BC
- void updateFluidStateForBC_(FluidState& fluidState) const
- {
- fluidState.setTemperature(refTemperature());
- fluidState.setPressure(phaseIdx, refPressure());
- // setMassFraction() has only to be called 1-numComponents times
- fluidState.setMassFraction(phaseIdx, transportCompIdx, refMassfrac());
- }
-
- // can be used for the variation of a boundary condition
- const Scalar variation_(const Scalar amplitude, const Scalar period) const
- { return sin(2*M_PI*this->timeManager().time()/period) * amplitude; }
-
- bool onLeftBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] < bBoxMin_[0] + eps_; }
-
- bool onRightBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] > bBoxMax_[0] - eps_; }
-
- bool onLowerBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] < bBoxMin_[1] + eps_; }
-
- bool onUpperBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] > bBoxMax_[1] - eps_; }
-
- static constexpr Scalar eps_ = 1e-8;
- GlobalPosition bBoxMin_;
- GlobalPosition bBoxMax_;
- Scalar runUpDistanceX_;
-
- Scalar refVelocity_;
- Scalar refPressure_;
- Scalar refMassfrac_;
- Scalar refTemperature_;
-};
-} //end namespace Dumux
-
-#endif // DUMUX_ZEROEQ2C_SUBPROBLEM_HH
diff --git a/test/multidomain/CMakeLists.txt b/test/multidomain/CMakeLists.txt
deleted file mode 100644
index f562a68846f0beecb7604f8c34aeca444438a0bc..0000000000000000000000000000000000000000
--- a/test/multidomain/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_subdirectory("2cstokes2p2c")
-add_subdirectory("2cnistokes2p2cni")
-add_subdirectory("2czeroeq2p2c")
-add_subdirectory("2cnizeroeq2p2cni")
diff --git a/test/multidomain/README b/test/multidomain/README
deleted file mode 100755
index 2587065c57ff88f432fa536a266bf31f9d80b50e..0000000000000000000000000000000000000000
--- a/test/multidomain/README
+++ /dev/null
@@ -1,18 +0,0 @@
-== Running the test cases in test/multidomain ==
-
-You need the following versions of the required Dune modules:
-Dune core modules: 2.4
-dune-typetree, dune-multidomaingrid: release (branch) 2.3
-Dune-PDELab, dune-multidomain: release (branch) 2.0
-
-The necessary modules and the correct versions can be obtained by using
-the script located in:
- bin/installexternal.sh
-
--- Other external packages --
-Install the external grid manager UG and a direct linear solver like SuperLU
-or UMFPACK. You need Boost fusion for dune-multidomaingrid.
-
-If you encounter segmentation faults, make sure that UG, all DUNE libraries and
-the executable in question are built with the same compiler.
-
diff --git a/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
index 3198893b99678b147773d65ee1730854d982982b..6cebb02ee55866742bf73e2368875b806bc36176 100644
--- a/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1pniconductionproblem.hh
@@ -26,10 +26,11 @@
#include <math.h>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box/properties.hh>
#include <dumux/porousmediumflow/1p/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/h2o.hh>
#include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
@@ -45,7 +46,7 @@ namespace Properties
{
NEW_TYPE_TAG(OnePNIConductionProblem, INHERITS_FROM(OnePNI));
NEW_TYPE_TAG(OnePNIConductionBoxProblem, INHERITS_FROM(BoxModel, OnePNIConductionProblem));
-NEW_TYPE_TAG(OnePNIConductionCCProblem, INHERITS_FROM(CCTpfaModel, OnePNIConductionProblem));
+NEW_TYPE_TAG(OnePNIConductionCCTpfaProblem, INHERITS_FROM(CCTpfaModel, OnePNIConductionProblem));
NEW_TYPE_TAG(OnePNIConductionCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePNIConductionProblem));
// Set the grid type
@@ -64,6 +65,8 @@ SET_TYPE_PROP(OnePNIConductionProblem,
SpatialParams,
OnePNISpatialParams<TypeTag>);
+// Set the model parameter group for the mpfa case (velocity disabled in input file)
+SET_STRING_PROP(OnePNIConductionCCMpfaProblem, ModelParameterGroup, "MpfaTest");
}
@@ -90,18 +93,19 @@ SET_TYPE_PROP(OnePNIConductionProblem,
* <tt>./test_cc1pniconduction -ParameterFile ./test_cc1pniconduction.input</tt>
*/
template <class TypeTag>
-class OnePNIConductionProblem : public ImplicitPorousMediaProblem<TypeTag>
+class OnePNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
{
- using ParentType = ImplicitPorousMediaProblem<TypeTag>;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using VtkOutputModule = typename GET_PROP_TYPE(TypeTag, VtkOutputModule);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using IapwsH2O = H2O<Scalar>;
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
@@ -110,9 +114,6 @@ class OnePNIConductionProblem : public ImplicitPorousMediaProblem<TypeTag>
dimWorld = GridView::dimensionworld
};
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dimWorld : 0 };
-
enum {
// indices of the primary variables
pressureIdx = Indices::pressureIdx,
@@ -125,72 +126,65 @@ class OnePNIConductionProblem : public ImplicitPorousMediaProblem<TypeTag>
};
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
public:
- OnePNIConductionProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ OnePNIConductionProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
//initialize fluid system
FluidSystem::init();
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name);
- outputInterval_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Problem, OutputInterval);
-
+ name_ = getParam<std::string>("Problem.Name");
temperatureHigh_ = 300.0;
+ temperatureExact_.resize(fvGridGeometry->numDofs());
}
-
- bool shouldWriteOutput() const
+ //! get the analytical temperature
+ const std::vector<Scalar>& getExactTemperature()
{
- return
- this->timeManager().timeStepIndex() == 0 ||
- this->timeManager().timeStepIndex() % outputInterval_ == 0 ||
- this->timeManager().episodeWillBeFinished() ||
- this->timeManager().willBeFinished();
+ return temperatureExact_;
}
- /*!
- * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
- */
- void addVtkOutputFields(VtkOutputModule& outputModule) const
+ //! udpate the analytical temperature
+ void updateExactTemperature(const SolutionVector& curSol, Scalar time)
{
- auto& temperatureExact = outputModule.createScalarField("temperatureExact", dofCodim);
+ const auto someElement = *(elements(this->fvGridGeometry().gridView()).begin());
- const auto someElement = *(elements(this->gridView()).begin());
- const auto someElemSol = this->model().elementSolution(someElement, this->model().curSol());
- const auto someInitSol = initial_(someElement.geometry().center());
+ ElementSolutionVector someElemSol(someElement, curSol, this->fvGridGeometry());
+ const auto someInitSol = initialAtPos(someElement.geometry().center());
- auto someFvGeometry = localView(this->model().fvGridGeometry());
- someFvGeometry.bindElement(someElement);
- const auto someScv = *(scvs(someFvGeometry).begin());
+ auto fvGeometry = localView(this->fvGridGeometry());
+ fvGeometry.bindElement(someElement);
+ const auto someScv = *(scvs(fvGeometry).begin());
VolumeVariables volVars;
volVars.update(someElemSol, *this, someElement, someScv);
const auto porosity = this->spatialParams().porosity(someElement, someScv, someElemSol);
const auto densityW = volVars.density();
- const auto heatCapacityW = FluidSystem::heatCapacity(volVars.fluidState(), 0);
+ const auto heatCapacityW = IapwsH2O::liquidHeatCapacity(someInitSol[temperatureIdx], someInitSol[pressureIdx]);
const auto densityS = this->spatialParams().solidDensity(someElement, someScv, someElemSol);
const auto heatCapacityS = this->spatialParams().solidHeatCapacity(someElement, someScv, someElemSol);
const auto storage = densityW*heatCapacityW*porosity + densityS*heatCapacityS*(1 - porosity);
const auto effectiveThermalConductivity = ThermalConductivityModel::effectiveThermalConductivity(volVars, this->spatialParams(),
- someElement, someFvGeometry, someScv);
+ someElement, fvGeometry, someScv);
using std::max;
- Scalar time = max(this->timeManager().time() + this->timeManager().timeStepSize(), 1e-10);
-
- for (const auto& element : elements(this->gridView()))
+ time = max(time, 1e-10);
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
{
- auto fvGeometry = localView(this->model().fvGridGeometry());
+ auto fvGeometry = localView(this->fvGridGeometry());
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
{
- auto globalIdx = scv.dofIndex();
- const auto& globalPos = scv.dofPosition();
-
- using std::erf; using std::sqrt;
- temperatureExact[globalIdx] = temperatureHigh_ + (someInitSol[temperatureIdx] - temperatureHigh_)
+ auto globalIdx = scv.dofIndex();
+ const auto& globalPos = scv.dofPosition();
+ using std::erf;
+ using std::sqrt;
+ temperatureExact_[globalIdx] = temperatureHigh_ + (someInitSol[temperatureIdx] - temperatureHigh_)
*erf(0.5*sqrt(globalPos[0]*globalPos[0]*storage/time/effectiveThermalConductivity));
+
}
}
}
@@ -227,7 +221,7 @@ public:
{
BoundaryTypes bcTypes;
- if(globalPos[0] < eps_ || globalPos[0] > this->bBoxMax()[0] - eps_)
+ if(globalPos[0] < eps_ || globalPos[0] > this->fvGridGeometry().bBoxMax()[0] - eps_)
bcTypes.setAllDirichlet();
else
bcTypes.setAllNeumann();
@@ -246,25 +240,12 @@ public:
*/
PrimaryVariables dirichletAtPos(const GlobalPosition &globalPos) const
{
- PrimaryVariables priVars(initial_(globalPos));
+ PrimaryVariables priVars(initial_());
if (globalPos[0] < eps_)
priVars[temperatureIdx] = temperatureHigh_;
return priVars;
}
- /*!
- * \brief Evaluate the boundary conditions for a Neumann
- * boundary segment.
- *
- * For this method, the \a priVars parameter stores the mass flux
- * in normal direction of each component. Negative values mean
- * influx.
- */
- PrimaryVariables neumannAtPos(const GlobalPosition &globalPos) const
- {
- return PrimaryVariables(0.0);
- }
-
// \}
/*!
@@ -283,17 +264,17 @@ public:
*/
PrimaryVariables initialAtPos(const GlobalPosition &globalPos) const
{
- return initial_(globalPos);
+ return initial_();
}
// \}
private:
// the internal method for the initial condition
- PrimaryVariables initial_(const GlobalPosition &globalPos) const
+ PrimaryVariables initial_() const
{
PrimaryVariables priVars(0.0);
- priVars[pressureIdx] = 1e5; // initial condition for the pressure
+ priVars[pressureIdx] = 1.0e5;
priVars[temperatureIdx] = 290.0;
return priVars;
}
@@ -301,7 +282,7 @@ private:
Scalar temperatureHigh_;
static constexpr Scalar eps_ = 1e-6;
std::string name_;
- int outputInterval_;
+ std::vector<Scalar> temperatureExact_;
};
} //end namespace Dumux
diff --git a/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh b/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
index ffdefa6481ff44473fd493e1d7f65fe56d6d17bf..4f3c3b38cd2cd2b249746f355a1eed7ef1b710cb 100644
--- a/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1pniconvectionproblem.hh
@@ -27,10 +27,10 @@
#include <math.h>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/mpfa/properties.hh>
#include <dumux/porousmediumflow/1p/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/h2o.hh>
#include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
#include "1pnispatialparams.hh"
@@ -46,7 +46,7 @@ namespace Properties
NEW_TYPE_TAG(OnePNIConvectionProblem, INHERITS_FROM(OnePNI));
NEW_TYPE_TAG(OnePNIConvectionBoxProblem, INHERITS_FROM(BoxModel, OnePNIConvectionProblem));
-NEW_TYPE_TAG(OnePNIConvectionCCProblem, INHERITS_FROM(CCTpfaModel, OnePNIConvectionProblem));
+NEW_TYPE_TAG(OnePNIConvectionCCTpfaProblem, INHERITS_FROM(CCTpfaModel, OnePNIConvectionProblem));
NEW_TYPE_TAG(OnePNIConvectionCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePNIConvectionProblem));
// Set the grid type
@@ -63,6 +63,8 @@ SET_TYPE_PROP(OnePNIConvectionProblem, Fluid,
// Set the spatial parameters
SET_TYPE_PROP(OnePNIConvectionProblem, SpatialParams, OnePNISpatialParams<TypeTag>);
+// Set the model parameter group for the mpfa case (velocity disabled in input file)
+SET_STRING_PROP(OnePNIConvectionCCMpfaProblem, ModelParameterGroup, "MpfaTest");
} // end namespace Properties
@@ -91,9 +93,9 @@ SET_TYPE_PROP(OnePNIConvectionProblem, SpatialParams, OnePNISpatialParams<TypeTa
* <tt>./test_cc1pniconvection -ParameterFile ./test_cc1pniconvection.input</tt>
*/
template <class TypeTag>
-class OnePNIConvectionProblem : public ImplicitPorousMediaProblem<TypeTag>
+class OnePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
{
- using ParentType = ImplicitPorousMediaProblem<TypeTag>;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
@@ -102,11 +104,11 @@ class OnePNIConvectionProblem : public ImplicitPorousMediaProblem<TypeTag>
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
- using VtkOutputModule = typename GET_PROP_TYPE(TypeTag, VtkOutputModule);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using IapwsH2O = H2O<Scalar>;
// copy some indices for convenience
@@ -116,9 +118,6 @@ class OnePNIConvectionProblem : public ImplicitPorousMediaProblem<TypeTag>
dimWorld = GridView::dimensionworld
};
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dimWorld : 0 };
-
enum {
// indices of the primary variables
pressureIdx = Indices::pressureIdx,
@@ -130,58 +129,54 @@ class OnePNIConvectionProblem : public ImplicitPorousMediaProblem<TypeTag>
energyEqIdx = Indices::energyEqIdx
};
-
+ using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using Element = typename GridView::template Codim<0>::Entity;
using Intersection = typename GridView::Intersection;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
public:
- OnePNIConvectionProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ OnePNIConvectionProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
//initialize fluid system
FluidSystem::init();
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name);
- outputInterval_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, Problem, OutputInterval);
- darcyVelocity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, DarcyVelocity);
+ name_ = getParam<std::string>("Problem.Name");
+ darcyVelocity_ = getParam<Scalar>("Problem.DarcyVelocity");
temperatureHigh_ = 291.0;
temperatureLow_ = 290.0;
pressureHigh_ = 2e5;
pressureLow_ = 1e5;
- }
+ temperatureExact_.resize(this->fvGridGeometry().numDofs());
+ }
- bool shouldWriteOutput() const
+ //! Get exact temperature vector for output
+ const std::vector<Scalar>& getExactTemperature()
{
- return
- this->timeManager().timeStepIndex() == 0 ||
- this->timeManager().timeStepIndex() % outputInterval_ == 0 ||
- this->timeManager().episodeWillBeFinished() ||
- this->timeManager().willBeFinished();
+ return temperatureExact_;
}
- /*!
- * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
- */
- void addVtkOutputFields(VtkOutputModule& outputModule) const
+ //! udpate the analytical temperature
+ void updateExactTemperature(const SolutionVector& curSol, Scalar time)
{
- auto& temperatureExact = outputModule.createScalarField("temperatureExact", dofCodim);
+ const auto someElement = *(elements(this->fvGridGeometry().gridView()).begin());
- const auto someElement = *(elements(this->gridView()).begin());
- const auto someElemSol = this->model().elementSolution(someElement, this->model().curSol());
+ ElementSolutionVector someElemSol(someElement, curSol, this->fvGridGeometry());
+ const auto someInitSol = initialAtPos(someElement.geometry().center());
- auto someFvGeometry = localView(this->model().fvGridGeometry());
- someFvGeometry.bindElement(someElement);
- const auto someScv = *(scvs(someFvGeometry).begin());
+ auto fvGeometry = localView(this->fvGridGeometry());
+ fvGeometry.bindElement(someElement);
+ const auto someScv = *(scvs(fvGeometry).begin());
VolumeVariables volVars;
volVars.update(someElemSol, *this, someElement, someScv);
const auto porosity = this->spatialParams().porosity(someElement, someScv, someElemSol);
const auto densityW = volVars.density();
- const auto heatCapacityW = FluidSystem::heatCapacity(volVars.fluidState(), 0);
+ const auto heatCapacityW = IapwsH2O::liquidHeatCapacity(someInitSol[temperatureIdx], someInitSol[pressureIdx]);
const auto storageW = densityW*heatCapacityW*porosity;
const auto densityS = this->spatialParams().solidDensity(someElement, someScv, someElemSol);
const auto heatCapacityS = this->spatialParams().solidHeatCapacity(someElement, someScv, someElemSol);
@@ -189,19 +184,19 @@ public:
std::cout << "storage: " << storageTotal << '\n';
using std::max;
- const Scalar time = max(this->timeManager().time() + this->timeManager().timeStepSize(), 1e-10);
+ time = max(time, 1e-10);
const Scalar retardedFrontVelocity = darcyVelocity_*storageW/storageTotal/porosity;
std::cout << "retarded velocity: " << retardedFrontVelocity << '\n';
- for (const auto& element : elements(this->gridView()))
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
{
- auto fvGeometry = localView(this->model().fvGridGeometry());
+ auto fvGeometry = localView(this->fvGridGeometry());
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
{
auto dofIdxGlobal = scv.dofIndex();
auto dofPosition = scv.dofPosition();
- temperatureExact[dofIdxGlobal] = (dofPosition[0] < retardedFrontVelocity*time) ? temperatureHigh_ : temperatureLow_;
+ temperatureExact_[dofIdxGlobal] = (dofPosition[0] < retardedFrontVelocity*time) ? temperatureHigh_ : temperatureLow_;
}
}
}
@@ -239,7 +234,7 @@ public:
{
BoundaryTypes bcTypes;
- if(globalPos[0] > this->bBoxMax()[0] - eps_)
+ if(globalPos[0] > this->fvGridGeometry().bBoxMax()[0] - eps_)
bcTypes.setAllDirichlet();
else
bcTypes.setAllNeumann();
@@ -279,12 +274,12 @@ public:
* The \a values store the mass flux of each phase normal to the boundary.
* Negative values indicate an inflow.
*/
- PrimaryVariables neumann(const Element& element,
+ NeumannFluxes neumann(const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolvars,
const SubControlVolumeFace& scvf) const
{
- PrimaryVariables values(0.0);
+ NeumannFluxes values(0.0);
const auto globalPos = scvf.ipGlobal();
const auto& volVars = elemVolvars[scvf.insideScvIdx()];
@@ -303,17 +298,6 @@ public:
*/
// \{
- /*!
- * \brief Return the sources within the domain.
- *
- * \param values Stores the source values, acts as return value
- * \param globalPos The global position
- */
- PrimaryVariables sourceAtPos(const GlobalPosition &globalPos) const
- {
- return PrimaryVariables(0);
- }
-
/*!
* \brief Evaluate the initial value for a control volume.
*
@@ -347,7 +331,7 @@ private:
Scalar darcyVelocity_;
static constexpr Scalar eps_ = 1e-6;
std::string name_;
- int outputInterval_;
+ std::vector<Scalar> temperatureExact_;
};
} //end namespace Dumux
diff --git a/test/porousmediumflow/1p/implicit/1pnispatialparams.hh b/test/porousmediumflow/1p/implicit/1pnispatialparams.hh
index 065bf870c69a936db425e3da4053127614ef9ca1..264d17258afd3257e3a5592bf0b318679eb7f9b8 100644
--- a/test/porousmediumflow/1p/implicit/1pnispatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/1pnispatialparams.hh
@@ -50,8 +50,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- OnePNISpatialParams(const Problem& problem, const GridView &gridView)
- : ParentType(problem, gridView) {}
+ OnePNISpatialParams(const Problem& problem)
+ : ParentType(problem) {}
/*!
* \brief Define the intrinsic permeability \f$\mathrm{[m^2]}\f$.
diff --git a/test/porousmediumflow/1p/implicit/1ptestproblem.hh b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
index 42989847d2c029dc126e2a544668962ddb1eba49..dd4ac4ff71e62bd57317ca77320ff2241876fed2 100644
--- a/test/porousmediumflow/1p/implicit/1ptestproblem.hh
+++ b/test/porousmediumflow/1p/implicit/1ptestproblem.hh
@@ -25,15 +25,14 @@
#ifndef DUMUX_1PTEST_PROBLEM_HH
#define DUMUX_1PTEST_PROBLEM_HH
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box/properties.hh>
#include <dumux/porousmediumflow/1p/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
-#include <dumux/linear/amgbackend.hh>
-
#include "1ptestspatialparams.hh"
namespace Dumux
@@ -41,18 +40,11 @@ namespace Dumux
template <class TypeTag>
class OnePTestProblem;
-namespace Capabilities
-{
- template<class TypeTag>
- struct isStationary<OnePTestProblem<TypeTag>>
- { static const bool value = true; };
-}
-
namespace Properties
{
NEW_TYPE_TAG(OnePTestProblem, INHERITS_FROM(OneP, OnePTestSpatialParams));
NEW_TYPE_TAG(OnePTestBoxProblem, INHERITS_FROM(BoxModel, OnePTestProblem));
-NEW_TYPE_TAG(OnePTestCCProblem, INHERITS_FROM(CCTpfaModel, OnePTestProblem));
+NEW_TYPE_TAG(OnePTestCCTpfaProblem, INHERITS_FROM(CCTpfaModel, OnePTestProblem));
NEW_TYPE_TAG(OnePTestCCMpfaProblem, INHERITS_FROM(CCMpfaModel, OnePTestProblem));
SET_PROP(OnePTestProblem, Fluid)
@@ -73,18 +65,6 @@ SET_TYPE_PROP(OnePTestProblem, Problem, OnePTestProblem<TypeTag> );
// Set the spatial parameters
SET_TYPE_PROP(OnePTestProblem, SpatialParams, OnePTestSpatialParams<TypeTag> );
-
-// Linear solver settings
-SET_TYPE_PROP(OnePTestProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-
-NEW_TYPE_TAG(OnePTestBoxProblemWithAMG, INHERITS_FROM(OnePTestBoxProblem));
-NEW_TYPE_TAG(OnePTestCCProblemWithAMG, INHERITS_FROM(OnePTestCCProblem));
-// Solver settings for the tests using AMG
-SET_TYPE_PROP(OnePTestBoxProblemWithAMG, LinearSolver, AMGBackend<TypeTag> );
-SET_TYPE_PROP(OnePTestCCProblemWithAMG, LinearSolver, AMGBackend<TypeTag> );
-
-// Enable gravity
-SET_BOOL_PROP(OnePTestProblem, ProblemEnableGravity, true);
}
/*!
@@ -110,46 +90,43 @@ SET_BOOL_PROP(OnePTestProblem, ProblemEnableGravity, true);
* and use <tt>test_1p_3d.dgf</tt> in the parameter file.
*/
template <class TypeTag>
-class OnePTestProblem : public ImplicitPorousMediaProblem<TypeTag>
+class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
{
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- enum {
- // Grid and world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+// enum {
+// // Grid and world dimension
+// dim = GridView::dimension,
+// dimWorld = GridView::dimensionworld
+// };
enum {
// indices of the primary variables
conti0EqIdx = Indices::conti0EqIdx,
pressureIdx = Indices::pressureIdx
};
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using SourceValues = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
+ static constexpr int dimWorld = GridView::dimensionworld;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
- OnePTestProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ OnePTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- std::string,
- Problem,
- Name);
+ name_ = getParam<std::string>("Problem.Name");
}
/*!
@@ -175,16 +152,6 @@ public:
Scalar temperature() const
{ return 273.15 + 10; } // 10C
- /*!
- * \brief Return the sources within the domain.
- *
- * \param values Stores the source values, acts as return value
- * \param globalPos The global position
- */
- PrimaryVariables sourceAtPos(const GlobalPosition &globalPos) const
- {
- return PrimaryVariables(0);
- }
// \}
/*!
* \name Boundary conditions
@@ -202,8 +169,7 @@ public:
{
BoundaryTypes values;
- Scalar eps = 1.0e-6;
- if (globalPos[dimWorld-1] < eps || globalPos[dimWorld-1] > this->bBoxMax()[dimWorld-1] - eps)
+ if (globalPos[dimWorld-1] < eps_ || globalPos[dimWorld-1] > this->fvGridGeometry().bBoxMax()[dimWorld-1] - eps_)
values.setAllDirichlet();
else
values.setAllNeumann();
@@ -227,19 +193,6 @@ public:
return values;
}
- /*!
- * \brief Evaluate the boundary conditions for a neumann
- * boundary segment.
- *
- * For this method, the \a priVars parameter stores the mass flux
- * in normal direction of each component. Negative values mean
- * influx.
- */
- PrimaryVariables neumannAtPos(const GlobalPosition& globalPos) const
- {
- return PrimaryVariables(0);
- }
-
// \}
/*!
@@ -255,7 +208,7 @@ public:
*/
PrimaryVariables initialAtPos(const GlobalPosition& globalPos) const
{
- PrimaryVariables priVars(0);
+ PrimaryVariables priVars(0.0);
priVars[pressureIdx] = 1.0e+5;
return priVars;
}
@@ -264,7 +217,9 @@ public:
private:
std::string name_;
+ static constexpr Scalar eps_ = 1.0e-6;
};
-} //end namespace
+
+} //end namespace Dumux
#endif
diff --git a/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh b/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh
index 6d680121c6e7a0af8ce951335b0fc3e617061b3d..c8489ccf7feaedce49175dad45ca6089845a8a52 100644
--- a/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/1ptestspatialparams.hh
@@ -39,10 +39,6 @@ namespace Properties
{
// The spatial parameters TypeTag
NEW_TYPE_TAG(OnePTestSpatialParams);
-
-// Set properties of the porous medium
-NEW_PROP_TAG(SpatialParamsRandomField);
-SET_BOOL_PROP(OnePTestSpatialParams, SpatialParamsRandomField, false);
}
/*!
@@ -62,7 +58,7 @@ class OnePTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using IndexSet = typename GridView::IndexSet;
- using ScalarVector = std::vector<Scalar>;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
enum {
dim=GridView::dimension,
@@ -76,20 +72,20 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- OnePTestSpatialParams(const Problem& problem, const GridView& gridView)
- : ParentType(problem, gridView),
- randomPermeability_(gridView.size(dim), 0.0),
- indexSet_(gridView.indexSet())
+ OnePTestSpatialParams(const Problem& problem)
+ : ParentType(problem),
+ randomPermeability_(problem.fvGridGeometry().gridView().size(dim), 0.0),
+ indexSet_(problem.fvGridGeometry().gridView().indexSet())
{
- randomField_ = GET_PARAM_FROM_GROUP(TypeTag, bool, SpatialParams, RandomField);
- permeability_ = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.Permeability);
+ randomField_ = getParam<bool>("SpatialParams.RandomField", false);
+ permeability_ = getParam<Scalar>("SpatialParams.Permeability");
if(!randomField_)
- permeabilityLens_ = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.PermeabilityLens);
+ permeabilityLens_ = getParam<Scalar>("SpatialParams.PermeabilityLens");
else
- initRandomField(gridView);
+ initRandomField(problem.fvGridGeometry());
- lensLowerLeft_ = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensLowerLeft);
- lensUpperRight_ = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensUpperRight);
+ lensLowerLeft_ = getParam<GlobalPosition>("SpatialParams.LensLowerLeft");
+ lensUpperRight_ = getParam<GlobalPosition>("SpatialParams.LensUpperRight");
}
/*!
@@ -127,32 +123,32 @@ public:
*
* \param gridView The GridView used by the problem
*/
- void initRandomField(const GridView& gridView)
+ void initRandomField(const FVGridGeometry& gg)
{
- std::string gStatControlFile = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Gstat, ControlFile);
- std::string gStatInputFile = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Gstat, InputFile);
- std::string outputFilePrefix = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Gstat, OutputFilePrefix);
+ const auto& gridView = gg.gridView();
+ const auto& elementMapper = gg.elementMapper();
+ const auto gStatControlFile = getParam<std::string>("Gstat.ControlFile");
+ const auto gStatInputFile = getParam<std::string>("Gstat.InputFile");
+ const auto outputFilePrefix = getParam<std::string>("Gstat.OutputFilePrefix");
// create random permeability object
- GstatRandomField<GridView, Scalar> randomPermeabilityField(gridView);
+ using RandomField = GstatRandomField<GridView, Scalar>;
+ RandomField randomPermeabilityField(gridView, elementMapper);
randomPermeabilityField.create(gStatControlFile,
gStatInputFile,
outputFilePrefix + ".dat",
- GstatRandomField<GridView, Scalar>::FieldType::log10,
+ RandomField::FieldType::log10,
true);
randomPermeability_.resize(gridView.size(dim), 0.0);
// copy vector from the temporary gstat object
- for (const auto& element : elements(gridView))
- {
- auto index = indexSet_.index(element.template subEntity<dim> (/*scvIdx=*/0));
- randomPermeability_[index] = randomPermeabilityField.data(element);
- }
-
- // output the random field to vtk
- randomPermeabilityField.writeVtk(outputFilePrefix, "absolute permeability");
+ randomPermeability_ = randomPermeabilityField.data();
}
+ //! get the permeability field for output
+ const std::vector<Scalar>& getPermField() const
+ { return randomPermeability_; }
+
private:
bool isInLens_(const GlobalPosition &globalPos) const
{
@@ -168,7 +164,7 @@ private:
GlobalPosition lensUpperRight_;
Scalar permeability_, permeabilityLens_;
- ScalarVector randomPermeability_;
+ std::vector<Scalar> randomPermeability_;
const IndexSet& indexSet_;
static constexpr Scalar eps_ = 1.5e-7;
diff --git a/test/porousmediumflow/1p/implicit/CMakeLists.txt b/test/porousmediumflow/1p/implicit/CMakeLists.txt
index 0997c152fe295579c19a28b42039a1834026ccb6..7835c4f25984ab9f1e3f62e0e7f7a8ac695d7930 100644
--- a/test/porousmediumflow/1p/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/CMakeLists.txt
@@ -1,117 +1,151 @@
add_subdirectory(pointsources)
+add_subdirectory(incompressible)
+add_subdirectory(compressible)
add_input_file_links()
add_gstat_file_links()
+dune_symlink_to_source_files(FILES grids)
dune_symlink_to_source_files(FILES "tubesconvergencetest.py")
# isothermal tests
-add_dumux_test(test_box1p test_box1p test_box1p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1ptestbox-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box1p")
-
-add_dumux_test(test_box1pwithamg test_box1pwithamg test_box1pwithamg.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1ptestboxwithamg-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box1pwithamg")
-
-add_dumux_test(test_cc1p test_cc1p test_cc1p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1ptestcc-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1p")
-
-add_dumux_test(test_ccmpfa1p test_ccmpfa1p test_ccmpfa1p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestccmpfa-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1ptestccmpfa-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccmpfa1p")
-
-add_dumux_test(test_cc1pwithamg test_cc1pwithamg test_cc1pwithamg.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1ptestccwithamg-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1pwithamg")
-
-add_dumux_test(test_cc1pwithgstat test_cc1pwithgstat test_cc1pwithgstat.cc
- ./test_cc1pwithgstat)
+dune_add_test(NAME test_1pcctpfa
+ SOURCES test_1pfv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfaProblem
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1ptestcctpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pcctpfa test_1pfv.input -Problem.Name 1ptestcctpfa")
+
+dune_add_test(NAME test_1pccmpfa
+ SOURCES test_1pfv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePTestCCMpfaProblem
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1ptestccmpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pccmpfa test_1pfv.input -Problem.Name 1ptestccmpfa")
+
+dune_add_test(NAME test_1pbox
+ SOURCES test_1pfv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePTestBoxProblem
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1ptestbox-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pbox test_1pfv.input -Problem.Name 1ptestbox")
+
+# a gstat test (becaue it's a random permeability field we can't test against a reference solution)
+dune_add_test(NAME test_1pwithgstat
+ SOURCES test_1pfv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfaProblem
+ CMAKE_GUARD HAVE_GSTAT)
# non-isothermal tests
-add_dumux_test(test_box1pniconduction test_box1pniconduction test_box1pniconduction.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1pniboxconduction-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/box1pniconduction-00006.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box1pniconduction"
- --zeroThreshold {"velocity_H2O":1e-8})
-
-add_dumux_test(test_box1pniconvection test_box1pniconvection test_box1pniconvection.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1pniboxconvection-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/box1pniconvection-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box1pniconvection"
- --zeroThreshold {"velocity":1e-15})
-
-add_dumux_test(test_cc1pniconduction test_cc1pniconduction test_cc1pniconduction.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1pniccconduction-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/cc1pniconduction-00006.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1pniconduction"
- --zeroThreshold {"velocity":1e-8})
-
-add_dumux_test(test_cc1pniconvection test_cc1pniconvection test_cc1pniconvection.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1pniccconvection-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/cc1pniconvection-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1pniconvection")
-
-add_dumux_test(test_ccmpfa1pniconduction test_ccmpfa1pniconduction test_ccmpfa1pniconduction.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/ccmpfa1pniconduction-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/ccmpfa1pniconduction-00006.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccmpfa1pniconduction")
-
-add_dumux_test(test_ccmpfa1pniconvection test_ccmpfa1pniconvection test_ccmpfa1pniconvection.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/ccmpfa1pniconvection-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/ccmpfa1pniconvection-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccmpfa1pniconvection")
-
-# dim < dimWorld tests with foamgrid
-dune_add_test(SOURCES test_box1pnetwork1d3d.cc
- NAME test_box1pnetwork1d3d
- COMMAND ./tubesconvergencetest.py test_box1pnetwork1d3d)
-
-add_dumux_test(test_box1pfracture2d3d test_box1pfracture2d3d test_box1pfracture2d3d.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1pboxfracture2d3d-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1pboxfracture2d3d-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box1pfracture2d3d")
-
-dune_add_test(SOURCES test_cc1pnetwork1d3d.cc
- NAME test_cc1pnetwork1d3d
- COMMAND ./tubesconvergencetest.py test_cc1pnetwork1d3d)
-
-add_dumux_test(test_cc1pfracture2d3d test_cc1pfracture2d3d test_cc1pfracture2d3d.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1pccfracture2d3d-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1pccfracture2d3d-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1pfracture2d3d")
+dune_add_test(NAME test_1pnibox_conduction
+ SOURCES test_1pnifv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConductionBoxProblem
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1pniboxconduction-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1pnibox_conduction-00006.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pnibox_conduction test_1pnifv_conduction.input -Problem.Name 1pnibox_conduction"
+ --zeroThreshold {"velocity_H2O":1e-8})
+
+dune_add_test(NAME test_1pnibox_convection
+ SOURCES test_1pnifv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionBoxProblem
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1pniboxconvection-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1pnibox_convection-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pnibox_convection test_1pnifv_convection.input -Problem.Name 1pnibox_convection"
+ --zeroThreshold {"velocity":1e-15})
+
+dune_add_test(NAME test_1pnicctpfa_conduction
+ SOURCES test_1pnifv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCTpfaProblem
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1pniccconduction-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1pnicctpfa_conduction-00006.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pnicctpfa_conduction test_1pnifv_conduction.input -Problem.Name 1pnicctpfa_conduction"
+ --zeroThreshold {"velocity":1e-8})
+
+dune_add_test(NAME test_1pnicctpfa_convection
+ SOURCES test_1pnifv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionCCTpfaProblem
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1pniccconvection-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1pnicctpfa_convection-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pnicctpfa_convection test_1pnifv_convection.input -Problem.Name 1pnicctpfa_convection")
+
+dune_add_test(NAME test_1pniccmpfa_conduction
+ SOURCES test_1pnifv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCMpfaProblem
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/ccmpfa1pniconduction-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1pniccmpfa_conduction-00006.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pniccmpfa_conduction test_1pnifv_conduction.input -Problem.Name 1pniccmpfa_conduction")
+
+dune_add_test(NAME test_1pniccmpfa_convection
+ SOURCES test_1pnifv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionCCMpfaProblem
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/ccmpfa1pniconvection-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1pniccmpfa_convection-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pniccmpfa_convection test_1pnifv_convection.input -Problem.Name 1pniccmpfa_convection")
+
+# dim < dimWorld tests with Dune::Foamgrid<1,3>
+dune_add_test(NAME test_1pcctpfa_network1d3d
+ SOURCES test_1pfv_network1d3d.cc
+ COMPILE_DEFINITIONS TYPETAG=TubesTestCCTpfaProblem
+ CMAKE_GUARD dune-foamgrid_FOUND
+ COMMAND ./tubesconvergencetest.py
+ CMD_ARGS test_1pcctpfa_network1d3d test_1pfv_network1d3d.input -Problem.Name test_1pcctpfa_network1d3d)
+
+dune_add_test(NAME test_1pbox_network1d3d
+ SOURCES test_1pfv_network1d3d.cc
+ COMPILE_DEFINITIONS TYPETAG=TubesTestBoxProblem
+ CMAKE_GUARD dune-foamgrid_FOUND
+ COMMAND ./tubesconvergencetest.py
+ CMD_ARGS test_1pbox_network1d3d test_1pfv_network1d3d.input -Problem.Name test_1pbox_network1d3d)
+
+# dim < dimWorld tests with Dune::Foamgrid<2,3>
+dune_add_test(NAME test_1pbox_fracture2d3d
+ SOURCES test_1pfv_fracture2d3d.cc
+ COMPILE_DEFINITIONS TYPETAG=FractureBoxProblem
+ CMAKE_GUARD dune-foamgrid_FOUND
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1pboxfracture2d3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1pbox_fracture2d3d-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pbox_fracture2d3d test_1pfv_fracture2d3d.input -Problem.Name 1pbox_fracture2d3d")
+
+dune_add_test(NAME test_1pcctpfa_fracture2d3d
+ SOURCES test_1pfv_fracture2d3d.cc
+ COMPILE_DEFINITIONS TYPETAG=FractureCCTpfaProblem
+ CMAKE_GUARD dune-foamgrid_FOUND
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1pccfracture2d3d-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1pcctpfa_fracture2d3d-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pcctpfa_fracture2d3d test_1pfv_fracture2d3d.input -Problem.Name 1pcctpfa_fracture2d3d")
+
+# TODO: Fix this test mpfa 2d3d!
+# dune_add_test(NAME test_1pccmpfa_fracture2d3d
+# SOURCES test_1pfv_fracture2d3d.cc
+# COMPILE_DEFINITIONS TYPETAG=FractureCCMpfaProblem
+# CMAKE_GUARD dune-foamgrid_FOUND
+# COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+# CMD_ARGS --script fuzzy
+# --files ${CMAKE_SOURCE_DIR}/test/references/1pccfracture2d3d-reference.vtu
+# ${CMAKE_CURRENT_BINARY_DIR}/1pccmpfa_fracture2d3d-00001.vtu
+# --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pccmpfa_fracture2d3d test_1pfv_fracture2d3d.input -Problem.Name 1pccmpfa_fracture2d3d")
#install sources
install(FILES
@@ -124,18 +158,8 @@ fractureproblem.hh
fracturespatialparams.hh
tubesproblem.hh
tubesspatialparams.hh
-test_box1pfracture2d3d.cc
-test_box1pnetwork1d3d.cc
-test_box1p.cc
-test_box1pniconduction.cc
-test_box1pniconvection.cc
-test_box1pwithamg.cc
-test_cc1pfracture2d3d.cc
-test_cc1pnetwork1d3d.cc
-test_cc1p.cc
-test_cc1pniconduction.cc
-test_cc1pniconvection.cc
-test_cc1pwithamg.cc
-test_ccmpfa1pniconduction.cc
-test_ccmpfa1pniconvection.cc
+test_1pfv.cc
+test_1pnifv.cc
+test_1pfv_fracture2d3d.cc
+test_1pfv_network1d3d.cc
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/1p)
diff --git a/test/porousmediumflow/1p/implicit/compressible/CMakeLists.txt b/test/porousmediumflow/1p/implicit/compressible/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..93803d4db5d272251efcd80994d8d445a647f010
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/compressible/CMakeLists.txt
@@ -0,0 +1,59 @@
+dune_symlink_to_source_files(FILES "test_1p.input" "test_1p_stationary.input")
+
+# compressible instationary
+dune_add_test(NAME test_1p_compressible_tpfa
+ SOURCES test_1p.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_tpfa-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_tpfa test_1p.input -Problem.Name 1p_tpfa")
+
+dune_add_test(NAME test_1p_compressible_mpfa
+ SOURCES test_1p.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_mpfa-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_mpfa test_1p.input -Problem.Name 1p_mpfa")
+
+dune_add_test(NAME test_1p_compressible_box
+ SOURCES test_1p.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePCompressibleBox
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_box-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_box test_1p.input -Problem.Name 1p_box")
+
+# compressible stationary
+dune_add_test(NAME test_1p_compressible_stationary_tpfa
+ SOURCES test_1p_stationary.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_stationary_tpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_tpfa test_1p_stationary.input -Problem.Name 1p_stationary_tpfa")
+
+dune_add_test(NAME test_1p_compressible_stationary_mpfa
+ SOURCES test_1p_stationary.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_stationary_mpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_mpfa test_1p_stationary.input -Problem.Name 1p_stationary_mpfa")
+
+dune_add_test(NAME test_1p_compressible_stationary_box
+ SOURCES test_1p_stationary.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePCompressibleBox
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1p_stationary_box-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_box test_1p_stationary.input -Problem.Name 1p_stationary_box")
+
+set(CMAKE_BUILD_TYPE Release)
diff --git a/test/porousmediumflow/1p/implicit/compressible/problem.hh b/test/porousmediumflow/1p/implicit/compressible/problem.hh
new file mode 100644
index 0000000000000000000000000000000000000000..c3b778d8a27f6509d8fe1c298fc43fe5a25fdb9a
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/compressible/problem.hh
@@ -0,0 +1,162 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief The properties for the incompressible test
+ */
+#ifndef DUMUX_INCOMPRESSIBLE_ONEP_TEST_PROBLEM_HH
+#define DUMUX_INCOMPRESSIBLE_ONEP_TEST_PROBLEM_HH
+
+#include <dumux/material/components/h2o.hh>
+#include <dumux/material/components/tabulatedcomponent.hh>
+#include <dumux/material/fluidsystems/liquidphase.hh>
+
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box/properties.hh>
+
+#include <dumux/porousmediumflow/problem.hh>
+#include <dumux/porousmediumflow/1p/implicit/model.hh>
+
+#include "spatialparams.hh"
+
+namespace Dumux
+{
+// forward declarations
+template<class TypeTag> class OnePTestProblem;
+
+namespace Properties
+{
+// create the type tag nodes
+NEW_TYPE_TAG(OnePCompressible, INHERITS_FROM(OneP));
+NEW_TYPE_TAG(OnePCompressibleTpfa, INHERITS_FROM(CCTpfaModel, OnePCompressible));
+NEW_TYPE_TAG(OnePCompressibleMpfa, INHERITS_FROM(CCMpfaModel, OnePCompressible));
+NEW_TYPE_TAG(OnePCompressibleBox, INHERITS_FROM(BoxModel, OnePCompressible));
+
+// Set the grid type
+SET_TYPE_PROP(OnePCompressible, Grid, Dune::YaspGrid<2>);
+
+// Set the problem type
+SET_TYPE_PROP(OnePCompressible, Problem, OnePTestProblem<TypeTag>);
+
+// set the spatial params
+SET_TYPE_PROP(OnePCompressible, SpatialParams, OnePTestSpatialParams<TypeTag>);
+
+// the fluid system
+SET_PROP(OnePCompressible, FluidSystem)
+{
+private:
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+public:
+ using type = FluidSystems::LiquidPhase<Scalar, TabulatedComponent<Scalar, H2O<Scalar>>>;
+};
+
+// Disable caching (for testing purposes)
+SET_BOOL_PROP(OnePCompressible, EnableGlobalVolumeVariablesCache, false);
+SET_BOOL_PROP(OnePCompressible, EnableGlobalFluxVariablesCache, false);
+SET_BOOL_PROP(OnePCompressible, EnableFVGridGeometryCache, false);
+
+} // end namespace Properties
+
+template<class TypeTag>
+class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
+{
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ static constexpr int dimWorld = GridView::dimensionworld;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+
+public:
+ OnePTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
+ {
+ TabulatedComponent<Scalar, H2O<Scalar>>::init(272.15, 294.15, 10,
+ 1.0e4, 1.0e6, 200);
+ }
+
+ /*!
+ * \brief Specifies which kind of boundary condition should be
+ * used for which equation on a given boundary control volume.
+ *
+ * \param values The boundary types for the conservation equations
+ * \param globalPos The position of the center of the finite volume
+ */
+ BoundaryTypes boundaryTypesAtPos(const GlobalPosition &globalPos) const
+ {
+ BoundaryTypes values;
+
+ Scalar eps = 1.0e-6;
+ if (globalPos[dimWorld-1] < eps || globalPos[dimWorld-1] > this->fvGridGeometry().bBoxMax()[dimWorld-1] - eps)
+ values.setAllDirichlet();
+ else
+ values.setAllNeumann();
+
+ return values;
+ }
+
+ /*!
+ * \brief Evaluate the boundary conditions for a dirichlet
+ * control volume.
+ *
+ * \param values The dirichlet values for the primary variables
+ * \param globalPos The center of the finite volume which ought to be set.
+ *
+ * For this method, the \a values parameter stores primary variables.
+ */
+ PrimaryVariables dirichletAtPos(const GlobalPosition &globalPos) const
+ {
+ PrimaryVariables values(0);
+ values[0] = 1.0e+5*(2.0 - globalPos[dimWorld-1]);
+ return values;
+ }
+
+ /*!
+ * \brief Evaluate the initial conditions
+ *
+ * \param globalPos The center of the finite volume which ought to be set.
+ */
+ PrimaryVariables initialAtPos(const GlobalPosition& globalPos) const
+ {
+ return PrimaryVariables(1.0e5);
+ }
+
+ /*!
+ * \brief Returns the temperature \f$\mathrm{[K]}\f$ for an isothermal problem.
+ *
+ * This is not specific to the discretization. By default it just
+ * throws an exception so it must be overloaded by the problem if
+ * no energy equation is used.
+ */
+ Scalar temperature() const
+ {
+ return 283.15; // 10°C
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh b/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh
new file mode 100644
index 0000000000000000000000000000000000000000..5339d8f3c2b68409e59fb3e96f830e3b2960673b
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/compressible/spatialparams.hh
@@ -0,0 +1,109 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief The spatial params the incompressible test
+ */
+#ifndef DUMUX_COMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
+#define DUMUX_COMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
+
+#include <dumux/material/spatialparams/implicit1p.hh>
+
+namespace Dumux
+{
+
+template<class TypeTag>
+class OnePTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+{
+ using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
+
+ static constexpr int dimWorld = GridView::dimensionworld;
+
+public:
+ using PermeabilityType = Scalar;
+ OnePTestSpatialParams(const Problem& problem)
+ : ParentType(problem)
+ {
+ permeability_ = getParam<Scalar>("SpatialParams.Permeability");
+ permeabilityLens_ = getParam<Scalar>("SpatialParams.PermeabilityLens");
+
+ lensLowerLeft_ = getParam<GlobalPosition>("SpatialParams.LensLowerLeft");
+ lensUpperRight_ = getParam<GlobalPosition>("SpatialParams.LensUpperRight");
+ }
+
+ /*!
+ * \brief Function for defining the (intrinsic) permeability \f$[m^2]\f$.
+ *
+ * \param element The element
+ * \param scv The sub control volume
+ * \param elemSol The element solution vector
+ * \return the intrinsic permeability
+ */
+ PermeabilityType permeability(const Element& element,
+ const SubControlVolume& scv,
+ const ElementSolutionVector& elemSol) const
+ {
+ if (isInLens_(scv.dofPosition()))
+ return permeabilityLens_;
+ else
+ return permeability_;
+ }
+
+ /*!
+ * \brief Function for defining the porosity.
+ * That is possibly solution dependent.
+ *
+ * \param element The current element
+ * \param scv The sub-control volume inside the element.
+ * \param elemSol The solution at the dofs connected to the element.
+ * \return the porosity
+ */
+ Scalar porosity(const Element &element,
+ const SubControlVolume &scv,
+ const ElementSolutionVector &elemSol) const
+ { return 0.4; }
+
+private:
+ bool isInLens_(const GlobalPosition &globalPos) const
+ {
+ for (int i = 0; i < dimWorld; ++i) {
+ if (globalPos[i] < lensLowerLeft_[i] + eps_ || globalPos[i] > lensUpperRight_[i] - eps_)
+ return false;
+ }
+ return true;
+ }
+
+ GlobalPosition lensLowerLeft_;
+ GlobalPosition lensUpperRight_;
+
+ Scalar permeability_, permeabilityLens_;
+
+ static constexpr Scalar eps_ = 1.5e-7;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/test/porousmediumflow/1p/implicit/compressible/test_1p.cc b/test/porousmediumflow/1p/implicit/compressible/test_1p.cc
new file mode 100644
index 0000000000000000000000000000000000000000..2cce167e02338923a15e8365d49ed31e4311050b
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/compressible/test_1p.cc
@@ -0,0 +1,222 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the one-phase CC model
+ */
+#include <config.h>
+
+#include "problem.hh"
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+#include <dumux/common/parameterparser.hh>
+
+#include <dumux/nonlinear/newtoncontroller.hh>
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ ////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // initialize parameter tree
+ Parameters::init(argc, argv);
+
+ //////////////////////////////////////////////////////////////////////
+ // try to create a grid (from the given grid file or the input file)
+ /////////////////////////////////////////////////////////////////////
+
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+ auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+
+ // intialize the vtk output module
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<CheckPointTimeLoop<Scalar>>(0.0, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = ILU0BiCGSTABBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>();
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod<NewtonController, Assembler, LinearSolver> nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // set some check points for the time loop
+ timeLoop->setPeriodicCheckPoint(tEnd/10.0);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ if (timeLoop->isCheckPoint())
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/false);
+
+ return 0;
+
+}
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/1p/implicit/compressible/test_1p.input b/test/porousmediumflow/1p/implicit/compressible/test_1p.input
new file mode 100644
index 0000000000000000000000000000000000000000..f2f1e8b726183abce713cc4ec4bf55f2270f9e39
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/compressible/test_1p.input
@@ -0,0 +1,18 @@
+[TimeLoop]
+TEnd = 0.1
+DtInitial = 0.002
+
+[Grid]
+LowerLeft = 0 0
+UpperRight = 1 1
+Cells = 10 10
+
+[Problem]
+Name = 1p
+
+[SpatialParams]
+LensLowerLeft = 0.2 0.2
+LensUpperRight = 0.8 0.8
+
+Permeability = 1e-10 # [m^2]
+PermeabilityLens = 1e-12 # [m^2]
diff --git a/test/porousmediumflow/1p/implicit/compressible/test_1p_stationary.cc b/test/porousmediumflow/1p/implicit/compressible/test_1p_stationary.cc
new file mode 100644
index 0000000000000000000000000000000000000000..cf5ab4a23dfcf8a9a9c588bd0da69759229a567a
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/compressible/test_1p_stationary.cc
@@ -0,0 +1,172 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the one-phase CC model
+ */
+#include <config.h>
+
+#include "problem.hh"
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+#include <dumux/common/parameterparser.hh>
+
+#include <dumux/nonlinear/newtoncontroller.hh>
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ ////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // initialize parameter tree
+ Parameters::init(argc, argv);
+
+ //////////////////////////////////////////////////////////////////////
+ // try to create a grid (from the given grid file or the input file)
+ /////////////////////////////////////////////////////////////////////
+
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x);
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables);
+
+ // the linear solver
+ using LinearSolver = ILU0BiCGSTABBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>();
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm());
+ NewtonMethod<NewtonController, Assembler, LinearSolver> nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // linearize & solve
+ Dune::Timer timer;
+ nonLinearSolver.solve(x);
+
+ // write vtk output
+ vtkWriter.write(1.0);
+
+ timer.stop();
+
+ const auto& comm = Dune::MPIHelper::getCollectiveCommunication();
+ std::cout << "Simulation took " << timer.elapsed() << " seconds on "
+ << comm.size() << " processes.\n"
+ << "The cumulative CPU time was " << timer.elapsed()*comm.size() << " seconds.\n";
+
+ ////////////////////////////////////////////////////////////
+ // print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/false);
+
+ return 0;
+
+}
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/1p/implicit/compressible/test_1p_stationary.input b/test/porousmediumflow/1p/implicit/compressible/test_1p_stationary.input
new file mode 100644
index 0000000000000000000000000000000000000000..a5c0dd2284adcd9f3b258973b615746eb01af251
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/compressible/test_1p_stationary.input
@@ -0,0 +1,14 @@
+[Grid]
+LowerLeft = 0 0
+UpperRight = 1 1
+Cells = 10 10
+
+[Problem]
+Name = 1p
+
+[SpatialParams]
+LensLowerLeft = 0.2 0.2
+LensUpperRight = 0.8 0.8
+
+Permeability = 1e-10 # [m^2]
+PermeabilityLens = 1e-12 # [m^2]
diff --git a/test/porousmediumflow/1p/implicit/fractureproblem.hh b/test/porousmediumflow/1p/implicit/fractureproblem.hh
index 62b0db658bc827dee60436768c95b05403fc81c8..5f331c11e755b38f651136bfce4f7aa0f984fda5 100644
--- a/test/porousmediumflow/1p/implicit/fractureproblem.hh
+++ b/test/porousmediumflow/1p/implicit/fractureproblem.hh
@@ -28,11 +28,10 @@
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/porousmediumflow/1p/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/implicit/box/properties.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/implicit/cellcentered/propertydefaults.hh>
+#include <dumux/porousmediumflow/problem.hh>
+#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/mpfa/properties.hh>
#include "fracturespatialparams.hh"
@@ -46,12 +45,13 @@ namespace Properties
{
NEW_TYPE_TAG(FractureProblem, INHERITS_FROM(OneP, FractureSpatialParams));
NEW_TYPE_TAG(FractureBoxProblem, INHERITS_FROM(BoxModel, FractureProblem));
-NEW_TYPE_TAG(FractureCCProblem, INHERITS_FROM(CCTpfaModel, FractureProblem));
+NEW_TYPE_TAG(FractureCCTpfaProblem, INHERITS_FROM(CCTpfaModel, FractureProblem));
NEW_TYPE_TAG(FractureCCMpfaProblem, INHERITS_FROM(CCMpfaModel, FractureProblem));
-SET_BOOL_PROP(FractureCCProblem, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(FractureCCProblem, EnableGlobalVolumeVariablesCache, true);
-SET_BOOL_PROP(FractureCCProblem, EnableGlobalFluxVariablesCache, true);
+//! Enable caching (more memory, but faster runtime)
+SET_BOOL_PROP(FractureProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(FractureProblem, EnableGlobalVolumeVariablesCache, true);
+SET_BOOL_PROP(FractureProblem, EnableGlobalFluxVariablesCache, true);
#if HAVE_DUNE_FOAMGRID
SET_TYPE_PROP(FractureProblem, Grid, Dune::FoamGrid<2, 3>);
@@ -71,11 +71,7 @@ public:
using type = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar>>;
};
-// Linear solver settings
-SET_TYPE_PROP(FractureProblem, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag>);
-
-SET_BOOL_PROP(FractureProblem, ProblemEnableGravity, false);
-}
+} // end namespace Properties
/*!
* \ingroup OnePModel
@@ -86,9 +82,9 @@ SET_BOOL_PROP(FractureProblem, ProblemEnableGravity, false);
* This problem uses the \ref OnePModel.
*/
template <class TypeTag>
-class FractureProblem : public ImplicitPorousMediaProblem<TypeTag>
+class FractureProblem : public PorousMediumFlowProblem<TypeTag>
{
- using ParentType = ImplicitPorousMediaProblem<TypeTag>;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
@@ -105,21 +101,20 @@ class FractureProblem : public ImplicitPorousMediaProblem<TypeTag>
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
public:
/*!
* \brief The constructor
*
- * \param timeManager The time manager
- * \param gridView The grid view
+ * \param fvGridGeometry The finite volume grid geometry
*/
- FractureProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ FractureProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name);
+ name_ = getParam<std::string>("Problem.Name");
}
/*!
@@ -142,17 +137,17 @@ public:
*
* Will be called diretly after the time integration.
*/
- void postTimeStep()
- {
- // Calculate storage terms
- PrimaryVariables storage;
- this->model().globalStorage(storage);
-
- // Write mass balance information for rank 0
- if (this->gridView().comm().rank() == 0) {
- std::cout<<"Storage: " << storage << std::endl;
- }
- }
+ // void postTimeStep()
+ // {
+ // // Calculate storage terms
+ // PrimaryVariables storage;
+ // this->model().globalStorage(storage);
+ //
+ // // Write mass balance information for rank 0
+ // if (this->gridView().comm().rank() == 0) {
+ // std::cout<<"Storage: " << storage << std::endl;
+ // }
+ // }
/*!
* \brief Returns the temperature \f$ K \f$
@@ -162,18 +157,6 @@ public:
Scalar temperature() const
{ return 273.15 + 20; }
- /*!
- * \brief Returns the source term
- *
- * \param values Stores the source values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} / (m^\textrm{dim} \cdot s )] \f$
- * \param globalPos The global position
- */
- PrimaryVariables sourceAtPos(const GlobalPosition &globalPos) const
- {
- return PrimaryVariables(0.0);
- }
-
// \}
/*!
@@ -193,7 +176,8 @@ public:
BoundaryTypes values;
values.setAllNeumann();
- if (globalPos[0] > this->bBoxMax()[0] - eps_ || globalPos[0] < this->bBoxMin()[0] + eps_)
+ const auto& gg = this->fvGridGeometry();
+ if (globalPos[0] > gg.bBoxMax()[0] - eps_ || globalPos[0] < gg.bBoxMin()[0] + eps_)
values.setAllDirichlet();
return values;
@@ -212,22 +196,6 @@ public:
return initialAtPos(globalPos);
}
- /*!
- * \brief Evaluate the boundary conditions for a neumann
- * boundary segment.
- *
- * \param values Stores the Neumann values for the conservation equations in
- * \f$ [ \textnormal{unit of conserved quantity} / (m^(dim-1) \cdot s )] \f$
- * \param globalPos The position of the integration point of the boundary segment.
- *
- * For this method, the \a values parameter stores the mass flux
- * in normal direction of each phase. Negative values mean influx.
- */
- PrimaryVariables neumannAtPos(const GlobalPosition &globalPos) const
- {
- return PrimaryVariables(0.0);
- }
-
// \}
/*!
@@ -246,7 +214,8 @@ public:
PrimaryVariables initialAtPos(const GlobalPosition &globalPos) const
{
PrimaryVariables values(0.0);
- values[pressureIdx] = 1.0e5*(globalPos[0] - this->bBoxMin()[0])/(this->bBoxMax()[0] - this->bBoxMin()[0]) + 1.0e5;
+ const auto& gg = this->fvGridGeometry();
+ values[pressureIdx] = 1.0e5*(globalPos[0] - gg.bBoxMin()[0])/(gg.bBoxMax()[0] - gg.bBoxMin()[0]) + 1.0e5;
return values;
}
// \}
diff --git a/test/porousmediumflow/1p/implicit/fracturespatialparams.hh b/test/porousmediumflow/1p/implicit/fracturespatialparams.hh
index 33542ec26507780cf48bee997f054b3060874f46..1983b3257661ae154265e03c102a31c63e4c8116 100644
--- a/test/porousmediumflow/1p/implicit/fracturespatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/fracturespatialparams.hh
@@ -69,8 +69,8 @@ public:
*
* \param gridView The grid view
*/
- FractureSpatialParams(const Problem& problem, const GridView& gridView)
- : ParentType(problem, gridView)
+ FractureSpatialParams(const Problem& problem)
+ : ParentType(problem)
{}
/*!
diff --git a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..259bf65e4f9fa852d6feacce893af17fcbb807eb
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt
@@ -0,0 +1,33 @@
+dune_symlink_to_source_files(FILES "test_1p.input")
+
+# using tpfa
+dune_add_test(NAME test_1p_incompressible_tpfa
+ SOURCES test_1pfv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1ptestcctpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_tpfa test_1p.input -Problem.Name 1ptestcctpfa")
+
+# using mpfa
+dune_add_test(NAME test_1p_incompressible_mpfa
+ SOURCES test_1pfv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleMpfa
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1ptestccmpfa-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_mpfa test_1p.input -Problem.Name 1ptestccmpfa")
+
+# using box
+dune_add_test(NAME test_1p_incompressible_box
+ SOURCES test_1pfv.cc
+ COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleBox
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1ptestbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1ptestbox-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_incompressible_box test_1p.input -Problem.Name 1ptestbox")
+
+set(CMAKE_BUILD_TYPE Release)
diff --git a/test/porousmediumflow/1p/implicit/incompressible/problem.hh b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
new file mode 100644
index 0000000000000000000000000000000000000000..87ad5c05d674a1b42dec5a6f342016aef91e7526
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/incompressible/problem.hh
@@ -0,0 +1,154 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief The properties for the incompressible test
+ */
+#ifndef DUMUX_INCOMPRESSIBLE_ONEP_TEST_PROBLEM_HH
+#define DUMUX_INCOMPRESSIBLE_ONEP_TEST_PROBLEM_HH
+
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box/properties.hh>
+
+#include <dumux/porousmediumflow/problem.hh>
+#include <dumux/porousmediumflow/1p/implicit/model.hh>
+#include <dumux/porousmediumflow/1p/implicit/incompressiblelocalresidual.hh>
+
+#include <dumux/material/components/simpleh2o.hh>
+#include <dumux/material/fluidsystems/liquidphase.hh>
+
+#include "spatialparams.hh"
+
+namespace Dumux
+{
+// forward declarations
+template<class TypeTag> class OnePTestProblem;
+
+namespace Properties
+{
+// create the type tag nodes
+NEW_TYPE_TAG(OnePIncompressible, INHERITS_FROM(OneP));
+NEW_TYPE_TAG(OnePIncompressibleTpfa, INHERITS_FROM(CCTpfaModel, OnePIncompressible));
+NEW_TYPE_TAG(OnePIncompressibleMpfa, INHERITS_FROM(CCMpfaModel, OnePIncompressible));
+NEW_TYPE_TAG(OnePIncompressibleBox, INHERITS_FROM(BoxModel, OnePIncompressible));
+
+// Set the grid type
+SET_TYPE_PROP(OnePIncompressible, Grid, Dune::YaspGrid<2>);
+
+// Set the problem type
+SET_TYPE_PROP(OnePIncompressible, Problem, OnePTestProblem<TypeTag>);
+
+// set the spatial params
+SET_TYPE_PROP(OnePIncompressible, SpatialParams, OnePTestSpatialParams<TypeTag>);
+
+// use the incompressible local residual (provides analytic jacobian)
+SET_TYPE_PROP(OnePIncompressible, LocalResidual, OnePIncompressibleLocalResidual<TypeTag>);
+
+// the fluid system
+SET_PROP(OnePIncompressible, Fluid)
+{
+private:
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+public:
+ using type = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
+};
+
+// Enable caching
+SET_BOOL_PROP(OnePIncompressible, EnableGlobalVolumeVariablesCache, false);
+SET_BOOL_PROP(OnePIncompressible, EnableGlobalFluxVariablesCache, false);
+SET_BOOL_PROP(OnePIncompressible, EnableFVGridGeometryCache, false);
+
+} // end namespace Properties
+
+template<class TypeTag>
+class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
+{
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using PointSource = typename GET_PROP_TYPE(TypeTag, PointSource);
+ static constexpr int dimWorld = GridView::dimensionworld;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+
+public:
+ OnePTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry) {}
+
+ /*!
+ * \brief Specifies which kind of boundary condition should be
+ * used for which equation on a given boundary control volume.
+ *
+ * \param values The boundary types for the conservation equations
+ * \param globalPos The position of the center of the finite volume
+ */
+ BoundaryTypes boundaryTypesAtPos(const GlobalPosition &globalPos) const
+ {
+ BoundaryTypes values;
+
+ Scalar eps = 1.0e-6;
+ if (globalPos[dimWorld-1] < eps || globalPos[dimWorld-1] > this->fvGridGeometry().bBoxMax()[dimWorld-1] - eps)
+ values.setAllDirichlet();
+ else
+ values.setAllNeumann();
+
+ return values;
+ }
+
+ /*!
+ * \brief Evaluate the boundary conditions for a dirichlet
+ * control volume.
+ *
+ * \param values The dirichlet values for the primary variables
+ * \param globalPos The center of the finite volume which ought to be set.
+ *
+ * For this method, the \a values parameter stores primary variables.
+ */
+ PrimaryVariables dirichletAtPos(const GlobalPosition &globalPos) const
+ {
+ PrimaryVariables values(0);
+ values[0] = 1.0e+5*(2.0 - globalPos[dimWorld-1]);
+ return values;
+ }
+
+ /*!
+ * \brief Returns the temperature \f$\mathrm{[K]}\f$ for an isothermal problem.
+ *
+ * This is not specific to the discretization. By default it just
+ * throws an exception so it must be overloaded by the problem if
+ * no energy equation is used.
+ */
+ Scalar temperature() const
+ {
+ return 283.15; // 10°C
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
new file mode 100644
index 0000000000000000000000000000000000000000..5577c27fd39c71642a109b846b7fc09f770d5096
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/incompressible/spatialparams.hh
@@ -0,0 +1,109 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief The spatial params the incompressible test
+ */
+#ifndef DUMUX_INCOMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
+#define DUMUX_INCOMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
+
+#include <dumux/material/spatialparams/implicit1p.hh>
+
+namespace Dumux
+{
+
+template<class TypeTag>
+class OnePTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+{
+ using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
+
+ static constexpr int dimWorld = GridView::dimensionworld;
+
+public:
+ using PermeabilityType = Scalar;
+ OnePTestSpatialParams(const Problem& problem)
+ : ParentType(problem)
+ {
+ permeability_ = getParam<Scalar>("SpatialParams.Permeability");
+ permeabilityLens_ = getParam<Scalar>("SpatialParams.PermeabilityLens");
+
+ lensLowerLeft_ = getParam<GlobalPosition>("SpatialParams.LensLowerLeft");
+ lensUpperRight_ = getParam<GlobalPosition>("SpatialParams.LensUpperRight");
+ }
+
+ /*!
+ * \brief Function for defining the (intrinsic) permeability \f$[m^2]\f$.
+ *
+ * \param element The element
+ * \param scv The sub control volume
+ * \param elemSol The element solution vector
+ * \return the intrinsic permeability
+ */
+ PermeabilityType permeability(const Element& element,
+ const SubControlVolume& scv,
+ const ElementSolutionVector& elemSol) const
+ {
+ if (isInLens_(scv.dofPosition()))
+ return permeabilityLens_;
+ else
+ return permeability_;
+ }
+
+ /*!
+ * \brief Function for defining the porosity.
+ * That is possibly solution dependent.
+ *
+ * \param element The current element
+ * \param scv The sub-control volume inside the element.
+ * \param elemSol The solution at the dofs connected to the element.
+ * \return the porosity
+ */
+ Scalar porosity(const Element &element,
+ const SubControlVolume &scv,
+ const ElementSolutionVector &elemSol) const
+ { return 0.4; }
+
+private:
+ bool isInLens_(const GlobalPosition &globalPos) const
+ {
+ for (int i = 0; i < dimWorld; ++i) {
+ if (globalPos[i] < lensLowerLeft_[i] + eps_ || globalPos[i] > lensUpperRight_[i] - eps_)
+ return false;
+ }
+ return true;
+ }
+
+ GlobalPosition lensLowerLeft_;
+ GlobalPosition lensUpperRight_;
+
+ Scalar permeability_, permeabilityLens_;
+
+ static constexpr Scalar eps_ = 1.5e-7;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/test/porousmediumflow/1p/implicit/incompressible/test_1p.input b/test/porousmediumflow/1p/implicit/incompressible/test_1p.input
new file mode 100644
index 0000000000000000000000000000000000000000..ebf9ad8f55e047c86db93031d8d490fd57cc9168
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/incompressible/test_1p.input
@@ -0,0 +1,14 @@
+[Problem]
+Name = incompressible
+
+[Grid]
+LowerLeft = 0 0
+UpperRight = 1 1
+Cells = 10 10
+
+[SpatialParams]
+LensLowerLeft = 0.2 0.2
+LensUpperRight = 0.8 0.8
+
+Permeability = 1e-10 # [m^2]
+PermeabilityLens = 1e-12 # [m^2]
diff --git a/test/porousmediumflow/1p/implicit/incompressible/test_1pfv.cc b/test/porousmediumflow/1p/implicit/incompressible/test_1pfv.cc
new file mode 100644
index 0000000000000000000000000000000000000000..28eec4a2bbb7e3eeb4ac767b98bd970b0c0d43e3
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/incompressible/test_1pfv.cc
@@ -0,0 +1,171 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the one-phase CC model
+ */
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+
+#include <dumux/linear/seqsolverbackend.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+
+#include "problem.hh"
+
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ using TypeTag = TTAG(TYPETAG);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ ////////////////////////////////////////////////////////////
+ // parse the command line arguments and input file
+ ////////////////////////////////////////////////////////////
+
+ // parse command line arguments
+ Parameters::init(argc, argv);
+
+ //////////////////////////////////////////////////////////////////////
+ // try to create a grid (from the given grid file or the input file)
+ /////////////////////////////////////////////////////////////////////
+
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x);
+
+ // intialize the vtk output module
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // make assemble and attach linear system
+ using Assembler = FVAssembler<TypeTag, DiffMethod::analytic>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+ auto A = std::make_shared<JacobianMatrix>();
+ auto r = std::make_shared<SolutionVector>();
+ assembler->setLinearSystem(A, r);
+
+ Dune::Timer timer;
+ // assemble the local jacobian and the residual
+ Dune::Timer assemblyTimer;
+ if (mpiHelper.rank() == 0) std::cout << "Assembling linear system ..." << std::flush;
+ assembler->assembleJacobianAndResidual(x);
+ assemblyTimer.stop();
+ if (mpiHelper.rank() == 0) std::cout << " took " << assemblyTimer.elapsed() << " seconds." << std::endl;
+
+ // we solve Ax = -r to save update and copy
+ (*r) *= -1.0;
+
+ // // solve the linear system
+ Dune::Timer solverTimer;
+ using LinearSolver = SSORCGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>();
+
+ if (mpiHelper.rank() == 0) std::cout << "Solving linear system using " + linearSolver->name() + "..." << std::flush;
+ linearSolver->solve(*A, x, *r);
+ solverTimer.stop();
+ if (mpiHelper.rank() == 0) std::cout << " took " << solverTimer.elapsed() << " seconds." << std::endl;
+
+ // output result to vtk
+ vtkWriter.write(1.0);
+
+ timer.stop();
+
+ const auto& comm = Dune::MPIHelper::getCollectiveCommunication();
+ if (mpiHelper.rank() == 0)
+ std::cout << "Simulation took " << timer.elapsed() << " seconds on "
+ << comm.size() << " processes.\n"
+ << "The cumulative CPU time was " << timer.elapsed()*comm.size() << " seconds.\n";
+
+ if (mpiHelper.rank() == 0)
+ Parameters::print();
+
+ return 0;
+
+}
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh
index a50608bafaf0312e71bf6a8b32aeb65d617db3a7..c2e14adb08ade98767e753edef83796cb626d1c7 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblem.hh
@@ -25,9 +25,10 @@
#ifndef DUMUX_1P_SINGULARITY_PROBLEM_HH
#define DUMUX_1P_SINGULARITY_PROBLEM_HH
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box/properties.hh>
#include <dumux/porousmediumflow/1p/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/fluidsystems/liquidphase.hh>
@@ -40,11 +41,11 @@ class OnePSingularityProblem;
namespace Properties
{
-NEW_TYPE_TAG(OnePSingularityProblem, INHERITS_FROM(OneP));
-NEW_TYPE_TAG(OnePSingularityBoxProblem, INHERITS_FROM(BoxModel, OnePSingularityProblem));
-NEW_TYPE_TAG(OnePSingularityCCProblem, INHERITS_FROM(CCTpfaModel, OnePSingularityProblem));
+NEW_TYPE_TAG(OnePSingularityTypeTag, INHERITS_FROM(OneP));
+NEW_TYPE_TAG(OnePSingularityBoxTypeTag, INHERITS_FROM(BoxModel, OnePSingularityTypeTag));
+NEW_TYPE_TAG(OnePSingularityCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, OnePSingularityTypeTag));
-SET_PROP(OnePSingularityProblem, Fluid)
+SET_PROP(OnePSingularityTypeTag, Fluid)
{
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
@@ -53,20 +54,14 @@ public:
};
// Set the grid type
-SET_TYPE_PROP(OnePSingularityProblem, Grid,
+SET_TYPE_PROP(OnePSingularityTypeTag, Grid,
Dune::YaspGrid<2, Dune::EquidistantOffsetCoordinates<typename GET_PROP_TYPE(TypeTag, Scalar), 2> >);
// Set the problem property
-SET_TYPE_PROP(OnePSingularityProblem, Problem, OnePSingularityProblem<TypeTag> );
+SET_TYPE_PROP(OnePSingularityTypeTag, Problem, OnePSingularityProblem<TypeTag> );
// Set the spatial parameters
-SET_TYPE_PROP(OnePSingularityProblem, SpatialParams, OnePSingularitySpatialParams<TypeTag> );
-
-// Linear solver settings
-SET_TYPE_PROP(OnePSingularityProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-
-// Enable gravity
-SET_BOOL_PROP(OnePSingularityProblem, ProblemEnableGravity, false);
+SET_TYPE_PROP(OnePSingularityTypeTag, SpatialParams, OnePSingularitySpatialParams<TypeTag> );
}
/*!
@@ -84,9 +79,9 @@ SET_BOOL_PROP(OnePSingularityProblem, ProblemEnableGravity, false);
* <tt>./test_cc1p_pointsources</tt>
*/
template <class TypeTag>
-class OnePSingularityProblem : public ImplicitPorousMediaProblem<TypeTag>
+class OnePSingularityProblem : public PorousMediumFlowProblem<TypeTag>
{
- using ParentType = ImplicitPorousMediaProblem<TypeTag>;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
@@ -105,15 +100,15 @@ class OnePSingularityProblem : public ImplicitPorousMediaProblem<TypeTag>
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
using PointSource = typename GET_PROP_TYPE(TypeTag, PointSource);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
- OnePSingularityProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ OnePSingularityProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name);
+ name_ = getParam<std::string>("Problem.Name");
}
/*!
@@ -173,19 +168,6 @@ public:
return initialAtPos(globalPos);
}
- /*!
- * \brief Evaluate the boundary conditions for a neumann
- * boundary segment.
- *
- * For this method, the \a priVars parameter stores the mass flux
- * in normal direction of each component. Negative values mean
- * influx.
- */
- PrimaryVariables neumannAtPos(const GlobalPosition& globalPos) const
- {
- return PrimaryVariables(0.0);
- }
-
// \}
/*!
@@ -193,17 +175,6 @@ public:
*/
// \{
- /*!
- * \brief Return the sources within the domain.
- *
- * \param values Stores the source values, acts as return value
- * \param globalPos The global position
- */
- PrimaryVariables sourceAtPos(const GlobalPosition &globalPos) const
- {
- return PrimaryVariables(0.0);
- }
-
/*!
* \brief Applies a vector of point sources. The point sources
* are possibly solution dependent.
@@ -241,6 +212,6 @@ private:
std::string name_;
};
-} //end namespace
+} //end namespace Dumux
#endif
diff --git a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh
index 64263a9fbfbafc49ad6144ebdc1fb01c691b9823..ad01ca8c0c7a2a70324a5b9748c517c5744f533c 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/1psingularityproblemtimedependent.hh
@@ -25,12 +25,6 @@
#ifndef DUMUX_1P_SINGULARITY_TIME_DEP_PROBLEM_HH
#define DUMUX_1P_SINGULARITY_TIME_DEP_PROBLEM_HH
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
-#include <dumux/porousmediumflow/1p/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/material/components/simpleh2o.hh>
-#include <dumux/material/fluidsystems/liquidphase.hh>
-
#include "1psingularityproblem.hh"
namespace Dumux
@@ -40,13 +34,13 @@ class OnePSingularityProblemTimeDependent;
namespace Properties
{
-NEW_TYPE_TAG(OnePSingularityProblemTimeDependent, INHERITS_FROM(OnePSingularityCCProblem));
+NEW_TYPE_TAG(OnePSingularityTimeDependentCCTpfaTypeTag, INHERITS_FROM(OnePSingularityCCTpfaTypeTag));
// Set the problem property
-SET_TYPE_PROP(OnePSingularityProblemTimeDependent, Problem, OnePSingularityProblemTimeDependent<TypeTag>);
+SET_TYPE_PROP(OnePSingularityTimeDependentCCTpfaTypeTag, Problem, OnePSingularityProblemTimeDependent<TypeTag>);
// point source
-SET_TYPE_PROP(OnePSingularityProblemTimeDependent, PointSource, SolDependentPointSource<TypeTag>);
+SET_TYPE_PROP(OnePSingularityTimeDependentCCTpfaTypeTag, PointSource, SolDependentPointSource<TypeTag>);
}
/*!
@@ -71,7 +65,6 @@ class OnePSingularityProblemTimeDependent : public OnePSingularityProblem<TypeTa
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
using PointSource = typename GET_PROP_TYPE(TypeTag, PointSource);
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
@@ -79,13 +72,14 @@ class OnePSingularityProblemTimeDependent : public OnePSingularityProblem<TypeTa
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
static const int dimWorld = GridView::dimensionworld;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
- OnePSingularityProblemTimeDependent(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ OnePSingularityProblemTimeDependent(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{}
/*!
@@ -108,18 +102,28 @@ public:
void addPointSources(std::vector<PointSource>& pointSources) const
{
// inject <time> kg/s water at position (0, 0), where <time> is the current simulation time
- // we use t+1 because this is an implicit Euler scheme
auto function = [](const Problem& problem,
const Element& element,
const FVElementGeometry& fvGeometry,
const ElementVolumeVariables& elemVolVars,
const SubControlVolume& scv)
- { return PrimaryVariables(problem.timeManager().time() + problem.timeManager().timeStepSize()); };
+ { return PrimaryVariables(problem.getTime()); };
pointSources.push_back(PointSource({0.0, 0.0}, function));
}
+
+ //! Set the current time at which we evaluate the source
+ void setTime(Scalar time)
+ { time_ = time; }
+
+ //! Set the current time at which we evaluate the source
+ Scalar getTime() const
+ { return time_; }
+
+private:
+ Scalar time_ = 0.0;
};
-} //end namespace
+} //end namespace Dumux
#endif
diff --git a/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh b/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh
index 7f8120b1b9b1558db2a8150105be1cf3df1d6b9c..ec2fe32672265a202da5b559dcdff502b896db56 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/pointsources/1psingularityspatialparams.hh
@@ -52,11 +52,11 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- OnePSingularitySpatialParams(const Problem& problem, const GridView& gridView)
- : ParentType(problem, gridView)
+ OnePSingularitySpatialParams(const Problem& problem)
+ : ParentType(problem)
{
- permeability_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Permeability);
- porosity_= GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, SpatialParams, Porosity);
+ permeability_ = getParam<Scalar>("SpatialParams.Permeability");
+ porosity_= getParam<Scalar>("SpatialParams.Porosity");
}
/*!
diff --git a/test/porousmediumflow/1p/implicit/pointsources/CMakeLists.txt b/test/porousmediumflow/1p/implicit/pointsources/CMakeLists.txt
index 1fd5f3291487c7c902ea60f25ec485f6b2124491..efca5c1889ad43e37365d5941b8f26ddf720f873 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/pointsources/CMakeLists.txt
@@ -1,31 +1,38 @@
add_input_file_links()
-add_dumux_test(test_cc1p_pointsources test_cc1p_pointsources test_cc1p_pointsources.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1psingularitycc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1psingularitycc-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1p_pointsources")
+dune_add_test(NAME test_1pcctpfa_pointsources
+ SOURCES test_1pfv_pointsources.cc
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ COMPILE_DEFINITIONS TYPETAG=OnePSingularityCCTpfaTypeTag
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1psingularitycc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1pcctpfa_singularity-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pcctpfa_pointsources test_1pfv_pointsources.input -Problem.Name 1pcctpfa_singularity")
-add_dumux_test(test_cc1p_pointsources_timedependent test_cc1p_pointsources_timedependent test_cc1p_pointsources_timedependent.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1psingularitycctimedependent-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1psingularitycctimedependent-00003.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc1p_pointsources_timedependent -ParameterFile test_cc1p_pointsources.input -TimeManager.TEnd 4 -Problem.Name 1psingularitycctimedependent")
+dune_add_test(NAME test_1pcctpfa_pointsources_timedependent
+ SOURCES test_1pfv_pointsources_timedependent.cc
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ COMPILE_DEFINITIONS TYPETAG=OnePSingularityTimeDependentCCTpfaTypeTag
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1psingularitycctimedependent-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1pcctpfa_singularity_timedependent-00003.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pcctpfa_pointsources_timedependent test_1pfv_pointsources.input -TimeLoop.TEnd 4 -Problem.Name 1pcctpfa_singularity_timedependent")
-add_dumux_test(test_box1p_pointsources test_box1p_pointsources test_box1p_pointsources.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/1psingularitybox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/1psingularitybox-00001.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box1p_pointsources")
+dune_add_test(NAME test_1pbox_pointsources
+ SOURCES test_1pfv_pointsources.cc
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ COMPILE_DEFINITIONS TYPETAG=OnePSingularityBoxTypeTag
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/1psingularitybox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/1pbox_singularity-00001.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pbox_pointsources test_1pfv_pointsources.input -Problem.Name 1pbox_singularity")
#install sources
install(FILES
1psingularityproblem.hh
+1psingularityproblemtimedependent.hh
1psingularityspatialparams.hh
-test_cc1p_pointsources.cc
-test_box1p_pointsources.cc
+test_1p_pointsources.cc
+test_1p_pointsources_timedependent.cc
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/1p/implicit/pointsources)
diff --git a/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources.cc b/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c7cb58f5b7e909852cdb8c566235fd827a93ca53
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources.cc
@@ -0,0 +1,220 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the one-phase model with point sources
+ */
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include "1psingularityproblem.hh"
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/1p/implicit/pointsources/test_cc1p_pointsources.input b/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources.input
similarity index 74%
rename from test/porousmediumflow/1p/implicit/pointsources/test_cc1p_pointsources.input
rename to test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources.input
index 53fa1292e8708fc4539bc360c81799719ad742be..e19a25b1c3a0659ed019d37143c010d80c6df6f9 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/test_cc1p_pointsources.input
+++ b/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 1 # [s]
@@ -8,7 +8,8 @@ UpperRight = 1 1
Cells = 100 100
[Problem]
-Name = 1psingularitycc
+Name = 1pfv_singularity
+EnableGravity = false
[SpatialParams]
Permeability = 1e-10 # [m^2]
diff --git a/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources_timedependent.cc b/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources_timedependent.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1321385759424ed61971b250f1122dc801ea298e
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/pointsources/test_1pfv_pointsources_timedependent.cc
@@ -0,0 +1,223 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the one-phase model with point sources
+ */
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include "1psingularityproblemtimedependent.hh"
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // set the time in the problem for implicit Euler scheme
+ problem->setTime(timeLoop->time() + timeLoop->timeStepSize());
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/1p/implicit/pointsources/test_box1p_pointsources.cc b/test/porousmediumflow/1p/implicit/pointsources/test_box1p_pointsources.cc
deleted file mode 100644
index 383c5b6b7060290937799ec93f9750f180f3e7f0..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/pointsources/test_box1p_pointsources.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase box model with pointsources
- */
-#include <config.h>
-#include "1psingularityproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n"
- "\t-SpatialParams.Permeability The intrinsic permeability in m2\n"
- "\t-SpatialParams.Porosity The porosity\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePSingularityBoxProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/pointsources/test_box1p_pointsources.input b/test/porousmediumflow/1p/implicit/pointsources/test_box1p_pointsources.input
deleted file mode 100644
index 1b471e1d0527c92a7cf52a1f214f2bfc313a24ca..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/pointsources/test_box1p_pointsources.input
+++ /dev/null
@@ -1,15 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1 # [s]
-
-[Grid]
-LowerLeft = -1 -1
-UpperRight = 1 1
-Cells = 100 100
-
-[Problem]
-Name = 1psingularitybox
-
-[SpatialParams]
-Permeability = 1e-10 # [m^2]
-Porosity = 0.3
diff --git a/test/porousmediumflow/1p/implicit/pointsources/test_cc1p_pointsources.cc b/test/porousmediumflow/1p/implicit/pointsources/test_cc1p_pointsources.cc
deleted file mode 100644
index 5edc18e450e48e160a3f991f878efdf8a7914b41..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/pointsources/test_cc1p_pointsources.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase CC model with pointsources
- */
-#include <config.h>
-#include "1psingularityproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n"
- "\t-SpatialParams.Permeability The intrinsic permeability in m2\n"
- "\t-SpatialParams.Porosity The porosity\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePSingularityCCProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/pointsources/test_cc1p_pointsources_timedependent.cc b/test/porousmediumflow/1p/implicit/pointsources/test_cc1p_pointsources_timedependent.cc
deleted file mode 100644
index c700376698eb2d0c62305466d05e42f3b5e6be22..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/pointsources/test_cc1p_pointsources_timedependent.cc
+++ /dev/null
@@ -1,61 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase CC model with time dependent pointsources
- */
-#include <config.h>
-#include "1psingularityproblemtimedependent.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n"
- "\t-SpatialParams.Permeability The intrinsic permeability in m2\n"
- "\t-SpatialParams.Porosity The porosity\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePSingularityProblemTimeDependent) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/test_1pfv.cc b/test/porousmediumflow/1p/implicit/test_1pfv.cc
new file mode 100644
index 0000000000000000000000000000000000000000..c4fdf40a325eeff94775ccfb878e5c975156d02c
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/test_1pfv.cc
@@ -0,0 +1,256 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the one-phase CC model
+ */
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include "1ptestproblem.hh"
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+/*!
+ * \brief Provides an interface for customizing error messages associated with
+ * reading in parameters.
+ *
+ * \param progName The name of the program, that was tried to be started.
+ * \param errorMsg The error message that was issued by the start function.
+ * Comprises the thing that went wrong and a general help message.
+ */
+void usage(const char *progName, const std::string &errorMsg)
+{
+ if (errorMsg.size() > 0) {
+ std::string errorMessageOut = "\nUsage: ";
+ errorMessageOut += progName;
+ errorMessageOut += " [options]\n";
+ errorMessageOut += errorMsg;
+ errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.LowerLeft Lower left corner coordinates\n"
+ "\t-Grid.UpperRight Upper right corner coordinates\n"
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n"
+ "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
+ "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
+ "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n"
+ "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n";
+
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+
+ // if we are using a random permeability field with gstat
+ bool isRandomField = getParam<bool>("SpatialParams.RandomField", false);
+ if(isRandomField) vtkWriter.addField(problem->spatialParams().getPermField(), "K");
+
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/1p/implicit/test_cc1p.input b/test/porousmediumflow/1p/implicit/test_1pfv.input
similarity index 77%
rename from test/porousmediumflow/1p/implicit/test_cc1p.input
rename to test/porousmediumflow/1p/implicit/test_1pfv.input
index bd21b5f555c67b6d7cf4624e7e8af6f29dc663aa..91f7620d48d646926d41c4aff22b423d0b102b4a 100644
--- a/test/porousmediumflow/1p/implicit/test_cc1p.input
+++ b/test/porousmediumflow/1p/implicit/test_1pfv.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 1 # [s]
@@ -8,7 +8,7 @@ UpperRight = 1 1
Cells = 10 10
[Problem]
-Name = 1ptestcc # name passed to the output routines
+Name = 1ptestfv # name passed to the output routines
[SpatialParams]
LensLowerLeft = 0.2 0.2
@@ -16,4 +16,3 @@ LensUpperRight = 0.8 0.8
Permeability = 1e-10 # [m^2]
PermeabilityLens = 1e-12 # [m^2]
-
diff --git a/test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.cc b/test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.cc
new file mode 100644
index 0000000000000000000000000000000000000000..ccf0b3ce2e7940c5e17a1d8178d6ff8149a7463e
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.cc
@@ -0,0 +1,252 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the one-phase CC model
+ */
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include "fractureproblem.hh"
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+/*!
+ * \brief Provides an interface for customizing error messages associated with
+ * reading in parameters.
+ *
+ * \param progName The name of the program, that was tried to be started.
+ * \param errorMsg The error message that was issued by the start function.
+ * Comprises the thing that went wrong and a general help message.
+ */
+void usage(const char *progName, const std::string &errorMsg)
+{
+ if (errorMsg.size() > 0) {
+ std::string errorMessageOut = "\nUsage: ";
+ errorMessageOut += progName;
+ errorMessageOut += " [options]\n";
+ errorMessageOut += errorMsg;
+ errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.File The grid file\n";
+
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+int main(int argc, char** argv) try
+{
+#if HAVE_DUNE_FOAMGRID
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+
+#else
+#warning External grid module dune-foamgrid needed to run this example.
+ std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
+ return 77;
+#endif
+
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.input b/test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.input
new file mode 100644
index 0000000000000000000000000000000000000000..e57ffebd69d263ac3a516e3eb5714181cd8c55d5
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/test_1pfv_fracture2d3d.input
@@ -0,0 +1,10 @@
+[TimeLoop]
+DtInitial = 1 # [s]
+TEnd = 1 # [s]
+
+[Grid]
+File = grids/fracture2d3d.msh
+
+[Problem]
+Name = 1pfv_fracture2d3d # name passed to the output routines
+EnableGravity = false
diff --git a/test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.cc b/test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.cc
new file mode 100644
index 0000000000000000000000000000000000000000..087fce42d10b2ad7266d395f7f48e771aacc7e0b
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.cc
@@ -0,0 +1,255 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the one-phase CC model
+ */
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include "tubesproblem.hh"
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+/*!
+ * \brief Provides an interface for customizing error messages associated with
+ * reading in parameters.
+ *
+ * \param progName The name of the program, that was tried to be started.
+ * \param errorMsg The error message that was issued by the start function.
+ * Comprises the thing that went wrong and a general help message.
+ */
+void usage(const char *progName, const std::string &errorMsg)
+{
+ if (errorMsg.size() > 0) {
+ std::string errorMessageOut = "\nUsage: ";
+ errorMessageOut += progName;
+ errorMessageOut += " [options]\n";
+ errorMessageOut += errorMsg;
+ errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.File The grid file\n";
+
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+int main(int argc, char** argv) try
+{
+#if HAVE_DUNE_FOAMGRID
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // output l2 norm for convergence analysis
+ problem->outputL2Norm(x);
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+
+#else
+#warning External grid module dune-foamgrid needed to run this example.
+ std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
+ return 77;
+#endif
+
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pnetwork1d3d.input b/test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.input
similarity index 82%
rename from test/porousmediumflow/1p/implicit/test_cc1pnetwork1d3d.input
rename to test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.input
index 3fc22439d76a392e8e8d183bd382a2331f6caff2..cf1817b21b0aa127d9df1fbf89ebbdb25ab9c223 100644
--- a/test/porousmediumflow/1p/implicit/test_cc1pnetwork1d3d.input
+++ b/test/porousmediumflow/1p/implicit/test_1pfv_network1d3d.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 1 # [s]
@@ -6,6 +6,6 @@ TEnd = 1 # [s]
File = ./grids/network1d3d.msh
[Problem]
-Name = 1pccnetwork1d3d
+Name = 1pfvnetwork1d3d
LiquidDensity = 1050 # blood density
LiquidKinematicViscosity = 4.0e-3 # blood viscosity
diff --git a/test/porousmediumflow/1p/implicit/test_1pnifv.cc b/test/porousmediumflow/1p/implicit/test_1pnifv.cc
new file mode 100644
index 0000000000000000000000000000000000000000..890a7ee15cd82f302985e470a3844fd94dfd989e
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/test_1pnifv.cc
@@ -0,0 +1,254 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the 1pni CC model
+ */
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include "1pniconductionproblem.hh"
+#include "1pniconvectionproblem.hh"
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+/*!
+ * \brief Provides an interface for customizing error messages associated with
+ * reading in parameters.
+ *
+ * \param progName The name of the program, that was tried to be started.
+ * \param errorMsg The error message that was issued by the start function.
+ * Comprises the thing that went wrong and a general help message.
+ */
+void usage(const char *progName, const std::string &errorMsg)
+{
+ if (errorMsg.size() > 0) {
+ std::string errorMessageOut = "\nUsage: ";
+ errorMessageOut += progName;
+ errorMessageOut += " [options]\n";
+ errorMessageOut += errorMsg;
+ errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.LowerLeft Lower left corner coordinates\n"
+ "\t-Grid.UpperRight Upper right corner coordinates\n"
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n";
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.addField(problem->getExactTemperature(), "temperatureExact");
+ vtkWriter.write(0.0);
+
+ // output every vtkOutputInterval time step
+ const int vtkOutputInterval = getParam<int>("Problem.OutputInterval");
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // compute the new analytical temperature field for the output
+ problem->updateExactTemperature(x, timeLoop->time()+timeLoop->timeStepSize());
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ if (timeLoop->timeStepIndex()==0 || timeLoop->timeStepIndex() % vtkOutputInterval == 0 || timeLoop->willBeFinished())
+ vtkWriter.write(timeLoop->time());
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/1p/implicit/test_1pnifv_conduction.input b/test/porousmediumflow/1p/implicit/test_1pnifv_conduction.input
new file mode 100644
index 0000000000000000000000000000000000000000..d422c0e066fbbef50e8b9168c1ff9d1af9f8a1e2
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/test_1pnifv_conduction.input
@@ -0,0 +1,21 @@
+[TimeLoop]
+DtInitial = 1 # [s]
+TEnd = 1e5 # [s]
+MaxTimeStepSize = 1e10
+
+[Grid]
+LowerLeft = 0 0
+UpperRight = 5 1
+Cells = 200 1
+
+[Problem]
+Name = 1pnifv_conduction # name passed to the output routines
+OutputInterval = 5 # every 5th timestep an output file is written
+DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
+EnableGravity = false # disable gravity
+
+[Vtk]
+AddVelocity = true # enable velocity output
+
+[MpfaTest.Vtk]
+AddVelocity = false # enable velocity output
diff --git a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.input b/test/porousmediumflow/1p/implicit/test_1pnifv_convection.input
similarity index 54%
rename from test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.input
rename to test/porousmediumflow/1p/implicit/test_1pnifv_convection.input
index 5794931580dd78e8e0faf05b5d9fba61f4673598..dc99b4a8b04f1bdcb2d280ca96a77df96462328a 100644
--- a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.input
+++ b/test/porousmediumflow/1p/implicit/test_1pnifv_convection.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 3e4 # [s]
MaxTimeStepSize = 1e3
@@ -9,10 +9,13 @@ UpperRight = 20 1
Cells = 80 1
[Problem]
-Name = ccmpfa1pniconvection # name passed to the output routines
+Name = 1pnifv_conduction # name passed to the output routines
OutputInterval = 5 # every 5th timestep an output file is written
DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
-EnableGravity = 0 # Disable gravity
+EnableGravity = false # Disable gravity
[Vtk]
-AddVelocity = 0 # enable velocity output
+AddVelocity = true # enable velocity output
+
+[MpfaTest.Vtk]
+AddVelocity = false # enable velocity output
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pwithgstat.input b/test/porousmediumflow/1p/implicit/test_1pwithgstat.input
similarity index 96%
rename from test/porousmediumflow/1p/implicit/test_cc1pwithgstat.input
rename to test/porousmediumflow/1p/implicit/test_1pwithgstat.input
index f3709218917357f49f837497c806cd2c2cfe4945..724aa0b3aaffe349a781953509e56125ac3fd88f 100644
--- a/test/porousmediumflow/1p/implicit/test_cc1pwithgstat.input
+++ b/test/porousmediumflow/1p/implicit/test_1pwithgstat.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 10 # [s]
diff --git a/test/porousmediumflow/1p/implicit/test_box1p.cc b/test/porousmediumflow/1p/implicit/test_box1p.cc
deleted file mode 100644
index 6621dc2b1194ffa7c05962188dc77901357c2015..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1p.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase box model
- */
-#include <config.h>
-#include "1ptestproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n"
- "\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n"
- "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePTestBoxProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/test_box1p.input b/test/porousmediumflow/1p/implicit/test_box1p.input
deleted file mode 100644
index 751b2bb39f20d9566446e2c6e110bf376206c522..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1p.input
+++ /dev/null
@@ -1,19 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1 # [s]
-
-[Grid]
-LowerLeft = 0 0
-UpperRight = 1 1
-Cells = 10 10
-
-[Problem]
-Name = 1ptestbox # name passed to the output routines
-
-[SpatialParams]
-LensLowerLeft = 0.25 0.25
-LensUpperRight = 0.75 0.75
-
-Permeability = 1e-10 # [m^2]
-PermeabilityLens = 1e-12 # [m^2]
-
diff --git a/test/porousmediumflow/1p/implicit/test_box1pfracture2d3d.cc b/test/porousmediumflow/1p/implicit/test_box1pfracture2d3d.cc
deleted file mode 100644
index b5b6589978fe62759813582995a91d76e002348a..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1pfracture2d3d.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase CC model
- */
-#include <config.h>
-#include "fractureproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File The grid file\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
-#if HAVE_DUNE_FOAMGRID
- typedef TTAG(FractureBoxProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-#else
-#warning External grid module dune-foamgrid needed to run this example.
- std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
- return 77;
-#endif
-}
diff --git a/test/porousmediumflow/1p/implicit/test_box1pfracture2d3d.input b/test/porousmediumflow/1p/implicit/test_box1pfracture2d3d.input
deleted file mode 100644
index b1caa98589277a779c6de3205e11f89de85ad29c..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1pfracture2d3d.input
+++ /dev/null
@@ -1,9 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1 # [s]
-
-[Grid]
-File = grids/fracture2d3d.msh
-
-[Problem]
-Name = 1pboxfracture2d3d # name passed to the output routines
diff --git a/test/porousmediumflow/1p/implicit/test_box1pnetwork1d3d.cc b/test/porousmediumflow/1p/implicit/test_box1pnetwork1d3d.cc
deleted file mode 100644
index 0d698cbb6c692b2c29e9c9b0e55b435e05cd2b7e..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1pnetwork1d3d.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase CC model
- */
-#include <config.h>
-#include "tubesproblem.hh"
-#include <dumux/common/start.hh>
-
-int main(int argc, char** argv)
-{
-#if HAVE_DUNE_FOAMGRID
- typedef TTAG(TubesTestBoxProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, [](const char *, const std::string &){});
-#else
-#warning External grid module dune-foamgrid needed to run this example.
- std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
- return 77;
-#endif
-}
diff --git a/test/porousmediumflow/1p/implicit/test_box1pnetwork1d3d.input b/test/porousmediumflow/1p/implicit/test_box1pnetwork1d3d.input
deleted file mode 100644
index 7a12bc63d79e13ed232dbaba95c9337fe1c130da..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1pnetwork1d3d.input
+++ /dev/null
@@ -1,11 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1 # [s]
-
-[Grid]
-File = ./grids/network1d3d.msh
-
-[Problem]
-Name = 1pboxnetwork1d3d
-LiquidDensity = 1050 # blood density
-LiquidKinematicViscosity = 4.0e-3 # blood viscosity
diff --git a/test/porousmediumflow/1p/implicit/test_box1pniconduction.cc b/test/porousmediumflow/1p/implicit/test_box1pniconduction.cc
deleted file mode 100644
index 810c4b03b30e02731360e736b3eafd0e56dfc5c3..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1pniconduction.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the 1pni box model
- */
-#include <config.h>
-#include "1pniconductionproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n";
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePNIConductionBoxProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/test_box1pniconduction.input b/test/porousmediumflow/1p/implicit/test_box1pniconduction.input
deleted file mode 100644
index 3b0ad37fd2300b8c4b1d2e73fe46ac6bb83b4728..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1pniconduction.input
+++ /dev/null
@@ -1,17 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1e5 # [s]
-MaxTimeStepSize = 1e10
-
-[Grid]
-LowerLeft = 0 0
-UpperRight = 5 1
-Cells = 200 1
-
-[Problem]
-Name = box1pniconduction # name passed to the output routines
-OutputInterval = 5 # every 5th timestep an output file is written
-EnableGravity = 0 # disable gravity
-
-[Vtk]
-AddVelocity= 1 # enable velocity output
diff --git a/test/porousmediumflow/1p/implicit/test_box1pniconvection.cc b/test/porousmediumflow/1p/implicit/test_box1pniconvection.cc
deleted file mode 100644
index af9bf712ac88e7155dfc3ad4917720c6eef24ce3..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1pniconvection.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the 1pni box model
- */
-#include <config.h>
-#include "1pniconvectionproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n";
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePNIConvectionBoxProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/test_box1pniconvection.input b/test/porousmediumflow/1p/implicit/test_box1pniconvection.input
deleted file mode 100644
index 46cfcf48d5d6c6e36098db57d5b70c06a1ebd625..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1pniconvection.input
+++ /dev/null
@@ -1,18 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 3e4 # [s]
-MaxTimeStepSize = 1e3
-
-[Grid]
-LowerLeft = 0 0
-UpperRight = 20 1
-Cells = 80 1
-
-[Problem]
-Name = box1pniconvection # name passed to the output routines
-OutputInterval = 5 # every 5th timestep an output file is written
-DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
-EnableGravity = 0 # Disable gravity
-
-[Vtk]
-AddVelocity = 1 # enable velocity output
diff --git a/test/porousmediumflow/1p/implicit/test_box1pwithamg.cc b/test/porousmediumflow/1p/implicit/test_box1pwithamg.cc
deleted file mode 100644
index cb38bc2dddf33a38a87afaab0b78552d4cb5ce35..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1pwithamg.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase box model
- */
-#include <config.h>
-
-#include "1ptestproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n"
- "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n"
- "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePTestBoxProblemWithAMG) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/test_box1pwithamg.input b/test/porousmediumflow/1p/implicit/test_box1pwithamg.input
deleted file mode 100644
index 4ab33037e21f740b03ea27b09399570e0377ece5..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_box1pwithamg.input
+++ /dev/null
@@ -1,19 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1 # [s]
-
-[Grid]
-LowerLeft = 0 0
-UpperRight = 1 1
-Cells = 10 10
-
-[Problem]
-Name = 1ptestboxwithamg # name passed to the output routines
-
-[SpatialParams]
-LensLowerLeft = 0.25 0.25
-LensUpperRight = 0.75 0.75
-
-Permeability = 1e-10 # [m^2]
-PermeabilityLens = 1e-12 # [m^2]
-
diff --git a/test/porousmediumflow/1p/implicit/test_cc1p.cc b/test/porousmediumflow/1p/implicit/test_cc1p.cc
deleted file mode 100644
index 9df938bd710a07429be03381ed33af3a27a092bd..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_cc1p.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase CC model
- */
-#include <config.h>
-#include "1ptestproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n"
- "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n"
- "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePTestCCProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pfracture2d3d.cc b/test/porousmediumflow/1p/implicit/test_cc1pfracture2d3d.cc
deleted file mode 100644
index 4a3d85bc6cf39d7aab76da8e24c3177b3b80d6c4..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_cc1pfracture2d3d.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase CC model
- */
-#include <config.h>
-#include "fractureproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File The grid file\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
-#if HAVE_DUNE_FOAMGRID
- typedef TTAG(FractureCCProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-#else
-#warning External grid module dune-foamgrid needed to run this example.
- std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
- return 77;
-#endif
-}
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pfracture2d3d.input b/test/porousmediumflow/1p/implicit/test_cc1pfracture2d3d.input
deleted file mode 100644
index 2683beff986b2a9adb2dbb5ff11da9889ab7efad..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_cc1pfracture2d3d.input
+++ /dev/null
@@ -1,9 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1 # [s]
-
-[Grid]
-File = grids/fracture2d3d.msh
-
-[Problem]
-Name = 1pccfracture2d3d # name passed to the output routines
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pnetwork1d3d.cc b/test/porousmediumflow/1p/implicit/test_cc1pnetwork1d3d.cc
deleted file mode 100644
index 21253b075349aae3085f212613348d351f9f3b64..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_cc1pnetwork1d3d.cc
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase CC model
- */
-#include <config.h>
-#include "tubesproblem.hh"
-#include <dumux/common/start.hh>
-
-int main(int argc, char** argv)
-{
-#if HAVE_DUNE_FOAMGRID
- typedef TTAG(TubesTestCCTpfaProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, [](const char *, const std::string &){});
-#else
-#warning External grid module dune-foamgrid needed to run this example.
- std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
- return 77;
-#endif
-}
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pniconduction.cc b/test/porousmediumflow/1p/implicit/test_cc1pniconduction.cc
deleted file mode 100644
index a2f444ddda090d8855d7abe02242b493a774c2c6..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_cc1pniconduction.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the 1pni CC model
- */
-#include <config.h>
-#include "1pniconductionproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n";
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePNIConductionCCProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pniconduction.input b/test/porousmediumflow/1p/implicit/test_cc1pniconduction.input
deleted file mode 100644
index 676649362660803ad0b6d3273f886fba613222e9..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_cc1pniconduction.input
+++ /dev/null
@@ -1,17 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1e5 # [s]
-MaxTimeStepSize = 1e10
-
-[Grid]
-LowerLeft = 0 0
-UpperRight = 5 1
-Cells = 200 1
-
-[Problem]
-Name = cc1pniconduction # name passed to the output routines
-OutputInterval = 5 # every 5th timestep an output file is written
-EnableGravity = 0 # disable gravity
-
-[Vtk]
-AddVelocity= 1 # enable velocity output
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pniconvection.cc b/test/porousmediumflow/1p/implicit/test_cc1pniconvection.cc
deleted file mode 100644
index a7fb0661fbea0878cfbae630342ea893205598ad..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_cc1pniconvection.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the 1pni CC model
- */
-#include <config.h>
-#include "1pniconvectionproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n";
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePNIConvectionCCProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pniconvection.input b/test/porousmediumflow/1p/implicit/test_cc1pniconvection.input
deleted file mode 100644
index eb923a7d818485cb50187507047100d1633c7a39..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_cc1pniconvection.input
+++ /dev/null
@@ -1,18 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 3e4 # [s]
-MaxTimeStepSize = 1e3
-
-[Grid]
-LowerLeft = 0 0
-UpperRight = 20 1
-Cells = 80 1
-
-[Problem]
-Name = cc1pniconvection # name passed to the output routines
-OutputInterval = 5 # every 5th timestep an output file is written
-DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
-EnableGravity = 0 # Disable gravity
-
-[Vtk]
-AddVelocity = 1 # enable velocity output
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pwithamg.cc b/test/porousmediumflow/1p/implicit/test_cc1pwithamg.cc
deleted file mode 100644
index fc621d97f63c562ac51dee31b66ca152d5fc796d..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_cc1pwithamg.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase CC model
- */
-#include <config.h>
-
-
-#include "1ptestproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n"
- "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePTestCCProblemWithAMG) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
-
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pwithamg.input b/test/porousmediumflow/1p/implicit/test_cc1pwithamg.input
deleted file mode 100644
index af9c9c0fe653886988bfcd0c09950bf945dca6d0..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_cc1pwithamg.input
+++ /dev/null
@@ -1,19 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1 # [s]
-
-[Grid]
-LowerLeft = 0 0
-UpperRight = 1 1
-Cells = 10 10
-
-[Problem]
-Name = 1ptestccwithamg # name passed to the output routines
-
-[SpatialParams]
-LensLowerLeft = 0.2 0.2 # [m]
-LensUpperRight = 0.8 0.8# [m]
-
-Permeability = 1e-10 # [m^2]
-PermeabilityLens = 1e-12 # [m^2]
-
diff --git a/test/porousmediumflow/1p/implicit/test_cc1pwithgstat.cc b/test/porousmediumflow/1p/implicit/test_cc1pwithgstat.cc
deleted file mode 100644
index e84848f6733d7a9d9d9da155439b60ee0bd7eb08..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_cc1pwithgstat.cc
+++ /dev/null
@@ -1,73 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase CC model on geostatistical random field
- * generated by gstat
- */
-#include <config.h>
-#include "1ptestproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n"
- "\t-SpatialParams.RandomField Set true to use a random field generated by gstat \n"
- "\t-SpatialParams.LensLowerLeft Coordinates of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRight Coordinates of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n"
- "\t-Gstat.ControlFile Control file for generating geostatistical field using gstat \n"
- "\t-Gstat.InputFile Input file generated for gstat \n"
- "\t-Gstat.OutputFilePrefix Prefix of the output file generated by gstat and for the vtu\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
-#if HAVE_GSTAT
- typedef TTAG(OnePTestCCProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-#else
-#warning External geostatistical module gstat needed to run this example.
- std::cerr << "Test skipped, it needs gstat!" << std::endl;
- return 77;
-#endif
-}
diff --git a/test/porousmediumflow/1p/implicit/test_ccmpfa1p.cc b/test/porousmediumflow/1p/implicit/test_ccmpfa1p.cc
deleted file mode 100644
index 75a9505b7aef215c23518870175e4a3bb9ab74a4..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_ccmpfa1p.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the one-phase CC model
- */
-#include <config.h>
-#include "1ptestproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n"
- "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePTestCCMpfaProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/test_ccmpfa1p.input b/test/porousmediumflow/1p/implicit/test_ccmpfa1p.input
deleted file mode 100644
index a94210a2d1f8528e51adbc157b40679bd070f7df..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_ccmpfa1p.input
+++ /dev/null
@@ -1,18 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1 # [s]
-
-[Grid]
-UpperRight = 1 1
-Cells = 10 10
-
-[Problem]
-Name = 1ptestccmpfa # name passed to the output routines
-
-[SpatialParams]
-LensLowerLeft = 0.2 0.2 # [m]
-LensUpperRight = 0.8 0.8 # [m]
-
-Permeability = 1e-10 # [m^2]
-PermeabilityLens = 1e-12 # [m^2]
-
diff --git a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.cc b/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.cc
deleted file mode 100644
index 62a2fb3a496eabb695531f0a68483b2ce0b1427a..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the 1pni CC model
- */
-#include <config.h>
-#include "1pniconductionproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n";
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePNIConductionCCMpfaProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.input b/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.input
deleted file mode 100644
index 145db6013982bbd428f112cf50b0b4fe068ddc64..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.input
+++ /dev/null
@@ -1,17 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1e5 # [s]
-MaxTimeStepSize = 1e10
-
-[Grid]
-LowerLeft = 0 0
-UpperRight = 5 1
-Cells = 200 1
-
-[Problem]
-Name = ccmpfa1pniconduction # name passed to the output routines
-OutputInterval = 5 # every 5th timestep an output file is written
-EnableGravity = 0 # disable gravity
-
-[Vtk]
-AddVelocity= 0 # enable velocity output
diff --git a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.cc b/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.cc
deleted file mode 100644
index 0c57aa535108ca5e0cc7a6cdf1b4c6d1dc1b3df1..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.cc
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the 1pni CC model
- */
-#include <config.h>
-#include "1pniconvectionproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.LowerLeft Lower left corner coordinates\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n";
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(OnePNIConvectionCCMpfaProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/1p/implicit/tubesconvergencetest.py b/test/porousmediumflow/1p/implicit/tubesconvergencetest.py
index 066651907eb0035d264e6fd6ea61376ffcc88078..bcb21d0864410ae4112e1f462ecd2b25ac21d227 100755
--- a/test/porousmediumflow/1p/implicit/tubesconvergencetest.py
+++ b/test/porousmediumflow/1p/implicit/tubesconvergencetest.py
@@ -4,11 +4,12 @@ from math import *
import subprocess
import sys
-if len(sys.argv) != 2:
+if len(sys.argv) < 2:
sys.stderr.write('Please provide a single argument <testname> to the script\n')
sys.exit(1)
testname = str(sys.argv[1])
+testargs = [str(i) for i in sys.argv][2:]
# remove the old log file
subprocess.call(['rm', testname + '.log'])
@@ -16,7 +17,7 @@ print("Removed old log file ({})!".format(testname + '.log'))
# do the runs with different refinement
for i in [0, 1, 2, 3, 4, 5]:
- subprocess.call(['./' + testname, '-Grid.Refinement', str(i),
+ subprocess.call(['./' + testname] + testargs + ['-Grid.Refinement', str(i),
'-Problem.Name', testname])
# check the rates and append them to the log file
diff --git a/test/porousmediumflow/1p/implicit/tubesproblem.hh b/test/porousmediumflow/1p/implicit/tubesproblem.hh
index 9bd591ad1668d6d06637a2968251ca2e6f4c40b8..6b601eb815ba02d0248bec24cbf5ee2984759471 100644
--- a/test/porousmediumflow/1p/implicit/tubesproblem.hh
+++ b/test/porousmediumflow/1p/implicit/tubesproblem.hh
@@ -28,9 +28,11 @@
#include <dune/localfunctions/lagrange/pqkfactory.hh>
#include <dune/geometry/quadraturerules.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/methods.hh>
#include <dumux/porousmediumflow/1p/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/components/constant.hh>
#include "tubesspatialparams.hh"
@@ -73,9 +75,9 @@ public:
* and a branching point embedded in a three-dimensional world
*/
template <class TypeTag>
-class TubesTestProblem : public ImplicitPorousMediaProblem<TypeTag>
+class TubesTestProblem : public PorousMediumFlowProblem<TypeTag>
{
- using ParentType = ImplicitPorousMediaProblem<TypeTag>;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
@@ -94,23 +96,24 @@ class TubesTestProblem : public ImplicitPorousMediaProblem<TypeTag>
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
using Element = typename GridView::template Codim<0>::Entity;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
+ enum { isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box };
public:
- TubesTestProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ TubesTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name);
+ name_ = getParam<std::string>("Problem.Name");
//get hMax_ of the grid
hMax_ = 0.0;
- for (const auto& element : elements(this->gridView()))
+ for (const auto& element : elements(fvGridGeometry->gridView()))
hMax_ = std::max(element.geometry().volume(), hMax_);
}
@@ -185,19 +188,6 @@ public:
return PrimaryVariables(0.0);
}
- /*!
- * \brief Evaluate the boundary conditions for a neumann
- * boundary segment.
- *
- * For this method, the \a priVars parameter stores the mass flux
- * in normal direction of each component. Negative values mean
- * influx.
- */
- PrimaryVariables neumannAtPos(const GlobalPosition& globalPos) const
- {
- return PrimaryVariables(0.0);
- }
-
// \}
/*!
@@ -232,8 +222,7 @@ public:
const auto& globalPos = scv.center();
const auto& volVars = elemVolVars[scv];
- const auto K = this->spatialParams().permeability(element, scv,
- this->model().elementSolution(element, this->model().curSol()));
+ const auto K = this->spatialParams().permeability(element, scv, ElementSolutionVector());
using std::sin;
if (globalPos[2] > 0.5 - eps_)
@@ -260,19 +249,18 @@ public:
// \}
- void postTimeStep()
+ void outputL2Norm(const SolutionVector solution) const
{
- const auto& solution = this->model().curSol();
-
// calculate the discrete L2-Norm
- Scalar LTwoNorm = 0.0;
+ Scalar lTwoNorm = 0.0;
// get the Gaussian quadrature rule for intervals
const auto& quad = Dune::QuadratureRules<Scalar, dim>::rule(Dune::GeometryType(1), 1);
- for (const auto& element : elements(this->gridView()))
+ const auto& gg = this->fvGridGeometry();
+ for (const auto& element : elements(gg.gridView()))
{
- const unsigned int eIdx = this->elementMapper().index(element);
+ const auto eIdx = gg.elementMapper().index(element);
const auto geometry = element.geometry();
for(auto&& qp : quad)
{
@@ -289,22 +277,23 @@ public:
const auto& localFiniteElement = feCache_.get(geometry.type());
localFiniteElement.localBasis().evaluateFunction(qp.position(), shapeValues);
for (unsigned int i = 0; i < shapeValues.size(); ++i)
- p += shapeValues[i]*solution[this->model().dofMapper().subIndex(element, i, dim)][pressureIdx];
+ p += shapeValues[i]*solution[gg.dofMapper().subIndex(element, i, dim)][pressureIdx];
}
- LTwoNorm += (p - pe)*(p - pe)*qp.weight()*integrationElement;
+ lTwoNorm += (p - pe)*(p - pe)*qp.weight()*integrationElement;
}
}
- LTwoNorm = std::sqrt(LTwoNorm);
+ lTwoNorm = std::sqrt(lTwoNorm);
// write the norm into a log file
- logFile_.open(this->name() + ".log", std::ios::app);
- logFile_ << "[ConvergenceTest] L2-norm(pressure) = " << LTwoNorm << " hMax = " << hMax_ << std::endl;
- logFile_.close();
+ std::ofstream logFile;
+ logFile.open(this->name() + ".log", std::ios::app);
+ logFile << "[ConvergenceTest] L2-norm(pressure) = " << lTwoNorm << " hMax = " << hMax_ << std::endl;
+ logFile.close();
}
private:
- Scalar exactPressure_(const GlobalPosition& globalPos)
+ Scalar exactPressure_(const GlobalPosition& globalPos) const
{
using std::sin;
return sin(4.0*M_PI*globalPos[2]);
@@ -315,7 +304,6 @@ private:
Scalar hMax_;
- std::ofstream logFile_;
typename Dune::PQkLocalFiniteElementCache<Scalar, Scalar, dim, 1> feCache_;
};
diff --git a/test/porousmediumflow/1p/implicit/tubesspatialparams.hh b/test/porousmediumflow/1p/implicit/tubesspatialparams.hh
index db88f75f4c23e604318be347a594aceb934c5c6f..4ad9e0eada13b9690db058d458fd486313574612 100644
--- a/test/porousmediumflow/1p/implicit/tubesspatialparams.hh
+++ b/test/porousmediumflow/1p/implicit/tubesspatialparams.hh
@@ -52,8 +52,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- TubesTestSpatialParams(const Problem& problem, const GridView& gridView)
- : ParentType(problem, gridView)
+ TubesTestSpatialParams(const Problem& problem)
+ : ParentType(problem)
{
radius_ = 1.0;
diff --git a/test/porousmediumflow/2p/implicit/CMakeLists.txt b/test/porousmediumflow/2p/implicit/CMakeLists.txt
index 829113f9c7cfb31a1d0b1c27697d04cd233b71f6..1bb24dedd40b5563940ec5a50bd29117359e35f1 100644
--- a/test/porousmediumflow/2p/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/CMakeLists.txt
@@ -1,104 +1,33 @@
-add_subdirectory(pointsources)
+#add_subdirectory(pointsources)
+add_subdirectory(fracture)
+add_subdirectory(incompressible)
+add_subdirectory(nonisothermal)
add_input_file_links()
-
-# isothermal tests
-add_dumux_test(test_box2p test_box2p test_box2p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lensbox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/lensbox-00007.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box2p")
-
-add_dumux_test(test_cc2p test_cc2p test_cc2p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/lenscc-00008.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc2p")
-
-add_dumux_test(test_ccadaptive2p test_ccadaptive2p test_ccadaptive2p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lensccadaptive-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/lensccadaptive-00017.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccadaptive2p")
-
-add_dumux_test(test_boxadaptive2p test_boxadaptive2p test_boxadaptive2p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/lensboxadaptive-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/lensboxadaptive-00014.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxadaptive2p")
-
-add_dumux_test(test_generalizeddirichlet test_generalizeddirichlet test_generalizeddirichlet.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/generalizeddirichlet-reference.vtp
- ${CMAKE_CURRENT_BINARY_DIR}/generalizeddirichlet-00034.vtp
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_generalizeddirichlet")
-
-if(HAVE_OPM_GRID)
-add_dumux_test(test_cc2pcornerpoint test_cc2pcornerpoint test_cc2pcornerpoint.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/cc2pcornerpoint-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/cc2pcornerpoint-00005.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc2pcornerpoint")
-endif()
-
-# non-isothermal tests
-if(HAVE_UG)
-add_dumux_test(test_box2pni test_box2pni test_box2pni.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-simplex-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/injection2pnibox-00007.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box2pni -Grid.CellType Simplex")
-else()
-add_dumux_test(test_box2pni test_box2pni test_box2pni.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-cube-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/injection2pnibox-00007.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box2pni")
-endif()
-
-if(HAVE_UG)
-add_dumux_test(test_cc2pni test_cc2pni test_cc2pni.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-simplex-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/injection2pnicc-00008.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc2pni -Grid.CellType Simplex")
-else()
-add_dumux_test(test_cc2pni test_cc2pni test_cc2pni.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-cube-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/injection2pnicc-00008.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc2pni")
-endif()
-
-add_dumux_test(test_fracture_box2p test_fracture_box2p test_fracture_box2p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/fracturebox2p-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/fracturebox-00023.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_fracture_box2p")
-
-add_dumux_test(test_fracture_cc2p test_fracture_cc2p test_fracture_cc2p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/fracturecc2p-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/fracturecc-00029.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_fracture_cc2p")
-
-add_dumux_test(test_fracture_ccmpfa2p test_fracture_ccmpfa2p test_fracture_ccmpfa2p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/fractureccmpfa2p-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/fractureccmpfa-00031.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_fracture_ccmpfa2p")
+dune_symlink_to_source_files(FILES grids)
+
+# # isothermal tests
+# add_dumux_test(test_ccadaptive2p test_ccadaptive2p test_ccadaptive2p.cc
+# python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+# --script fuzzy
+# --files ${CMAKE_SOURCE_DIR}/test/references/lensccadaptive-reference.vtu
+# ${CMAKE_CURRENT_BINARY_DIR}/lensccadaptive-00017.vtu
+# --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccadaptive2p")
+#
+# add_dumux_test(test_boxadaptive2p test_boxadaptive2p test_boxadaptive2p.cc
+# python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+# --script fuzzy
+# --files ${CMAKE_SOURCE_DIR}/test/references/lensboxadaptive-reference.vtu
+# ${CMAKE_CURRENT_BINARY_DIR}/lensboxadaptive-00014.vtu
+# --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxadaptive2p")
+#
+# if(HAVE_OPM_GRID)
+# add_dumux_test(test_cc2pcornerpoint test_cc2pcornerpoint test_cc2pcornerpoint.cc
+# python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+# --script fuzzy
+# --files ${CMAKE_SOURCE_DIR}/test/references/cc2pcornerpoint-reference.vtu
+# ${CMAKE_CURRENT_BINARY_DIR}/cc2pcornerpoint-00005.vtu
+# --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc2pcornerpoint")
+# endif()
#install sources
install(FILES
@@ -106,15 +35,8 @@ cc2pcornerpointproblem.hh
cc2pcornerpointspatialparams.hh
generalizeddirichletproblem.hh
generalizeddirichletspatialparams.hh
-injectionproblem2pni.hh
-lensproblem.hh
-lensspatialparams.hh
-test_box2p.cc
-test_box2pni.cc
test_boxadaptive2p.cc
-test_cc2p.cc
test_cc2pcornerpoint.cc
-test_cc2pni.cc
test_ccadaptive2p.cc
test_generalizeddirichlet.cc
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/2p)
diff --git a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..3e7db8460be67780af55344394023644f83a1c58
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
@@ -0,0 +1,37 @@
+dune_symlink_to_source_files(FILES "test_fracture.input" "grids")
+
+dune_add_test(NAME test_2p_fracture_box
+ SOURCES test_2p_fracture_fv.cc
+ COMPILE_DEFINITIONS TYPETAG=FractureBoxTypeTag
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/fracturebox2p-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/fracturebox-00023.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box test_fracture.input -Problem.Name fracturebox")
+
+dune_add_test(NAME test_2p_fracture_tpfa
+ SOURCES test_2p_fracture_fv.cc
+ COMPILE_DEFINITIONS TYPETAG=FractureCCTpfaTypeTag
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/fracturecc2p-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/fracturetpfa-00029.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa test_fracture.input -Problem.Name fracturetpfa")
+
+dune_add_test(NAME test_2p_fracture_mpfa
+ SOURCES test_2p_fracture_fv.cc
+ COMPILE_DEFINITIONS TYPETAG=FractureCCMpfaTypeTag
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/fractureccmpfa2p-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/fracturempfa-00031.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_mpfa test_fracture.input -Problem.Name fracturempfa")
+
+set(CMAKE_BUILD_TYPE Release)
+
+#install sources
+install(FILES
+problem.hh
+spatialparams.hh
+test_2p_fracture_fv.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/2p/fracture)
diff --git a/test/porousmediumflow/2p/implicit/grids/fracture.geo b/test/porousmediumflow/2p/implicit/fracture/grids/fracture.geo
similarity index 100%
rename from test/porousmediumflow/2p/implicit/grids/fracture.geo
rename to test/porousmediumflow/2p/implicit/fracture/grids/fracture.geo
diff --git a/test/porousmediumflow/2p/implicit/grids/fracture.msh b/test/porousmediumflow/2p/implicit/fracture/grids/fracture.msh
similarity index 100%
rename from test/porousmediumflow/2p/implicit/grids/fracture.msh
rename to test/porousmediumflow/2p/implicit/fracture/grids/fracture.msh
diff --git a/test/porousmediumflow/2p/implicit/fractureproblem.hh b/test/porousmediumflow/2p/implicit/fracture/problem.hh
similarity index 63%
rename from test/porousmediumflow/2p/implicit/fractureproblem.hh
rename to test/porousmediumflow/2p/implicit/fracture/problem.hh
index d3de2f357ab3437c1191279cd325d1edfa96ccd9..ecc0170e7dcb26541c21d8b4bc6296a3189f09f2 100644
--- a/test/porousmediumflow/2p/implicit/fractureproblem.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/problem.hh
@@ -27,13 +27,15 @@
#include <dumux/material/components/simpleh2o.hh>
#include <dumux/material/components/dnapl.hh>
+
#include <dumux/porousmediumflow/2p/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/implicit/cellcentered/propertydefaults.hh>
+#include <dumux/porousmediumflow/problem.hh>
+
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box/properties.hh>
-#include "fracturespatialparams.hh"
+#include "spatialparams.hh"
namespace Dumux
{
@@ -44,20 +46,12 @@ class FractureProblem;
namespace Properties
{
NEW_TYPE_TAG(FractureProblem, INHERITS_FROM(TwoP, FractureSpatialParams));
-NEW_TYPE_TAG(FractureBoxProblem, INHERITS_FROM(BoxModel, FractureProblem));
-NEW_TYPE_TAG(FractureCCProblem, INHERITS_FROM(CCTpfaModel, FractureProblem));
-NEW_TYPE_TAG(FractureCCMpfaProblem, INHERITS_FROM(CCMpfaModel, FractureProblem));
+NEW_TYPE_TAG(FractureBoxTypeTag, INHERITS_FROM(BoxModel, FractureProblem));
+NEW_TYPE_TAG(FractureCCTpfaTypeTag, INHERITS_FROM(CCTpfaModel, FractureProblem));
+NEW_TYPE_TAG(FractureCCMpfaTypeTag, INHERITS_FROM(CCMpfaModel, FractureProblem));
-SET_BOOL_PROP(FractureProblem, EnableFVGridGeometryCache, true);
-SET_BOOL_PROP(FractureProblem, EnableGlobalVolumeVariablesCache, true);
-SET_BOOL_PROP(FractureProblem, EnableGlobalFluxVariablesCache, true);
-SET_BOOL_PROP(FractureProblem, SolutionDependentAdvection, false);
-
-#if HAVE_DUNE_FOAMGRID
+// set the grid property
SET_TYPE_PROP(FractureProblem, Grid, Dune::FoamGrid<2, 3>);
-#else
-SET_TYPE_PROP(FractureProblem, Grid, Dune::YaspGrid<3>);
-#endif
// Set the problem property
SET_TYPE_PROP(FractureProblem, Problem, Dumux::FractureProblem<TypeTag>);
@@ -80,58 +74,30 @@ public:
using type = FluidSystems::LiquidPhase<Scalar, DNAPL<Scalar>>;
};
-// Linear solver settings
-SET_TYPE_PROP(FractureProblem, LinearSolver, Dumux::ILU0BiCGSTABBackend<TypeTag>);
+// Use global caching
+SET_BOOL_PROP(FractureProblem, EnableFVGridGeometryCache, true);
+SET_BOOL_PROP(FractureProblem, EnableGlobalVolumeVariablesCache, true);
+SET_BOOL_PROP(FractureProblem, EnableGlobalFluxVariablesCache, true);
-SET_BOOL_PROP(FractureProblem, ProblemEnableGravity, false);
+// permeablility is solution-independent
+SET_BOOL_PROP(FractureProblem, SolutionDependentAdvection, false);
}
/*!
* \ingroup TwoPModel
* \ingroup ImplicitTestProblems
- * \brief Soil contamination problem where DNAPL infiltrates a fully
- * water saturated medium.
- *
- * The domain is sized 6m times 4m and features a rectangular lens
- * with low permeablility which spans from (1 m , 2 m) to (4 m, 3 m)
- * and is surrounded by a medium with higher permability. Note that
- * this problem is discretized using only two dimensions, so from the
- * point of view of the two-phase model, the depth of the domain
- * implicitly is 1 m everywhere.
- *
- * On the top and the bottom of the domain neumann boundary conditions
- * are used, while dirichlet conditions apply on the left and right
- * boundaries.
- *
- * DNAPL is injected at the top boundary from 3m to 4m at a rate of
- * 0.04 kg/(s m^2), the remaining neumann boundaries are no-flow
- * boundaries.
- *
- * The dirichlet boundaries on the left boundary is the hydrostatic
- * pressure scaled by a factor of 1.125, while on the right side it is
- * just the hydrostatic pressure. The DNAPL saturation on both sides
- * is zero.
- *
- * This problem uses the \ref TwoPModel.
- *
- * This problem should typically be simulated until \f$t_{\text{end}}
- * \approx 20\,000\;s\f$ is reached. A good choice for the initial time step
- * size is \f$t_{\text{inital}} = 250\;s\f$.
- *
- * To run the simulation execute the following line in shell:
- * <tt>./test_box2p -parameterFile test_box2p.input</tt> or
- * <tt>./test_cc2p -parameterFile test_cc2p.input</tt>
+ * \brief DNAPL transport through a fracture network (2d in 3d).
*/
template <class TypeTag>
-class FractureProblem : public ImplicitPorousMediaProblem<TypeTag>
+class FractureProblem : public PorousMediumFlowProblem<TypeTag>
{
- using ParentType = ImplicitPorousMediaProblem<TypeTag>;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
- using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
- using WettingPhase = typename GET_PROP_TYPE(TypeTag, WettingPhase);
- using NonwettingPhase = typename GET_PROP_TYPE(TypeTag, NonwettingPhase);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
enum {
@@ -153,46 +119,17 @@ class FractureProblem : public ImplicitPorousMediaProblem<TypeTag>
dimWorld = GridView::dimensionworld
};
-
- using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
- using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
- using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using Vertex = typename GridView::template Codim<dim>::Entity;
- using Element = typename GridView::template Codim<0>::Entity;
- using Intersection = typename GridView::Intersection;
- using ReferenceElements = typename Dune::ReferenceElements<Scalar, dim>;
public:
- /*!
- * \brief The constructor
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- */
- FractureProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
- {
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name);
- }
+ FractureProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry) {}
/*!
* \name Problem parameters
*/
// \{
- /*!
- * \brief Returns the problem name
- *
- * This is used as a prefix for files generated by the simulation.
- */
- const std::string& name() const
- {
- return name_;
- }
-
/*!
* \brief User defined output after the time integration
*
@@ -200,14 +137,14 @@ public:
*/
void postTimeStep()
{
- // Calculate storage terms
- PrimaryVariables storage;
- this->model().globalStorage(storage);
-
- // Write mass balance information for rank 0
- if (this->gridView().comm().rank() == 0) {
- std::cout<<"Storage: " << storage << std::endl;
- }
+ // // Calculate storage terms
+ // PrimaryVariables storage;
+ // this->model().globalStorage(storage);
+ //
+ // // Write mass balance information for rank 0
+ // if (this->gridView().comm().rank() == 0) {
+ // std::cout<<"Storage: " << storage << std::endl;
+ // }
}
/*!
@@ -241,8 +178,7 @@ public:
* \brief Specifies which kind of boundary condition should be
* used for which equation on a given boundary segment.
*
- * \param values The boundary types for the conservation equations
- * \param vertex The vertex for which the boundary type is set
+ * \param globalPos The global position where to set the BC types
*/
BoundaryTypes boundaryTypesAtPos(const GlobalPosition &globalPos) const
{
@@ -309,16 +245,13 @@ public:
* \param globalPos The global position
*/
PrimaryVariables initialAtPos(const GlobalPosition &globalPos) const
- {
- return dirichletAtPos(globalPos);
- }
+ { return dirichletAtPos(globalPos); }
// \}
private:
+
bool onInlet_(const GlobalPosition &globalPos) const
- {
- return globalPos[0] < eps_ && globalPos[1] > -0.5 - eps_;
- }
+ { return globalPos[0] < eps_ && globalPos[1] > -0.5 - eps_; }
static constexpr Scalar eps_ = 1.5e-7;
std::string name_;
diff --git a/test/porousmediumflow/2p/implicit/fracturespatialparams.hh b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
similarity index 95%
rename from test/porousmediumflow/2p/implicit/fracturespatialparams.hh
rename to test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
index 97d7fdd172e1a158a46f1a615d090a4b1f5e37b0..18d8a3122c27d8e6bf187f1902e679358dad48eb 100644
--- a/test/porousmediumflow/2p/implicit/fracturespatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/fracture/spatialparams.hh
@@ -91,13 +91,8 @@ public:
// export permeability type
using PermeabilityType = Scalar;
- /*!
- * \brief The constructor
- *
- * \param gridView The grid view
- */
- FractureSpatialParams(const Problem& problem, const GridView& gridView)
- : ParentType(problem, gridView)
+ FractureSpatialParams(const Problem& problem)
+ : ParentType(problem)
{
// residual saturations
materialParams_.setSwr(0.05);
diff --git a/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_box.cc b/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_box.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f459057a596a6dc1916774a4b2827f8f06027035
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_box.cc
@@ -0,0 +1,241 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief Fracture 2d in 3d test for the two-phase box model
+ */
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include "problem.hh"
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+/*!
+ * \brief Provides an interface for customizing error messages associated with
+ * reading in parameters.
+ *
+ * \param progName The name of the program, that was tried to be started.
+ * \param errorMsg The error message that was issued by the start function.
+ * Comprises the thing that went wrong and a general help message.
+ */
+void usage(const char *progName, const std::string &errorMsg)
+{}
+
+////////////////////////
+// the main function
+////////////////////////
+int main(int argc, char** argv) try
+{
+#if HAVE_DUNE_FOAMGRID
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(FractureBoxProblem);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(GridView::dimension));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->elementMapper());
+
+ // the non-linear solver
+ using NewtonController = NewtonController<TypeTag>;
+ using NewtonMethod = NewtonMethod<TypeTag, NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+#else
+#warning External grid module dune-foamgrid needed to run this example.
+ std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
+ return 77;
+#endif
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_cc.cc b/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_cc.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3bb9db15fe5ab456c794a2a47b8f59cdad00d195
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_cc.cc
@@ -0,0 +1,234 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief Fracture 2d in 3d test for the two-phase box model
+ */
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include "problem.hh"
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+/*!
+ * \brief Provides an interface for customizing error messages associated with
+ * reading in parameters.
+ *
+ * \param progName The name of the program, that was tried to be started.
+ * \param errorMsg The error message that was issued by the start function.
+ * Comprises the thing that went wrong and a general help message.
+ */
+void usage(const char *progName, const std::string &errorMsg)
+{}
+
+////////////////////////
+// the main function
+////////////////////////
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_fv.cc b/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_fv.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3bb9db15fe5ab456c794a2a47b8f59cdad00d195
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/fracture/test_2p_fracture_fv.cc
@@ -0,0 +1,234 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief Fracture 2d in 3d test for the two-phase box model
+ */
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include "problem.hh"
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+/*!
+ * \brief Provides an interface for customizing error messages associated with
+ * reading in parameters.
+ *
+ * \param progName The name of the program, that was tried to be started.
+ * \param errorMsg The error message that was issued by the start function.
+ * Comprises the thing that went wrong and a general help message.
+ */
+void usage(const char *progName, const std::string &errorMsg)
+{}
+
+////////////////////////
+// the main function
+////////////////////////
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/2p/implicit/test_fracture_cc2p.input b/test/porousmediumflow/2p/implicit/fracture/test_fracture.input
similarity index 63%
rename from test/porousmediumflow/2p/implicit/test_fracture_cc2p.input
rename to test/porousmediumflow/2p/implicit/fracture/test_fracture.input
index ec55ea7fdcfe1912a922b61641746105ecc7ec18..a0ee2bd12b1b8aaeeb377feb2fa4e0d8fd703303 100644
--- a/test/porousmediumflow/2p/implicit/test_fracture_cc2p.input
+++ b/test/porousmediumflow/2p/implicit/fracture/test_fracture.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 250 # [s]
TEnd = 300000 # [s]
@@ -6,7 +6,8 @@ TEnd = 300000 # [s]
File = grids/fracture.msh
[Problem]
-Name = fracturecc # name passed to the output routines
+Name = fracture
+EnableGravity = false
[Implicit]
UpwindWeight = 1.0
diff --git a/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh b/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh
deleted file mode 100644
index 3f8a05f0be56c9adcb1bc3b9cf6fff96a7285248..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/generalizeddirichletproblem.hh
+++ /dev/null
@@ -1,200 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Problem that uses a generalized Dirichlet boundary condition.
- */
-#ifndef DUMUX_GENERALIZED_DIRICHLET_PROBLEM_HH
-#define DUMUX_GENERALIZED_DIRICHLET_PROBLEM_HH
-
-// The numerical model
-#include <dumux/porousmediumflow/2p/implicit/model.hh>
-
-// The base porous media box problem
-#include <dumux/porousmediumflow/implicit/problem.hh>
-
-// Spatially dependent parameters
-#include "generalizeddirichletspatialparams.hh"
-
-// The components that are used
-#include <dumux/material/components/h2o.hh>
-#include <dumux/material/components/lnapl.hh>
-#include <dumux/linear/seqsolverbackend.hh>
-
-namespace Dumux{
-// Forward declaration of the problem class
-template <class TypeTag>
-class GeneralizedDirichletProblem;
-
-namespace Properties {
-// Create a new type tag for the problem
-NEW_TYPE_TAG(GeneralizedDirichletProblem, INHERITS_FROM(BoxTwoP, GeneralizedDirichletSpatialParams));
-
-// Set the "Problem" property
-SET_PROP(GeneralizedDirichletProblem, Problem)
-{ typedef GeneralizedDirichletProblem<TypeTag> type;};
-
-// Set grid to be used
-SET_TYPE_PROP(GeneralizedDirichletProblem, Grid, Dune::YaspGrid<1>);
-
-// Set the wetting phase
-SET_PROP(GeneralizedDirichletProblem, WettingPhase)
-{
-private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef FluidSystems::LiquidPhase<Scalar, H2O<Scalar> > type;
-};
-
-// Set the non-wetting phase
-SET_PROP(GeneralizedDirichletProblem, NonwettingPhase)
-{
-private: typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public: typedef FluidSystems::LiquidPhase<Scalar, LNAPL<Scalar> > type;
-};
-
-SET_INT_PROP(GeneralizedDirichletProblem, Formulation, TwoPFormulation::pnsw);
-
-SET_BOOL_PROP(GeneralizedDirichletProblem, ProblemEnableGravity, false);
-}
-
-/*!
- * \ingroup TwoPBoxModel
- *
- * \brief Problem that uses a generalized Dirichlet boundary condition.
- *
- * On the right boundary, a Dirichlet value for the nonwetting-phase pressure
- * should be set. At the same time, nonwetting phase should be allowed to leave
- * the domain by means of an outflow boundary condition. In order to achieve
- * this the general 'setDirichlet' method is used in the function
- * 'boundaryTypesAtPos' which allows to set the value of a primary variable by
- * replacing an arbitrary balance equation. In this case, the index of the
- * primary variable is Indices::pnIdx, while the index of the replaced equation
- * is Indices::contiWEqIdx. This allows to set the outflow condition for
- * equation index Indices::contiNEqIdx.
- */
-template <class TypeTag>
-class GeneralizedDirichletProblem : public ImplicitPorousMediaProblem<TypeTag>
-{
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
- // Grid dimension
- enum { dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
- // Types from DUNE-Grid
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
- // Dumux specific types
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
-
-public:
- GeneralizedDirichletProblem(TimeManager &timeManager,
- const GridView &gridView)
- : ParentType(timeManager, gridView)
- {
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name);
- }
-
- //! Specifies the problem name. This is used as a prefix for files
- //! generated by the simulation.
- const std::string& name() const
- { return name_; }
-
- //! Returns the temperature within a finite volume. We use constant
- //! 10 degrees Celsius.
- Scalar temperature() const
- { return 283.15; };
-
- bool shouldWriteRestartFile() const
- {
- return false;
- }
-
- //! Specifies which kind of boundary condition should be used for
- //! which equation for a finite volume on the boundary.
- void boundaryTypesAtPos(BoundaryTypes &bcTypes,
- const GlobalPosition &globalPos) const
- {
- if (globalPos[0] > this->bBoxMax()[0] - eps_)
- {
- bcTypes.setDirichlet(Indices::pnIdx, Indices::contiWEqIdx);
- bcTypes.setOutflow(Indices::contiNEqIdx);
- }
- else // Neumann for the remaining boundaries
- bcTypes.setAllNeumann();
-
- }
-
- //! Evaluates the Dirichlet boundary conditions for a finite volume
- //! on the grid boundary. Here, the 'values' parameter stores
- //! primary variables.
- void dirichletAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values = 0;
- if (globalPos[0] > this->bBoxMax()[0] - eps_)
- values[Indices::pnIdx] = 200e3; // 200 kPa = 2 bar oil pressure on right boundary
- }
-
- //! Evaluates the boundary conditions for a Neumann boundary
- //! segment. Here, the 'values' parameter stores the mass flux in
- //! [kg/(m^2 * s)] in normal direction of each phase. Negative
- //! values mean influx.
- void neumannAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- // water influx of 0.05 kg / (m.s) on the left boundary
- if (globalPos[0] < eps_) {
- values[Indices::contiWEqIdx] = -5e-2;
- values[Indices::contiNEqIdx] = 0;
- }
- }
-
- //! Evaluates the initial value for a control volume. For this
- //! method, the 'values' parameter stores primary variables.
- void initialAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values[Indices::pnIdx] = 200e3; // 200 kPa = 2 bar
- values[Indices::swIdx] = 0;
- }
-
- //! Evaluates the source term for all phases within a given
- //! sub-control-volume. In this case, the 'values' parameter
- //! stores the rate mass generated or annihilated per volume unit
- //! in [kg / (m^3 * s)]. Positive values mean that mass is created.
- void sourceAtPos(PrimaryVariables &values,
- const GlobalPosition &globalPos) const
- {
- values = 0;
- }
-
-private:
- static constexpr Scalar eps_ = 3e-6;
- std::string name_;
-};
-}
-
-#endif
diff --git a/test/porousmediumflow/2p/implicit/generalizeddirichletspatialparams.hh b/test/porousmediumflow/2p/implicit/generalizeddirichletspatialparams.hh
deleted file mode 100644
index e8933cf258d6ee6073f3a7b3777e211cbc5d3291..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/generalizeddirichletspatialparams.hh
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief The spatial parameters for the problem that uses a generalized
- * Dirichlet boundary condition.
- */
-#ifndef DUMUX_GENERALIZED_DIRICHLET_SPATIAL_PARAMS_COUPLED_HH
-#define DUMUX_GENERALIZED_DIRICHLET_SPATIAL_PARAMS_COUPLED_HH
-
-// include parent spatialparameters
-#include <dumux/material/spatialparams/implicit.hh>
-
-// include material laws
-#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
-
-namespace Dumux {
-//forward declaration
-template<class TypeTag>
-class GeneralizedDirichletSpatialParams;
-
-namespace Properties
-{
-// The spatial parameters TypeTag
-NEW_TYPE_TAG(GeneralizedDirichletSpatialParams);
-
-// Set the spatial parameters
-SET_TYPE_PROP(GeneralizedDirichletSpatialParams, SpatialParams,
- GeneralizedDirichletSpatialParams<TypeTag>);
-
-// Set the material law
-SET_PROP(GeneralizedDirichletSpatialParams, MaterialLaw)
-{
-private:
- // material law typedefs
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- // select material law to be used
- typedef RegularizedBrooksCorey<Scalar> RawMaterialLaw;
-public:
- // adapter for absolute law
- typedef EffToAbsLaw<RawMaterialLaw> type;
-};
-}
-
-/*!
- * \ingroup TwoPBoxModel
- *
- * \brief The spatial parameters for the problem that uses a generalized
- * Dirichlet boundary condition.
- */
-template<class TypeTag>
-class GeneralizedDirichletSpatialParams: public ImplicitSpatialParams<TypeTag>
-{
- // Get informations for current implementation via property system
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- enum
- {
- dim = Grid::dimension,
- dimWorld = GridView::dimensionworld
- };
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
- typedef Dune::FieldMatrix<Scalar, dimWorld, dimWorld> DimWorldMatrix;
-
-public:
- // get material law from property system
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
- // determine appropriate parameters depending on selected materialLaw
- typedef typename MaterialLaw::Params MaterialLawParams;
-
- /*! Intrinsic permeability tensor K \f$[m^2]\f$ depending
- * on the position in the domain
- */
- const DimWorldMatrix& intrinsicPermeabilityAtPos(const GlobalPosition& globalPos) const
- { return K_; }
-
- /*! Defines the porosity \f$[-]\f$ of the porous medium depending
- * on the position in the domain
- */
- Scalar porosityAtPos(const GlobalPosition& globalPos) const
- { return 0.2; }
-
- /*! Returns the parameter object for the material law (i.e. Brooks-Corey)
- * depending on the position in the domain
- */
- const MaterialLawParams& materialLawParamsAtPos(const GlobalPosition& globalPos) const
- {
- return materialParams_;
- }
-
- // constructor
- GeneralizedDirichletSpatialParams(const GridView& gridView) :
- ImplicitSpatialParams<TypeTag>(gridView),
- K_(0)
- {
- //set main diagonal entries of the permeability tensor to a value
- //setting to one value means: isotropic, homogeneous
- for (int i = 0; i < dim; i++)
- K_[i][i] = 1e-7;
-
- //set residual saturations
- materialParams_.setSwr(0.0);
- materialParams_.setSnr(0.0);
-
- //parameters of Brooks & Corey Law
- materialParams_.setPe(500.0);
- materialParams_.setLambda(2);
- }
-
-private:
- DimWorldMatrix K_;
- // Object that holds the values/parameters of the selected material law.
- MaterialLawParams materialParams_;
-};
-} // end namespace
-#endif
diff --git a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..b53242902f9379ac07f4ca79ac034990a13ee699
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
@@ -0,0 +1,40 @@
+dune_symlink_to_source_files(FILES "test_2p.input")
+
+# using tpfa
+dune_add_test(NAME test_2p_incompressible_tpfa
+ SOURCES test_2p_fv.cc
+ COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleTpfa
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/2p_tpfa-00008.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_tpfa test_2p.input -Problem.Name 2p_tpfa")
+
+# using box
+dune_add_test(NAME test_2p_incompressible_box
+ SOURCES test_2p_fv.cc
+ COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/lensbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/2p_box-00007.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_box test_2p.input -Problem.Name 2p_box")
+
+# using mpfa
+dune_add_test(NAME test_2p_incompressible_mpfa
+ SOURCES test_2p_fv.cc
+ COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleMpfa
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/lenscc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/2p_mpfa-00008.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_incompressible_mpfa test_2p.input -Problem.Name 2p_mpfa")
+
+set(CMAKE_BUILD_TYPE Release)
+
+#install sources
+install(FILES
+problem.hh
+spatialparams.hh
+test_2p_fv.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/2p/incompressible)
diff --git a/test/porousmediumflow/2p/implicit/incompressible/problem.hh b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
new file mode 100644
index 0000000000000000000000000000000000000000..6e058dc8cbcaaa46071ed837be0c396f3671ccc8
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/incompressible/problem.hh
@@ -0,0 +1,245 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief The properties for the incompressible test
+ */
+#ifndef DUMUX_INCOMPRESSIBLE_ONEP_TEST_PROBLEM_HH
+#define DUMUX_INCOMPRESSIBLE_ONEP_TEST_PROBLEM_HH
+
+#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+
+#include <dumux/material/components/dnapl.hh>
+#include <dumux/material/components/simpleh2o.hh>
+
+#include <dumux/porousmediumflow/problem.hh>
+#include <dumux/porousmediumflow/2p/implicit/model.hh>
+#include <dumux/porousmediumflow/2p/implicit/incompressiblelocalresidual.hh>
+
+#include "spatialparams.hh"
+
+namespace Dumux
+{
+// forward declarations
+template<class TypeTag> class TwoPTestProblem;
+
+namespace Properties
+{
+NEW_TYPE_TAG(TwoPIncompressible, INHERITS_FROM(TwoP));
+NEW_TYPE_TAG(TwoPIncompressibleTpfa, INHERITS_FROM(CCTpfaModel, TwoPIncompressible, SpatialParams));
+NEW_TYPE_TAG(TwoPIncompressibleMpfa, INHERITS_FROM(CCMpfaModel, TwoPIncompressible, SpatialParams));
+NEW_TYPE_TAG(TwoPIncompressibleBox, INHERITS_FROM(BoxModel, TwoPIncompressible, SpatialParams));
+
+// Set the grid type
+SET_TYPE_PROP(TwoPIncompressible, Grid, Dune::YaspGrid<2>);
+
+// Set the problem type
+SET_TYPE_PROP(TwoPIncompressible, Problem, TwoPTestProblem<TypeTag>);
+
+// the local residual containing the analytic derivative methods
+SET_TYPE_PROP(TwoPIncompressible, LocalResidual, TwoPIncompressibleLocalResidual<TypeTag>);
+
+// Set the wetting phase
+SET_PROP(TwoPIncompressible, WettingPhase)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+public:
+ typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
+};
+
+// Set the non-wetting phase
+SET_PROP(TwoPIncompressible, NonwettingPhase)
+{
+private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+public:
+ typedef FluidSystems::LiquidPhase<Scalar, DNAPL<Scalar> > type;
+};
+
+// Enable caching
+SET_BOOL_PROP(TwoPIncompressible, EnableGlobalVolumeVariablesCache, false);
+SET_BOOL_PROP(TwoPIncompressible, EnableGlobalFluxVariablesCache, false);
+SET_BOOL_PROP(TwoPIncompressible, EnableFVGridGeometryCache, false);
+} // end namespace Properties
+
+template<class TypeTag>
+class TwoPTestProblem : public PorousMediumFlowProblem<TypeTag>
+{
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
+ using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+
+ static constexpr int dimWorld = GridView::dimensionworld;
+
+public:
+ TwoPTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry) {}
+
+ /*!
+ * \brief Specifies which kind of boundary condition should be
+ * used for which equation on a given boundary segment
+ *
+ * \param values Stores the value of the boundary type
+ * \param globalPos The global position
+ */
+ BoundaryTypes boundaryTypesAtPos(const GlobalPosition &globalPos) const
+ {
+ BoundaryTypes values;
+ if (onLeftBoundary_(globalPos) || onRightBoundary_(globalPos))
+ values.setAllDirichlet();
+ else
+ values.setAllNeumann();
+ return values;
+ }
+
+ /*!
+ * \brief Evaluates the boundary conditions for a Dirichlet
+ * boundary segment
+ *
+ * \param values Stores the Dirichlet values for the conservation equations in
+ * \f$ [ \textnormal{unit of primary variable} ] \f$
+ * \param globalPos The global position
+ */
+ PrimaryVariables dirichletAtPos(const GlobalPosition &globalPos) const
+ {
+ PrimaryVariables values;
+ typename GET_PROP_TYPE(TypeTag, FluidState) fluidState;
+ fluidState.setTemperature(temperature());
+ fluidState.setPressure(FluidSystem::wPhaseIdx, /*pressure=*/1e5);
+ fluidState.setPressure(FluidSystem::nPhaseIdx, /*pressure=*/1e5);
+
+ Scalar densityW = FluidSystem::density(fluidState, FluidSystem::wPhaseIdx);
+
+ Scalar height = this->fvGridGeometry().bBoxMax()[1] - this->fvGridGeometry().bBoxMin()[1];
+ Scalar depth = this->fvGridGeometry().bBoxMax()[1] - globalPos[1];
+ Scalar alpha = 1 + 1.5/height;
+ Scalar width = this->fvGridGeometry().bBoxMax()[0] - this->fvGridGeometry().bBoxMin()[0];
+ Scalar factor = (width*alpha + (1.0 - alpha)*globalPos[0])/width;
+
+ // hydrostatic pressure scaled by alpha
+ values[Indices::pwIdx] = 1e5 - factor*densityW*this->gravity()[1]*depth;
+ values[Indices::snIdx] = 0.0;
+
+ return values;
+ }
+
+ /*!
+ * \brief Evaluate the boundary conditions for a neumann
+ * boundary segment.
+ *
+ * \param values Stores the Neumann values for the conservation equations in
+ * \f$ [ \textnormal{unit of conserved quantity} / (m^(dim-1) \cdot s )] \f$
+ * \param globalPos The position of the integration point of the boundary segment.
+ *
+ * For this method, the \a values parameter stores the mass flux
+ * in normal direction of each phase. Negative values mean influx.
+ */
+ NeumannFluxes neumannAtPos(const GlobalPosition &globalPos) const
+ {
+ NeumannFluxes values(0.0);
+ if (onInlet_(globalPos))
+ values[Indices::contiNEqIdx] = -0.04; // kg / (m * s)
+ return values;
+ }
+
+ /*!
+ * \brief Evaluates the initial values for a control volume
+ *
+ * \param values Stores the initial values for the conservation equations in
+ * \f$ [ \textnormal{unit of primary variables} ] \f$
+ * \param globalPos The global position
+ */
+ PrimaryVariables initialAtPos(const GlobalPosition &globalPos) const
+ {
+ PrimaryVariables values;
+ typename GET_PROP_TYPE(TypeTag, FluidState) fluidState;
+ fluidState.setTemperature(temperature());
+ fluidState.setPressure(FluidSystem::wPhaseIdx, /*pressure=*/1e5);
+ fluidState.setPressure(FluidSystem::nPhaseIdx, /*pressure=*/1e5);
+
+ Scalar densityW = FluidSystem::density(fluidState, FluidSystem::wPhaseIdx);
+
+ Scalar depth = this->fvGridGeometry().bBoxMax()[1] - globalPos[1];
+
+ // hydrostatic pressure
+ values[Indices::pwIdx] = 1e5 - densityW*this->gravity()[1]*depth;
+ values[Indices::snIdx] = 0.0;
+ return values;
+ }
+
+ /*!
+ * \brief Returns the temperature \f$\mathrm{[K]}\f$ for an isothermal problem.
+ *
+ * This is not specific to the discretization. By default it just
+ * throws an exception so it must be overloaded by the problem if
+ * no energy equation is used.
+ */
+ Scalar temperature() const
+ {
+ return 293.15; // 10°C
+ }
+
+private:
+ bool onLeftBoundary_(const GlobalPosition &globalPos) const
+ {
+ return globalPos[0] < this->fvGridGeometry().bBoxMin()[0] + eps_;
+ }
+
+ bool onRightBoundary_(const GlobalPosition &globalPos) const
+ {
+ return globalPos[0] > this->fvGridGeometry().bBoxMax()[0] - eps_;
+ }
+
+ bool onLowerBoundary_(const GlobalPosition &globalPos) const
+ {
+ return globalPos[1] < this->fvGridGeometry().bBoxMin()[1] + eps_;
+ }
+
+ bool onUpperBoundary_(const GlobalPosition &globalPos) const
+ {
+ return globalPos[1] > this->fvGridGeometry().bBoxMax()[1] - eps_;
+ }
+
+ bool onInlet_(const GlobalPosition &globalPos) const
+ {
+ Scalar width = this->fvGridGeometry().bBoxMax()[0] - this->fvGridGeometry().bBoxMin()[0];
+ Scalar lambda = (this->fvGridGeometry().bBoxMax()[0] - globalPos[0])/width;
+ return onUpperBoundary_(globalPos) && 0.5 < lambda && lambda < 2.0/3.0;
+ }
+
+ static constexpr Scalar eps_ = 1e-6;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/test/porousmediumflow/2p/implicit/lensspatialparams.hh b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
similarity index 76%
rename from test/porousmediumflow/2p/implicit/lensspatialparams.hh
rename to test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
index bdca22573f740ba085c51eab4433be40fe4064c2..4867db01ce86ab5cf5448cb0f3adedfa477b7f59 100644
--- a/test/porousmediumflow/2p/implicit/lensspatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/incompressible/spatialparams.hh
@@ -18,37 +18,33 @@
*****************************************************************************/
/*!
* \file
- *
- * \brief The spatial parameters for the LensProblem which uses the
- * two-phase fully implicit model
+ * \brief The spatial params the incompressible test
*/
-#ifndef DUMUX_LENS_SPATIAL_PARAMS_HH
-#define DUMUX_LENS_SPATIAL_PARAMS_HH
+#ifndef DUMUX_COMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
+#define DUMUX_COMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
#include <dumux/material/spatialparams/implicit.hh>
+
#include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-#include <dumux/porousmediumflow/2p/implicit/model.hh>
-
namespace Dumux
{
//forward declaration
template<class TypeTag>
-class LensSpatialParams;
+class TwoPTestSpatialParams;
namespace Properties
{
// The spatial parameters TypeTag
-NEW_TYPE_TAG(LensSpatialParams);
+NEW_TYPE_TAG(SpatialParams);
// Set the spatial parameters
-SET_TYPE_PROP(LensSpatialParams, SpatialParams, LensSpatialParams<TypeTag>);
+SET_TYPE_PROP(SpatialParams, SpatialParams, TwoPTestSpatialParams<TypeTag>);
// Set the material Law
-SET_PROP(LensSpatialParams, MaterialLaw)
+SET_PROP(SpatialParams, MaterialLaw)
{
private:
// define the material law which is parameterized by effective
@@ -60,49 +56,31 @@ public:
using type = EffToAbsLaw<EffectiveLaw>;
};
}
-/*!
- * \ingroup TwoPModel
- * \ingroup ImplicitTestProblems
- * \brief The spatial parameters for the LensProblem which uses the
- * two-phase fully implicit model
- */
+
template<class TypeTag>
-class LensSpatialParams : public ImplicitSpatialParams<TypeTag>
+class TwoPTestSpatialParams : public ImplicitSpatialParams<TypeTag>
{
using ParentType = ImplicitSpatialParams<TypeTag>;
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
- using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
-
- enum {
- dim=GridView::dimension,
- dimWorld=GridView::dimensionworld
- };
-
- using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
- using Tensor = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
-
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
-
- //get the material law from the property system
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
+ static constexpr int dimWorld = GridView::dimensionworld;
+
public:
- // export permeability type
using PermeabilityType = Scalar;
- /*!
- * \brief The constructor
- *
- * \param gridView The grid view
- */
- LensSpatialParams(const Problem& problem, const GridView& gridView)
- : ParentType(problem, gridView)
+ TwoPTestSpatialParams(const Problem& problem)
+ : ParentType(problem)
{
- lensLowerLeft_ = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensLowerLeft);
- lensUpperRight_ = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensUpperRight);
+ lensLowerLeft_ = getParam<GlobalPosition>("SpatialParams.LensLowerLeft");
+ lensUpperRight_ = getParam<GlobalPosition>("SpatialParams.LensUpperRight");
// residual saturations
lensMaterialParams_.setSwr(0.18);
@@ -153,7 +131,6 @@ public:
return outerMaterialParams_;
}
-
private:
bool isInLens_(const GlobalPosition &globalPos) const
{
@@ -178,4 +155,3 @@ private:
} // end namespace Dumux
#endif
-
diff --git a/test/porousmediumflow/2p/implicit/test_cc2p.input b/test/porousmediumflow/2p/implicit/incompressible/test_2p.input
similarity index 54%
rename from test/porousmediumflow/2p/implicit/test_cc2p.input
rename to test/porousmediumflow/2p/implicit/incompressible/test_2p.input
index d6385b07db7486af09ca576eddf6d8a6465ba77b..93f7f1f1ee922e699bd27f853eda26be4521f705 100644
--- a/test/porousmediumflow/2p/implicit/test_cc2p.input
+++ b/test/porousmediumflow/2p/implicit/incompressible/test_2p.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 250 # [s]
TEnd = 3000 # [s]
@@ -12,8 +12,5 @@ LensLowerLeft = 1.0 2.0 # [m] coordinates of the lower left lens corner
LensUpperRight = 4.0 3.0 # [m] coordinates of the upper right lens corner
[Problem]
-Name = lenscc # name passed to the output routines
-
-[Implicit]
-EnablePartialReassemble = 1 # enable partial reassembly of the jacobian matrix?
-EnableJacobianRecycling = 1 # Enable reuse of jacobian matrices?
+Name = 2p
+EnableGravity = true
diff --git a/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc b/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc
new file mode 100644
index 0000000000000000000000000000000000000000..829bb307be560e70832f611b34338c3468881ea1
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/incompressible/test_2p_fv.cc
@@ -0,0 +1,252 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the two-phase porousmedium flow model
+ */
+#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include "problem.hh"
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+/*!
+ * \brief Provides an interface for customizing error messages associated with
+ * reading in parameters.
+ *
+ * \param progName The name of the program, that was tried to be started.
+ * \param errorMsg The error message that was issued by the start function.
+ * Comprises the thing that went wrong and a general help message.
+ */
+void usage(const char *progName, const std::string &errorMsg)
+{
+ if (errorMsg.size() > 0) {
+ std::string errorMessageOut = "\nUsage: ";
+ errorMessageOut += progName;
+ errorMessageOut += " [options]\n";
+ errorMessageOut += errorMsg;
+ errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.LowerLeft Lower left corner coordinates\n"
+ "\t-Grid.UpperRight Upper right corner coordinates\n"
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n"
+ "\t definition in DGF format\n"
+ "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
+ "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
+ "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n"
+ "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n";
+
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/2p/implicit/lensproblem.hh b/test/porousmediumflow/2p/implicit/lensproblem.hh
deleted file mode 100644
index 4897635d0d484a834e518056746f9bf2ef1eab65..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/lensproblem.hh
+++ /dev/null
@@ -1,460 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Soil contamination problem where DNAPL infiltrates a fully
- * water saturated medium.
- */
-
-#ifndef DUMUX_LENSPROBLEM_HH
-#define DUMUX_LENSPROBLEM_HH
-
-#include <dumux/material/components/simpleh2o.hh>
-#include <dumux/material/components/dnapl.hh>
-#include <dumux/porousmediumflow/2p/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
-#include <dumux/porousmediumflow/2p/implicit/gridadaptindicator.hh>
-#include <dumux/porousmediumflow/2p/implicit/adaptionhelper.hh>
-#include <dumux/implicit/adaptive/gridadaptinitializationindicator.hh>
-
-#include "lensspatialparams.hh"
-
-namespace Dumux
-{
-
-template <class TypeTag>
-class LensProblem;
-
-//////////
-// Specify the properties for the lens problem
-//////////
-namespace Properties
-{
-NEW_TYPE_TAG(LensProblem, INHERITS_FROM(TwoP, LensSpatialParams));
-NEW_TYPE_TAG(LensBoxProblem, INHERITS_FROM(BoxModel, LensProblem));
-NEW_TYPE_TAG(LensBoxAdaptiveProblem, INHERITS_FROM(BoxModel, LensProblem));
-NEW_TYPE_TAG(LensCCProblem, INHERITS_FROM(CCTpfaModel, LensProblem));
-NEW_TYPE_TAG(LensCCAdaptiveProblem, INHERITS_FROM(CCModel, LensProblem));
-
-#if HAVE_UG
-SET_TYPE_PROP(LensCCProblem, Grid, Dune::UGGrid<2>);
-SET_TYPE_PROP(LensBoxProblem, Grid, Dune::UGGrid<2>);
-SET_TYPE_PROP(LensBoxAdaptiveProblem, Grid, Dune::UGGrid<2>);
-#else
-SET_TYPE_PROP(LensCCProblem, Grid, Dune::YaspGrid<2>);
-SET_TYPE_PROP(LensBoxProblem, Grid, Dune::YaspGrid<2>);
-#endif
-
-#if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(LensCCAdaptiveProblem, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
-#endif
-
-// Set the problem property
-SET_TYPE_PROP(LensProblem, Problem, LensProblem<TypeTag>);
-
-// Set the wetting phase
-SET_PROP(LensProblem, WettingPhase)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public:
- typedef FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> > type;
-};
-
-// Set the non-wetting phase
-SET_PROP(LensProblem, NonwettingPhase)
-{
-private:
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-public:
- typedef FluidSystems::LiquidPhase<Scalar, DNAPL<Scalar> > type;
-};
-
-// Linear solver settings
-SET_TYPE_PROP(LensCCProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-SET_TYPE_PROP(LensBoxProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-#if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(LensCCAdaptiveProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-
-SET_BOOL_PROP(LensCCAdaptiveProblem, AdaptiveGrid, true);
-SET_TYPE_PROP(LensCCAdaptiveProblem, AdaptionIndicator, TwoPImplicitGridAdaptIndicator<TypeTag>);
-SET_TYPE_PROP(LensCCAdaptiveProblem, AdaptionInitializationIndicator, ImplicitGridAdaptInitializationIndicator<TypeTag>);
-SET_TYPE_PROP(LensCCAdaptiveProblem, AdaptionHelper, TwoPAdaptionHelper<TypeTag>);
-#endif
-
-#if HAVE_UG
-SET_TYPE_PROP(LensBoxAdaptiveProblem, LinearSolver, ILU0BiCGSTABBackend<TypeTag> );
-
-SET_BOOL_PROP(LensBoxAdaptiveProblem, AdaptiveGrid, true);
-SET_TYPE_PROP(LensBoxAdaptiveProblem, AdaptionIndicator, TwoPImplicitGridAdaptIndicator<TypeTag>);
-SET_TYPE_PROP(LensBoxAdaptiveProblem, AdaptionInitializationIndicator, ImplicitGridAdaptInitializationIndicator<TypeTag>);
-SET_TYPE_PROP(LensBoxAdaptiveProblem, AdaptionHelper, TwoPAdaptionHelper<TypeTag>);
-#endif
-
-NEW_PROP_TAG(BaseProblem);
-SET_TYPE_PROP(LensBoxProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
-SET_TYPE_PROP(LensCCProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
-#if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(LensCCAdaptiveProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
-#endif
-#if HAVE_UG
-SET_TYPE_PROP(LensBoxAdaptiveProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
-#endif
-}
-
-/*!
- * \ingroup TwoPModel
- * \ingroup ImplicitTestProblems
- * \brief Soil contamination problem where DNAPL infiltrates a fully
- * water saturated medium.
- *
- * The domain is sized 6m times 4m and features a rectangular lens
- * with low permeablility which spans from (1 m , 2 m) to (4 m, 3 m)
- * and is surrounded by a medium with higher permability. Note that
- * this problem is discretized using only two dimensions, so from the
- * point of view of the two-phase model, the depth of the domain
- * implicitly is 1 m everywhere.
- *
- * On the top and the bottom of the domain neumann boundary conditions
- * are used, while dirichlet conditions apply on the left and right
- * boundaries.
- *
- * DNAPL is injected at the top boundary from 3m to 4m at a rate of
- * 0.04 kg/(s m^2), the remaining neumann boundaries are no-flow
- * boundaries.
- *
- * The dirichlet boundaries on the left boundary is the hydrostatic
- * pressure scaled by a factor of 1.125, while on the right side it is
- * just the hydrostatic pressure. The DNAPL saturation on both sides
- * is zero.
- *
- * This problem uses the \ref TwoPModel.
- *
- * This problem should typically be simulated until \f$t_{\text{end}}
- * \approx 20\,000\;s\f$ is reached. A good choice for the initial time step
- * size is \f$t_{\text{inital}} = 250\;s\f$.
- *
- * To run the simulation execute the following line in shell:
- * <tt>./test_box2p -parameterFile test_box2p.input</tt> or
- * <tt>./test_cc2p -parameterFile test_cc2p.input</tt>
- */
-template <class TypeTag >
-class LensProblem : public GET_PROP_TYPE(TypeTag, BaseProblem)
-{
- typedef typename GET_PROP_TYPE(TypeTag, BaseProblem) ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
- typedef typename GET_PROP_TYPE(TypeTag, WettingPhase) WettingPhase;
- typedef typename GET_PROP_TYPE(TypeTag, NonwettingPhase) NonwettingPhase;
-
- enum {
-
- // primary variable indices
- pwIdx = Indices::pwIdx,
- snIdx = Indices::snIdx,
-
- // equation indices
- contiNEqIdx = Indices::contiNEqIdx,
-
- // phase indices
- wPhaseIdx = Indices::wPhaseIdx,
- nPhaseIdx = Indices::nPhaseIdx,
-
-
- // world dimension
- dim = GridView::dimension,
- dimWorld = GridView::dimensionworld
- };
-
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dim : 0 };
-
- enum { adaptiveGrid = GET_PROP_VALUE(TypeTag, AdaptiveGrid) };
-
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
-public:
- /*!
- * \brief The constructor
- *
- * \param timeManager The time manager
- * \param gridView The grid view
- */
- LensProblem(TimeManager &timeManager,
- const GridView &gridView)
- : ParentType(timeManager, gridView)
- {
- temperature_ = 273.15 + 20; // -> 20°C
-
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- std::string,
- Problem,
- Name);
- }
-
- /*!
- * \name Problem parameters
- */
- // \{
-
- /*!
- * \brief Returns the problem name
- *
- * This is used as a prefix for files generated by the simulation.
- */
- const std::string& name() const
- {
- return name_;
- }
-
- /*!
- * \brief User defined output before the time integration
- */
- void preTimeStep()
- {
- if(adaptiveGrid)
- {
- PrimaryVariables totalMass = calculateTotalMass();
- std::cout << "Total mass before grid adaption: " << std::endl;
- std::cout << "wPhaseIdx: " << totalMass[wPhaseIdx] << " " << "nPhaseIdx: " << totalMass[nPhaseIdx] << std::endl;
-
- ParentType::preTimeStep();
-
- totalMass = calculateTotalMass();
- std::cout << "Total mass after grid adaption: " << std::endl;
- std::cout << "wPhaseIdx: " << totalMass[wPhaseIdx] << " " << "nPhaseIdx: " << totalMass[nPhaseIdx] << std::endl;
- }
- else
- {
- ParentType::preTimeStep();
- PrimaryVariables totalMass = calculateTotalMass();
- std::cout << "Total mass: " << std::endl;
- std::cout << "wPhaseIdx: " << totalMass[wPhaseIdx] << " " << "nPhaseIdx: " << totalMass[nPhaseIdx] << std::endl;
- }
- }
-
- /*!
- * \brief Returns the temperature \f$ K \f$
- *
- * This problem assumes a uniform temperature of 20 degrees Celsius.
- */
- Scalar temperature() const
- { return temperature_; }
-
- /*!
- * \brief Returns the source term
- *
- * \param values Stores the source values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} / (m^\textrm{dim} \cdot s )] \f$
- * \param globalPos The global position
- */
- Sources sourceAtPos(const GlobalPosition &globalPos) const
- {
- return PrimaryVariables(0.0);
- }
-
- // \}
-
- /*!
- * \name Boundary conditions
- */
- // \{
-
- /*!
- * \brief Specifies which kind of boundary condition should be
- * used for which equation on a given boundary segment
- *
- * \param values Stores the value of the boundary type
- * \param globalPos The global position
- */
- BoundaryTypes boundaryTypesAtPos(const GlobalPosition &globalPos) const
- {
- BoundaryTypes values;
- if (onLeftBoundary_(globalPos) || onRightBoundary_(globalPos)) {
- values.setAllDirichlet();
- }
- else {
- values.setAllNeumann();
- }
- return values;
- }
-
- /*!
- * \brief Evaluates the boundary conditions for a Dirichlet
- * boundary segment
- *
- * \param values Stores the Dirichlet values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variable} ] \f$
- * \param globalPos The global position
- */
- PrimaryVariables dirichletAtPos(const GlobalPosition &globalPos) const
- {
- PrimaryVariables values;
- typename GET_PROP_TYPE(TypeTag, FluidState) fluidState;
- fluidState.setTemperature(temperature_);
- fluidState.setPressure(FluidSystem::wPhaseIdx, /*pressure=*/1e5);
- fluidState.setPressure(FluidSystem::nPhaseIdx, /*pressure=*/1e5);
-
- Scalar densityW = FluidSystem::density(fluidState, FluidSystem::wPhaseIdx);
-
- Scalar height = this->bBoxMax()[1] - this->bBoxMin()[1];
- Scalar depth = this->bBoxMax()[1] - globalPos[1];
- Scalar alpha = 1 + 1.5/height;
- Scalar width = this->bBoxMax()[0] - this->bBoxMin()[0];
- Scalar factor = (width*alpha + (1.0 - alpha)*globalPos[0])/width;
-
- // hydrostatic pressure scaled by alpha
- values[pwIdx] = 1e5 - factor*densityW*this->gravity()[1]*depth;
- values[snIdx] = 0.0;
-
- return values;
- }
-
- /*!
- * \brief Evaluate the boundary conditions for a neumann
- * boundary segment.
- *
- * \param values Stores the Neumann values for the conservation equations in
- * \f$ [ \textnormal{unit of conserved quantity} / (m^(dim-1) \cdot s )] \f$
- * \param globalPos The position of the integration point of the boundary segment.
- *
- * For this method, the \a values parameter stores the mass flux
- * in normal direction of each phase. Negative values mean influx.
- */
- NeumannFluxes neumannAtPos(const GlobalPosition &globalPos) const
- {
- NeumannFluxes values(0.0);
- if (onInlet_(globalPos)) {
- values[contiNEqIdx] = -0.04; // kg / (m * s)
- }
- return values;
- }
- // \}
-
- /*!
- * \name Volume terms
- */
- // \{
-
-
- /*!
- * \brief Evaluates the initial values for a control volume
- *
- * \param values Stores the initial values for the conservation equations in
- * \f$ [ \textnormal{unit of primary variables} ] \f$
- * \param globalPos The global position
- */
- PrimaryVariables initialAtPos(const GlobalPosition &globalPos) const
- {
- PrimaryVariables values;
- typename GET_PROP_TYPE(TypeTag, FluidState) fluidState;
- fluidState.setTemperature(temperature_);
- fluidState.setPressure(FluidSystem::wPhaseIdx, /*pressure=*/1e5);
- fluidState.setPressure(FluidSystem::nPhaseIdx, /*pressure=*/1e5);
-
- Scalar densityW = FluidSystem::density(fluidState, FluidSystem::wPhaseIdx);
-
- Scalar depth = this->bBoxMax()[1] - globalPos[1];
-
- // hydrostatic pressure
- values[pwIdx] = 1e5 - densityW*this->gravity()[1]*depth;
- values[snIdx] = 0.0;
- return values;
- }
- // \}
-
-private:
-
- bool onLeftBoundary_(const GlobalPosition &globalPos) const
- {
- return globalPos[0] < this->bBoxMin()[0] + eps_;
- }
-
- bool onRightBoundary_(const GlobalPosition &globalPos) const
- {
- return globalPos[0] > this->bBoxMax()[0] - eps_;
- }
-
- bool onLowerBoundary_(const GlobalPosition &globalPos) const
- {
- return globalPos[1] < this->bBoxMin()[1] + eps_;
- }
-
- bool onUpperBoundary_(const GlobalPosition &globalPos) const
- {
- return globalPos[1] > this->bBoxMax()[1] - eps_;
- }
-
- bool onInlet_(const GlobalPosition &globalPos) const
- {
- Scalar width = this->bBoxMax()[0] - this->bBoxMin()[0];
- Scalar lambda = (this->bBoxMax()[0] - globalPos[0])/width;
- return onUpperBoundary_(globalPos) && 0.5 < lambda && lambda < 2.0/3.0;
- }
-
- PrimaryVariables calculateTotalMass()
- {
- PrimaryVariables totalMass(0);
-
- for (const auto& element : elements(this->gridView(), Dune::Partitions::interior))
- {
- auto fvGeometry = localView(this->model().fvGridGeometry());
- fvGeometry.bindElement(element);
-
- auto elemVolVars = localView(this->model().curGlobalVolVars());
- elemVolVars.bindElement(element, fvGeometry, this->model().curSol());
-
- for (auto&& scv : scvs(fvGeometry))
- {
- const auto& volVars = elemVolVars[scv];
-
- totalMass[nPhaseIdx] += scv.volume()*volVars.density(nPhaseIdx)
- *volVars.porosity()*volVars.saturation(nPhaseIdx);
- totalMass[wPhaseIdx] += scv.volume()*volVars.density(wPhaseIdx)
- *volVars.porosity()*volVars.saturation(wPhaseIdx);
- }
- }
-
- // communicate global sum if we are running mpi parallel
- if (this->gridView().comm().size() > 1)
- totalMass = this->gridView().comm().sum(totalMass);
-
- return totalMass;
- }
-
- Scalar temperature_;
- static constexpr Scalar eps_ = 3e-6;
- std::string name_;
-};
-} //end namespace
-
-#endif
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..03319857616e0de93989f31f157f46f59a52e1be
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
@@ -0,0 +1,53 @@
+dune_symlink_to_source_files(FILES "test_2pni.input")
+
+dune_add_test(SOURCES test_2pni_fv.cc
+ NAME test_2pni_box_simplex
+ CMAKE_GUARD dune-uggrid_FOUND
+ COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
+ COMPILE_DEFINITIONS TYPETAG=InjectionBoxProblem2PNI
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-simplex-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex-00007.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex test_2pni.input -Problem.Name test_2pni_box_simplex -Grid.CellType Simplex")
+
+dune_add_test(SOURCES test_2pni_fv.cc
+ NAME test_2pni_box_cube
+ COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2>
+ COMPILE_DEFINITIONS TYPETAG=InjectionBoxProblem2PNI
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-cube-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube-00007.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube test_2pni.input -Problem.Name test_2pni_box_cube")
+
+dune_add_test(SOURCES test_2pni_fv.cc
+ NAME test_2pni_tpfa_simplex
+ CMAKE_GUARD dune-uggrid_FOUND
+ COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
+ COMPILE_DEFINITIONS TYPETAG=InjectionCCProblem2PNI
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-simplex-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex-00008.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex test_2pni.input -Problem.Name test_2pni_tpfa_simplex -Grid.CellType Simplex")
+
+dune_add_test(SOURCES test_2pni_fv.cc
+ NAME test_2pni_tpfa_cube
+ COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2>
+ COMPILE_DEFINITIONS TYPETAG=InjectionCCProblem2PNI
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-cube-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_cube-00008.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_cube test_2pni.input -Problem.Name test_2pni_tpfa_cube")
+
+
+set(CMAKE_BUILD_TYPE Release)
+
+#install sources
+install(FILES
+problem.hh
+spatialparams.hh
+test_2pni_fv.cc
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/2p/nonisothermal)
diff --git a/test/porousmediumflow/2p/implicit/injectionproblem2pni.hh b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
similarity index 73%
rename from test/porousmediumflow/2p/implicit/injectionproblem2pni.hh
rename to test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
index db808df30fcfe262a4ad12aee2d460eca32f6f1d..dd318d3c7ed97a8038e55ca53717499b00cc25a9 100644
--- a/test/porousmediumflow/2p/implicit/injectionproblem2pni.hh
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/problem.hh
@@ -28,39 +28,29 @@
#define DUMUX_INJECTION_PROBLEM_2PNI_HH
#include <dumux/porousmediumflow/2p/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/porousmediumflow/problem.hh>
+
+#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+
#include <dumux/material/fluidsystems/h2on2.hh>
#include <dumux/material/components/n2.hh>
-// use the same spatial parameters as the injection problem of the
-// 2p2c test program
-#include "test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh"
-#define ISOTHERMAL 0
+// use the spatial parameters as the injection problem of the 2p2c test program
+#include "test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh"
namespace Dumux {
-template <class TypeTag>
-class InjectionProblem2PNI;
+//! Forward declaration of the problem class
+template <class TypeTag> class InjectionProblem2PNI;
-namespace Properties
-{
-#if !ISOTHERMAL
+namespace Properties {
NEW_TYPE_TAG(InjectionProblem2PNI, INHERITS_FROM(TwoPNI, InjectionSpatialParams));
NEW_TYPE_TAG(InjectionBoxProblem2PNI, INHERITS_FROM(BoxModel, InjectionProblem2PNI));
NEW_TYPE_TAG(InjectionCCProblem2PNI, INHERITS_FROM(CCTpfaModel, InjectionProblem2PNI));
-#else
-NEW_TYPE_TAG(InjectionProblem2PNI, INHERITS_FROM(TwoP, InjectionSpatialParams));
-NEW_TYPE_TAG(InjectionBoxProblem2PNI, INHERITS_FROM(BoxModel, InjectionProblem2PNI));
-NEW_TYPE_TAG(InjectionCCProblem2PNI, INHERITS_FROM(CCTpfaModel, InjectionProblem2PNI));
-#endif
-// Set the grid type
-#if HAVE_UG
-SET_TYPE_PROP(InjectionProblem2PNI, Grid, Dune::UGGrid<2>);
-#else
-SET_TYPE_PROP(InjectionProblem2PNI, Grid, Dune::YaspGrid<2>);
-#endif
+// Obtain grid type from COMPILE_DEFINITIONS
+SET_TYPE_PROP(InjectionProblem2PNI, Grid, GRIDTYPE);
// Set the problem property
SET_TYPE_PROP(InjectionProblem2PNI, Problem, InjectionProblem2PNI<TypeTag>);
@@ -112,51 +102,46 @@ SET_TYPE_PROP(InjectionProblem2PNI, FluidSystem, FluidSystems::H2ON2<typename GE
* <tt>./test_cc2pni -parameterFile test_cc2pni.input</tt>
*/
template<class TypeTag>
-class InjectionProblem2PNI : public ImplicitPorousMediaProblem<TypeTag>
+class InjectionProblem2PNI : public PorousMediumFlowProblem<TypeTag>
{
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
-
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
-
- enum {
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Intersection = typename GridView::Intersection;
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+
+ enum
+ {
+ //! primary variable indices
pressureIdx = Indices::pressureIdx,
saturationIdx = Indices::saturationIdx,
+ temperatureIdx = Indices::temperatureIdx,
+ //! equation indices
contiNEqIdx = Indices::contiNEqIdx,
-
-#if !ISOTHERMAL
- temperatureIdx = Indices::temperatureIdx,
energyEqIdx = Indices::energyEqIdx,
-#endif
+
+ //! phase indices
+ wPhaseIdx = Indices::wPhaseIdx,
+ nPhaseIdx = Indices::nPhaseIdx,
// world dimension
dimWorld = GridView::dimensionworld
};
-
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
- using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
- using GasN2 = N2<Scalar>;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
/*!
@@ -165,20 +150,20 @@ public:
* \param timeManager The time manager
* \param gridView The grid view
*/
- InjectionProblem2PNI(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ InjectionProblem2PNI(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
maxDepth_ = 2700.0; // [m]
// initialize the tables of the fluid system
FluidSystem::init(/*tempMin=*/273.15,
- /*tempMax=*/423.15,
- /*numTemp=*/50,
- /*pMin=*/0.0,
- /*pMax=*/30e6,
- /*numP=*/300);
+ /*tempMax=*/423.15,
+ /*numTemp=*/50,
+ /*pMin=*/0.0,
+ /*pMax=*/30e6,
+ /*numP=*/300);
- name_ = GET_RUNTIME_PARAM(TypeTag, std::string, Problem.Name);
+ name_ = getParam<std::string>("Problem.Name");
}
/*!
@@ -194,17 +179,6 @@ public:
const std::string name() const
{ return name_; }
-#if ISOTHERMAL
- /*!
- * \brief Returns the temperature \f$ K \f$
- */
- Scalar temperature() const
- {
- return 273.15 + 30; // [K]
- }
-#endif
-
-
/*!
* \brief Returns the source term
*
@@ -240,11 +214,10 @@ public:
values.setAllDirichlet();
else
values.setAllNeumann();
- return values;
-#if !ISOTHERMAL
- values.setDirichlet(temperatureIdx);
-#endif
+ //! Use Dirichlet BCs everywhere for the temperature
+ // values.setDirichlet(temperatureIdx);
+ return values;
}
/*!
@@ -259,12 +232,10 @@ public:
{
PrimaryVariables values;
Scalar densityW = 1000.0;
- values[pressureIdx] = 1e5 + (maxDepth_ - globalPos[1])*densityW*9.81;
+ values[pressureIdx] = 1e5 + (maxDepth_ - globalPos[dimWorld-1])*densityW*9.81;
values[saturationIdx] = 0.0;
-#if !ISOTHERMAL
- values[temperatureIdx] = 283.0 + (maxDepth_ - globalPos[1])*0.03;
-#endif
- return values;
+ values[temperatureIdx] = 283.0 + (maxDepth_ - globalPos[dimWorld-1])*0.03;
+ return values;
}
/*!
@@ -275,27 +246,39 @@ public:
* \f$ [ \textnormal{unit of conserved quantity} / (m^(dim-1) \cdot s )] \f$
* \param element The finite element
* \param fvGeometry The finite volume geometry of the element
- * \param intersection The intersection between element and boundary
- * \param scvIdx The local index of the sub-control volume
- * \param boundaryFaceIdx The index of the boundary face
+ * \param elemVolVars The element volume variables
+ * \param scvf The sub-control volume face on which the BC is evaluated
*
* The \a values store the mass flux of each phase normal to the boundary.
* Negative values indicate an inflow.
*/
NeumannFluxes neumann(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf) const
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf) const
{
NeumannFluxes values(0.0);
const auto globalPos = scvf.ipGlobal();
- if (globalPos[1] < 15 + eps_ && globalPos[1] > 7 - eps_) {
+ if (globalPos[1] < 13.75 + eps_ && globalPos[1] > 6.875 - eps_)
+ {
// inject air. negative values mean injection
values[contiNEqIdx] = -1e-3; // kg/(s*m^2)
+ // compute enthalpy flux associated with this injection [(J/(kg*s)]
+ using FluidState = typename GET_PROP_TYPE(TypeTag, FluidState);
+ FluidState fs;
+
+ const auto ic = initialAtPos(scvf.ipGlobal());
+ fs.setPressure(wPhaseIdx, ic[pressureIdx]);
+ fs.setPressure(nPhaseIdx, ic[pressureIdx]); // assume pressure equality here
+ fs.setTemperature(ic[temperatureIdx]);
+
+ // energy flux is mass flux times specific enthalpy
+ values[energyEqIdx] = values[contiNEqIdx]*FluidSystem::enthalpy(fs, nPhaseIdx);
}
- return values;
+
+ return values;
}
// \}
@@ -319,13 +302,12 @@ public:
Scalar densityW = 1000.0;
values[pressureIdx] = 1e5 + (maxDepth_ - globalPos[1])*densityW*9.81;
values[saturationIdx] = 0.0;
-
-#if !ISOTHERMAL
values[temperatureIdx] = 283.0 + (maxDepth_ - globalPos[1])*0.03;
- if (globalPos[0] > 20 - eps_ && globalPos[0] < 30 + eps_ && globalPos[1] > 5 - eps_ && globalPos[1] < 35 + eps_)
+
+ if (globalPos[0] > 21.25 - eps_ && globalPos[0] < 28.75 + eps_ && globalPos[1] > 6.25 - eps_ && globalPos[1] < 33.75 + eps_)
values[temperatureIdx] = 380;
-#endif // !ISOTHERMAL
- return values;
+
+ return values;
}
// \}
diff --git a/test/porousmediumflow/2p/implicit/test_cc2pni.input b/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni.input
similarity index 82%
rename from test/porousmediumflow/2p/implicit/test_cc2pni.input
rename to test/porousmediumflow/2p/implicit/nonisothermal/test_2pni.input
index 955b9248419181f1993da2085a76960775eb4d86..3b0427fc3c282b907530fb7873caecdd136d21ae 100644
--- a/test/porousmediumflow/2p/implicit/test_cc2pni.input
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 250 # [s]
TEnd = 1e4 # [s]
@@ -8,7 +8,7 @@ UpperRight = 60 40
Cells = 24 16
[Problem]
-Name = injection2pnicc
+Name = injection2pni
[Newton]
WriteConvergence = 1 # write convergence behaviour to disk?
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_fv.cc b/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_fv.cc
new file mode 100644
index 0000000000000000000000000000000000000000..50854b012bfd032bf870bce0561f93c71cb55070
--- /dev/null
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/test_2pni_fv.cc
@@ -0,0 +1,247 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the 2pni CC model
+ */
+#include <config.h>
+
+#include "problem.hh"
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+/*!
+ * \brief Provides an interface for customizing error messages associated with
+ * reading in parameters.
+ *
+ * \param progName The name of the program, that was tried to be started.
+ * \param errorMsg The error message that was issued by the start function.
+ * Comprises the thing that went wrong and a general help message.
+ */
+void usage(const char *progName, const std::string &errorMsg)
+{
+ if (errorMsg.size() > 0) {
+ std::string errorMessageOut = "\nUsage: ";
+ errorMessageOut += progName;
+ errorMessageOut += " [options]\n";
+ errorMessageOut += errorMsg;
+ errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n"
+ "\t-Grid.UpperRight Upper right corner coordinates\n";
+
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+////////////////////////
+// the main function
+////////////////////////
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(fvGridGeometry->numDofs());
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::ILU0BiCGSTABBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>();
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+}
+
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/2p/implicit/test_box2p.cc b/test/porousmediumflow/2p/implicit/test_box2p.cc
deleted file mode 100644
index 2d6beebc942ecf13afa9e8add9fc9070dd891ab4..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_box2p.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Test for the two-phase box model
- */
-#include <config.h>
-#include "lensproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
- "\t-Problem.Name String for naming of the output files \n"
- "\n";
-
- std::cout << errorMessageOut << std::endl;
- }
-}
-
-////////////////////////
-// the main function
-////////////////////////
-int main(int argc, char** argv)
-{
- typedef TTAG(LensBoxProblem) TypeTag;
- return Dumux::start<TypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/2p/implicit/test_box2p.input b/test/porousmediumflow/2p/implicit/test_box2p.input
deleted file mode 100644
index 95d7809362ae27f3c7299bd6fcfdffb580ccb081..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_box2p.input
+++ /dev/null
@@ -1,19 +0,0 @@
-[TimeManager]
-DtInitial = 250 # [s]
-TEnd = 3000 # [s]
-
-[Grid]
-LowerLeft = 0 0
-UpperRight = 6 4
-Cells = 48 32
-
-[SpatialParams]
-LensLowerLeft = 1.0 2.0 # [m] coordinates of the lower left lens corner
-LensUpperRight = 4.0 3.0 # [m] coordinates of the upper right lens corner
-
-[Problem]
-Name = lensbox # name passed to the output routines
-
-[Implicit]
-EnablePartialReassemble = 1 # enable partial reassembly of the jacobian matrix?
-EnableJacobianRecycling = 1 # Enable reuse of jacobian matrices?
diff --git a/test/porousmediumflow/2p/implicit/test_box2pni.cc b/test/porousmediumflow/2p/implicit/test_box2pni.cc
deleted file mode 100644
index 563babe94a7f92033f09cdff64759c13a6f4bbe6..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_box2pni.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the 2pni box model
- */
-#include <config.h>
-
-#include "injectionproblem2pni.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-////////////////////////
-// the main function
-////////////////////////
-int main(int argc, char** argv)
-{
- typedef TTAG(InjectionBoxProblem2PNI) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/2p/implicit/test_box2pni.input b/test/porousmediumflow/2p/implicit/test_box2pni.input
deleted file mode 100644
index 6c05aae18c9de44ad68b3468fcb41c645b70c21c..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_box2pni.input
+++ /dev/null
@@ -1,14 +0,0 @@
-[TimeManager]
-DtInitial = 250 # [s]
-TEnd = 1e4 # [s]
-
-[Grid]
-LowerLeft = 0 0
-UpperRight = 60 40
-Cells = 24 16
-
-[Problem]
-Name = injection2pnibox
-
-[Newton]
-WriteConvergence = 1 # write convergence behaviour to disk?
diff --git a/test/porousmediumflow/2p/implicit/test_cc2p.cc b/test/porousmediumflow/2p/implicit/test_cc2p.cc
deleted file mode 100644
index 2cb7906ea8ab6c402b3c81c171819237fa69399e..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_cc2p.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Test for the two-phase CC model
- */
-#include <config.h>
-#include "lensproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
- "\t-Problem.Name String for naming of the output files \n"
- "\n";
-
- std::cout << errorMessageOut << std::endl;
- }
-}
-
-////////////////////////
-// the main function
-////////////////////////
-int main(int argc, char** argv)
-{
- typedef TTAG(LensCCProblem) TypeTag;
- return Dumux::start<TypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/2p/implicit/test_cc2pni.cc b/test/porousmediumflow/2p/implicit/test_cc2pni.cc
deleted file mode 100644
index 19f5d3ac3cf542f42010d366ea96dbb479a3b736..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_cc2pni.cc
+++ /dev/null
@@ -1,62 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the 2pni CC model
- */
-#include <config.h>
-
-#include "injectionproblem2pni.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.Cells Number of cells in respective coordinate directions\n"
- "\t-Grid.UpperRight Upper right corner coordinates\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-////////////////////////
-// the main function
-////////////////////////
-int main(int argc, char** argv)
-{
- typedef TTAG(InjectionCCProblem2PNI) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/2p/implicit/test_fracture_box2p.cc b/test/porousmediumflow/2p/implicit/test_fracture_box2p.cc
deleted file mode 100644
index 133f9962e6f1c4b13d9e7f7d0e62ff44c86e265f..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_fracture_box2p.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Fracture 2d in 3d test for the two-phase box model
- */
-#include <config.h>
-#include "fractureproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{}
-
-////////////////////////
-// the main function
-////////////////////////
-int main(int argc, char** argv)
-{
-#if HAVE_DUNE_FOAMGRID
- typedef TTAG(FractureBoxProblem) TypeTag;
- return Dumux::start<TypeTag>(argc, argv, usage);
-#else
-#warning External grid module dune-foamgrid needed to run this example.
- std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
- return 77;
-#endif
-}
diff --git a/test/porousmediumflow/2p/implicit/test_fracture_box2p.input b/test/porousmediumflow/2p/implicit/test_fracture_box2p.input
deleted file mode 100644
index 0c637c1900caf6ce9aae15cedbd08f3b68d0305f..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_fracture_box2p.input
+++ /dev/null
@@ -1,9 +0,0 @@
-[TimeManager]
-DtInitial = 250 # [s]
-TEnd = 300000 # [s]
-
-[Grid]
-File = grids/fracture.msh
-
-[Problem]
-Name = fracturebox # name passed to the output routines
diff --git a/test/porousmediumflow/2p/implicit/test_fracture_cc2p.cc b/test/porousmediumflow/2p/implicit/test_fracture_cc2p.cc
deleted file mode 100644
index a9d4e4f14a1805418dbbc852f6f7224a9f7edf04..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_fracture_cc2p.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Fracture 2d in 3d test for the two-phase box model
- */
-#include <config.h>
-#include "fractureproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{}
-
-////////////////////////
-// the main function
-////////////////////////
-int main(int argc, char** argv)
-{
-#if HAVE_DUNE_FOAMGRID
- typedef TTAG(FractureCCProblem) TypeTag;
- return Dumux::start<TypeTag>(argc, argv, usage);
-#else
-#warning External grid module dune-foamgrid needed to run this example.
- std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
- return 77;
-#endif
-}
diff --git a/test/porousmediumflow/2p/implicit/test_fracture_ccmpfa2p.cc b/test/porousmediumflow/2p/implicit/test_fracture_ccmpfa2p.cc
deleted file mode 100644
index a66392b163b73c490fd181763a20d3dff5511ca5..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_fracture_ccmpfa2p.cc
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief Fracture 2d in 3d test for the two-phase box model
- */
-#include <config.h>
-#include "fractureproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{}
-
-////////////////////////
-// the main function
-////////////////////////
-int main(int argc, char** argv)
-{
-#if HAVE_DUNE_FOAMGRID
- typedef TTAG(FractureCCMpfaProblem) TypeTag;
- return Dumux::start<TypeTag>(argc, argv, usage);
-#else
-#warning External grid module dune-foamgrid needed to run this example.
- std::cerr << "Test skipped, it needs dune-foamgrid!" << std::endl;
- return 77;
-#endif
-}
diff --git a/test/porousmediumflow/2p/implicit/test_fracture_ccmpfa2p.input b/test/porousmediumflow/2p/implicit/test_fracture_ccmpfa2p.input
deleted file mode 100644
index f47ac9508b5b64b29192d6a08ee26801fd7484cc..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_fracture_ccmpfa2p.input
+++ /dev/null
@@ -1,12 +0,0 @@
-[TimeManager]
-DtInitial = 250 # [s]
-TEnd = 300000 # [s]
-
-[Grid]
-File = grids/fracture.msh
-
-[Problem]
-Name = fractureccmpfa # name passed to the output routines
-
-[Implicit]
-UpwindWeight = 1.0
diff --git a/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.cc b/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.cc
deleted file mode 100644
index 0a822952bd87b9e04254cb03065d2b5508a69e94..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-#include <config.h>
-#include "generalizeddirichletproblem.hh"
-#include <dumux/common/start.hh>
-
-void usage(const char *progName, const std::string &errorMsg)
-{
- std::cout
- << "\nUsage: " << progName << " [options]\n";
- if (errorMsg.size() > 0)
- std::cout << errorMsg << "\n";
- std::cout
- << "\n"
- << "The list of mandatory arguments for this program is:\n"
- << "\t-TEnd The end of the simulation [s]\n"
- << "\t-DtInitial The initial timestep size [s]\n"
- << "\t-Grid.UpperRight Upper right corner coordinates\n"
- << "\t-Grid.Cells Number of cells in respective coordinate directions\n"
- << "\n";
-}
-
-int main(int argc, char** argv)
-{
- typedef TTAG(GeneralizedDirichletProblem) TypeTag;
- return Dumux::start<TypeTag>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.input b/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.input
deleted file mode 100644
index 36475ff127f0b35ffa59e933d5c6399319ebe4e8..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.input
+++ /dev/null
@@ -1,11 +0,0 @@
-[TimeManager]
-TEnd = 500000 # duration of the simulation [s]
-DtInitial = 10 # initial time step size [s]
-
-[Problem]
-Name = generalizeddirichlet # name passed to the output routines
-
-[Grid]
-LowerLeft = 0
-UpperRight = 300
-Cells = 100
diff --git a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
index 8d4d0719bbbd391671487f8f8db3cdebf1678993..31b26d46d68bf19bdb91a741f8344c21b58027e0 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
@@ -27,7 +27,7 @@
#include <dumux/implicit/cellcentered/tpfa/properties.hh>
#include <dumux/implicit/cellcentered/mpfa/properties.hh>
#include <dumux/porousmediumflow/2p2c/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/fluidsystems/h2on2.hh>
#include "injectionspatialparams.hh"
@@ -85,10 +85,11 @@ SET_BOOL_PROP(InjectionProblem, UseMoles, true);
* <tt>./test_cc2p2c</tt>
*/
template <class TypeTag>
-class InjectionProblem : public ImplicitPorousMediaProblem<TypeTag>
+class InjectionProblem : public PorousMediumFlowProblem<TypeTag>
{
- using ParentType = ImplicitPorousMediaProblem<TypeTag>;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
@@ -138,28 +139,18 @@ public:
* \param timeManager The time manager
* \param gridView The grid view
*/
- InjectionProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ InjectionProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
- nTemperature_ = GET_RUNTIME_PARAM(TypeTag, int, Problem.NTemperature);
- nPressure_ = GET_RUNTIME_PARAM(TypeTag, int, Problem.NPressure);
- pressureLow_ = GET_RUNTIME_PARAM(TypeTag, Scalar, Problem.PressureLow);
- pressureHigh_ = GET_RUNTIME_PARAM(TypeTag, Scalar, Problem.PressureHigh);
- temperatureLow_ = GET_RUNTIME_PARAM(TypeTag, Scalar, Problem.TemperatureLow);
- temperatureHigh_ = GET_RUNTIME_PARAM(TypeTag, Scalar, Problem.TemperatureHigh);
- temperature_ = GET_RUNTIME_PARAM(TypeTag, Scalar, Problem.InitialTemperature);
- depthBOR_ = GET_RUNTIME_PARAM(TypeTag, Scalar, Problem.DepthBOR);
- name_ = GET_RUNTIME_PARAM(TypeTag, std::string, Problem.Name);
-
- /* Alternative syntax:
- * typedef typename GET_PROP(TypeTag, ParameterTree) ParameterTree;
- * const Dune::ParameterTree &tree = ParameterTree::tree();
- * nTemperature_ = tree.template get<int>("Problem.NTemperature");
- *
- * + We see what we do
- * - Reporting whether it was used does not work
- * - Overwriting on command line not possible
- */
+ nTemperature_ = getParam<int>("Problem.NTemperature");
+ nPressure_ = getParam<int>("Problem.NPressure");
+ pressureLow_ = getParam<Scalar>("Problem.PressureLow");
+ pressureHigh_ = getParam<Scalar>("Problem.PressureHigh");
+ temperatureLow_ = getParam<Scalar>("Problem.TemperatureLow");
+ temperatureHigh_ = getParam<Scalar>("Problem.TemperatureHigh");
+ temperature_ = getParam<Scalar>("Problem.InitialTemperature");
+ depthBOR_ = getParam<Scalar>("Problem.DepthBOR");
+ name_ = getParam<std::string>("Problem.Name");
// initialize the tables of the fluid system
FluidSystem::init(/*Tmin=*/temperatureLow_,
@@ -185,18 +176,18 @@ public:
*
* Will be called diretly after the time integration.
*/
- void postTimeStep()
- {
- // Calculate storage terms
- PrimaryVariables storage;
- this->model().globalStorage(storage);
-
- // Write mass balance information for rank 0
- if (this->gridView().comm().rank() == 0) {
- std::cout<<"Storage: wetting=[" << storage[wPhaseIdx] << "]"
- << " nonwetting=[" << storage[nPhaseIdx] << "]\n";
- }
- }
+ // void postTimeStep()
+ // {
+ // // Calculate storage terms
+ // PrimaryVariables storage;
+ // this->model().globalStorage(storage);
+ //
+ // // Write mass balance information for rank 0
+ // if (this->gridView().comm().rank() == 0) {
+ // std::cout<<"Storage: wetting=[" << storage[wPhaseIdx] << "]"
+ // << " nonwetting=[" << storage[nPhaseIdx] << "]\n";
+ // }
+ // }
/*!
diff --git a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
index ced51a83c50e310357053ace44f1dfaf82294f16..855c7290315f69224b0f656e253d1c1f51eadba4 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
@@ -31,8 +31,6 @@
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-#include <dumux/porousmediumflow/2p2c/implicit/properties.hh>
-
namespace Dumux
{
@@ -90,10 +88,10 @@ public:
*
* \param gridView The grid view
*/
- InjectionSpatialParams(const Problem& problem, const GridView &gridView)
- : ParentType(problem, gridView)
+ InjectionSpatialParams(const Problem& problem)
+ : ParentType(problem)
{
- layerBottom_ = 22.0;
+ layerBottom_ = 22.5;
// intrinsic permeabilities
fineK_ = 1e-13;
diff --git a/test/porousmediumflow/2p2c/implicit/test_cc2p2c.cc b/test/porousmediumflow/2p2c/implicit/test_cc2p2c.cc
index 3a2915f12ec5be9312d3d649390a5eec13851e03..9b93e6d9df9c2ded7ecd6f5119a700b5a61fee3a 100644
--- a/test/porousmediumflow/2p2c/implicit/test_cc2p2c.cc
+++ b/test/porousmediumflow/2p2c/implicit/test_cc2p2c.cc
@@ -23,7 +23,7 @@
*/
#include <config.h>
#include "injectionproblem.hh"
-#include <dumux/common/start.hh>
+#include <dumux/common/start/instationarynonlinear.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -62,6 +62,6 @@ void usage(const char *progName, const std::string &errorMsg)
int main(int argc, char** argv)
{
- typedef TTAG(InjectionCCProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ using ProblemTypeTag = TTAG(InjectionCCProblem);
+ return Dumux::InstationaryNonLinearSimulation<ProblemTypeTag>::start(argc, argv);
}
diff --git a/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input b/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input
index 7237f3520e39a77953763c4c28c99fd7c3411436..a2933a09dc15ec698f390c3eace73a307eb34ea1 100644
--- a/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input
+++ b/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 250 # [s]
TEnd = 1e4 # [s]
@@ -19,6 +19,3 @@ PressureLow = 1e5 # [Pa] lower pressure limit for tabularization
PressureHigh = 3e7 # [Pa] upper pressure limit for tabularization
TemperatureLow = 312.15 # [Pa] lower temperature limit for tabularization
TemperatureHigh = 314.15 # [Pa] upper temperature limit for tabularization
-
-[Implicit]
-EnableJacobianRecycling = 1 #
diff --git a/test/porousmediumflow/2pnc/implicit/CMakeLists.txt b/test/porousmediumflow/2pnc/implicit/CMakeLists.txt
index 268696baf56fd9ec677214741336d9f13f8e44e0..d55646db5e2a6e35024d0e7281beeff543a53524 100644
--- a/test/porousmediumflow/2pnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2pnc/implicit/CMakeLists.txt
@@ -1,19 +1,23 @@
+dune_symlink_to_source_files(FILES test_2pnc.input)
+
# isothermal tests
-add_dumux_test(test_box2pnc test_box2pnc test_box2pnc.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/fuelcell2pncbox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/fuelcell-box-00015.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box2pnc -ParameterFile test_2pnc.input -Problem.Name fuelcell-box")
+dune_add_test(NAME test_box2pnc
+ SOURCES test_box2pnc.cc
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/fuelcell2pncbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/fuelcell-box-00015.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_box2pnc -ParameterFile test_2pnc.input -Problem.Name fuelcell-box")
-add_dumux_test(test_cc2pnc test_cc2pnc test_cc2pnc.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/fuelcell2pnccc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/fuelcell-cc-00015.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc2pnc -ParameterFile test_2pnc.input -Problem.Name fuelcell-cc")
+dune_add_test(NAME test_cc2pnc
+ SOURCES test_cc2pnc.cc
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/fuelcell2pnccc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/fuelcell-cc-00015.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc2pnc -ParameterFile test_2pnc.input -Problem.Name fuelcell-cc")
-dune_symlink_to_source_files(FILES test_2pnc.input)
+set(CMAKE_BUILD_TYPE Release)
#install sources
install(FILES
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
index 18d6aaacee9b0b623ed71ef501fc373b46fd3a08..05e560b2b3c74239d8f99f3f921125e65e40d536 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh
@@ -24,9 +24,10 @@
#ifndef DUMUX_FUELCELL_PROBLEM_HH
#define DUMUX_FUELCELL_PROBLEM_HH
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box/properties.hh>
#include <dumux/porousmediumflow/2pnc/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include <dumux/material/fluidsystems/h2on2o2.hh>
#include <dumux/material/chemistry/electrochemistry/electrochemistry.hh>
@@ -75,14 +76,13 @@ SET_INT_PROP(FuelCellProblem, ReplaceCompEqIdx, 3);
* <tt>./test_box2pnc</tt>
*/
template <class TypeTag>
-class FuelCellProblem : public ImplicitPorousMediaProblem<TypeTag>
+class FuelCellProblem : public PorousMediumFlowProblem<TypeTag>
{
- using ParentType = ImplicitPorousMediaProblem<TypeTag>;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using Sources = typename GET_PROP_TYPE(TypeTag, NumEqVector);
@@ -90,9 +90,15 @@ class FuelCellProblem : public ImplicitPorousMediaProblem<TypeTag>
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
- using VtkOutputModule = typename GET_PROP_TYPE(TypeTag, VtkOutputModule);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+
+
+
// Select the electrochemistry method
using ElectroChemistry = typename Dumux::ElectroChemistry<TypeTag, ElectroChemistryModel::Ochs>;
@@ -124,7 +130,7 @@ class FuelCellProblem : public ImplicitPorousMediaProblem<TypeTag>
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
- static constexpr bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, DiscretizationMethod) == DiscretizationMethods::Box;
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
enum { dofCodim = isBox ? dim : 0 };
@@ -135,20 +141,20 @@ public:
* \param timeManager The time manager
* \param gridView The grid view
*/
- FuelCellProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ FuelCellProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
- nTemperature_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FluidSystem, NTemperature);
- nPressure_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FluidSystem, NPressure);
- pressureLow_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FluidSystem, PressureLow);
- pressureHigh_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FluidSystem, PressureHigh);
- temperatureLow_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FluidSystem, TemperatureLow);
- temperatureHigh_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FluidSystem, TemperatureHigh);
- temperature_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, FluidSystem, InitialTemperature);
+ nTemperature_ = getParam<int>("Problem.NTemperature");
+ nPressure_ = getParam<int>("Problem.NPressure");
+ pressureLow_ = getParam<Scalar>("Problem.PressureLow");
+ pressureHigh_ = getParam<Scalar>("Problem.PressureHigh");
+ temperatureLow_ = getParam<Scalar>("Problem.TemperatureLow");
+ temperatureHigh_ = getParam<Scalar>("Problem.TemperatureHigh");
+ temperature_ = getParam<Scalar>("Problem.InitialTemperature");
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name);
+ name_ = getParam<std::string>("Problem.Name");
- pO2Inlet_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, ElectroChemistry, pO2Inlet);
+ pO2Inlet_ = getParam<Scalar>("ElectroChemistry.pO2Inlet");
FluidSystem::init(/*Tmin=*/temperatureLow_,
/*Tmax=*/temperatureHigh_,
@@ -156,6 +162,12 @@ public:
/*pmin=*/pressureLow_,
/*pmax=*/pressureHigh_,
/*np=*/nPressure_);
+
+ currentDensity_.resize(fvGridGeometry->gridView().size(dofCodim));
+ reactionSourceH2O_.resize(fvGridGeometry->gridView().size(dofCodim));
+ reactionSourceO2_.resize(fvGridGeometry->gridView().size(dofCodim));
+ Kxx_.resize(fvGridGeometry->gridView().size(dofCodim));
+ Kyy_.resize(fvGridGeometry->gridView().size(dofCodim));
}
/*!
@@ -233,9 +245,9 @@ public:
if(onUpperBoundary_(globalPos))
{
- Scalar pg = 1.0e5;
- priVars[pressureIdx] = pg;
- priVars[switchIdx] = 0.3;//Sl for bothPhases
+ Scalar pn = 1.0e5;
+ priVars[pressureIdx] = pn;
+ priVars[switchIdx] = 0.3;//Sw for bothPhases
priVars[switchIdx+1] = pO2Inlet_/4.315e9; //moleFraction xlO2 for bothPhases
}
@@ -259,50 +271,74 @@ public:
/*!
* \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
*/
- void addVtkOutputFields(VtkOutputModule& outputModule) const
+ const std::vector<Scalar>& getCurrentDensity()
+ {
+ return currentDensity_;
+ }
+
+ const std::vector<Scalar>& getReactionSourceH2O()
+ {
+ return reactionSourceH2O_;
+ }
+
+ const std::vector<Scalar>& getReactionSourceO2()
+ {
+ return reactionSourceO2_;
+ }
+
+ const std::vector<Scalar>& getKxx()
+ {
+ return Kxx_;
+ }
+
+ const std::vector<Scalar>& getKyy()
{
- // create the required scalar fields
- auto& currentDensity = outputModule.createScalarField("currentDensity [A/cm^2]", dofCodim);
- auto& reactionSourceH2O = outputModule.createScalarField("reactionSourceH2O [mol/(sm^2)]", dofCodim);
- auto& reactionSourceO2 = outputModule.createScalarField("reactionSourceO2 [mol/(sm^2)]", dofCodim);
+ return Kyy_;
+ }
- for (const auto& element : elements(this->gridView()))
+ void updateVtkOutput(const SolutionVector& curSol)
+ {
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
{
- auto fvGeometry = localView(this->model().fvGridGeometry());
- fvGeometry.bindElement(element);
+ ElementSolutionVector elemSol(element, curSol, this->fvGridGeometry());
- auto elemVolVars = localView(this->model().curGlobalVolVars());
- elemVolVars.bindElement(element, fvGeometry, this->model().curSol());
+ auto fvGeometry = localView(this->fvGridGeometry());
+ fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
{
+ VolumeVariables volVars;
+ volVars.update(elemSol, *this, element, scv);
const auto& globalPos = scv.dofPosition();
const auto dofIdxGlobal = scv.dofIndex();
- //reaction sources from electro chemistry
if(inReactionLayer_(globalPos))
{
//reactionSource Output
PrimaryVariables source;
- auto i = ElectroChemistry::calculateCurrentDensity(elemVolVars[scv]);
+ auto i = ElectroChemistry::calculateCurrentDensity(volVars);
ElectroChemistry::reactionSource(source, i);
- reactionSourceH2O[dofIdxGlobal] = source[wPhaseIdx];
- reactionSourceO2[dofIdxGlobal] = source[numComponents-1];
+ reactionSourceH2O_[dofIdxGlobal] = source[wPhaseIdx];
+ reactionSourceO2_[dofIdxGlobal] = source[numComponents-1];
//Current Output in A/cm^2
- currentDensity[dofIdxGlobal] = i/10000;
+ currentDensity_[dofIdxGlobal] = i/10000;
}
else
{
- reactionSourceH2O[dofIdxGlobal] = 0.0;
- reactionSourceO2[dofIdxGlobal] = 0.0;
- currentDensity[dofIdxGlobal] = 0.0;
+ reactionSourceH2O_[dofIdxGlobal] = 0.0;
+ reactionSourceO2_[dofIdxGlobal] = 0.0;
+ currentDensity_[dofIdxGlobal] = 0.0;
}
+ Kxx_[dofIdxGlobal] = volVars.permeability()[0][0];
+ Kyy_[dofIdxGlobal] = volVars.permeability()[1][1];
}
}
}
+
+
private:
PrimaryVariables initial_(const GlobalPosition &globalPos) const
@@ -310,28 +346,28 @@ private:
PrimaryVariables priVars(0.0);
priVars.setState(Indices::bothPhases);
- Scalar pg = 1.0e5;
- priVars[pressureIdx] = pg;
- priVars[switchIdx] = 0.3;//Sl for bothPhases
+ Scalar pn = 1.0e5;
+ priVars[pressureIdx] = pn;
+ priVars[switchIdx] = 0.3;//Sw for bothPhases
priVars[switchIdx+1] = pO2Inlet_/4.315e9; //moleFraction xlO2 for bothPhases
return priVars;
}
bool onLeftBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] < this->bBoxMin()[0] + eps_; }
+ { return globalPos[0] < this->fvGridGeometry().bBoxMin()[0] + eps_; }
bool onRightBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[0] > this->bBoxMax()[0] - eps_; }
+ { return globalPos[0] > this->fvGridGeometry().bBoxMax()[0] - eps_; }
bool onLowerBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] < this->bBoxMin()[1] + eps_; }
+ { return globalPos[1] < this->fvGridGeometry().bBoxMin()[1] + eps_; }
bool onUpperBoundary_(const GlobalPosition &globalPos) const
- { return globalPos[1] > this->bBoxMax()[1] - eps_; }
+ { return globalPos[1] > this->fvGridGeometry().bBoxMax()[1] - eps_; }
bool inReactionLayer_(const GlobalPosition& globalPos) const
- { return globalPos[1] < 0.1*(this->bBoxMax()[1] - this->bBoxMin()[1]) + eps_; }
+ { return globalPos[1] < 0.1*(this->fvGridGeometry().bBoxMax()[1] - this->fvGridGeometry().bBoxMin()[1]) + eps_; }
Scalar temperature_;
static constexpr Scalar eps_ = 1e-6;
@@ -341,6 +377,11 @@ private:
Scalar pressureLow_, pressureHigh_;
Scalar temperatureLow_, temperatureHigh_;
Scalar pO2Inlet_;
+ std::vector<double> currentDensity_;
+ std::vector<double> reactionSourceH2O_;
+ std::vector<double> reactionSourceO2_;
+ std::vector<double> Kxx_;
+ std::vector<double> Kyy_;
};
} //end namespace Dumux
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
index 6d591fb9eeaaf1d6bf4ad08a689c83ef9f185e80..255da0f8e9f99d4b2690f5eeb418e77789cc1a3c 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
@@ -100,8 +100,8 @@ public:
*
* \param gridView The grid view
*/
- FuelCellSpatialParams(const Problem& problem, const GridView &gridView)
- : ParentType(problem, gridView), K_(0)
+ FuelCellSpatialParams(const Problem& problem)
+ : ParentType(problem), K_(0)
{
// intrinsic permeabilities
K_[0][0] = 5e-11;
diff --git a/test/porousmediumflow/2pnc/implicit/test_2pnc.input b/test/porousmediumflow/2pnc/implicit/test_2pnc.input
index 387623cb1d62bba07a7e304ccc3990fea777b79d..00a7b1890c9fda8fde2c5589d4b36eacb3520c56 100644
--- a/test/porousmediumflow/2pnc/implicit/test_2pnc.input
+++ b/test/porousmediumflow/2pnc/implicit/test_2pnc.input
@@ -2,7 +2,7 @@
# Everything behind a '#' is a comment.
# Type "./test_2pnc --help" for more information.
-[TimeManager]
+[TimeLoop]
DtInitial = 5e-1 # [s] initial time step size
MaxTimeStepSize = 1000 # [s] maximum time step size
TEnd= 1e3 # [s] duration of the simulation
@@ -14,8 +14,6 @@ Cells = 21 6 # [-] number of cells in x,y-direction
[Problem]
Name = fuelcell
EnableGravity = 0
-
-[FluidSystem]
NTemperature = 3 # [-] number of temperature table entries
NPressure = 200 # [-] number of pressure table entries
PressureLow = 1e5 # [Pa] lower pressure limit for tabularization
diff --git a/test/porousmediumflow/2pnc/implicit/test_box2pnc.cc b/test/porousmediumflow/2pnc/implicit/test_box2pnc.cc
index 826b60d1217f7d77df8b232f592eea3ae4c2cc77..9ed36c7b4ca5c232c24ba872b09b29d1d6bf83b9 100644
--- a/test/porousmediumflow/2pnc/implicit/test_box2pnc.cc
+++ b/test/porousmediumflow/2pnc/implicit/test_box2pnc.cc
@@ -22,8 +22,34 @@
* \brief Test for the 2pnc box model used for water management in PEM fuel cells.
*/
#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
#include "fuelcellproblem.hh"
-#include <dumux/common/start.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -48,8 +74,180 @@ void usage(const char *progName, const std::string &errorMsg)
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(FuelCellBoxProblem);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(GridView::dimension));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ //add specific output
+ vtkWriter.addField(problem->getCurrentDensity(), "currentDensity [A/cm^2]");
+ vtkWriter.addField(problem->getReactionSourceH2O(), "reactionSourceH2O [mol/(sm^2)]");
+ vtkWriter.addField(problem->getReactionSourceO2(), "reactionSourceO2 [mol/(sm^2)]");
+ vtkWriter.addField(problem->getKxx(), "Kxx");
+ vtkWriter.addField(problem->getKyy(), "Kyy");
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->elementMapper());
+
+ // the non-linear solver
+ using NewtonController = PriVarSwitchNewtonController<TypeTag>;
+ using NewtonMethod = NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // update the output fields before write
+ problem->updateVtkOutput(xOld);
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(FuelCellBoxProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/porousmediumflow/2pnc/implicit/test_cc2pnc.cc b/test/porousmediumflow/2pnc/implicit/test_cc2pnc.cc
index 7786be91f6af42353d346dab84014bf752633bfa..a697b4bc31bbb023445320d98046c618e93fd9ee 100644
--- a/test/porousmediumflow/2pnc/implicit/test_cc2pnc.cc
+++ b/test/porousmediumflow/2pnc/implicit/test_cc2pnc.cc
@@ -22,8 +22,34 @@
* \brief Test for the 2pnc cc model used for water management in PEM fuel cells.
*/
#include <config.h>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
#include "fuelcellproblem.hh"
-#include <dumux/common/start.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/porousmediumflow/compositional/privarswitchnewtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -48,8 +74,179 @@ void usage(const char *progName, const std::string &errorMsg)
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(FuelCellCCProblem);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(0));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ //add specific output
+ vtkWriter.addField(problem->getCurrentDensity(), "currentDensity [A/cm^2]");
+ vtkWriter.addField(problem->getReactionSourceH2O(), "reactionSourceH2O [mol/(sm^2)]");
+ vtkWriter.addField(problem->getReactionSourceO2(), "reactionSourceO2 [mol/(sm^2)]");
+ vtkWriter.addField(problem->getKxx(), "Kxx");
+ vtkWriter.addField(problem->getKyy(), "Kyy");
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->elementMapper());
+
+ // the non-linear solver
+ using NewtonController = PriVarSwitchNewtonController<TypeTag>;
+ using NewtonMethod = NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // update the output fields before write
+ problem->updateVtkOutput(xOld);
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(FuelCellCCProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
index 2ebb373e23d5834c65bb62e03375e6463a54fa44..c9c3fbf61883782256b8e805bc1e2a60d2fd75fb 100644
--- a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
@@ -26,14 +26,15 @@
#include <math.h>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box/properties.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include <dumux/porousmediumflow/3p/implicit/model.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-
#include <dumux/material/fluidsystems/h2oairmesitylene.hh>
#include <dumux/material/components/h2o.hh>
#include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh>
+
#include "3pnispatialparams.hh"
@@ -45,10 +46,13 @@ class ThreePNIConductionProblem;
namespace Properties
{
-NEW_TYPE_TAG(ThreePNIConductionProblem, INHERITS_FROM(ThreePNI, ThreePNISpatialParams));
-NEW_TYPE_TAG(ThreePNIConductionBoxProblem, INHERITS_FROM(BoxModel, ThreePNIConductionProblem));
-NEW_TYPE_TAG(ThreePNIConductionCCProblem, INHERITS_FROM(CCTpfaModel, ThreePNIConductionProblem));
-NEW_TYPE_TAG(ThreePNIConductionCCMpfaProblem, INHERITS_FROM(CCMpfaModel, ThreePNIConductionProblem));
+
+NEW_PROP_TAG(FVGridGeometry);
+
+NEW_TYPE_TAG(ThreePNIConductionProblem, INHERITS_FROM(ThreePNI));
+NEW_TYPE_TAG(ThreePNIConductionBoxProblem, INHERITS_FROM(BoxModel, ThreePNIConductionProblem, ThreePNISpatialParams));
+NEW_TYPE_TAG(ThreePNIConductionCCProblem, INHERITS_FROM(CCTpfaModel, ThreePNIConductionProblem, ThreePNISpatialParams));
+NEW_TYPE_TAG(ThreePNIConductionCCMpfaProblem, INHERITS_FROM(CCMpfaModel, ThreePNIConductionProblem, ThreePNISpatialParams));
// Set the grid type
SET_TYPE_PROP(ThreePNIConductionProblem, Grid, Dune::YaspGrid<2>);
@@ -67,7 +71,7 @@ SET_TYPE_PROP(ThreePNIConductionProblem,
SpatialParams,
ThreePNISpatialParams<TypeTag>);
-}
+}// end namespace Properties
/*!
@@ -94,34 +98,34 @@ SET_TYPE_PROP(ThreePNIConductionProblem,
* <tt>./test_cc3pniconduction -ParameterFile ./test_cc3pniconduction.input</tt>
*/
template <class TypeTag>
-class ThreePNIConductionProblem : public ImplicitPorousMediaProblem<TypeTag>
+class ThreePNIConductionProblem : public PorousMediumFlowProblem<TypeTag>
{
- using ParentType = ImplicitPorousMediaProblem<TypeTag>;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using IapwsH2O = H2O<Scalar>;
- using VtkOutputModule = typename GET_PROP_TYPE(TypeTag, VtkOutputModule);
+ using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
// copy some indices for convenience
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
// world dimension
- dimWorld = GridView::dimensionworld
+ dimWorld = GridView::dimensionworld,
+ dim=GridView::dimension
};
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dimWorld : 0 };
-
enum {
// index of the primary variables
pressureIdx = Indices::pressureIdx,
@@ -136,48 +140,34 @@ class ThreePNIConductionProblem : public ImplicitPorousMediaProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
- ThreePNIConductionProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ ThreePNIConductionProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
//initialize fluid system
FluidSystem::init();
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- std::string,
- Problem,
- Name);
- outputInterval_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- int, Problem, OutputInterval);
-
+ name_ = getParam<std::string>("Problem.Name");
temperatureHigh_ = 300.0;
+ temperatureExact_.resize(fvGridGeometry->numDofs());
+ }
- }
-
-
- bool shouldWriteOutput() const
+ //! get the analytical temperature
+ const std::vector<Scalar>& getExactTemperature()
{
- return
- this->timeManager().timeStepIndex() == 0 ||
- this->timeManager().timeStepIndex() % outputInterval_ == 0 ||
- this->timeManager().episodeWillBeFinished() ||
- this->timeManager().willBeFinished();
+ return temperatureExact_;
}
-
- /*!
- * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
- */
- void addVtkOutputFields(VtkOutputModule& outputModule) const
+ //! udpate the analytical temperature
+ void updateExactTemperature(const SolutionVector& curSol, Scalar time)
{
- auto& temperatureExact = outputModule.createScalarField("temperatureExact", dofCodim);
+ const auto someElement = *(elements(this->fvGridGeometry().gridView()).begin());
- const auto someElement = *(elements(this->gridView()).begin());
- const auto someElemSol = this->model().elementSolution(someElement, this->model().curSol());
+ ElementSolutionVector someElemSol(someElement, curSol, this->fvGridGeometry());
const auto someInitSol = initialAtPos(someElement.geometry().center());
- auto someFvGeometry = localView(this->model().fvGridGeometry());
- someFvGeometry.bindElement(someElement);
- const auto someScv = *(scvs(someFvGeometry).begin());
+ auto fvGeometry = localView(this->fvGridGeometry());
+ fvGeometry.bindElement(someElement);
+ const auto someScv = *(scvs(fvGeometry).begin());
VolumeVariables volVars;
volVars.update(someElemSol, *this, someElement, someScv);
@@ -189,26 +179,27 @@ public:
const auto heatCapacityS = this->spatialParams().solidHeatCapacity(someElement, someScv, someElemSol);
const auto storage = densityW*heatCapacityW*porosity + densityS*heatCapacityS*(1 - porosity);
const auto effectiveThermalConductivity = ThermalConductivityModel::effectiveThermalConductivity(volVars, this->spatialParams(),
- someElement, someFvGeometry, someScv);
+ someElement, fvGeometry, someScv);
using std::max;
- Scalar time = max(this->timeManager().time() + this->timeManager().timeStepSize(), 1e-10);
-
- for (const auto& element : elements(this->gridView()))
+ time = max(time, 1e-10);
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
{
- auto fvGeometry = localView(this->model().fvGridGeometry());
+ auto fvGeometry = localView(this->fvGridGeometry());
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
{
- auto globalIdx = scv.dofIndex();
- const auto& globalPos = scv.dofPosition();
- using std::erf;
- using std::sqrt;
- temperatureExact[globalIdx] = temperatureHigh_ + (someInitSol[temperatureIdx] - temperatureHigh_)
+ auto globalIdx = scv.dofIndex();
+ const auto& globalPos = scv.dofPosition();
+ using std::erf;
+ using std::sqrt;
+ temperatureExact_[globalIdx] = temperatureHigh_ + (someInitSol[temperatureIdx] - temperatureHigh_)
*erf(0.5*sqrt(globalPos[0]*globalPos[0]*storage/time/effectiveThermalConductivity));
+
}
}
}
+
/*!
* \name Problem parameters
*/
@@ -239,7 +230,7 @@ public:
BoundaryTypes boundaryTypesAtPos(const GlobalPosition &globalPos) const
{
BoundaryTypes values;
- if(globalPos[0] < eps_ || globalPos[0] > this->bBoxMax()[0] - eps_)
+ if(globalPos[0] < eps_ || globalPos[0] > this->fvGridGeometry().bBoxMax()[0] - eps_)
{
values.setAllDirichlet();
}
@@ -265,22 +256,20 @@ public:
return values;
}
- /*!
+ /*!
* \brief Evaluate the boundary conditions for a neumann
* boundary segment.
*
- * \param element The finite element
- * \param fvGeometry The finite-volume geometry in the box scheme
- * \param elemVolVars The element volume variables
- * \param scvf The subcontrolvolume face
- * Negative values mean influx.
+ * \param values Stores the Neumann values for the conservation equations in
+ * \f$ [ \textnormal{unit of conserved quantity} / (m^(dim-1) \cdot s )] \f$
+ * \param globalPos The position of the integration point of the boundary segment.
+ *
+ * For this method, the \a values parameter stores the mass flux
+ * in normal direction of each phase. Negative values mean influx.
*/
- PrimaryVariables neumann(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf) const
+ NeumannFluxes neumannAtPos(const GlobalPosition &globalPos) const
{
- return PrimaryVariables(0.0);
+ return NeumannFluxes(0.0);
}
// \}
@@ -317,20 +306,19 @@ public:
{
PrimaryVariables values;
values[pressureIdx] = 1e5; // initial condition for the pressure
- values[swIdx] = 1.; // initial condition for the wetting phase saturation
+ values[swIdx] = 1.0; // initial condition for the wetting phase saturation
values[snIdx] = 1e-5; // initial condition for the non-wetting phase saturation
- values[temperatureIdx] = 290.;
+ values[temperatureIdx] = 290;
return values;
}
// \}
private:
-
Scalar temperatureHigh_;
static constexpr Scalar eps_ = 1e-6;
std::string name_;
- int outputInterval_;
+ std::vector<Scalar> temperatureExact_;
};
} //end namespace
diff --git a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
index a88a062336ec26032fd1099d331964d341191be9..1178f4d46e104db1257cbad3c9e36f0a8789a46a 100644
--- a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
@@ -26,16 +26,16 @@
#include <math.h>
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/cellcentered/mpfa/properties.hh>
+#include <dumux/discretization/box/properties.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include <dumux/porousmediumflow/3p/implicit/model.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
-#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-
#include <dumux/material/fluidsystems/h2oairmesitylene.hh>
#include <dumux/material/components/h2o.hh>
#include <dumux/material/fluidmatrixinteractions/3p/thermalconductivitysomerton3p.hh>
-#include "3pnispatialparams.hh"
+#include "3pnispatialparams.hh"
namespace Dumux
{
@@ -94,34 +94,32 @@ SET_TYPE_PROP(ThreePNIConvectionProblem,
* <tt>./test_cc3pcniconvection -ParameterFile ./test_cc3pniconvection.input</tt>
*/
template <class TypeTag>
-class ThreePNIConvectionProblem : public ImplicitPorousMediaProblem<TypeTag>
+class ThreePNIConvectionProblem : public PorousMediumFlowProblem<TypeTag>
{
- using ParentType = ImplicitPorousMediaProblem<TypeTag>;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
- using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
using ThermalConductivityModel = typename GET_PROP_TYPE(TypeTag, ThermalConductivityModel);
using VolumeVariables = typename GET_PROP_TYPE(TypeTag, VolumeVariables);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using IapwsH2O = H2O<Scalar>;
- using VtkOutputModule = typename GET_PROP_TYPE(TypeTag, VtkOutputModule);
// copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
enum {
// world dimension
dimWorld = GridView::dimensionworld
};
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
- enum { dofCodim = isBox ? dimWorld : 0 };
-
enum {
// index of the primary variables
pressureIdx = Indices::pressureIdx,
@@ -133,61 +131,46 @@ class ThreePNIConvectionProblem : public ImplicitPorousMediaProblem<TypeTag>
energyEqIdx = Indices::energyEqIdx
};
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::Intersection Intersection;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
-
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Intersection = typename GridView::Intersection;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
- ThreePNIConvectionProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ ThreePNIConvectionProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
//initialize fluid system
FluidSystem::init();
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- std::string,
- Problem, Name);
- outputInterval_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- int, Problem, OutputInterval);
- darcyVelocity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag,
- Scalar, Problem, DarcyVelocity);
+ name_ = getParam<std::string>("Problem.Name");
+ outputInterval_ = getParam<int>("Problem.OutputInterval");
+ darcyVelocity_ = getParam<Scalar>("Problem.DarcyVelocity");
temperatureHigh_ = 291.;
temperatureLow_ = 290.;
pressureHigh_ = 2e5;
pressureLow_ = 1e5;
-
+ temperatureExact_.resize(this->fvGridGeometry().numDofs());
}
-
- bool shouldWriteOutput() const
+ //! Get exact temperature vector for output
+ const std::vector<Scalar>& getExactTemperature()
{
- return
- this->timeManager().timeStepIndex() == 0 ||
- this->timeManager().timeStepIndex() % outputInterval_ == 0 ||
- this->timeManager().episodeWillBeFinished() ||
- this->timeManager().willBeFinished();
+ return temperatureExact_;
}
-
- /*!
- * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
- */
- void addVtkOutputFields(VtkOutputModule& outputModule) const
+ //! udpate the analytical temperature
+ void updateExactTemperature(const SolutionVector& curSol, Scalar time)
{
- auto& temperatureExact = outputModule.createScalarField("temperatureExact", dofCodim);
+ const auto someElement = *(elements(this->fvGridGeometry().gridView()).begin());
- const auto someElement = *(elements(this->gridView()).begin());
- const auto someElemSol = this->model().elementSolution(someElement, this->model().curSol());
+ ElementSolutionVector someElemSol(someElement, curSol, this->fvGridGeometry());
const auto someInitSol = initialAtPos(someElement.geometry().center());
- auto someFvGeometry = localView(this->model().fvGridGeometry());
- someFvGeometry.bindElement(someElement);
- const auto someScv = *(scvs(someFvGeometry).begin());
+ auto fvGeometry = localView(this->fvGridGeometry());
+ fvGeometry.bindElement(someElement);
+ const auto someScv = *(scvs(fvGeometry).begin());
VolumeVariables volVars;
volVars.update(someElemSol, *this, someElement, someScv);
@@ -202,24 +185,23 @@ public:
std::cout << "storage: " << storageTotal << '\n';
using std::max;
- const Scalar time = max(this->timeManager().time() + this->timeManager().timeStepSize(), 1e-10);
+ time = max(time, 1e-10);
const Scalar retardedFrontVelocity = darcyVelocity_*storageW/storageTotal/porosity;
std::cout << "retarded velocity: " << retardedFrontVelocity << '\n';
- for (const auto& element : elements(this->gridView()))
+ for (const auto& element : elements(this->fvGridGeometry().gridView()))
{
- auto fvGeometry = localView(this->model().fvGridGeometry());
+ auto fvGeometry = localView(this->fvGridGeometry());
fvGeometry.bindElement(element);
for (auto&& scv : scvs(fvGeometry))
{
auto dofIdxGlobal = scv.dofIndex();
auto dofPosition = scv.dofPosition();
- temperatureExact[dofIdxGlobal] = (dofPosition[0] < retardedFrontVelocity*time) ? temperatureHigh_ : temperatureLow_;
+ temperatureExact_[dofIdxGlobal] = (dofPosition[0] < retardedFrontVelocity*time) ? temperatureHigh_ : temperatureLow_;
}
}
}
-
/*!
* \name Problem parameters
*/
@@ -251,7 +233,7 @@ public:
BoundaryTypes boundaryTypesAtPos(const GlobalPosition &globalPos) const
{
BoundaryTypes values;
- if(globalPos[0] > this->bBoxMax()[0] - eps_)
+ if(globalPos[0] > this->fvGridGeometry().bBoxMax()[0] - eps_)
{
values.setAllDirichlet();
}
@@ -309,23 +291,6 @@ public:
*/
// \{
- /*!
- * \brief Evaluate the source term for all phases within a given
- * sub-control-volume.
- *
- * \param globalPos The position for which the source should be evaluated
- *
- * Returns the rate mass of a component is generated or annihilate
- * per volume unit. Positive values mean that mass is created,
- * negative ones mean that it vanishes.
- *
- * The units must be according to either using mole or mass fractions. (mole/(m^3*s) or kg/(m^3*s))
- */
- PrimaryVariables sourceAtPos(const GlobalPosition &globalPos) const
- {
- return PrimaryVariables(0.0);
- }
-
/*!
* \brief Evaluate the initial value for a control volume.
*
@@ -353,7 +318,9 @@ private:
static constexpr Scalar eps_ = 1e-6;
std::string name_;
int outputInterval_;
+ std::vector<Scalar> temperatureExact_;
};
-} //end namespace
+} //end namespace Dumux
+
#endif
diff --git a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
index 6fdd140d43ea3268e4537f0db0943b48dc9e8486..9a75e54ef610368360045b057d7b9337b24be64d 100644
--- a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
@@ -58,11 +58,11 @@ SET_PROP(ThreePNISpatialParams, MaterialLaw)
private:
// define the material law which is parameterized by effective
// saturations
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef RegularizedParkerVanGen3P<Scalar> EffectiveLaw;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using EffectiveLaw = RegularizedParkerVanGen3P<Scalar>;
public:
// define the material law parameterized by absolute saturations
- typedef EffToAbsLaw<EffectiveLaw> type;
+ using type = EffToAbsLaw<EffectiveLaw>;
};
}
@@ -94,8 +94,8 @@ public:
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
using MaterialLawParams = typename MaterialLaw::Params;
- ThreePNISpatialParams(const Problem& problem, const GridView &gridView)
- : ParentType(problem, gridView)
+ ThreePNISpatialParams(const Problem& problem)
+ : ParentType(problem)
{
permeability_ = 1e-10;
porosity_ = 0.4;
diff --git a/test/porousmediumflow/3p/implicit/CMakeLists.txt b/test/porousmediumflow/3p/implicit/CMakeLists.txt
index 4cf0fd0b92e999191d0bc269090ca5c400be1593..deeff681559ef513a61288331c0bf8370f2bd68f 100644
--- a/test/porousmediumflow/3p/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/3p/implicit/CMakeLists.txt
@@ -1,52 +1,58 @@
add_input_file_links()
# isothermal tests
-add_dumux_test(test_box3p test_box3p test_box3p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/infiltration3pbox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/infiltration3pbox-00008.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box3p")
+dune_add_test(NAME test_box3p
+ SOURCES test_box3p.cc
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/infiltration3pbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/infiltration3pbox-00008.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_box3p")
-add_dumux_test(test_cc3p test_cc3p test_cc3p.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/infiltration3pcc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/infiltration3pcc-00008.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3p")
+dune_add_test(NAME test_cc3p
+ SOURCES test_cc3p.cc
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/infiltration3pcc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/infiltration3pcc-00008.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3p")
# non-isothermal tests
-add_dumux_test(test_box3pniconvection test_box3pniconvection test_box3pniconvection.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/3pniconvectionbox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconvection-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconvection"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+dune_add_test(NAME test_box3pniconvection
+ SOURCES test_box3pniconvection.cc
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/3pniconvectionbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconvection-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconvection"
+ --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
-add_dumux_test(test_cc3pniconvection test_cc3pniconvection test_cc3pniconvection.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/3pniconvectioncc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection-00010.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+dune_add_test(NAME test_cc3pniconvection
+ SOURCES test_cc3pniconvection.cc
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/3pniconvectioncc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection-00010.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection"
+ --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
-add_dumux_test(test_box3pniconduction test_box3pniconduction test_box3pniconduction.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/3pniconductionbox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconduction-00006.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconduction"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+dune_add_test(NAME test_box3pniconduction
+ SOURCES test_box3pniconduction.cc
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/3pniconductionbox-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconduction-00006.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconduction"
+ --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
-add_dumux_test(test_cc3pniconduction test_cc3pniconduction test_cc3pniconduction.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/3pniconductioncc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction-00006.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+dune_add_test(NAME test_cc3pniconduction
+ SOURCES test_cc3pniconduction.cc
+ COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ CMD_ARGS --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/3pniconductioncc-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction-00006.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction"
+ --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
#install sources
install(FILES
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
index 89a8f9c264f76c8907931a760f52080b2eaea98f..5948e370ba2fb5d5479c54ad9aa5e8361af48dd5 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
@@ -25,11 +25,13 @@
#ifndef DUMUX_INFILTRATION_THREEP_PROBLEM_HH
#define DUMUX_INFILTRATION_THREEP_PROBLEM_HH
+#include <dumux/discretization/cellcentered/tpfa/properties.hh>
+#include <dumux/discretization/box/properties.hh>
+#include <dumux/discretization/methods.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include <dumux/porousmediumflow/3p/implicit/model.hh>
-#include <dumux/implicit/cellcentered/tpfa/properties.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
-
#include <dumux/material/fluidsystems/h2oairmesitylene.hh>
+#include <dumux/linear/seqsolverbackend.hh>
#include "infiltration3pspatialparams.hh"
@@ -55,10 +57,7 @@ SET_TYPE_PROP(InfiltrationThreePProblem,
FluidSystem,
FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
-
-// Maximum tolerated relative error in the Newton method
-SET_SCALAR_PROP(InfiltrationThreePProblem, NewtonMaxRelativeShift, 1e-4);
-}
+}// end namespace Properties
/*!
* \ingroup ThreePModel
@@ -91,18 +90,14 @@ SET_SCALAR_PROP(InfiltrationThreePProblem, NewtonMaxRelativeShift, 1e-4);
* <tt>./naplinfiltrationexercise -parameterFile naplinfiltrationexercise.input</tt>
* */
template <class TypeTag >
-class InfiltrationThreePProblem : public ImplicitPorousMediaProblem<TypeTag>
+class InfiltrationThreePProblem : public PorousMediumFlowProblem<TypeTag>
{
- typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
- // copy some indices for convenience
- typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
enum {
pressureIdx = Indices::pressureIdx,
swIdx = Indices::swIdx,
@@ -113,24 +108,16 @@ class InfiltrationThreePProblem : public ImplicitPorousMediaProblem<TypeTag>
dimWorld = GridView::dimensionworld
};
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using NeumannFluxes = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
- typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
- typedef typename GET_PROP_TYPE(TypeTag, BoundaryTypes) BoundaryTypes;
- typedef typename GET_PROP_TYPE(TypeTag, TimeManager) TimeManager;
-
- typedef typename GridView::template Codim<0>::Entity Element;
- typedef typename GridView::template Codim<dim>::Entity Vertex;
- typedef typename GridView::Intersection Intersection;
-
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables) ElementVolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace) SubControlVolumeFace;
- typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-
- typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+ using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
+ using MaterialLawParams = typename MaterialLaw::Params;
- enum { isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox) };
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
/*!
@@ -139,28 +126,31 @@ public:
* \param timeManager The time manager
* \param gridView The grid view
*/
- InfiltrationThreePProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ InfiltrationThreePProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry)
{
temperature_ = 273.15 + 10.0; // -> 10 degrees Celsius
FluidSystem::init(282.15, 284.15, 3, 8e4, 3e5, 200);
- name_ = GET_RUNTIME_PARAM(TypeTag, std::string, Problem.Name);
+ name_ = getParam<std::string>("Problem.Name");
this->spatialParams().plotMaterialLaw();
+ time_ = 0.0;
}
/*!
* \name Problem parameters
*/
// \{
+ void setTime(Scalar time)
+ { time_ = time; }
/*!
* \brief The problem name.
*
* This is used as a prefix for files generated by the simulation.
*/
- const std::string name() const
+ const std::string& name() const
{ return name_; }
/*!
@@ -175,17 +165,6 @@ public:
return temperature_;
}
- /*!
- * \brief Returns the source term at specific position in the domain.
- *
- * \param values The source values for the primary variables
- * \param globalPos The position
- */
- PrimaryVariables sourceAtPos(const GlobalPosition &globalPos) const
- {
- return PrimaryVariables(0.0);
- }
-
// \}
/*!
@@ -204,9 +183,8 @@ public:
{
BoundaryTypes values;
- if(globalPos[0] > 500. - eps_)
- values.setAllDirichlet();
- else if(globalPos[0] < eps_)
+ if(globalPos[0] > this->fvGridGeometry().bBoxMax()[0] - eps_
+ || globalPos[0] < this->fvGridGeometry().bBoxMin()[0] + eps_)
values.setAllDirichlet();
else
values.setAllNeumann();
@@ -226,65 +204,32 @@ public:
PrimaryVariables dirichletAtPos(const GlobalPosition &globalPos) const
{
PrimaryVariables values(0.0);
-
- Scalar y = globalPos[1];
- Scalar x = globalPos[0];
- Scalar sw, swr=0.12, sgr=0.03;
-
- if(y > (-1.E-3*x+5) - eps_)
- {
- Scalar pc = 9.81 * 1000.0 * (y - (-5E-4*x+5));
- if (pc < 0.0) pc = 0.0;
-
- sw = invertPcgw_(pc,
- this->spatialParams().materialLawParamsAtPos(globalPos));
- if (sw < swr) sw = swr;
- if (sw > 1.-sgr) sw = 1.-sgr;
-
- values[pressureIdx] = 1e5 ;
- values[swIdx] = sw;
- values[snIdx] = 0.;
- }else {
- values[pressureIdx] = 1e5 + 9.81 * 1000.0 * ((-5E-4*x+5) - y);
- values[swIdx] = 1.-sgr;
- values[snIdx] = 0.;
- }
-
+ initial_(values, globalPos);
return values;
}
-
/*!
* \brief Evaluate the boundary conditions for a neumann
* boundary segment.
*
- * \param values The neumann values for the conservation equations
- * \param element The finite element
- * \param fvGeometry The finite-volume geometry in the box scheme
- * \param intersection The intersection between element and boundary
- * \param scvIdx The local vertex index
- * \param boundaryFaceIdx The index of the boundary face
+ * \param values Stores the Neumann values for the conservation equations in
+ * \f$ [ \textnormal{unit of conserved quantity} / (m^(dim-1) \cdot s )] \f$
+ * \param globalPos The position of the integration point of the boundary segment.
*
* For this method, the \a values parameter stores the mass flux
* in normal direction of each phase. Negative values mean influx.
*/
- PrimaryVariables neumann(const Element &element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolumeFace& scvf) const
+ NeumannFluxes neumannAtPos(const GlobalPosition &globalPos) const
{
- PrimaryVariables values(0.0);
-
- GlobalPosition globalPos = scvf.center();
- // TODO: BOX??? FACES SHOULD HAVE INTEGRATION POINT
+ NeumannFluxes values(0.0);
// negative values for injection
- if (this->timeManager().time()<2592000.)
+ if (time_ < 2592000.0 - eps_)
{
- if ((globalPos[0] <= 175.+eps_) && (globalPos[0] >= 155.-eps_) && (globalPos[1] >= 10.-eps_))
+ if ((globalPos[0] < 175.0 + eps_) && (globalPos[0] > 155.0 - eps_)
+ && (globalPos[1] > this->fvGridGeometry().bBoxMax()[1] - eps_))
{
- values[Indices::contiWEqIdx] = -0.0;
- values[Indices::contiNEqIdx] = -0.001, // /*Molfluss, umr. über M(Mesit.)=0,120 kg/mol --> 1.2e-4 kg/(sm)
- values[Indices::contiGEqIdx] = -0.0;
+ // mol fluxes, convert with M(Mesit.)=0,120 kg/mol --> 1.2e-4 kg/(sm)
+ values[Indices::contiNEqIdx] = -0.001;
}
}
@@ -311,7 +256,6 @@ public:
{
PrimaryVariables values(0.0);
initial_(values, globalPos);
-
return values;
}
@@ -323,6 +267,8 @@ public:
Scalar temperature() const
{ return temperature_; }
+
+
private:
// internal method for the initial condition (reused for the
// dirichlet conditions!)
@@ -353,6 +299,7 @@ private:
}
}
+ // small solver inverting the pc curve
static Scalar invertPcgw_(Scalar pcIn, const MaterialLawParams &pcParams)
{
Scalar lower,upper;
@@ -383,7 +330,9 @@ private:
Scalar temperature_;
static constexpr Scalar eps_ = 1e-6;
std::string name_;
+ Scalar time_;
};
-} //end namespace
+
+} // end namespace Dumux
#endif
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
index 0e06b9ef59b69737e6409aea94255a0eb0aba4e9..b2f00a114c93523cdc57d1a0038fccddfeb7dcc3 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
@@ -52,11 +52,11 @@ SET_PROP(InfiltrationThreePSpatialParams, MaterialLaw)
private:
// define the material law which is parameterized by effective
// saturations
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef RegularizedParkerVanGen3P<Scalar> EffectiveLaw;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using EffectiveLaw = RegularizedParkerVanGen3P<Scalar>;
public:
// define the material law parameterized by absolute saturations
- typedef EffToAbsLaw<EffectiveLaw> type;
+ using type = EffToAbsLaw<EffectiveLaw>;
};
}
@@ -69,64 +69,59 @@ SET_PROP(InfiltrationThreePSpatialParams, MaterialLaw)
template<class TypeTag>
class InfiltrationThreePSpatialParams : public ImplicitSpatialParams<TypeTag>
{
- typedef ImplicitSpatialParams<TypeTag> ParentType;
-
- typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
- typedef typename GET_PROP_TYPE(TypeTag, Problem) Problem;
- typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
- typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
- typedef typename Grid::ctype CoordScalar;
+ using ParentType = ImplicitSpatialParams<TypeTag>;
+
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag,ElementSolutionVector);
enum {
dimWorld=GridView::dimensionworld
};
- typedef Dune::FieldVector<CoordScalar,dimWorld> GlobalPosition;
-
- typedef typename GET_PROP_TYPE(TypeTag, VolumeVariables) VolumeVariables;
- typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
- typedef typename GET_PROP_TYPE(TypeTag, SubControlVolume) SubControlVolume;
- typedef typename GridView::template Codim<0>::Entity Element;
-
+ using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
public:
// export permeability type
using PermeabilityType = Scalar;
//get the material law from the property system
- typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
- typedef typename MaterialLaw::Params MaterialLawParams;
+ using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
+ using MaterialLawParams = typename MaterialLaw::Params;
/*!
* \brief The constructor
*
* \param gridView The grid view
*/
- InfiltrationThreePSpatialParams(const Problem& problem, const GridView &gridView)
- : ParentType(problem, gridView)
+ InfiltrationThreePSpatialParams(const Problem& problem)
+ : ParentType(problem)
{
// intrinsic permeabilities
- fineK_ = GET_RUNTIME_PARAM(TypeTag, Scalar, permeability);
- coarseK_ = GET_RUNTIME_PARAM(TypeTag, Scalar, permeability);
+ fineK_ = getParam<Scalar>("SpatialParams.permeability");
+ coarseK_ = getParam<Scalar>("SpatialParams.permeability");
// porosities
- porosity_ = GET_RUNTIME_PARAM(TypeTag, Scalar, porosity);
-
+ porosity_ = getParam<Scalar>("SpatialParams.porosity");
+ vGAlpha_ = getParam<Scalar>("SpatialParams.vanGenuchtenAlpha");
+ vGN_ = getParam<Scalar>("SpatialParams.vanGenuchtenN");
// residual saturations
materialParams_.setSwr(0.12);
materialParams_.setSnr(0.07);
materialParams_.setSgr(0.03);
// parameters for the 3phase van Genuchten law
- materialParams_.setVgAlpha(GET_RUNTIME_PARAM(TypeTag, Scalar, vanGenuchtenAlpha));
- materialParams_.setVgn(GET_RUNTIME_PARAM(TypeTag, Scalar, vanGenuchtenN));
+ materialParams_.setVgAlpha(vGAlpha_);
+ materialParams_.setVgn(vGN_);
materialParams_.setKrRegardsSnr(false);
// parameters for adsorption
materialParams_.setKdNAPL(0.);
materialParams_.setRhoBulk(1500.);
- plotFluidMatrixInteractions_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, Output,
- PlotFluidMatrixInteractions);
+ plotFluidMatrixInteractions_ = getParam<bool>("Output.PlotFluidMatrixInteractions");
}
~InfiltrationThreePSpatialParams()
@@ -144,14 +139,19 @@ public:
plotMaterialLaw.plotkr(materialParams_);
}
- /*!
- * \brief Returns the scalar intrinsic permeability \f$[m^2]\f$
+ /*!
+ * \brief Function for defining the (intrinsic) permeability \f$[m^2]\f$.
*
- * \param globalPos The global position
+ * \param element The element
+ * \param scv The sub control volume
+ * \param elemSol The element solution vector
+ * \return the intrinsic permeability
*/
- Scalar permeabilityAtPos(const GlobalPosition& globalPos) const
+ PermeabilityType permeability(const Element& element,
+ const SubControlVolume& scv,
+ const ElementSolutionVector& elemSol) const
{
- if (isFineMaterial_(globalPos))
+ if (isFineMaterial_(scv.dofPosition()))
return fineK_;
return coarseK_;
}
@@ -186,6 +186,8 @@ private:
Scalar coarseK_;
Scalar porosity_;
+ Scalar vGN_;
+ Scalar vGAlpha_;
MaterialLawParams materialParams_;
diff --git a/test/porousmediumflow/3p/implicit/test_box3p.cc b/test/porousmediumflow/3p/implicit/test_box3p.cc
index 73718b474e2a89983275ddab5e3ddc05194ff41c..1f2ae7a3d71f3f027cbc60441466ac7ea2cbe25c 100644
--- a/test/porousmediumflow/3p/implicit/test_box3p.cc
+++ b/test/porousmediumflow/3p/implicit/test_box3p.cc
@@ -23,7 +23,32 @@
*/
#include <config.h>
#include "infiltration3pproblem.hh"
-#include <dumux/common/start.hh>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -51,9 +76,177 @@ void usage(const char *progName, const std::string &errorMsg)
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
{
- typedef TTAG(InfiltrationThreePBoxProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(InfiltrationThreePBoxProblem);
+
+ ////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(GridView::dimension));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->elementMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+ problem->setTime(timeLoop->time()+timeLoop->timeStepSize());
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+
+}
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/3p/implicit/test_box3p.input b/test/porousmediumflow/3p/implicit/test_box3p.input
index 6445dff4ae034abcd0ce6f15d05dc78e0c9e4349..b41123ccc30639f2208a2dbab7db7c3dc771c2b2 100644
--- a/test/porousmediumflow/3p/implicit/test_box3p.input
+++ b/test/porousmediumflow/3p/implicit/test_box3p.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 60 # [s]
TEnd = 3600 # [s]
@@ -9,7 +9,7 @@ Cells = 50 10
[Problem]
Name = infiltration3pbox
-[]
+[SpatialParams]
permeability = 1.e-11 # m^2
porosity = 0.40
vanGenuchtenAlpha = 0.0005
@@ -18,3 +18,5 @@ vanGenuchtenN = 4.0
[Output]
PlotFluidMatrixInteractions = false
+[Newton]
+MaxRelativeShift = 1e-4
diff --git a/test/porousmediumflow/3p/implicit/test_box3pniconduction.cc b/test/porousmediumflow/3p/implicit/test_box3pniconduction.cc
index b0bfeb26b0625c47a3ad5e34199774fb30a40e4a..bb5ab3447fe9ffc5114bfeedb8ba1b9a788ff602 100644
--- a/test/porousmediumflow/3p/implicit/test_box3pniconduction.cc
+++ b/test/porousmediumflow/3p/implicit/test_box3pniconduction.cc
@@ -23,7 +23,32 @@
*/
#include <config.h>
#include "3pniconductionproblem.hh"
-#include <dumux/common/start.hh>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -41,17 +66,194 @@ void usage(const char *progName, const std::string &errorMsg)
errorMessageOut += " [options]\n";
errorMessageOut += errorMsg;
errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n";
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.File Name of the file containing the grid \n"
+ "\t definition in DGF format\n";
+
std::cout << errorMessageOut
<< "\n";
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(ThreePNIConductionBoxProblem);
+
+ ////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(GridView::dimension));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.addField(problem->getExactTemperature(), "temperatureExact");
+ vtkWriter.write(0.0);
+ // output every vtkOutputInterval time step
+ const auto vtkOutputInterval = getParam<int>("Problem.OutputInterval");
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->vertexMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // compute the new analytical temperature field for the output
+ problem->updateExactTemperature(x, timeLoop->time()+timeLoop->timeStepSize());
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ // write vtk output
+ if (timeLoop->timeStepIndex()==0 || timeLoop->timeStepIndex() % vtkOutputInterval == 0 || timeLoop->willBeFinished())
+ vtkWriter.write(timeLoop->time());
+
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+
+}
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(ThreePNIConductionBoxProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/porousmediumflow/3p/implicit/test_box3pniconduction.input b/test/porousmediumflow/3p/implicit/test_box3pniconduction.input
index 2492431958113698456d3f5169e0ed5339560ccd..cddf9d588eb13142e985d6b7797882fd1d6a5f61 100644
--- a/test/porousmediumflow/3p/implicit/test_box3pniconduction.input
+++ b/test/porousmediumflow/3p/implicit/test_box3pniconduction.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 1e5 # [s]
MaxTimeStepSize = 1e10
diff --git a/test/porousmediumflow/3p/implicit/test_box3pniconvection.cc b/test/porousmediumflow/3p/implicit/test_box3pniconvection.cc
index 4b6f12df0276bd5eb334bbd33662c0ccd3a6d40c..7cca3428373c63fe449cef5ce1adaa6d4bd5c8b5 100644
--- a/test/porousmediumflow/3p/implicit/test_box3pniconvection.cc
+++ b/test/porousmediumflow/3p/implicit/test_box3pniconvection.cc
@@ -23,7 +23,32 @@
*/
#include <config.h>
#include "3pniconvectionproblem.hh"
-#include <dumux/common/start.hh>
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -41,17 +66,192 @@ void usage(const char *progName, const std::string &errorMsg)
errorMessageOut += " [options]\n";
errorMessageOut += errorMsg;
errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n";
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.File Name of the file containing the grid \n"
+ "\t definition in DGF format\n";
+
std::cout << errorMessageOut
<< "\n";
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(ThreePNIConvectionBoxProblem);
+
+ ////////////////////////////////////////////////////////////
+ ////////////////////////////////////////////////////////////
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(GridView::dimension));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.addField(problem->getExactTemperature(), "temperatureExact");
+ vtkWriter.write(0.0);
+ // output every vtkOutputInterval time step
+ const int vtkOutputInterval = getParam<int>("Problem.OutputInterval");
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->vertexMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // compute the new analytical temperature field for the output
+ problem->updateExactTemperature(x, timeLoop->time()+timeLoop->timeStepSize());
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ if (timeLoop->timeStepIndex()==0 || timeLoop->timeStepIndex() % vtkOutputInterval == 0 || timeLoop->willBeFinished())
+ vtkWriter.write(timeLoop->time());
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+
+}
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(ThreePNIConvectionBoxProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/porousmediumflow/3p/implicit/test_box3pniconvection.input b/test/porousmediumflow/3p/implicit/test_box3pniconvection.input
index 5dc7d07dbdc79866c820bf651548a6a26481f09d..74c95f92a70ec36847d50733bb961979ed598397 100644
--- a/test/porousmediumflow/3p/implicit/test_box3pniconvection.input
+++ b/test/porousmediumflow/3p/implicit/test_box3pniconvection.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 3e4 # [s]
MaxTimeStepSize = 1e3
diff --git a/test/porousmediumflow/3p/implicit/test_cc3p.cc b/test/porousmediumflow/3p/implicit/test_cc3p.cc
index 7ad8e04e371041dc68ffd728e3ded8845685b187..5f09e831f7cb37ce35d5484491b96d43be4a5218 100644
--- a/test/porousmediumflow/3p/implicit/test_cc3p.cc
+++ b/test/porousmediumflow/3p/implicit/test_cc3p.cc
@@ -23,7 +23,31 @@
*/
#include <config.h>
#include "infiltration3pproblem.hh"
-#include <dumux/common/start.hh>
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -40,20 +64,191 @@ void usage(const char *progName, const std::string &errorMsg)
errorMessageOut += progName;
errorMessageOut += " [options]\n";
errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n";
+ errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.LowerLeft Lower left corner coordinates\n"
+ "\t-Grid.UpperRight Upper right corner coordinates\n"
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n"
+ "\t definition in DGF format\n"
+ "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
+ "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
+ "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n"
+ "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n";
std::cout << errorMessageOut
<< "\n";
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
{
- typedef TTAG(InfiltrationThreePCCProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(InfiltrationThreePCCProblem);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(0));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = UMFPackBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>();
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // set the end of the next time step as time in the problem to control
+ // the boundary conditions for the implicit Euler scheme
+ problem->setTime(timeLoop->time()+timeLoop->timeStepSize());
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ // write vtk output
+ vtkWriter.write(timeLoop->time());
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/3p/implicit/test_cc3p.input b/test/porousmediumflow/3p/implicit/test_cc3p.input
index 764e1a3f0c4ab0036e27c25bc2f9177e9a33673e..2fc97e822c6883ea43f696ddb6d15cca2a256f48 100644
--- a/test/porousmediumflow/3p/implicit/test_cc3p.input
+++ b/test/porousmediumflow/3p/implicit/test_cc3p.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 60 # [s]
TEnd = 3600 # [s]
@@ -9,7 +9,7 @@ Cells = 50 10
[Problem]
Name = infiltration3pcc
-[]
+[SpatialParams]
permeability = 1.e-11 # m^2
porosity = 0.40
vanGenuchtenAlpha = 0.0005
@@ -18,3 +18,5 @@ vanGenuchtenN = 4.0
[Output]
PlotFluidMatrixInteractions = false
+[Newton]
+MaxRelativeShift = 1e-4
diff --git a/test/porousmediumflow/3p/implicit/test_cc3pniconduction.cc b/test/porousmediumflow/3p/implicit/test_cc3pniconduction.cc
index 6c1fc640e642a690be25416d747a657a7f54acc6..858dbea7e6fbbd83103992f8541efb8d91fd5b6e 100644
--- a/test/porousmediumflow/3p/implicit/test_cc3pniconduction.cc
+++ b/test/porousmediumflow/3p/implicit/test_cc3pniconduction.cc
@@ -23,7 +23,31 @@
*/
#include <config.h>
#include "3pniconductionproblem.hh"
-#include <dumux/common/start.hh>
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -40,18 +64,193 @@ void usage(const char *progName, const std::string &errorMsg)
errorMessageOut += progName;
errorMessageOut += " [options]\n";
errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n";
+ errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.LowerLeft Lower left corner coordinates\n"
+ "\t-Grid.UpperRight Upper right corner coordinates\n"
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n"
+ "\t definition in DGF format\n"
+ "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
+ "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
+ "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n"
+ "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n";
+
std::cout << errorMessageOut
<< "\n";
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(ThreePNIConductionCCProblem);
+
+// initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(0));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.addField(problem->getExactTemperature(), "temperatureExact");
+ vtkWriter.write(0.0);
+ // output every vtkOutputInterval time step
+ const auto vtkOutputInterval = getParam<int>("Problem.OutputInterval");
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->elementMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // update the exact time temperature
+ problem->updateExactTemperature(x, timeLoop->time()+timeLoop->timeStepSize());
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ if (timeLoop->timeStepIndex()==0 || timeLoop->timeStepIndex() % vtkOutputInterval == 0 || timeLoop->willBeFinished())
+ vtkWriter.write(timeLoop->time());
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(ThreePNIConductionCCProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/porousmediumflow/3p/implicit/test_cc3pniconduction.input b/test/porousmediumflow/3p/implicit/test_cc3pniconduction.input
index 42fb551f9b6a4a78d44272188c88321a03f1e661..11dff4a2c571408c3a9079969f8aa1c93e9b7b72 100644
--- a/test/porousmediumflow/3p/implicit/test_cc3pniconduction.input
+++ b/test/porousmediumflow/3p/implicit/test_cc3pniconduction.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 1e5 # [s]
MaxTimeStepSize = 1e10
diff --git a/test/porousmediumflow/3p/implicit/test_cc3pniconvection.cc b/test/porousmediumflow/3p/implicit/test_cc3pniconvection.cc
index dce33c08ccc8e3cbc7044a0ecb07dd64509e2c73..77ee4c8b207e1bd23a59e3c8aea041a531e8a872 100644
--- a/test/porousmediumflow/3p/implicit/test_cc3pniconvection.cc
+++ b/test/porousmediumflow/3p/implicit/test_cc3pniconvection.cc
@@ -23,7 +23,31 @@
*/
#include <config.h>
#include "3pniconvectionproblem.hh"
-#include <dumux/common/start.hh>
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+
+#include <dumux/linear/amgbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+#include <dumux/nonlinear/newtoncontroller.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/discretization/methods.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
/*!
* \brief Provides an interface for customizing error messages associated with
@@ -40,18 +64,194 @@ void usage(const char *progName, const std::string &errorMsg)
errorMessageOut += progName;
errorMessageOut += " [options]\n";
errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.File Name of the file containing the grid \n"
- "\t definition in DGF format\n";
+ errorMessageOut += "\n\nThe list of mandatory arguments for this program is:\n"
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.LowerLeft Lower left corner coordinates\n"
+ "\t-Grid.UpperRight Upper right corner coordinates\n"
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n"
+ "\t definition in DGF format\n"
+ "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
+ "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
+ "\t-SpatialParams.Permeability Permeability of the domain [m^2] \n"
+ "\t-SpatialParams.PermeabilityLens Permeability of the lens [m^2] \n";
+
std::cout << errorMessageOut
<< "\n";
}
}
-int main(int argc, char** argv)
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ // define the type tag for this problem
+ using TypeTag = TTAG(ThreePNIConvectionCCProblem);
+
+ // initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ // print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ // parse command line arguments and input file
+ Parameters::init(argc, argv, usage);
+
+ // try to create a grid (from the given grid file or the input file)
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ GridCreator::makeGrid();
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // run instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ // we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ // create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ // the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ // the solution vector
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(0));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ // the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ // get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ const auto tEnd = getParam<Scalar>("TimeLoop.TEnd");
+ const auto maxDivisions = getParam<int>("TimeLoop.MaxTimeStepDivisions");
+ const auto maxDt = getParam<Scalar>("TimeLoop.MaxTimeStepSize");
+ auto dt = getParam<Scalar>("TimeLoop.DtInitial");
+
+ // check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (Parameters::getTree().hasKey("Restart") || Parameters::getTree().hasKey("TimeLoop.Restart"))
+ restartTime = getParam<Scalar>("TimeLoop.Restart");
+
+ // intialize the vtk output module
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.addField(problem->getExactTemperature(), "temperatureExact");
+ vtkWriter.write(0.0);
+ // output every vtkOutputInterval time step
+ const auto vtkOutputInterval = getParam<int>("Problem.OutputInterval");
+
+ // instantiate time loop
+ auto timeLoop = std::make_shared<TimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ // the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+
+ // the linear solver
+ using LinearSolver = Dumux::AMGBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->elementMapper());
+
+ // the non-linear solver
+ using NewtonController = Dumux::NewtonController<TypeTag>;
+ using NewtonMethod = Dumux::NewtonMethod<NewtonController, Assembler, LinearSolver>;
+ auto newtonController = std::make_shared<NewtonController>(leafGridView.comm(), timeLoop);
+ NewtonMethod nonLinearSolver(newtonController, assembler, linearSolver);
+
+ // time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ // try solving the non-linear system
+ for (int i = 0; i < maxDivisions; ++i)
+ {
+ // linearize & solve
+ auto converged = nonLinearSolver.solve(x);
+
+ if (converged)
+ break;
+
+ if (!converged && i == maxDivisions-1)
+ DUNE_THROW(Dune::MathError,
+ "Newton solver didn't converge after "
+ << maxDivisions
+ << " time-step divisions. dt="
+ << timeLoop->timeStepSize()
+ << ".\nThe solutions of the current and the previous time steps "
+ << "have been saved to restart files.");
+ }
+
+ // compute the new analytical temperature field for the output
+ problem->updateExactTemperature(x, timeLoop->time()+timeLoop->timeStepSize());
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(newtonController->suggestTimeStepSize(timeLoop->timeStepSize()));
+
+ // write vtk output
+ if(timeLoop->timeStepIndex()==0 || timeLoop->timeStepIndex() % vtkOutputInterval == 0 || timeLoop->willBeFinished())
+ vtkWriter.write(timeLoop->time());
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ // print dumux end message
+ if (mpiHelper.rank() == 0)
+ {
+ Parameters::print();
+ DumuxMessage::print(/*firstCall=*/false);
+ }
+
+ return 0;
+} // end main
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
{
- typedef TTAG(ThreePNIConvectionCCProblem) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
}
diff --git a/test/porousmediumflow/3p/implicit/test_cc3pniconvection.input b/test/porousmediumflow/3p/implicit/test_cc3pniconvection.input
index 2cd99fed09f035001799b6a185290f3904d4e5b9..fc7f8894399b094963f19235f7dbfec8cdaabeab 100644
--- a/test/porousmediumflow/3p/implicit/test_cc3pniconvection.input
+++ b/test/porousmediumflow/3p/implicit/test_cc3pniconvection.input
@@ -1,4 +1,4 @@
-[TimeManager]
+[TimeLoop]
DtInitial = 1 # [s]
TEnd = 3e4 # [s]
MaxTimeStepSize = 1e3
@@ -15,3 +15,4 @@ EnableGravity = 0 # disable gravity
[Vtk]
AddVelocity = 1 #Enable velocity output
+
diff --git a/test/porousmediumflow/tracer/1ptracer/1p.input b/test/porousmediumflow/tracer/1ptracer/1p.input
new file mode 100644
index 0000000000000000000000000000000000000000..03c604ffd50f0fe5672195e835263c98b6f03038
--- /dev/null
+++ b/test/porousmediumflow/tracer/1ptracer/1p.input
@@ -0,0 +1,10 @@
+[Grid]
+UpperRight = 1 1
+Cells = 50 50
+
+[SpatialParams]
+LensLowerLeft = 0.2 0.2
+LensUpperRight = 0.8 0.8
+
+Permeability = 1e-10 # [m^2]
+PermeabilityLens = 1e-11 # [m^2]
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh b/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
new file mode 100644
index 0000000000000000000000000000000000000000..5cd529a5d215f46b64efa3dab24643cbad96a5fe
--- /dev/null
+++ b/test/porousmediumflow/tracer/1ptracer/1ptestproblem.hh
@@ -0,0 +1,148 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief The properties for the incompressible test
+ */
+#ifndef DUMUX_INCOMPRESSIBLE_ONEP_TEST_PROBLEM_HH
+#define DUMUX_INCOMPRESSIBLE_ONEP_TEST_PROBLEM_HH
+
+#include <dumux/porousmediumflow/problem.hh>
+#include <dumux/material/components/simpleh2o.hh>
+#include <dumux/material/fluidsystems/liquidphase.hh>
+#include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/porousmediumflow/1p/implicit/propertydefaults.hh>
+#include <dumux/porousmediumflow/1p/implicit/incompressiblelocalresidual.hh>
+
+#include "1ptestspatialparams.hh"
+
+namespace Dumux
+{
+// forward declarations
+template<class TypeTag> class OnePTestProblem;
+
+namespace Properties
+{
+NEW_TYPE_TAG(IncompressibleTestProblem, INHERITS_FROM(CCTpfaModel, OneP));
+
+// Set the grid type
+SET_TYPE_PROP(IncompressibleTestProblem, Grid, Dune::YaspGrid<2>);
+
+// Set the problem type
+SET_TYPE_PROP(IncompressibleTestProblem, Problem, OnePTestProblem<TypeTag>);
+SET_TYPE_PROP(IncompressibleTestProblem, SpatialParams, OnePTestSpatialParams<TypeTag>);
+SET_TYPE_PROP(IncompressibleTestProblem, LocalResidual, OnePIncompressibleLocalResidual<TypeTag>);
+
+// the fluid system
+SET_PROP(IncompressibleTestProblem, Fluid)
+{
+private:
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+public:
+ using type = FluidSystems::LiquidPhase<Scalar, SimpleH2O<Scalar> >;
+};
+
+// Enable caching
+SET_BOOL_PROP(IncompressibleTestProblem, EnableGlobalVolumeVariablesCache, true);
+SET_BOOL_PROP(IncompressibleTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(IncompressibleTestProblem, EnableFVGridGeometryCache, true);
+
+} // end namespace Properties
+
+template<class TypeTag>
+class OnePTestProblem : public PorousMediumFlowProblem<TypeTag>
+{
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using ResidualVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
+
+ static constexpr int dimWorld = GridView::dimensionworld;
+
+public:
+ OnePTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ : ParentType(fvGridGeometry) {}
+
+ /*!
+ * \brief Specifies which kind of boundary condition should be
+ * used for which equation on a given boundary control volume.
+ *
+ * \param values The boundary types for the conservation equations
+ * \param globalPos The position of the center of the finite volume
+ */
+ BoundaryTypes boundaryTypes(const Element &element,
+ const SubControlVolumeFace &scvf) const
+ {
+ BoundaryTypes values;
+ const auto globalPos = scvf.ipGlobal();
+
+ Scalar eps = 1.0e-6;
+ if (globalPos[dimWorld-1] < eps || globalPos[dimWorld-1] > this->fvGridGeometry().bBoxMax()[dimWorld-1] - eps)
+ values.setAllDirichlet();
+ else
+ values.setAllNeumann();
+
+ return values;
+ }
+
+ /*!
+ * \brief Evaluate the boundary conditions for a dirichlet
+ * control volume.
+ *
+ * \param values The dirichlet values for the primary variables
+ * \param globalPos The center of the finite volume which ought to be set.
+ *
+ * For this method, the \a values parameter stores primary variables.
+ */
+ PrimaryVariables dirichlet(const Element &element,
+ const SubControlVolumeFace &scvf) const
+ {
+ const auto& pos = scvf.ipGlobal();
+ PrimaryVariables values(0);
+ values[0] = 1.0e+5*(1.1 - pos[dimWorld-1]*0.1);
+ return values;
+ }
+
+ /*!
+ * \brief Returns the temperature \f$\mathrm{[K]}\f$ for an isothermal problem.
+ *
+ * This is not specific to the discretization. By default it just
+ * throws an exception so it must be overloaded by the problem if
+ * no energy equation is used.
+ */
+ Scalar temperature() const
+ {
+ return 283.15; // 10°C
+ }
+
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh b/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
new file mode 100644
index 0000000000000000000000000000000000000000..c1250cca536e3c69c5c94166e720aaf41c1e03ef
--- /dev/null
+++ b/test/porousmediumflow/tracer/1ptracer/1ptestspatialparams.hh
@@ -0,0 +1,129 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ * \brief The spatial params the incompressible test
+ */
+#ifndef DUMUX_INCOMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
+#define DUMUX_INCOMPRESSIBLE_ONEP_TEST_SPATIAL_PARAMS_HH
+
+#include <random>
+#include <dumux/material/spatialparams/implicit1p.hh>
+
+namespace Dumux
+{
+
+template<class TypeTag>
+class OnePTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+{
+ using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+ using GlobalPosition = Dune::FieldVector<Scalar, GridView::dimension>;
+
+ static constexpr int dimWorld = GridView::dimensionworld;
+
+public:
+ using PermeabilityType = Scalar;
+ OnePTestSpatialParams(const Problem& problem)
+ : ParentType(problem), K_(problem.fvGridGeometry().gridView().size(0), 0.0)
+ {
+ permeability_ = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.Permeability);
+ permeabilityLens_ = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.PermeabilityLens);
+
+ lensLowerLeft_ = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensLowerLeft);
+ lensUpperRight_ = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensUpperRight);
+
+ // generate random fields
+ std::mt19937 rand(0);
+ std::lognormal_distribution<Scalar> K(std::log(permeability_), std::log(permeability_)*0.1);
+ std::lognormal_distribution<Scalar> KLens(std::log(permeabilityLens_), std::log(permeabilityLens_)*0.1);
+ for (const auto& element : elements(problem.fvGridGeometry().gridView()))
+ {
+ const auto eIdx = problem.fvGridGeometry().elementMapper().index(element);
+ const auto globalPos = element.geometry().center();
+ K_[eIdx] = isInLens_(globalPos) ? KLens(rand) : K(rand);
+ }
+ }
+
+ /*!
+ * \brief Function for defining the (intrinsic) permeability \f$[m^2]\f$.
+ *
+ * \param element The element
+ * \param scv The sub control volume
+ * \param elemSol The element solution vector
+ * \return the intrinsic permeability
+ */
+ const PermeabilityType& permeability(const Element& element,
+ const SubControlVolume& scv,
+ const ElementSolutionVector& elemSol) const
+ {
+ return K_[scv.dofIndex()];
+
+ // if (isInLens_(scv.dofPosition()))
+ // return permeabilityLens_;
+ // else
+ // return permeability_;
+ }
+
+ /*!
+ * \brief Function for defining the porosity.
+ * That is possibly solution dependent.
+ *
+ * \param element The current element
+ * \param scv The sub-control volume inside the element.
+ * \param elemSol The solution at the dofs connected to the element.
+ * \return the porosity
+ */
+ Scalar porosity(const Element &element,
+ const SubControlVolume &scv,
+ const ElementSolutionVector &elemSol) const
+ { return 0.2; }
+
+ //! Reference to the k field
+ const std::vector<Scalar>& getKField() const
+ { return K_; }
+
+private:
+ bool isInLens_(const GlobalPosition &globalPos) const
+ {
+ for (int i = 0; i < dimWorld; ++i) {
+ if (globalPos[i] < lensLowerLeft_[i] + eps_ || globalPos[i] > lensUpperRight_[i] - eps_)
+ return false;
+ }
+ return true;
+ }
+
+ GlobalPosition lensLowerLeft_;
+ GlobalPosition lensUpperRight_;
+
+ Scalar permeability_, permeabilityLens_;
+
+ std::vector<Scalar> K_;
+
+ static constexpr Scalar eps_ = 1.5e-7;
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1ace50b94c8f4b2ffd1610e5d99f5f6ca4eda576
--- /dev/null
+++ b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_input_file_links()
+
+# tracer tests
+add_dumux_test(test_1ptracer test_1ptracer test_cctracer.cc
+ python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+ --script fuzzy
+ --files ${CMAKE_SOURCE_DIR}/test/references/cctracer-reference.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/cctracer-00027.vtu
+ --command "${CMAKE_CURRENT_BINARY_DIR}/test_cctracer")
+set(CMAKE_BUILD_TYPE Release)
+#install sources
+install(FILES
+1ptracertestproblem.hh
+1ptracertestspatialparams.hh
+test_cctracer.cc
+test_cctracer.input
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/tracer/1ptracer)
diff --git a/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc b/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3e30275de19ab28bfd957d208d892b98b62dfd05
--- /dev/null
+++ b/test/porousmediumflow/tracer/1ptracer/test_cctracer.cc
@@ -0,0 +1,323 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the tracer CC model
+ */
+#include <config.h>
+
+#include "1ptestproblem.hh"
+#include "tracertestproblem.hh"
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+#include <dumux/common/parameterparser.hh>
+
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+
+#include <dumux/assembly/ccassembler.hh>
+#include <dumux/assembly/diffmethod.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+int main(int argc, char** argv)
+{
+ using namespace Dumux;
+
+ //! define the type tags for this problem
+ using OnePTypeTag = TTAG(IncompressibleTestProblem);
+ using TracerTypeTag = TTAG(TracerTestCCProblem);
+
+ //! initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ //! print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ ////////////////////////////////////////////////////////////
+ // parse the command line arguments and input file
+ ////////////////////////////////////////////////////////////
+
+ //! parse command line arguments
+ using OnePParameterTree = typename GET_PROP(OnePTypeTag, ParameterTree);
+ ParameterParser::parseCommandLineArguments(argc, argv, OnePParameterTree::tree());
+
+ using TracerParameterTree = typename GET_PROP(TracerTypeTag, ParameterTree);
+ ParameterParser::parseCommandLineArguments(argc, argv, TracerParameterTree::tree());
+
+ //! parse the input file into the parameter tree
+ ParameterParser::parseInputFile(argc, argv, OnePParameterTree::tree(), "1p.input");
+ ParameterParser::parseInputFile(argc, argv, TracerParameterTree::tree(), "tracer.input");
+
+ //////////////////////////////////////////////////////////////////////
+ // try to create a grid (from the given grid file or the input file)
+ /////////////////////////////////////////////////////////////////////
+
+ // only create the grid once using the 1p type tag
+ using GridCreator = typename GET_PROP_TYPE(OnePTypeTag, GridCreator);
+ try { GridCreator::makeGrid(); }
+ catch (...) {
+ std::cout << "\n\t -> Creation of the grid failed! <- \n\n";
+ throw;
+ }
+ GridCreator::loadBalance();
+
+ //! we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ ////////////////////////////////////////////////////////////
+ // setup & solve 1p problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ //! create the finite volume grid geometry
+ using OnePFVGridGeometry = typename GET_PROP_TYPE(OnePTypeTag, FVGridGeometry);
+ auto onePFvGridGeometry = std::make_shared<OnePFVGridGeometry>(leafGridView);
+ onePFvGridGeometry->update();
+
+ //! the problem (boundary conditions)
+ using OnePProblem = typename GET_PROP_TYPE(OnePTypeTag, Problem);
+ auto problemOneP = std::make_shared<OnePProblem>(onePFvGridGeometry);
+
+ //! the solution vector
+ using JacobianMatrix = typename GET_PROP_TYPE(OnePTypeTag, JacobianMatrix);
+ using SolutionVector = typename GET_PROP_TYPE(OnePTypeTag, SolutionVector);
+ SolutionVector p(leafGridView.size(0));
+
+ //! the linear system
+ auto A = std::make_shared<JacobianMatrix>();
+ auto r = std::make_shared<SolutionVector>();
+
+ //! the grid variables
+ using OnePGridVariables = typename GET_PROP_TYPE(OnePTypeTag, GridVariables);
+ auto onePGridVariables = std::make_shared<OnePGridVariables>(problemOneP, onePFvGridGeometry);
+ onePGridVariables->init(p);
+
+ //! the assembler
+ using OnePAssembler = CCAssembler<OnePTypeTag, DiffMethod::analytic>;
+ auto assemblerOneP = std::make_shared<OnePAssembler>(problemOneP, onePFvGridGeometry, onePGridVariables);
+ assemblerOneP->setLinearSystem(A, r);
+
+ Dune::Timer timer;
+ // assemble the local jacobian and the residual
+ Dune::Timer assemblyTimer; std::cout << "Assembling linear system ..." << std::flush;
+ assemblerOneP->assembleJacobianAndResidual(p);
+ assemblyTimer.stop(); std::cout << " took " << assemblyTimer.elapsed() << " seconds." << std::endl;
+
+ // we solve Ax = -r
+ (*r) *= -1.0;
+
+ //! solve the 1p problem
+ using LinearSolver = UMFPackBackend<OnePTypeTag>;
+ Dune::Timer solverTimer; std::cout << "Solving linear system ..." << std::flush;
+ auto linearSolver = std::make_shared<LinearSolver>();
+ linearSolver->solve(*A, p, *r);
+ solverTimer.stop(); std::cout << " took " << solverTimer.elapsed() << " seconds." << std::endl;
+
+ //! update the grid variables
+ Dune::Timer updateTimer; std::cout << "Updating variables ..." << std::flush;
+ onePGridVariables->update(p);
+ updateTimer.elapsed(); std::cout << " took " << updateTimer.elapsed() << std::endl;
+
+ //! write output to vtk
+ using GridView = typename GET_PROP_TYPE(OnePTypeTag, GridView);
+ Dune::VTKWriter<GridView> onepWriter(leafGridView);
+ onepWriter.addCellData(p, "pressure");
+ const auto& k = problemOneP->spatialParams().getKField();
+ onepWriter.addCellData(k, "permeability");
+ onepWriter.write("1p");
+
+ timer.stop();
+
+ const auto& comm = Dune::MPIHelper::getCollectiveCommunication();
+ std::cout << "Simulation took " << timer.elapsed() << " seconds on "
+ << comm.size() << " processes.\n"
+ << "The cumulative CPU time was " << timer.elapsed()*comm.size() << " seconds.\n";
+
+ ////////////////////////////////////////////////////////////
+ // compute volume fluxes for the tracer model
+ ////////////////////////////////////////////////////////////
+ using Scalar = typename GET_PROP_TYPE(OnePTypeTag, Scalar);
+ std::vector<Scalar> volumeFlux(onePFvGridGeometry->numScvf(), 0.0);
+
+ using FluxVariables = typename GET_PROP_TYPE(OnePTypeTag, FluxVariables);
+ auto upwindTerm = [](const auto& volVars) { return volVars.mobility(0); };
+ for (const auto& element : elements(leafGridView))
+ {
+ auto fvGeometry = localView(*onePFvGridGeometry);
+ fvGeometry.bind(element);
+
+ auto elemVolVars = localView(onePGridVariables->curGridVolVars());
+ elemVolVars.bind(element, fvGeometry, p);
+
+ auto elemFluxVars = localView(onePGridVariables->gridFluxVarsCache());
+ elemFluxVars.bind(element, fvGeometry, elemVolVars);
+
+ for (const auto& scvf : scvfs(fvGeometry))
+ {
+ const auto idx = scvf.index();
+
+ if (!scvf.boundary())
+ {
+ FluxVariables fluxVars;
+ fluxVars.init(*problemOneP, element, fvGeometry, elemVolVars, scvf, elemFluxVars);
+ volumeFlux[idx] = fluxVars.advectiveFlux(0, upwindTerm);
+ }
+ else
+ {
+ const auto bcTypes = problemOneP->boundaryTypes(element, scvf);
+ if (bcTypes.hasOnlyDirichlet())
+ {
+ FluxVariables fluxVars;
+ fluxVars.init(*problemOneP, element, fvGeometry, elemVolVars, scvf, elemFluxVars);
+ volumeFlux[idx] = fluxVars.advectiveFlux(0, upwindTerm);
+ }
+ }
+ }
+ }
+
+ ////////////////////////////////////////////////////////////
+ // setup & solve tracer problem on the same grid
+ ////////////////////////////////////////////////////////////
+
+ //! create the finite volume grid geometry
+ using TracerFVGridGeometry = typename GET_PROP_TYPE(TracerTypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<TracerFVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ //! the problem (initial and boundary conditions)
+ using TracerProblem = typename GET_PROP_TYPE(TracerTypeTag, Problem);
+ auto tracerProblem = std::make_shared<TracerProblem>(fvGridGeometry);
+
+ // set the flux from the 1p problem
+ tracerProblem->spatialParams().setVolumeFlux(volumeFlux);
+
+ //! the solution vector
+ SolutionVector x(leafGridView.size(0));
+ tracerProblem->applyInitialSolution(x);
+ auto xOld = x;
+
+ //! the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TracerTypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(tracerProblem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ //! get some time loop parameters
+ auto tEnd = GET_RUNTIME_PARAM_FROM_GROUP(TracerTypeTag, Scalar, TimeLoop, TEnd);
+ auto dt = GET_RUNTIME_PARAM_FROM_GROUP(TracerTypeTag, Scalar, TimeLoop, DtInitial);
+ auto maxDt = GET_PARAM_FROM_GROUP(TracerTypeTag, Scalar, TimeLoop, MaxTimeStepSize);
+
+ //! instantiate time loop
+ auto timeLoop = std::make_shared<CheckPointTimeLoop<Scalar>>(0.0, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ //! the assembler with time loop for instationary problem
+ using TracerAssembler = CCAssembler<TracerTypeTag, DiffMethod::analytic, /*implicit=*/false>;
+ auto assembler = std::make_shared<TracerAssembler>(tracerProblem, fvGridGeometry, gridVariables, timeLoop);
+ assembler->setLinearSystem(A, r);
+
+ //! intialize the vtk output module
+ VtkOutputModule<TracerTypeTag> vtkWriter(*tracerProblem, *fvGridGeometry, *gridVariables, x, tracerProblem->name());
+ using VtkOutputFields = typename GET_PROP_TYPE(TracerTypeTag, VtkOutputFields);
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ /////////////////////////////////////////////////////////////////////////////////////////////////
+ // run instationary non-linear simulation
+ /////////////////////////////////////////////////////////////////////////////////////////////////
+
+ //! set some check points for the time loop
+ timeLoop->setPeriodicCheckPoint(tEnd/10.0);
+
+ //! start the time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ Dune::Timer assembleTimer;
+ assembler->assembleJacobianAndResidual(x);
+ assembleTimer.stop();
+
+ // solve the linear system A(xOld-xNew) = r
+ Dune::Timer solveTimer;
+ SolutionVector xDelta(x);
+ linearSolver->solve(*A, xDelta, *r);
+ solveTimer.stop();
+
+ // update solution and grid variables
+ updateTimer.reset();
+ x -= xDelta;
+ gridVariables->update(x);
+ updateTimer.stop();
+
+ // statistics
+ const auto elapsedTot = assembleTimer.elapsed() + solveTimer.elapsed() + updateTimer.elapsed();
+ std::cout << "Assemble/solve/update time: "
+ << assembleTimer.elapsed() << "(" << 100*assembleTimer.elapsed()/elapsedTot << "%)/"
+ << solveTimer.elapsed() << "(" << 100*solveTimer.elapsed()/elapsedTot << "%)/"
+ << updateTimer.elapsed() << "(" << 100*updateTimer.elapsed()/elapsedTot << "%)"
+ << std::endl;
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output on check points
+ if (timeLoop->isCheckPoint())
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(dt);
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ //! print dumux end message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/false);
+
+ return 0;
+
+} // end main
diff --git a/test/porousmediumflow/tracer/1ptracer/tracer.input b/test/porousmediumflow/tracer/1ptracer/tracer.input
new file mode 100644
index 0000000000000000000000000000000000000000..f458eb0eafc4e9047c0a53bd45c5d388edd23036
--- /dev/null
+++ b/test/porousmediumflow/tracer/1ptracer/tracer.input
@@ -0,0 +1,10 @@
+[TimeLoop]
+DtInitial = 10 # [s]
+MaxTimeStepSize = 10
+TEnd = 5000 # [s]
+
+[Problem]
+Name = tracer # name passed to the output routines
+
+[Vtk]
+AddVelocity = true
diff --git a/test/porousmediumflow/tracer/implicit/tracertestproblem.hh b/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
similarity index 90%
rename from test/porousmediumflow/tracer/implicit/tracertestproblem.hh
rename to test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
index 21e7b32892f1343a467725cae874b3298f447370..3f949d129cd4c47c0397ff61653db2a3e69347a0 100644
--- a/test/porousmediumflow/tracer/implicit/tracertestproblem.hh
+++ b/test/porousmediumflow/tracer/1ptracer/tracertestproblem.hh
@@ -27,8 +27,8 @@
#include <dumux/implicit/box/properties.hh>
#include <dumux/implicit/cellcentered/tpfa/properties.hh>
#include <dumux/implicit/cellcentered/mpfa/properties.hh>
-#include <dumux/porousmediumflow/tracer/implicit/model.hh>
-#include <dumux/porousmediumflow/implicit/problem.hh>
+#include <dumux/porousmediumflow/tracer/implicit/propertydefaults.hh>
+#include <dumux/porousmediumflow/problem.hh>
#include "tracertestspatialparams.hh"
@@ -45,6 +45,11 @@ NEW_TYPE_TAG(TracerTestCCProblem, INHERITS_FROM(CCTpfaModel, TracerTestProblem))
NEW_TYPE_TAG(TracerTestCCMpfaProblem, INHERITS_FROM(CCMpfaModel, TracerTestProblem));
NEW_TYPE_TAG(TracerTestBoxProblem, INHERITS_FROM(BoxModel, TracerTestProblem));
+// enable caching
+SET_BOOL_PROP(TracerTestProblem, EnableGlobalVolumeVariablesCache, true);
+SET_BOOL_PROP(TracerTestProblem, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(TracerTestProblem, EnableFVGridGeometryCache, true);
+
// Set the grid type
SET_TYPE_PROP(TracerTestProblem, Grid, Dune::YaspGrid<2>);
@@ -56,6 +61,7 @@ SET_TYPE_PROP(TracerTestProblem, SpatialParams, TracerTestSpatialParams<TypeTag>
// Define whether mole(true) or mass (false) fractions are used
SET_BOOL_PROP(TracerTestProblem, UseMoles, false);
+SET_BOOL_PROP(TracerTestCCProblem, SolutionDependentMolecularDiffusion, false);
//! A simple fluid system with one tracer component
template<class TypeTag>
@@ -89,7 +95,7 @@ public:
const Problem& problem,
const Element& element,
const SubControlVolume& scv)
- { return 1.0e-9; }
+ { return 0.0;}//1.0e-9; }
};
SET_TYPE_PROP(TracerTestProblem, FluidSystem, TracerFluidSystem<TypeTag>);
@@ -111,14 +117,15 @@ SET_TYPE_PROP(TracerTestProblem, FluidSystem, TracerFluidSystem<TypeTag>);
* <tt>./test_cctracer -ParameterFile ./test_cctracer.input</tt>
*/
template <class TypeTag>
-class TracerTestProblem : public ImplicitPorousMediaProblem<TypeTag>
+class TracerTestProblem : public PorousMediumFlowProblem<TypeTag>
{
- using ParentType = ImplicitPorousMediaProblem<TypeTag>;
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
@@ -131,11 +138,9 @@ class TracerTestProblem : public ImplicitPorousMediaProblem<TypeTag>
using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
public:
- TracerTestProblem(TimeManager &timeManager, const GridView &gridView)
- : ParentType(timeManager, gridView)
+ TracerTestProblem(std::shared_ptr<const FVGridGeometry> fvGridGeom)
+ : ParentType(fvGridGeom)
{
- name_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name);
-
// stating in the console whether mole or mass fractions are used
if(useMoles)
std::cout<<"problem uses mole fractions" << '\n';
@@ -143,23 +148,6 @@ public:
std::cout<<"problem uses mass fractions" << '\n';
}
- /*!
- * \name Problem parameters
- */
- // \{
-
- /*!
- * \brief The problem name.
- *
- * This is used as a prefix for files generated by the simulation.
- */
- const std::string& name() const
- {
- return name_;
- }
-
- // \}
-
/*!
* \name Boundary conditions
*/
@@ -209,7 +197,7 @@ public:
PrimaryVariables initialAtPos(const GlobalPosition &globalPos) const
{
PrimaryVariables initialValues(0.0);
- if (globalPos[1] > 0.4 - eps_ && globalPos[1] < 0.6 + eps_)
+ if (globalPos[1] < 0.1 + eps_)
{
if (useMoles)
initialValues = 1e-9;
@@ -222,7 +210,6 @@ public:
private:
static constexpr Scalar eps_ = 1e-6;
- std::string name_;
};
} //end namespace Dumux
diff --git a/test/porousmediumflow/tracer/implicit/tracertestspatialparams.hh b/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh
similarity index 85%
rename from test/porousmediumflow/tracer/implicit/tracertestspatialparams.hh
rename to test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh
index 5083725dd84fe7c26c1a59b50e8dc2113e087263..0b254ae3fa4fdee6f9b2f0a3d3271dbd43765ead 100644
--- a/test/porousmediumflow/tracer/implicit/tracertestspatialparams.hh
+++ b/test/porousmediumflow/tracer/1ptracer/tracertestspatialparams.hh
@@ -43,6 +43,8 @@ class TracerTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Element = typename GridView::template Codim<0>::Entity;
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
@@ -52,8 +54,8 @@ class TracerTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
public:
- TracerTestSpatialParams(const Problem& problem, const GridView &gridView)
- : ParentType(problem, gridView) {}
+ TracerTestSpatialParams(const Problem& problem)
+ : ParentType(problem) {}
/*!
* \brief Define the porosity \f$\mathrm{[-]}\f$.
@@ -92,19 +94,19 @@ public:
{ return 18.0; }
//! velocity field
- GlobalPosition velocity(const Element &element,
- const SubControlVolumeFace& scvf) const
+ Scalar volumeFlux(const Element &element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf) const
{
- GlobalPosition vel(1e-5);
- const auto globalPos = scvf.center();
- const auto& x = globalPos[0];
- const auto& y = globalPos[1];
+ return volumeFlux_[scvf.index()];
+ }
- vel[0] *= x*x * (1.0 - x)*(1.0 - x) * (2.0*y - 6.0*y*y + 4.0*y*y*y);
- vel[1] *= -1.0*y*y * (1.0 - y)*(1.0 - y) * (2.0*x - 6.0*x*x + 4.0*x*x*x);
+ void setVolumeFlux(const std::vector<Scalar>& f)
+ { volumeFlux_ = f; }
- return vel;
- }
+private:
+ std::vector<Scalar> volumeFlux_;
};
} // end namespace Dumux
diff --git a/test/porousmediumflow/tracer/CMakeLists.txt b/test/porousmediumflow/tracer/CMakeLists.txt
index ba8341c614f1a2c797c95f5402f602025f1087b1..7770e5721c70a9cfe7886bf13faf30360902c875 100644
--- a/test/porousmediumflow/tracer/CMakeLists.txt
+++ b/test/porousmediumflow/tracer/CMakeLists.txt
@@ -1 +1,2 @@
-add_subdirectory("implicit")
+add_subdirectory("constvel")
+add_subdirectory("1ptracer")
diff --git a/test/porousmediumflow/tracer/constvel/CMakeLists.txt b/test/porousmediumflow/tracer/constvel/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0b5657fbbc203d0606354444b8e926db7a967b1a
--- /dev/null
+++ b/test/porousmediumflow/tracer/constvel/CMakeLists.txt
@@ -0,0 +1,32 @@
+dune_symlink_to_source_files(FILES "test_tracer.input")
+
+# tracer tests
+dune_add_test(NAME test_tracer_explicit_tpfa
+ SOURCES test_tracer.cc
+ COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false
+ CMD_ARGS test_tracer.input -Problem.Name tracer_explicit_tpfa)
+
+dune_add_test(NAME test_tracer_explicit_box
+ SOURCES test_tracer.cc
+ COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false
+ CMD_ARGS test_tracer.input -Problem.Name tracer_explicit_box)
+
+dune_add_test(NAME test_tracer_implicit_tpfa
+ SOURCES test_tracer.cc
+ COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=true
+ CMD_ARGS test_tracer.input -Problem.Name tracer_implicit_tpfa)
+
+dune_add_test(NAME test_tracer_implicit_box
+ SOURCES test_tracer.cc
+ COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=true
+ CMD_ARGS test_tracer.input -Problem.Name tracer_implicit_box)
+
+set(CMAKE_BUILD_TYPE Release)
+
+#install sources
+install(FILES
+tracertestproblem.hh
+tracertestspatialparams.hh
+test_tracer.cc
+test_tracer.input
+DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/tracer/constvel)
diff --git a/test/porousmediumflow/tracer/constvel/test_tracer.cc b/test/porousmediumflow/tracer/constvel/test_tracer.cc
new file mode 100644
index 0000000000000000000000000000000000000000..55bc0163983a91e5a553e47ea78afc33da76419e
--- /dev/null
+++ b/test/porousmediumflow/tracer/constvel/test_tracer.cc
@@ -0,0 +1,246 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the tracer CC model
+ */
+#include <config.h>
+
+#include "tracertestproblem.hh"
+
+#include <ctime>
+#include <iostream>
+
+#include <dune/common/parallel/mpihelper.hh>
+#include <dune/common/timer.hh>
+#include <dune/grid/io/file/dgfparser/dgfexception.hh>
+#include <dune/grid/io/file/vtk.hh>
+#include <dune/istl/io.hh>
+
+#include <dumux/common/propertysystem.hh>
+#include <dumux/common/parameters.hh>
+#include <dumux/common/valgrind.hh>
+#include <dumux/common/dumuxmessage.hh>
+#include <dumux/common/defaultusagemessage.hh>
+#include <dumux/common/parameterparser.hh>
+
+#include <dumux/linear/seqsolverbackend.hh>
+#include <dumux/nonlinear/newtonmethod.hh>
+
+#include <dumux/assembly/fvassembler.hh>
+
+#include <dumux/io/vtkoutputmodule.hh>
+
+int main(int argc, char** argv) try
+{
+ using namespace Dumux;
+
+ //! define the type tag for this problem
+ using TypeTag = TTAG(TYPETAG);
+
+ //! initialize MPI, finalize is done automatically on exit
+ const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);
+
+ //! print dumux start message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/true);
+
+ ////////////////////////////////////////////////////////////
+ // parse the command line arguments and input file
+ ////////////////////////////////////////////////////////////
+
+ //! parse command line arguments
+ using ParameterTree = typename GET_PROP(TypeTag, ParameterTree);
+ ParameterParser::parseCommandLineArguments(argc, argv, ParameterTree::tree());
+
+ //! parse the input file into the parameter tree
+ //! check first if the user provided an input file through the command line, if not use the default
+ const auto parameterFileName = ParameterTree::tree().hasKey("ParameterFile") ?
+ GET_RUNTIME_PARAM(TypeTag, std::string, ParameterFile) : "";
+ ParameterParser::parseInputFile(argc, argv, ParameterTree::tree(), parameterFileName);
+
+ //////////////////////////////////////////////////////////////////////
+ // try to create a grid (from the given grid file or the input file)
+ /////////////////////////////////////////////////////////////////////
+
+ using GridCreator = typename GET_PROP_TYPE(TypeTag, GridCreator);
+ try { GridCreator::makeGrid(); }
+ catch (...) {
+ std::cout << "\n\t -> Creation of the grid failed! <- \n\n";
+ throw;
+ }
+ GridCreator::loadBalance();
+
+ ////////////////////////////////////////////////////////////
+ // setup instationary non-linear problem on this grid
+ ////////////////////////////////////////////////////////////
+
+ //! we compute on the leaf grid view
+ const auto& leafGridView = GridCreator::grid().leafGridView();
+
+ //! create the finite volume grid geometry
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
+ fvGridGeometry->update();
+
+ //! the problem (initial and boundary conditions)
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ auto problem = std::make_shared<Problem>(fvGridGeometry);
+
+ //! the solution vector
+ static constexpr bool isBox = GET_PROP_VALUE(TypeTag, ImplicitIsBox);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ static constexpr int dofCodim = isBox ? GridView::dimension : 0;
+ using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
+ SolutionVector x(leafGridView.size(dofCodim));
+ problem->applyInitialSolution(x);
+ auto xOld = x;
+
+ //! the grid variables
+ using GridVariables = typename GET_PROP_TYPE(TypeTag, GridVariables);
+ auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+ gridVariables->init(x, xOld);
+
+ //! get some time loop parameters
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ auto tEnd = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeLoop, TEnd);
+ auto dt = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeLoop, DtInitial);
+ auto maxDt = GET_PARAM_FROM_GROUP(TypeTag, Scalar, TimeLoop, MaxTimeStepSize);
+
+ //! check if we are about to restart a previously interrupted simulation
+ Scalar restartTime = 0;
+ if (ParameterTree::tree().hasKey("Restart") || ParameterTree::tree().hasKey("TimeLoop.Restart"))
+ restartTime = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, TimeLoop, Restart);
+
+ //! instantiate time loop
+ auto timeLoop = std::make_shared<CheckPointTimeLoop<Scalar>>(restartTime, dt, tEnd);
+ timeLoop->setMaxTimeStepSize(maxDt);
+
+ //! the assembler with time loop for instationary problem
+ using Assembler = FVAssembler<TypeTag, DiffMethod::analytic, IMPLICIT>;
+ auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+ using JacobianMatrix = typename GET_PROP_TYPE(TypeTag, JacobianMatrix);
+ auto A = std::make_shared<JacobianMatrix>();
+ auto r = std::make_shared<SolutionVector>();
+ assembler->setLinearSystem(A, r);
+
+ //! the linear solver
+ using LinearSolver = UMFPackBackend<TypeTag>;
+ auto linearSolver = std::make_shared<LinearSolver>(*problem);
+
+ //! intialize the vtk output module
+ VtkOutputModule<TypeTag> vtkWriter(*problem, *fvGridGeometry, *gridVariables, x, problem->name());
+ using VtkOutputFields = typename GET_PROP_TYPE(TypeTag, VtkOutputFields);
+ VtkOutputFields::init(vtkWriter); //! Add model specific output fields
+ vtkWriter.write(0.0);
+
+ /////////////////////////////////////////////////////////////////////////////////////////////////
+ // run instationary non-linear simulation
+ /////////////////////////////////////////////////////////////////////////////////////////////////
+
+ //! set some check points for the time loop
+ timeLoop->setPeriodicCheckPoint(tEnd/10.0);
+
+ //! start the time loop
+ timeLoop->start(); do
+ {
+ // set previous solution for storage evaluations
+ assembler->setPreviousSolution(xOld);
+
+ Dune::Timer assembleTimer;
+ assembler->assembleJacobianAndResidual(x);
+ assembleTimer.stop();
+
+ // solve the linear system A(xOld-xNew) = r
+ Dune::Timer solveTimer;
+ SolutionVector xDelta(x);
+ linearSolver->solve(*A, xDelta, *r);
+ solveTimer.stop();
+
+ // update solution and grid variables
+ Dune::Timer updateTimer;
+ x -= xDelta;
+ gridVariables->update(x);
+ updateTimer.stop();
+
+ // statistics
+ const auto elapsedTot = assembleTimer.elapsed() + solveTimer.elapsed() + updateTimer.elapsed();
+ std::cout << "Assemble/solve/update time: "
+ << assembleTimer.elapsed() << "(" << 100*assembleTimer.elapsed()/elapsedTot << "%)/"
+ << solveTimer.elapsed() << "(" << 100*solveTimer.elapsed()/elapsedTot << "%)/"
+ << updateTimer.elapsed() << "(" << 100*updateTimer.elapsed()/elapsedTot << "%)"
+ << std::endl;
+
+ // make the new solution the old solution
+ xOld = x;
+ gridVariables->advanceTimeStep();
+
+ // advance to the time loop to the next step
+ timeLoop->advanceTimeStep();
+
+ // write vtk output on check points
+ if (timeLoop->isCheckPoint())
+ vtkWriter.write(timeLoop->time());
+
+ // report statistics of this time step
+ timeLoop->reportTimeStep();
+
+ // set new dt as suggested by newton controller
+ timeLoop->setTimeStepSize(dt);
+
+ } while (!timeLoop->finished());
+
+ timeLoop->finalize(leafGridView.comm());
+
+ ////////////////////////////////////////////////////////////
+ // finalize, print dumux message to say goodbye
+ ////////////////////////////////////////////////////////////
+
+ //! print dumux end message
+ if (mpiHelper.rank() == 0)
+ DumuxMessage::print(/*firstCall=*/false);
+
+ return 0;
+
+}
+catch (Dumux::ParameterException &e)
+{
+ std::cerr << std::endl << e << " ---> Abort!" << std::endl;
+ return 1;
+}
+catch (Dune::DGFException & e)
+{
+ std::cerr << "DGF exception thrown (" << e <<
+ "). Most likely, the DGF file name is wrong "
+ "or the DGF file is corrupted, "
+ "e.g. missing hash at end of file or wrong number (dimensions) of entries."
+ << " ---> Abort!" << std::endl;
+ return 2;
+}
+catch (Dune::Exception &e)
+{
+ std::cerr << "Dune reported error: " << e << " ---> Abort!" << std::endl;
+ return 3;
+}
+catch (...)
+{
+ std::cerr << "Unknown exception thrown! ---> Abort!" << std::endl;
+ return 4;
+}
diff --git a/test/porousmediumflow/tracer/constvel/test_tracer.input b/test/porousmediumflow/tracer/constvel/test_tracer.input
new file mode 100644
index 0000000000000000000000000000000000000000..eabae69ba2022b32eb8042b379dd9ef782914584
--- /dev/null
+++ b/test/porousmediumflow/tracer/constvel/test_tracer.input
@@ -0,0 +1,16 @@
+[TimeLoop]
+DtInitial = 1e4 # [s]
+MaxTimeStepSize = 1e4
+TEnd = 1e6 # [s]
+
+[Grid]
+UpperRight = 1 1
+Cells = 50 50
+
+[Problem]
+Name = tracer # name passed to the output routines
+D = 1e-8
+D2 = 0
+
+[Vtk]
+AddVelocity = true
diff --git a/test/porousmediumflow/tracer/constvel/tracertestproblem.hh b/test/porousmediumflow/tracer/constvel/tracertestproblem.hh
new file mode 100644
index 0000000000000000000000000000000000000000..5b86454cec1ae19365359b8ea4101bdebffe5bf5
--- /dev/null
+++ b/test/porousmediumflow/tracer/constvel/tracertestproblem.hh
@@ -0,0 +1,245 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/**
+ * \file
+ * \brief Definition of a problem, for the tracer problem:
+ * A rotating velocity field mixes a tracer band in a porous groundwater reservoir.
+ */
+#ifndef DUMUX_TRACER_TEST_PROBLEM_HH
+#define DUMUX_TRACER_TEST_PROBLEM_HH
+
+#include <dumux/implicit/box/properties.hh>
+#include <dumux/implicit/cellcentered/tpfa/properties.hh>
+#include <dumux/implicit/cellcentered/mpfa/properties.hh>
+#include <dumux/porousmediumflow/tracer/implicit/propertydefaults.hh>
+#include <dumux/porousmediumflow/problem.hh>
+#include <dumux/material/fluidsystems/base.hh>
+
+#include "tracertestspatialparams.hh"
+
+namespace Dumux
+{
+
+template <class TypeTag>
+class TracerTest;
+
+namespace Properties
+{
+NEW_TYPE_TAG(TracerTest, INHERITS_FROM(Tracer));
+NEW_TYPE_TAG(TracerTestTpfa, INHERITS_FROM(CCTpfaModel, TracerTest));
+NEW_TYPE_TAG(TracerTestMpfa, INHERITS_FROM(CCMpfaModel, TracerTest));
+NEW_TYPE_TAG(TracerTestBox, INHERITS_FROM(BoxModel, TracerTest));
+
+// enable caching
+SET_BOOL_PROP(TracerTest, EnableGlobalVolumeVariablesCache, true);
+SET_BOOL_PROP(TracerTest, EnableGlobalFluxVariablesCache, true);
+SET_BOOL_PROP(TracerTest, EnableFVGridGeometryCache, true);
+
+// Set the grid type
+SET_TYPE_PROP(TracerTest, Grid, Dune::YaspGrid<2>);
+
+// Set the problem property
+SET_TYPE_PROP(TracerTest, Problem, TracerTest<TypeTag>);
+
+// Set the spatial parameters
+SET_TYPE_PROP(TracerTest, SpatialParams, TracerTestSpatialParams<TypeTag>);
+
+// Define whether mole(true) or mass (false) fractions are used
+SET_BOOL_PROP(TracerTest, UseMoles, false);
+
+//! A simple fluid system with one tracer component
+template<class TypeTag>
+class TracerFluidSystem : public FluidSystems::BaseFluidSystem<typename GET_PROP_TYPE(TypeTag, Scalar),
+ TracerFluidSystem<TypeTag>>
+{
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+
+public:
+ static constexpr bool isTracerFluidSystem()
+ { return true; }
+
+ //! None of the components are the main component of the phase
+ static constexpr bool isMainComponent(int compIdx, int phaseIdx)
+ { return false; }
+
+ //! The number of components
+ static constexpr int numComponents = 2;
+ static constexpr int numPhases = 1;
+
+ //! Human readable component name (index compIdx) (for vtk output)
+ static std::string componentName(int compIdx)
+ { return "tracer_" + std::to_string(compIdx); }
+
+ //! Human readable phase name (index phaseIdx) (for velocity vtk output)
+ static std::string phaseName(int phaseIdx = 0)
+ { return "Groundwater"; }
+
+ //! Molar mass in kg/mol of the component with index compIdx
+ static Scalar molarMass(unsigned int compIdx)
+ { return 0.300; }
+
+ //! binary diffusion coefficient
+ //! (might depend on spatial parameters like pressure / temperature)
+ static Scalar binaryDiffusionCoefficient(unsigned int compIdx,
+ const Problem& problem,
+ const Element& element,
+ const SubControlVolume& scv)
+ {
+ static const Scalar D = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, D);
+ static const Scalar D2 = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, D2);
+ if (compIdx == 0)
+ return D;
+ else
+ return D2;
+ }
+
+ /*!
+ * \copydoc BaseFluidSystem::isCompressible
+ */
+ static constexpr bool isCompressible(int phaseIdx)
+ { return false; }
+
+ /*!
+ * \copydoc BaseFluidSystem::viscosityIsConstant
+ */
+ static constexpr bool viscosityIsConstant(int phaseIdx)
+ { return true; }
+};
+
+SET_TYPE_PROP(TracerTest, FluidSystem, TracerFluidSystem<TypeTag>);
+
+} // end namespace Properties
+
+
+/*!
+ * \ingroup TracerModel
+ * \ingroup ImplicitTestProblems
+ *
+ * \brief Definition of a problem, for the tracer problem:
+ * A lens of contaminant tracer is diluted by diffusion and a base groundwater flow
+ *
+ * This problem uses the \ref TracerModel model.
+ *
+ * To run the simulation execute the following line in shell:
+ * <tt>./test_boxtracer -ParameterFile ./test_boxtracer.input</tt> or
+ * <tt>./test_cctracer -ParameterFile ./test_cctracer.input</tt>
+ */
+template <class TypeTag>
+class TracerTest : public PorousMediumFlowProblem<TypeTag>
+{
+ using ParentType = PorousMediumFlowProblem<TypeTag>;
+
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using TimeManager = typename GET_PROP_TYPE(TypeTag, TimeManager);
+ using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
+ using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
+ using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
+ using SpatialParams = typename GET_PROP_TYPE(TypeTag, SpatialParams);
+
+ //! property that defines whether mole or mass fractions are used
+ static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
+
+ static const int dimWorld = GridView::dimensionworld;
+ using GlobalPosition = Dune::FieldVector<Scalar, dimWorld>;
+
+public:
+ TracerTest(std::shared_ptr<const FVGridGeometry> fvGridGeom)
+ : ParentType(fvGridGeom)
+ {
+ // stating in the console whether mole or mass fractions are used
+ if(useMoles)
+ std::cout<<"problem uses mole fractions" << '\n';
+ else
+ std::cout<<"problem uses mass fractions" << '\n';
+ }
+
+ /*!
+ * \name Boundary conditions
+ */
+ // \{
+
+ /*!
+ * \brief Specifies which kind of boundary condition should be
+ * used for which equation on a given boundary segment.
+ *
+ * \param globalPos The position for which the bc type should be evaluated
+ */
+ BoundaryTypes boundaryTypesAtPos(const GlobalPosition &globalPos) const
+ {
+ BoundaryTypes values;
+ values.setAllNeumann();
+ return values;
+ }
+
+ /*!
+ * \brief Evaluate the boundary conditions for a Neumann
+ * boundary segment.
+ *
+ * For this method, the \a priVars parameter stores the mass flux
+ * in normal direction of each component. Negative values mean
+ * influx.
+ *
+ * The units must be according to either using mole or mass fractions. (mole/(m^2*s) or kg/(m^2*s))
+ */
+ PrimaryVariables neumannAtPos(const GlobalPosition& globalPos) const
+ { return PrimaryVariables(0.0); }
+
+ // \}
+
+ /*!
+ * \name Volume terms
+ */
+ // \{
+
+ /*!
+ * \brief Evaluate the initial value for a control volume.
+ *
+ * \param globalPos The position for which the initial condition should be evaluated
+ *
+ * For this method, the \a values parameter stores primary
+ * variables.
+ */
+ PrimaryVariables initialAtPos(const GlobalPosition &globalPos) const
+ {
+ PrimaryVariables initialValues(0.0);
+ if (globalPos[1] > 0.4 - eps_ && globalPos[1] < 0.6 + eps_)
+ {
+ if (useMoles)
+ initialValues = 1e-9;
+ else
+ initialValues = 1e-9*FluidSystem::molarMass(0)/this->spatialParams().fluidMolarMass(globalPos);
+ }
+ return initialValues; }
+
+ // \}
+
+private:
+ static constexpr Scalar eps_ = 1e-6;
+};
+
+} //end namespace Dumux
+
+#endif
diff --git a/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh b/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh
new file mode 100644
index 0000000000000000000000000000000000000000..978051674d2a1c3f7886a02db98c63ece05125ec
--- /dev/null
+++ b/test/porousmediumflow/tracer/constvel/tracertestspatialparams.hh
@@ -0,0 +1,123 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program 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. *
+ * *
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief Definition of the spatial parameters for the tracer problem
+ */
+#ifndef DUMUX_TRACER_TEST_SPATIAL_PARAMS_HH
+#define DUMUX_TRACER_TEST_SPATIAL_PARAMS_HH
+
+#include <dumux/material/spatialparams/implicit1p.hh>
+
+namespace Dumux
+{
+
+/*!
+ * \ingroup TracerModel
+ * \ingroup ImplicitTestProblems
+ *
+ * \brief Definition of the spatial parameters for the tracer problem
+ */
+template<class TypeTag>
+class TracerTestSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
+{
+ using ParentType = ImplicitSpatialParamsOneP<TypeTag>;
+ using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
+ using Problem = typename GET_PROP_TYPE(TypeTag, Problem);
+ using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
+ using Element = typename GridView::template Codim<0>::Entity;
+ using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
+ using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, ElementVolumeVariables);
+ using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
+ using SubControlVolumeFace = typename GET_PROP_TYPE(TypeTag, SubControlVolumeFace);
+ using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
+
+ static const int dimWorld = GridView::dimensionworld;
+ using GlobalPosition = typename Dune::FieldVector<Scalar, dimWorld>;
+
+public:
+
+ TracerTestSpatialParams(const Problem& problem)
+ : ParentType(problem) {}
+
+ /*!
+ * \brief Define the porosity \f$\mathrm{[-]}\f$.
+ *
+ * \param globalPos The global position
+ */
+ Scalar porosityAtPos(const GlobalPosition& globalPos) const
+ { return 0.2; }
+
+ /*!
+ * \brief Define the dispersivity.
+ *
+ * \param element The finite element
+ * \param scv The sub-control volume
+ * \param elemSol The solution for all dofs of the element
+ */
+ Scalar dispersivity(const Element &element,
+ const SubControlVolume& scv,
+ const ElementSolutionVector& elemSol) const
+ { return 0; }
+
+ //! Fluid properties that are spatial params in the tracer model
+ //! They can possible vary with space but are usually constants
+
+ //! fluid density
+ Scalar fluidDensity(const Element &element,
+ const SubControlVolume& scv) const
+ { return 1000; }
+
+ //! fluid molar mass
+ Scalar fluidMolarMass(const Element &element,
+ const SubControlVolume& scv) const
+ { return 18.0; }
+
+ Scalar fluidMolarMass(const GlobalPosition &globalPos) const
+ { return 18.0; }
+
+ //! velocity field
+ GlobalPosition velocity(const SubControlVolumeFace& scvf) const
+ {
+ GlobalPosition vel(1e-5);
+ const auto globalPos = scvf.ipGlobal();
+ const auto& x = globalPos[0];
+ const auto& y = globalPos[1];
+
+ vel[0] *= x*x * (1.0 - x)*(1.0 - x) * (2.0*y - 6.0*y*y + 4.0*y*y*y);
+ vel[1] *= -1.0*y*y * (1.0 - y)*(1.0 - y) * (2.0*x - 6.0*x*x + 4.0*x*x*x);
+
+ return vel;
+ }
+
+ //! velocity field
+ Scalar volumeFlux(const Element &element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolumeFace& scvf) const
+ {
+ return velocity(scvf) * scvf.unitOuterNormal() * scvf.area()
+ * elemVolVars[fvGeometry.scv(scvf.insideScvIdx())].extrusionFactor();
+ }
+};
+
+} // end namespace Dumux
+
+#endif
diff --git a/test/porousmediumflow/tracer/implicit/CMakeLists.txt b/test/porousmediumflow/tracer/implicit/CMakeLists.txt
deleted file mode 100644
index 6e5da54b2cf68d059ddf58186c23d7a2ef227e79..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/tracer/implicit/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-add_input_file_links()
-
-# tracer tests
-add_dumux_test(test_cctracer test_cctracer test_cctracer.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/cctracer-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/cctracer-00027.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_cctracer")
-
-add_dumux_test(test_ccmpfatracer test_ccmpfatracer test_ccmpfatracer.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/ccmpfatracer-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/ccmpfatracer-00027.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccmpfatracer")
-
-add_dumux_test(test_boxtracer test_boxtracer test_boxtracer.cc
- python ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
- --script fuzzy
- --files ${CMAKE_SOURCE_DIR}/test/references/boxtracer-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/boxtracer-00027.vtu
- --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxtracer")
-
-#install sources
-install(FILES
-tracertestproblem.hh
-tracertestspatialparams.hh
-test_cctracer.cc
-test_cctracer.input
-test_ccmpfatracer.cc
-test_ccmpfatracer.input
-test_boxtracer.cc
-test_boxtracer.input
-DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/tracer/implicit)
diff --git a/test/porousmediumflow/tracer/implicit/test_boxtracer.cc b/test/porousmediumflow/tracer/implicit/test_boxtracer.cc
deleted file mode 100644
index 81b429bb4b2be76e803587732453eba6b8ffc41b..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/tracer/implicit/test_boxtracer.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the tracer model
- */
-#include <config.h>
-#include "tracertestproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n";
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- return Dumux::start<TTAG(TracerTestBoxProblem)>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/tracer/implicit/test_boxtracer.input b/test/porousmediumflow/tracer/implicit/test_boxtracer.input
deleted file mode 100644
index 918e5e859a4dcb44d67a9b4870c2ffbb720289a9..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/tracer/implicit/test_boxtracer.input
+++ /dev/null
@@ -1,13 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1e6 # [s]
-
-[Grid]
-UpperRight = 1 1
-Cells = 50 50
-
-[Problem]
-Name = boxtracer # name passed to the output routines
-
-[Vtk]
-AddVelocity = true
diff --git a/test/porousmediumflow/tracer/implicit/test_ccmpfatracer.cc b/test/porousmediumflow/tracer/implicit/test_ccmpfatracer.cc
deleted file mode 100644
index 7e5be4aadd811769149407729c9cf2b4492f99db..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/tracer/implicit/test_ccmpfatracer.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the tracer model
- */
-#include <config.h>
-#include "tracertestproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n";
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- return Dumux::start<TTAG(TracerTestCCMpfaProblem)>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/tracer/implicit/test_ccmpfatracer.input b/test/porousmediumflow/tracer/implicit/test_ccmpfatracer.input
deleted file mode 100644
index 7c980cae67c44fb2695f035f7f9165c12d317aa7..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/tracer/implicit/test_ccmpfatracer.input
+++ /dev/null
@@ -1,13 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1e6 # [s]
-
-[Grid]
-UpperRight = 1 1
-Cells = 50 50
-
-[Problem]
-Name = ccmpfatracer # name passed to the output routines
-
-[Vtk]
-AddVelocity = false
diff --git a/test/porousmediumflow/tracer/implicit/test_cctracer.cc b/test/porousmediumflow/tracer/implicit/test_cctracer.cc
deleted file mode 100644
index 0d2ba6075da87b25e03ec40d32f0021b338a9d24..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/tracer/implicit/test_cctracer.cc
+++ /dev/null
@@ -1,54 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- * See the file COPYING for full copying permissions. *
- * *
- * This program 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. *
- * *
- * This program 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 this program. If not, see <http://www.gnu.org/licenses/>. *
- *****************************************************************************/
-/*!
- * \file
- *
- * \brief test for the tracer model
- */
-#include <config.h>
-#include "tracertestproblem.hh"
-#include <dumux/common/start.hh>
-
-/*!
- * \brief Provides an interface for customizing error messages associated with
- * reading in parameters.
- *
- * \param progName The name of the program, that was tried to be started.
- * \param errorMsg The error message that was issued by the start function.
- * Comprises the thing that went wrong and a general help message.
- */
-void usage(const char *progName, const std::string &errorMsg)
-{
- if (errorMsg.size() > 0) {
- std::string errorMessageOut = "\nUsage: ";
- errorMessageOut += progName;
- errorMessageOut += " [options]\n";
- errorMessageOut += errorMsg;
- errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
- "\t-TimeManager.TEnd End of the simulation [s] \n"
- "\t-TimeManager.DtInitial Initial timestep size [s] \n";
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-int main(int argc, char** argv)
-{
- return Dumux::start<TTAG(TracerTestCCProblem)>(argc, argv, usage);
-}
diff --git a/test/porousmediumflow/tracer/implicit/test_cctracer.input b/test/porousmediumflow/tracer/implicit/test_cctracer.input
deleted file mode 100644
index 81562dd195ef591292492826c31bd5c7982497c6..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/tracer/implicit/test_cctracer.input
+++ /dev/null
@@ -1,13 +0,0 @@
-[TimeManager]
-DtInitial = 1 # [s]
-TEnd = 1e6 # [s]
-
-[Grid]
-UpperRight = 1 1
-Cells = 50 50
-
-[Problem]
-Name = cctracer # name passed to the output routines
-
-[Vtk]
-AddVelocity = true
diff --git a/test/references/1pboxfracture2d3d-reference.vtu b/test/references/1pboxfracture2d3d-reference.vtu
index ed173790e1507082045c9ac158e255008b586667..b7618163b0f726d72971b524f3981f5d677dadde 100644
--- a/test/references/1pboxfracture2d3d-reference.vtu
+++ b/test/references/1pboxfracture2d3d-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="3638" NumberOfPoints="1915">
- <PointData Scalars="p">
- <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="pressure">
+ <DataArray type="Float32" Name="pressure" NumberOfComponents="1" format="ascii">
105783 104215 104334 139403 140960 140948 102834 142451 127013 128817 127968 128866
127051 128025 139926 138050 138983 134347 132513 133422 105400 107200 106289 132429
134237 133378 112606 110804 111681 118003 119073 117087 119818 118013 119116 138999
diff --git a/test/references/1pniccconvection-reference.vtu b/test/references/1pniccconvection-reference.vtu
index 2ede38f1267565b8c7dc26438cface7bb211fa10..6e08a4666a1ba04ff13e49d7e92a215c02eed409 100644
--- a/test/references/1pniccconvection-reference.vtu
+++ b/test/references/1pniccconvection-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="80" NumberOfPoints="162">
- <CellData Scalars="p" Vectors="velocity">
- <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="p" Vectors="velocity_H2O (m/s)">
+ <DataArray type="Float32" Name="pressure" NumberOfComponents="1" format="ascii">
121429 121165 120901 120637 120373 120108 119844 119580 119316 119052 118788 118524
118259 117994 117729 117463 117196 116928 116659 116390 116120 115850 115580 115309
115038 114767 114497 114226 113955 113684 113413 113142 112871 112600 112329 112058
@@ -12,7 +12,7 @@
105284 105013 104742 104471 104200 103929 103658 103387 103116 102845 102574 102303
102032 101761 101490 101219 100948 100677 100406 100135
</DataArray>
- <DataArray type="Float32" Name="velocity" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_H2O (m/s)" NumberOfComponents="3" format="ascii">
0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0
0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0
0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0
diff --git a/test/references/fracturebox2p-reference.vtu b/test/references/fracturebox2p-reference.vtu
index 6f6c59f5a2b9775ffef59c3aba8a8868b1433200..252871f545650a69531bd49394ba624e07c2c3ef 100644
--- a/test/references/fracturebox2p-reference.vtu
+++ b/test/references/fracturebox2p-reference.vtu
@@ -783,84 +783,6 @@
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
</DataArray>
- <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- </DataArray>
</PointData>
<CellData Scalars="process rank">
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
diff --git a/test/references/fracturecc2p-reference.vtu b/test/references/fracturecc2p-reference.vtu
index fb46e412fbeb349270514a7b6fa0e647896119e1..0bb78c563d21df7460a36dc7f156b6eac5b7eda9 100644
--- a/test/references/fracturecc2p-reference.vtu
+++ b/test/references/fracturecc2p-reference.vtu
@@ -1423,148 +1423,6 @@
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
0.4 0.4
</DataArray>
- <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15
- </DataArray>
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/test/references/fractureccmpfa2p-reference.vtu b/test/references/fractureccmpfa2p-reference.vtu
index fdc539336be0c209d91cfe3480732424d1f6a3c3..da8cfe981a0c5373c1fa898bca46795b611645d8 100644
--- a/test/references/fractureccmpfa2p-reference.vtu
+++ b/test/references/fractureccmpfa2p-reference.vtu
@@ -1423,148 +1423,6 @@
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
0.4 0.4
</DataArray>
- <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15
- </DataArray>
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/test/references/fuelcell2pncbox-reference.vtu b/test/references/fuelcell2pncbox-reference.vtu
index e6c358eb279f57ef6635fcc262f384c4244a7165..68dfaa91c95de98439e201a98685b4c0dc1c6aaa 100644
--- a/test/references/fuelcell2pncbox-reference.vtu
+++ b/test/references/fuelcell2pncbox-reference.vtu
@@ -153,21 +153,6 @@
0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
</DataArray>
- <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310
- </DataArray>
<DataArray type="Float32" Name="Kxx" NumberOfComponents="1" format="ascii">
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
@@ -318,7 +303,7 @@
0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276
0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276
</DataArray>
- <DataArray type="Float32" Name="m^_l^O2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m_l^O2" NumberOfComponents="1" format="ascii">
0.237118 0.237118 0.263747 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747
0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747
0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747
diff --git a/test/references/fuelcell2pnccc-reference.vtu b/test/references/fuelcell2pnccc-reference.vtu
index d334911546ac6436af3c8c09bda478f21c746b7f..afcc2136ccf658df7c07521164b3027b51c5bba1 100644
--- a/test/references/fuelcell2pnccc-reference.vtu
+++ b/test/references/fuelcell2pnccc-reference.vtu
@@ -133,19 +133,6 @@
0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
0.2 0.2 0.2 0.2 0.2 0.2
</DataArray>
- <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310 310 310 310 310 310 310
- 310 310 310 310 310 310
- </DataArray>
<DataArray type="Float32" Name="Kxx" NumberOfComponents="1" format="ascii">
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
diff --git a/test/references/infiltration3pbox-reference.vtu b/test/references/infiltration3pbox-reference.vtu
index 60a78b3e579d079cd37bd1e99c58a583e0dc24f2..e0a89ebfae5760cd61fbcca06848dd98b7cc460a 100644
--- a/test/references/infiltration3pbox-reference.vtu
+++ b/test/references/infiltration3pbox-reference.vtu
@@ -542,55 +542,6 @@
1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11
1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11
</DataArray>
- <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- </DataArray>
</PointData>
<CellData Scalars="process rank">
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
diff --git a/test/references/infiltration3pcc-reference.vtu b/test/references/infiltration3pcc-reference.vtu
index 0dbc53eaa51413c13bf8d898618d2b3c30a61e10..4415cf588793d4f9d2380dcd27f173b39f29c8d4 100644
--- a/test/references/infiltration3pcc-reference.vtu
+++ b/test/references/infiltration3pcc-reference.vtu
@@ -487,50 +487,6 @@
1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11
1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11 1e-11
</DataArray>
- <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
- </DataArray>
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/test/references/lensbox-reference.vtu b/test/references/lensbox-reference.vtu
index 6c0b5113b62916752c4d42ca9e32059a94490393..87758fe97756131a60322dfe55f793dfb2b64422 100644
--- a/test/references/lensbox-reference.vtu
+++ b/test/references/lensbox-reference.vtu
@@ -1373,143 +1373,6 @@
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
</DataArray>
- <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- </DataArray>
</PointData>
<CellData Scalars="process rank">
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
diff --git a/test/references/lenscc-reference.vtu b/test/references/lenscc-reference.vtu
index 8c5ca7597ebf654c37c594b6e3ee6467cc2f98f8..38546c9481682246a82869ff0659afff56e6c67e 100644
--- a/test/references/lenscc-reference.vtu
+++ b/test/references/lenscc-reference.vtu
@@ -1303,136 +1303,6 @@
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
</DataArray>
- <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
- </DataArray>
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/test/references/stokes2c-densitydriven-reference.vtu b/test/references/stokes2c-densitydriven-reference.vtu
index eec8a3218b211b7e992ebb61fd909c4175d9c55e..5477d08c89d8dad9099c01db8dbe7f941becfb4e 100644
--- a/test/references/stokes2c-densitydriven-reference.vtu
+++ b/test/references/stokes2c-densitydriven-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1600" NumberOfPoints="1681">
- <CellData Scalars="pressure" Vectors="velocity_liquid (m/s)">
- <DataArray type="Float32" Name="pressure" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="p" Vectors="velocity_liquid (m/s)">
+ <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000 110000
@@ -286,6 +286,12 @@
999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694
999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694
999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694
+ 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694
+ 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694
+ 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694 999.694
+ 999.694 999.694 999.694 999.694 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
+ 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.694
+ 999.694 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
@@ -310,14 +316,12 @@
999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
- 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
- 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
- 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
- 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
- 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
- 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
- 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
+ 999.692 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
999.692 999.692 999.692 999.692 999.692 999.692 999.693 999.693 999.693 999.693 999.692 999.692
+ 999.692 999.692 999.692 999.692 999.693 999.693 999.693 999.693 999.693 999.693 999.693 999.693
+ 999.693 999.693 999.693 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
+ 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.693
+ 999.693 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
@@ -338,20 +342,15 @@
999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
+ 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.691 999.692 999.692 999.692
999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
- 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
- 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
- 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.691 999.691 999.691 999.691
- 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.692 999.692 999.692
999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.691
999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
+ 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.692 999.692 999.691 999.691 999.691
999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
- 999.691 999.691 999.691 999.691 999.691 999.691 999.692 999.692 999.692 999.692 999.691 999.691
999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
- 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.692
- 999.692 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
@@ -369,15 +368,15 @@
999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
- 999.691 999.691 999.691 999.691 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
- 999.69 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
- 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.69
- 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
+ 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
+ 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
+ 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
+ 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
+ 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.69 999.69 999.69 999.69
999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
999.69 999.69 999.69 999.691 999.691 999.69 999.69 999.69 999.69 999.69 999.69 999.69
999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
- 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.691 999.691 999.69 999.69 999.69
999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
@@ -399,10 +398,11 @@
999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
- 999.69 999.69 999.69 999.69 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689
- 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.69 999.69
- 999.69 999.69 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689
- 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689
+ 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
+ 999.69 999.69 999.69 999.69 999.689 999.689 999.69 999.69 999.69 999.69 999.69 999.69
+ 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
+ 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69 999.69
+ 999.69 999.69 999.69 999.69 999.69 999.69 999.689 999.689 999.689 999.689 999.689 999.689
999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689
999.689 999.689 999.689 999.69 999.69 999.689 999.689 999.689 999.689 999.689 999.689 999.689
999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689 999.689
@@ -413,57 +413,57 @@
</DataArray>
<DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 0.999999 0.999999 0.999999 0.999999 0.999999 0.999999 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 0.999999 0.999999 0.999999 0.999999 0.999999 0.999999 0.999999
+ 0.999999 0.999999 0.999999 0.999999 0.999999 0.999999 0.999999 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 0.999999 0.999999 0.999999 0.999999 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 0.999999 0.999999 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 1 0.999999
+ 0.999999 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 0.999999 0.999999 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 0.999999 0.999999 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 1 0.999999
+ 0.999999 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 0.999999 0.999999 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 0.999999 0.999999 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 1 0.999999
+ 0.999999 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 0.999999 0.999999 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 0.999999 0.999999 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 1 0.999999
+ 0.999999 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 0.999999 0.999999 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 0.999999 0.999999 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 0.999999
@@ -476,18 +476,18 @@
1 1 1 1 1 1 1 0.999999 0.999999 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 0.999999 0.999999
- 0.999999 0.999999 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 1 0.999999
+ 0.999999 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 0.999999 0.999999 0.999999 0.999999 1 1 1 1 1 1
+ 1 1 1 0.999999 0.999999 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 0.999999 0.999999 0.999999 0.999999 1 1
+ 1 1 1 1 1 1 1 0.999999 0.999999 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 0.999999 0.999999
- 0.999999 0.999999 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 1 0.999999
+ 0.999999 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 0.999999 0.999999 1 1 1 1 1 1 1
@@ -543,7 +543,7 @@
1 1 1 0.999999 0.999999 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 0.999999 0.999999 0.999998 0.999998 0.999999 0.999999 1
+ 1 1 1 1 0.999999 0.999999 0.999999 0.999998 0.999998 0.999999 0.999999 0.999999
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1
</DataArray>
@@ -672,8 +672,8 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
- 1 1 1 1 1 1 1 1 1 1 1 1
+ 1 1 1 1 1 1 1 1 1 1 1 0.999999
+ 0.999999 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 0.999999 0.999999 1 1 1 1 1 1 1
@@ -684,678 +684,678 @@
1 1 1 1
</DataArray>
<DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
- 0 0 0 0 0 0 0 0 0 0 0 2.85555e-15
- 3.42666e-14 2.43436e-13 1.17006e-12 4.2148e-12 1.19455e-11 2.73908e-11 5.14531e-11 7.89078e-11 7.89086e-11 5.14538e-11 2.73912e-11 1.19458e-11
- 4.21515e-12 1.17006e-12 2.43436e-13 3.42666e-14 2.85555e-15 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0
- 0 7.13888e-16 4.99722e-15 3.96208e-14 2.73062e-13 1.32105e-12 4.89228e-12 1.4538e-11 3.57169e-11 7.38903e-11 1.29737e-10 1.92301e-10
- 1.92303e-10 1.29738e-10 7.38903e-11 3.57169e-11 1.45383e-11 4.89228e-12 1.32069e-12 2.73062e-13 3.96208e-14 4.99722e-15 7.13888e-16 0
- 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 1.42778e-15 8.56666e-15 5.42555e-14 3.16966e-13 1.6448e-12 6.57063e-12 2.11332e-11 5.64714e-11
- 1.28135e-10 2.50302e-10 4.23164e-10 6.15146e-10 6.1515e-10 4.23166e-10 2.50304e-10 1.28137e-10 5.64721e-11 2.11336e-11 6.57027e-12 1.6448e-12
- 3.16609e-13 5.38986e-14 8.56666e-15 1.42778e-15 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 1.78472e-15 1.32069e-14 7.6386e-14 3.91568e-13 1.82934e-12
- 7.92095e-12 2.75443e-11 7.95011e-11 1.95187e-10 4.14904e-10 7.72279e-10 1.26377e-09 1.8057e-09 1.80571e-09 1.26378e-09 7.72284e-10 4.14907e-10
- 1.95189e-10 7.95022e-11 2.75443e-11 7.92095e-12 1.8297e-12 3.91925e-13 7.6386e-14 1.32069e-14 1.78472e-15 0 0 0
- 0 0 0 0 0 0 0 0 0 3.56944e-16 3.2125e-15 1.96319e-14
- 1.06369e-13 5.16855e-13 2.24304e-12 8.84258e-12 3.21503e-11 9.98473e-11 2.63079e-10 6.00303e-10 1.20447e-09 2.14612e-09 3.40742e-09 4.7886e-09
- 4.78863e-09 3.40744e-09 2.14613e-09 1.20448e-09 6.00308e-10 2.63081e-10 9.98483e-11 3.21507e-11 8.84222e-12 2.24304e-12 5.16855e-13 1.06369e-13
- 1.96319e-14 3.2125e-15 3.56944e-16 0 0 0 0 0 0 0 0 0
- 3.56944e-16 3.92638e-15 2.39153e-14 1.33854e-13 6.4357e-13 2.72455e-12 1.03243e-11 3.54817e-11 1.12068e-10 3.15669e-10 7.67383e-10 1.63925e-09
- 3.11904e-09 5.33398e-09 8.22561e-09 1.13693e-08 1.13694e-08 8.22566e-09 5.33401e-09 3.11906e-09 1.63926e-09 7.67389e-10 3.15671e-10 1.1207e-10
- 3.5482e-11 1.03243e-11 2.72455e-12 6.4357e-13 1.33854e-13 2.42722e-14 3.92638e-15 3.56944e-16 0 0 0 0
- 0 0 0 3.56944e-16 3.2125e-15 2.49861e-14 1.44919e-13 7.18885e-13 3.08221e-12 1.16499e-11 3.93838e-11 1.20614e-10
- 3.38682e-10 8.74483e-10 1.97634e-09 3.97294e-09 7.19283e-09 1.18282e-08 1.77286e-08 2.40956e-08 2.40957e-08 1.77287e-08 1.18283e-08 7.19287e-09
- 3.97296e-09 1.97636e-09 8.7449e-10 3.38685e-10 1.20615e-10 3.93841e-11 1.16499e-11 3.08221e-12 7.18528e-13 1.44562e-13 2.49861e-14 3.2125e-15
- 3.56944e-16 0 0 0 0 0 3.56944e-16 2.49861e-15 1.99889e-14 1.29928e-13 6.89259e-13 3.0972e-12
- 1.20504e-11 4.13348e-11 1.268e-10 3.52134e-10 8.95319e-10 2.13318e-09 4.50939e-09 8.5682e-09 1.48046e-08 2.34541e-08 3.41988e-08 4.57135e-08
- 4.57137e-08 3.4199e-08 2.34542e-08 1.48047e-08 8.56824e-09 4.50941e-09 2.13319e-09 8.95326e-10 3.52136e-10 1.26801e-10 4.13348e-11 1.20504e-11
- 3.0972e-12 6.89259e-13 1.29928e-13 1.99889e-14 2.49861e-15 3.56944e-16 0 0 0 3.56944e-16 1.07083e-15 1.17792e-14
- 9.28055e-14 5.51122e-13 2.69279e-12 1.11274e-11 3.98482e-11 1.25878e-10 3.55725e-10 9.10046e-10 2.13041e-09 4.61181e-09 9.16909e-09 1.65371e-08
- 2.73575e-08 4.18517e-08 5.94588e-08 7.82363e-08 7.82367e-08 5.94591e-08 4.18519e-08 2.73577e-08 1.65372e-08 9.16914e-09 4.61184e-09 2.13042e-09
- 9.10052e-10 3.55728e-10 1.25878e-10 3.98485e-11 1.11277e-11 2.69243e-12 5.51479e-13 9.24485e-14 1.21361e-14 1.07083e-15 3.56944e-16 0
- 0 3.56944e-16 5.35416e-15 4.89013e-14 3.45879e-13 1.91215e-12 8.65696e-12 3.31901e-11 1.10349e-10 3.23851e-10 8.50894e-10 2.02561e-09
- 4.41651e-09 8.91099e-09 1.67529e-08 2.88084e-08 4.57963e-08 6.78506e-08 9.41361e-08 1.22136e-07 1.22136e-07 9.41364e-08 6.78509e-08 4.57965e-08
- 2.88085e-08 1.6753e-08 8.91104e-09 4.41653e-09 2.02563e-09 8.509e-10 3.23853e-10 1.10349e-10 3.31904e-11 8.65696e-12 1.91215e-12 3.45879e-13
- 4.89013e-14 4.99722e-15 3.56944e-16 0 0 1.07083e-15 1.78472e-14 1.6241e-13 1.07583e-12 5.55869e-12 2.35301e-11 8.44101e-11
- 2.62805e-10 7.22936e-10 1.7824e-09 3.98684e-09 8.17886e-09 1.55453e-08 2.77881e-08 4.57766e-08 7.0212e-08 1.0109e-07 1.37353e-07 1.76135e-07
- 1.76135e-07 1.37354e-07 1.0109e-07 7.02123e-08 4.57768e-08 2.77882e-08 1.55454e-08 8.1789e-09 3.98686e-09 1.78241e-09 7.22941e-10 2.62807e-10
- 8.44108e-11 2.35301e-11 5.55905e-12 1.07619e-12 1.6241e-13 1.74903e-14 1.07083e-15 0 0 3.56944e-15 5.24708e-14 4.55818e-13
- 2.84235e-12 1.38202e-11 5.50993e-11 1.8631e-10 5.47263e-10 1.42205e-09 3.31705e-09 7.03269e-09 1.37033e-08 2.47869e-08 4.2323e-08 6.71201e-08
- 9.97517e-08 1.40076e-07 1.86972e-07 2.37635e-07 2.37636e-07 1.86973e-07 1.40076e-07 9.9752e-08 6.71204e-08 4.23232e-08 2.4787e-08 1.37033e-08
- 7.03272e-09 3.31707e-09 1.42206e-09 5.47266e-10 1.86311e-10 5.50997e-11 1.38202e-11 2.84235e-12 4.55818e-13 5.24708e-14 3.56944e-15 0
- 3.56944e-16 9.99443e-15 1.33497e-13 1.1001e-12 6.50174e-12 2.99669e-11 1.13323e-10 3.63766e-10 1.01556e-09 2.51201e-09 5.58854e-09 1.13263e-08
- 2.1147e-08 3.67338e-08 5.98833e-08 9.18686e-08 1.32842e-07 1.82586e-07 2.40169e-07 3.03442e-07 3.03443e-07 2.4017e-07 1.82586e-07 1.32843e-07
- 9.18689e-08 5.98835e-08 3.67339e-08 2.11471e-08 1.13264e-08 5.58857e-09 2.51203e-09 1.01557e-09 3.63769e-10 1.13324e-10 2.99672e-11 6.50209e-12
- 1.1001e-12 1.33497e-13 9.99443e-15 3.56944e-16 7.13888e-16 2.35583e-14 2.95907e-13 2.32228e-12 1.30888e-11 5.75455e-11 2.07679e-10 6.36689e-10
- 1.69945e-09 4.02476e-09 8.58819e-09 1.67287e-08 3.00853e-08 5.04538e-08 7.95898e-08 1.1865e-07 1.6757e-07 2.26162e-07 2.94017e-07 3.70407e-07
- 3.70408e-07 2.94017e-07 2.26162e-07 1.6757e-07 1.1865e-07 7.959e-08 5.04539e-08 3.00854e-08 1.67288e-08 8.58823e-09 4.02478e-09 1.69946e-09
- 6.36693e-10 2.07681e-10 5.75462e-11 1.30891e-11 2.32228e-12 2.95907e-13 2.35583e-14 7.13888e-16 1.78472e-15 4.74736e-14 5.77892e-13 4.35329e-12
- 2.35512e-11 9.93918e-11 3.44477e-10 1.01498e-09 2.60667e-09 5.9484e-09 1.22518e-08 2.30795e-08 4.02167e-08 6.54604e-08 1.00364e-07 1.4598e-07
- 2.02032e-07 2.68496e-07 3.45881e-07 4.35819e-07 4.3582e-07 3.45882e-07 2.68497e-07 2.02032e-07 1.4598e-07 1.00364e-07 6.54606e-08 4.02168e-08
- 2.30796e-08 1.22519e-08 5.94843e-09 2.60669e-09 1.01499e-09 3.44479e-10 9.93925e-11 2.35512e-11 4.35329e-12 5.77536e-13 4.74736e-14 1.78472e-15
- 3.56944e-15 8.56666e-14 1.00765e-12 7.33948e-12 3.83497e-11 1.56319e-10 5.23471e-10 1.49133e-09 3.70704e-09 8.19853e-09 1.63906e-08 3.00188e-08
- 5.09411e-08 8.08768e-08 1.21122e-07 1.72485e-07 2.34562e-07 3.07639e-07 3.93595e-07 4.97543e-07 4.97544e-07 3.93595e-07 3.0764e-07 2.34562e-07
- 1.72485e-07 1.21122e-07 8.0877e-08 5.09412e-08 3.00189e-08 1.63906e-08 8.19857e-09 3.70705e-09 1.49133e-09 5.23474e-10 1.56319e-10 3.83501e-11
- 7.33948e-12 1.00765e-12 8.53096e-14 3.56944e-15 4.99722e-15 1.3778e-13 1.58697e-12 1.1242e-11 5.70907e-11 2.26145e-10 7.3618e-10 2.0401e-09
- 4.93728e-09 1.0643e-08 2.07653e-08 3.7164e-08 6.17064e-08 9.59644e-08 1.40908e-07 1.97019e-07 2.6382e-07 3.42051e-07 4.35476e-07 5.54014e-07
- 5.54015e-07 4.35477e-07 3.42052e-07 2.63821e-07 1.9702e-07 1.40909e-07 9.59646e-08 6.17066e-08 3.71641e-08 2.07653e-08 1.0643e-08 4.9373e-09
- 2.04011e-09 7.36184e-10 2.26147e-10 5.70907e-11 1.12416e-11 1.58733e-12 1.3778e-13 5.35416e-15 7.49583e-15 2.0096e-13 2.27409e-12 1.57716e-11
- 7.8336e-11 3.03435e-10 9.66165e-10 2.62023e-09 6.21021e-09 1.31214e-08 2.51151e-08 4.41332e-08 7.19999e-08 1.10078e-07 1.58949e-07 2.187e-07
- 2.88793e-07 3.70571e-07 4.70269e-07 6.04148e-07 6.04149e-07 4.70269e-07 3.70572e-07 2.88793e-07 2.187e-07 1.58949e-07 1.10078e-07 7.2e-08
- 4.41333e-08 2.51152e-08 1.31214e-08 6.21023e-09 2.62024e-09 9.6617e-10 3.03436e-10 7.83367e-11 1.57712e-11 2.27445e-12 2.0096e-13 7.49583e-15
- 1.03514e-14 2.6628e-13 2.9837e-12 2.03915e-11 9.96941e-11 3.80013e-10 1.19094e-09 3.18018e-09 7.42505e-09 1.54618e-08 2.91795e-08 5.057e-08
- 8.13737e-08 1.22693e-07 1.74658e-07 2.36879e-07 3.08747e-07 3.92354e-07 4.97062e-07 6.47261e-07 6.47262e-07 4.97062e-07 3.92355e-07 3.08747e-07
- 2.3688e-07 1.74659e-07 1.22693e-07 8.13739e-08 5.05702e-08 2.91796e-08 1.54618e-08 7.42508e-09 3.1802e-09 1.19095e-09 3.80014e-10 9.96945e-11
- 2.03911e-11 2.98334e-12 2.66637e-13 9.99443e-15 1.17792e-14 3.21964e-13 3.59764e-12 2.43996e-11 1.18185e-10 4.4617e-10 1.38502e-09 3.66424e-09
- 8.47768e-09 1.74947e-08 3.27143e-08 5.61583e-08 8.94555e-08 1.33404e-07 1.87616e-07 2.51116e-07 3.2319e-07 4.06825e-07 5.15237e-07 6.83005e-07
- 6.83006e-07 5.15238e-07 4.06825e-07 3.2319e-07 2.51116e-07 1.87616e-07 1.33404e-07 8.94557e-08 5.61585e-08 3.27144e-08 1.74947e-08 8.4777e-09
- 3.66425e-09 1.38503e-09 4.46172e-10 1.18185e-10 2.43996e-11 3.59764e-12 3.22321e-13 1.17792e-14 1.2493e-14 3.55516e-13 3.99706e-12 2.70835e-11
- 1.3082e-10 4.92321e-10 1.52362e-09 4.019e-09 9.27004e-09 1.90641e-08 3.55015e-08 6.06281e-08 9.59463e-08 1.41911e-07 1.97546e-07 2.61153e-07
- 3.31859e-07 4.13669e-07 5.2445e-07 7.11327e-07 7.11328e-07 5.2445e-07 4.13669e-07 3.31859e-07 2.61153e-07 1.97546e-07 1.41911e-07 9.59465e-08
- 6.06283e-08 3.55016e-08 1.90641e-08 9.27007e-09 4.01902e-09 1.52363e-09 4.92323e-10 1.3082e-10 2.70838e-11 3.99706e-12 3.55873e-13 1.2493e-14
- 1.21361e-14 3.58372e-13 4.09201e-12 2.78991e-11 1.35271e-10 5.1082e-10 1.58649e-09 4.19981e-09 9.71854e-09 2.00354e-08 3.73538e-08 6.3754e-08
- 1.00613e-07 1.48012e-07 2.04317e-07 2.6692e-07 3.34733e-07 4.12847e-07 5.24627e-07 7.32455e-07 7.32456e-07 5.24628e-07 4.12847e-07 3.34733e-07
- 2.66921e-07 2.04318e-07 1.48012e-07 1.00613e-07 6.37541e-08 3.73539e-08 2.00355e-08 9.71857e-09 4.19982e-09 1.5865e-09 5.10823e-10 1.35272e-10
- 2.78995e-11 4.09201e-12 3.58372e-13 1.17792e-14 9.99443e-15 3.29102e-13 3.85428e-12 2.6633e-11 1.30473e-10 4.97648e-10 1.56154e-09 4.17685e-09
- 9.76201e-09 2.0304e-08 3.8123e-08 6.53697e-08 1.0333e-07 1.51698e-07 2.08047e-07 2.68547e-07 3.32052e-07 4.04615e-07 5.15975e-07 7.46858e-07
- 7.46859e-07 5.15976e-07 4.04615e-07 3.32052e-07 2.68548e-07 2.08047e-07 1.51699e-07 1.0333e-07 6.53698e-08 3.81231e-08 2.0304e-08 9.76204e-09
- 4.17686e-09 1.56155e-09 4.9765e-10 1.30474e-10 2.66334e-11 3.85428e-12 3.29102e-13 9.99443e-15 7.49583e-15 2.73776e-13 3.32922e-12 2.34841e-11
- 1.16984e-10 4.536e-10 1.44779e-09 3.94066e-09 9.36889e-09 1.97981e-08 3.7684e-08 6.5296e-08 1.03871e-07 1.52708e-07 2.08569e-07 2.6635e-07
- 3.24306e-07 3.89512e-07 4.98953e-07 7.55202e-07 7.55203e-07 4.98954e-07 3.89513e-07 3.24306e-07 2.6635e-07 2.0857e-07 1.52708e-07 1.03871e-07
- 6.52961e-08 3.76841e-08 1.97981e-08 9.36892e-09 3.94067e-09 1.4478e-09 4.53602e-10 1.16984e-10 2.34837e-11 3.32886e-12 2.73419e-13 7.85277e-15
- 4.64027e-15 2.04529e-13 2.62175e-12 1.9029e-11 9.69838e-11 3.84646e-10 1.25713e-09 3.50693e-09 8.54624e-09 1.84915e-08 3.59501e-08 6.33816e-08
- 1.02071e-07 1.51006e-07 2.06161e-07 2.60797e-07 3.12188e-07 3.68325e-07 4.74229e-07 7.58279e-07 7.5828e-07 4.7423e-07 3.68326e-07 3.12188e-07
- 2.60798e-07 2.06161e-07 1.51006e-07 1.02072e-07 6.33817e-08 3.59501e-08 1.84915e-08 8.54626e-09 3.50694e-09 1.25714e-09 3.84648e-10 9.69846e-11
- 1.90294e-11 2.62175e-12 2.04529e-13 4.64027e-15 2.85555e-15 1.44562e-13 1.92821e-12 1.4277e-11 7.39595e-11 3.0072e-10 1.01394e-09 2.91939e-09
- 7.34986e-09 1.64219e-08 3.28947e-08 5.95093e-08 9.77604e-08 1.46459e-07 2.00768e-07 2.52444e-07 2.96507e-07 3.42021e-07 4.42621e-07 7.56942e-07
- 7.56943e-07 4.42621e-07 3.42021e-07 2.96507e-07 2.52445e-07 2.00768e-07 1.46459e-07 9.77606e-08 5.95094e-08 3.28948e-08 1.64219e-08 7.34988e-09
- 2.9194e-09 1.01394e-09 3.00721e-10 7.39599e-11 1.4277e-11 1.92857e-12 1.44562e-13 2.85555e-15 1.78472e-15 9.95874e-14 1.38887e-12 1.04802e-11
- 5.509e-11 2.27484e-10 7.81091e-10 2.29792e-09 5.92501e-09 1.35945e-08 2.85885e-08 5.36202e-08 9.07577e-08 1.38926e-07 1.92567e-07 2.41822e-07
- 2.78077e-07 3.11692e-07 4.0505e-07 7.5205e-07 7.52051e-07 4.05051e-07 3.11692e-07 2.78077e-07 2.41822e-07 1.92567e-07 1.38927e-07 9.07579e-08
- 5.36203e-08 2.85885e-08 1.35945e-08 5.92503e-09 2.29792e-09 7.81094e-10 2.27485e-10 5.50907e-11 1.04802e-11 1.38923e-12 9.95874e-14 1.78472e-15
- 7.13888e-16 6.67485e-14 9.77313e-13 7.49047e-12 3.98075e-11 1.6642e-10 5.80539e-10 1.74216e-09 4.6124e-09 1.08839e-08 2.34689e-08 4.52231e-08
- 8.03469e-08 1.28142e-07 1.81726e-07 2.29233e-07 2.57582e-07 2.78519e-07 3.62534e-07 7.44428e-07 7.44429e-07 3.62534e-07 2.78519e-07 2.57582e-07
- 2.29233e-07 1.81726e-07 1.28143e-07 8.0347e-08 4.52232e-08 2.34689e-08 1.08839e-08 4.61241e-09 1.74217e-09 5.80541e-10 1.66421e-10 3.98082e-11
- 7.49047e-12 9.7767e-13 6.71055e-14 7.13888e-16 3.56944e-16 4.42611e-14 6.71055e-13 5.20103e-12 2.78413e-11 1.17476e-10 4.15387e-10 1.26967e-09
- 3.44591e-09 8.35569e-09 1.84711e-08 3.6807e-08 6.71514e-08 1.09885e-07 1.67263e-07 2.14142e-07 2.35402e-07 2.4375e-07 3.16211e-07 7.34836e-07
- 7.34837e-07 3.16212e-07 2.4375e-07 2.35402e-07 2.14143e-07 1.67263e-07 1.09885e-07 6.71515e-08 3.68071e-08 1.84711e-08 8.35571e-09 3.44592e-09
- 1.26968e-09 4.15388e-10 1.17477e-10 2.78416e-11 5.20103e-12 6.71412e-13 4.42611e-14 3.56944e-16 3.56944e-16 2.85555e-14 4.47608e-13 3.49591e-12
- 1.87778e-11 7.97217e-11 2.85079e-10 8.86262e-10 2.46249e-09 6.13458e-09 1.39164e-08 2.8623e-08 5.35596e-08 9.08626e-08 1.39992e-07 1.93971e-07
- 2.11354e-07 2.08678e-07 2.67433e-07 7.23948e-07 7.23949e-07 2.67433e-07 2.08678e-07 2.11354e-07 1.93971e-07 1.39992e-07 9.08628e-08 5.35597e-08
- 2.86231e-08 1.39164e-08 6.1346e-09 2.4625e-09 8.86265e-10 2.85081e-10 7.9722e-11 1.87778e-11 3.49591e-12 4.47608e-13 2.81986e-14 3.56944e-16
- 3.56944e-16 1.74903e-14 2.88768e-13 2.26267e-12 1.21497e-11 5.17412e-11 1.86687e-10 5.89421e-10 1.67452e-09 4.28595e-09 9.99322e-09 2.12165e-08
- 4.08096e-08 7.12393e-08 1.117e-07 1.62878e-07 1.84229e-07 1.74571e-07 2.1792e-07 7.1233e-07 7.12332e-07 2.1792e-07 1.74571e-07 1.84229e-07
- 1.62878e-07 1.117e-07 7.12394e-08 4.08096e-08 2.12165e-08 9.99324e-09 4.28596e-09 1.67452e-09 5.89423e-10 1.86688e-10 5.17415e-11 1.215e-11
- 2.26303e-12 2.88768e-13 1.78472e-14 3.56944e-16 0 1.07083e-14 1.78829e-13 1.40065e-12 7.48869e-12 3.18905e-11 1.15837e-10 3.70887e-10
- 1.07616e-09 2.8301e-09 6.79283e-09 1.48995e-08 2.95741e-08 5.31708e-08 8.51149e-08 1.19305e-07 1.52113e-07 1.42528e-07 1.70062e-07 7.0043e-07
- 7.00431e-07 1.70063e-07 1.42528e-07 1.52113e-07 1.19305e-07 8.5115e-08 5.31708e-08 2.95741e-08 1.48995e-08 6.79284e-09 2.83011e-09 1.07616e-09
- 3.70889e-10 1.15838e-10 3.18908e-11 7.48869e-12 1.40101e-12 1.79186e-13 1.03514e-14 0 -1.78472e-16 5.71111e-15 1.05299e-13 8.20971e-13
- 4.35472e-12 1.84872e-11 6.74531e-11 2.18716e-10 6.47582e-10 1.75021e-09 4.33219e-09 9.83368e-09 2.02152e-08 3.75363e-08 6.19172e-08 8.8024e-08
- 1.1764e-07 1.12974e-07 1.2741e-07 6.88567e-07 6.88569e-07 1.2741e-07 1.12974e-07 1.1764e-07 8.8024e-08 6.19172e-08 3.75364e-08 2.02152e-08
- 9.8337e-09 4.3322e-09 1.75021e-09 6.47584e-10 2.18717e-10 6.74535e-11 1.84872e-11 4.35472e-12 8.20971e-13 1.05299e-13 6.06805e-15 -1.78472e-16
- 0 3.2125e-15 5.81819e-14 4.4975e-13 2.3569e-12 9.94625e-12 3.63747e-11 1.19291e-10 3.60192e-10 1.00099e-09 2.56077e-09 6.03165e-09
- 1.28967e-08 2.48511e-08 4.24379e-08 6.22936e-08 8.60269e-08 8.54848e-08 9.55446e-08 6.76937e-07 6.76938e-07 9.55447e-08 8.54848e-08 8.60269e-08
- 6.22937e-08 4.24379e-08 2.48511e-08 1.28967e-08 6.03166e-09 2.56078e-09 1.00099e-09 3.60193e-10 1.19292e-10 3.63747e-11 9.9466e-12 2.3569e-12
- 4.4975e-13 5.81819e-14 3.56944e-15 0 0 1.42778e-15 2.96264e-14 2.25589e-13 1.16471e-12 4.87229e-12 1.78229e-11 5.90514e-11
- 1.81783e-10 5.19978e-10 1.37873e-09 3.38292e-09 7.56388e-09 1.52249e-08 2.70987e-08 4.13017e-08 5.58759e-08 6.00175e-08 7.95163e-08 6.67676e-07
- 6.67677e-07 7.95164e-08 6.00175e-08 5.5876e-08 4.13017e-08 2.70988e-08 1.52249e-08 7.56389e-09 3.38293e-09 1.37873e-09 5.19979e-10 1.81783e-10
- 5.90514e-11 1.78229e-11 4.87229e-12 1.16471e-12 2.25589e-13 2.96264e-14 1.42778e-15 0 0 7.13888e-16 1.35639e-14 1.00658e-13
- 5.10787e-13 2.11204e-12 7.71392e-12 2.57981e-11 8.09892e-11 2.38866e-10 6.58999e-10 1.69386e-09 3.98911e-09 8.46183e-09 1.58407e-08 2.52863e-08
- 3.26872e-08 3.8475e-08 7.00523e-08 6.73055e-07 6.73056e-07 7.00524e-08 3.84749e-08 3.26872e-08 2.52863e-08 1.58407e-08 8.46184e-09 3.98912e-09
- 1.69386e-09 6.59001e-10 2.38866e-10 8.09895e-11 2.57985e-11 7.71392e-12 2.1124e-12 5.10787e-13 1.00658e-13 1.35639e-14 7.13888e-16 0
- 0 3.56944e-16 5.35416e-15 3.8193e-14 1.90251e-13 7.75283e-13 2.82236e-12 9.52577e-12 3.05301e-11 9.31242e-11 2.68856e-10 7.30017e-10
- 1.83029e-09 4.14391e-09 8.26623e-09 1.39931e-08 1.90602e-08 2.30618e-08 6.9281e-08 7.04726e-07 7.04727e-07 6.92811e-08 2.30618e-08 1.90602e-08
- 1.39931e-08 8.26623e-09 4.14392e-09 1.83029e-09 7.30019e-10 2.68856e-10 9.31246e-11 3.05301e-11 9.52577e-12 2.82236e-12 7.75283e-13 1.90251e-13
- 3.855e-14 5.35416e-15 3.56944e-16 0 0 0 1.42778e-15 1.14222e-14 5.56833e-14 2.23447e-13 8.11691e-13 2.7681e-12
- 9.08387e-12 2.8814e-11 8.78604e-11 2.5546e-10 6.93969e-10 1.71233e-09 3.719e-09 6.80731e-09 9.92074e-09 1.21085e-08 9.00795e-08 7.90743e-07
- 7.90744e-07 9.00797e-08 1.21085e-08 9.92075e-09 6.80731e-09 3.71901e-09 1.71233e-09 6.9397e-10 2.5546e-10 8.78611e-11 2.88143e-11 9.08387e-12
- 2.76774e-12 8.11691e-13 2.23447e-13 5.56833e-14 1.14222e-14 1.42778e-15 0 0 0 0 3.56944e-16 2.14166e-15
- 1.10653e-14 4.39041e-14 1.60268e-13 5.55405e-13 1.8811e-12 6.27758e-12 2.05639e-11 6.5626e-11 1.99703e-10 5.59377e-10 1.38181e-09 2.84097e-09
- 4.57629e-09 5.82246e-09 2.05189e-07 1.02251e-06 1.02252e-06 2.05189e-07 5.82246e-09 4.57629e-09 2.84097e-09 1.38181e-09 5.59378e-10 1.99703e-10
- 6.56263e-11 2.05639e-11 6.27758e-12 1.8811e-12 5.55048e-13 1.60268e-13 4.39041e-14 1.10653e-14 2.14166e-15 3.56944e-16 0 0
- 0 0 0 0 1.07083e-15 3.92638e-15 1.57055e-14 5.63972e-14 2.03815e-13 7.40659e-13 2.72884e-12 1.0179e-11
- 3.78743e-11 1.35015e-10 4.32188e-10 1.19785e-09 4.7088e-07 8.77765e-07 1.31628e-06 1.87639e-06 1.87639e-06 1.31628e-06 8.77765e-07 4.7088e-07
- 1.19785e-09 4.32189e-10 1.35015e-10 3.78746e-11 1.01786e-11 2.72848e-12 7.40302e-13 2.03458e-13 5.63972e-14 1.57055e-14 3.92638e-15 1.07083e-15
- 0 0 0 0
+ 1.24015e-07 1.69299e-07 1.96682e-07 2.19778e-07 2.42414e-07 2.65807e-07 2.87701e-07 3.10383e-07 3.3479e-07 3.60582e-07 3.86219e-07 4.10964e-07
+ 4.34087e-07 4.55018e-07 4.73493e-07 4.8961e-07 5.03823e-07 5.16297e-07 5.27926e-07 5.41081e-07 5.41504e-07 5.28249e-07 5.1658e-07 5.04085e-07
+ 4.89853e-07 4.73719e-07 4.55229e-07 4.34283e-07 4.11145e-07 3.86384e-07 3.60733e-07 3.34927e-07 3.10506e-07 2.87813e-07 2.65909e-07 2.42508e-07
+ 2.19862e-07 1.96757e-07 1.69365e-07 1.24068e-07 1.97397e-07 2.9419e-07 3.59162e-07 3.97928e-07 4.19696e-07 4.33269e-07 4.45004e-07 4.55631e-07
+ 4.6536e-07 4.74468e-07 4.83419e-07 4.92035e-07 5.0007e-07 5.07271e-07 5.13441e-07 5.18485e-07 5.22447e-07 5.27837e-07 5.38727e-07 5.59399e-07
+ 5.59843e-07 5.39017e-07 5.28067e-07 5.22651e-07 5.18682e-07 5.1363e-07 5.07453e-07 5.00244e-07 4.92201e-07 4.83576e-07 4.74616e-07 4.65499e-07
+ 4.55762e-07 4.45127e-07 4.33384e-07 4.19804e-07 3.98031e-07 3.59257e-07 2.94271e-07 1.97455e-07 2.2036e-07 3.2788e-07 3.89193e-07 4.19899e-07
+ 4.36703e-07 4.48042e-07 4.56919e-07 4.64425e-07 4.71023e-07 4.76882e-07 4.82029e-07 4.86399e-07 4.89909e-07 4.92529e-07 4.94392e-07 4.95913e-07
+ 4.97956e-07 5.05536e-07 5.2451e-07 5.62849e-07 5.63315e-07 5.2477e-07 5.05713e-07 4.98098e-07 4.96047e-07 4.94523e-07 4.92658e-07 4.90035e-07
+ 4.86522e-07 4.82147e-07 4.76995e-07 4.7113e-07 4.64527e-07 4.57015e-07 4.48132e-07 4.36789e-07 4.19981e-07 3.89274e-07 3.27953e-07 2.20414e-07
+ 2.25266e-07 3.35927e-07 3.91248e-07 4.14896e-07 4.26831e-07 4.3506e-07 4.41822e-07 4.47649e-07 4.52607e-07 4.56622e-07 4.59579e-07 4.61366e-07
+ 4.6195e-07 4.61474e-07 4.60419e-07 4.59816e-07 4.61549e-07 4.72919e-07 5.0283e-07 5.64544e-07 5.65025e-07 5.03059e-07 4.73046e-07 4.61634e-07
+ 4.5989e-07 4.60491e-07 4.61548e-07 4.62026e-07 4.61443e-07 4.59655e-07 4.56697e-07 4.52679e-07 4.47719e-07 4.41888e-07 4.35123e-07 4.26893e-07
+ 4.14959e-07 3.91313e-07 3.35991e-07 2.25314e-07 2.22046e-07 3.34466e-07 3.85402e-07 4.03901e-07 4.1163e-07 4.16598e-07 4.20841e-07 4.24617e-07
+ 4.27705e-07 4.29781e-07 4.30539e-07 4.29754e-07 4.27379e-07 4.23697e-07 4.19562e-07 4.16759e-07 4.18514e-07 4.34134e-07 4.76364e-07 5.65686e-07
+ 5.66176e-07 4.76564e-07 4.34221e-07 4.18553e-07 4.16783e-07 4.19585e-07 4.23724e-07 4.27412e-07 4.29792e-07 4.30581e-07 4.29825e-07 4.27749e-07
+ 4.24661e-07 4.20884e-07 4.16641e-07 4.11674e-07 4.0395e-07 3.85456e-07 3.34522e-07 2.22087e-07 2.14709e-07 3.2883e-07 3.77112e-07 3.92093e-07
+ 3.96442e-07 3.98376e-07 3.99979e-07 4.01423e-07 4.02315e-07 4.02133e-07 4.00386e-07 3.96714e-07 3.9103e-07 3.83733e-07 3.76071e-07 3.70683e-07
+ 3.72363e-07 3.92049e-07 4.46754e-07 5.66566e-07 5.67065e-07 4.4693e-07 3.92111e-07 3.72372e-07 3.70672e-07 3.76059e-07 3.83725e-07 3.9103e-07
+ 3.96723e-07 4.00401e-07 4.02153e-07 4.02338e-07 4.01448e-07 4.00007e-07 3.98406e-07 3.96475e-07 3.92132e-07 3.77158e-07 3.28879e-07 2.14744e-07
+ 2.05173e-07 3.21122e-07 3.68073e-07 3.80829e-07 3.82661e-07 3.82054e-07 3.81224e-07 3.80343e-07 3.78924e-07 3.76304e-07 3.71843e-07 3.65061e-07
+ 3.55825e-07 3.44643e-07 3.33144e-07 3.2483e-07 3.26132e-07 3.49251e-07 4.15446e-07 5.67298e-07 5.67803e-07 4.15608e-07 3.49303e-07 3.26131e-07
+ 3.24805e-07 3.33113e-07 3.44615e-07 3.55805e-07 3.65049e-07 3.7184e-07 3.76308e-07 3.78933e-07 3.80357e-07 3.81242e-07 3.82075e-07 3.82687e-07
+ 3.80862e-07 3.68114e-07 3.21166e-07 2.05203e-07 1.94465e-07 3.12302e-07 3.58822e-07 3.70316e-07 3.704e-07 3.67821e-07 3.64942e-07 3.61957e-07
+ 3.58325e-07 3.53288e-07 3.461e-07 3.36196e-07 3.23423e-07 3.08394e-07 2.93088e-07 2.81787e-07 2.82415e-07 3.08047e-07 3.83765e-07 5.67937e-07
+ 5.68448e-07 3.83926e-07 3.08111e-07 2.82426e-07 2.81766e-07 2.93054e-07 3.08358e-07 3.23392e-07 3.36174e-07 3.46086e-07 3.53283e-07 3.58327e-07
+ 3.61964e-07 3.64954e-07 3.67837e-07 3.70421e-07 3.70344e-07 3.58858e-07 3.12342e-07 1.94492e-07 1.83696e-07 3.02517e-07 3.49522e-07 3.60426e-07
+ 3.5938e-07 3.55354e-07 3.50844e-07 3.46063e-07 3.40433e-07 3.33135e-07 3.23365e-07 3.10526e-07 2.94483e-07 2.75979e-07 2.57307e-07 2.43373e-07
+ 2.43242e-07 2.70324e-07 3.52879e-07 5.68514e-07 5.6903e-07 3.53059e-07 2.70417e-07 2.43282e-07 2.43372e-07 2.57283e-07 2.75945e-07 2.9445e-07
+ 3.10499e-07 3.23346e-07 3.33124e-07 3.40429e-07 3.46066e-07 3.50852e-07 3.55366e-07 3.59397e-07 3.6045e-07 3.49555e-07 3.02553e-07 1.8372e-07
+ 1.73198e-07 2.92526e-07 3.3986e-07 3.50981e-07 3.49258e-07 3.44214e-07 3.38444e-07 3.32168e-07 3.24777e-07 3.15427e-07 3.03307e-07 2.87844e-07
+ 2.68986e-07 2.47644e-07 2.26405e-07 2.10614e-07 2.09942e-07 2.37384e-07 3.23737e-07 5.69048e-07 5.69568e-07 3.23956e-07 2.37516e-07 2.10018e-07
+ 2.10641e-07 2.26399e-07 2.47619e-07 2.68956e-07 2.87816e-07 3.03285e-07 3.15413e-07 3.24771e-07 3.32168e-07 3.3845e-07 3.44224e-07 3.49273e-07
+ 3.51002e-07 3.39889e-07 2.92558e-07 1.73219e-07 1.62976e-07 2.82552e-07 3.30225e-07 3.41739e-07 3.39752e-07 3.34011e-07 3.27272e-07 3.19744e-07
+ 3.10799e-07 2.99602e-07 2.85389e-07 2.6768e-07 2.46568e-07 2.23185e-07 2.00403e-07 1.83814e-07 1.83067e-07 2.09862e-07 2.9702e-07 5.69552e-07
+ 5.70076e-07 2.97292e-07 2.10034e-07 1.83177e-07 1.83868e-07 2.00416e-07 2.23173e-07 2.46544e-07 2.67654e-07 2.85367e-07 2.99587e-07 3.10791e-07
+ 3.19742e-07 3.27276e-07 3.34019e-07 3.39764e-07 3.41758e-07 3.30252e-07 2.82582e-07 1.62995e-07 1.53055e-07 2.72731e-07 3.20774e-07 3.32715e-07
+ 3.30665e-07 3.2445e-07 3.16948e-07 3.08341e-07 2.97999e-07 2.85136e-07 2.69092e-07 2.49537e-07 2.26778e-07 2.0221e-07 1.78974e-07 1.62718e-07
+ 1.6244e-07 1.8776e-07 2.73112e-07 5.70034e-07 5.70563e-07 2.73449e-07 1.87965e-07 1.62572e-07 1.62793e-07 1.79005e-07 2.02211e-07 2.26762e-07
+ 2.49516e-07 2.69072e-07 2.85121e-07 2.97989e-07 3.08338e-07 3.1695e-07 3.24456e-07 3.30676e-07 3.32732e-07 3.20799e-07 2.72759e-07 1.53072e-07
+ 1.43467e-07 2.63167e-07 3.11615e-07 3.2394e-07 3.21883e-07 3.15335e-07 3.07199e-07 2.97621e-07 2.85994e-07 2.71627e-07 2.54012e-07 2.33026e-07
+ 2.0923e-07 1.84312e-07 1.61639e-07 1.46712e-07 1.47331e-07 1.70602e-07 2.5213e-07 5.70501e-07 5.71033e-07 2.52532e-07 1.70827e-07 1.4747e-07
+ 1.46797e-07 1.61682e-07 1.84325e-07 2.09224e-07 2.33011e-07 2.53995e-07 2.71613e-07 2.85984e-07 2.97616e-07 3.072e-07 3.1534e-07 3.21892e-07
+ 3.23956e-07 3.11639e-07 2.63193e-07 1.43483e-07 1.34249e-07 2.53936e-07 3.02822e-07 3.15449e-07 3.13351e-07 3.06548e-07 2.97846e-07 2.87357e-07
+ 2.74533e-07 2.58819e-07 2.399e-07 2.17899e-07 1.93658e-07 1.69147e-07 1.47885e-07 1.3501e-07 1.36718e-07 1.57641e-07 2.33967e-07 5.70957e-07
+ 5.71493e-07 2.34427e-07 1.57871e-07 1.36852e-07 1.35097e-07 1.47936e-07 1.6917e-07 1.93661e-07 2.17891e-07 2.39888e-07 2.58807e-07 2.74525e-07
+ 2.87353e-07 2.97846e-07 3.06551e-07 3.13358e-07 3.15463e-07 3.02844e-07 2.53961e-07 1.34262e-07 1.25428e-07 2.45095e-07 2.94497e-07 3.07194e-07
+ 3.05054e-07 2.98028e-07 2.88786e-07 2.77424e-07 2.63486e-07 2.46591e-07 2.26648e-07 2.04044e-07 1.79906e-07 1.56448e-07 1.37224e-07 1.26799e-07
+ 1.29544e-07 1.48056e-07 2.18367e-07 5.71405e-07 5.71944e-07 2.18873e-07 1.48277e-07 1.29663e-07 1.26878e-07 1.37277e-07 1.56478e-07 1.79918e-07
+ 2.04044e-07 2.26642e-07 2.46582e-07 2.63479e-07 2.7742e-07 2.88786e-07 2.98031e-07 3.05061e-07 3.07207e-07 2.94519e-07 2.45119e-07 1.25441e-07
+ 1.17031e-07 2.36786e-07 2.86553e-07 2.99179e-07 2.96999e-07 2.89755e-07 2.79979e-07 2.67778e-07 2.52822e-07 2.3493e-07 2.14254e-07 1.91444e-07
+ 1.6789e-07 1.45979e-07 1.29147e-07 1.21159e-07 1.24876e-07 1.41087e-07 2.05002e-07 5.71847e-07 5.7239e-07 2.05538e-07 1.4129e-07 1.24977e-07
+ 1.21217e-07 1.29193e-07 1.46011e-07 1.67908e-07 1.91451e-07 2.14253e-07 2.34926e-07 2.52817e-07 2.67774e-07 2.79979e-07 2.89758e-07 2.97005e-07
+ 2.99191e-07 2.86573e-07 2.3681e-07 1.17042e-07 1.09151e-07 2.29025e-07 2.78898e-07 2.91427e-07 2.89199e-07 2.81731e-07 2.71427e-07 2.58436e-07
+ 2.42583e-07 2.239e-07 2.02782e-07 1.80134e-07 1.57566e-07 1.37563e-07 1.23338e-07 1.17807e-07 1.21981e-07 1.36101e-07 1.93528e-07 5.72285e-07
+ 5.72831e-07 1.94077e-07 1.3628e-07 1.22063e-07 1.17865e-07 1.23381e-07 1.37596e-07 1.57589e-07 1.80146e-07 2.02787e-07 2.239e-07 2.42581e-07
+ 2.58434e-07 2.71427e-07 2.81733e-07 2.89204e-07 2.91437e-07 2.78916e-07 2.29048e-07 1.09161e-07 1.01917e-07 2.21668e-07 2.71536e-07 2.83951e-07
+ 2.81672e-07 2.73977e-07 2.63167e-07 2.49462e-07 2.32859e-07 2.13605e-07 1.92328e-07 1.70162e-07 1.48894e-07 1.31024e-07 1.19437e-07 1.16129e-07
+ 1.20318e-07 1.32603e-07 1.83629e-07 5.7272e-07 5.73269e-07 1.84172e-07 1.32755e-07 1.20382e-07 1.16172e-07 1.19474e-07 1.31056e-07 1.48919e-07
+ 1.70179e-07 1.92338e-07 2.13609e-07 2.3286e-07 2.49462e-07 2.63168e-07 2.73979e-07 2.81677e-07 2.83961e-07 2.71554e-07 2.2169e-07 1.01928e-07
+ 9.52763e-08 2.14682e-07 2.64459e-07 2.76759e-07 2.74433e-07 2.66525e-07 2.55259e-07 2.40948e-07 2.23765e-07 2.04163e-07 1.82985e-07 1.61563e-07
+ 1.41804e-07 1.26138e-07 1.16993e-07 1.15382e-07 1.195e-07 1.30226e-07 1.75033e-07 5.73152e-07 5.73705e-07 1.75556e-07 1.30351e-07 1.19549e-07
+ 1.15414e-07 1.17023e-07 1.26166e-07 1.41829e-07 1.61582e-07 1.82998e-07 2.0417e-07 2.23769e-07 2.4095e-07 2.55261e-07 2.66528e-07 2.74438e-07
+ 2.76768e-07 2.64475e-07 2.14703e-07 9.52865e-08 8.9166e-08 2.08023e-07 2.57643e-07 2.69846e-07 2.67496e-07 2.59414e-07 2.47776e-07 2.32997e-07
+ 2.15418e-07 1.95682e-07 1.74824e-07 1.54336e-07 1.3619e-07 1.22659e-07 1.1563e-07 1.15224e-07 1.19261e-07 1.28699e-07 1.67527e-07 5.73584e-07
+ 5.7414e-07 1.68016e-07 1.28798e-07 1.19298e-07 1.15248e-07 1.15653e-07 1.22683e-07 1.36214e-07 1.54356e-07 1.74839e-07 1.95693e-07 2.15424e-07
+ 2.33e-07 2.47778e-07 2.59417e-07 2.67501e-07 2.69854e-07 2.57659e-07 2.08043e-07 8.91757e-08 8.35169e-08 2.01637e-07 2.51059e-07 2.632e-07
+ 2.60872e-07 2.52685e-07 2.4079e-07 2.25705e-07 2.07924e-07 1.88251e-07 1.67884e-07 1.48443e-07 1.31913e-07 1.20342e-07 1.15042e-07 1.15413e-07
+ 1.19416e-07 1.27827e-07 1.60956e-07 5.74014e-07 5.74574e-07 1.614e-07 1.27903e-07 1.19444e-07 1.15431e-07 1.15059e-07 1.20363e-07 1.31935e-07
+ 1.48464e-07 1.67901e-07 1.88263e-07 2.07932e-07 2.2571e-07 2.40793e-07 2.52688e-07 2.60876e-07 2.63208e-07 2.51073e-07 2.01656e-07 8.35262e-08
+ 7.82498e-08 1.95458e-07 2.44666e-07 2.56804e-07 2.54566e-07 2.46376e-07 2.3437e-07 2.19162e-07 2.01366e-07 1.81925e-07 1.6217e-07 1.43814e-07
+ 1.28816e-07 1.18959e-07 1.14981e-07 1.15786e-07 1.19838e-07 1.27465e-07 1.55221e-07 5.74444e-07 5.75006e-07 1.55612e-07 1.27522e-07 1.1986e-07
+ 1.158e-07 1.14995e-07 1.18976e-07 1.28836e-07 1.43835e-07 1.62188e-07 1.81939e-07 2.01376e-07 2.19167e-07 2.34374e-07 2.46379e-07 2.54571e-07
+ 2.56811e-07 2.4468e-07 1.95477e-07 7.82586e-08 7.3271e-08 1.89415e-07 2.38419e-07 2.50633e-07 2.48579e-07 2.40513e-07 2.28569e-07 2.13431e-07
+ 1.95805e-07 1.76736e-07 1.57659e-07 1.40356e-07 1.26738e-07 1.18309e-07 1.15267e-07 1.16243e-07 1.20443e-07 1.27508e-07 1.50278e-07 5.74873e-07
+ 5.75439e-07 1.50611e-07 1.27548e-07 1.20461e-07 1.16255e-07 1.15278e-07 1.18323e-07 1.26756e-07 1.40375e-07 1.57678e-07 1.76751e-07 1.95816e-07
+ 2.13438e-07 2.28574e-07 2.40517e-07 2.48583e-07 2.5064e-07 2.38432e-07 1.89432e-07 7.32793e-08 6.8508e-08 1.83405e-07 2.32261e-07 2.44653e-07
+ 2.429e-07 2.35114e-07 2.23424e-07 2.08559e-07 1.91277e-07 1.72689e-07 1.54306e-07 1.3796e-07 1.25525e-07 1.18236e-07 1.15778e-07 1.16739e-07
+ 1.21179e-07 1.27871e-07 1.46144e-07 5.75302e-07 5.75872e-07 1.46415e-07 1.27899e-07 1.21194e-07 1.16749e-07 1.15787e-07 1.18248e-07 1.25541e-07
+ 1.37978e-07 1.54324e-07 1.72704e-07 1.91288e-07 2.08566e-07 2.23429e-07 2.35118e-07 2.42904e-07 2.4466e-07 2.32274e-07 1.83422e-07 6.85158e-08
+ 6.38853e-08 1.77341e-07 2.26111e-07 2.38814e-07 2.37504e-07 2.30174e-07 2.18949e-07 2.04566e-07 1.87796e-07 1.69776e-07 1.52059e-07 1.36517e-07
+ 1.25019e-07 1.1862e-07 1.16454e-07 1.17289e-07 1.22021e-07 1.28488e-07 1.42899e-07 5.75732e-07 5.76305e-07 1.43105e-07 1.28507e-07 1.22035e-07
+ 1.17299e-07 1.16462e-07 1.1863e-07 1.25034e-07 1.36534e-07 1.52076e-07 1.69791e-07 1.87808e-07 2.04574e-07 2.18954e-07 2.30178e-07 2.37508e-07
+ 2.3882e-07 2.26123e-07 1.77357e-07 6.38925e-08 5.93123e-08 1.71124e-07 2.19877e-07 2.33038e-07 2.3233e-07 2.25648e-07 2.15112e-07 2.01436e-07
+ 1.8536e-07 1.67996e-07 1.509e-07 1.35967e-07 1.25098e-07 1.19289e-07 1.17264e-07 1.17992e-07 1.2297e-07 1.29301e-07 1.40695e-07 5.76163e-07
+ 5.76739e-07 1.40837e-07 1.29315e-07 1.22983e-07 1.18001e-07 1.1727e-07 1.19298e-07 1.25111e-07 1.35983e-07 1.50917e-07 1.6801e-07 1.85371e-07
+ 2.01444e-07 2.15117e-07 2.25652e-07 2.32335e-07 2.33044e-07 2.19888e-07 1.71139e-07 5.9319e-08 5.46751e-08 1.6463e-07 2.13445e-07 2.2723e-07
+ 2.27278e-07 2.21368e-07 2.11677e-07 1.98898e-07 1.83721e-07 1.67205e-07 1.50856e-07 1.36517e-07 1.26062e-07 1.2046e-07 1.18438e-07 1.19053e-07
+ 1.24055e-07 1.30266e-07 1.39762e-07 5.76595e-07 5.77175e-07 1.39843e-07 1.30277e-07 1.24068e-07 1.19062e-07 1.18444e-07 1.20469e-07 1.26075e-07
+ 1.36533e-07 1.50872e-07 1.67219e-07 1.83731e-07 1.98905e-07 2.11682e-07 2.21371e-07 2.27282e-07 2.27236e-07 2.13455e-07 1.64645e-07 5.46813e-08
+ 5.03257e-08 1.57718e-07 2.06541e-07 2.21105e-07 2.22067e-07 2.17133e-07 2.08506e-07 1.96867e-07 1.82837e-07 1.67384e-07 1.51917e-07 1.38186e-07
+ 1.27988e-07 1.22267e-07 1.19979e-07 1.20568e-07 1.25369e-07 1.31368e-07 1.40417e-07 5.77031e-07 5.77613e-07 1.40439e-07 1.31379e-07 1.25382e-07
+ 1.20577e-07 1.19985e-07 1.22276e-07 1.28001e-07 1.38201e-07 1.51932e-07 1.67397e-07 1.82847e-07 1.96874e-07 2.08511e-07 2.17136e-07 2.22071e-07
+ 2.21111e-07 2.06552e-07 1.57732e-07 5.03313e-08 4.62672e-08 1.5036e-07 1.9889e-07 2.14415e-07 2.16535e-07 2.128e-07 2.05468e-07 1.9522e-07
+ 1.82595e-07 1.68435e-07 1.54013e-07 1.40942e-07 1.30906e-07 1.24849e-07 1.22126e-07 1.22478e-07 1.26992e-07 1.32614e-07 1.41336e-07 5.78659e-07
+ 5.79211e-07 1.41358e-07 1.32624e-07 1.27004e-07 1.22487e-07 1.22134e-07 1.24858e-07 1.30919e-07 1.40957e-07 1.54027e-07 1.68447e-07 1.82604e-07
+ 1.95226e-07 2.05472e-07 2.12803e-07 2.16539e-07 2.1442e-07 1.989e-07 1.50373e-07 4.62722e-08 4.24455e-08 1.424e-07 1.90265e-07 2.06904e-07
+ 2.10437e-07 2.08143e-07 2.02345e-07 1.93745e-07 1.82793e-07 1.70182e-07 1.5701e-07 1.44719e-07 1.34851e-07 1.28388e-07 1.25156e-07 1.25025e-07
+ 1.29042e-07 1.34045e-07 1.42368e-07 5.81914e-07 5.8244e-07 1.42389e-07 1.34055e-07 1.29054e-07 1.25035e-07 1.25165e-07 1.28398e-07 1.34864e-07
+ 1.44732e-07 1.57023e-07 1.70193e-07 1.828e-07 1.9375e-07 2.02349e-07 2.08147e-07 2.10441e-07 2.0691e-07 1.90274e-07 1.42412e-07 4.245e-08
+ 3.88076e-08 1.33676e-07 1.80404e-07 1.98233e-07 2.03414e-07 2.02811e-07 1.98791e-07 1.92094e-07 1.83092e-07 1.72316e-07 1.60655e-07 1.4935e-07
+ 1.39788e-07 1.32996e-07 1.29228e-07 1.28402e-07 1.31645e-07 1.35699e-07 1.43541e-07 5.87275e-07 5.87779e-07 1.43562e-07 1.35708e-07 1.31657e-07
+ 1.28413e-07 1.29239e-07 1.33007e-07 1.39801e-07 1.49363e-07 1.60667e-07 1.72325e-07 1.83099e-07 1.92099e-07 1.98795e-07 2.02814e-07 2.03418e-07
+ 1.98239e-07 1.80413e-07 1.33687e-07 3.88117e-08 3.52994e-08 1.24017e-07 1.69022e-07 1.87963e-07 1.9495e-07 1.96265e-07 1.94261e-07 1.89718e-07
+ 1.82946e-07 1.74315e-07 1.64492e-07 1.54486e-07 1.45507e-07 1.38603e-07 1.34365e-07 1.32736e-07 1.34901e-07 1.37584e-07 1.44893e-07 5.95437e-07
+ 5.95922e-07 1.44914e-07 1.37592e-07 1.34912e-07 1.32747e-07 1.34376e-07 1.38614e-07 1.45518e-07 1.54497e-07 1.64502e-07 1.74322e-07 1.82952e-07
+ 1.89722e-07 1.94265e-07 1.96269e-07 1.94955e-07 1.87969e-07 1.69031e-07 1.24027e-07 3.53031e-08 3.18618e-08 1.13265e-07 1.55822e-07 1.75569e-07
+ 1.84358e-07 1.8773e-07 1.87933e-07 1.85766e-07 1.81494e-07 1.75338e-07 1.6774e-07 1.59452e-07 1.51477e-07 1.44826e-07 1.40293e-07 1.3839e-07
+ 1.38837e-07 1.39634e-07 1.46474e-07 6.07433e-07 6.07901e-07 1.46496e-07 1.3964e-07 1.38847e-07 1.38399e-07 1.40303e-07 1.44836e-07 1.51487e-07
+ 1.59461e-07 1.67748e-07 1.75344e-07 1.81498e-07 1.85769e-07 1.87936e-07 1.87733e-07 1.84363e-07 1.75576e-07 1.55831e-07 1.13274e-07 3.18651e-08
+ 2.84269e-08 1.01288e-07 1.40541e-07 1.60498e-07 1.7081e-07 1.76178e-07 1.7865e-07 1.78998e-07 1.77446e-07 1.74084e-07 1.69131e-07 1.63073e-07
+ 1.56662e-07 1.50787e-07 1.46298e-07 1.43918e-07 1.42851e-07 1.41599e-07 1.48374e-07 6.24874e-07 6.25325e-07 1.48397e-07 1.41605e-07 1.42859e-07
+ 1.43927e-07 1.46307e-07 1.50796e-07 1.5667e-07 1.63081e-07 1.69137e-07 1.74088e-07 1.7745e-07 1.79002e-07 1.78654e-07 1.76182e-07 1.70815e-07
+ 1.60504e-07 1.40549e-07 1.01296e-07 2.84298e-08 2.49112e-08 8.80116e-08 1.22995e-07 1.42266e-07 1.53464e-07 1.60443e-07 1.6498e-07 1.67779e-07
+ 1.69016e-07 1.68668e-07 1.66752e-07 1.63474e-07 1.59297e-07 1.54888e-07 1.51004e-07 1.4833e-07 1.4625e-07 1.43016e-07 1.50801e-07 6.50476e-07
+ 6.50914e-07 1.50826e-07 1.4302e-07 1.46256e-07 1.48337e-07 1.51012e-07 1.54895e-07 1.59303e-07 1.6348e-07 1.66756e-07 1.68672e-07 1.69019e-07
+ 1.67783e-07 1.64984e-07 1.60448e-07 1.53469e-07 1.42272e-07 1.23002e-07 8.80185e-08 2.49137e-08 2.12063e-08 7.34382e-08 1.03154e-07 1.20616e-07
+ 1.31712e-07 1.39508e-07 1.45501e-07 1.50312e-07 1.54078e-07 1.56695e-07 1.58009e-07 1.57964e-07 1.56701e-07 1.54577e-07 1.52105e-07 1.49793e-07
+ 1.47636e-07 1.42905e-07 1.54386e-07 6.89335e-07 6.89759e-07 1.54416e-07 1.42908e-07 1.47641e-07 1.49798e-07 1.52111e-07 1.54582e-07 1.56706e-07
+ 1.57968e-07 1.58012e-07 1.56698e-07 1.54081e-07 1.50316e-07 1.45505e-07 1.39513e-07 1.31717e-07 1.20622e-07 1.03159e-07 7.34437e-08 2.12084e-08
+ 1.71668e-08 5.76818e-08 8.12178e-08 9.56936e-08 1.05485e-07 1.12967e-07 1.19375e-07 1.25265e-07 1.30773e-07 1.3578e-07 1.40038e-07 1.43294e-07
+ 1.45389e-07 1.46321e-07 1.46236e-07 1.45316e-07 1.43376e-07 1.3905e-07 1.6142e-07 7.52378e-07 7.5279e-07 1.6146e-07 1.39052e-07 1.43379e-07
+ 1.45319e-07 1.4624e-07 1.46325e-07 1.45393e-07 1.43297e-07 1.40041e-07 1.35783e-07 1.30777e-07 1.25268e-07 1.19379e-07 1.12971e-07 1.05489e-07
+ 9.56981e-08 8.12224e-08 5.7686e-08 1.71685e-08 1.2607e-08 4.10228e-08 5.77322e-08 6.82272e-08 7.55739e-08 8.1527e-08 8.70711e-08 9.27078e-08
+ 9.86145e-08 1.04739e-07 1.10871e-07 1.16709e-07 1.21929e-07 1.26235e-07 1.29375e-07 1.31067e-07 1.30711e-07 1.28682e-07 1.82646e-07 8.67764e-07
+ 8.68158e-07 1.82706e-07 1.28684e-07 1.30713e-07 1.3107e-07 1.29378e-07 1.26238e-07 1.21932e-07 1.16712e-07 1.10873e-07 1.04742e-07 9.86171e-08
+ 9.27105e-08 8.70738e-08 8.15299e-08 7.55769e-08 6.82303e-08 5.77353e-08 4.10256e-08 1.26083e-08 7.3987e-09 2.40888e-08 3.38271e-08 3.98166e-08
+ 4.39829e-08 4.74987e-08 5.10728e-08 5.51156e-08 5.98351e-08 6.5291e-08 7.14268e-08 7.8092e-08 8.50594e-08 9.20195e-08 9.8514e-08 1.03748e-07
+ 1.06264e-07 1.04688e-07 2.88031e-07 1.1299e-06 1.13026e-06 2.88141e-07 1.04689e-07 1.06267e-07 1.0375e-07 9.85164e-08 9.20217e-08 8.50613e-08
+ 7.80937e-08 7.14284e-08 6.52926e-08 5.98366e-08 5.51171e-08 5.10742e-08 4.75002e-08 4.39844e-08 3.98181e-08 3.38287e-08 2.40903e-08 7.39948e-09
+ 2.19681e-09 8.65984e-09 1.21452e-08 1.39368e-08 1.49958e-08 1.59445e-08 1.71715e-08 1.89192e-08 2.13473e-08 2.4574e-08 2.87042e-08 3.38547e-08
+ 4.01828e-08 4.78745e-08 5.69001e-08 6.61912e-08 5.74837e-07 1.00631e-06 1.47162e-06 2.04968e-06 2.04982e-06 1.47166e-06 1.00633e-06 5.74841e-07
+ 6.61934e-08 5.69019e-08 4.78759e-08 4.01838e-08 3.38554e-08 2.87047e-08 2.45744e-08 2.13475e-08 1.89194e-08 1.71717e-08 1.59447e-08 1.4996e-08
+ 1.39371e-08 1.21456e-08 8.66031e-09 2.19707e-09
</DataArray>
<DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
- 0 0 0 0 0 0 0 0 0 0 0 1.77636e-15
- 2.13163e-14 1.51434e-13 7.27862e-13 2.6219e-12 7.43094e-12 1.7039e-11 3.20075e-11 4.90863e-11 4.90867e-11 3.2008e-11 1.70393e-11 7.43117e-12
- 2.62212e-12 7.27862e-13 1.51434e-13 2.13163e-14 1.77636e-15 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0
- 0 4.44089e-16 3.10862e-15 2.4647e-14 1.69864e-13 8.21787e-13 3.04334e-12 9.04365e-12 2.22184e-11 4.5965e-11 8.07054e-11 1.19625e-10
- 1.19626e-10 8.07061e-11 4.5965e-11 2.22184e-11 9.04388e-12 3.04334e-12 8.21565e-13 1.69864e-13 2.4647e-14 3.10862e-15 4.44089e-16 0
- 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 8.88178e-16 5.32907e-15 3.37508e-14 1.97176e-13 1.02318e-12 4.0874e-12 1.31464e-11 3.51292e-11
- 7.97091e-11 1.55706e-10 2.63238e-10 3.82665e-10 3.82667e-10 2.6324e-10 1.55707e-10 7.971e-11 3.51297e-11 1.31466e-11 4.08718e-12 1.02318e-12
- 1.96954e-13 3.35287e-14 5.32907e-15 8.88178e-16 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 1.11022e-15 8.21565e-15 4.75175e-14 2.43583e-13 1.13798e-12
- 4.92739e-12 1.71345e-11 4.94553e-11 1.2142e-10 2.581e-10 4.80412e-10 7.86153e-10 1.12327e-09 1.12328e-09 7.86158e-10 4.80415e-10 2.58102e-10
- 1.21421e-10 4.9456e-11 1.71345e-11 4.92739e-12 1.1382e-12 2.43805e-13 4.75175e-14 8.21565e-15 1.11022e-15 0 0 0
- 0 0 0 0 0 0 0 0 0 2.22045e-16 1.9984e-15 1.22125e-14
- 6.61693e-14 3.21521e-13 1.39533e-12 5.50071e-12 1.99998e-11 6.21121e-11 1.63654e-10 3.73431e-10 7.49269e-10 1.33504e-09 2.11966e-09 2.97885e-09
- 2.97887e-09 2.11967e-09 1.33505e-09 7.49274e-10 3.73434e-10 1.63655e-10 6.21128e-11 2e-11 5.50049e-12 1.39533e-12 3.21521e-13 6.61693e-14
- 1.22125e-14 1.9984e-15 2.22045e-16 0 0 0 0 0 0 0 0 0
- 2.22045e-16 2.44249e-15 1.4877e-14 8.32667e-14 4.00346e-13 1.69487e-12 6.42242e-12 2.20721e-11 6.97145e-11 1.96368e-10 4.77367e-10 1.01973e-09
- 1.94026e-09 3.31811e-09 5.11691e-09 7.07253e-09 7.07257e-09 5.11694e-09 3.31813e-09 1.94027e-09 1.01974e-09 4.77371e-10 1.9637e-10 6.97153e-11
- 2.20723e-11 6.42242e-12 1.69487e-12 4.00346e-13 8.32667e-14 1.5099e-14 2.44249e-15 2.22045e-16 0 0 0 0
- 0 0 0 2.22045e-16 1.9984e-15 1.55431e-14 9.01501e-14 4.47198e-13 1.91736e-12 7.24709e-12 2.44995e-11 7.50302e-11
- 2.10684e-10 5.43991e-10 1.22942e-09 2.47145e-09 4.47445e-09 7.358e-09 1.10285e-08 1.49892e-08 1.49893e-08 1.10285e-08 7.35805e-09 4.47448e-09
- 2.47146e-09 1.22943e-09 5.43995e-10 2.10686e-10 7.50309e-11 2.44997e-11 7.24709e-12 1.91736e-12 4.46976e-13 8.99281e-14 1.55431e-14 1.9984e-15
- 2.22045e-16 0 0 0 0 0 2.22045e-16 1.55431e-15 1.24345e-14 8.08242e-14 4.28768e-13 1.92668e-12
- 7.49623e-12 2.57132e-11 7.88785e-11 2.19052e-10 5.56952e-10 1.32699e-09 2.80516e-09 5.33003e-09 9.20951e-09 1.45901e-08 2.12741e-08 2.84371e-08
- 2.84372e-08 2.12742e-08 1.45902e-08 9.20956e-09 5.33006e-09 2.80518e-09 1.327e-09 5.56956e-10 2.19054e-10 7.88791e-11 2.57132e-11 7.49623e-12
- 1.92668e-12 4.28768e-13 8.08242e-14 1.24345e-14 1.55431e-15 2.22045e-16 0 0 0 2.22045e-16 6.66134e-16 7.32747e-15
- 5.77316e-14 3.42837e-13 1.6751e-12 6.92202e-12 2.47884e-11 7.83049e-11 2.21286e-10 5.66113e-10 1.32527e-09 2.86887e-09 5.70383e-09 1.02873e-08
- 1.70183e-08 2.60347e-08 3.69876e-08 4.86686e-08 4.86688e-08 3.69878e-08 2.60349e-08 1.70184e-08 1.02873e-08 5.70386e-09 2.86889e-09 1.32528e-09
- 5.66117e-10 2.21288e-10 7.83054e-11 2.47886e-11 6.92224e-12 1.67488e-12 3.43059e-13 5.75096e-14 7.54952e-15 6.66134e-16 2.22045e-16 0
- 0 2.22045e-16 3.33067e-15 3.04201e-14 2.15161e-13 1.18949e-12 5.38525e-12 2.06466e-11 6.86449e-11 2.01458e-10 5.29317e-10 1.26008e-09
- 2.74738e-09 5.54327e-09 1.04215e-08 1.79208e-08 2.84885e-08 4.22079e-08 5.85593e-08 7.59772e-08 7.59775e-08 5.85596e-08 4.22081e-08 2.84887e-08
- 1.79209e-08 1.04216e-08 5.5433e-09 2.7474e-09 1.26008e-09 5.2932e-10 2.0146e-10 6.86451e-11 2.06468e-11 5.38525e-12 1.18949e-12 2.15161e-13
- 3.04201e-14 3.10862e-15 2.22045e-16 0 0 6.66134e-16 1.11022e-14 1.0103e-13 6.69242e-13 3.4579e-12 1.46374e-11 5.25091e-11
- 1.63484e-10 4.49717e-10 1.10878e-09 2.4801e-09 5.08783e-09 9.67029e-09 1.72862e-08 2.84763e-08 4.36769e-08 6.2885e-08 8.54435e-08 1.09568e-07
- 1.09569e-07 8.54438e-08 6.28852e-08 4.36771e-08 2.84764e-08 1.72862e-08 9.67033e-09 5.08786e-09 2.48011e-09 1.10879e-09 4.4972e-10 1.63485e-10
- 5.25096e-11 1.46374e-11 3.45812e-12 6.69464e-13 1.0103e-13 1.08802e-14 6.66134e-16 0 0 2.22045e-15 3.26406e-14 2.83551e-13
- 1.76814e-12 8.59712e-12 3.42757e-11 1.15898e-10 3.40437e-10 8.84617e-10 2.06344e-09 4.37483e-09 8.52441e-09 1.54192e-08 2.63279e-08 4.17535e-08
- 6.20526e-08 8.7137e-08 1.1631e-07 1.47826e-07 1.47826e-07 1.1631e-07 8.71373e-08 6.20528e-08 4.17536e-08 2.6328e-08 1.54193e-08 8.52445e-09
- 4.37485e-09 2.06345e-09 8.84622e-10 3.40439e-10 1.15899e-10 3.42759e-11 8.59712e-12 1.76814e-12 2.83551e-13 3.26406e-14 2.22045e-15 0
- 2.22045e-16 6.21725e-15 8.30447e-14 6.84341e-13 4.04454e-12 1.86415e-11 7.04949e-11 2.26289e-10 6.31752e-10 1.56265e-09 3.47647e-09 7.04578e-09
- 1.3155e-08 2.2851e-08 3.72517e-08 5.71488e-08 8.26373e-08 1.13581e-07 1.49402e-07 1.88763e-07 1.88763e-07 1.49403e-07 1.13582e-07 8.26375e-08
- 5.7149e-08 3.72518e-08 2.28511e-08 1.3155e-08 7.04581e-09 3.47649e-09 1.56266e-09 6.31756e-10 2.2629e-10 7.04956e-11 1.86418e-11 4.04476e-12
- 6.84341e-13 8.30447e-14 6.21725e-15 2.22045e-16 4.44089e-16 1.46549e-14 1.84075e-13 1.44462e-12 8.14215e-12 3.57974e-11 1.29191e-10 3.96066e-10
- 1.05718e-09 2.50368e-09 5.34247e-09 1.04065e-08 1.87152e-08 3.13858e-08 4.95105e-08 7.38088e-08 1.0424e-07 1.40689e-07 1.82899e-07 2.3042e-07
- 2.3042e-07 1.829e-07 1.40689e-07 1.04241e-07 7.3809e-08 4.95107e-08 3.13859e-08 1.87153e-08 1.04065e-08 5.34249e-09 2.5037e-09 1.05718e-09
- 3.96068e-10 1.29192e-10 3.57978e-11 8.14238e-12 1.44462e-12 1.84075e-13 1.46549e-14 4.44089e-16 1.11022e-15 2.95319e-14 3.5949e-13 2.70806e-12
- 1.46505e-11 6.18288e-11 2.14289e-10 6.3139e-10 1.62154e-09 3.70033e-09 7.6215e-09 1.43571e-08 2.50176e-08 4.0721e-08 6.24333e-08 9.08099e-08
- 1.25678e-07 1.67024e-07 2.15163e-07 2.7111e-07 2.71111e-07 2.15163e-07 1.67024e-07 1.25678e-07 9.08101e-08 6.24335e-08 4.07211e-08 2.50177e-08
- 1.43571e-08 7.62153e-09 3.70035e-09 1.62154e-09 6.31394e-10 2.1429e-10 6.18292e-11 1.46505e-11 2.70806e-12 3.59268e-13 2.95319e-14 1.11022e-15
- 2.22045e-15 5.32907e-14 6.26832e-13 4.56568e-12 2.38563e-11 9.72413e-11 3.25636e-10 9.2771e-10 2.30604e-09 5.10007e-09 1.01961e-08 1.86738e-08
- 3.1689e-08 5.03111e-08 7.53466e-08 1.07298e-07 1.45914e-07 1.91373e-07 2.44844e-07 3.09507e-07 3.09508e-07 2.44844e-07 1.91374e-07 1.45914e-07
- 1.07298e-07 7.53468e-08 5.03112e-08 3.16891e-08 1.86739e-08 1.01961e-08 5.10009e-09 2.30605e-09 9.27715e-10 3.25638e-10 9.72418e-11 2.38565e-11
- 4.56568e-12 6.26832e-13 5.30687e-14 2.22045e-15 3.10862e-15 8.57092e-14 9.8721e-13 6.99329e-12 3.55145e-11 1.40679e-10 4.57957e-10 1.26909e-09
- 3.07134e-09 6.6207e-09 1.29175e-08 2.31186e-08 3.83858e-08 5.96967e-08 8.7655e-08 1.2256e-07 1.64115e-07 2.1278e-07 2.70897e-07 3.44636e-07
- 3.44637e-07 2.70898e-07 2.1278e-07 1.64115e-07 1.2256e-07 8.76552e-08 5.96968e-08 3.83859e-08 2.31187e-08 1.29175e-08 6.62072e-09 3.07135e-09
- 1.2691e-09 4.57959e-10 1.40679e-10 3.55145e-11 6.99307e-12 9.87432e-13 8.57092e-14 3.33067e-15 4.66294e-15 1.25011e-13 1.41465e-12 9.81104e-12
- 4.87306e-11 1.88758e-10 6.01023e-10 1.62997e-09 3.86319e-09 8.16244e-09 1.56234e-08 2.7454e-08 4.4789e-08 6.84764e-08 9.88775e-08 1.36047e-07
- 1.7965e-07 2.30522e-07 2.92541e-07 3.75823e-07 3.75824e-07 2.92541e-07 2.30522e-07 1.7965e-07 1.36047e-07 9.88777e-08 6.84765e-08 4.47891e-08
- 2.74541e-08 1.56234e-08 8.16247e-09 3.86321e-09 1.62998e-09 6.01026e-10 1.88759e-10 4.8731e-11 9.81082e-12 1.41487e-12 1.25011e-13 4.66294e-15
- 6.43929e-15 1.65645e-13 1.85607e-12 1.2685e-11 6.20168e-11 2.36395e-10 7.40849e-10 1.9783e-09 4.61891e-09 9.61833e-09 1.81517e-08 3.14581e-08
- 5.06202e-08 7.63239e-08 1.0865e-07 1.47356e-07 1.92062e-07 2.44072e-07 3.09208e-07 4.02643e-07 4.02643e-07 3.09208e-07 2.44072e-07 1.92063e-07
- 1.47356e-07 1.0865e-07 7.63241e-08 5.06203e-08 3.14582e-08 1.81518e-08 9.61836e-09 4.61893e-09 1.97831e-09 7.40852e-10 2.36396e-10 6.20171e-11
- 1.26847e-11 1.85585e-12 1.65867e-13 6.21725e-15 7.32747e-15 2.00284e-13 2.23799e-12 1.51783e-11 7.35192e-11 2.7755e-10 8.61583e-10 2.27942e-09
- 5.27372e-09 1.08829e-08 2.03506e-08 3.49345e-08 5.56477e-08 8.29868e-08 1.1671e-07 1.56212e-07 2.01047e-07 2.53074e-07 3.20514e-07 4.24878e-07
- 4.24878e-07 3.20515e-07 2.53074e-07 2.01047e-07 1.56212e-07 1.16711e-07 8.29869e-08 5.56478e-08 3.49346e-08 2.03507e-08 1.0883e-08 5.27373e-09
- 2.27943e-09 8.61586e-10 2.77551e-10 7.35196e-11 1.51783e-11 2.23799e-12 2.00506e-13 7.32747e-15 7.77156e-15 2.21156e-13 2.48646e-12 1.68479e-11
- 8.13791e-11 3.06259e-10 9.47803e-10 2.50011e-09 5.76663e-09 1.18592e-08 2.20844e-08 3.7715e-08 5.96854e-08 8.82785e-08 1.22888e-07 1.62456e-07
- 2.0644e-07 2.57331e-07 3.26245e-07 4.42496e-07 4.42497e-07 3.26245e-07 2.57332e-07 2.0644e-07 1.62456e-07 1.22888e-07 8.82787e-08 5.96855e-08
- 3.77151e-08 2.20845e-08 1.18592e-08 5.76665e-09 2.50012e-09 9.47806e-10 3.0626e-10 8.13796e-11 1.68481e-11 2.48646e-12 2.21378e-13 7.77156e-15
- 7.54952e-15 2.22933e-13 2.54552e-12 1.73552e-11 8.41485e-11 3.17766e-10 9.86911e-10 2.61258e-09 6.04562e-09 1.24635e-08 2.32367e-08 3.96595e-08
- 6.25883e-08 9.20739e-08 1.271e-07 1.66043e-07 2.08228e-07 2.5682e-07 3.26356e-07 4.55639e-07 4.5564e-07 3.26356e-07 2.56821e-07 2.08228e-07
- 1.66044e-07 1.271e-07 9.2074e-08 6.25884e-08 3.96596e-08 2.32368e-08 1.24635e-08 6.04564e-09 2.61259e-09 9.86915e-10 3.17768e-10 8.41489e-11
- 1.73555e-11 2.54552e-12 2.22933e-13 7.32747e-15 6.21725e-15 2.04725e-13 2.39764e-12 1.65676e-11 8.11635e-11 3.09572e-10 9.71389e-10 2.5983e-09
- 6.07266e-09 1.26305e-08 2.37152e-08 4.06646e-08 6.42786e-08 9.43672e-08 1.2942e-07 1.67056e-07 2.0656e-07 2.51699e-07 3.20973e-07 4.64599e-07
- 4.646e-07 3.20974e-07 2.51699e-07 2.0656e-07 1.67056e-07 1.2942e-07 9.43673e-08 6.42787e-08 4.06647e-08 2.37153e-08 1.26305e-08 6.07268e-09
- 2.59831e-09 9.71393e-10 3.09573e-10 8.1164e-11 1.65679e-11 2.39764e-12 2.04725e-13 6.21725e-15 4.66294e-15 1.70308e-13 2.07101e-12 1.46088e-11
- 7.27725e-11 2.82171e-10 9.00631e-10 2.45137e-09 5.82812e-09 1.23158e-08 2.34421e-08 4.06188e-08 6.4615e-08 9.4995e-08 1.29745e-07 1.65689e-07
- 2.01741e-07 2.42304e-07 3.10385e-07 4.6979e-07 4.6979e-07 3.10385e-07 2.42305e-07 2.01741e-07 1.65689e-07 1.29745e-07 9.49951e-08 6.46152e-08
- 4.06188e-08 2.34422e-08 1.23159e-08 5.82813e-09 2.45138e-09 9.00634e-10 2.82173e-10 7.27727e-11 1.46085e-11 2.07079e-12 1.70086e-13 4.88498e-15
- 2.88658e-15 1.27232e-13 1.63092e-12 1.18374e-11 6.03309e-11 2.39277e-10 7.82024e-10 2.18156e-09 5.31637e-09 1.1503e-08 2.23635e-08 3.94278e-08
- 6.34957e-08 9.39364e-08 1.28247e-07 1.62235e-07 1.94203e-07 2.29125e-07 2.95004e-07 4.71704e-07 4.71704e-07 2.95005e-07 2.29125e-07 1.94203e-07
- 1.62235e-07 1.28247e-07 9.39365e-08 6.34958e-08 3.94279e-08 2.23635e-08 1.1503e-08 5.31638e-09 2.18157e-09 7.82028e-10 2.39278e-10 6.03313e-11
- 1.18376e-11 1.63092e-12 1.27232e-13 2.88658e-15 1.77636e-15 8.99281e-14 1.19948e-12 8.88134e-12 4.60081e-11 1.87069e-10 6.30743e-10 1.81607e-09
- 4.57213e-09 1.02156e-08 2.04629e-08 3.7019e-08 6.08139e-08 9.11078e-08 1.24892e-07 1.57038e-07 1.84449e-07 2.12761e-07 2.75341e-07 4.70872e-07
- 4.70873e-07 2.75342e-07 2.12762e-07 1.84449e-07 1.57039e-07 1.24892e-07 9.11079e-08 6.08141e-08 3.70191e-08 2.04629e-08 1.02156e-08 4.57215e-09
- 1.81607e-09 6.30745e-10 1.8707e-10 4.60083e-11 8.88134e-12 1.19971e-12 8.99281e-14 1.77636e-15 1.11022e-15 6.19504e-14 8.63976e-13 6.51945e-12
- 3.42699e-11 1.41511e-10 4.85894e-10 1.42947e-09 3.68578e-09 8.45673e-09 1.77841e-08 3.33556e-08 5.64578e-08 8.64221e-08 1.1979e-07 1.5043e-07
- 1.72984e-07 1.93894e-07 2.5197e-07 4.67829e-07 4.6783e-07 2.5197e-07 1.93895e-07 1.72984e-07 1.5043e-07 1.1979e-07 8.64222e-08 5.64578e-08
- 3.33556e-08 1.77841e-08 8.45675e-09 3.68579e-09 1.42947e-09 4.85896e-10 1.41512e-10 3.42704e-11 6.51945e-12 8.64198e-13 6.19504e-14 1.11022e-15
- 4.44089e-16 4.15223e-14 6.07958e-13 4.65961e-12 2.47631e-11 1.03525e-10 3.61136e-10 1.08375e-09 2.86924e-09 6.77057e-09 1.45993e-08 2.8132e-08
- 4.99815e-08 7.97137e-08 1.13047e-07 1.42599e-07 1.60234e-07 1.73258e-07 2.25522e-07 4.63087e-07 4.63088e-07 2.25522e-07 1.73259e-07 1.60234e-07
- 1.42599e-07 1.13047e-07 7.97138e-08 4.99816e-08 2.8132e-08 1.45993e-08 6.77059e-09 2.86925e-09 1.08375e-09 3.61138e-10 1.03526e-10 2.47635e-11
- 4.65961e-12 6.0818e-13 4.17444e-14 4.44089e-16 2.22045e-16 2.75335e-14 4.17444e-13 3.23541e-12 1.73193e-11 7.30782e-11 2.584e-10 7.89828e-10
- 2.1436e-09 5.19783e-09 1.14903e-08 2.28966e-08 4.1773e-08 6.83563e-08 1.04049e-07 1.33212e-07 1.46437e-07 1.5163e-07 1.96706e-07 4.5712e-07
- 4.57121e-07 1.96706e-07 1.5163e-07 1.46437e-07 1.33212e-07 1.0405e-07 6.83564e-08 4.1773e-08 2.28966e-08 1.14904e-08 5.19784e-09 2.14361e-09
- 7.8983e-10 2.58401e-10 7.30789e-11 1.73195e-11 3.23541e-12 4.17666e-13 2.75335e-14 2.22045e-16 2.22045e-16 1.77636e-14 2.78444e-13 2.1747e-12
- 1.16811e-11 4.95926e-11 1.7734e-10 5.51318e-10 1.53184e-09 3.81615e-09 8.65697e-09 1.78056e-08 3.33179e-08 5.6523e-08 8.7085e-08 1.20664e-07
- 1.31477e-07 1.29812e-07 1.66362e-07 4.50347e-07 4.50348e-07 1.66363e-07 1.29812e-07 1.31478e-07 1.20664e-07 8.7085e-08 5.65231e-08 3.3318e-08
- 1.78056e-08 8.65698e-09 3.81616e-09 1.53185e-09 5.5132e-10 1.7734e-10 4.95928e-11 1.16811e-11 2.1747e-12 2.78444e-13 1.75415e-14 2.22045e-16
- 2.22045e-16 1.08802e-14 1.79634e-13 1.40754e-12 7.55795e-12 3.21867e-11 1.16133e-10 3.66662e-10 1.04167e-09 2.66617e-09 6.21649e-09 1.31982e-08
- 2.53865e-08 4.43159e-08 6.94851e-08 1.01322e-07 1.14603e-07 1.08596e-07 1.35562e-07 4.4312e-07 4.43121e-07 1.35562e-07 1.08596e-07 1.14603e-07
- 1.01322e-07 6.94852e-08 4.4316e-08 2.53865e-08 1.31982e-08 6.21651e-09 2.66617e-09 1.04167e-09 3.66663e-10 1.16133e-10 3.21869e-11 7.55818e-12
- 1.40776e-12 1.79634e-13 1.11022e-14 2.22045e-16 0 6.66134e-15 1.11244e-13 8.71303e-13 4.6585e-12 1.98381e-11 7.20588e-11 2.30718e-10
- 6.69446e-10 1.76052e-09 4.22562e-09 9.26855e-09 1.83972e-08 3.3076e-08 5.29475e-08 7.4216e-08 9.46253e-08 8.86623e-08 1.05791e-07 4.35717e-07
- 4.35718e-07 1.05791e-07 8.86623e-08 9.46253e-08 7.4216e-08 5.29476e-08 3.3076e-08 1.83972e-08 9.26857e-09 4.22563e-09 1.76053e-09 6.69448e-10
- 2.30719e-10 7.20592e-11 1.98384e-11 4.6585e-12 8.71525e-13 1.11466e-13 6.43929e-15 0 -1.11022e-16 3.55271e-15 6.55032e-14 5.10703e-13
- 2.70894e-12 1.15004e-11 4.19607e-11 1.36057e-10 4.02842e-10 1.08875e-09 2.69493e-09 6.11725e-09 1.25753e-08 2.33503e-08 3.85169e-08 5.47572e-08
- 7.31806e-08 7.02781e-08 7.92578e-08 4.28338e-07 4.28339e-07 7.9258e-08 7.02781e-08 7.31806e-08 5.47572e-08 3.85169e-08 2.33503e-08 1.25753e-08
- 6.11726e-09 2.69494e-09 1.08876e-09 4.02843e-10 1.36058e-10 4.19609e-11 1.15004e-11 2.70894e-12 5.10703e-13 6.55032e-14 3.77476e-15 -1.11022e-16
- 0 1.9984e-15 3.61933e-14 2.79776e-13 1.46616e-12 6.18727e-12 2.26277e-11 7.42078e-11 2.24065e-10 6.22688e-10 1.59298e-09 3.75212e-09
- 8.02267e-09 1.54591e-08 2.63994e-08 3.87511e-08 5.35149e-08 5.31776e-08 5.94356e-08 4.21103e-07 4.21104e-07 5.94356e-08 5.31776e-08 5.35149e-08
- 3.87511e-08 2.63994e-08 1.54591e-08 8.02268e-09 3.75212e-09 1.59299e-09 6.2269e-10 2.24066e-10 7.4208e-11 2.26277e-11 6.18749e-12 1.46616e-12
- 2.79776e-13 3.61933e-14 2.22045e-15 0 0 8.88178e-16 1.84297e-14 1.40332e-13 7.24532e-13 3.03091e-12 1.10871e-11 3.67342e-11
- 1.13082e-10 3.23463e-10 8.57667e-10 2.10442e-09 4.70527e-09 9.47099e-09 1.68573e-08 2.56926e-08 3.47588e-08 3.73352e-08 4.94648e-08 4.15342e-07
- 4.15343e-07 4.94649e-08 3.73352e-08 3.47588e-08 2.56926e-08 1.68574e-08 9.471e-09 4.70528e-09 2.10442e-09 8.57669e-10 3.23464e-10 1.13082e-10
- 3.67342e-11 1.10871e-11 3.03091e-12 7.24532e-13 1.40332e-13 1.84297e-14 8.88178e-16 0 0 4.44089e-16 8.43769e-15 6.26166e-14
- 3.17746e-13 1.31384e-12 4.79861e-12 1.60483e-11 5.0381e-11 1.48592e-10 4.09945e-10 1.0537e-09 2.48151e-09 5.26386e-09 9.85406e-09 1.57299e-08
- 2.03338e-08 2.39342e-08 4.35775e-08 4.18688e-07 4.18689e-07 4.35776e-08 2.39342e-08 2.03338e-08 1.57299e-08 9.85407e-09 5.26386e-09 2.48151e-09
- 1.0537e-09 4.09945e-10 1.48592e-10 5.03813e-11 1.60485e-11 4.79861e-12 1.31406e-12 3.17746e-13 6.26166e-14 8.43769e-15 4.44089e-16 0
- 0 2.22045e-16 3.33067e-15 2.37588e-14 1.1835e-13 4.82281e-13 1.75571e-12 5.9257e-12 1.89919e-11 5.79299e-11 1.67248e-10 4.54123e-10
- 1.13857e-09 2.57781e-09 5.14218e-09 8.70467e-09 1.18568e-08 1.43461e-08 4.30977e-08 4.3839e-07 4.3839e-07 4.30978e-08 1.43461e-08 1.18568e-08
- 8.70468e-09 5.14219e-09 2.57781e-09 1.13857e-09 4.54124e-10 1.67248e-10 5.79301e-11 1.89919e-11 5.9257e-12 1.75571e-12 4.82281e-13 1.1835e-13
- 2.39808e-14 3.33067e-15 2.22045e-16 0 0 0 8.88178e-16 7.10543e-15 3.4639e-14 1.39e-13 5.04929e-13 1.72196e-12
- 5.65081e-12 1.79243e-11 5.46554e-11 1.58914e-10 4.31698e-10 1.06519e-09 2.31348e-09 4.23463e-09 6.17141e-09 7.53235e-09 5.60359e-08 4.91898e-07
- 4.91899e-07 5.6036e-08 7.53235e-09 6.17141e-09 4.23463e-09 2.31349e-09 1.06519e-09 4.31699e-10 1.58914e-10 5.46558e-11 1.79246e-11 5.65081e-12
- 1.72173e-12 5.04929e-13 1.39e-13 3.4639e-14 7.10543e-15 8.88178e-16 0 0 0 0 2.22045e-16 1.33227e-15
- 6.88338e-15 2.73115e-14 9.9698e-14 3.45501e-13 1.17018e-12 3.9051e-12 1.27922e-11 4.0824e-11 1.2423e-10 3.47973e-10 8.59585e-10 1.76729e-09
- 2.84678e-09 3.62199e-09 1.27642e-07 6.36077e-07 6.36077e-07 1.27642e-07 3.62199e-09 2.84678e-09 1.76729e-09 8.59586e-10 3.47973e-10 1.2423e-10
- 4.08242e-11 1.27922e-11 3.9051e-12 1.17018e-12 3.45279e-13 9.9698e-14 2.73115e-14 6.88338e-15 1.33227e-15 2.22045e-16 0 0
- 0 0 0 0 6.66134e-16 2.44249e-15 9.76996e-15 3.5083e-14 1.26787e-13 4.60743e-13 1.69753e-12 6.33205e-12
- 2.35605e-11 8.3989e-11 2.68852e-10 7.45146e-10 2.92921e-07 5.46032e-07 8.18818e-07 1.16725e-06 1.16725e-06 8.18818e-07 5.46032e-07 2.92921e-07
- 7.45146e-10 2.68852e-10 8.3989e-11 2.35607e-11 6.33182e-12 1.69731e-12 4.60521e-13 1.26565e-13 3.5083e-14 9.76996e-15 2.44249e-15 6.66134e-16
- 0 0 0 0
+ 7.71462e-08 1.05316e-07 1.2235e-07 1.36718e-07 1.50799e-07 1.65351e-07 1.78971e-07 1.9308e-07 2.08263e-07 2.24308e-07 2.40256e-07 2.55649e-07
+ 2.70033e-07 2.83054e-07 2.94546e-07 3.04572e-07 3.13414e-07 3.21174e-07 3.28407e-07 3.36591e-07 3.36854e-07 3.28609e-07 3.2135e-07 3.13577e-07
+ 3.04724e-07 2.94687e-07 2.83185e-07 2.70155e-07 2.55761e-07 2.40358e-07 2.24401e-07 2.08348e-07 1.93157e-07 1.7904e-07 1.65414e-07 1.50857e-07
+ 1.3677e-07 1.22397e-07 1.05357e-07 7.71791e-08 1.22795e-07 1.83007e-07 2.23425e-07 2.4754e-07 2.61081e-07 2.69524e-07 2.76824e-07 2.83435e-07
+ 2.89487e-07 2.95153e-07 3.00721e-07 3.06081e-07 3.11079e-07 3.15559e-07 3.19397e-07 3.22535e-07 3.24999e-07 3.28352e-07 3.35127e-07 3.47986e-07
+ 3.48262e-07 3.35307e-07 3.28495e-07 3.25126e-07 3.22657e-07 3.19515e-07 3.15672e-07 3.11188e-07 3.06184e-07 3.00819e-07 2.95245e-07 2.89574e-07
+ 2.83516e-07 2.76901e-07 2.69596e-07 2.61148e-07 2.47604e-07 2.23483e-07 1.83057e-07 1.22831e-07 1.3708e-07 2.03965e-07 2.42106e-07 2.61207e-07
+ 2.71661e-07 2.78714e-07 2.84236e-07 2.88906e-07 2.9301e-07 2.96654e-07 2.99856e-07 3.02575e-07 3.04758e-07 3.06388e-07 3.07547e-07 3.08493e-07
+ 3.09764e-07 3.14479e-07 3.26283e-07 3.50132e-07 3.50422e-07 3.26444e-07 3.14589e-07 3.09853e-07 3.08577e-07 3.07628e-07 3.06468e-07 3.04836e-07
+ 3.02651e-07 2.9993e-07 2.96725e-07 2.93076e-07 2.88969e-07 2.84296e-07 2.7877e-07 2.71714e-07 2.61258e-07 2.42156e-07 2.0401e-07 1.37113e-07
+ 1.40132e-07 2.08971e-07 2.43384e-07 2.58095e-07 2.65519e-07 2.70638e-07 2.74845e-07 2.7847e-07 2.81554e-07 2.84051e-07 2.85891e-07 2.87003e-07
+ 2.87366e-07 2.8707e-07 2.86414e-07 2.86038e-07 2.87117e-07 2.94189e-07 3.12796e-07 3.51187e-07 3.51486e-07 3.12938e-07 2.94269e-07 2.87169e-07
+ 2.86084e-07 2.86458e-07 2.87116e-07 2.87413e-07 2.87051e-07 2.85938e-07 2.84098e-07 2.81599e-07 2.78513e-07 2.74886e-07 2.70678e-07 2.65558e-07
+ 2.58134e-07 2.43425e-07 2.0901e-07 1.40161e-07 1.38128e-07 2.08062e-07 2.39747e-07 2.51255e-07 2.56063e-07 2.59154e-07 2.61793e-07 2.64142e-07
+ 2.66063e-07 2.67355e-07 2.67826e-07 2.67338e-07 2.6586e-07 2.6357e-07 2.60998e-07 2.59254e-07 2.60346e-07 2.70062e-07 2.96332e-07 3.51897e-07
+ 3.52202e-07 2.96457e-07 2.70117e-07 2.6037e-07 2.59269e-07 2.61012e-07 2.63587e-07 2.65881e-07 2.67361e-07 2.67852e-07 2.67382e-07 2.6609e-07
+ 2.64169e-07 2.6182e-07 2.59181e-07 2.56091e-07 2.51286e-07 2.39781e-07 2.08096e-07 1.38154e-07 1.33564e-07 2.04556e-07 2.3459e-07 2.4391e-07
+ 2.46615e-07 2.47818e-07 2.48816e-07 2.49714e-07 2.50269e-07 2.50156e-07 2.49069e-07 2.46785e-07 2.43248e-07 2.38709e-07 2.33943e-07 2.30591e-07
+ 2.31637e-07 2.43883e-07 2.77913e-07 3.52445e-07 3.52755e-07 2.78023e-07 2.43921e-07 2.31642e-07 2.30585e-07 2.33935e-07 2.38705e-07 2.43249e-07
+ 2.4679e-07 2.49078e-07 2.50168e-07 2.50283e-07 2.4973e-07 2.48833e-07 2.47837e-07 2.46636e-07 2.43934e-07 2.34619e-07 2.04586e-07 1.33586e-07
+ 1.27632e-07 1.99761e-07 2.28968e-07 2.36903e-07 2.38042e-07 2.37665e-07 2.37149e-07 2.366e-07 2.35718e-07 2.34088e-07 2.31313e-07 2.27094e-07
+ 2.21348e-07 2.14392e-07 2.07239e-07 2.02067e-07 2.02877e-07 2.17259e-07 2.58437e-07 3.529e-07 3.53214e-07 2.58538e-07 2.17292e-07 2.02877e-07
+ 2.02052e-07 2.0722e-07 2.14375e-07 2.21336e-07 2.27087e-07 2.31311e-07 2.3409e-07 2.35724e-07 2.36609e-07 2.3716e-07 2.37678e-07 2.38058e-07
+ 2.36923e-07 2.28993e-07 1.99788e-07 1.27651e-07 1.20971e-07 1.94274e-07 2.23213e-07 2.30363e-07 2.30415e-07 2.28811e-07 2.2702e-07 2.25163e-07
+ 2.22904e-07 2.1977e-07 2.15299e-07 2.09138e-07 2.01192e-07 1.91843e-07 1.82322e-07 1.75291e-07 1.75682e-07 1.91627e-07 2.38729e-07 3.53298e-07
+ 3.53615e-07 2.3883e-07 1.91667e-07 1.75689e-07 1.75278e-07 1.82301e-07 1.91821e-07 2.01173e-07 2.09124e-07 2.1529e-07 2.19767e-07 2.22905e-07
+ 2.25168e-07 2.27027e-07 2.28821e-07 2.30428e-07 2.3038e-07 2.23235e-07 1.94299e-07 1.20988e-07 1.14272e-07 1.88187e-07 2.17428e-07 2.24211e-07
+ 2.2356e-07 2.21055e-07 2.1825e-07 2.15276e-07 2.11774e-07 2.07234e-07 2.01156e-07 1.93169e-07 1.8319e-07 1.71678e-07 1.60063e-07 1.51395e-07
+ 1.51314e-07 1.68161e-07 2.19516e-07 3.53656e-07 3.53977e-07 2.19628e-07 1.68218e-07 1.51339e-07 1.51395e-07 1.60048e-07 1.71658e-07 1.83169e-07
+ 1.93152e-07 2.01144e-07 2.07227e-07 2.11771e-07 2.15278e-07 2.18255e-07 2.21063e-07 2.23571e-07 2.24226e-07 2.17448e-07 1.88209e-07 1.14287e-07
+ 1.07741e-07 1.81972e-07 2.11417e-07 2.18335e-07 2.17263e-07 2.14126e-07 2.10536e-07 2.06632e-07 2.02035e-07 1.96218e-07 1.88678e-07 1.7906e-07
+ 1.67329e-07 1.54052e-07 1.4084e-07 1.31017e-07 1.30599e-07 1.4767e-07 2.01388e-07 3.53989e-07 3.54312e-07 2.01524e-07 1.47752e-07 1.30646e-07
+ 1.31034e-07 1.40836e-07 1.54037e-07 1.6731e-07 1.79042e-07 1.88665e-07 1.96209e-07 2.02031e-07 2.06632e-07 2.1054e-07 2.14132e-07 2.17273e-07
+ 2.18348e-07 2.11435e-07 1.81992e-07 1.07755e-07 1.01382e-07 1.75767e-07 2.05424e-07 2.12586e-07 2.1135e-07 2.07779e-07 2.03587e-07 1.98904e-07
+ 1.93339e-07 1.86374e-07 1.77532e-07 1.66516e-07 1.53383e-07 1.38837e-07 1.24665e-07 1.14345e-07 1.13881e-07 1.30549e-07 1.84767e-07 3.54302e-07
+ 3.54628e-07 1.84937e-07 1.30656e-07 1.13949e-07 1.14379e-07 1.24673e-07 1.38829e-07 1.53368e-07 1.665e-07 1.77519e-07 1.86364e-07 1.93334e-07
+ 1.98902e-07 2.03589e-07 2.07784e-07 2.11358e-07 2.12598e-07 2.0544e-07 1.75786e-07 1.01395e-07 9.52108e-08 1.69658e-07 1.99544e-07 2.06972e-07
+ 2.05697e-07 2.01831e-07 1.97165e-07 1.9181e-07 1.85376e-07 1.77375e-07 1.67394e-07 1.5523e-07 1.41072e-07 1.25789e-07 1.11335e-07 1.01222e-07
+ 1.01049e-07 1.168e-07 1.69895e-07 3.54602e-07 3.54931e-07 1.70105e-07 1.16928e-07 1.01131e-07 1.01269e-07 1.11354e-07 1.2579e-07 1.41062e-07
+ 1.55217e-07 1.67382e-07 1.77366e-07 1.85371e-07 1.91808e-07 1.97166e-07 2.01835e-07 2.05704e-07 2.06983e-07 1.9956e-07 1.69675e-07 9.52216e-08
+ 8.92469e-08 1.63708e-07 1.93847e-07 2.01514e-07 2.00234e-07 1.96161e-07 1.911e-07 1.85141e-07 1.77908e-07 1.68972e-07 1.58014e-07 1.44959e-07
+ 1.30156e-07 1.14655e-07 1.00551e-07 9.12653e-08 9.16502e-08 1.06127e-07 1.56843e-07 3.54892e-07 3.55223e-07 1.57093e-07 1.06266e-07 9.17369e-08
+ 9.13184e-08 1.00578e-07 1.14663e-07 1.30152e-07 1.44949e-07 1.58003e-07 1.68963e-07 1.77903e-07 1.85139e-07 1.911e-07 1.96164e-07 2.0024e-07
+ 2.01523e-07 1.93861e-07 1.63725e-07 8.92565e-08 8.35122e-08 1.57966e-07 1.88377e-07 1.96231e-07 1.94927e-07 1.90694e-07 1.85281e-07 1.78757e-07
+ 1.70779e-07 1.61004e-07 1.49235e-07 1.35548e-07 1.20469e-07 1.05222e-07 9.19949e-08 8.3986e-08 8.50485e-08 9.80642e-08 1.45544e-07 3.55176e-07
+ 3.55509e-07 1.4583e-07 9.82068e-08 8.51319e-08 8.40397e-08 9.20266e-08 1.05236e-07 1.20471e-07 1.35544e-07 1.49228e-07 1.60997e-07 1.70774e-07
+ 1.78754e-07 1.85281e-07 1.90697e-07 1.94931e-07 1.9624e-07 1.88391e-07 1.57982e-07 8.35207e-08 7.80254e-08 1.52467e-07 1.83198e-07 1.91097e-07
+ 1.89765e-07 1.85395e-07 1.79646e-07 1.72578e-07 1.63907e-07 1.53397e-07 1.40991e-07 1.2693e-07 1.11914e-07 9.73218e-08 8.53632e-08 7.88781e-08
+ 8.05854e-08 9.21017e-08 1.3584e-07 3.55454e-07 3.5579e-07 1.36155e-07 9.22391e-08 8.06599e-08 7.89274e-08 8.5396e-08 9.73404e-08 1.11922e-07
+ 1.2693e-07 1.40987e-07 1.53392e-07 1.63903e-07 1.72575e-07 1.79645e-07 1.85397e-07 1.8977e-07 1.91104e-07 1.83212e-07 1.52481e-07 7.80331e-08
+ 7.28017e-08 1.47298e-07 1.78256e-07 1.86111e-07 1.84754e-07 1.80248e-07 1.74167e-07 1.66577e-07 1.57273e-07 1.46143e-07 1.33281e-07 1.19092e-07
+ 1.0444e-07 9.08091e-08 8.03383e-08 7.53693e-08 7.76818e-08 8.77664e-08 1.27526e-07 3.55729e-07 3.56067e-07 1.27859e-07 8.78925e-08 7.77448e-08
+ 7.54059e-08 8.03673e-08 9.08292e-08 1.04451e-07 1.19096e-07 1.33281e-07 1.4614e-07 1.5727e-07 1.66575e-07 1.74167e-07 1.8025e-07 1.84758e-07
+ 1.86118e-07 1.78269e-07 1.47313e-07 7.28086e-08 6.78994e-08 1.4247e-07 1.73494e-07 1.81288e-07 1.79902e-07 1.75257e-07 1.68847e-07 1.60765e-07
+ 1.50904e-07 1.39282e-07 1.26145e-07 1.12056e-07 9.80174e-08 8.55742e-08 7.6725e-08 7.32845e-08 7.58811e-08 8.46644e-08 1.20388e-07 3.56002e-07
+ 3.56342e-07 1.2073e-07 8.47756e-08 7.5932e-08 7.33205e-08 7.6752e-08 8.55948e-08 9.80313e-08 1.12064e-07 1.26148e-07 1.39282e-07 1.50902e-07
+ 1.60764e-07 1.68847e-07 1.75258e-07 1.79906e-07 1.81295e-07 1.73506e-07 1.42484e-07 6.79061e-08 6.33999e-08 1.37893e-07 1.68915e-07 1.76638e-07
+ 1.7522e-07 1.70433e-07 1.63709e-07 1.55183e-07 1.44855e-07 1.32878e-07 1.19642e-07 1.05853e-07 9.26227e-08 8.15065e-08 7.42982e-08 7.22404e-08
+ 7.48462e-08 8.24888e-08 1.1423e-07 3.56272e-07 3.56614e-07 1.14568e-07 8.25833e-08 7.48861e-08 7.22675e-08 7.43213e-08 8.15261e-08 9.2638e-08
+ 1.05863e-07 1.19648e-07 1.3288e-07 1.44855e-07 1.55183e-07 1.63709e-07 1.70435e-07 1.75223e-07 1.76644e-07 1.68926e-07 1.37907e-07 6.34064e-08
+ 5.92687e-08 1.33548e-07 1.64512e-07 1.72164e-07 1.70717e-07 1.65798e-07 1.5879e-07 1.49887e-07 1.39198e-07 1.27004e-07 1.1383e-07 1.00504e-07
+ 8.82122e-08 7.84665e-08 7.27779e-08 7.1776e-08 7.43377e-08 8.101e-08 1.08883e-07 3.56542e-07 3.56886e-07 1.09208e-07 8.10876e-08 7.43683e-08
+ 7.1796e-08 7.27964e-08 7.84842e-08 8.82277e-08 1.00516e-07 1.13838e-07 1.27008e-07 1.392e-07 1.49888e-07 1.5879e-07 1.65799e-07 1.7072e-07
+ 1.72169e-07 1.64522e-07 1.33561e-07 5.9275e-08 5.54676e-08 1.29405e-07 1.60273e-07 1.67863e-07 1.66402e-07 1.61374e-07 1.54134e-07 1.4494e-07
+ 1.34005e-07 1.21728e-07 1.08753e-07 9.60077e-08 8.47196e-08 7.63023e-08 7.19304e-08 7.16776e-08 7.4189e-08 8.00601e-08 1.04214e-07 3.5681e-07
+ 3.57156e-07 1.04518e-07 8.01218e-08 7.42122e-08 7.16922e-08 7.19446e-08 7.63176e-08 8.47346e-08 9.60206e-08 1.08763e-07 1.21735e-07 1.34009e-07
+ 1.44942e-07 1.54135e-07 1.61376e-07 1.66404e-07 1.67868e-07 1.60282e-07 1.29418e-07 5.54736e-08 5.19535e-08 1.25432e-07 1.56177e-07 1.63729e-07
+ 1.62281e-07 1.57188e-07 1.49788e-07 1.40405e-07 1.29343e-07 1.17105e-07 1.04436e-07 9.23421e-08 8.20591e-08 7.48613e-08 7.15641e-08 7.17952e-08
+ 7.42852e-08 7.95173e-08 1.00126e-07 3.57078e-07 3.57426e-07 1.00402e-07 7.95647e-08 7.43028e-08 7.18061e-08 7.15749e-08 7.48742e-08 8.2073e-08
+ 9.23551e-08 1.04446e-07 1.17113e-07 1.29348e-07 1.40408e-07 1.4979e-07 1.5719e-07 1.62284e-07 1.63734e-07 1.56186e-07 1.25444e-07 5.19592e-08
+ 4.86769e-08 1.21589e-07 1.522e-07 1.5975e-07 1.58358e-07 1.53263e-07 1.45795e-07 1.36334e-07 1.25264e-07 1.13171e-07 1.00881e-07 8.94627e-08
+ 8.01328e-08 7.40007e-08 7.15266e-08 7.20274e-08 7.45478e-08 7.92924e-08 9.65582e-08 3.57345e-07 3.57695e-07 9.68017e-08 7.93275e-08 7.45615e-08
+ 7.2036e-08 7.1535e-08 7.40113e-08 8.01454e-08 8.94755e-08 1.00893e-07 1.13179e-07 1.2527e-07 1.36338e-07 1.45797e-07 1.53265e-07 1.58361e-07
+ 1.59755e-07 1.52208e-07 1.216e-07 4.86824e-08 4.55798e-08 1.17829e-07 1.48314e-07 1.55911e-07 1.54634e-07 1.49616e-07 1.42186e-07 1.32769e-07
+ 1.21805e-07 1.09942e-07 9.80754e-08 8.73114e-08 7.88403e-08 7.35964e-08 7.17043e-08 7.23115e-08 7.49242e-08 7.93188e-08 9.34836e-08 3.57612e-07
+ 3.57964e-07 9.36906e-08 7.93438e-08 7.49353e-08 7.23187e-08 7.1711e-08 7.36052e-08 7.88515e-08 8.73235e-08 9.80867e-08 1.09952e-07 1.21811e-07
+ 1.32774e-07 1.42189e-07 1.49619e-07 1.54636e-07 1.55916e-07 1.48322e-07 1.1784e-07 4.5585e-08 4.26168e-08 1.14091e-07 1.44483e-07 1.52192e-07
+ 1.51101e-07 1.46258e-07 1.38986e-07 1.29738e-07 1.18988e-07 1.07425e-07 9.59892e-08 8.58208e-08 7.80854e-08 7.3551e-08 7.20221e-08 7.26197e-08
+ 7.5382e-08 7.95448e-08 9.09121e-08 3.57879e-07 3.58233e-07 9.10803e-08 7.95622e-08 7.53915e-08 7.26262e-08 7.20277e-08 7.35584e-08 7.80955e-08
+ 8.58323e-08 9.60003e-08 1.07434e-07 1.18995e-07 1.29743e-07 1.38989e-07 1.4626e-07 1.51104e-07 1.52196e-07 1.44491e-07 1.14101e-07 4.26217e-08
+ 3.97412e-08 1.10319e-07 1.40657e-07 1.48559e-07 1.47744e-07 1.43184e-07 1.36202e-07 1.27255e-07 1.16823e-07 1.05613e-07 9.45912e-08 8.49231e-08
+ 7.77706e-08 7.37899e-08 7.24427e-08 7.29623e-08 7.59057e-08 7.99285e-08 8.88934e-08 3.58146e-07 3.58503e-07 8.90217e-08 7.99406e-08 7.59144e-08
+ 7.29684e-08 7.24475e-08 7.37964e-08 7.77798e-08 8.49339e-08 9.46021e-08 1.05622e-07 1.1683e-07 1.27259e-07 1.36205e-07 1.43187e-07 1.47747e-07
+ 1.48563e-07 1.40664e-07 1.10329e-07 3.97457e-08 3.68965e-08 1.06451e-07 1.36779e-07 1.44966e-07 1.44526e-07 1.40369e-07 1.33815e-07 1.25308e-07
+ 1.15307e-07 1.04505e-07 9.38708e-08 8.4581e-08 7.78195e-08 7.42061e-08 7.29463e-08 7.33993e-08 7.64961e-08 8.04347e-08 8.75221e-08 3.58414e-07
+ 3.58773e-07 8.76107e-08 8.04434e-08 7.65044e-08 7.34051e-08 7.29502e-08 7.4212e-08 7.78281e-08 8.45913e-08 9.38812e-08 1.04514e-07 1.15314e-07
+ 1.25312e-07 1.33818e-07 1.40372e-07 1.44529e-07 1.4497e-07 1.36786e-07 1.06461e-07 3.69006e-08 3.40118e-08 1.02412e-07 1.32778e-07 1.41353e-07
+ 1.41383e-07 1.37706e-07 1.31678e-07 1.23729e-07 1.14287e-07 1.04014e-07 9.38432e-08 8.49232e-08 7.84196e-08 7.49344e-08 7.3677e-08 7.40595e-08
+ 7.71713e-08 8.10345e-08 8.6942e-08 3.58683e-07 3.59044e-07 8.69922e-08 8.10415e-08 7.71791e-08 7.40648e-08 7.36807e-08 7.494e-08 7.84278e-08
+ 8.49331e-08 9.38533e-08 1.04022e-07 1.14294e-07 1.23733e-07 1.31681e-07 1.37709e-07 1.41386e-07 1.41357e-07 1.32784e-07 1.02421e-07 3.40157e-08
+ 3.13062e-08 9.81121e-08 1.28483e-07 1.37543e-07 1.38142e-07 1.35072e-07 1.29706e-07 1.22465e-07 1.13738e-07 1.04125e-07 9.4503e-08 8.59612e-08
+ 7.96176e-08 7.60585e-08 7.46353e-08 7.50018e-08 7.79887e-08 8.17205e-08 8.73491e-08 3.58954e-07 3.59317e-07 8.73632e-08 8.17272e-08 7.79965e-08
+ 7.50074e-08 7.46395e-08 7.60642e-08 7.96256e-08 8.59707e-08 9.45125e-08 1.04133e-07 1.13744e-07 1.2247e-07 1.29709e-07 1.35074e-07 1.38144e-07
+ 1.37547e-07 1.2849e-07 9.81206e-08 3.13097e-08 2.87815e-08 9.35345e-08 1.23724e-07 1.33381e-07 1.347e-07 1.32377e-07 1.27816e-07 1.21441e-07
+ 1.13587e-07 1.04779e-07 9.5807e-08 8.76761e-08 8.14327e-08 7.76647e-08 7.59713e-08 7.61897e-08 7.89981e-08 8.24955e-08 8.79211e-08 3.59967e-07
+ 3.6031e-07 8.79348e-08 8.25019e-08 7.90057e-08 7.61958e-08 7.59763e-08 7.76708e-08 8.14406e-08 8.76852e-08 9.58159e-08 1.04786e-07 1.13593e-07
+ 1.21445e-07 1.27818e-07 1.32379e-07 1.34702e-07 1.33385e-07 1.2373e-07 9.35425e-08 2.87846e-08 2.64041e-08 8.85832e-08 1.18358e-07 1.28709e-07
+ 1.30907e-07 1.2948e-07 1.25873e-07 1.20523e-07 1.1371e-07 1.05866e-07 9.76716e-08 9.00253e-08 8.38869e-08 7.98662e-08 7.78561e-08 7.77742e-08
+ 8.02736e-08 8.33858e-08 8.85629e-08 3.61992e-07 3.62319e-07 8.85764e-08 8.33918e-08 8.02811e-08 7.77807e-08 7.78618e-08 7.98727e-08 8.38947e-08
+ 9.00338e-08 9.76796e-08 1.05872e-07 1.13715e-07 1.20526e-07 1.25876e-07 1.29482e-07 1.30909e-07 1.28713e-07 1.18364e-07 8.85907e-08 2.64069e-08
+ 2.41411e-08 8.31559e-08 1.12224e-07 1.23315e-07 1.26538e-07 1.26163e-07 1.23662e-07 1.19496e-07 1.13896e-07 1.07193e-07 9.9939e-08 9.29066e-08
+ 8.69583e-08 8.27327e-08 8.03893e-08 7.98751e-08 8.18926e-08 8.44145e-08 8.92927e-08 3.65327e-07 3.6564e-07 8.9306e-08 8.442e-08 8.18998e-08
+ 7.98819e-08 8.03956e-08 8.27395e-08 8.69659e-08 9.29144e-08 9.99461e-08 1.07198e-07 1.13901e-07 1.19499e-07 1.23665e-07 1.26165e-07 1.2654e-07
+ 1.23319e-07 1.1223e-07 8.31628e-08 2.41437e-08 2.19587e-08 7.71475e-08 1.05143e-07 1.16926e-07 1.21273e-07 1.22091e-07 1.20844e-07 1.18018e-07
+ 1.13805e-07 1.08436e-07 1.02326e-07 9.61015e-08 9.05157e-08 8.62209e-08 8.35848e-08 8.25711e-08 8.39181e-08 8.55869e-08 9.01336e-08 3.70404e-07
+ 3.70706e-07 9.01469e-08 8.55918e-08 8.39248e-08 8.2578e-08 8.35914e-08 8.62277e-08 9.05228e-08 9.61083e-08 1.02332e-07 1.08441e-07 1.13809e-07
+ 1.18021e-07 1.20846e-07 1.22093e-07 1.21276e-07 1.1693e-07 1.05149e-07 7.71538e-08 2.1961e-08 1.98203e-08 7.04587e-08 9.69325e-08 1.09217e-07
+ 1.14684e-07 1.16781e-07 1.16908e-07 1.15559e-07 1.12902e-07 1.09073e-07 1.04346e-07 9.91906e-08 9.42294e-08 9.00918e-08 8.7272e-08 8.60881e-08
+ 8.63668e-08 8.68621e-08 9.11175e-08 3.77867e-07 3.78157e-07 9.11311e-08 8.68663e-08 8.63726e-08 8.60939e-08 8.72784e-08 9.00982e-08 9.42357e-08
+ 9.91963e-08 1.04351e-07 1.09077e-07 1.12905e-07 1.15562e-07 1.1691e-07 1.16784e-07 1.14687e-07 1.09221e-07 9.69378e-08 7.04644e-08 1.98224e-08
+ 1.76836e-08 6.30085e-08 8.74264e-08 9.98412e-08 1.06256e-07 1.09595e-07 1.11133e-07 1.1135e-07 1.10384e-07 1.08292e-07 1.05212e-07 1.01443e-07
+ 9.74551e-08 9.38001e-08 9.1008e-08 8.95272e-08 8.88632e-08 8.80847e-08 9.22989e-08 3.88716e-07 3.88997e-07 9.23132e-08 8.80882e-08 8.88685e-08
+ 8.9533e-08 9.10136e-08 9.38056e-08 9.74602e-08 1.01448e-07 1.05215e-07 1.08295e-07 1.10386e-07 1.11352e-07 1.11135e-07 1.09598e-07 1.06259e-07
+ 9.98452e-08 8.74312e-08 6.30135e-08 1.76854e-08 1.54965e-08 5.47495e-08 7.65116e-08 8.84994e-08 9.54657e-08 9.98071e-08 1.02629e-07 1.04371e-07
+ 1.0514e-07 1.04923e-07 1.03731e-07 1.01693e-07 9.9094e-08 9.63514e-08 9.39353e-08 9.22717e-08 9.09777e-08 8.89663e-08 9.3809e-08 4.04643e-07
+ 4.04915e-07 9.38247e-08 8.89688e-08 9.09819e-08 9.22764e-08 9.394e-08 9.63557e-08 9.90979e-08 1.01696e-07 1.03734e-07 1.04926e-07 1.05142e-07
+ 1.04373e-07 1.02632e-07 9.98098e-08 9.54689e-08 8.85032e-08 7.6516e-08 5.47538e-08 1.54981e-08 1.31918e-08 4.56838e-08 6.41688e-08 7.50318e-08
+ 8.19341e-08 8.67841e-08 9.05121e-08 9.3505e-08 9.58475e-08 9.74754e-08 9.82928e-08 9.82651e-08 9.74794e-08 9.61581e-08 9.46202e-08 9.31817e-08
+ 9.18401e-08 8.88971e-08 9.60392e-08 4.28815e-07 4.2908e-07 9.60578e-08 8.88987e-08 9.18433e-08 9.31852e-08 9.46237e-08 9.61612e-08 9.74822e-08
+ 9.82675e-08 9.8295e-08 9.74774e-08 9.58495e-08 9.35071e-08 9.05145e-08 8.67868e-08 8.19371e-08 7.50352e-08 6.41725e-08 4.56872e-08 1.31931e-08
+ 1.0679e-08 3.58822e-08 5.05233e-08 5.95282e-08 6.56192e-08 7.02737e-08 7.42597e-08 7.79237e-08 8.13504e-08 8.44647e-08 8.71134e-08 8.91388e-08
+ 9.04424e-08 9.10221e-08 9.09693e-08 9.03966e-08 8.919e-08 8.64992e-08 1.00415e-07 4.68033e-07 4.68289e-07 1.00439e-07 8.65001e-08 8.91921e-08
+ 9.03991e-08 9.09717e-08 9.10244e-08 9.04445e-08 8.91407e-08 8.71152e-08 8.44666e-08 8.13523e-08 7.79258e-08 7.42619e-08 7.02761e-08 6.56218e-08
+ 5.9531e-08 5.05261e-08 3.58848e-08 1.06801e-08 7.84247e-09 2.55191e-08 3.59135e-08 4.24422e-08 4.70124e-08 5.07156e-08 5.41644e-08 5.76709e-08
+ 6.13452e-08 6.51551e-08 6.89696e-08 7.26015e-08 7.58487e-08 7.85273e-08 8.04803e-08 8.1533e-08 8.13113e-08 8.00493e-08 1.13619e-07 5.39811e-07
+ 5.40056e-07 1.13656e-07 8.00507e-08 8.13128e-08 8.15349e-08 8.04822e-08 7.8529e-08 7.58503e-08 7.26031e-08 6.89712e-08 6.51567e-08 6.13469e-08
+ 5.76725e-08 5.41661e-08 5.07174e-08 4.70142e-08 4.24441e-08 3.59155e-08 2.55209e-08 7.84327e-09 4.60252e-09 1.4985e-08 2.10429e-08 2.47687e-08
+ 2.73605e-08 2.95476e-08 3.17709e-08 3.42858e-08 3.72217e-08 4.06157e-08 4.44325e-08 4.85788e-08 5.2913e-08 5.72427e-08 6.12827e-08 6.45386e-08
+ 6.61041e-08 6.51234e-08 1.79176e-07 7.0288e-07 7.03101e-07 1.79244e-07 6.51238e-08 6.61054e-08 6.45402e-08 6.12842e-08 5.7244e-08 5.29142e-08
+ 4.85799e-08 4.44336e-08 4.06166e-08 3.72226e-08 3.42867e-08 3.17718e-08 2.95485e-08 2.73614e-08 2.47697e-08 2.10439e-08 1.49859e-08 4.603e-09
+ 1.36657e-09 5.38704e-09 7.55517e-09 8.66966e-09 9.32845e-09 9.91863e-09 1.06819e-08 1.17691e-08 1.32795e-08 1.52868e-08 1.7856e-08 2.106e-08
+ 2.49966e-08 2.97813e-08 3.53959e-08 4.11756e-08 3.57589e-07 6.25994e-07 9.15456e-07 1.27505e-06 1.27513e-06 9.15479e-07 6.2601e-07 3.57592e-07
+ 4.1177e-08 3.5397e-08 2.97822e-08 2.49972e-08 2.10605e-08 1.78564e-08 1.5287e-08 1.32797e-08 1.17692e-08 1.0682e-08 9.91873e-09 9.32858e-09
+ 8.66985e-09 7.55542e-09 5.38733e-09 1.36674e-09
</DataArray>
<DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
- 7.54613e-07 1.06361e-05 0 9.55545e-07 1.59257e-05 0 -1.6009e-07 1.70935e-05 0 -1.1832e-06 1.68584e-05 0
- -2.03357e-06 1.59205e-05 0 -2.76507e-06 1.44888e-05 0 -3.41427e-06 1.26403e-05 0 -3.99529e-06 1.04149e-05 0
- -4.50784e-06 7.84438e-06 0 -4.94261e-06 4.96305e-06 0 -5.28408e-06 1.81336e-06 0 -5.51198e-06 -1.55024e-06 0
- -5.60235e-06 -5.05793e-06 0 -5.52887e-06 -8.62146e-06 0 -5.26476e-06 -1.21317e-05 0 -4.78606e-06 -1.54572e-05 0
- -4.07661e-06 -1.84453e-05 0 -3.13515e-06 -2.09266e-05 0 -1.98445e-06 -2.27258e-05 0 -6.80721e-07 -2.36825e-05 0
- 6.80711e-07 -2.36826e-05 0 1.98444e-06 -2.27259e-05 0 3.13515e-06 -2.09266e-05 0 4.07661e-06 -1.84453e-05 0
- 4.78606e-06 -1.54572e-05 0 5.26476e-06 -1.21317e-05 0 5.52887e-06 -8.62149e-06 0 5.60235e-06 -5.05796e-06 0
- 5.51198e-06 -1.55027e-06 0 5.28408e-06 1.81334e-06 0 4.94261e-06 4.96303e-06 0 4.50784e-06 7.84436e-06 0
- 3.99529e-06 1.04149e-05 0 3.41427e-06 1.26403e-05 0 2.76507e-06 1.44888e-05 0 2.03357e-06 1.59205e-05 0
- 1.1832e-06 1.68584e-05 0 1.60091e-07 1.70935e-05 0 -9.55544e-07 1.59257e-05 0 -7.54613e-07 1.06361e-05 0
- 4.38748e-07 2.08334e-05 0 1.55683e-07 3.25732e-05 0 -1.6724e-06 3.52932e-05 0 -3.90392e-06 3.48421e-05 0
- -6.08186e-06 3.28938e-05 0 -8.1051e-06 2.99481e-05 0 -9.96628e-06 2.61712e-05 0 -1.16639e-05 2.16368e-05 0
- -1.31818e-05 1.63997e-05 0 -1.4487e-05 1.05204e-05 0 -1.55314e-05 4.07679e-06 0 -1.62532e-05 -2.8288e-06 0
- -1.65786e-05 -1.00621e-05 0 -1.64252e-05 -1.74502e-05 0 -1.57063e-05 -2.4775e-05 0 -1.43412e-05 -3.1768e-05 0
- -1.22698e-05 -3.81085e-05 0 -9.47624e-06 -4.34288e-05 0 -6.01969e-06 -4.73325e-05 0 -2.06944e-06 -4.94345e-05 0
- 2.06941e-06 -4.94345e-05 0 6.01966e-06 -4.73325e-05 0 9.47622e-06 -4.34289e-05 0 1.22698e-05 -3.81085e-05 0
- 1.43412e-05 -3.1768e-05 0 1.57063e-05 -2.4775e-05 0 1.64252e-05 -1.74502e-05 0 1.65786e-05 -1.00621e-05 0
- 1.62532e-05 -2.82884e-06 0 1.55314e-05 4.07674e-06 0 1.4487e-05 1.05204e-05 0 1.31818e-05 1.63996e-05 0
- 1.16639e-05 2.16367e-05 0 9.96628e-06 2.61711e-05 0 8.10511e-06 2.99481e-05 0 6.08186e-06 3.28937e-05 0
- 3.90392e-06 3.48421e-05 0 1.6724e-06 3.52932e-05 0 -1.55681e-07 3.25732e-05 0 -4.38747e-07 2.08334e-05 0
- -1.99977e-07 2.05947e-05 0 -1.35648e-06 3.42516e-05 0 -3.67737e-06 3.77639e-05 0 -6.52716e-06 3.74527e-05 0
- -9.48666e-06 3.54206e-05 0 -1.23731e-05 3.2331e-05 0 -1.51134e-05 2.83898e-05 0 -1.76656e-05 2.3668e-05 0
- -1.99851e-05 1.82058e-05 0 -2.20127e-05 1.20471e-05 0 -2.36709e-05 5.25267e-06 0 -2.48623e-05 -2.09152e-06 0
- -2.54699e-05 -9.86624e-06 0 -2.53592e-05 -1.79102e-05 0 -2.43842e-05 -2.60089e-05 0 -2.24e-05 -3.38833e-05 0
- -1.92876e-05 -4.1177e-05 0 -1.49918e-05 -4.74497e-05 0 -9.57815e-06 -5.21818e-05 0 -3.30487e-06 -5.48088e-05 0
- 3.30482e-06 -5.48088e-05 0 9.57811e-06 -5.21818e-05 0 1.49917e-05 -4.74498e-05 0 1.92876e-05 -4.11771e-05 0
- 2.24e-05 -3.38833e-05 0 2.43841e-05 -2.6009e-05 0 2.53592e-05 -1.79102e-05 0 2.54699e-05 -9.86629e-06 0
- 2.48623e-05 -2.09157e-06 0 2.36709e-05 5.25262e-06 0 2.20127e-05 1.20471e-05 0 1.99851e-05 1.82058e-05 0
- 1.76656e-05 2.36679e-05 0 1.51134e-05 2.83898e-05 0 1.23731e-05 3.2331e-05 0 9.48666e-06 3.54205e-05 0
- 6.52716e-06 3.74527e-05 0 3.67738e-06 3.77638e-05 0 1.35648e-06 3.42515e-05 0 1.99978e-07 2.05946e-05 0
- -6.28719e-07 2.14234e-05 0 -2.57276e-06 3.65234e-05 0 -5.56216e-06 4.08023e-05 0 -9.05434e-06 4.07563e-05 0
- -1.27149e-05 3.87371e-05 0 -1.63618e-05 3.55479e-05 0 -1.98951e-05 3.14466e-05 0 -2.32447e-05 2.6513e-05 0
- -2.63414e-05 2.07769e-05 0 -2.91015e-05 1.42638e-05 0 -3.14195e-05 7.01225e-06 0 -3.31634e-05 -9.15781e-07 0
- -3.41714e-05 -9.42635e-06 0 -3.42506e-05 -1.83815e-05 0 -3.31817e-05 -2.75816e-05 0 -3.07334e-05 -3.67429e-05 0
- -2.66949e-05 -4.54683e-05 0 -2.09325e-05 -5.32167e-05 0 -1.34811e-05 -5.92799e-05 0 -4.67576e-06 -6.27894e-05 0
- 4.67569e-06 -6.27894e-05 0 1.34811e-05 -5.92799e-05 0 2.09325e-05 -5.32168e-05 0 2.66949e-05 -4.54684e-05 0
- 3.07334e-05 -3.6743e-05 0 3.31817e-05 -2.75817e-05 0 3.42506e-05 -1.83816e-05 0 3.41714e-05 -9.4264e-06 0
- 3.31634e-05 -9.15832e-07 0 3.14195e-05 7.0122e-06 0 2.91015e-05 1.42637e-05 0 2.63414e-05 2.07769e-05 0
- 2.32447e-05 2.6513e-05 0 1.98951e-05 3.14466e-05 0 1.63618e-05 3.55478e-05 0 1.27149e-05 3.87371e-05 0
- 9.05435e-06 4.07562e-05 0 5.56217e-06 4.08023e-05 0 2.57276e-06 3.65234e-05 0 6.28719e-07 2.14233e-05 0
- -9.21555e-07 2.29736e-05 0 -3.53617e-06 3.95318e-05 0 -7.26821e-06 4.45154e-05 0 -1.14912e-05 4.47584e-05 0
- -1.58992e-05 4.28035e-05 0 -2.03264e-05 3.95556e-05 0 -2.467e-05 3.53157e-05 0 -2.88478e-05 3.01714e-05 0
- -3.27745e-05 2.41419e-05 0 -3.63471e-05 1.72314e-05 0 -3.94348e-05 9.45031e-06 0 -4.18709e-05 8.26208e-07 0
- -4.34446e-05 -8.58665e-06 0 -4.38934e-05 -1.86932e-05 0 -4.29031e-05 -2.93292e-05 0 -4.01234e-05 -4.02233e-05 0
- -3.52077e-05 -5.09421e-05 0 -2.78921e-05 -6.08208e-05 0 -1.81328e-05 -6.88865e-05 0 -6.32792e-06 -7.3793e-05 0
- 6.32782e-06 -7.3793e-05 0 1.81327e-05 -6.88866e-05 0 2.78921e-05 -6.08209e-05 0 3.52077e-05 -5.09422e-05 0
- 4.01234e-05 -4.02234e-05 0 4.29031e-05 -2.93293e-05 0 4.38934e-05 -1.86933e-05 0 4.34446e-05 -8.58671e-06 0
- 4.18709e-05 8.26155e-07 0 3.94348e-05 9.45026e-06 0 3.63471e-05 1.72314e-05 0 3.27745e-05 2.41419e-05 0
- 2.88478e-05 3.01713e-05 0 2.467e-05 3.53157e-05 0 2.03264e-05 3.95556e-05 0 1.58992e-05 4.28034e-05 0
- 1.14912e-05 4.47584e-05 0 7.26822e-06 4.45154e-05 0 3.53617e-06 3.95318e-05 0 9.21556e-07 2.29736e-05 0
- -1.15274e-06 2.50479e-05 0 -4.3649e-06 4.32843e-05 0 -8.85401e-06 4.89841e-05 0 -1.38651e-05 4.95238e-05 0
- -1.90791e-05 4.766e-05 0 -2.43396e-05 4.43868e-05 0 -2.95486e-05 4.00371e-05 0 -3.46223e-05 3.47015e-05 0
- -3.9468e-05 2.83842e-05 0 -4.39691e-05 2.10628e-05 0 -4.79728e-05 1.27104e-05 0 -5.12774e-05 3.3069e-06 0
- -5.36172e-05 -7.15387e-06 0 -5.46448e-05 -1.86495e-05 0 -5.39244e-05 -3.10836e-05 0 -5.09471e-05 -4.4226e-05 0
- -4.51802e-05 -5.7622e-05 0 -3.6172e-05 -7.04648e-05 0 -2.37443e-05 -8.14296e-05 0 -8.33915e-06 -8.84599e-05 0
- 8.33902e-06 -8.846e-05 0 2.37442e-05 -8.14297e-05 0 3.61719e-05 -7.04649e-05 0 4.51802e-05 -5.76221e-05 0
- 5.09471e-05 -4.42261e-05 0 5.39244e-05 -3.10836e-05 0 5.46448e-05 -1.86496e-05 0 5.36172e-05 -7.15394e-06 0
- 5.12774e-05 3.30685e-06 0 4.79728e-05 1.27103e-05 0 4.39691e-05 2.10627e-05 0 3.9468e-05 2.83842e-05 0
- 3.46223e-05 3.47014e-05 0 2.95486e-05 4.00371e-05 0 2.43396e-05 4.43868e-05 0 1.90791e-05 4.766e-05 0
- 1.38651e-05 4.95238e-05 0 8.85402e-06 4.8984e-05 0 4.3649e-06 4.32843e-05 0 1.15274e-06 2.50479e-05 0
- -1.35675e-06 2.75574e-05 0 -5.12583e-06 4.7756e-05 0 -1.03673e-05 5.42429e-05 0 -1.61953e-05 5.5104e-05 0
- -2.226e-05 5.33585e-05 0 -2.84067e-05 5.00954e-05 0 -3.45449e-05 4.56757e-05 0 -4.05953e-05 4.0187e-05 0
- -4.64644e-05 3.36135e-05 0 -5.20276e-05 2.58977e-05 0 -5.71125e-05 1.69641e-05 0 -6.14807e-05 6.72594e-06 0
- -6.48024e-05 -4.91137e-06 0 -6.66277e-05 -1.80391e-05 0 -6.63681e-05 -3.2674e-05 0 -6.33153e-05 -4.86658e-05 0
- -5.67031e-05 -6.55613e-05 0 -4.58385e-05 -8.23983e-05 0 -3.03574e-05 -9.74049e-05 0 -1.07242e-05 -0.000107523 0
- 1.0724e-05 -0.000107523 0 3.03573e-05 -9.7405e-05 0 4.58384e-05 -8.23985e-05 0 5.67031e-05 -6.55615e-05 0
- 6.33153e-05 -4.86659e-05 0 6.63681e-05 -3.26741e-05 0 6.66277e-05 -1.80392e-05 0 6.48025e-05 -4.91144e-06 0
- 6.14807e-05 6.72588e-06 0 5.71126e-05 1.69641e-05 0 5.20276e-05 2.58977e-05 0 4.64644e-05 3.36134e-05 0
- 4.05953e-05 4.0187e-05 0 3.45449e-05 4.56757e-05 0 2.84067e-05 5.00954e-05 0 2.226e-05 5.33585e-05 0
- 1.61953e-05 5.5104e-05 0 1.03673e-05 5.42429e-05 0 5.12583e-06 4.7756e-05 0 1.35675e-06 2.75574e-05 0
- -1.54621e-06 3.04604e-05 0 -5.84568e-06 5.29216e-05 0 -1.18274e-05 6.03006e-05 0 -1.8482e-05 6.15289e-05 0
- -2.54246e-05 5.99409e-05 0 -3.24995e-05 5.67347e-05 0 -3.96252e-05 5.23003e-05 0 -4.67316e-05 4.67192e-05 0
- -5.37297e-05 3.99486e-05 0 -6.04904e-05 3.18865e-05 0 -6.68221e-05 2.23921e-05 0 -7.24434e-05 1.12873e-05 0
- -7.69476e-05 -1.64682e-06 0 -7.97623e-05 -1.66636e-05 0 -8.01179e-05 -3.39534e-05 0 -7.70711e-05 -5.34859e-05 0
- -6.95889e-05 -7.48357e-05 0 -5.67023e-05 -9.68752e-05 0 -3.78251e-05 -0.000117286 0 -1.34265e-05 -0.000131674 0
- 1.34263e-05 -0.000131674 0 3.7825e-05 -0.000117286 0 5.67022e-05 -9.68754e-05 0 6.95888e-05 -7.48359e-05 0
- 7.70711e-05 -5.3486e-05 0 8.01179e-05 -3.39535e-05 0 7.97623e-05 -1.66637e-05 0 7.69476e-05 -1.64689e-06 0
- 7.24434e-05 1.12873e-05 0 6.68222e-05 2.2392e-05 0 6.04904e-05 3.18864e-05 0 5.37298e-05 3.99485e-05 0
- 4.67317e-05 4.67192e-05 0 3.96252e-05 5.23003e-05 0 3.24995e-05 5.67347e-05 0 2.54246e-05 5.99409e-05 0
- 1.8482e-05 6.15289e-05 0 1.18274e-05 6.03006e-05 0 5.84569e-06 5.29216e-05 0 1.54621e-06 3.04604e-05 0
- -1.72409e-06 3.37307e-05 0 -6.52913e-06 5.87558e-05 0 -1.32309e-05 6.71499e-05 0 -2.07059e-05 6.88093e-05 0
- -2.85358e-05 6.7433e-05 0 -3.65646e-05 6.43463e-05 0 -4.47222e-05 5.99721e-05 0 -5.29513e-05 5.4383e-05 0
- -6.11708e-05 4.75024e-05 0 -6.92479e-05 3.91705e-05 0 -7.69678e-05 2.91597e-05 0 -8.39956e-05 1.71688e-05 0
- -8.98309e-05 2.81117e-06 0 -9.3759e-05 -1.43788e-05 0 -9.48078e-05 -3.48339e-05 0 -9.17825e-05 -5.86775e-05 0
- -8.33733e-05 -8.55355e-05 0 -6.8328e-05 -0.000114107 0 -4.58248e-05 -0.000141434 0 -1.63245e-05 -0.000161424 0
- 1.63242e-05 -0.000161425 0 4.58246e-05 -0.000141435 0 6.83278e-05 -0.000114108 0 8.33733e-05 -8.55357e-05 0
- 9.17825e-05 -5.86777e-05 0 9.48078e-05 -3.4834e-05 0 9.3759e-05 -1.43789e-05 0 8.98309e-05 2.81109e-06 0
- 8.39957e-05 1.71687e-05 0 7.69678e-05 2.91597e-05 0 6.92479e-05 3.91704e-05 0 6.11708e-05 4.75023e-05 0
- 5.29514e-05 5.4383e-05 0 4.47222e-05 5.99721e-05 0 3.65646e-05 6.43463e-05 0 2.85358e-05 6.7433e-05 0
- 2.07059e-05 6.88093e-05 0 1.32309e-05 6.71499e-05 0 6.52914e-06 5.87558e-05 0 1.72409e-06 3.37307e-05 0
- -1.88898e-06 3.73438e-05 0 -7.16911e-06 6.5228e-05 0 -1.45589e-05 7.47693e-05 0 -2.28312e-05 7.69371e-05 0
- -3.15378e-05 7.58417e-05 0 -4.05251e-05 7.29538e-05 0 -4.97372e-05 6.87343e-05 0 -5.9132e-05 6.32447e-05 0
- -6.8637e-05 5.63651e-05 0 -7.81129e-05 4.78607e-05 0 -8.73127e-05 3.73892e-05 0 -9.58332e-05 2.44877e-05 0
- -0.000103062 8.55655e-06 0 -0.000108128 -1.11309e-05 0 -0.00010985 -3.53104e-05 0 -0.000106792 -6.42841e-05 0
- -9.73856e-05 -9.77447e-05 0 -8.01137e-05 -0.000134215 0 -5.39255e-05 -0.000170018 0 -1.92591e-05 -0.000197008 0
- 1.92588e-05 -0.000197008 0 5.39253e-05 -0.000170018 0 8.01136e-05 -0.000134216 0 9.73855e-05 -9.7745e-05 0
- 0.000106792 -6.42843e-05 0 0.00010985 -3.53106e-05 0 0.000108128 -1.1131e-05 0 0.000103062 8.55647e-06 0
- 9.58333e-05 2.44876e-05 0 8.73127e-05 3.73892e-05 0 7.81129e-05 4.78606e-05 0 6.86371e-05 5.63651e-05 0
- 5.9132e-05 6.32447e-05 0 4.97373e-05 6.87343e-05 0 4.05252e-05 7.29538e-05 0 3.15378e-05 7.58417e-05 0
- 2.28312e-05 7.69371e-05 0 1.45589e-05 7.47693e-05 0 7.16912e-06 6.5228e-05 0 1.88898e-06 3.73438e-05 0
- -2.03736e-06 4.12701e-05 0 -7.75185e-06 7.22963e-05 0 -1.57819e-05 8.3121e-05 0 -2.48081e-05 8.58839e-05 0
- -3.43576e-05 8.5151e-05 0 -4.42821e-05 8.25564e-05 0 -5.45417e-05 7.86034e-05 0 -6.51102e-05 7.3339e-05 0
- -7.59217e-05 6.65874e-05 0 -8.68232e-05 5.80158e-05 0 -9.75231e-05 4.71338e-05 0 -0.000107534 3.32745e-05 0
- -0.000116116 1.5581e-05 0 -0.000122233 -6.97274e-06 0 -0.00012452 -3.54595e-05 0 -0.000121331 -7.03821e-05 0
- -0.000110877 -0.000111507 0 -9.14171e-05 -0.000157185 0 -6.16847e-05 -0.000202969 0 -2.20708e-05 -0.000238337 0
- 2.20705e-05 -0.000238338 0 6.16844e-05 -0.000202969 0 9.1417e-05 -0.000157186 0 0.000110877 -0.000111507 0
- 0.000121331 -7.03824e-05 0 0.00012452 -3.54597e-05 0 0.000122233 -6.97287e-06 0 0.000116116 1.55809e-05 0
- 0.000107534 3.32745e-05 0 9.75231e-05 4.71337e-05 0 8.68233e-05 5.80157e-05 0 7.59218e-05 6.65874e-05 0
- 6.51103e-05 7.33389e-05 0 5.45417e-05 7.86034e-05 0 4.42821e-05 8.25563e-05 0 3.43577e-05 8.5151e-05 0
- 2.48081e-05 8.58839e-05 0 1.57819e-05 8.31209e-05 0 7.75186e-06 7.22963e-05 0 2.03737e-06 4.12701e-05 0
- -2.16455e-06 4.5472e-05 0 -8.25948e-06 7.99038e-05 0 -1.68628e-05 9.21468e-05 0 -2.65763e-05 9.55978e-05 0
- -3.69079e-05 9.53183e-05 0 -4.77167e-05 9.31224e-05 0 -5.89798e-05 8.95601e-05 0 -7.06856e-05 8.46567e-05 0
- -8.2769e-05 7.81646e-05 0 -9.50539e-05 6.96249e-05 0 -0.000107191 5.83617e-05 0 -0.000118596 4.34623e-05 0
- -0.000128395 2.37743e-05 0 -0.000135393 -2.05083e-06 0 -0.000138078 -3.54095e-05 0 -0.000134655 -7.70447e-05 0
- -0.000123162 -0.00012679 0 -0.000101678 -0.000182847 0 -6.87334e-05 -0.000239984 0 -2.46309e-05 -0.000285039 0
- 2.46306e-05 -0.000285039 0 6.87332e-05 -0.000239984 0 0.000101678 -0.000182848 0 0.000123162 -0.00012679 0
- 0.000134655 -7.7045e-05 0 0.000138078 -3.54097e-05 0 0.000135393 -2.05098e-06 0 0.000128395 2.37742e-05 0
- 0.000118596 4.34622e-05 0 0.000107191 5.83617e-05 0 9.50539e-05 6.96249e-05 0 8.27691e-05 7.81646e-05 0
- 7.06857e-05 8.46567e-05 0 5.89799e-05 8.95601e-05 0 4.77167e-05 9.31224e-05 0 3.69079e-05 9.53183e-05 0
- 2.65763e-05 9.55978e-05 0 1.68628e-05 9.21468e-05 0 8.25949e-06 7.99038e-05 0 2.16456e-06 4.5472e-05 0
- -2.26523e-06 4.99018e-05 0 -8.67168e-06 8.79754e-05 0 -1.77595e-05 0.000101766 0 -2.80677e-05 0.000106 0
- -3.909e-05 0.00010627 0 -5.06948e-05 0.000104585 0 -6.28753e-05 0.000101542 0 -7.56304e-05 9.71361e-05 0
- -8.88891e-05 9.10274e-05 0 -0.000102442 8.25998e-05 0 -0.000115872 7.09542e-05 0 -0.000128493 5.48957e-05 0
- -0.000139304 3.29512e-05 0 -0.000146979 3.44501e-06 0 -0.000149897 -3.53022e-05 0 -0.000146166 -8.43061e-05 0
- -0.00013372 -0.000143467 0 -0.000110496 -0.00021088 0 -7.4825e-05 -0.000280566 0 -2.68572e-05 -0.000336526 0
- 2.68569e-05 -0.000336527 0 7.48248e-05 -0.000280567 0 0.000110496 -0.00021088 0 0.00013372 -0.000143467 0
- 0.000146166 -8.43064e-05 0 0.000149897 -3.53024e-05 0 0.000146979 3.44485e-06 0 0.000139304 3.2951e-05 0
- 0.000128493 5.48956e-05 0 0.000115872 7.09541e-05 0 0.000102442 8.25998e-05 0 8.88892e-05 9.10274e-05 0
- 7.56305e-05 9.71361e-05 0 6.28754e-05 0.000101542 0 5.06949e-05 0.000104585 0 3.909e-05 0.00010627 0
- 2.80677e-05 0.000106 0 1.77595e-05 0.000101766 0 8.67168e-06 8.79754e-05 0 2.26523e-06 4.99018e-05 0
- -2.33382e-06 5.45009e-05 0 -8.96703e-06 9.6416e-05 0 -1.84274e-05 0.000111874 0 -2.92097e-05 0.000116983 0
- -4.07991e-05 0.000117899 0 -5.30738e-05 0.000116835 0 -6.60408e-05 0.000114438 0 -7.97051e-05 0.000110659 0
- -9.3983e-05 0.000105041 0 -0.000108625 9.67805e-05 0 -0.000123142 8.47209e-05 0 -0.000136751 6.73588e-05 0
- -0.000148343 4.28914e-05 0 -0.000156495 9.3314e-06 0 -0.000159514 -3.52511e-05 0 -0.000155467 -9.21348e-05 0
- -0.000142239 -0.000161312 0 -0.000117659 -0.00024084 0 -7.98452e-05 -0.00032409 0 -2.87163e-05 -0.0003921 0
- 2.8716e-05 -0.0003921 0 7.9845e-05 -0.000324091 0 0.000117658 -0.000240841 0 0.000142239 -0.000161312 0
- 0.000155467 -9.21352e-05 0 0.000159514 -3.52514e-05 0 0.000156495 9.33122e-06 0 0.000148343 4.28913e-05 0
- 0.000136751 6.73588e-05 0 0.000123142 8.47209e-05 0 0.000108625 9.67805e-05 0 9.3983e-05 0.000105041 0
- 7.97052e-05 0.000110659 0 6.60408e-05 0.000114438 0 5.30738e-05 0.000116835 0 4.07991e-05 0.000117899 0
- 2.92098e-05 0.000116983 0 1.84274e-05 0.000111874 0 8.96704e-06 9.6416e-05 0 2.33382e-06 5.45009e-05 0
- -2.36491e-06 5.91996e-05 0 -9.12434e-06 0.00010511 0 -1.8822e-05 0.000122338 0 -2.99298e-05 0.000128409 0
- -4.19299e-05 0.000130062 0 -5.47105e-05 0.000129727 0 -6.829e-05 0.000128093 0 -8.26755e-05 0.000125054 0
- -9.77665e-05 0.000120015 0 -0.000113272 0.000111953 0 -0.000128636 9.94295e-05 0 -0.000142992 8.0615e-05 0
- -0.000155146 5.33814e-05 0 -0.00016361 1.54574e-05 0 -0.000166663 -3.53049e-05 0 -0.000162371 -0.00010042 0
- -0.000148612 -0.000180014 0 -0.000123126 -0.000272205 0 -8.37976e-05 -0.000369867 0 -3.02168e-05 -0.000451032 0
- 3.02166e-05 -0.000451033 0 8.37975e-05 -0.000369868 0 0.000123126 -0.000272206 0 0.000148611 -0.000180014 0
- 0.000162371 -0.00010042 0 0.000166663 -3.53052e-05 0 0.00016361 1.54572e-05 0 0.000155146 5.33812e-05 0
- 0.000142992 8.06149e-05 0 0.000128636 9.94294e-05 0 0.000113272 0.000111953 0 9.77666e-05 0.000120015 0
- 8.26755e-05 0.000125054 0 6.829e-05 0.000128093 0 5.47105e-05 0.000129727 0 4.19299e-05 0.000130062 0
- 2.99298e-05 0.000128409 0 1.8822e-05 0.000122338 0 9.12434e-06 0.00010511 0 2.36491e-06 5.91996e-05 0
- -2.35351e-06 6.3918e-05 0 -9.12381e-06 0.000113921 0 -1.89013e-05 0.000133002 0 -3.01587e-05 0.00014011 0
- -4.2382e-05 0.000142584 0 -5.54696e-05 0.000143073 0 -6.94493e-05 0.000142306 0 -8.43286e-05 0.000140106 0
- -9.9991e-05 0.000135717 0 -0.000116109 0.000127875 0 -0.000132072 0.000114836 0 -0.00014695 9.44417e-05 0
- -0.00015949 6.4249e-05 0 -0.00016817 2.17333e-05 0 -0.000171264 -3.54341e-05 0 -0.000166873 -0.000108974 0
- -0.000152895 -0.000199196 0 -0.000126994 -0.00030441 0 -8.6776e-05 -0.000417209 0 -3.13993e-05 -0.000512648 0
- 3.13991e-05 -0.000512649 0 8.67759e-05 -0.00041721 0 0.000126994 -0.00030441 0 0.000152895 -0.000199197 0
- 0.000166873 -0.000108975 0 0.000171264 -3.54344e-05 0 0.00016817 2.17331e-05 0 0.00015949 6.42489e-05 0
- 0.00014695 9.44416e-05 0 0.000132073 0.000114836 0 0.000116109 0.000127875 0 9.99911e-05 0.000135717 0
- 8.43286e-05 0.000140106 0 6.94493e-05 0.000142306 0 5.54696e-05 0.000143073 0 4.2382e-05 0.000142584 0
- 3.01587e-05 0.00014011 0 1.89013e-05 0.000133002 0 9.12381e-06 0.000113921 0 2.35351e-06 6.3918e-05 0
- -2.29542e-06 6.8567e-05 0 -8.94825e-06 0.000122695 0 -1.86278e-05 0.000143685 0 -2.98347e-05 0.000151892 0
- -4.2066e-05 0.000155257 0 -5.52313e-05 0.000156653 0 -6.93676e-05 0.000156842 0 -8.4485e-05 0.000155566 0
- -0.000100457 0.000151891 0 -0.000116932 0.000144293 0 -0.000133262 0.000130712 0 -0.000148476 0.000108656 0
- -0.000161285 7.53837e-05 0 -0.000170152 2.81454e-05 0 -0.000173371 -3.55326e-05 0 -0.000169094 -0.000117544 0
- -0.000155258 -0.00021844 0 -0.000129443 -0.000336881 0 -8.89292e-05 -0.000465469 0 -3.23236e-05 -0.000576371 0
- 3.23234e-05 -0.000576372 0 8.89291e-05 -0.000465469 0 0.000129443 -0.000336882 0 0.000155258 -0.000218441 0
- 0.000169094 -0.000117544 0 0.000173371 -3.55329e-05 0 0.000170152 2.81451e-05 0 0.000161285 7.53836e-05 0
- 0.000148476 0.000108656 0 0.000133263 0.000130712 0 0.000116932 0.000144293 0 0.000100457 0.000151891 0
- 8.4485e-05 0.000155566 0 6.93677e-05 0.000156842 0 5.52313e-05 0.000156653 0 4.20661e-05 0.000155257 0
- 2.98347e-05 0.000151892 0 1.86278e-05 0.000143685 0 8.94825e-06 0.000122695 0 2.29542e-06 6.8567e-05 0
- -2.18745e-06 7.30498e-05 0 -8.58404e-06 0.000131262 0 -1.79711e-05 0.000154185 0 -2.89066e-05 0.000163534 0
- -4.09075e-05 0.000167847 0 -5.38967e-05 0.000170218 0 -6.79228e-05 0.00017144 0 -8.30039e-05 0.000171167 0
- -9.90156e-05 0.000168274 0 -0.000115599 0.000160968 0 -0.000132093 0.000146862 0 -0.000147504 0.00012313 0
- -0.000160527 8.67422e-05 0 -0.000169624 3.47513e-05 0 -0.000173117 -3.54263e-05 0 -0.000169218 -0.000125826 0
- -0.000155908 -0.000237305 0 -0.000130679 -0.000369061 0 -9.04186e-05 -0.000514063 0 -3.30531e-05 -0.000641748 0
- 3.30529e-05 -0.000641748 0 9.04185e-05 -0.000514064 0 0.000130679 -0.000369061 0 0.000155908 -0.000237305 0
- 0.000169218 -0.000125827 0 0.000173117 -3.54267e-05 0 0.000169624 3.47511e-05 0 0.000160527 8.67421e-05 0
- 0.000147504 0.00012313 0 0.000132093 0.000146862 0 0.000115599 0.000160968 0 9.90156e-05 0.000168274 0
- 8.30039e-05 0.000171167 0 6.79228e-05 0.00017144 0 5.38967e-05 0.000170218 0 4.09076e-05 0.000167847 0
- 2.89067e-05 0.000163534 0 1.79711e-05 0.000154185 0 8.58405e-06 0.000131262 0 2.18745e-06 7.30499e-05 0
- -2.02766e-06 7.7265e-05 0 -8.02191e-06 0.000139438 0 -1.69092e-05 0.000164283 0 -2.73363e-05 0.000174798 0
- -3.88503e-05 0.000180098 0 -5.1391e-05 0.000183497 0 -6.50232e-05 0.00018582 0 -7.97826e-05 0.000186628 0
- -9.55629e-05 0.000184605 0 -0.000112021 0.000177679 0 -0.000128506 0.00016313 0 -0.000144022 0.00013779 0
- -0.000157262 9.83455e-05 0 -0.000166688 4.16708e-05 0 -0.000170648 -3.48929e-05 0 -0.000167417 -0.00013349 0
- -0.000155027 -0.000255342 0 -0.00013087 -0.00040041 0 -9.13714e-05 -0.000562473 0 -3.36375e-05 -0.000708438 0
- 3.36373e-05 -0.000708439 0 9.13713e-05 -0.000562473 0 0.00013087 -0.000400411 0 0.000155027 -0.000255342 0
- 0.000167417 -0.00013349 0 0.000170648 -3.48933e-05 0 0.000166688 4.16705e-05 0 0.000157262 9.83453e-05 0
- 0.000144022 0.00013779 0 0.000128506 0.00016313 0 0.000112022 0.000177679 0 9.5563e-05 0.000184605 0
- 7.97826e-05 0.000186628 0 6.50232e-05 0.00018582 0 5.1391e-05 0.000183497 0 3.88503e-05 0.000180098 0
- 2.73363e-05 0.000174798 0 1.69092e-05 0.000164283 0 8.02191e-06 0.000139438 0 2.02766e-06 7.7265e-05 0
- -1.81544e-06 8.11081e-05 0 -7.2574e-06 0.000147031 0 -1.54293e-05 0.00017375 0 -2.51e-05 0.00018543 0
- -3.5858e-05 0.000191738 0 -4.76649e-05 0.000196204 0 -6.06079e-05 0.000199688 0 -7.47523e-05 0.000201664 0
- -9.00301e-05 0.000200628 0 -0.00010614 0.000194226 0 -0.000122467 0.000179394 0 -0.000138034 0.00015261 0
- -0.000151535 0.000110266 0 -0.000161425 4.90665e-05 0 -0.000166069 -3.36848e-05 0 -0.000163802 -0.000140195 0
- -0.000152714 -0.000272115 0 -0.000130091 -0.000430417 0 -9.18407e-05 -0.000610215 0 -3.40977e-05 -0.000776173 0
- 3.40975e-05 -0.000776174 0 9.18406e-05 -0.000610216 0 0.000130091 -0.000430418 0 0.000152713 -0.000272115 0
- 0.000163802 -0.000140195 0 0.000166069 -3.36852e-05 0 0.000161425 4.90662e-05 0 0.000151535 0.000110265 0
- 0.000138034 0.00015261 0 0.000122467 0.000179394 0 0.00010614 0.000194226 0 9.00301e-05 0.000200628 0
- 7.47523e-05 0.000201664 0 6.0608e-05 0.000199688 0 4.7665e-05 0.000196204 0 3.5858e-05 0.000191738 0
- 2.51e-05 0.00018543 0 1.54293e-05 0.00017375 0 7.2574e-06 0.000147031 0 1.81544e-06 8.11081e-05 0
- -1.5516e-06 8.44751e-05 0 -6.29123e-06 0.000153845 0 -1.35289e-05 0.000182345 0 -2.21895e-05 0.000195166 0
- -3.19153e-05 0.000202486 0 -4.26951e-05 0.000208043 0 -5.46449e-05 0.000212741 0 -6.7873e-05 0.000215982 0
- -8.23721e-05 0.000216086 0 -9.79123e-05 0.000210418 0 -0.000113942 0.000195557 0 -0.000129525 0.000167597 0
- -0.000143355 0.000122608 0 -0.000153865 5.7124e-05 0 -0.000159411 -3.15521e-05 0 -0.000158388 -0.000145618 0
- -0.000148955 -0.000287212 0 -0.00012831 -0.000458587 0 -9.17934e-05 -0.000656812 0 -3.44209e-05 -0.000844692 0
- 3.44208e-05 -0.000844692 0 9.17933e-05 -0.000656813 0 0.00012831 -0.000458588 0 0.000148955 -0.000287213 0
- 0.000158388 -0.000145619 0 0.000159411 -3.15525e-05 0 0.000153865 5.71237e-05 0 0.000143355 0.000122608 0
- 0.000129525 0.000167597 0 0.000113942 0.000195557 0 9.79124e-05 0.000210418 0 8.23722e-05 0.000216086 0
- 6.78731e-05 0.000215982 0 5.46449e-05 0.000212741 0 4.26951e-05 0.000208043 0 3.19153e-05 0.000202486 0
- 2.21895e-05 0.000195166 0 1.35289e-05 0.000182345 0 6.29123e-06 0.000153845 0 1.5516e-06 8.44751e-05 0
- -1.23835e-06 8.72651e-05 0 -5.1293e-06 0.000159686 0 -1.12158e-05 0.000189828 0 -1.86127e-05 0.00020374 0
- -2.70285e-05 0.000212054 0 -3.64839e-05 0.000218711 0 -4.71296e-05 0.000224669 0 -5.91296e-05 0.000229282 0
- -7.25594e-05 0.000230714 0 -8.72921e-05 0.000226062 0 -0.000102875 0.000211526 0 -0.000118435 0.000182772 0
- -0.000132669 0.000135497 0 -0.000143962 6.60386e-05 0 -0.000150628 -2.82535e-05 0 -0.00015111 -0.000149458 0
- -0.00014366 -0.000300255 0 -0.000125414 -0.000484437 0 -9.11352e-05 -0.000701757 0 -3.45707e-05 -0.000913683 0
- 3.45706e-05 -0.000913684 0 9.11351e-05 -0.000701759 0 0.000125414 -0.000484438 0 0.00014366 -0.000300255 0
- 0.00015111 -0.000149459 0 0.000150628 -2.82539e-05 0 0.000143962 6.60383e-05 0 0.000132669 0.000135497 0
- 0.000118435 0.000182772 0 0.000102875 0.000211526 0 8.72921e-05 0.000226062 0 7.25594e-05 0.000230715 0
- 5.91296e-05 0.000229283 0 4.71296e-05 0.000224669 0 3.64839e-05 0.000218711 0 2.70285e-05 0.000212054 0
- 1.86127e-05 0.00020374 0 1.12159e-05 0.000189828 0 5.12931e-06 0.000159686 0 1.23835e-06 8.72651e-05 0
- -8.79248e-07 8.93827e-05 0 -3.78263e-06 0.000164363 0 -8.50824e-06 0.000195964 0 -1.43935e-05 0.000210887 0
- -2.12256e-05 0.000220155 0 -2.90605e-05 0.0002279 0 -3.80864e-05 0.000235152 0 -4.85315e-05 0.000241245 0
- -6.0575e-05 0.000244225 0 -7.42263e-05 0.000240936 0 -8.91733e-05 0.000227182 0 -0.000104641 0.000198143 0
- -0.000119339 0.000149058 0 -0.000131591 7.60219e-05 0 -0.000139625 -2.35366e-05 0 -0.000141878 -0.00015144 0
- -0.000136712 -0.00031089 0 -0.000121274 -0.000507486 0 -8.97621e-05 -0.000744499 0 -3.45073e-05 -0.000982761 0
- 3.45072e-05 -0.000982762 0 8.97621e-05 -0.0007445 0 0.000121274 -0.000507487 0 0.000136712 -0.000310891 0
- 0.000141878 -0.000151441 0 0.000139625 -2.3537e-05 0 0.000131591 7.60216e-05 0 0.000119339 0.000149058 0
- 0.000104641 0.000198143 0 8.91734e-05 0.000227182 0 7.42264e-05 0.000240936 0 6.0575e-05 0.000244225 0
- 4.85316e-05 0.000241245 0 3.80864e-05 0.000235152 0 2.90605e-05 0.0002279 0 2.12256e-05 0.000220155 0
- 1.43935e-05 0.000210887 0 8.50824e-06 0.000195964 0 3.78263e-06 0.000164363 0 8.79248e-07 8.93827e-05 0
- -4.79068e-07 9.0741e-05 0 -2.26699e-06 0.000167696 0 -5.43417e-06 0.000200524 0 -9.57193e-06 0.00021635 0
- -1.4557e-05 0.000226509 0 -2.04822e-05 0.000235306 0 -2.75714e-05 0.000243861 0 -3.61197e-05 0.00025153 0
- -4.64237e-05 0.000256288 0 -5.86631e-05 0.000254764 0 -7.27174e-05 0.000242356 0 -8.79651e-05 0.000213684 0
- -0.000103169 0.00016342 0 -0.000116576 8.73185e-05 0 -0.000126266 -1.71093e-05 0 -0.000130591 -0.000151289 0
- -0.00012802 -0.000318778 0 -0.000115805 -0.00052725 0 -8.76086e-05 -0.000784443 0 -3.42063e-05 -0.00105147 0
- 3.42063e-05 -0.00105148 0 8.76086e-05 -0.000784444 0 0.000115805 -0.000527251 0 0.00012802 -0.000318779 0
- 0.000130591 -0.00015129 0 0.000126266 -1.71097e-05 0 0.000116576 8.73182e-05 0 0.000103169 0.00016342 0
- 8.79652e-05 0.000213684 0 7.27175e-05 0.000242356 0 5.86632e-05 0.000254764 0 4.64237e-05 0.000256288 0
- 3.61197e-05 0.00025153 0 2.75714e-05 0.000243861 0 2.04822e-05 0.000235306 0 1.4557e-05 0.000226509 0
- 9.57192e-06 0.00021635 0 5.43417e-06 0.000200524 0 2.26699e-06 0.000167696 0 4.79069e-07 9.07411e-05 0
- -4.36163e-08 9.12637e-05 0 -6.02365e-07 0.00016952 0 -2.03088e-06 0.000203295 0 -4.20291e-06 0.000219888 0
- -7.09527e-06 0.000230848 0 -1.08364e-05 0.000240633 0 -1.56791e-05 0.000250466 0 -2.19778e-05 0.000259772 0
- -3.01506e-05 0.000266523 0 -4.05764e-05 0.000267194 0 -5.33874e-05 0.000256791 0 -6.82021e-05 0.000229312 0
- -8.39071e-05 0.000178702 0 -9.86779e-05 0.000100214 0 -0.000110371 -8.62114e-06 0 -0.000117136 -0.000148689 0
- -0.000117533 -0.000323551 0 -0.000108987 -0.000543238 0 -8.46647e-05 -0.000820974 0 -3.36647e-05 -0.00111935 0
- 3.36647e-05 -0.00111935 0 8.46648e-05 -0.000820976 0 0.000108987 -0.000543239 0 0.000117533 -0.000323552 0
- 0.000117136 -0.000148689 0 0.000110371 -8.62158e-06 0 9.86779e-05 0.000100214 0 8.39072e-05 0.000178701 0
- 6.82021e-05 0.000229312 0 5.33874e-05 0.000256791 0 4.05764e-05 0.000267194 0 3.01506e-05 0.000266523 0
- 2.19778e-05 0.000259772 0 1.56791e-05 0.000250466 0 1.08364e-05 0.000240633 0 7.09527e-06 0.000230848 0
- 4.2029e-06 0.000219888 0 2.03089e-06 0.000203295 0 6.02365e-07 0.00016952 0 4.36161e-08 9.12637e-05 0
- 4.20521e-07 9.08868e-05 0 1.1878e-06 0.000169688 0 1.65657e-06 0.000204087 0 1.6451e-06 0.00022128 0
- 1.06674e-06 0.000232927 0 -2.40249e-07 0.000243603 0 -2.54579e-06 0.000254645 0 -6.24607e-06 0.000265592 0
- -1.18665e-05 0.000274496 0 -1.99998e-05 0.00027778 0 -3.10909e-05 0.000270107 0 -4.51175e-05 0.000244837 0
- -6.12214e-05 0.000194985 0 -7.75586e-05 0.000115038 0 -9.16804e-05 2.36981e-06 0 -0.000101375 -0.000143221 0
- -0.000105221 -0.000324777 0 -0.000100837 -0.000554942 0 -8.09499e-05 -0.00085348 0 -3.28898e-05 -0.0011859 0
- 3.28898e-05 -0.0011859 0 8.09499e-05 -0.000853481 0 0.000100838 -0.000554943 0 0.000105221 -0.000324777 0
- 0.000101375 -0.000143221 0 9.16805e-05 2.36937e-06 0 7.75586e-05 0.000115038 0 6.12214e-05 0.000194985 0
- 4.51175e-05 0.000244837 0 3.10909e-05 0.000270107 0 1.99998e-05 0.000277781 0 1.18665e-05 0.000274496 0
- 6.24605e-06 0.000265592 0 2.54578e-06 0.000254645 0 2.4024e-07 0.000243603 0 -1.06674e-06 0.000232927 0
- -1.64511e-06 0.00022128 0 -1.65657e-06 0.000204087 0 -1.18781e-06 0.000169688 0 -4.20522e-07 9.08868e-05 0
- 9.06242e-07 8.95601e-05 0 3.07755e-06 0.000168076 0 5.5771e-06 0.00020273 0 7.89338e-06 0.000220332 0
- 9.82068e-06 0.000232526 0 1.11658e-05 0.000243965 0 1.16542e-05 0.000256099 0 1.08719e-05 0.00026862 0
- 8.22088e-06 0.000279739 0 2.92478e-06 0.000285966 0 -5.81679e-06 0.000281754 0 -1.8488e-05 0.000259888 0
- -3.4688e-05 0.000212239 0 -5.27189e-05 0.000132153 0 -6.97747e-05 1.64326e-05 0 -8.30647e-05 -0.000134299 0
- -9.10037e-05 -0.000321914 0 -9.13444e-05 -0.000561847 0 -7.64515e-05 -0.000881356 0 -3.18731e-05 -0.00125066 0
- 3.18732e-05 -0.00125066 0 7.64516e-05 -0.000881357 0 9.13446e-05 -0.000561848 0 9.10038e-05 -0.000321915 0
- 8.30648e-05 -0.000134299 0 6.97748e-05 1.64322e-05 0 5.27189e-05 0.000132153 0 3.4688e-05 0.000212238 0
- 1.8488e-05 0.000259888 0 5.81678e-06 0.000281754 0 -2.9248e-06 0.000285966 0 -8.22091e-06 0.00027974 0
- -1.08719e-05 0.00026862 0 -1.16542e-05 0.000256099 0 -1.11659e-05 0.000243965 0 -9.82069e-06 0.000232526 0
- -7.89338e-06 0.000220332 0 -5.5771e-06 0.00020273 0 -3.07755e-06 0.000168076 0 -9.06241e-07 8.95601e-05 0
- 1.40611e-06 8.72477e-05 0 5.03896e-06 0.000164585 0 9.67472e-06 0.000199087 0 1.44551e-05 0.000216879 0
- 1.9047e-05 0.00022946 0 2.32271e-05 0.000241506 0 2.67261e-05 0.000254571 0 2.91366e-05 0.00026852 0
- 2.98297e-05 0.000281797 0 2.79019e-05 0.000291132 0 2.22237e-05 0.000291008 0 1.17581e-05 0.000273771 0
- -3.81514e-06 0.000230129 0 -2.34011e-05 0.000151879 0 -4.39488e-05 3.43097e-05 0 -6.17572e-05 -0.000121078 0
- -7.46675e-05 -0.000314286 0 -8.03732e-05 -0.000563429 0 -7.10485e-05 -0.000903992 0 -3.05589e-05 -0.0013131 0
- 3.05591e-05 -0.0013131 0 7.10487e-05 -0.000903993 0 8.03734e-05 -0.00056343 0 7.46676e-05 -0.000314287 0
- 6.17573e-05 -0.000121078 0 4.39489e-05 3.43093e-05 0 2.34011e-05 0.000151879 0 3.81514e-06 0.000230129 0
- -1.17581e-05 0.000273771 0 -2.22237e-05 0.000291008 0 -2.7902e-05 0.000291132 0 -2.98297e-05 0.000281797 0
- -2.91366e-05 0.00026852 0 -2.67262e-05 0.000254571 0 -2.32271e-05 0.000241506 0 -1.90471e-05 0.00022946 0
- -1.44551e-05 0.000216879 0 -9.67472e-06 0.000199087 0 -5.03897e-06 0.000164585 0 -1.40612e-06 8.72477e-05 0
- 1.91247e-06 8.39292e-05 0 7.0424e-06 0.00015914 0 1.38887e-05 0.000193049 0 2.12351e-05 0.00021079 0
- 2.86157e-05 0.000223576 0 3.57773e-05 0.000236048 0 4.2465e-05 0.000249843 0 4.82963e-05 0.000265007 0
- 5.26473e-05 0.000280267 0 5.45441e-05 0.000292694 0 5.26214e-05 0.000297047 0 4.53404e-05 0.000285478 0
- 3.1505e-05 0.00024783 0 1.12378e-05 0.000174031 0 -1.30208e-05 5.69644e-05 0 -3.65913e-05 -0.000102353 0
- -5.56682e-05 -0.000301023 0 -6.75283e-05 -0.000559126 0 -6.44239e-05 -0.000920724 0 -2.88113e-05 -0.00137247 0
- 2.88114e-05 -0.00137247 0 6.44241e-05 -0.000920725 0 6.75284e-05 -0.000559127 0 5.56683e-05 -0.000301024 0
- 3.65914e-05 -0.000102354 0 1.30208e-05 5.6964e-05 0 -1.12378e-05 0.000174031 0 -3.1505e-05 0.00024783 0
- -4.53405e-05 0.000285478 0 -5.26215e-05 0.000297047 0 -5.45442e-05 0.000292694 0 -5.26473e-05 0.000280267 0
- -4.82964e-05 0.000265007 0 -4.2465e-05 0.000249843 0 -3.57773e-05 0.000236048 0 -2.86157e-05 0.000223576 0
- -2.12351e-05 0.00021079 0 -1.38887e-05 0.000193049 0 -7.04241e-06 0.00015914 0 -1.91247e-06 8.39292e-05 0
- 2.41738e-06 7.95993e-05 0 9.05623e-06 0.000151702 0 1.81528e-05 0.000184545 0 2.81288e-05 0.000201972 0
- 3.83831e-05 0.00021476 0 4.86357e-05 0.00022745 0 5.86521e-05 0.000241736 0 6.80893e-05 0.000257845 0
- 7.63558e-05 0.000274812 0 8.24626e-05 0.000290145 0 8.49016e-05 0.000299079 0 8.17122e-05 0.000293916 0
- 7.08868e-05 0.000264053 0 5.13888e-05 0.000197574 0 2.42364e-05 8.48327e-05 0 -5.93577e-06 -7.64789e-05 0
- -3.28188e-05 -0.000280938 0 -5.19502e-05 -0.00054822 0 -5.59546e-05 -0.00093073 0 -2.6375e-05 -0.00142765 0
- 2.63752e-05 -0.00142765 0 5.59549e-05 -0.000930731 0 5.19503e-05 -0.000548221 0 3.28189e-05 -0.000280938 0
- 5.93585e-06 -7.64794e-05 0 -2.42364e-05 8.48324e-05 0 -5.13888e-05 0.000197574 0 -7.08868e-05 0.000264053 0
- -8.17122e-05 0.000293916 0 -8.49017e-05 0.000299079 0 -8.24626e-05 0.000290146 0 -7.63558e-05 0.000274812 0
- -6.80893e-05 0.000257845 0 -5.86521e-05 0.000241736 0 -4.86357e-05 0.00022745 0 -3.83831e-05 0.00021476 0
- -2.81288e-05 0.000201972 0 -1.81528e-05 0.000184545 0 -9.05623e-06 0.000151702 0 -2.41738e-06 7.95993e-05 0
- 2.91251e-06 7.42694e-05 0 1.10461e-05 0.000142259 0 2.23932e-05 0.000173544 0 3.5018e-05 0.000190372 0
- 4.81868e-05 0.000202937 0 6.15981e-05 0.00021561 0 7.50466e-05 0.000230112 0 8.82408e-05 0.000246838 0
- 0.000100644 0.000265148 0 0.000111295 0.000283051 0 0.000118614 0.000296416 0 0.000120332 0.000298052 0
- 0.000113753 0.000277321 0 9.66072e-05 0.00022095 0 6.84053e-05 0.000116811 0 3.20901e-05 -4.19695e-05 0
- -4.03191e-06 -0.000252442 0 -3.20396e-05 -0.000529577 0 -4.45561e-05 -0.000932852 0 -2.2819e-05 -0.00147685 0
- 2.28193e-05 -0.00147685 0 4.45564e-05 -0.000932854 0 3.20398e-05 -0.000529577 0 4.03202e-06 -0.000252443 0
- -3.209e-05 -4.197e-05 0 -6.84053e-05 0.00011681 0 -9.66072e-05 0.00022095 0 -0.000113753 0.000277321 0
- -0.000120332 0.000298052 0 -0.000118614 0.000296416 0 -0.000111295 0.000283051 0 -0.000100644 0.000265148 0
- -8.82408e-05 0.000246838 0 -7.50466e-05 0.000230112 0 -6.15981e-05 0.00021561 0 -4.81869e-05 0.000202937 0
- -3.5018e-05 0.000190372 0 -2.23932e-05 0.000173544 0 -1.10461e-05 0.000142259 0 -2.91251e-06 7.42694e-05 0
- 3.38889e-06 6.7968e-05 0 1.29738e-05 0.000130842 0 2.65256e-05 0.000160062 0 4.17652e-05 0.000175989 0
- 5.78353e-05 0.000188081 0 7.44229e-05 0.000200467 0 9.13644e-05 0.000214865 0 0.000108436 0.00023182 0
- 0.000125178 0.00025102 0 0.000140695 0.000271012 0 0.000153402 0.000288429 0 0.00016082 0.000296903 0
- 0.000159654 0.000286214 0 0.000146461 0.000242396 0 0.000119173 0.000150855 0 7.89311e-05 5.42727e-07 0
- 3.38109e-05 -0.000213712 0 -5.23067e-06 -0.000501257 0 -2.85304e-05 -0.000925356 0 -1.74724e-05 -0.00151714 0
- 1.74728e-05 -0.00151714 0 2.85306e-05 -0.000925357 0 5.23086e-06 -0.000501258 0 -3.38108e-05 -0.000213713 0
- -7.8931e-05 5.42354e-07 0 -0.000119173 0.000150855 0 -0.000146461 0.000242396 0 -0.000159654 0.000286214 0
- -0.00016082 0.000296903 0 -0.000153402 0.000288429 0 -0.000140695 0.000271012 0 -0.000125178 0.00025102 0
- -0.000108436 0.00023182 0 -9.13644e-05 0.000214865 0 -7.44229e-05 0.000200467 0 -5.78353e-05 0.000188081 0
- -4.17652e-05 0.000175989 0 -2.65257e-05 0.000160062 0 -1.29738e-05 0.000130842 0 -3.38889e-06 6.79681e-05 0
- 3.83648e-06 6.07427e-05 0 1.4795e-05 0.000117524 0 3.04496e-05 0.000144174 0 4.82029e-05 0.000158885 0
- 6.7091e-05 0.000170227 0 8.68049e-05 0.000182019 0 0.000107241 0.000195935 0 0.000128265 0.000212654 0
- 0.00014953 0.000232178 0 0.000170253 0.000253614 0 0.000188917 0.000274456 0 0.000202951 0.000289425 0
- 0.000208591 0.000289219 0 0.000201301 0.000259875 0 0.000177285 0.000184681 0 0.00013604 4.82045e-05 0
- 8.3358e-05 -0.000163572 0 3.15209e-05 -0.000460518 0 -5.55221e-06 -0.000905722 0 -9.38575e-06 -0.001544 0
- 9.38613e-06 -0.001544 0 5.55251e-06 -0.000905723 0 -3.15208e-05 -0.000460519 0 -8.33579e-05 -0.000163573 0
- -0.000136039 4.82041e-05 0 -0.000177285 0.00018468 0 -0.000201301 0.000259875 0 -0.000208591 0.000289218 0
- -0.000202951 0.000289425 0 -0.000188917 0.000274456 0 -0.000170253 0.000253614 0 -0.00014953 0.000232178 0
- -0.000128265 0.000212654 0 -0.000107241 0.000195935 0 -8.6805e-05 0.000182019 0 -6.7091e-05 0.000170227 0
- -4.8203e-05 0.000158885 0 -3.04496e-05 0.000144174 0 -1.4795e-05 0.000117524 0 -3.83648e-06 6.07427e-05 0
- 4.24295e-06 5.26633e-05 0 1.64536e-05 0.000102434 0 3.40359e-05 0.000126027 0 5.41133e-05 0.000139201 0
- 7.56392e-05 0.000149497 0 9.83291e-05 0.000160346 0 0.000122163 0.000173339 0 0.00014713 0.000189258 0
- 0.000173043 0.000208396 0 0.000199303 0.000230414 0 0.000224571 0.000253724 0 0.000246341 0.000274352 0
- 0.000260586 0.000284406 0 0.000261871 0.000270694 0 0.00024459 0.000215159 0 0.000205672 9.789e-05 0
- 0.000147568 -0.000102472 0 8.22683e-05 -0.000404482 0 2.77947e-05 -0.000870211 0 2.75192e-06 -0.00155063 0
- -2.75152e-06 -0.00155063 0 -2.77943e-05 -0.000870212 0 -8.22681e-05 -0.000404483 0 -0.000147568 -0.000102473 0
- -0.000205672 9.78897e-05 0 -0.00024459 0.000215159 0 -0.000261871 0.000270694 0 -0.000260586 0.000284406 0
- -0.000246341 0.000274352 0 -0.000224571 0.000253724 0 -0.000199303 0.000230414 0 -0.000173043 0.000208396 0
- -0.00014713 0.000189258 0 -0.000122163 0.000173339 0 -9.83291e-05 0.000160346 0 -7.56392e-05 0.000149497 0
- -5.41133e-05 0.000139201 0 -3.4036e-05 0.000126027 0 -1.64536e-05 0.000102434 0 -4.24295e-06 5.26633e-05 0
- 4.59031e-06 4.383e-05 0 1.78684e-05 8.57785e-05 0 3.70981e-05 0.00010587 0 5.91817e-05 0.000117197 0
- 8.30217e-05 0.000126135 0 0.000108378 0.000135661 0 0.000135338 0.000147231 0 0.000164054 0.000161682 0
- 0.000194563 0.00017955 0 0.000226555 0.000201007 0 0.000259028 0.00022539 0 0.000289769 0.000250176 0
- 0.000314775 0.000269331 0 0.000327965 0.000271294 0 0.000321922 0.000237883 0 0.000290361 0.000145645 0
- 0.000231496 -3.3258e-05 0 0.000153993 -0.000330895 0 7.7172e-05 -0.000812504 0 2.08777e-05 -0.001527 0
- -2.08773e-05 -0.001527 0 -7.71717e-05 -0.000812504 0 -0.000153993 -0.000330895 0 -0.000231495 -3.32583e-05 0
- -0.000290361 0.000145645 0 -0.000321922 0.000237883 0 -0.000327965 0.000271294 0 -0.000314775 0.000269331 0
- -0.000289769 0.000250176 0 -0.000259028 0.00022539 0 -0.000226555 0.000201007 0 -0.000194563 0.00017955 0
- -0.000164054 0.000161682 0 -0.000135338 0.000147231 0 -0.000108378 0.000135661 0 -8.30217e-05 0.000126135 0
- -5.91817e-05 0.000117197 0 -3.70981e-05 0.00010587 0 -1.78684e-05 8.57785e-05 0 -4.59031e-06 4.383e-05 0
- 4.84493e-06 3.43948e-05 0 1.8896e-05 6.78845e-05 0 3.93217e-05 8.41091e-05 0 6.2891e-05 9.33052e-05 0
- 8.84906e-05 0.000100587 0 0.000115937 0.000108406 0 0.000145435 0.000118027 0 0.000177333 0.000130272 0
- 0.000211956 0.000145829 0 0.000249413 0.000165279 0 0.000289257 0.000188801 0 0.000329917 0.000215364 0
- 0.000367884 0.000241169 0 0.000396921 0.000257229 0 0.000408055 0.000246856 0 0.000391493 0.000184795 0
- 0.00034036 3.75904e-05 0 0.000255565 -0.000239446 0 0.000151341 -0.000722908 0 4.85812e-05 -0.00145755 0
- -4.85807e-05 -0.00145755 0 -0.000151341 -0.000722908 0 -0.000255564 -0.000239447 0 -0.000340359 3.75902e-05 0
- -0.000391493 0.000184795 0 -0.000408055 0.000246856 0 -0.000396921 0.000257229 0 -0.000367884 0.000241169 0
- -0.000329917 0.000215364 0 -0.000289257 0.000188801 0 -0.000249413 0.000165279 0 -0.000211956 0.000145829 0
- -0.000177333 0.000130272 0 -0.000145436 0.000118027 0 -0.000115937 0.000108406 0 -8.84907e-05 0.000100587 0
- -6.2891e-05 9.33052e-05 0 -3.93217e-05 8.41091e-05 0 -1.8896e-05 6.78845e-05 0 -4.84493e-06 3.43948e-05 0
- 4.93128e-06 2.46186e-05 0 1.92423e-05 4.92986e-05 0 4.01018e-05 6.14098e-05 0 6.42816e-05 6.82553e-05 0
- 9.06826e-05 7.36362e-05 0 0.000119166 7.94273e-05 0 0.00015004 8.66339e-05 0 0.000183839 9.59699e-05 0
- 0.000221205 0.000108142 0 0.000262764 0.000123951 0 0.000308858 0.00014419 0 0.000359015 0.000169158 0
- 0.00041098 0.000197444 0 0.000459357 0.000223541 0 0.000494526 0.000234241 0 0.000503497 0.000205001 0
- 0.000473666 9.83492e-05 0 0.000393391 -0.000135135 0 0.000261447 -0.000591052 0 9.18854e-05 -0.00131708 0
- -9.18849e-05 -0.00131708 0 -0.000261447 -0.000591053 0 -0.00039339 -0.000135135 0 -0.000473666 9.8349e-05 0
- -0.000503497 0.000205001 0 -0.000494526 0.000234241 0 -0.000459357 0.000223541 0 -0.00041098 0.000197444 0
- -0.000359015 0.000169158 0 -0.000308858 0.00014419 0 -0.000262764 0.000123951 0 -0.000221205 0.000108142 0
- -0.000183839 9.59699e-05 0 -0.00015004 8.66339e-05 0 -0.000119166 7.94273e-05 0 -9.06827e-05 7.36363e-05 0
- -6.42816e-05 6.82553e-05 0 -4.01018e-05 6.14099e-05 0 -1.92423e-05 4.92986e-05 0 -4.93128e-06 2.46186e-05 0
- 4.67267e-06 1.50146e-05 0 1.82746e-05 3.09896e-05 0 3.82108e-05 3.89232e-05 0 6.14537e-05 4.33193e-05 0
- 8.69325e-05 4.66924e-05 0 0.000114512 5.0308e-05 0 0.00014454 5.48515e-05 0 0.00017766 6.08331e-05 0
- 0.000214756 6.8817e-05 0 0.000256915 7.95584e-05 0 0.000305343 9.40602e-05 0 0.000361029 0.000113444 0
- 0.000423893 0.000138331 0 0.000491037 0.000167133 0 0.000554223 0.000192294 0 0.000598714 0.000193486 0
- 0.00060872 0.00012969 0 0.000557593 -3.50732e-05 0 0.000412951 -0.000414527 0 0.000157051 -0.00106814 0
- -0.000157051 -0.00106814 0 -0.00041295 -0.000414527 0 -0.000557593 -3.50734e-05 0 -0.00060872 0.00012969 0
- -0.000598714 0.000193486 0 -0.000554223 0.000192293 0 -0.000491037 0.000167133 0 -0.000423893 0.000138331 0
- -0.000361029 0.000113444 0 -0.000305343 9.40602e-05 0 -0.000256915 7.95584e-05 0 -0.000214756 6.88171e-05 0
- -0.00017766 6.08331e-05 0 -0.00014454 5.48515e-05 0 -0.000114512 5.0308e-05 0 -8.69325e-05 4.66924e-05 0
- -6.14537e-05 4.33193e-05 0 -3.82108e-05 3.89232e-05 0 -1.82746e-05 3.09896e-05 0 -4.67267e-06 1.50147e-05 0
- 3.69732e-06 6.64466e-06 0 1.47286e-05 1.47264e-05 0 3.12459e-05 1.87329e-05 0 5.06745e-05 2.08381e-05 0
- 7.1992e-05 2.23772e-05 0 9.50231e-05 2.40126e-05 0 0.000120054 2.60883e-05 0 0.00014767 2.886e-05 0
- 0.000178731 3.26332e-05 0 0.000214445 3.78695e-05 0 0.000256469 4.52974e-05 0 0.000306972 5.60171e-05 0
- 0.000368368 7.14976e-05 0 0.000442071 9.3119e-05 0 0.000525047 0.000120146 0 0.000604195 0.000141995 0
- 0.00066719 0.00010818 0 0.000680936 2.38173e-05 0 0.000568609 -0.000216448 0 0.00023469 -0.000676404 0
- -0.000234689 -0.000676404 0 -0.000568609 -0.000216448 0 -0.000680936 2.38173e-05 0 -0.000667189 0.00010818 0
- -0.000604194 0.000141995 0 -0.000525047 0.000120146 0 -0.000442071 9.3119e-05 0 -0.000368368 7.14976e-05 0
- -0.000306972 5.60171e-05 0 -0.000256469 4.52974e-05 0 -0.000214445 3.78695e-05 0 -0.000178731 3.26332e-05 0
- -0.00014767 2.886e-05 0 -0.000120054 2.60883e-05 0 -9.50232e-05 2.40126e-05 0 -7.1992e-05 2.23772e-05 0
- -5.06745e-05 2.08381e-05 0 -3.12459e-05 1.87329e-05 0 -1.47286e-05 1.47264e-05 0 -3.69732e-06 6.64466e-06 0
- 1.47367e-06 1.47367e-06 0 6.6436e-06 3.69626e-06 0 1.51146e-05 4.77472e-06 0 2.51858e-05 5.29649e-06 0
- 3.61347e-05 5.65242e-06 0 4.78141e-05 6.02695e-06 0 6.03491e-05 6.50804e-06 0 7.40155e-05 7.15844e-06 0
- 8.92314e-05 8.05742e-06 0 0.000106626 9.33726e-06 0 0.000127198 1.12342e-05 0 0.000152603 1.41715e-05 0
- 0.000185662 1.88876e-05 0 0.000231119 2.65692e-05 0 0.000296264 3.85752e-05 0 0.00038776 5.29211e-05 0
- 0.00048135 4.06687e-05 0 0.000540475 1.84569e-05 0 0.000500323 -5.8609e-05 0 0.000220857 -0.000220857 0
- -0.000220857 -0.000220857 0 -0.000500323 -5.86091e-05 0 -0.000540475 1.84569e-05 0 -0.00048135 4.06687e-05 0
- -0.00038776 5.29211e-05 0 -0.000296264 3.85752e-05 0 -0.000231119 2.65692e-05 0 -0.000185662 1.88876e-05 0
- -0.000152603 1.41715e-05 0 -0.000127198 1.12342e-05 0 -0.000106626 9.33726e-06 0 -8.92314e-05 8.05742e-06 0
- -7.40155e-05 7.15843e-06 0 -6.03491e-05 6.50804e-06 0 -4.78141e-05 6.02695e-06 0 -3.61347e-05 5.65242e-06 0
- -2.51858e-05 5.29649e-06 0 -1.51146e-05 4.77472e-06 0 -6.6436e-06 3.69626e-06 0 -1.47367e-06 1.47367e-06 0
+ -1.8836e-05 1.8836e-05 0 -5.5294e-05 1.76221e-05 0 -8.19639e-05 9.04774e-06 0 -9.38385e-05 2.82689e-06 0
+ -9.65808e-05 -8.45861e-08 0 -9.55122e-05 -9.84046e-07 0 -9.36063e-05 -9.21772e-07 0 -9.22408e-05 -4.43793e-07 0
+ -9.20414e-05 2.44384e-07 0 -9.33695e-05 1.08374e-06 0 -9.65143e-05 2.06104e-06 0 -0.000101692 3.1167e-06 0
+ -0.000108907 4.09866e-06 0 -0.000117706 4.69968e-06 0 -0.000126805 4.39927e-06 0 -0.000133639 2.43469e-06 0
+ -0.00013391 -2.16294e-06 0 -0.00012135 -1.03979e-05 0 -8.8922e-05 -2.20297e-05 0 -3.35537e-05 -3.33386e-05 0
+ 3.32049e-05 -3.342e-05 0 8.87231e-05 -2.20982e-05 0 0.000121258 -1.04364e-05 0 0.000133875 -2.18115e-06 0
+ 0.00013363 2.42693e-06 0 0.000126806 4.39647e-06 0 0.000117711 4.69901e-06 0 0.000108913 4.09879e-06 0
+ 0.000101697 3.11706e-06 0 9.65185e-05 2.06144e-06 0 9.33729e-05 1.08412e-06 0 9.20441e-05 2.44747e-07 0
+ 9.22428e-05 -4.43467e-07 0 9.36078e-05 -9.21577e-07 0 9.55136e-05 -9.84156e-07 0 9.65829e-05 -8.5216e-08 0
+ 9.38424e-05 2.82574e-06 0 8.19699e-05 9.04673e-06 0 5.53005e-05 1.76227e-05 0 1.88389e-05 1.88389e-05 0
+ -2.56043e-05 6.32763e-05 0 -8.0607e-05 6.46425e-05 0 -0.000130403 3.84932e-05 0 -0.000162516 1.73695e-05 0
+ -0.000180359 5.95771e-06 0 -0.0001897 1.2461e-06 0 -0.000194943 1.85129e-07 0 -0.000198971 1.11172e-06 0
+ -0.000203742 3.26015e-06 0 -0.000210625 6.27917e-06 0 -0.000220532 9.91736e-06 0 -0.000233881 1.37873e-05 0
+ -0.000250369 1.71311e-05 0 -0.000268497 1.85944e-05 0 -0.00028494 1.60458e-05 0 -0.000293867 6.54959e-06 0
+ -0.000286546 -1.33273e-05 0 -0.00025171 -4.66304e-05 0 -0.000178735 -9.11997e-05 0 -6.5926e-05 -0.000132346 0
+ 6.54711e-05 -0.000132568 0 0.000178416 -9.14126e-05 0 0.000251522 -4.67632e-05 0 0.000286447 -1.33966e-05 0
+ 0.000293818 6.51683e-06 0 0.000284916 1.60322e-05 0 0.000268485 1.85899e-05 0 0.00025036 1.71305e-05 0
+ 0.000233873 1.37882e-05 0 0.000220523 9.91861e-06 0 0.000210615 6.28044e-06 0 0.000203731 3.2613e-06 0
+ 0.00019896 1.1126e-06 0 0.000194932 1.85423e-07 0 0.00018969 1.24528e-06 0 0.000180351 5.95516e-06 0
+ 0.000162511 1.73651e-05 0 0.000130402 3.84891e-05 0 8.06089e-05 6.4643e-05 0 2.56057e-05 6.32834e-05 0
+ -2.00628e-05 0.000108943 0 -6.8313e-05 0.000122228 0 -0.000120844 8.32345e-05 0 -0.000163291 4.71887e-05 0
+ -0.000194038 2.47279e-05 0 -0.000215506 1.32851e-05 0 -0.000231017 8.90031e-06 0 -0.000243622 9.02911e-06 0
+ -0.00025575 1.22415e-05 0 -0.000269252 1.76834e-05 0 -0.000285424 2.45924e-05 0 -0.000304863 3.19002e-05 0
+ -0.000327119 3.77615e-05 0 -0.000350149 3.9123e-05 0 -0.00036961 3.14206e-05 0 -0.00037816 8.65253e-06 0
+ -0.000365165 -3.57472e-05 0 -0.000317527 -0.000106684 0 -0.000223555 -0.000198092 0 -8.20094e-05 -0.000279808 0
+ 8.16134e-05 -0.000280126 0 0.000223249 -0.000198435 0 0.000317322 -0.00010692 0 0.000365039 -3.58817e-05 0
+ 0.000378086 8.58332e-06 0 0.000369565 3.13889e-05 0 0.000350118 3.91108e-05 0 0.000327094 3.77586e-05 0
+ 0.00030484 3.19011e-05 0 0.000285401 2.45945e-05 0 0.000269228 1.76857e-05 0 0.000255724 1.22435e-05 0
+ 0.000243596 9.03037e-06 0 0.000230991 8.90022e-06 0 0.000215481 1.32827e-05 0 0.000194016 2.47223e-05 0
+ 0.000163273 4.71798e-05 0 0.000120832 8.32249e-05 0 6.83074e-05 0.000122225 0 2.00615e-05 0.000108951 0
+ -1.30837e-05 0.00014209 0 -4.82848e-05 0.000172533 0 -9.30086e-05 0.000130184 0 -0.000135335 8.50123e-05 0
+ -0.000171062 5.33787e-05 0 -0.000199842 3.48821e-05 0 -0.000223171 2.61438e-05 0 -0.000243173 2.43919e-05 0
+ -0.000261952 2.77855e-05 0 -0.000281325 3.50154e-05 0 -0.000302651 4.47585e-05 0 -0.000326578 5.5099e-05 0
+ -0.000352637 6.28777e-05 0 -0.000378663 6.30633e-05 0 -0.000400059 4.83376e-05 0 -0.000409084 9.31074e-06 0
+ -0.000394568 -6.39178e-05 0 -0.000342862 -0.000177857 0 -0.000241586 -0.000322167 0 -8.87161e-05 -0.00045015 0
+ 8.84018e-05 -0.000450525 0 0.000241328 -0.000322598 0 0.000342672 -0.000178174 0 0.00039444 -6.41117e-05 0
+ 0.000409001 9.2043e-06 0 0.000400005 4.82854e-05 0 0.000378624 6.30416e-05 0 0.000352604 6.28716e-05 0
+ 0.000326547 5.51e-05 0 0.000302619 4.4762e-05 0 0.000281292 3.50193e-05 0 0.000261917 2.77886e-05 0
+ 0.000243137 2.43936e-05 0 0.000223135 2.61431e-05 0 0.000199808 3.48777e-05 0 0.000171031 5.33693e-05 0
+ 0.000135309 8.49975e-05 0 9.29899e-05 0.000130167 0 4.82749e-05 0.000172522 0 1.30809e-05 0.000142093 0
+ -7.65797e-06 0.000162832 0 -3.06782e-05 0.000210013 0 -6.41322e-05 0.000170882 0 -0.000100087 0.000122595 0
+ -0.000134158 8.55949e-05 0 -0.000164615 6.19033e-05 0 -0.00019151 4.93467e-05 0 -0.000215859 4.55396e-05 0
+ -0.000239066 4.86234e-05 0 -0.000262555 5.70402e-05 0 -0.000287486 6.89902e-05 0 -0.000314431 8.17388e-05 0
+ -0.000342943 9.08096e-05 0 -0.000370961 8.91756e-05 0 -0.000394068 6.67288e-05 0 -0.000404743 1.06194e-05 0
+ -0.000391989 -9.24975e-05 0 -0.000342196 -0.000250776 0 -0.000242467 -0.000450252 0 -8.94191e-05 -0.000627982 0
+ 8.91625e-05 -0.000628393 0 0.000242247 -0.000450741 0 0.000342025 -0.000251154 0 0.000391867 -9.27421e-05 0
+ 0.000404663 1.04777e-05 0 0.000394016 6.66557e-05 0 0.000370924 8.91437e-05 0 0.000342913 9.08003e-05 0
+ 0.000314402 8.17403e-05 0 0.000287455 6.89959e-05 0 0.000262521 5.70466e-05 0 0.000239029 4.86284e-05 0
+ 0.000215821 4.55421e-05 0 0.000191471 4.93454e-05 0 0.000164578 6.18966e-05 0 0.000134124 8.55811e-05 0
+ 0.000100058 0.000122573 0 6.4112e-05 0.000170857 0 3.06673e-05 0.000209993 0 7.65496e-06 0.000162829 0
+ -4.00897e-06 0.000174499 0 -1.7645e-05 0.000235002 0 -4.02703e-05 0.000201972 0 -6.76405e-05 0.000154829 0
+ -9.64024e-05 0.000116193 0 -0.000124555 8.99157e-05 0 -0.000151365 7.50384e-05 0 -0.000177002 6.98338e-05 0
+ -0.000202173 7.27073e-05 0 -0.000227795 8.20678e-05 0 -0.000254694 9.57919e-05 0 -0.000283267 0.000110455 0
+ -0.000313052 0.000120391 0 -0.000342154 0.000116715 0 -0.000366523 8.66648e-05 0 -0.000379171 1.40067e-05 0
+ -0.000369709 -0.000118101 0 -0.000325036 -0.000319639 0 -0.000232115 -0.00057404 0 -8.61068e-05 -0.000803251 0
+ 8.58741e-05 -0.000803686 0 0.000231911 -0.000574569 0 0.000324873 -0.000320066 0 0.000369594 -0.000118393 0
+ 0.000379098 1.38294e-05 0 0.00036648 8.65696e-05 0 0.000342129 0.000116672 0 0.000313033 0.000120378 0
+ 0.000283248 0.000110458 0 0.000254672 9.58013e-05 0 0.000227769 8.2078e-05 0 0.000202143 7.27154e-05 0
+ 0.000176968 6.98379e-05 0 0.00015133 7.5037e-05 0 0.000124522 8.99068e-05 0 9.63719e-05 0.000116175 0
+ 6.76153e-05 0.000154801 0 4.02524e-05 0.000201938 0 1.76355e-05 0.000234973 0 4.00636e-06 0.00017449 0
+ -1.71511e-06 0.000180223 0 -8.7894e-06 0.000249988 0 -2.26547e-05 0.000223477 0 -4.17729e-05 0.000179814 0
+ -6.41122e-05 0.00014231 0 -8.80102e-05 0.00011585 0 -0.000112487 0.000100391 0 -0.000137229 9.48606e-05 0
+ -0.000162421 9.80429e-05 0 -0.000188515 0.00010845 0 -0.000215975 0.000123768 0 -0.000244954 0.000140031 0
+ -0.00027491 0.000150555 0 -0.000304075 0.000144818 0 -0.000328792 0.000107647 0 -0.000342768 1.96485e-05 0
+ -0.00033655 -0.000139423 0 -0.000298039 -0.000381502 0 -0.000214617 -0.000688518 0 -8.0142e-05 -0.000969256 0
+ 7.99061e-05 -0.00096971 0 0.000214409 -0.000689084 0 0.000297875 -0.00038198 0 0.000336439 -0.000139765 0
+ 0.000342704 1.94321e-05 0 0.000328763 0.000107527 0 0.000304065 0.000144764 0 0.000274908 0.00015054 0
+ 0.000244952 0.000140036 0 0.000215968 0.000123783 0 0.000188503 0.000108465 0 0.000162402 9.80553e-05 0
+ 0.000137207 9.48674e-05 0 0.000112463 0.00010039 0 8.79853e-05 0.00011584 0 6.40891e-05 0.000142289 0
+ 4.17537e-05 0.00017978 0 2.2641e-05 0.000223435 0 8.78219e-06 0.000249952 0 1.71314e-06 0.00018021 0
+ -3.27097e-07 0.000182265 0 -3.12998e-06 0.000257823 0 -1.06688e-05 0.000237046 0 -2.30722e-05 0.000197766 0
+ -3.94598e-05 0.000163085 0 -5.87237e-05 0.000138237 0 -7.9966e-05 0.000123723 0 -0.000102676 0.000118981 0
+ -0.000126717 0.000123154 0 -0.000152184 0.0001349 0 -0.000179199 0.000151792 0 -0.000207639 0.000169427 0
+ -0.000236805 0.00018028 0 -0.000264975 0.000172428 0 -0.00028884 0.000128619 0 -0.000302865 2.66776e-05 0
+ -0.000298809 -0.000156726 0 -0.000266062 -0.000435457 0 -0.000193034 -0.000791013 0 -7.25634e-05 -0.00112171 0
+ 7.231e-05 -0.00112218 0 0.000192813 -0.00079162 0 0.000265894 -0.000435992 0 0.000298701 -0.000157124 0
+ 0.000302811 2.64174e-05 0 0.000288823 0.000128471 0 0.00026498 0.00017236 0 0.000236819 0.000180262 0
+ 0.000207654 0.000169436 0 0.000179208 0.000151812 0 0.000152187 0.000134922 0 0.000126713 0.000123172 0
+ 0.000102667 0.000118991 0 7.99533e-05 0.000123724 0 5.87094e-05 0.000138227 0 3.94457e-05 0.000163061 0
+ 2.306e-05 0.000197729 0 1.066e-05 0.000236999 0 3.12529e-06 0.000257781 0 3.25786e-07 0.000182249 0
+ 4.71492e-07 0.000182121 0 2.54483e-07 0.000260988 0 -3.1464e-06 0.000244821 0 -1.07176e-05 0.000209965 0
+ -2.23794e-05 0.000178935 0 -3.75759e-05 0.000156847 0 -5.56334e-05 0.000144412 0 -7.60272e-05 0.000141395 0
+ -9.84535e-05 0.000147207 0 -0.000122752 0.000160614 0 -0.000148743 0.000179084 0 -0.000176011 0.000197844 0
+ -0.000203639 0.000208657 0 -0.000229866 0.000198447 0 -0.000251661 0.00014826 0 -0.000264263 3.36643e-05 0
+ -0.000260836 -0.000171195 0 -0.000232676 -0.000481895 0 -0.000169748 -0.00088053 0 -6.42045e-05 -0.0012582 0
+ 6.39338e-05 -0.0012587 0 0.000169516 -0.00088119 0 0.000232507 -0.000482495 0 0.000260734 -0.000171655 0
+ 0.000264216 3.33569e-05 0 0.000251654 0.000148082 0 0.000229882 0.000198364 0 0.000203666 0.000208635 0
+ 0.000176039 0.000197856 0 0.000148766 0.00017911 0 0.000122769 0.000160643 0 9.84632e-05 0.000147231 0
+ 7.60309e-05 0.000141411 0 5.56325e-05 0.000144417 0 3.7572e-05 0.000156839 0 2.23742e-05 0.000178911 0
+ 1.07124e-05 0.000209926 0 3.14229e-06 0.000244772 0 -2.56841e-07 0.000260943 0 -4.72194e-07 0.000182102 0
+ 8.68938e-07 0.00018078 0 2.04631e-06 0.000261368 0 1.07214e-06 0.000248816 0 -3.41092e-06 0.000218025 0
+ -1.17799e-05 0.000190906 0 -2.39053e-05 0.000172198 0 -3.93641e-05 0.000162578 0 -5.77051e-05 0.000161964 0
+ -7.85547e-05 0.000169914 0 -0.000101568 0.000185219 0 -0.0001263 0.000205201 0 -0.000152039 0.000224734 0
+ -0.000177611 0.000234969 0 -0.000201154 0.000221905 0 -0.000219857 0.000165299 0 -0.000229721 3.90913e-05 0
+ -0.000225426 -0.000184344 0 -0.000200423 -0.00052191 0 -0.000146591 -0.000957276 0 -5.57342e-05 -0.00137786 0
+ 5.5458e-05 -0.00137837 0 0.00014636 -0.000957998 0 0.000200262 -0.000522581 0 0.000225332 -0.000184866 0
+ 0.00022968 3.87371e-05 0 0.000219854 0.000165091 0 0.000201174 0.000221806 0 0.000177643 0.000234941 0
+ 0.000152073 0.000224747 0 0.000126332 0.000205233 0 0.000101595 0.000185255 0 7.8575e-05 0.000169945 0
+ 5.77193e-05 0.000161985 0 3.93732e-05 0.000162587 0 2.39105e-05 0.000172192 0 1.17822e-05 0.000190884 0
+ 3.41154e-06 0.000217986 0 -1.07233e-06 0.000248766 0 -2.04667e-06 0.000261322 0 -8.69095e-07 0.000180761 0
+ 9.95543e-07 0.000178916 0 2.73815e-06 0.000260312 0 2.94523e-06 0.000250639 0 1.51705e-07 0.000223479 0
+ -6.24835e-06 0.000200221 0 -1.63839e-05 0.000185144 0 -3.00389e-05 0.000178746 0 -4.68593e-05 0.000180958 0
+ -6.64469e-05 0.000191357 0 -8.83126e-05 0.000208655 0 -0.00011177 0.000229955 0 -0.000135815 0.000249764 0
+ -0.000159008 0.000258704 0 -0.00017936 0.000242066 0 -0.000194253 0.000178734 0 -0.000200434 4.1702e-05 0
+ -0.000194117 -0.000197567 0 -0.000170965 -0.000556842 0 -0.000124892 -0.00102225 0 -4.76617e-05 -0.00148097 0
+ 4.73985e-05 -0.00148151 0 0.000124678 -0.00102304 0 0.000170822 -0.000557583 0 0.000194035 -0.000198146 0
+ 0.000200397 4.13063e-05 0 0.000194247 0.000178498 0 0.000179376 0.00024195 0 0.000159036 0.000258669 0
+ 0.000135849 0.000249776 0 0.000111804 0.00022999 0 8.83437e-05 0.000208696 0 6.64734e-05 0.000191394 0
+ 4.68807e-05 0.000180985 0 3.00552e-05 0.000178759 0 1.63958e-05 0.000185142 0 6.25649e-06 0.000200202 0
+ -1.46594e-07 0.000223442 0 -2.94241e-06 0.00025059 0 -2.73695e-06 0.000260267 0 -9.95272e-07 0.000178897 0
+ 9.47786e-07 0.000176972 0 2.70483e-06 0.000258756 0 3.2239e-06 0.000251469 0 1.08069e-06 0.000227585 0
+ -4.42036e-06 0.000208016 0 -1.3532e-05 0.000196597 0 -2.61704e-05 0.000193587 0 -4.20633e-05 0.000198831 0
+ -6.07969e-05 0.000211806 0 -8.17532e-05 0.000231028 0 -0.000104019 0.000253305 0 -0.000126312 0.000272752 0
+ -0.00014694 0.000279536 0 -0.000163807 0.000258452 0 -0.000174498 0.000187931 0 -0.000176499 4.06883e-05 0
+ -0.000167493 -0.000211877 0 -0.000145209 -0.000587969 0 -0.000105498 -0.0010769 0 -4.03351e-05 -0.00156871 0
+ 4.01046e-05 -0.00156927 0 0.000105317 -0.00107777 0 0.000145094 -0.000588774 0 0.000167425 -0.000212499 0
+ 0.000176462 4.02607e-05 0 0.000174484 0.000187672 0 0.000163812 0.00025832 0 0.000146958 0.000279492 0
+ 0.000126338 0.00027276 0 0.000104049 0.000253339 0 8.17836e-05 0.000231072 0 6.08252e-05 0.000211846 0
+ 4.20881e-05 0.000198862 0 2.61909e-05 0.000193604 0 1.35482e-05 0.000196599 0 4.43238e-06 0.000208 0
+ -1.0725e-06 0.000227552 0 -3.21899e-06 0.000251422 0 -2.70255e-06 0.000258712 0 -9.47218e-07 0.000176954 0
+ 7.95576e-07 0.000175229 0 2.22219e-06 0.000257316 0 2.47851e-06 0.000252134 0 2.59475e-07 0.000231283 0
+ -5.13356e-06 0.000215213 0 -1.39799e-05 0.000207358 0 -2.62582e-05 0.000207742 0 -4.1746e-05 0.000216056 0
+ -6.00012e-05 0.000231569 0 -8.02765e-05 0.000252497 0 -0.000101443 0.000275269 0 -0.000121965 0.000293603 0
+ -0.000139936 0.000297285 0 -0.000153201 0.000270835 0 -0.000159596 0.000192634 0 -0.000157343 3.57343e-05 0
+ -0.000145466 -0.000227806 0 -0.000123449 -0.000616342 0 -8.88184e-05 -0.00112287 0 -3.39469e-05 -0.00164278 0
+ 3.37658e-05 -0.00164336 0 8.86818e-05 -0.00112381 0 0.000123367 -0.000617195 0 0.000145414 -0.000228457 0
+ 0.000157307 3.52874e-05 0 0.000159573 0.000192358 0 0.000153191 0.000270689 0 0.000139939 0.000297229 0
+ 0.000121978 0.000293603 0 0.000101464 0.0002753 0 8.03017e-05 0.00025254 0 6.00274e-05 0.000231612 0
+ 4.17708e-05 0.000216091 0 2.62801e-05 0.000207764 0 1.39981e-05 0.000207364 0 5.1477e-06 0.000215201 0
+ -2.49496e-07 0.000231253 0 -2.47237e-06 0.000252091 0 -2.21927e-06 0.000257275 0 -7.94832e-07 0.000175212 0
+ 5.87855e-07 0.000173846 0 1.48841e-06 0.000256372 0 1.12976e-06 0.00025318 0 -1.64006e-06 0.000235226 0
+ -7.46039e-06 0.000222483 0 -1.65687e-05 0.000218042 0 -2.89586e-05 0.000221726 0 -4.44227e-05 0.000233024 0
+ -6.24698e-05 0.000250904 0 -8.22178e-05 0.000273185 0 -0.000102336 0.000295865 0 -0.00012107 0.000312262 0
+ -0.000136357 0.000311885 0 -0.000146057 0.000279201 0 -0.000148316 0.000192922 0 -0.000142083 2.69603e-05 0
+ -0.000127539 -0.000245454 0 -0.00010553 -0.000642719 0 -7.49041e-05 -0.00116175 0 -2.85549e-05 -0.00170512 0
+ 2.84338e-05 -0.00170572 0 7.48186e-05 -0.00116275 0 0.000105483 -0.000643604 0 0.000127503 -0.000246115 0
+ 0.000142048 2.65074e-05 0 0.000148283 0.000192637 0 0.000146032 0.000279043 0 0.000136344 0.000311816 0
+ 0.000121068 0.000312251 0 0.000102345 0.000295888 0 8.22346e-05 0.000273224 0 6.24908e-05 0.000250945 0
+ 4.44448e-05 0.00023306 0 2.89796e-05 0.000221751 0 1.6587e-05 0.000218052 0 7.47516e-06 0.000222476 0
+ 1.65074e-06 0.0002352 0 -1.12312e-06 0.00025314 0 -1.48524e-06 0.000256334 0 -5.87037e-07 0.00017383 0
+ 3.58623e-07 0.000172899 0 6.44913e-07 0.000256132 0 -5.22276e-07 0.000254946 0 -4.12461e-06 0.000239832 0
+ -1.06851e-05 0.000230258 0 -2.03631e-05 0.000229054 0 -3.31401e-05 0.000235882 0 -4.87946e-05 0.000249987 0
+ -6.67668e-05 0.00026996 0 -8.60391e-05 0.00029315 0 -0.000105101 0.000315081 0 -0.000122027 0.000328705 0
+ -0.000134666 0.000323369 0 -0.00014097 0.000283721 0 -0.000139456 0.000189146 0 -0.000129767 1.48148e-05 0
+ -0.00011302 -0.000264599 0 -9.10104e-05 -0.000667592 0 -6.35509e-05 -0.00119497 0 -2.41144e-05 -0.00175769 0
+ 2.40573e-05 -0.00175831 0 6.35175e-05 -0.00119601 0 9.09954e-05 -0.000668489 0 0.000113 -0.000265255 0
+ 0.000129735 1.43681e-05 0 0.000139416 0.00018886 0 0.000140932 0.000283555 0 0.000134637 0.000323288 0
+ 0.00012201 0.000328682 0 0.000105098 0.000315094 0 8.6046e-05 0.000293181 0 6.67807e-05 0.000269998 0
+ 4.88121e-05 0.000250022 0 3.31584e-05 0.000235907 0 2.03801e-05 0.000229066 0 1.06993e-05 0.000230254 0
+ 4.13517e-06 0.00023981 0 5.28866e-07 0.000254911 0 -6.41784e-07 0.000256097 0 -3.57813e-07 0.000172886 0
+ 1.33807e-07 0.000172407 0 -2.11985e-07 0.000256684 0 -2.27407e-06 0.000257624 0 -6.83623e-06 0.000245319 0
+ -1.42613e-05 0.000238757 0 -2.4625e-05 0.000240597 0 -3.78804e-05 0.000250371 0 -5.37722e-05 0.000267044 0
+ -7.16628e-05 0.000288766 0 -9.0409e-05 0.000312362 0 -0.000108355 0.000332877 0 -0.000123459 0.000342938 0
+ -0.000133555 0.000331871 0 -0.000136761 0.000284728 0 -0.000131993 0.000181857 0 -0.000119521 -5.64936e-08 0
+ -0.000101167 -0.000284829 0 -7.93112e-05 -0.000691228 0 -5.44067e-05 -0.00122369 0 -2.05161e-05 -0.00180229 0
+ 2.05212e-05 -0.00180292 0 5.44218e-05 -0.00122476 0 7.93248e-05 -0.000692118 0 0.00010116 -0.000285466 0
+ 0.000119492 -4.87617e-07 0 0.00013195 0.000181576 0 0.000136714 0.000284557 0 0.000133515 0.00033178 0
+ 0.00012343 0.000342902 0 0.00010834 0.000332877 0 9.04058e-05 0.000312384 0 7.16688e-05 0.000288797 0
+ 5.37841e-05 0.000267076 0 3.78949e-05 0.000250396 0 2.46396e-05 0.000240611 0 1.42742e-05 0.000238756 0
+ 6.84608e-06 0.000245301 0 2.28027e-06 0.000257592 0 2.14866e-07 0.000256651 0 -1.33089e-07 0.000172395 0
+ -6.89268e-08 0.000172342 0 -1.02632e-06 0.000258052 0 -3.99028e-06 0.000261282 0 -9.50837e-06 0.000251741 0
+ -1.77712e-05 0.000248022 0 -2.87751e-05 0.000252699 0 -4.2438e-05 0.000265187 0 -5.84625e-05 0.000284144 0
+ -7.61378e-05 0.000307232 0 -9.42211e-05 0.000330726 0 -0.000110957 0.000349195 0 -0.000124248 0.000355015 0
+ -0.000131983 0.000337626 0 -0.000132496 0.000282691 0 -0.00012511 0.00017174 0 -0.000110611 -1.69106e-05 0
+ -9.13014e-05 -0.000305638 0 -6.98384e-05 -0.000713739 0 -4.7066e-05 -0.00124886 0 -1.76212e-05 -0.00184046 0
+ 1.76825e-05 -0.00184109 0 4.71235e-05 -0.00124993 0 6.98757e-05 -0.000714604 0 9.13056e-05 -0.000306245 0
+ 0.000110586 -1.73198e-05 0 0.000125066 0.00017147 0 0.000132445 0.00028252 0 0.000131935 0.000337526 0
+ 0.00012421 0.000354966 0 0.000110932 0.000349181 0 9.42089e-05 0.000330736 0 7.61363e-05 0.000307254 0
+ 5.84685e-05 0.000284171 0 4.24482e-05 0.000265211 0 2.87868e-05 0.000252713 0 1.77822e-05 0.000248023 0
+ 9.5171e-06 0.000251726 0 3.99589e-06 0.000261253 0 1.02889e-06 0.000258022 0 6.95329e-08 0.000172331 0
+ -2.4779e-07 0.000172659 0 -1.77182e-06 0.000260216 0 -5.57257e-06 0.000265882 0 -1.19373e-05 0.000259024 0
+ -2.08912e-05 0.000257956 0 -3.23577e-05 0.000265235 0 -4.62196e-05 0.000280176 0 -6.21426e-05 0.000301103 0
+ -7.93637e-05 0.000325169 0 -9.65816e-05 0.00034809 0 -0.000111997 0.000363982 0 -0.000123523 0.000365044 0
+ -0.000129152 0.000340962 0 -0.000127466 0.000278183 0 -0.00011817 0.000159565 0 -0.000102456 -3.49487e-05 0
+ -8.28535e-05 -0.000326511 0 -6.205e-05 -0.000735132 0 -4.11324e-05 -0.00127116 0 -1.52861e-05 -0.00187346 0
+ 1.53955e-05 -0.00187408 0 4.12249e-05 -0.00127221 0 6.21061e-05 -0.000735958 0 8.28677e-05 -0.000327083 0
+ 0.000102436 -3.53317e-05 0 0.000118128 0.00015931 0 0.000127415 0.000278015 0 0.000129101 0.000340855 0
+ 0.000123479 0.000364984 0 0.000111966 0.000363956 0 9.65623e-05 0.000348088 0 7.93556e-05 0.000325182 0
+ 6.2143e-05 0.000301124 0 4.62255e-05 0.000280196 0 3.23662e-05 0.000265249 0 2.09e-05 0.000257959 0
+ 1.19447e-05 0.000259012 0 5.57745e-06 0.000265857 0 1.77406e-06 0.00026019 0 2.48311e-07 0.000172649 0
+ -4.07431e-07 0.000173314 0 -2.43178e-06 0.00026311 0 -6.94173e-06 0.000271299 0 -1.39633e-05 0.000266993 0
+ -2.33668e-05 0.000268345 0 -3.5011e-05 0.000277957 0 -4.87513e-05 0.000295056 0 -6.42331e-05 0.000317628 0
+ -8.06785e-05 0.000342311 0 -9.67833e-05 0.000364271 0 -0.000110771 0.000377204 0 -0.00012062 0.000373197 0
+ -0.000124471 0.00034229 0 -0.000121157 0.000271855 0 -0.000110709 0.000146149 0 -9.45915e-05 -5.33645e-05 0
+ -7.53289e-05 -0.00034696 0 -5.54646e-05 -0.000755351 0 -3.62441e-05 -0.00129108 0 -1.3376e-05 -0.00190225 0
+ 1.35241e-05 -0.00190287 0 3.6364e-05 -0.0012921 0 5.55349e-05 -0.000756128 0 7.53512e-05 -0.000347491 0
+ 9.45781e-05 -5.3719e-05 0 0.000110673 0.000145911 0 0.000121109 0.000271692 0 0.000124421 0.000342181 0
+ 0.000120574 0.000373126 0 0.000110735 0.000377166 0 9.67593e-05 0.000364257 0 8.06654e-05 0.000342314 0
+ 6.42289e-05 0.000317641 0 4.87533e-05 0.000295072 0 3.50165e-05 0.000277969 0 2.33734e-05 0.000268347 0
+ 1.39693e-05 0.000266982 0 6.94584e-06 0.000271277 0 2.43371e-06 0.000263085 0 4.07877e-07 0.000173305 0
+ -5.4693e-07 0.000174268 0 -2.98588e-06 0.000266619 0 -8.0306e-06 0.000277345 0 -1.54564e-05 0.000275394 0
+ -2.49932e-05 0.000278884 0 -3.64468e-05 0.000290517 0 -4.96573e-05 0.000309447 0 -6.42778e-05 0.000333339 0
+ -7.95644e-05 0.000358332 0 -9.42773e-05 0.000379068 0 -0.000106734 0.000388852 0 -0.00011504 0.000379704 0
+ -0.000117507 0.000342101 0 -0.000113192 0.000264415 0 -0.000102372 0.000132321 0 -8.66233e-05 -7.14026e-05 0
+ -6.8287e-05 -0.000366521 0 -4.96577e-05 -0.000774284 0 -3.20805e-05 -0.00130894 0 -1.17692e-05 -0.00192757 0
+ 1.19467e-05 -0.00192817 0 3.22205e-05 -0.00130991 0 4.9738e-05 -0.000775004 0 6.83157e-05 -0.000367009 0
+ 8.66161e-05 -7.17282e-05 0 0.000102342 0.000132099 0 0.00011315 0.00026426 0 0.00011746 0.00034199 0
+ 0.000114996 0.000379627 0 0.000106698 0.000388803 0 9.4251e-05 0.000379042 0 7.95481e-05 0.000358325 0
+ 6.42702e-05 0.000333344 0 4.9656e-05 0.000309458 0 3.64495e-05 0.000290526 0 2.49978e-05 0.000278886 0
+ 1.5461e-05 0.000275385 0 8.03395e-06 0.000277324 0 2.98748e-06 0.000266596 0 5.47302e-07 0.00017426 0
+ -6.61622e-07 0.000175477 0 -3.40935e-06 0.000270597 0 -8.77651e-06 0.000283779 0 -1.63045e-05 0.000283914 0
+ -2.56021e-05 0.000289198 0 -3.64353e-05 0.000302489 0 -4.86464e-05 0.000322897 0 -6.19293e-05 0.000347793 0
+ -7.563e-05 0.000372865 0 -8.86479e-05 0.000392265 0 -9.94727e-05 0.000398935 0 -0.000106395 0.000384849 0
+ -0.00010791 0.00034094 0 -0.000103255 0.000256608 0 -9.28359e-05 0.000118889 0 -7.81836e-05 -8.83722e-05 0
+ -6.13261e-05 -0.000384745 0 -4.42506e-05 -0.000791764 0 -2.83578e-05 -0.00132493 0 -1.03571e-05 -0.00194989 0
+ 1.05553e-05 -0.00195047 0 2.85113e-05 -0.00132583 0 4.43374e-05 -0.000792423 0 6.136e-05 -0.00038519 0
+ 7.81824e-05 -8.86698e-05 0 9.28128e-05 0.000118684 0 0.000103219 0.000256461 0 0.00010787 0.00034083 0
+ 0.000106355 0.000384767 0 9.94384e-05 0.000398878 0 8.86217e-05 0.00039223 0 7.56124e-05 0.000372849 0
+ 6.19196e-05 0.000347791 0 4.86429e-05 0.000322902 0 3.64359e-05 0.000302495 0 2.56049e-05 0.000289199 0
+ 1.63079e-05 0.000283906 0 8.77914e-06 0.00028376 0 3.41066e-06 0.000270576 0 6.61929e-07 0.00017547 0
+ -7.43293e-07 0.000176882 0 -3.67036e-06 0.000274867 0 -9.11341e-06 0.000290319 0 -1.6403e-05 0.000292192 0
+ -2.50493e-05 0.000298865 0 -3.47946e-05 0.000313401 0 -4.5502e-05 0.000334903 0 -5.69399e-05 0.000360507 0
+ -6.86001e-05 0.000385512 0 -7.95966e-05 0.000403633 0 -8.86727e-05 0.000407468 0 -9.43662e-05 0.000388931 0
+ -9.53678e-05 0.000339374 0 -9.10265e-05 0.000249177 0 -8.17536e-05 0.000106627 0 -6.88866e-05 -0.00010363 0
+ -5.40471e-05 -0.000401184 0 -3.88839e-05 -0.000807564 0 -2.48134e-05 -0.0013391 0 -9.03933e-06 -0.0019695 0
+ 9.25066e-06 -0.00197007 0 2.4975e-05 -0.00133992 0 3.89747e-05 -0.00080816 0 5.40853e-05 -0.000401587 0
+ 6.88915e-05 -0.000103902 0 8.17379e-05 0.000106439 0 9.09988e-05 0.000249038 0 9.53344e-05 0.000339266 0
+ 9.43324e-05 0.000388846 0 8.86424e-05 0.000407405 0 7.95723e-05 0.00040359 0 6.85828e-05 0.000385488 0
+ 5.69293e-05 0.000360499 0 4.5497e-05 0.000334904 0 3.47936e-05 0.000313404 0 2.50507e-05 0.000298864 0
+ 1.64054e-05 0.000292183 0 9.11543e-06 0.000290301 0 3.67141e-06 0.000274847 0 7.43542e-07 0.000176875 0
+ -7.78689e-07 0.000178404 0 -3.72501e-06 0.000279218 0 -8.96316e-06 0.000296649 0 -1.56432e-05 0.000299832 0
+ -2.32023e-05 0.00030743 0 -3.1377e-05 0.000322755 0 -4.00694e-05 0.000344949 0 -4.91513e-05 0.000370982 0
+ -5.83075e-05 0.000395854 0 -6.69329e-05 0.000412913 0 -7.41039e-05 0.000414436 0 -7.86754e-05 0.000392229 0
+ -7.95531e-05 0.000337956 0 -7.61367e-05 0.000242838 0 -6.87098e-05 9.62668e-05 0 -5.82829e-05 -0.000116563 0
+ -4.601e-05 -0.000415363 0 -3.31843e-05 -0.000821374 0 -2.11855e-05 -0.00135136 0 -7.71732e-06 -0.00198648 0
+ 7.93511e-06 -0.00198703 0 2.13507e-05 -0.0013521 0 3.3277e-05 -0.000821906 0 4.60519e-05 -0.000415726 0
+ 5.82937e-05 -0.00011681 0 6.87018e-05 9.60936e-05 0 7.61175e-05 0.000242708 0 7.95281e-05 0.000337851 0
+ 7.86489e-05 0.000392143 0 7.40791e-05 0.000414368 0 6.69121e-05 0.000412865 0 5.8292e-05 0.000395824 0
+ 4.91411e-05 0.000370968 0 4.00638e-05 0.000344945 0 3.13751e-05 0.000322755 0 2.32028e-05 0.000307428 0
+ 1.56448e-05 0.000299822 0 8.9647e-06 0.000296632 0 3.72585e-06 0.000279199 0 7.7889e-07 0.000178398 0
+ -7.51363e-07 0.000179934 0 -3.51623e-06 0.000283399 0 -8.22755e-06 0.000302417 0 -1.39e-05 0.000306416 0
+ -1.99245e-05 0.00031443 0 -2.60506e-05 0.000330057 0 -3.22358e-05 0.000352525 0 -3.8476e-05 0.000378728 0
+ -4.46789e-05 0.000403467 0 -5.05679e-05 0.000419814 0 -5.56187e-05 0.000419756 0 -5.90761e-05 0.000394937 0
+ -6.01077e-05 0.000337157 0 -5.81299e-05 0.000238243 0 -5.31768e-05 8.84823e-05 0 -4.58125e-05 -0.00012657 0
+ -3.66896e-05 -0.000426752 0 -2.67285e-05 -0.000832772 0 -1.71911e-05 -0.00136149 0 -6.2869e-06 -0.00200072 0
+ 6.50538e-06 -0.00200124 0 1.7356e-05 -0.00136216 0 2.68217e-05 -0.000833243 0 3.67351e-05 -0.000427078 0
+ 4.58293e-05 -0.000126795 0 5.31766e-05 8.83226e-05 0 5.81194e-05 0.00023812 0 6.00915e-05 0.000337056 0
+ 5.90576e-05 0.000394852 0 5.56005e-05 0.000419686 0 5.05518e-05 0.000419762 0 4.46662e-05 0.000403432 0
+ 3.8467e-05 0.000378709 0 3.22305e-05 0.000352517 0 2.60483e-05 0.000330054 0 1.99243e-05 0.000314426 0
+ 1.3901e-05 0.000306406 0 8.22873e-06 0.0003024 0 3.51691e-06 0.000283381 0 7.5153e-07 0.000179928 0
+ -6.41937e-07 0.000181327 0 -2.97488e-06 0.000287104 0 -6.78628e-06 0.000307236 0 -1.10232e-05 0.000311507 0
+ -1.5059e-05 0.000319399 0 -1.86754e-05 0.00033483 0 -2.18996e-05 0.000357161 0 -2.48605e-05 0.000383293 0
+ -2.76998e-05 0.000407944 0 -3.04892e-05 0.000424016 0 -3.31439e-05 0.000423261 0 -3.53612e-05 0.000397108 0
+ -3.66404e-05 0.000337297 0 -3.64442e-05 0.000235928 0 -3.44802e-05 8.38795e-05 0 -3.07654e-05 -0.000133047 0
+ -2.54374e-05 -0.000434727 0 -1.90132e-05 -0.000841183 0 -1.25093e-05 -0.00136912 0 -4.63425e-06 -0.00201187 0
+ 4.84827e-06 -0.00201236 0 1.26708e-05 -0.0013697 0 1.91062e-05 -0.000841597 0 2.54866e-05 -0.000435018 0
+ 3.07886e-05 -0.000133251 0 3.4488e-05 8.37321e-05 0 3.64426e-05 0.000235813 0 3.66332e-05 0.0003372 0
+ 3.5351e-05 0.000397024 0 3.31326e-05 0.00042319 0 3.04783e-05 0.000423961 0 2.76905e-05 0.000407907 0
+ 2.48535e-05 0.000383271 0 2.1895e-05 0.00035715 0 1.86732e-05 0.000334825 0 1.50586e-05 0.000319393 0
+ 1.10239e-05 0.000311497 0 6.78725e-06 0.000307219 0 2.97547e-06 0.000287086 0 6.42083e-07 0.000181322 0
+ -4.22214e-07 0.000182391 0 -2.01195e-06 0.000289962 0 -4.49472e-06 0.000310671 0 -6.83572e-06 0.000314649 0
+ -8.42217e-06 0.000321879 0 -9.08641e-06 0.000336631 0 -8.93668e-06 0.000358435 0 -8.23561e-06 0.000384279 0
+ -7.3503e-06 0.000408912 0 -6.69512e-06 0.000425182 0 -6.63333e-06 0.000424687 0 -7.35076e-06 0.000398616 0
+ -8.74879e-06 0.000338466 0 -1.04244e-05 0.000236239 0 -1.17865e-05 8.29671e-05 0 -1.22649e-05 -0.000135371 0
+ -1.14635e-05 -0.000438533 0 -9.43715e-06 -0.000845828 0 -6.77655e-06 -0.00137364 0 -2.63874e-06 -0.00201936 0
+ 2.84359e-06 -0.00201983 0 6.932e-06 -0.00137414 0 9.52964e-06 -0.00084619 0 1.15169e-05 -0.000438793 0
+ 1.2295e-05 -0.000135557 0 1.18026e-05 8.28308e-05 0 1.04319e-05 0.000236131 0 8.7507e-06 0.000338373 0
+ 7.34893e-06 0.000398534 0 6.62913e-06 0.000424618 0 6.68975e-06 0.000425127 0 7.34482e-06 0.000408873 0
+ 8.2309e-06 0.000384256 0 8.93333e-06 0.000358422 0 9.08465e-06 0.000336624 0 8.42185e-06 0.000321872 0
+ 6.83636e-06 0.000314638 0 4.49562e-06 0.000310655 0 2.01251e-06 0.000289946 0 4.22355e-07 0.000182386 0
+ -5.02383e-08 0.000182864 0 -5.07725e-07 0.000291537 0 -1.17701e-06 0.000312249 0 -1.13353e-06 0.00031537 0
+ 1.93289e-07 0.000321418 0 2.90683e-06 0.000335042 0 6.81274e-06 0.000355968 0 1.15217e-05 0.000381336 0
+ 1.64613e-05 0.00040603 0 2.0899e-05 0.000422971 0 2.40383e-05 0.000423697 0 2.51937e-05 0.000399168 0
+ 2.40072e-05 0.000340499 0 2.06396e-05 0.00023925 0 1.58371e-05 8.61208e-05 0 1.06879e-05 -0.000132897 0
+ 6.14699e-06 -0.000437267 0 2.70516e-06 -0.000845678 0 4.03745e-07 -0.00137415 0 -1.88737e-07 -0.0020224 0
+ 3.80095e-07 -0.00202285 0 -2.56511e-07 -0.00137458 0 -2.61254e-06 -0.000845995 0 -6.08833e-06 -0.0004375 0
+ -1.06502e-05 -0.000133066 0 -1.58123e-05 8.59947e-05 0 -2.0623e-05 0.000239148 0 -2.39965e-05 0.000340411 0
+ -2.51875e-05 0.00039909 0 -2.40358e-05 0.00042363 0 -2.08991e-05 0.000422917 0 -1.6463e-05 0.000405992 0
+ -1.1524e-05 0.000381312 0 -6.81464e-06 0.000355954 0 -2.90783e-06 0.000335034 0 -1.93246e-07 0.00032141 0
+ 1.13434e-06 0.000315358 0 1.17801e-06 0.000312232 0 5.08337e-07 0.000291521 0 5.03907e-08 0.000182859 0
+ 5.07696e-07 0.000182406 0 1.65304e-06 0.000291307 0 3.35732e-06 0.000311444 0 6.31248e-06 0.000313176 0
+ 1.10274e-05 0.000317571 0 1.75355e-05 0.000329668 0 2.55598e-05 0.000349411 0 3.46019e-05 0.000374141 0
+ 4.39155e-05 0.000398972 0 5.24877e-05 0.00041702 0 5.91182e-05 0.000419879 0 6.26242e-05 0.000398325 0
+ 6.21465e-05 0.000343006 0 5.74906e-05 0.000244766 0 4.93628e-05 9.35347e-05 0 3.91793e-05 -0.000124978 0
+ 2.84256e-05 -0.000429891 0 1.82396e-05 -0.000839426 0 9.45167e-06 -0.00136932 0 2.79464e-06 -0.00201999 0
+ -2.6201e-06 -0.00202042 0 -9.31412e-06 -0.00136969 0 -1.81452e-05 -0.000839705 0 -2.83605e-05 -0.000430099 0
+ -3.91334e-05 -0.000125132 0 -4.93292e-05 9.34184e-05 0 -5.74653e-05 0.000244671 0 -6.21275e-05 0.000342923 0
+ -6.26106e-05 0.000398252 0 -5.91095e-05 0.000419816 0 -5.2483e-05 0.000416969 0 -4.39137e-05 0.000398935 0
+ -3.46017e-05 0.000374118 0 -2.55602e-05 0.000349397 0 -1.75355e-05 0.000329659 0 -1.10268e-05 0.000317562 0
+ -6.31131e-06 0.000313163 0 -3.35609e-06 0.000311428 0 -1.65232e-06 0.000291291 0 -5.07517e-07 0.000182402 0
+ 1.27291e-06 0.000180626 0 4.56457e-06 0.00028865 0 9.29685e-06 0.000307664 0 1.57538e-05 0.000307544 0
+ 2.4354e-05 0.000309888 0 3.50662e-05 0.000320131 0 4.75494e-05 0.000338441 0 6.12288e-05 0.000362391 0
+ 7.52302e-05 0.000387408 0 8.83123e-05 0.00040693 0 9.89135e-05 0.000412737 0 0.000105365 0.000395509 0
+ 0.000106261 0.000345404 0 0.000100925 0.00025236 0 8.98018e-05 0.000105191 0 7.43631e-05 -0.000111012 0
+ 5.64989e-05 -0.000415239 0 3.8076e-05 -0.00082547 0 2.08888e-05 -0.0013573 0 6.45548e-06 -0.00201091 0
+ -6.2972e-06 -0.00201132 0 -2.07601e-05 -0.00135762 0 -3.79793e-05 -0.000825716 0 -5.64273e-05 -0.000415425 0
+ -7.43093e-05 -0.000111151 0 -8.976e-05 0.000105084 0 -0.000100891 0.000252273 0 -0.000106235 0.000345327 0
+ -0.000105345 0.000395441 0 -9.88995e-05 0.000412679 0 -8.83034e-05 0.000406883 0 -7.52254e-05 0.000387374 0
+ -6.12264e-05 0.000362368 0 -4.75482e-05 0.000338427 0 -3.50651e-05 0.000320122 0 -2.43526e-05 0.000309878 0
+ -1.57521e-05 0.000307531 0 -9.29531e-06 0.000307648 0 -4.56371e-06 0.000288636 0 -1.2727e-06 0.000180622 0
+ 2.27207e-06 0.000177081 0 8.3235e-06 0.000282852 0 1.68251e-05 0.000300228 0 2.74344e-05 0.000297913 0
+ 4.04263e-05 0.000297926 0 5.5725e-05 0.000306082 0 7.29682e-05 0.000322764 0 9.15568e-05 0.0003458 0
+ 0.000110551 0.000371003 0 0.000128548 0.000392255 0 0.000143682 0.000401676 0 0.000153819 0.000389982 0
+ 0.000156954 0.0003469 0 0.000151779 0.000261376 0 0.000138209 0.000120868 0 0.00011745 -9.04905e-05 0
+ 9.1578e-05 -0.000392025 0 6.32051e-05 -0.000801888 0 3.53784e-05 -0.00133587 0 1.10437e-05 -0.00199358 0
+ -1.08976e-05 -0.00199396 0 -3.52557e-05 -0.00133616 0 -6.3107e-05 -0.000802108 0 -9.15011e-05 -0.000392191 0
+ -0.000117389 -9.06157e-05 0 -0.00013816 0.000120771 0 -0.000151739 0.000261297 0 -0.000156922 0.00034683 0
+ -0.000153794 0.000389921 0 -0.000143664 0.000401624 0 -0.000128535 0.000392214 0 -0.000110543 0.000370973 0
+ -9.15525e-05 0.00034578 0 -7.29655e-05 0.000322751 0 -5.57228e-05 0.000306073 0 -4.0424e-05 0.000297916 0
+ -2.74321e-05 0.000297901 0 -1.68232e-05 0.000300213 0 -8.32246e-06 0.000282839 0 -2.27183e-06 0.000177077 0
+ 3.52951e-06 0.000171279 0 1.30096e-05 0.000273122 0 2.60764e-05 0.00028839 0 4.15087e-05 0.00028371 0
+ 5.93675e-05 0.000281278 0 7.95685e-05 0.00028723 0 0.000101796 0.000302145 0 0.000125502 0.000324123 0
+ 0.000149763 0.000349425 0 0.000173102 0.000372498 0 0.000193425 0.000385976 0 0.000208163 0.000380808 0
+ 0.000214661 0.000346441 0 0.000210793 0.000270878 0 0.000195626 0.000140103 0 0.000169718 -6.30582e-05 0
+ 0.000135012 -0.000358879 0 9.47885e-05 -0.000766438 0 5.37017e-05 -0.0013024 0 1.6841e-05 -0.00196585 0
+ -1.67026e-05 -0.00196621 0 -5.35825e-05 -0.00130268 0 -9.46889e-05 -0.000766636 0 -0.00013493 -0.000359027 0
+ -0.000169651 -6.31699e-05 0 -0.000195571 0.000140016 0 -0.000210748 0.000270807 0 -0.000214624 0.000346379 0
+ -0.000208135 0.000380754 0 -0.000193404 0.000385931 0 -0.000173088 0.000372462 0 -0.000149754 0.000349399 0
+ -0.000125496 0.000324106 0 -0.000101792 0.000302133 0 -7.9565e-05 0.000287221 0 -5.93643e-05 0.000281268 0
+ -4.15056e-05 0.000283698 0 -2.6074e-05 0.000288376 0 -1.30084e-05 0.00027311 0 -3.52923e-06 0.000171276 0
+ 5.05214e-06 0.000162698 0 1.86326e-05 0.000258643 0 3.70378e-05 0.000271397 0 5.79042e-05 0.000264404 0
+ 8.10016e-05 0.000259628 0 0.000106286 0.000263396 0 0.000133581 0.000276458 0 0.00016249 0.000297195 0
+ 0.000192211 0.000322371 0 0.000221302 0.000347121 0 0.000247544 0.000364788 0 0.00026799 0.000366812 0
+ 0.000279293 0.000342636 0 0.000278311 0.000279533 0 0.000262877 0.00016205 0 0.000232431 -2.86508e-05 0
+ 0.000188306 -0.000314456 0 0.000134234 -0.000716567 0 7.68258e-05 -0.00125378 0 2.41837e-05 -0.00192497 0
+ -2.40495e-05 -0.00192531 0 -7.67077e-05 -0.00125404 0 -0.000134132 -0.000716747 0 -0.00018822 -0.000314587 0
+ -0.00023236 -2.87493e-05 0 -0.000262818 0.000161974 0 -0.000278262 0.00027947 0 -0.000279253 0.000342583 0
+ -0.000267959 0.000366766 0 -0.000247521 0.00036475 0 -0.000221286 0.000347091 0 -0.0001922 0.00032235 0
+ -0.000162483 0.00029718 0 -0.000133575 0.000276447 0 -0.000106281 0.000263386 0 -8.09974e-05 0.000259618 0
+ -5.79004e-05 0.000264393 0 -3.7035e-05 0.000271384 0 -1.86312e-05 0.000258632 0 -5.05184e-06 0.000162695 0
+ 6.8094e-06 0.000150836 0 2.50583e-05 0.000238676 0 4.94109e-05 0.000248607 0 7.61266e-05 0.000239612 0
+ 0.000104615 0.000232834 0 0.000134927 0.000234592 0 0.000167133 0.00024576 0 0.000201109 0.000265008 0
+ 0.0002363 0.000289648 0 0.00027144 0.000315613 0 0.000304324 0.00033717 0 0.000331738 0.00034657 0
+ 0.000349648 0.000333665 0 0.000353719 0.000285415 0 0.000340131 0.00018519 0 0.00030655 1.22365e-05 0
+ 0.000253018 -0.000257686 0 0.000183266 -0.000649512 0 0.000106049 -0.00118621 0 3.35392e-05 -0.00186738 0
+ -3.34061e-05 -0.00186772 0 -0.00010593 -0.00118645 0 -0.000183162 -0.000649676 0 -0.00025293 -0.000257802 0
+ -0.000306476 1.21515e-05 0 -0.00034007 0.000185125 0 -0.000353668 0.000285362 0 -0.000349607 0.000333621 0
+ -0.000331706 0.000346533 0 -0.0003043 0.000337139 0 -0.000271422 0.000315589 0 -0.000236287 0.00028963 0
+ -0.0002011 0.000264995 0 -0.000167126 0.00024575 0 -0.000134921 0.000234584 0 -0.00010461 0.000232825 0
+ -7.61222e-05 0.000239601 0 -4.94078e-05 0.000248595 0 -2.50569e-05 0.000238666 0 -6.80909e-06 0.000150834 0
+ 8.71016e-06 0.000135317 0 3.19245e-05 0.000212732 0 6.24479e-05 0.000219675 0 9.50227e-05 0.000209254 0
+ 0.00012866 0.000201067 0 0.000163563 0.000201145 0 0.000200147 0.000210416 0 0.000238685 0.000227839 0
+ 0.000279008 0.000251303 0 0.000320195 0.000277631 0 0.00036025 0.000302213 0 0.000395882 0.000318481 0
+ 0.000422488 0.000317238 0 0.000434465 0.000285793 0 0.000425952 0.000206913 0 0.000392045 5.80021e-05 0
+ 0.000330485 -0.00018836 0 0.000244015 -0.000562617 0 0.00014326 -0.00109513 0 4.5647e-05 -0.00178834 0
+ -4.55124e-05 -0.00178866 0 -0.000143138 -0.00109536 0 -0.000243908 -0.000562765 0 -0.000330394 -0.000188461 0
+ -0.000391969 5.79311e-05 0 -0.00042589 0.00020686 0 -0.000434415 0.000285751 0 -0.000422448 0.000317203 0
+ -0.00039585 0.000318452 0 -0.000360226 0.00030219 0 -0.000320177 0.000277613 0 -0.000278995 0.00025129 0
+ -0.000238674 0.000227829 0 -0.000200139 0.000210408 0 -0.000163556 0.000201137 0 -0.000128654 0.000201059 0
+ -9.50178e-05 0.000209244 0 -6.24446e-05 0.000219665 0 -3.1923e-05 0.000212724 0 -8.70986e-06 0.000135315 0
+ 1.058e-05 0.000116026 0 3.85576e-05 0.00018083 0 7.47934e-05 0.000184818 0 0.000112548 0.000173782 0
+ 0.000150462 0.000164987 0 0.000188935 0.00016385 0 0.000228804 0.000171258 0 0.000270828 0.000186436 0
+ 0.000315359 0.000207852 0 0.000361996 0.000233259 0 0.000409203 0.000259323 0 0.000453926 0.000281016 0
+ 0.000491296 0.000290727 0 0.000514598 0.000277025 0 0.000515738 0.000223054 0 0.000486513 0.000104993 0
+ 0.000420967 -0.000108245 0 0.000318873 -0.000454169 0 0.000191327 -0.000975279 0 6.17917e-05 -0.00168104 0
+ -6.1653e-05 -0.00168135 0 -0.000191202 -0.000975493 0 -0.000318764 -0.0004543 0 -0.000420876 -0.000108329 0
+ -0.000486438 0.000104937 0 -0.000515678 0.000223014 0 -0.00051455 0.000276994 0 -0.000491258 0.000290702 0
+ -0.000453896 0.000280995 0 -0.00040918 0.000259306 0 -0.000361978 0.000233245 0 -0.000315346 0.000207842 0
+ -0.000270818 0.000186428 0 -0.000228795 0.000171251 0 -0.000188927 0.000163843 0 -0.000150456 0.00016498 0
+ -0.000112543 0.000173774 0 -7.47902e-05 0.000184809 0 -3.85562e-05 0.000180824 0 -1.05798e-05 0.000116026 0
+ 1.21423e-05 9.33041e-05 0 4.39118e-05 0.000143806 0 8.43792e-05 0.000145139 0 0.000125619 0.000134467 0
+ 0.000166022 0.000125985 0 0.000206219 0.000124181 0 0.000247487 0.00012979 0 0.000291104 0.000142261 0
+ 0.000338011 0.000160589 0 0.000388481 0.000183415 0 0.000441718 0.000208723 0 0.00049534 0.000233272 0
+ 0.000544787 0.000251654 0 0.000582802 0.000254782 0 0.000599343 0.000227616 0 0.000582588 0.00014641 0
+ 0.000521514 -2.30422e-05 0 0.000409662 -0.000325425 0 0.000254631 -0.000821445 0 8.43451e-05 -0.00153506 0
+ -8.41994e-05 -0.00153535 0 -0.000254502 -0.000821643 0 -0.000409553 -0.000325537 0 -0.000521426 -2.31067e-05 0
+ -0.000582519 0.00014637 0 -0.000599287 0.000227589 0 -0.000582758 0.000254762 0 -0.000544753 0.000251637 0
+ -0.000495312 0.000233258 0 -0.000441696 0.000208712 0 -0.000388464 0.000183406 0 -0.000337997 0.000160582 0
+ -0.000291093 0.000142255 0 -0.000247477 0.000129785 0 -0.000206211 0.000124176 0 -0.000166015 0.00012598 0
+ -0.000125614 0.00013446 0 -8.43762e-05 0.000145133 0 -4.39106e-05 0.000143801 0 -1.21421e-05 9.33038e-05 0
+ 1.30016e-05 6.81602e-05 0 4.65383e-05 0.000103643 0 8.84147e-05 0.000102957 0 0.000130138 9.36853e-05 0
+ 0.000170067 8.64355e-05 0 0.000209081 8.45192e-05 0 0.000248835 8.84308e-05 0 0.000291063 9.77757e-05 0
+ 0.000337253 0.000111978 0 0.0003884 0.000130409 0 0.000444665 0.000152227 0 0.000504838 0.000175973 0
+ 0.000565525 0.000198818 0 0.000620067 0.000215062 0 0.000657585 0.000213277 0 0.000663314 0.000171775 0
+ 0.000621299 5.46813e-05 0 0.000514854 -0.000184852 0 0.000339227 -0.000631361 0 0.000117623 -0.00133325 0
+ -0.000117467 -0.00133352 0 -0.000339097 -0.000631537 0 -0.00051475 -0.000184938 0 -0.000621221 5.46379e-05 0
+ -0.000663254 0.000171751 0 -0.000657539 0.000213262 0 -0.00062003 0.00021505 0 -0.000565495 0.000198808 0
+ -0.000504814 0.000175965 0 -0.000444645 0.00015222 0 -0.000388384 0.000130404 0 -0.000337239 0.000111973 0
+ -0.000291052 9.77718e-05 0 -0.000248826 8.84272e-05 0 -0.000209073 8.45154e-05 0 -0.00017006 8.64312e-05 0
+ -0.000130134 9.36806e-05 0 -8.84121e-05 0.000102953 0 -4.65373e-05 0.000103641 0 -1.30015e-05 6.81602e-05 0
+ 1.26154e-05 4.25432e-05 0 4.45636e-05 6.37754e-05 0 8.34737e-05 6.2039e-05 0 0.000121235 5.51185e-05 0
+ 0.000156447 4.98624e-05 0 0.000190213 4.83125e-05 0 0.000224413 5.06834e-05 0 0.000261023 5.66853e-05 0
+ 0.00030187 6.60316e-05 0 0.000348506 7.8572e-05 0 0.000402045 9.42602e-05 0 0.000462792 0.00011302 0
+ 0.000529471 0.000134405 0 0.000597781 0.000156624 0 0.00065826 0.000173718 0 0.000695236 0.00016863 0
+ 0.000692034 0.000103043 0 0.000620534 -5.5268e-05 0 0.000448786 -0.00041357 0 0.00016758 -0.00104823 0
+ -0.000167409 -0.00104846 0 -0.000448662 -0.000413713 0 -0.000620447 -5.53247e-05 0 -0.000691973 0.000103021 0
+ -0.000695192 0.00016862 0 -0.000658226 0.000173712 0 -0.000597754 0.000156619 0 -0.000529449 0.0001344 0
+ -0.000462773 0.000113016 0 -0.000402029 9.42568e-05 0 -0.000348492 7.85691e-05 0 -0.000301858 6.60291e-05 0
+ -0.000261013 5.66831e-05 0 -0.000224404 5.06812e-05 0 -0.000190206 4.83102e-05 0 -0.000156442 4.98597e-05 0
+ -0.000121232 5.51156e-05 0 -8.34717e-05 6.20363e-05 0 -4.4563e-05 6.37739e-05 0 -1.26153e-05 4.25434e-05 0
+ 1.0222e-05 1.97058e-05 0 3.56051e-05 2.92815e-05 0 6.55812e-05 2.76467e-05 0 9.36204e-05 2.37097e-05 0
+ 0.000118827 2.08532e-05 0 0.00014241 1.99725e-05 0 0.000166167 2.10668e-05 0 0.000191916 2.39425e-05 0
+ 0.000221365 2.84786e-05 0 0.000256143 3.47111e-05 0 0.000297854 4.28712e-05 0 0.000348066 5.34498e-05 0
+ 0.000408052 6.73094e-05 0 0.000477791 8.56698e-05 0 0.000553133 0.00010885 0 0.000620903 0.000128752 0
+ 0.000671156 9.58706e-05 0 0.000674128 2.0433e-05 0 0.000557817 -0.000201212 0 0.000229649 -0.000651215 0
+ -0.00022947 -0.000651371 0 -0.000557718 -0.000201302 0 -0.000674075 2.04067e-05 0 -0.000671124 9.58649e-05 0
+ -0.00062088 0.000128751 0 -0.000553114 0.00010885 0 -0.000477774 8.56688e-05 0 -0.000408037 6.73082e-05 0
+ -0.000348053 5.34484e-05 0 -0.000297843 4.28699e-05 0 -0.000256133 3.47099e-05 0 -0.000221357 2.84776e-05 0
+ -0.000191909 2.39416e-05 0 -0.000166161 2.10659e-05 0 -0.000142405 1.99714e-05 0 -0.000118823 2.0852e-05 0
+ -9.36178e-05 2.37084e-05 0 -6.55799e-05 2.76455e-05 0 -3.56048e-05 2.92808e-05 0 -1.02221e-05 1.9706e-05 0
+ 4.74191e-06 4.74191e-06 0 1.65441e-05 7.06025e-06 0 3.00201e-05 6.4158e-06 0 4.16788e-05 5.24285e-06 0
+ 5.1357e-05 4.43542e-06 0 5.99782e-05 4.18571e-06 0 6.86194e-05 4.45548e-06 0 7.82496e-05 5.17472e-06 0
+ 8.97355e-05 6.31125e-06 0 0.000103942 7.89475e-06 0 0.000121877 1.00409e-05 0 0.000144932 1.30135e-05 0
+ 0.000175319 1.73734e-05 0 0.000216938 2.42465e-05 0 0.000276527 3.53424e-05 0 0.000361443 4.95734e-05 0
+ 0.000448628 3.76111e-05 0 0.000505294 1.90551e-05 0 0.000473059 -5.12896e-05 0 0.00021093 -0.00021084 0
+ -0.000210804 -0.000210894 0 -0.000473016 -5.13185e-05 0 -0.000505286 1.9049e-05 0 -0.000448625 3.76114e-05 0
+ -0.00036144 4.95743e-05 0 -0.000276522 3.53428e-05 0 -0.000216933 2.42466e-05 0 -0.000175313 1.73732e-05 0
+ -0.000144927 1.30133e-05 0 -0.000121873 1.00407e-05 0 -0.000103938 7.89451e-06 0 -8.9732e-05 6.31103e-06 0
+ -7.82465e-05 5.17452e-06 0 -6.86167e-05 4.45528e-06 0 -5.9976e-05 4.18547e-06 0 -5.13554e-05 4.43513e-06 0
+ -4.16777e-05 5.24252e-06 0 -3.00197e-05 6.4155e-06 0 -1.65441e-05 7.0601e-06 0 -4.74199e-06 4.74199e-06 0
</DataArray>
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
@@ -1493,141 +1493,141 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="delRho" NumberOfComponents="1" format="ascii">
- -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263
- -0.000200263 -0.000200263 -0.000200263 -0.000200262 -0.000200259 -0.000200253 -0.000200244 -0.000200233 -0.000200233 -0.000200244 -0.000200253 -0.000200259
- -0.000200262 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000200263
- -0.000200263 -0.000200263 -0.000200263 -0.000200263 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408
- -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317406 -0.000317403 -0.000317395 -0.00031738 -0.000317359 -0.000317336
- -0.000317336 -0.000317359 -0.00031738 -0.000317395 -0.000317403 -0.000317406 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408
- -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000317408 -0.000434553 -0.000434553 -0.000434553 -0.000434553
- -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434552 -0.000434551 -0.000434545 -0.000434532
- -0.000434505 -0.000434459 -0.000434393 -0.000434321 -0.000434321 -0.000434393 -0.000434459 -0.000434505 -0.000434532 -0.000434545 -0.000434551 -0.000434552
- -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553 -0.000434553
- -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000551697
- -0.000551695 -0.000551688 -0.000551668 -0.000551624 -0.000551541 -0.000551406 -0.000551221 -0.000551016 -0.000551016 -0.000551221 -0.000551406 -0.000551541
- -0.000551624 -0.000551668 -0.000551688 -0.000551695 -0.000551697 -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000551698
- -0.000551698 -0.000551698 -0.000551698 -0.000551698 -0.000668843 -0.000668843 -0.000668843 -0.000668843 -0.000668843 -0.000668843 -0.000668843 -0.000668843
- -0.000668843 -0.000668843 -0.000668842 -0.00066884 -0.000668831 -0.000668805 -0.000668744 -0.000668616 -0.000668388 -0.000668032 -0.000667556 -0.000667034
- -0.000667034 -0.000667556 -0.000668032 -0.000668388 -0.000668616 -0.000668744 -0.000668805 -0.000668831 -0.00066884 -0.000668842 -0.000668843 -0.000668843
- -0.000668843 -0.000668843 -0.000668843 -0.000668843 -0.000668843 -0.000668843 -0.000668843 -0.000668843 -0.000785988 -0.000785988 -0.000785988 -0.000785988
- -0.000785988 -0.000785988 -0.000785988 -0.000785988 -0.000785988 -0.000785987 -0.000785984 -0.000785974 -0.000785946 -0.000785869 -0.000785698 -0.000785369
- -0.000784809 -0.000783973 -0.00078288 -0.000781692 -0.000781692 -0.00078288 -0.000783973 -0.000784809 -0.000785369 -0.000785698 -0.000785869 -0.000785946
- -0.000785974 -0.000785984 -0.000785987 -0.000785988 -0.000785988 -0.000785988 -0.000785988 -0.000785988 -0.000785988 -0.000785988 -0.000785988 -0.000785988
- -0.000903133 -0.000903133 -0.000903133 -0.000903133 -0.000903133 -0.000903133 -0.000903133 -0.000903132 -0.000903132 -0.000903128 -0.000903118 -0.000903087
- -0.000903005 -0.000902802 -0.000902386 -0.000901632 -0.000900415 -0.000898664 -0.000896435 -0.000894029 -0.000894029 -0.000896435 -0.000898664 -0.000900415
- -0.000901632 -0.000902386 -0.000902802 -0.000903005 -0.000903087 -0.000903118 -0.000903128 -0.000903132 -0.000903132 -0.000903133 -0.000903133 -0.000903133
- -0.000903133 -0.000903133 -0.000903133 -0.000903133 -0.00102028 -0.00102028 -0.00102028 -0.00102028 -0.00102028 -0.00102028 -0.00102028 -0.00102028
- -0.00102027 -0.00102026 -0.00102023 -0.00102014 -0.00101994 -0.00101947 -0.00101857 -0.00101704 -0.00101468 -0.00101142 -0.00100736 -0.00100301
- -0.00100301 -0.00100736 -0.00101142 -0.00101468 -0.00101704 -0.00101857 -0.00101947 -0.00101994 -0.00102014 -0.00102023 -0.00102026 -0.00102027
- -0.00102028 -0.00102028 -0.00102028 -0.00102028 -0.00102028 -0.00102028 -0.00102028 -0.00102028 -0.00113742 -0.00113742 -0.00113742 -0.00113742
- -0.00113742 -0.00113742 -0.00113742 -0.00113742 -0.00113741 -0.00113738 -0.00113729 -0.00113708 -0.00113662 -0.00113568 -0.00113396 -0.00113117
- -0.00112709 -0.00112161 -0.00111496 -0.00110786 -0.00110786 -0.00111496 -0.00112161 -0.00112709 -0.00113117 -0.00113396 -0.00113568 -0.00113662
- -0.00113708 -0.00113729 -0.00113738 -0.00113741 -0.00113742 -0.00113742 -0.00113742 -0.00113742 -0.00113742 -0.00113742 -0.00113742 -0.00113742
- -0.00125457 -0.00125457 -0.00125457 -0.00125457 -0.00125457 -0.00125457 -0.00125456 -0.00125455 -0.00125453 -0.00125445 -0.00125425 -0.0012538
- -0.0012529 -0.0012512 -0.00124824 -0.00124368 -0.00123726 -0.00122893 -0.001219 -0.00120842 -0.00120842 -0.001219 -0.00122893 -0.00123726
- -0.00124368 -0.00124824 -0.0012512 -0.0012529 -0.0012538 -0.00125425 -0.00125445 -0.00125453 -0.00125455 -0.00125456 -0.00125457 -0.00125457
- -0.00125457 -0.00125457 -0.00125457 -0.00125457 -0.00137171 -0.00137171 -0.00137171 -0.00137171 -0.00137171 -0.00137171 -0.0013717 -0.00137168
- -0.00137161 -0.00137144 -0.00137104 -0.00137021 -0.00136862 -0.00136584 -0.00136121 -0.00135442 -0.00134519 -0.00133352 -0.00131982 -0.00130517
- -0.00130517 -0.00131982 -0.00133352 -0.00134519 -0.00135442 -0.00136121 -0.00136584 -0.00136862 -0.00137021 -0.00137104 -0.00137144 -0.00137161
- -0.00137168 -0.0013717 -0.00137171 -0.00137171 -0.00137171 -0.00137171 -0.00137171 -0.00137171 -0.00148886 -0.00148886 -0.00148886 -0.00148886
- -0.00148886 -0.00148885 -0.00148884 -0.00148879 -0.00148865 -0.00148832 -0.0014876 -0.0014862 -0.00148368 -0.00147949 -0.00147287 -0.0014635
- -0.00145117 -0.00143593 -0.00141822 -0.00139908 -0.00139908 -0.00141822 -0.00143593 -0.00145117 -0.0014635 -0.00147287 -0.00147949 -0.00148368
- -0.0014862 -0.0014876 -0.00148832 -0.00148865 -0.00148879 -0.00148884 -0.00148885 -0.00148886 -0.00148886 -0.00148886 -0.00148886 -0.00148886
- -0.001606 -0.001606 -0.001606 -0.001606 -0.001606 -0.00160599 -0.00160596 -0.00160586 -0.00160562 -0.00160505 -0.00160389 -0.00160172
- -0.00159801 -0.00159212 -0.00158338 -0.00157129 -0.00155581 -0.00153702 -0.00151526 -0.00149136 -0.00149136 -0.00151526 -0.00153702 -0.00155581
- -0.00157129 -0.00158338 -0.00159212 -0.00159801 -0.00160172 -0.00160389 -0.00160505 -0.00160562 -0.00160586 -0.00160596 -0.00160599 -0.001606
- -0.001606 -0.001606 -0.001606 -0.001606 -0.00172315 -0.00172315 -0.00172315 -0.00172315 -0.00172314 -0.00172312 -0.00172307 -0.00172291
- -0.0017225 -0.00172163 -0.0017199 -0.00171683 -0.00171178 -0.00170408 -0.00169308 -0.00167832 -0.00165984 -0.0016377 -0.00161206 -0.0015832
- -0.0015832 -0.00161206 -0.0016377 -0.00165984 -0.00167832 -0.00169308 -0.00170408 -0.00171178 -0.00171683 -0.0017199 -0.00172163 -0.0017225
- -0.00172291 -0.00172307 -0.00172312 -0.00172314 -0.00172315 -0.00172315 -0.00172315 -0.00172315 -0.00184029 -0.00184029 -0.00184029 -0.00184029
- -0.00184028 -0.00184025 -0.00184016 -0.00183991 -0.00183931 -0.00183804 -0.00183566 -0.00183157 -0.0018251 -0.00181556 -0.00180237 -0.00178514
- -0.00176396 -0.00173885 -0.00170961 -0.00167563 -0.00167563 -0.00170961 -0.00173885 -0.00176396 -0.00178514 -0.00180237 -0.00181556 -0.0018251
- -0.00183157 -0.00183566 -0.00183804 -0.00183931 -0.00183991 -0.00184016 -0.00184025 -0.00184028 -0.00184029 -0.00184029 -0.00184029 -0.00184029
- -0.00195744 -0.00195744 -0.00195744 -0.00195743 -0.00195742 -0.00195738 -0.00195724 -0.00195687 -0.00195604 -0.00195434 -0.00195124 -0.00194609
- -0.00193819 -0.00192688 -0.00191167 -0.00189227 -0.00186882 -0.00184121 -0.00180873 -0.00176946 -0.00176946 -0.00180873 -0.00184121 -0.00186882
- -0.00189227 -0.00191167 -0.00192688 -0.00193819 -0.00194609 -0.00195124 -0.00195434 -0.00195604 -0.00195687 -0.00195724 -0.00195738 -0.00195742
- -0.00195743 -0.00195744 -0.00195744 -0.00195744 -0.00207458 -0.00207458 -0.00207458 -0.00207458 -0.00207456 -0.0020745 -0.0020743 -0.00207381
- -0.00207272 -0.00207056 -0.00206674 -0.00206054 -0.00205127 -0.00203832 -0.00202134 -0.00200014 -0.00197491 -0.00194535 -0.00191005 -0.00186527
- -0.00186527 -0.00191005 -0.00194535 -0.00197491 -0.00200014 -0.00202134 -0.00203832 -0.00205127 -0.00206054 -0.00206674 -0.00207056 -0.00207272
- -0.00207381 -0.0020743 -0.0020745 -0.00207456 -0.00207458 -0.00207458 -0.00207458 -0.00207458 -0.00219173 -0.00219173 -0.00219172 -0.00219172
- -0.0021917 -0.00219161 -0.00219136 -0.00219074 -0.00218938 -0.00218677 -0.00218224 -0.00217505 -0.00216452 -0.00215014 -0.00213167 -0.0021091
- -0.00208262 -0.00205172 -0.00201405 -0.00196347 -0.00196347 -0.00201405 -0.00205172 -0.00208262 -0.0021091 -0.00213167 -0.00215014 -0.00216452
- -0.00217505 -0.00218224 -0.00218677 -0.00218938 -0.00219074 -0.00219136 -0.00219161 -0.0021917 -0.00219172 -0.00219172 -0.00219173 -0.00219173
- -0.00230887 -0.00230887 -0.00230887 -0.00230886 -0.00230883 -0.00230873 -0.00230842 -0.00230767 -0.00230607 -0.00230303 -0.00229785 -0.00228976
- -0.00227813 -0.00226252 -0.00224288 -0.00221937 -0.00219222 -0.00216063 -0.00212107 -0.00206433 -0.00206433 -0.00212107 -0.00216063 -0.00219222
- -0.00221937 -0.00224288 -0.00226252 -0.00227813 -0.00228976 -0.00229785 -0.00230303 -0.00230607 -0.00230767 -0.00230842 -0.00230873 -0.00230883
- -0.00230886 -0.00230887 -0.00230887 -0.00230887 -0.00242602 -0.00242601 -0.00242601 -0.00242601 -0.00242597 -0.00242585 -0.00242549 -0.00242463
- -0.00242281 -0.00241941 -0.00241366 -0.0024048 -0.00239222 -0.00237561 -0.00235513 -0.00233114 -0.00230391 -0.00227231 -0.00223135 -0.00216797
- -0.00216797 -0.00223135 -0.00227231 -0.00230391 -0.00233114 -0.00235513 -0.00237561 -0.00239222 -0.0024048 -0.00241366 -0.00241941 -0.00242281
- -0.00242463 -0.00242549 -0.00242585 -0.00242597 -0.00242601 -0.00242601 -0.00242601 -0.00242602 -0.00254316 -0.00254316 -0.00254316 -0.00254315
- -0.00254311 -0.00254297 -0.00254258 -0.00254164 -0.00253966 -0.00253596 -0.00252975 -0.00252025 -0.00250691 -0.00248954 -0.00246852 -0.00244449
- -0.00241778 -0.00238687 -0.00234502 -0.00227441 -0.00227441 -0.00234502 -0.00238687 -0.00241778 -0.00244449 -0.00246852 -0.00248954 -0.00250691
- -0.00252025 -0.00252975 -0.00253596 -0.00253966 -0.00254164 -0.00254258 -0.00254297 -0.00254311 -0.00254315 -0.00254316 -0.00254316 -0.00254316
- -0.0026603 -0.0026603 -0.0026603 -0.00266029 -0.00266025 -0.00266011 -0.00265971 -0.00265872 -0.00265663 -0.00265273 -0.00264619 -0.00263622
- -0.00262229 -0.00260438 -0.00258311 -0.00255946 -0.00253384 -0.00250433 -0.00246209 -0.00238357 -0.00238357 -0.00246209 -0.00250433 -0.00253384
- -0.00255946 -0.00258311 -0.00260438 -0.00262229 -0.00263622 -0.00264619 -0.00265273 -0.00265663 -0.00265872 -0.00265971 -0.00266011 -0.00266025
- -0.00266029 -0.0026603 -0.0026603 -0.0026603 -0.00277745 -0.00277745 -0.00277745 -0.00277744 -0.0027774 -0.00277726 -0.00277686 -0.00277587
- -0.00277376 -0.00276978 -0.00276305 -0.00275275 -0.00273841 -0.00272014 -0.00269885 -0.00267599 -0.002652 -0.00262458 -0.00258251 -0.00249528
- -0.00249528 -0.00258251 -0.00262458 -0.002652 -0.00267599 -0.00269885 -0.00272014 -0.00273841 -0.00275275 -0.00276305 -0.00276978 -0.00277376
- -0.00277587 -0.00277686 -0.00277726 -0.0027774 -0.00277744 -0.00277745 -0.00277745 -0.00277745 -0.00289459 -0.00289459 -0.00289459 -0.00289459
- -0.00289455 -0.00289442 -0.00289405 -0.00289311 -0.00289105 -0.00288711 -0.00288036 -0.00286992 -0.00285535 -0.0028369 -0.00281579 -0.00279396
- -0.00277207 -0.00274743 -0.00270608 -0.00260927 -0.00260927 -0.00270608 -0.00274743 -0.00277207 -0.00279396 -0.00281579 -0.0028369 -0.00285535
- -0.00286992 -0.00288036 -0.00288711 -0.00289105 -0.00289311 -0.00289405 -0.00289442 -0.00289455 -0.00289459 -0.00289459 -0.00289459 -0.00289459
- -0.00301174 -0.00301174 -0.00301174 -0.00301173 -0.0030117 -0.00301159 -0.00301126 -0.00301041 -0.00300851 -0.00300475 -0.00299816 -0.00298779
- -0.00297317 -0.00295469 -0.00293385 -0.00291321 -0.00289379 -0.00287258 -0.00283257 -0.00272525 -0.00272525 -0.00283257 -0.00287258 -0.00289379
- -0.00291321 -0.00293385 -0.00295469 -0.00297317 -0.00298779 -0.00299816 -0.00300475 -0.00300851 -0.00301041 -0.00301126 -0.00301159 -0.0030117
- -0.00301173 -0.00301174 -0.00301174 -0.00301174 -0.00312888 -0.00312888 -0.00312888 -0.00312888 -0.00312886 -0.00312877 -0.0031285 -0.00312778
- -0.00312611 -0.00312268 -0.00311646 -0.0031064 -0.00309195 -0.00307355 -0.00305303 -0.00303351 -0.00301686 -0.00299966 -0.00296166 -0.0028429
- -0.0028429 -0.00296166 -0.00299966 -0.00301686 -0.00303351 -0.00305303 -0.00307355 -0.00309195 -0.0031064 -0.00311646 -0.00312268 -0.00312611
- -0.00312778 -0.0031285 -0.00312877 -0.00312886 -0.00312888 -0.00312888 -0.00312888 -0.00312888 -0.00324603 -0.00324603 -0.00324603 -0.00324602
- -0.00324601 -0.00324594 -0.00324573 -0.00324516 -0.00324379 -0.00324089 -0.00323523 -0.00322577 -0.00321174 -0.00319354 -0.00317327 -0.00315466
- -0.00314097 -0.00312827 -0.003093 -0.00296189 -0.00296189 -0.00309299 -0.00312827 -0.00314097 -0.00315466 -0.00317327 -0.00319354 -0.00321174
- -0.00322577 -0.00323523 -0.00324089 -0.00324379 -0.00324516 -0.00324573 -0.00324594 -0.00324601 -0.00324602 -0.00324603 -0.00324603 -0.00324603
- -0.00336317 -0.00336317 -0.00336317 -0.00336317 -0.00336316 -0.00336311 -0.00336295 -0.00336251 -0.00336143 -0.00335906 -0.00335431 -0.00334609
- -0.00333282 -0.00331476 -0.00329451 -0.00327657 -0.00326586 -0.00325794 -0.0032262 -0.00308192 -0.00308192 -0.0032262 -0.00325794 -0.00326586
- -0.00327657 -0.00329451 -0.00331476 -0.00333282 -0.00334609 -0.00335431 -0.00335906 -0.00336143 -0.00336251 -0.00336295 -0.00336311 -0.00336316
- -0.00336317 -0.00336317 -0.00336317 -0.00336317 -0.00348032 -0.00348032 -0.00348032 -0.00348031 -0.00348031 -0.00348027 -0.00348016 -0.00347984
- -0.00347902 -0.00347716 -0.00347334 -0.00346641 -0.00345495 -0.0034388 -0.00341712 -0.00339941 -0.00339138 -0.00338823 -0.00336085 -0.00320269
- -0.00320269 -0.00336085 -0.00338823 -0.00339138 -0.00339941 -0.00341712 -0.0034388 -0.00345495 -0.00346641 -0.00347334 -0.00347716 -0.00347902
- -0.00347984 -0.00348016 -0.00348027 -0.00348031 -0.00348031 -0.00348032 -0.00348032 -0.00348032 -0.00359746 -0.00359746 -0.00359746 -0.00359746
- -0.00359745 -0.00359743 -0.00359735 -0.00359713 -0.00359653 -0.00359514 -0.0035922 -0.00358665 -0.00357723 -0.00356313 -0.00354457 -0.00352418
- -0.00351761 -0.00351862 -0.00349642 -0.00332395 -0.00332394 -0.00349642 -0.00351862 -0.00351761 -0.00352418 -0.00354457 -0.00356313 -0.00357723
- -0.00358665 -0.0035922 -0.00359514 -0.00359653 -0.00359713 -0.00359735 -0.00359743 -0.00359745 -0.00359746 -0.00359746 -0.00359746 -0.00359746
- -0.00371461 -0.00371461 -0.00371461 -0.00371461 -0.0037146 -0.00371459 -0.00371454 -0.00371438 -0.00371397 -0.00371299 -0.00371083 -0.00370659
- -0.00369919 -0.00368769 -0.0036724 -0.00365307 -0.003645 -0.00364865 -0.00363227 -0.00344548 -0.00344548 -0.00363227 -0.00364865 -0.003645
- -0.00365307 -0.0036724 -0.00368769 -0.00369919 -0.00370659 -0.00371083 -0.00371299 -0.00371397 -0.00371438 -0.00371454 -0.00371459 -0.0037146
- -0.00371461 -0.00371461 -0.00371461 -0.00371461 -0.00383175 -0.00383175 -0.00383175 -0.00383175 -0.00383175 -0.00383174 -0.00383171 -0.00383161
- -0.00383134 -0.00383068 -0.00382918 -0.00382612 -0.00382058 -0.00381166 -0.00379959 -0.00378668 -0.00377428 -0.0037779 -0.0037675 -0.00356712
- -0.00356712 -0.0037675 -0.0037779 -0.00377428 -0.00378668 -0.00379959 -0.00381166 -0.00382058 -0.00382612 -0.00382918 -0.00383068 -0.00383134
- -0.00383161 -0.00383171 -0.00383174 -0.00383175 -0.00383175 -0.00383175 -0.00383175 -0.00383175 -0.0039489 -0.0039489 -0.0039489 -0.00394889
- -0.00394889 -0.00394889 -0.00394887 -0.00394881 -0.00394865 -0.00394823 -0.00394726 -0.00394518 -0.00394126 -0.00393471 -0.0039255 -0.00391564
- -0.00390445 -0.00390621 -0.00390076 -0.00368875 -0.00368875 -0.00390076 -0.00390621 -0.00390445 -0.00391564 -0.0039255 -0.00393471 -0.00394126
- -0.00394518 -0.00394726 -0.00394823 -0.00394865 -0.00394881 -0.00394887 -0.00394889 -0.00394889 -0.00394889 -0.0039489 -0.0039489 -0.0039489
- -0.00406604 -0.00406604 -0.00406604 -0.00406604 -0.00406604 -0.00406604 -0.00406603 -0.00406599 -0.0040659 -0.00406566 -0.00406507 -0.00406376
- -0.00406117 -0.00405665 -0.00405001 -0.0040425 -0.00403354 -0.00403374 -0.00402994 -0.00381029 -0.00381028 -0.00402994 -0.00403374 -0.00403354
- -0.0040425 -0.00405001 -0.00405665 -0.00406117 -0.00406376 -0.00406507 -0.00406566 -0.0040659 -0.00406599 -0.00406603 -0.00406604 -0.00406604
- -0.00406604 -0.00406604 -0.00406604 -0.00406604 -0.00418318 -0.00418318 -0.00418318 -0.00418318 -0.00418318 -0.00418318 -0.00418318 -0.00418316
- -0.00418312 -0.00418299 -0.00418266 -0.00418191 -0.00418033 -0.00417743 -0.00417295 -0.00416758 -0.00416207 -0.00416051 -0.00415314 -0.00393093
- -0.00393093 -0.00415314 -0.00416051 -0.00416207 -0.00416758 -0.00417295 -0.00417743 -0.00418033 -0.00418191 -0.00418266 -0.00418299 -0.00418312
- -0.00418316 -0.00418318 -0.00418318 -0.00418318 -0.00418318 -0.00418318 -0.00418318 -0.00418318 -0.00430035 -0.00430035 -0.00430035 -0.00430035
- -0.00430035 -0.00430035 -0.00430035 -0.00430034 -0.00430032 -0.00430026 -0.0043001 -0.00429971 -0.00429884 -0.00429715 -0.00429436 -0.00429079
- -0.004288 -0.00428581 -0.00427388 -0.00404606 -0.00404606 -0.00427388 -0.00428581 -0.004288 -0.00429079 -0.00429436 -0.00429715 -0.00429884
- -0.00429971 -0.0043001 -0.00430026 -0.00430032 -0.00430034 -0.00430035 -0.00430035 -0.00430035 -0.00430035 -0.00430035 -0.00430035 -0.00430035
- -0.00441752 -0.00441752 -0.00441752 -0.00441752 -0.00441752 -0.00441752 -0.00441752 -0.00441751 -0.00441751 -0.00441748 -0.00441742 -0.00441724
- -0.00441683 -0.00441595 -0.00441439 -0.00441223 -0.00441032 -0.0044088 -0.00439134 -0.00415126 -0.00415126 -0.00439134 -0.0044088 -0.00441032
- -0.00441223 -0.00441439 -0.00441595 -0.00441683 -0.00441724 -0.00441742 -0.00441748 -0.00441751 -0.00441751 -0.00441752 -0.00441752 -0.00441752
- -0.00441752 -0.00441752 -0.00441752 -0.00441752 -0.00453469 -0.00453469 -0.00453469 -0.00453469 -0.00453469 -0.00453469 -0.00453469 -0.00453469
- -0.00453468 -0.00453468 -0.00453465 -0.00453459 -0.00453442 -0.00453404 -0.00453328 -0.00453212 -0.00453094 -0.00453011 -0.00450065 -0.00423594
- -0.00423593 -0.00450065 -0.00453011 -0.00453094 -0.00453212 -0.00453328 -0.00453404 -0.00453442 -0.00453459 -0.00453465 -0.00453468 -0.00453468
- -0.00453469 -0.00453469 -0.00453469 -0.00453469 -0.00453469 -0.00453469 -0.00453469 -0.00453469 -0.00465186 -0.00465186 -0.00465186 -0.00465186
- -0.00465186 -0.00465186 -0.00465186 -0.00465186 -0.00465186 -0.00465185 -0.00465185 -0.00465183 -0.00465178 -0.00465164 -0.00465133 -0.00465078
- -0.00465013 -0.00464966 -0.00457433 -0.00426554 -0.00426554 -0.00457433 -0.00464966 -0.00465013 -0.00465078 -0.00465133 -0.00465164 -0.00465178
- -0.00465183 -0.00465185 -0.00465185 -0.00465186 -0.00465186 -0.00465186 -0.00465186 -0.00465186 -0.00465186 -0.00465186 -0.00465186 -0.00465186
- -0.00476903 -0.00476903 -0.00476903 -0.00476903 -0.00476903 -0.00476903 -0.00476903 -0.00476903 -0.00476903 -0.00476902 -0.00476902 -0.00476902
- -0.00476901 -0.00476897 -0.00476886 -0.00476857 -0.00459112 -0.0044374 -0.00427172 -0.0040601 -0.0040601 -0.00427172 -0.0044374 -0.00459112
- -0.00476857 -0.00476886 -0.00476897 -0.00476901 -0.00476902 -0.00476902 -0.00476902 -0.00476903 -0.00476903 -0.00476903 -0.00476903 -0.00476903
- -0.00476903 -0.00476903 -0.00476903 -0.00476903
+ <DataArray type="Float32" Name="deltaRho" NumberOfComponents="1" format="ascii">
+ -0.000153409 -0.0001363 -0.000125954 -0.000117228 -0.000108676 -9.98377e-05 -9.15658e-05 -8.29966e-05 -7.37752e-05 -6.40306e-05 -5.43447e-05 -4.49954e-05
+ -3.62593e-05 -2.83512e-05 -2.13714e-05 -1.52821e-05 -9.91219e-06 -5.19934e-06 -8.05881e-07 4.1644e-06 4.32414e-06 -6.83688e-07 -5.09232e-06 -9.81307e-06
+ -1.51901e-05 -2.12857e-05 -2.82716e-05 -3.61855e-05 -4.49273e-05 -5.42823e-05 -6.39736e-05 -7.37234e-05 -8.29498e-05 -9.15236e-05 -9.97993e-05 -0.000108641
+ -0.000117196 -0.000125926 -0.000136275 -0.000153389 -0.000242829 -0.000206259 -0.000181712 -0.000167066 -0.000158842 -0.000153714 -0.00014928 -0.000145265
+ -0.000141589 -0.000138148 -0.000134766 -0.000131511 -0.000128475 -0.000125754 -0.000123423 -0.000121518 -0.000120021 -0.000117985 -0.00011387 -0.00010606
+ -0.000105892 -0.00011376 -0.000117898 -0.000119944 -0.000121443 -0.000123352 -0.000125686 -0.000128409 -0.000131448 -0.000134707 -0.000138092 -0.000141536
+ -0.000145215 -0.000149233 -0.00015367 -0.000158801 -0.000167027 -0.000181676 -0.000206229 -0.000242807 -0.000351298 -0.000310676 -0.000287511 -0.00027591
+ -0.000269561 -0.000265277 -0.000261923 -0.000259087 -0.000256595 -0.000254381 -0.000252436 -0.000250785 -0.000249459 -0.000248469 -0.000247765 -0.000247191
+ -0.000246419 -0.000243555 -0.000236386 -0.000221901 -0.000221725 -0.000236288 -0.000243488 -0.000246365 -0.00024714 -0.000247716 -0.000248421 -0.000249412
+ -0.000250739 -0.000252392 -0.000254338 -0.000256554 -0.000259049 -0.000261887 -0.000265243 -0.000269529 -0.000275879 -0.000287481 -0.000310648 -0.000351278
+ -0.000466589 -0.00042478 -0.00040388 -0.000394945 -0.000390436 -0.000387327 -0.000384772 -0.00038257 -0.000380697 -0.00037918 -0.000378063 -0.000377388
+ -0.000377167 -0.000377347 -0.000377746 -0.000377974 -0.000377319 -0.000373023 -0.000361722 -0.000338406 -0.000338224 -0.000361636 -0.000372975 -0.000377287
+ -0.000377946 -0.000377718 -0.000377319 -0.000377139 -0.000377359 -0.000378034 -0.000379152 -0.00038067 -0.000382544 -0.000384747 -0.000387303 -0.000390412
+ -0.000394921 -0.000403855 -0.000424756 -0.000466572 -0.000584951 -0.000542477 -0.000523233 -0.000516244 -0.000513324 -0.000511447 -0.000509844 -0.000508417
+ -0.000507251 -0.000506466 -0.00050618 -0.000506476 -0.000507374 -0.000508765 -0.000510327 -0.000511386 -0.000510723 -0.000504822 -0.000488867 -0.00045512
+ -0.000454934 -0.000488791 -0.000504789 -0.000510708 -0.000511377 -0.000510318 -0.000508755 -0.000507361 -0.000506462 -0.000506164 -0.00050645 -0.000507234
+ -0.000508401 -0.000509827 -0.000511431 -0.000513307 -0.000516226 -0.000523213 -0.000542456 -0.000584936 -0.000704868 -0.000661752 -0.00064351 -0.00063785
+ -0.000636207 -0.000635476 -0.000634871 -0.000634325 -0.000633988 -0.000634057 -0.000634717 -0.000636104 -0.000638252 -0.000641009 -0.000643903 -0.000645939
+ -0.000645304 -0.000637867 -0.000617198 -0.000571932 -0.000571744 -0.000617132 -0.000637844 -0.000645301 -0.000645943 -0.000643908 -0.000641012 -0.000638252
+ -0.000636101 -0.000634711 -0.000634049 -0.000633979 -0.000634316 -0.00063486 -0.000635465 -0.000636194 -0.000637835 -0.000643493 -0.000661733 -0.000704855
+ -0.000825616 -0.000781809 -0.00076407 -0.000759251 -0.000758559 -0.000758788 -0.000759101 -0.000759434 -0.000759971 -0.00076096 -0.000762646 -0.000765208
+ -0.000768698 -0.000772922 -0.000777267 -0.000780408 -0.000779916 -0.000771181 -0.000746172 -0.0006888 -0.000688609 -0.000746111 -0.000771162 -0.000779916
+ -0.000780417 -0.000777279 -0.000772933 -0.000768705 -0.000765213 -0.000762647 -0.000760959 -0.000759967 -0.000759429 -0.000759095 -0.00075878 -0.000758549
+ -0.000759238 -0.000764055 -0.000781792 -0.000825604 -0.000946806 -0.000902286 -0.00088471 -0.000880368 -0.000880336 -0.00088131 -0.000882398 -0.000883526
+ -0.000884898 -0.000886801 -0.000889517 -0.000893258 -0.000898084 -0.000903763 -0.000909545 -0.000913815 -0.000913578 -0.000903894 -0.000875286 -0.000805704
+ -0.000805511 -0.000875225 -0.000903869 -0.000913574 -0.000913823 -0.000909558 -0.000903776 -0.000898096 -0.000893267 -0.000889522 -0.000886803 -0.000884897
+ -0.000883523 -0.000882393 -0.000881304 -0.000880328 -0.000880357 -0.000884697 -0.000902271 -0.000946796 -0.00106802 -0.00102313 -0.00100537 -0.00100125
+ -0.00100164 -0.00100317 -0.00100487 -0.00100668 -0.0010088 -0.00101156 -0.00101525 -0.0010201 -0.00102616 -0.00103315 -0.00104021 -0.00104547
+ -0.00104552 -0.00103529 -0.0010041 -0.000922631 -0.000922436 -0.00100403 -0.00103526 -0.00104551 -0.00104547 -0.00104022 -0.00103317 -0.00102618
+ -0.00102011 -0.00101526 -0.00101156 -0.0010088 -0.00100667 -0.00100487 -0.00100316 -0.00100164 -0.00100124 -0.00100536 -0.00102311 -0.00106801
+ -0.00118913 -0.00114405 -0.00112616 -0.00112196 -0.00112261 -0.00112452 -0.0011267 -0.00112907 -0.00113186 -0.0011354 -0.00113997 -0.00114582
+ -0.00115294 -0.001161 -0.00116903 -0.00117499 -0.00117525 -0.00116488 -0.00113226 -0.00103957 -0.00103938 -0.00113217 -0.00116483 -0.00117522
+ -0.00117498 -0.00116903 -0.00116101 -0.00115295 -0.00114583 -0.00113998 -0.0011354 -0.00113186 -0.00112907 -0.0011267 -0.00112452 -0.00112261
+ -0.00112195 -0.00112615 -0.00114404 -0.00118912 -0.00131014 -0.00126496 -0.00124695 -0.0012426 -0.00124335 -0.00124552 -0.00124806 -0.00125091
+ -0.00125429 -0.00125852 -0.00126389 -0.00127058 -0.00127856 -0.00128739 -0.001296 -0.00130227 -0.00130255 -0.00129242 -0.00125949 -0.00115653
+ -0.00115633 -0.00125939 -0.00129236 -0.00130251 -0.00130224 -0.00129599 -0.00128739 -0.00127856 -0.00127059 -0.0012639 -0.00125852 -0.00125429
+ -0.00125091 -0.00124806 -0.00124552 -0.00124335 -0.00124259 -0.00124694 -0.00126495 -0.00131013 -0.00143103 -0.00138582 -0.00136766 -0.00136315
+ -0.00136393 -0.00136628 -0.00136911 -0.00137236 -0.00137627 -0.00138113 -0.00138719 -0.00139458 -0.00140318 -0.00141246 -0.00142124 -0.00142738
+ -0.00142749 -0.00141792 -0.00138567 -0.00127349 -0.00127329 -0.00138554 -0.00141784 -0.00142744 -0.00142735 -0.00142123 -0.00141246 -0.00140318
+ -0.00139459 -0.0013872 -0.00138113 -0.00137627 -0.00137236 -0.00136911 -0.00136627 -0.00136392 -0.00136315 -0.00136766 -0.00138581 -0.00143102
+ -0.0015518 -0.00150657 -0.00148827 -0.00148361 -0.00148439 -0.00148686 -0.00148994 -0.00149356 -0.00149795 -0.00150338 -0.00151003 -0.00151796
+ -0.00152695 -0.00153637 -0.00154493 -0.00155057 -0.00155034 -0.00154155 -0.00151074 -0.00139046 -0.00139026 -0.00151059 -0.00154146 -0.00155029
+ -0.00155054 -0.00154492 -0.00153636 -0.00152695 -0.00151797 -0.00151004 -0.00150338 -0.00149795 -0.00149356 -0.00148994 -0.00148686 -0.00148439
+ -0.00148361 -0.00148826 -0.00150656 -0.00155179 -0.00167243 -0.00162721 -0.00160874 -0.00160397 -0.00160476 -0.00160733 -0.00161062 -0.00161458
+ -0.00161942 -0.00162536 -0.00163251 -0.00164082 -0.00164998 -0.00165924 -0.00166727 -0.00167214 -0.00167149 -0.00166359 -0.00163475 -0.00150743
+ -0.00150723 -0.00163458 -0.0016635 -0.00167144 -0.00167211 -0.00166725 -0.00165923 -0.00164998 -0.00164082 -0.00163251 -0.00162537 -0.00161943
+ -0.00161458 -0.00161062 -0.00160733 -0.00160476 -0.00160396 -0.00160873 -0.0016272 -0.00167242 -0.0017929 -0.00174769 -0.00172903 -0.00172423
+ -0.00172504 -0.00172769 -0.00173118 -0.00173548 -0.00174074 -0.00174713 -0.00175466 -0.0017632 -0.00177232 -0.00178118 -0.00178845 -0.00179239
+ -0.00179135 -0.00178435 -0.00175779 -0.00162441 -0.0016242 -0.0017576 -0.00178427 -0.0017913 -0.00179236 -0.00178843 -0.00178117 -0.00177232
+ -0.0017632 -0.00175466 -0.00174713 -0.00174075 -0.00173548 -0.00173118 -0.00172769 -0.00172504 -0.00172423 -0.00172902 -0.00174768 -0.0017929
+ -0.00191322 -0.00186798 -0.00184917 -0.0018444 -0.00184523 -0.00184796 -0.00185166 -0.00185627 -0.00186192 -0.00186868 -0.00187649 -0.00188511
+ -0.00189401 -0.00190228 -0.00190864 -0.00191166 -0.00191026 -0.00190413 -0.00187998 -0.00174139 -0.00174118 -0.00187978 -0.00190406 -0.00191022
+ -0.00191164 -0.00190863 -0.00190227 -0.001894 -0.0018851 -0.00187649 -0.00186868 -0.00186192 -0.00185627 -0.00185166 -0.00184796 -0.00184522
+ -0.0018444 -0.00184917 -0.00186797 -0.00191322 -0.00203334 -0.00198805 -0.00196921 -0.00196448 -0.00196532 -0.00196814 -0.00197203 -0.00197694
+ -0.00198293 -0.00198999 -0.00199797 -0.00200652 -0.00201505 -0.00202261 -0.00202798 -0.00203007 -0.0020285 -0.00202316 -0.00200146 -0.00185836
+ -0.00185816 -0.00200126 -0.00202309 -0.00202846 -0.00203005 -0.00202797 -0.0020226 -0.00201504 -0.00200652 -0.00199797 -0.00198999 -0.00198293
+ -0.00197694 -0.00197203 -0.00196814 -0.00196532 -0.00196447 -0.0019692 -0.00198804 -0.00203334 -0.00215322 -0.00210798 -0.00208914 -0.00208445
+ -0.00208531 -0.00208821 -0.0020923 -0.00209748 -0.00210375 -0.00211102 -0.00211906 -0.00212744 -0.00213547 -0.00214222 -0.0021466 -0.00214785
+ -0.00214627 -0.00214163 -0.00212235 -0.00197535 -0.00197514 -0.00212214 -0.00214157 -0.00214624 -0.00214783 -0.00214659 -0.00214221 -0.00213546
+ -0.00212743 -0.00211906 -0.00211102 -0.00210375 -0.00209748 -0.0020923 -0.00208821 -0.00208531 -0.00208444 -0.00208913 -0.00210797 -0.00215322
+ -0.00227287 -0.00222776 -0.00220895 -0.00220431 -0.00220519 -0.00220817 -0.00221243 -0.00221784 -0.00222433 -0.00223174 -0.00223974 -0.00224783
+ -0.0022553 -0.00226121 -0.00226467 -0.00226528 -0.00226372 -0.00225967 -0.00224274 -0.00209233 -0.00209212 -0.00224254 -0.00225962 -0.0022637
+ -0.00226527 -0.00226466 -0.0022612 -0.00225529 -0.00224782 -0.00223973 -0.00223173 -0.00222433 -0.00221784 -0.00221243 -0.00220817 -0.00220518
+ -0.0022043 -0.00220895 -0.00222775 -0.00227287 -0.00239233 -0.00234742 -0.00232867 -0.00232406 -0.00232495 -0.00232801 -0.0023324 -0.00233799
+ -0.00234463 -0.00235208 -0.00235996 -0.00236771 -0.00237456 -0.00237967 -0.00238233 -0.00238248 -0.00238096 -0.00237739 -0.00236272 -0.00220931
+ -0.0022091 -0.00236254 -0.00237735 -0.00238094 -0.00238247 -0.00238232 -0.00237966 -0.00237455 -0.0023677 -0.00235996 -0.00235208 -0.00234463
+ -0.00233799 -0.0023324 -0.002328 -0.00232495 -0.00232406 -0.00232867 -0.00234741 -0.00239232 -0.00251161 -0.00246698 -0.00244831 -0.00244372
+ -0.0024446 -0.00244769 -0.00245219 -0.00245789 -0.0024646 -0.00247204 -0.00247973 -0.00248708 -0.00249332 -0.00249769 -0.0024997 -0.00249956
+ -0.00249804 -0.00249487 -0.00248235 -0.00232629 -0.00232608 -0.00248218 -0.00249484 -0.00249803 -0.00249955 -0.00249969 -0.00249769 -0.00249331
+ -0.00248707 -0.00247973 -0.00247203 -0.0024646 -0.00245788 -0.00245219 -0.00244769 -0.0024446 -0.00244372 -0.0024483 -0.00246697 -0.0025116
+ -0.00263074 -0.00258646 -0.00256787 -0.00256328 -0.00256413 -0.00256722 -0.00257176 -0.0025775 -0.00258423 -0.00259157 -0.00259903 -0.00260597
+ -0.00261164 -0.00261536 -0.00261686 -0.00261656 -0.00261503 -0.00261215 -0.00260166 -0.00244327 -0.00244306 -0.00260151 -0.00261213 -0.00261502
+ -0.00261655 -0.00261686 -0.00261535 -0.00261163 -0.00260596 -0.00259903 -0.00259157 -0.00258422 -0.0025775 -0.00257176 -0.00256722 -0.00256412
+ -0.00256328 -0.00256786 -0.00258645 -0.00263074 -0.00274977 -0.00270589 -0.00268737 -0.00268276 -0.00268353 -0.00268658 -0.00269109 -0.00269681
+ -0.00270347 -0.00271068 -0.00271788 -0.00272442 -0.00272957 -0.00273275 -0.0027339 -0.00273353 -0.00273194 -0.00272928 -0.00272067 -0.00256026
+ -0.00256004 -0.00272055 -0.00272926 -0.00273194 -0.00273353 -0.0027339 -0.00273275 -0.00272956 -0.00272441 -0.00271788 -0.00271067 -0.00270347
+ -0.00269681 -0.00269109 -0.00268658 -0.00268353 -0.00268275 -0.00268737 -0.00270588 -0.00274976 -0.00286871 -0.0028253 -0.00280684 -0.00280216
+ -0.00280282 -0.00280577 -0.00281018 -0.0028158 -0.00282233 -0.00282935 -0.0028363 -0.00284247 -0.00284717 -0.00284992 -0.00285085 -0.00285049
+ -0.00284881 -0.00284628 -0.00283938 -0.00267724 -0.00267702 -0.00283928 -0.00284627 -0.00284881 -0.00285049 -0.00285085 -0.00284992 -0.00284716
+ -0.00284246 -0.00283629 -0.00282934 -0.00282232 -0.0028158 -0.00281018 -0.00280576 -0.00280282 -0.00280216 -0.00280684 -0.0028253 -0.00286871
+ -0.0029876 -0.00294474 -0.00292631 -0.00292151 -0.00292201 -0.00292478 -0.00292902 -0.00293445 -0.00294079 -0.0029476 -0.00295429 -0.00296016
+ -0.00296451 -0.00296692 -0.00296774 -0.00296743 -0.00296564 -0.00296319 -0.00295775 -0.00279422 -0.002794 -0.00295767 -0.00296319 -0.00296563
+ -0.00296742 -0.00296774 -0.00296692 -0.0029645 -0.00296015 -0.00295428 -0.00294759 -0.00294078 -0.00293445 -0.00292902 -0.00292478 -0.00292201
+ -0.00292151 -0.00292631 -0.00294473 -0.0029876 -0.00310647 -0.00306423 -0.00304581 -0.00304084 -0.00304111 -0.00304363 -0.00304761 -0.00305278
+ -0.00305885 -0.00306541 -0.00307187 -0.00307751 -0.00308162 -0.00308381 -0.00308458 -0.0030843 -0.00308242 -0.00308003 -0.00307573 -0.0029112
+ -0.00291098 -0.00307567 -0.00308003 -0.00308242 -0.0030843 -0.00308458 -0.00308381 -0.00308161 -0.00307751 -0.00307187 -0.00306541 -0.00305885
+ -0.00305278 -0.00304761 -0.00304363 -0.0030411 -0.00304084 -0.00304581 -0.00306422 -0.00310647 -0.00322537 -0.00318383 -0.00316539 -0.00316018
+ -0.00316016 -0.00316239 -0.00316605 -0.00317088 -0.00317662 -0.00318286 -0.00318903 -0.00319445 -0.0031984 -0.00320052 -0.00320128 -0.00320105
+ -0.00319916 -0.00319681 -0.00319322 -0.00302818 -0.00302796 -0.00319319 -0.00319681 -0.00319915 -0.00320105 -0.00320128 -0.00320051 -0.0031984
+ -0.00319444 -0.00318903 -0.00318285 -0.00317661 -0.00317088 -0.00316605 -0.00316239 -0.00316016 -0.00316018 -0.00316538 -0.00318382 -0.00322537
+ -0.00334416 -0.00330358 -0.00328514 -0.00327964 -0.00327927 -0.00328114 -0.0032844 -0.00328879 -0.00329409 -0.00329993 -0.00330578 -0.00331096
+ -0.00331482 -0.00331698 -0.00331784 -0.00331762 -0.00331581 -0.00331354 -0.00331012 -0.00314516 -0.00314494 -0.00331011 -0.00331354 -0.0033158
+ -0.00331762 -0.00331784 -0.00331698 -0.00331481 -0.00331096 -0.00330577 -0.00329993 -0.00329409 -0.00328879 -0.00328439 -0.00328114 -0.00327927
+ -0.00327963 -0.00328514 -0.00330358 -0.00334416 -0.00346284 -0.00342351 -0.00340517 -0.00339931 -0.00339851 -0.00339992 -0.00340269 -0.00340656
+ -0.00341133 -0.00341668 -0.00342213 -0.00342707 -0.00343086 -0.00343315 -0.00343418 -0.00343404 -0.00343234 -0.00343021 -0.00342692 -0.00326169
+ -0.00326148 -0.00342691 -0.00343021 -0.00343233 -0.00343404 -0.00343417 -0.00343314 -0.00343085 -0.00342706 -0.00342212 -0.00341668 -0.00341133
+ -0.00340656 -0.00340269 -0.00339992 -0.00339851 -0.00339931 -0.00340517 -0.0034235 -0.00346283 -0.00358143 -0.00354366 -0.00352558 -0.00351929
+ -0.00351796 -0.00351882 -0.00352101 -0.00352426 -0.0035284 -0.00353316 -0.00353814 -0.00354279 -0.00354651 -0.00354896 -0.00355018 -0.00355023
+ -0.00354871 -0.00354682 -0.00354367 -0.00337761 -0.00337741 -0.00354367 -0.00354681 -0.0035487 -0.00355022 -0.00355017 -0.00354895 -0.00354651
+ -0.00354278 -0.00353814 -0.00353316 -0.0035284 -0.00352426 -0.00352101 -0.00351882 -0.00351795 -0.00351929 -0.00352557 -0.00354366 -0.00358142
+ -0.00369994 -0.0036641 -0.00364645 -0.00363971 -0.00363775 -0.00363798 -0.0036395 -0.00364203 -0.00364543 -0.0036495 -0.00365391 -0.00365818
+ -0.00366179 -0.00366436 -0.00366578 -0.00366609 -0.00366487 -0.00366334 -0.00366038 -0.00349273 -0.00349254 -0.00366037 -0.00366333 -0.00366486
+ -0.00366609 -0.00366578 -0.00366436 -0.00366179 -0.00365818 -0.0036539 -0.0036495 -0.00364543 -0.00364203 -0.0036395 -0.00363798 -0.00363775
+ -0.00363971 -0.00364644 -0.0036641 -0.00369994 -0.00381841 -0.0037849 -0.00376789 -0.00376074 -0.0037581 -0.0037576 -0.00375836 -0.00376007
+ -0.00376263 -0.00376589 -0.0037696 -0.00377338 -0.00377678 -0.00377939 -0.00378099 -0.0037816 -0.00378078 -0.00377977 -0.00377701 -0.00360679
+ -0.0036066 -0.003777 -0.00377977 -0.00378078 -0.0037816 -0.00378098 -0.00377938 -0.00377677 -0.00377338 -0.0037696 -0.00376589 -0.00376263
+ -0.00376007 -0.00375836 -0.0037576 -0.00375809 -0.00376073 -0.00376789 -0.00378489 -0.00381841 -0.00393686 -0.0039061 -0.00389002 -0.00388256
+ -0.00387924 -0.00387797 -0.00387789 -0.00387871 -0.00388033 -0.00388265 -0.00388552 -0.00388865 -0.00389167 -0.00389418 -0.00389589 -0.00389661
+ -0.00389644 -0.00389614 -0.00389356 -0.0037194 -0.00371922 -0.00389355 -0.00389614 -0.00389644 -0.00389661 -0.00389589 -0.00389417 -0.00389166
+ -0.00388865 -0.00388552 -0.00388265 -0.00388032 -0.00387871 -0.00387789 -0.00387797 -0.00387924 -0.00388256 -0.00389002 -0.0039061 -0.00393686
+ -0.0040553 -0.00402777 -0.00401294 -0.0040054 -0.00400151 -0.00399948 -0.00399854 -0.00399841 -0.003999 -0.00400027 -0.00400214 -0.00400443
+ -0.00400685 -0.00400907 -0.00401077 -0.00401167 -0.00401207 -0.00401254 -0.00400998 -0.00382996 -0.00382978 -0.00400997 -0.00401254 -0.00401207
+ -0.00401166 -0.00401076 -0.00400907 -0.00400685 -0.00400443 -0.00400214 -0.00400027 -0.003999 -0.00399841 -0.00399854 -0.00399948 -0.0040015
+ -0.0040054 -0.00401294 -0.00402777 -0.0040553 -0.00417377 -0.00414993 -0.00413672 -0.00412943 -0.0041252 -0.00412257 -0.00412085 -0.0041198
+ -0.00411933 -0.00411946 -0.00412018 -0.00412142 -0.004123 -0.00412467 -0.00412613 -0.00412714 -0.00412793 -0.00412915 -0.00412621 -0.00393743
+ -0.00393726 -0.0041262 -0.00412915 -0.00412793 -0.00412714 -0.00412613 -0.00412466 -0.004123 -0.00412142 -0.00412018 -0.00411946 -0.00411933
+ -0.00411979 -0.00412085 -0.00412257 -0.0041252 -0.00412943 -0.00413671 -0.00414993 -0.00417377 -0.00429234 -0.0042726 -0.00426138 -0.00425478
+ -0.00425059 -0.00424764 -0.00424538 -0.00424356 -0.00424214 -0.00424115 -0.00424065 -0.00424067 -0.00424115 -0.00424195 -0.00424288 -0.00424376
+ -0.00424457 -0.00424636 -0.00424202 -0.00403991 -0.00403975 -0.00424201 -0.00424636 -0.00424457 -0.00424375 -0.00424288 -0.00424195 -0.00424114
+ -0.00424067 -0.00424065 -0.00424115 -0.00424214 -0.00424356 -0.00424538 -0.00424764 -0.00425058 -0.00425478 -0.00426137 -0.0042726 -0.00429234
+ -0.00441103 -0.00439573 -0.00438683 -0.00438136 -0.00437766 -0.00437484 -0.00437242 -0.00437019 -0.00436811 -0.00436622 -0.00436461 -0.00436338
+ -0.00436259 -0.00436224 -0.00436227 -0.00436262 -0.00436335 -0.00436498 -0.00435653 -0.00413326 -0.00413311 -0.00435652 -0.00436498 -0.00436335
+ -0.00436261 -0.00436227 -0.00436223 -0.00436259 -0.00436338 -0.00436461 -0.00436622 -0.00436811 -0.00437019 -0.00437242 -0.00437484 -0.00437766
+ -0.00438136 -0.00438683 -0.00439572 -0.00441103 -0.00452992 -0.00451919 -0.00451288 -0.00450891 -0.00450613 -0.00450389 -0.00450179 -0.00449966
+ -0.00449743 -0.00449512 -0.0044928 -0.00449059 -0.00448862 -0.00448699 -0.00448581 -0.00448517 -0.0044853 -0.00448607 -0.00446568 -0.00420684
+ -0.00420669 -0.00446566 -0.00448607 -0.0044853 -0.00448517 -0.00448581 -0.00448699 -0.00448862 -0.00449059 -0.0044928 -0.00449511 -0.00449743
+ -0.00449966 -0.00450179 -0.00450388 -0.00450613 -0.00450891 -0.00451287 -0.00451919 -0.00452992 -0.00464906 -0.00464276 -0.00463908 -0.00463681
+ -0.00463524 -0.00463391 -0.00463256 -0.00463103 -0.00462925 -0.00462719 -0.00462487 -0.00462235 -0.00461972 -0.00461709 -0.00461464 -0.00461266
+ -0.00461171 -0.0046123 -0.00454304 -0.00422497 -0.00422483 -0.00454299 -0.0046123 -0.00461171 -0.00461266 -0.00461464 -0.00461709 -0.00461972
+ -0.00462235 -0.00462487 -0.00462719 -0.00462925 -0.00463103 -0.00463256 -0.00463391 -0.00463524 -0.00463681 -0.00463908 -0.00464275 -0.00464906
+ -0.0047682 -0.00476575 -0.00476444 -0.00476376 -0.00476336 -0.004763 -0.00476254 -0.00476188 -0.00476096 -0.00475974 -0.00475818 -0.00475624
+ -0.00475384 -0.00475094 -0.00474753 -0.00474402 -0.00455185 -0.00438883 -0.00421303 -0.00399463 -0.00399458 -0.00421301 -0.00438882 -0.00455184
+ -0.00474402 -0.00474753 -0.00475094 -0.00475384 -0.00475623 -0.00475818 -0.00475974 -0.00476096 -0.00476188 -0.00476254 -0.004763 -0.00476336
+ -0.00476376 -0.00476444 -0.00476575 -0.0047682
</DataArray>
</CellData>
<Points>
diff --git a/test/references/test_kovasznay-reference.vtu b/test/references/test_kovasznay-reference.vtu
index 274f82e2de6b9c964ea7f7ddb4ffcafb39a6637d..2ebc7049891491a259d10365f84452a329c14b98 100644
--- a/test/references/test_kovasznay-reference.vtu
+++ b/test/references/test_kovasznay-reference.vtu
@@ -2,844 +2,844 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="2500" NumberOfPoints="2601">
- <CellData Scalars="pressure" Vectors="velocity_Constant (m/s)">
- <DataArray type="Float32" Name="pressure" NumberOfComponents="1" format="ascii">
- -0.749079 -0.610346 -0.504136 -0.410101 -0.324902 -0.247117 -0.176005 -0.111065 -0.0518674 0.00199463 0.0509208 0.0953034
- 0.135523 0.171942 0.204904 0.234731 0.261719 0.286139 0.30824 0.328247 0.346364 0.362773 0.37764 0.391113
- 0.403328 0.414403 0.424448 0.433562 0.441831 0.449337 0.456152 0.462342 0.467967 0.47308 0.477731 0.481967
- 0.485827 0.489351 0.492574 0.495528 0.498243 0.500747 0.503065 0.505221 0.507238 0.509139 0.510957 0.512746
- 0.514654 0.517106 -0.749079 -0.605647 -0.50357 -0.410174 -0.324761 -0.246656 -0.175313 -0.110254 -0.0510274 0.00280281
- 0.0516615 0.0959588 0.136087 0.172417 0.205297 0.23505 0.261974 0.286339 0.308395 0.328364 0.34645 0.362834
- 0.377681 0.391138 0.40334 0.414406 0.424444 0.433551 0.441817 0.44932 0.456134 0.462323 0.467947 0.473061
- 0.477714 0.481951 0.485815 0.489342 0.492568 0.495526 0.498246 0.500755 0.503078 0.50524 0.507263 0.509171
- 0.51099 0.51276 0.514543 0.51639 -0.749079 -0.602602 -0.503329 -0.410571 -0.325002 -0.246565 -0.174934 -0.109685
- -0.050362 0.00349368 0.0523292 0.0965728 0.136631 0.172884 0.205687 0.235367 0.262225 0.286534 0.30854 0.328469
- 0.346521 0.362878 0.377703 0.391144 0.403333 0.414389 0.424419 0.433521 0.441783 0.449284 0.456096 0.462285
- 0.467909 0.473024 0.477678 0.481917 0.485781 0.489311 0.492539 0.4955 0.498222 0.500734 0.503061 0.505226
- 0.507252 0.509157 0.510961 0.512679 0.514313 0.515803 -0.749079 -0.603652 -0.504846 -0.411828 -0.325756 -0.246834
- -0.174829 -0.109328 -0.0498557 0.00407008 0.0529193 0.097138 0.137146 0.173336 0.206071 0.235683 0.262478 0.286729
- 0.308687 0.328573 0.346591 0.362919 0.377722 0.391145 0.403319 0.414364 0.424387 0.433483 0.441741 0.449239
- 0.456049 0.462237 0.467861 0.472975 0.477629 0.481868 0.485733 0.489262 0.492491 0.495452 0.498175 0.500688
- 0.503016 0.505182 0.507208 0.509109 0.510898 0.512572 0.514103 0.515398 -0.749079 -0.609032 -0.508444 -0.414101
- -0.32706 -0.247449 -0.174973 -0.109163 -0.0495004 0.0045316 0.0534258 0.0976455 0.137625 0.173766 0.206443 0.235995
- 0.262731 0.286929 0.308838 0.328684 0.346666 0.362966 0.377746 0.39115 0.40331 0.414343 0.424357 0.433446
- 0.441699 0.449193 0.456001 0.462186 0.467808 0.472921 0.477574 0.481811 0.485675 0.489202 0.492429 0.495388
- 0.498109 0.50062 0.502946 0.505112 0.507137 0.509037 0.51082 0.512477 0.513971 0.515205 -0.749079 -0.617432
- -0.513493 -0.417098 -0.328768 -0.248335 -0.175329 -0.109175 -0.0492919 0.00487448 0.0538406 0.0980851 0.138054 0.174164
- 0.206795 0.236296 0.26298 0.287129 0.308995 0.328802 0.346752 0.363024 0.377781 0.391166 0.403311 0.414333
- 0.424336 0.433418 0.441665 0.449154 0.455958 0.462139 0.467758 0.472868 0.477518 0.481752 0.485612 0.489135
- 0.492358 0.495312 0.498028 0.500535 0.502857 0.50502 0.507045 0.508948 0.510738 0.512409 0.51393 0.515222
- -0.749079 -0.626527 -0.51882 -0.420256 -0.330608 -0.249357 -0.175831 -0.109332 -0.0492187 0.00510048 0.0541606 0.0984506
- 0.138428 0.174519 0.207117 0.236577 0.263219 0.287327 0.309154 0.328928 0.346848 0.363095 0.37783 0.391197
- 0.403327 0.414336 0.42433 0.433404 0.441643 0.449126 0.455924 0.462101 0.467716 0.472821 0.477466 0.481695
- 0.485549 0.489067 0.492283 0.495229 0.497938 0.500436 0.502752 0.50491 0.506934 0.508843 0.51065 0.51236
- 0.513957 0.515396 -0.749079 -0.633847 -0.523242 -0.422993 -0.332274 -0.25035 -0.17639 -0.109585 -0.049252 0.00522587
- 0.0543956 0.0987471 0.138746 0.174831 0.207407 0.236837 0.263445 0.287519 0.309316 0.32906 0.346954 0.363179
- 0.377894 0.391245 0.403361 0.414358 0.424341 0.433405 0.441637 0.449113 0.455904 0.462075 0.467683 0.472783
- 0.477421 0.481643 0.48549 0.489 0.492207 0.495144 0.497842 0.500329 0.502635 0.504784 0.506804 0.508717
- 0.510545 0.512305 0.514003 0.515635 -0.749079 -0.637845 -0.526064 -0.424934 -0.333515 -0.251151 -0.17691 -0.109864
- -0.0493463 0.00528243 0.0545715 0.0989948 0.139024 0.175111 0.207672 0.23708 0.263662 0.28771 0.30948 0.329201
- 0.347073 0.363278 0.377976 0.391311 0.403412 0.414397 0.424369 0.433424 0.441647 0.449115 0.455899 0.462062
- 0.467664 0.472755 0.477386 0.4816 0.485438 0.488938 0.492134 0.495058 0.497743 0.500216 0.502507 0.504644
- 0.506653 0.508565 0.510408 0.512212 0.514009 0.515831 -0.749079 -0.638762 -0.527211 -0.426022 -0.334184 -0.25164
- -0.177329 -0.110106 -0.0494547 0.00530712 0.0547276 0.0992288 0.139289 0.175381 0.207931 0.237321 0.263882 0.287907
- 0.309656 0.329355 0.347208 0.363395 0.378076 0.391396 0.403484 0.414456 0.424417 0.433462 0.441675 0.449134
- 0.455909 0.462064 0.467657 0.472741 0.477363 0.481567 0.485395 0.488883 0.492066 0.494976 0.497644 0.5001
- 0.502372 0.504489 0.506481 0.508381 0.510225 0.512054 0.513918 0.51588 -0.749079 -0.637694 -0.526504 -0.425554
- -0.334078 -0.251638 -0.177615 -0.110275 -0.0495533 0.00532131 0.0549123 0.0994964 0.139583 0.175673 0.20821 0.237581
- 0.264121 0.288125 0.309852 0.329532 0.347366 0.363534 0.378199 0.391504 0.403577 0.414536 0.424485 0.433518
- 0.44172 0.44917 0.455935 0.462081 0.467665 0.472738 0.47735 0.481544 0.48536 0.488835 0.492003 0.494897
- 0.497546 0.499981 0.502229 0.50432 0.506285 0.50816 0.509983 0.511806 0.51369 0.515711 -0.749079 -0.635709
- -0.525144 -0.424495 -0.333273 -0.250941 -0.176793 -0.109813 -0.0496187 0.00529352 0.0551916 0.0998568 0.139951 0.176026
- 0.208539 0.237884 0.264398 0.288378 0.310082 0.329739 0.347552 0.363701 0.378348 0.391635 0.403693 0.414638
- 0.424573 0.433594 0.441784 0.449222 0.455977 0.462112 0.467685 0.472748 0.477349 0.481531 0.485334 0.488794
- 0.491946 0.494822 0.49745 0.499859 0.502079 0.504137 0.506065 0.507898 0.509678 0.511458 0.513305 0.515297
- -0.749079 -0.633803 -0.523595 -0.423156 -0.332107 -0.249903 -0.175822 -0.108975 -0.04881 0.00555934 0.055678 0.100347
- 0.140404 0.176436 0.208908 0.238216 0.264696 0.288645 0.310321 0.329953 0.347743 0.363872 0.3785 0.39177
- 0.403813 0.414743 0.424665 0.433673 0.441852 0.449279 0.456023 0.462148 0.467711 0.472764 0.477354 0.481525
- 0.485315 0.48876 0.491894 0.494749 0.497353 0.499735 0.501921 0.503939 0.505819 0.507595 0.509306 0.511006
- 0.512762 0.514653 -0.749079 -0.635797 -0.525251 -0.424615 -0.3334 -0.251071 -0.176924 -0.109932 -0.0497399 0.00519619
- 0.0550947 0.0997669 0.13987 0.175952 0.208472 0.237823 0.264343 0.288327 0.310034 0.329693 0.347507 0.363657
- 0.378303 0.39159 0.403646 0.414588 0.424521 0.433538 0.441725 0.449158 0.455908 0.462037 0.467602 0.472656
- 0.477245 0.481413 0.485198 0.488637 0.491763 0.494604 0.497191 0.49955 0.501706 0.503686 0.505516 0.507227
- 0.508855 0.510446 0.512066 0.513816 -0.749079 -0.637891 -0.526731 -0.425794 -0.334323 -0.251881 -0.177859 -0.110473
- -0.0497438 0.00515065 0.0547579 0.0993593 0.139463 0.175568 0.208119 0.2375 0.264049 0.28806 0.309791 0.329473
- 0.347306 0.363473 0.378135 0.391435 0.403503 0.414455 0.424396 0.43342 0.441612 0.44905 0.455803 0.461934
- 0.467501 0.472554 0.477141 0.481304 0.485083 0.488512 0.491625 0.49445 0.497014 0.499344 0.501462 0.503394
- 0.505161 0.506791 0.508312 0.509765 0.511214 0.512783 -0.749079 -0.63907 -0.527556 -0.426364 -0.334525 -0.251967
- -0.177634 -0.110376 -0.0496984 0.00509196 0.0545393 0.099066 0.13915 0.175262 0.20783 0.237233 0.263804 0.287837
- 0.309588 0.329287 0.347137 0.363319 0.377992 0.391303 0.40338 0.41434 0.424287 0.433316 0.441513 0.448954
- 0.455709 0.46184 0.467406 0.472457 0.47704 0.481197 0.484968 0.488386 0.491483 0.494288 0.496827 0.499124
- 0.5012 0.503077 0.504773 0.506309 0.507707 0.508996 0.510234 0.511551 -0.749079 -0.638259 -0.52649 -0.425352
- -0.333916 -0.251523 -0.177246 -0.110159 -0.0496042 0.00506032 0.0543826 0.0988362 0.138892 0.175002 0.207581 0.237001
- 0.263592 0.287643 0.309413 0.329128 0.346993 0.363186 0.377871 0.39119 0.403275 0.41424 0.424192 0.433225
- 0.441424 0.448867 0.455622 0.461752 0.467316 0.472363 0.476941 0.481091 0.484851 0.488256 0.491336 0.494119
- 0.49663 0.49889 0.50092 0.502737 0.504355 0.505788 0.50705 0.508157 0.509151 0.510147 -0.749079 -0.634321
- -0.523695 -0.423419 -0.332666 -0.250702 -0.176699 -0.109849 -0.0494743 0.00504208 0.0542463 0.0986279 0.138652 0.174757
- 0.207346 0.236784 0.263394 0.287465 0.309253 0.328985 0.346863 0.363069 0.377763 0.391091 0.403182 0.414152
- 0.424108 0.433143 0.441344 0.448786 0.45554 0.461669 0.467229 0.472271 0.476842 0.480984 0.484733 0.488123
- 0.491184 0.493943 0.496424 0.498645 0.500626 0.502378 0.503915 0.505241 0.506361 0.507278 0.508012 0.508643
- -0.749079 -0.626936 -0.519181 -0.420583 -0.330901 -0.249611 -0.176044 -0.109503 -0.0493504 0.00500392 0.0540939 0.0984077
- 0.138402 0.174504 0.207106 0.236563 0.263196 0.287289 0.309098 0.328848 0.346741 0.36296 0.377664 0.391
- 0.403096 0.414071 0.42403 0.433067 0.441268 0.44871 0.455462 0.461588 0.467144 0.472181 0.476744 0.480876
- 0.484613 0.487987 0.491029 0.493763 0.496211 0.498393 0.500323 0.502011 0.503465 0.504685 0.505667 0.5064
- 0.506881 0.507146 -0.749079 -0.617555 -0.513586 -0.417191 -0.328859 -0.24841 -0.175378 -0.109193 -0.0492804 0.00491157
- 0.0538966 0.0981523 0.138125 0.174229 0.206848 0.236329 0.262988 0.287107 0.308939 0.328709 0.346619 0.362851
- 0.377566 0.39091 0.403013 0.413993 0.423954 0.432993 0.441194 0.448635 0.455386 0.461509 0.46706 0.472091
- 0.476647 0.480769 0.484493 0.487851 0.490873 0.493582 0.495999 0.498142 0.500022 0.501648 0.503023 0.504144
- 0.505 0.50557 0.50583 0.505774 -0.749079 -0.608555 -0.50805 -0.413824 -0.326862 -0.247285 -0.17481 -0.108985
- -0.0493048 0.0047394 0.0536365 0.0978485 0.137809 0.173924 0.206565 0.236075 0.262765 0.286912 0.308769 0.328561
- 0.34649 0.362737 0.377464 0.390817 0.402928 0.413912 0.423877 0.432918 0.44112 0.44856 0.455309 0.461429
- 0.466977 0.472002 0.476551 0.480663 0.484376 0.48772 0.490723 0.493408 0.495796 0.497901 0.499736 0.501305
- 0.502611 0.503645 0.504394 0.504833 0.504924 0.504634 -0.749079 -0.602153 -0.50375 -0.411099 -0.325249 -0.246423
- -0.174442 -0.108935 -0.0494542 0.00447058 0.0533033 0.0974899 0.137452 0.173585 0.206255 0.235798 0.26252 0.286699
- 0.308583 0.328399 0.346348 0.362612 0.377352 0.390716 0.402834 0.413825 0.423794 0.432838 0.441041 0.448483
- 0.455231 0.46135 0.466894 0.471915 0.476458 0.480563 0.484265 0.487596 0.490583 0.493248 0.49561 0.497684
- 0.499479 0.501 0.502247 0.503212 0.503879 0.504224 0.50421 0.503792 -0.749079 -0.599535 -0.501415 -0.409457
- -0.324279 -0.245977 -0.174361 -0.109091 -0.049754 0.00409134 0.052889 0.0970708 0.137048 0.173209 0.205913 0.235492
- 0.26225 0.286461 0.308375 0.328216 0.346186 0.362467 0.377223 0.390599 0.402727 0.413725 0.423701 0.432749
- 0.440957 0.4484 0.45515 0.461269 0.466812 0.471831 0.47637 0.48047 0.484165 0.487487 0.490461 0.49311
- 0.495452 0.497501 0.499266 0.50075 0.501952 0.502865 0.503476 0.503765 0.503703 0.503258 -0.749079 -0.600404
- -0.501052 -0.409009 -0.324074 -0.24604 -0.174629 -0.109492 -0.0502288 0.00358578 0.0523821 0.0965819 0.13659 0.172787
- 0.205531 0.235149 0.261944 0.286189 0.308134 0.328002 0.345995 0.362297 0.377069 0.390459 0.4026 0.413609
- 0.423593 0.432649 0.440862 0.448311 0.455064 0.461186 0.466731 0.47175 0.476289 0.480387 0.484078 0.487395
- 0.490362 0.493001 0.49533 0.497363 0.499107 0.500566 0.50174 0.502621 0.503199 0.50346 0.503391 0.502985
- -0.749079 -0.603022 -0.50201 -0.40958 -0.324624 -0.246647 -0.175285 -0.110169 -0.0509017 0.00293621 0.0517679 0.0960102
- 0.136064 0.172308 0.205097 0.234758 0.261593 0.285874 0.307851 0.327748 0.345767 0.362091 0.376884 0.390292
- 0.402448 0.41347 0.423467 0.432533 0.440755 0.448212 0.454973 0.4611 0.46665 0.471674 0.476216 0.480315
- 0.484008 0.487324 0.490289 0.492926 0.495251 0.497277 0.499012 0.500461 0.501621 0.502488 0.503052 0.503304
- 0.503242 0.502887 -0.749079 -0.603022 -0.50201 -0.40958 -0.324624 -0.246647 -0.175285 -0.110169 -0.0509017 0.00293621
- 0.0517679 0.0960102 0.136064 0.172308 0.205097 0.234758 0.261593 0.285874 0.307851 0.327748 0.345767 0.362091
- 0.376884 0.390292 0.402448 0.41347 0.423467 0.432533 0.440755 0.448212 0.454973 0.4611 0.46665 0.471674
- 0.476216 0.480315 0.484008 0.487324 0.490289 0.492926 0.495251 0.497277 0.499012 0.500461 0.501621 0.502488
- 0.503052 0.503304 0.503242 0.502887 -0.749079 -0.600404 -0.501052 -0.409009 -0.324074 -0.24604 -0.174629 -0.109492
- -0.0502288 0.00358578 0.0523821 0.0965819 0.13659 0.172787 0.205531 0.235149 0.261944 0.286189 0.308134 0.328002
- 0.345995 0.362297 0.377069 0.390459 0.4026 0.413609 0.423593 0.432649 0.440862 0.448311 0.455064 0.461186
- 0.466731 0.47175 0.476289 0.480387 0.484078 0.487395 0.490362 0.493001 0.49533 0.497363 0.499107 0.500566
- 0.50174 0.502621 0.503199 0.50346 0.503391 0.502985 -0.749079 -0.599535 -0.501415 -0.409457 -0.324279 -0.245977
- -0.174361 -0.109091 -0.049754 0.00409134 0.052889 0.0970708 0.137048 0.173209 0.205913 0.235492 0.26225 0.286461
- 0.308375 0.328216 0.346186 0.362467 0.377223 0.390599 0.402727 0.413725 0.423701 0.432749 0.440957 0.4484
- 0.45515 0.461269 0.466812 0.471831 0.47637 0.48047 0.484165 0.487487 0.490461 0.49311 0.495452 0.497501
- 0.499266 0.50075 0.501952 0.502865 0.503476 0.503765 0.503703 0.503258 -0.749079 -0.602153 -0.50375 -0.411099
- -0.325249 -0.246423 -0.174442 -0.108935 -0.0494542 0.00447058 0.0533033 0.0974899 0.137452 0.173585 0.206255 0.235798
- 0.26252 0.286699 0.308583 0.328399 0.346348 0.362612 0.377352 0.390716 0.402834 0.413825 0.423794 0.432838
- 0.441041 0.448483 0.455231 0.46135 0.466894 0.471915 0.476458 0.480563 0.484265 0.487596 0.490583 0.493248
- 0.49561 0.497684 0.499479 0.501 0.502247 0.503212 0.503879 0.504224 0.50421 0.503792 -0.749079 -0.608555
- -0.50805 -0.413824 -0.326862 -0.247285 -0.17481 -0.108985 -0.0493048 0.0047394 0.0536365 0.0978485 0.137809 0.173924
- 0.206565 0.236075 0.262765 0.286912 0.308769 0.328561 0.34649 0.362737 0.377464 0.390817 0.402928 0.413912
- 0.423877 0.432918 0.44112 0.44856 0.455309 0.461429 0.466977 0.472002 0.476551 0.480663 0.484376 0.48772
- 0.490723 0.493408 0.495796 0.497901 0.499736 0.501305 0.502611 0.503645 0.504394 0.504833 0.504924 0.504634
- -0.749079 -0.617555 -0.513586 -0.417191 -0.328859 -0.24841 -0.175378 -0.109193 -0.0492804 0.00491157 0.0538966 0.0981523
- 0.138125 0.174229 0.206848 0.236329 0.262988 0.287107 0.308939 0.328709 0.346619 0.362851 0.377566 0.39091
- 0.403013 0.413993 0.423954 0.432993 0.441194 0.448635 0.455386 0.461509 0.46706 0.472091 0.476647 0.480769
- 0.484493 0.487851 0.490873 0.493582 0.495999 0.498142 0.500022 0.501648 0.503023 0.504144 0.505 0.50557
- 0.50583 0.505774 -0.749079 -0.626936 -0.519181 -0.420583 -0.330901 -0.249611 -0.176044 -0.109503 -0.0493504 0.00500392
- 0.0540939 0.0984077 0.138402 0.174504 0.207106 0.236563 0.263196 0.287289 0.309098 0.328848 0.346741 0.36296
- 0.377664 0.391 0.403096 0.414071 0.42403 0.433067 0.441268 0.44871 0.455462 0.461588 0.467144 0.472181
- 0.476744 0.480876 0.484613 0.487987 0.491029 0.493763 0.496211 0.498393 0.500323 0.502011 0.503465 0.504685
- 0.505667 0.5064 0.506881 0.507146 -0.749079 -0.634321 -0.523695 -0.423419 -0.332666 -0.250702 -0.176699 -0.109849
- -0.0494743 0.00504208 0.0542463 0.0986279 0.138652 0.174757 0.207346 0.236784 0.263394 0.287465 0.309253 0.328985
- 0.346863 0.363069 0.377763 0.391091 0.403182 0.414152 0.424108 0.433143 0.441344 0.448786 0.45554 0.461669
- 0.467229 0.472271 0.476842 0.480984 0.484733 0.488123 0.491184 0.493943 0.496424 0.498645 0.500626 0.502378
- 0.503915 0.505241 0.506361 0.507278 0.508012 0.508643 -0.749079 -0.638259 -0.52649 -0.425352 -0.333916 -0.251523
- -0.177246 -0.110159 -0.0496042 0.00506032 0.0543826 0.0988362 0.138892 0.175002 0.207581 0.237001 0.263592 0.287643
- 0.309413 0.329128 0.346993 0.363186 0.377871 0.39119 0.403275 0.41424 0.424192 0.433225 0.441424 0.448867
- 0.455622 0.461752 0.467316 0.472363 0.476941 0.481091 0.484851 0.488256 0.491336 0.494119 0.49663 0.49889
- 0.50092 0.502737 0.504355 0.505788 0.50705 0.508157 0.509151 0.510147 -0.749079 -0.63907 -0.527556 -0.426364
- -0.334525 -0.251967 -0.177634 -0.110376 -0.0496984 0.00509196 0.0545393 0.099066 0.13915 0.175262 0.20783 0.237233
- 0.263804 0.287837 0.309588 0.329287 0.347137 0.363319 0.377992 0.391303 0.40338 0.41434 0.424287 0.433316
- 0.441513 0.448954 0.455709 0.46184 0.467406 0.472457 0.47704 0.481197 0.484968 0.488386 0.491483 0.494288
- 0.496827 0.499124 0.5012 0.503077 0.504773 0.506309 0.507707 0.508996 0.510234 0.511551 -0.749079 -0.637891
- -0.526731 -0.425794 -0.334323 -0.251881 -0.177859 -0.110473 -0.0497438 0.00515065 0.0547579 0.0993593 0.139463 0.175568
- 0.208119 0.2375 0.264049 0.28806 0.309791 0.329473 0.347306 0.363473 0.378135 0.391435 0.403503 0.414455
- 0.424396 0.43342 0.441612 0.44905 0.455803 0.461934 0.467501 0.472554 0.477141 0.481304 0.485083 0.488512
- 0.491625 0.49445 0.497014 0.499344 0.501462 0.503394 0.505161 0.506791 0.508312 0.509765 0.511214 0.512783
- -0.749079 -0.635797 -0.525251 -0.424615 -0.3334 -0.251071 -0.176924 -0.109932 -0.0497399 0.00519619 0.0550947 0.0997669
- 0.13987 0.175952 0.208472 0.237823 0.264343 0.288327 0.310034 0.329693 0.347507 0.363657 0.378303 0.39159
- 0.403646 0.414588 0.424521 0.433538 0.441725 0.449158 0.455908 0.462037 0.467602 0.472656 0.477245 0.481413
- 0.485198 0.488637 0.491763 0.494604 0.497191 0.49955 0.501706 0.503686 0.505516 0.507227 0.508855 0.510446
- 0.512066 0.513816 -0.749079 -0.633803 -0.523595 -0.423156 -0.332107 -0.249903 -0.175822 -0.108975 -0.04881 0.00555934
- 0.055678 0.100347 0.140404 0.176436 0.208908 0.238216 0.264696 0.288645 0.310321 0.329953 0.347743 0.363872
- 0.3785 0.39177 0.403813 0.414743 0.424665 0.433673 0.441852 0.449279 0.456023 0.462148 0.467711 0.472764
- 0.477354 0.481525 0.485315 0.48876 0.491894 0.494749 0.497353 0.499735 0.501921 0.503939 0.505819 0.507595
- 0.509306 0.511006 0.512762 0.514653 -0.749079 -0.635709 -0.525144 -0.424495 -0.333273 -0.250941 -0.176793 -0.109813
- -0.0496187 0.00529352 0.0551916 0.0998568 0.139951 0.176026 0.208539 0.237884 0.264398 0.288378 0.310082 0.329739
- 0.347552 0.363701 0.378348 0.391635 0.403693 0.414638 0.424573 0.433594 0.441784 0.449222 0.455977 0.462112
- 0.467685 0.472748 0.477349 0.481531 0.485334 0.488794 0.491946 0.494822 0.49745 0.499859 0.502079 0.504137
- 0.506065 0.507898 0.509678 0.511458 0.513305 0.515297 -0.749079 -0.637694 -0.526504 -0.425554 -0.334078 -0.251638
- -0.177615 -0.110275 -0.0495533 0.00532131 0.0549123 0.0994964 0.139583 0.175673 0.20821 0.237581 0.264121 0.288125
- 0.309852 0.329532 0.347366 0.363534 0.378199 0.391504 0.403577 0.414536 0.424485 0.433518 0.44172 0.44917
- 0.455935 0.462081 0.467665 0.472738 0.47735 0.481544 0.48536 0.488835 0.492003 0.494897 0.497546 0.499981
- 0.502229 0.50432 0.506285 0.50816 0.509983 0.511806 0.51369 0.515711 -0.749079 -0.638762 -0.527211 -0.426022
- -0.334184 -0.25164 -0.177329 -0.110106 -0.0494547 0.00530712 0.0547276 0.0992288 0.139289 0.175381 0.207931 0.237321
- 0.263882 0.287907 0.309656 0.329355 0.347208 0.363395 0.378076 0.391396 0.403484 0.414456 0.424417 0.433462
- 0.441675 0.449134 0.455909 0.462064 0.467657 0.472741 0.477363 0.481567 0.485395 0.488883 0.492066 0.494976
- 0.497644 0.5001 0.502372 0.504489 0.506481 0.508381 0.510225 0.512054 0.513918 0.51588 -0.749079 -0.637845
- -0.526064 -0.424934 -0.333515 -0.251151 -0.17691 -0.109864 -0.0493463 0.00528243 0.0545715 0.0989948 0.139024 0.175111
- 0.207672 0.23708 0.263662 0.28771 0.30948 0.329201 0.347073 0.363278 0.377976 0.391311 0.403412 0.414397
- 0.424369 0.433424 0.441647 0.449115 0.455899 0.462062 0.467664 0.472755 0.477386 0.4816 0.485438 0.488938
- 0.492134 0.495058 0.497743 0.500216 0.502507 0.504644 0.506653 0.508565 0.510408 0.512212 0.514009 0.515831
- -0.749079 -0.633847 -0.523242 -0.422993 -0.332274 -0.25035 -0.17639 -0.109585 -0.049252 0.00522587 0.0543956 0.0987471
- 0.138746 0.174831 0.207407 0.236837 0.263445 0.287519 0.309316 0.32906 0.346954 0.363179 0.377894 0.391245
- 0.403361 0.414358 0.424341 0.433405 0.441637 0.449113 0.455904 0.462075 0.467683 0.472783 0.477421 0.481643
- 0.48549 0.489 0.492207 0.495144 0.497842 0.500329 0.502635 0.504784 0.506804 0.508717 0.510545 0.512305
- 0.514003 0.515635 -0.749079 -0.626527 -0.51882 -0.420256 -0.330608 -0.249357 -0.175831 -0.109332 -0.0492187 0.00510048
- 0.0541606 0.0984506 0.138428 0.174519 0.207117 0.236577 0.263219 0.287327 0.309154 0.328928 0.346848 0.363095
- 0.37783 0.391197 0.403327 0.414336 0.42433 0.433404 0.441643 0.449126 0.455924 0.462101 0.467716 0.472821
- 0.477466 0.481695 0.485549 0.489067 0.492283 0.495229 0.497938 0.500436 0.502752 0.50491 0.506934 0.508843
- 0.51065 0.51236 0.513957 0.515396 -0.749079 -0.617432 -0.513493 -0.417098 -0.328768 -0.248335 -0.175329 -0.109175
- -0.0492919 0.00487448 0.0538406 0.0980851 0.138054 0.174164 0.206795 0.236296 0.26298 0.287129 0.308995 0.328802
- 0.346752 0.363024 0.377781 0.391166 0.403311 0.414333 0.424336 0.433418 0.441665 0.449154 0.455958 0.462139
- 0.467758 0.472868 0.477518 0.481752 0.485612 0.489135 0.492358 0.495312 0.498028 0.500535 0.502857 0.50502
- 0.507045 0.508948 0.510738 0.512409 0.51393 0.515222 -0.749079 -0.609032 -0.508444 -0.414101 -0.32706 -0.247449
- -0.174973 -0.109163 -0.0495004 0.0045316 0.0534258 0.0976455 0.137625 0.173766 0.206443 0.235995 0.262731 0.286929
- 0.308838 0.328684 0.346666 0.362966 0.377746 0.39115 0.40331 0.414343 0.424357 0.433446 0.441699 0.449193
- 0.456001 0.462186 0.467808 0.472921 0.477574 0.481811 0.485675 0.489202 0.492429 0.495388 0.498109 0.50062
- 0.502946 0.505112 0.507137 0.509037 0.51082 0.512477 0.513971 0.515205 -0.749079 -0.603652 -0.504846 -0.411828
- -0.325756 -0.246834 -0.174829 -0.109328 -0.0498557 0.00407008 0.0529193 0.097138 0.137146 0.173336 0.206071 0.235683
- 0.262478 0.286729 0.308687 0.328573 0.346591 0.362919 0.377722 0.391145 0.403319 0.414364 0.424387 0.433483
- 0.441741 0.449239 0.456049 0.462237 0.467861 0.472975 0.477629 0.481868 0.485733 0.489262 0.492491 0.495452
- 0.498175 0.500688 0.503016 0.505182 0.507208 0.509109 0.510898 0.512572 0.514103 0.515398 -0.749079 -0.602602
- -0.503329 -0.410571 -0.325002 -0.246565 -0.174934 -0.109685 -0.050362 0.00349368 0.0523292 0.0965728 0.136631 0.172884
- 0.205687 0.235367 0.262225 0.286534 0.30854 0.328469 0.346521 0.362878 0.377703 0.391144 0.403333 0.414389
- 0.424419 0.433521 0.441783 0.449284 0.456096 0.462285 0.467909 0.473024 0.477678 0.481917 0.485781 0.489311
- 0.492539 0.4955 0.498222 0.500734 0.503061 0.505226 0.507252 0.509157 0.510961 0.512679 0.514313 0.515803
- -0.749079 -0.605647 -0.50357 -0.410174 -0.324761 -0.246656 -0.175313 -0.110254 -0.0510274 0.00280281 0.0516615 0.0959588
- 0.136087 0.172417 0.205297 0.23505 0.261974 0.286339 0.308395 0.328364 0.34645 0.362834 0.377681 0.391138
- 0.40334 0.414406 0.424444 0.433551 0.441817 0.44932 0.456134 0.462323 0.467947 0.473061 0.477714 0.481951
- 0.485815 0.489342 0.492568 0.495526 0.498246 0.500755 0.503078 0.50524 0.507263 0.509171 0.51099 0.51276
- 0.514543 0.51639 -0.749079 -0.610346 -0.504136 -0.410101 -0.324902 -0.247117 -0.176005 -0.111065 -0.0518674 0.00199463
- 0.0509208 0.0953034 0.135523 0.171942 0.204904 0.234731 0.261719 0.286139 0.30824 0.328247 0.346364 0.362773
- 0.37764 0.391113 0.403328 0.414403 0.424448 0.433562 0.441831 0.449337 0.456152 0.462342 0.467967 0.47308
- 0.477731 0.481967 0.485827 0.489351 0.492574 0.495528 0.498243 0.500747 0.503065 0.505221 0.507238 0.509139
- 0.510957 0.512746 0.514654 0.517106
+ <CellData Scalars="p" Vectors="velocity_c (m/s)">
+ <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
+ -0.749079 -0.615405 -0.507054 -0.411442 -0.325135 -0.246597 -0.174991 -0.10974 -0.0503596 0.00359659 0.0525568 0.0969336
+ 0.137121 0.173494 0.206401 0.236168 0.263096 0.287458 0.309503 0.329458 0.347525 0.363889 0.378715 0.392151
+ 0.404332 0.415376 0.425394 0.434482 0.442728 0.450214 0.457011 0.463184 0.468794 0.473895 0.478536 0.482762
+ 0.486616 0.490135 0.493355 0.496308 0.499024 0.501531 0.503855 0.50602 0.508048 0.509963 0.511795 0.5136
+ 0.51552 0.517978 -0.749079 -0.609871 -0.505876 -0.411125 -0.324765 -0.246013 -0.174243 -0.108913 -0.049528 0.00438326
+ 0.0532695 0.0975586 0.137655 0.17394 0.206767 0.236463 0.263329 0.287639 0.309641 0.32956 0.347599 0.363939
+ 0.378747 0.392168 0.404337 0.415373 0.425384 0.434467 0.44271 0.450194 0.456989 0.463162 0.468773 0.473875
+ 0.478517 0.482746 0.486603 0.490125 0.493349 0.496306 0.499027 0.50154 0.50387 0.506041 0.508076 0.509997
+ 0.511831 0.513616 0.515413 0.517268 -0.749079 -0.605669 -0.504804 -0.41095 -0.324625 -0.245676 -0.17371 -0.108253
+ -0.0488129 0.00509654 0.053942 0.0981664 0.138186 0.17439 0.207138 0.236762 0.263563 0.287816 0.309771 0.32965
+ 0.347657 0.363972 0.378759 0.392165 0.404322 0.415349 0.425353 0.434431 0.442672 0.450153 0.456948 0.463121
+ 0.468732 0.473835 0.478479 0.482709 0.486568 0.490092 0.493319 0.496279 0.499003 0.501519 0.503853 0.506028
+ 0.508065 0.509985 0.511805 0.51354 0.51519 0.516693 -0.749079 -0.605399 -0.505395 -0.411557 -0.324928 -0.245635
+ -0.173393 -0.107754 -0.0482147 0.00573001 0.0545647 0.0987472 0.138706 0.174839 0.207514 0.237067 0.263803 0.287999
+ 0.309904 0.329742 0.347715 0.364002 0.378768 0.392157 0.4043 0.415317 0.425314 0.434387 0.442624 0.450103
+ 0.456897 0.463069 0.46868 0.473783 0.478427 0.482658 0.486517 0.490042 0.493268 0.496229 0.498953 0.50147
+ 0.503805 0.505982 0.50802 0.509937 0.511743 0.513437 0.514989 0.516304 -0.749079 -0.60951 -0.50811 -0.413207
+ -0.325786 -0.24593 -0.173309 -0.107428 -0.0477461 0.00626875 0.055122 0.0992861 0.139202 0.175277 0.207887 0.237374
+ 0.264049 0.288189 0.310046 0.329843 0.347781 0.36404 0.378783 0.392153 0.404283 0.415289 0.425278 0.434345
+ 0.442577 0.450053 0.456844 0.463014 0.468624 0.473725 0.478368 0.482597 0.486455 0.489978 0.493202 0.496161
+ 0.498883 0.501399 0.503732 0.505908 0.507947 0.509863 0.511665 0.513346 0.514865 0.516127 -0.749079 -0.616886
+ -0.512447 -0.41569 -0.327116 -0.246534 -0.173455 -0.107284 -0.0474236 0.00669385 0.0555946 0.0997649 0.139656 0.175689
+ 0.208245 0.237676 0.264296 0.288385 0.310196 0.329954 0.347859 0.36409 0.37881 0.392163 0.404277 0.415272
+ 0.425251 0.434311 0.442538 0.450009 0.456796 0.462963 0.468569 0.473668 0.478308 0.482534 0.486388 0.489907
+ 0.493127 0.49608 0.498798 0.501308 0.503638 0.505811 0.50785 0.50977 0.511582 0.513279 0.514831 0.516158
+ -0.749079 -0.625326 -0.517304 -0.41849 -0.328678 -0.247339 -0.173789 -0.107312 -0.0472511 0.00699459 0.0559696 0.10017
+ 0.140057 0.176061 0.208578 0.237963 0.264536 0.288581 0.310352 0.330075 0.347949 0.364155 0.378853 0.392188
+ 0.404288 0.41527 0.42524 0.434291 0.442511 0.449976 0.456758 0.462921 0.468522 0.473616 0.478252 0.482472
+ 0.48632 0.489833 0.493046 0.495992 0.498702 0.501204 0.503526 0.505694 0.507732 0.509658 0.511489 0.513228
+ 0.51486 0.516341 -0.749079 -0.632376 -0.521497 -0.421026 -0.330171 -0.248189 -0.174231 -0.107469 -0.047209 0.00717915
+ 0.0562499 0.1005 0.140399 0.176391 0.208879 0.238229 0.264765 0.288774 0.310512 0.330204 0.348052 0.364235
+ 0.378913 0.392231 0.404317 0.415287 0.425245 0.434288 0.4425 0.449958 0.456734 0.46289 0.468486 0.473574
+ 0.478203 0.482417 0.486257 0.489761 0.492965 0.4959 0.498599 0.501089 0.503401 0.50556 0.507592 0.509524
+ 0.511376 0.513166 0.514904 0.516584 -0.749079 -0.636386 -0.524263 -0.422886 -0.331329 -0.248914 -0.174684 -0.10769
+ -0.0472548 0.0072761 0.056458 0.100772 0.140695 0.176683 0.209154 0.238478 0.264985 0.288966 0.310677 0.330344
+ 0.348169 0.364331 0.378992 0.392293 0.404365 0.415322 0.42527 0.434303 0.442506 0.449957 0.456725 0.462874
+ 0.468462 0.473543 0.478164 0.482369 0.4862 0.489694 0.492886 0.495808 0.498493 0.500968 0.503264 0.505409
+ 0.507431 0.50936 0.511227 0.513063 0.514901 0.516774 -0.749079 -0.637378 -0.525427 -0.423962 -0.331974 -0.249377
+ -0.175077 -0.107905 -0.0473391 0.00732379 0.0566334 0.101021 0.140973 0.176962 0.209419 0.238723 0.265207 0.289164
+ 0.310852 0.330497 0.348302 0.364446 0.379089 0.392376 0.404433 0.415378 0.425315 0.434338 0.442531 0.449972
+ 0.456732 0.462873 0.468453 0.473524 0.478136 0.482332 0.486152 0.489634 0.492812 0.495719 0.498386 0.500843
+ 0.503119 0.505243 0.507246 0.509162 0.511028 0.512888 0.514794 0.516808 -0.749079 -0.636331 -0.524729 -0.423502
+ -0.331873 -0.249376 -0.175369 -0.108066 -0.0474336 0.00734896 0.0568271 0.101296 0.141272 0.177259 0.209701 0.238985
+ 0.265447 0.289382 0.311048 0.330673 0.348458 0.364584 0.37921 0.392481 0.404524 0.415456 0.42538 0.434391
+ 0.442574 0.450005 0.456755 0.462886 0.468457 0.473519 0.47812 0.482305 0.486112 0.489581 0.492744 0.495633
+ 0.498281 0.500715 0.502965 0.505061 0.507036 0.508924 0.510767 0.512619 0.514542 0.516614 -0.749079 -0.634336
+ -0.52337 -0.422448 -0.331073 -0.248683 -0.174547 -0.107618 -0.0475145 0.00733047 0.0571094 0.101658 0.141641 0.177611
+ 0.21003 0.239288 0.265724 0.289634 0.311276 0.330879 0.348643 0.364749 0.379357 0.39261 0.404638 0.415555
+ 0.425466 0.434464 0.442635 0.450055 0.456794 0.462914 0.468474 0.473525 0.478115 0.482287 0.486082 0.489535
+ 0.492681 0.495551 0.498176 0.500584 0.502804 0.504865 0.506799 0.508642 0.510439 0.512243 0.514124 0.516164
+ -0.749079 -0.632414 -0.521811 -0.421106 -0.329907 -0.247648 -0.17358 -0.106788 -0.0467161 0.0075919 0.0575905 0.102142
+ 0.142088 0.178016 0.210394 0.239615 0.266018 0.289897 0.311512 0.331089 0.34883 0.364916 0.379505 0.392742
+ 0.404754 0.415657 0.425554 0.43454 0.4427 0.450109 0.456837 0.462948 0.468497 0.473538 0.478117 0.482278
+ 0.486058 0.489495 0.492623 0.495472 0.498071 0.500449 0.502633 0.504652 0.506535 0.508317 0.51004 0.511758
+ 0.51354 0.515472 -0.749079 -0.634433 -0.523489 -0.422582 -0.331216 -0.248831 -0.174695 -0.107751 -0.0476501 0.00722244
+ 0.0570025 0.101559 0.141552 0.177531 0.209957 0.239222 0.265664 0.289579 0.311224 0.330828 0.348594 0.3647
+ 0.379308 0.39256 0.404586 0.415501 0.425409 0.434404 0.442571 0.449986 0.456719 0.462833 0.468385 0.473426
+ 0.478004 0.482162 0.485938 0.489368 0.492486 0.49532 0.497901 0.500255 0.502407 0.504384 0.506214 0.507927
+ 0.50956 0.511161 0.512798 0.514576 -0.749079 -0.636549 -0.524982 -0.423772 -0.332149 -0.24965 -0.175645 -0.108288
+ -0.0476465 0.00715959 0.0566571 0.101146 0.141142 0.177145 0.209602 0.238898 0.26537 0.289312 0.310981 0.330608
+ 0.348393 0.364516 0.379139 0.392404 0.404441 0.415366 0.425282 0.434284 0.442457 0.449877 0.456613 0.462729
+ 0.468281 0.473321 0.477897 0.482049 0.485818 0.489238 0.492341 0.495158 0.497715 0.500037 0.502149 0.504075
+ 0.505838 0.507464 0.508984 0.510438 0.511892 0.513476 -0.749079 -0.637722 -0.525814 -0.424348 -0.33236 -0.249747
+ -0.175423 -0.108209 -0.0476118 0.00708507 0.0564262 0.100844 0.140822 0.176834 0.20931 0.238628 0.265123 0.289087
+ 0.310777 0.330421 0.348222 0.36436 0.378995 0.392271 0.404318 0.41525 0.425172 0.434179 0.442356 0.449778
+ 0.456516 0.462632 0.468184 0.473221 0.477792 0.481938 0.485698 0.489105 0.492193 0.494988 0.497518 0.499805
+ 0.501872 0.50374 0.505427 0.506953 0.508341 0.509622 0.510854 0.512171 -0.749079 -0.636849 -0.524743 -0.423359
+ -0.331784 -0.249336 -0.175065 -0.108023 -0.0475439 0.00702926 0.0562499 0.100599 0.140552 0.176565 0.209054 0.238392
+ 0.264907 0.288891 0.310599 0.33026 0.348076 0.364227 0.378872 0.392157 0.404211 0.415149 0.425076 0.434086
+ 0.442265 0.449689 0.456427 0.462542 0.468091 0.473124 0.477689 0.481827 0.485576 0.488969 0.492038 0.49481
+ 0.49731 0.499558 0.501576 0.503379 0.504983 0.506401 0.507645 0.508734 0.509709 0.51069 -0.749079 -0.632909
+ -0.522009 -0.42151 -0.330619 -0.248592 -0.174583 -0.107769 -0.0474599 0.00697322 0.0560837 0.100368 0.140295 0.176307
+ 0.208809 0.238167 0.264704 0.288708 0.310436 0.330115 0.347945 0.364108 0.378763 0.392056 0.404116 0.415059
+ 0.42499 0.434002 0.442182 0.449606 0.456343 0.462455 0.468001 0.473029 0.477587 0.481715 0.485452 0.48883
+ 0.491879 0.494625 0.497092 0.499299 0.501264 0.503 0.504517 0.505821 0.506916 0.507805 0.508506 0.509107
+ -0.749079 -0.625788 -0.517716 -0.418865 -0.329014 -0.247633 -0.174035 -0.107509 -0.047404 0.00688139 0.0558896 0.100116
+ 0.140021 0.176036 0.208556 0.237936 0.264498 0.288527 0.310277 0.329974 0.34782 0.363996 0.378662 0.391963
+ 0.404029 0.414976 0.42491 0.433924 0.442104 0.449527 0.456262 0.462372 0.467912 0.472935 0.477484 0.481603
+ 0.485326 0.488687 0.491715 0.494434 0.496868 0.499032 0.500943 0.502611 0.50404 0.505232 0.506181 0.506876
+ 0.507312 0.50753 -0.749079 -0.617035 -0.51256 -0.415801 -0.327221 -0.246623 -0.173517 -0.107314 -0.0474229 0.00672068
+ 0.0556402 0.0998208 0.139714 0.175739 0.208281 0.23769 0.264282 0.288338 0.310113 0.329831 0.347695 0.363885
+ 0.378562 0.391872 0.403944 0.414896 0.424832 0.433848 0.442028 0.44945 0.456183 0.462289 0.467825 0.472841
+ 0.477383 0.48149 0.4852 0.488544 0.491551 0.494244 0.496644 0.498767 0.500625 0.502226 0.503572 0.504659
+ 0.505474 0.505996 0.5062 0.506082 -0.749079 -0.608996 -0.507675 -0.41289 -0.325557 -0.245743 -0.173132 -0.107244
+ -0.0475511 0.00647009 0.0553209 0.0994727 0.139366 0.175409 0.207981 0.237423 0.264048 0.288136 0.309938 0.32968
+ 0.347563 0.363768 0.378458 0.391777 0.403857 0.414813 0.424753 0.433771 0.441952 0.449373 0.456104 0.462207
+ 0.467739 0.472749 0.477283 0.48138 0.485078 0.488406 0.491393 0.49406 0.496429 0.498513 0.500322 0.501863
+ 0.503135 0.50413 0.504831 0.505213 0.505238 0.504871 -0.749079 -0.603761 -0.504158 -0.410705 -0.324322 -0.245153
+ -0.172962 -0.107339 -0.0478087 0.00612055 0.0549276 0.0990692 0.138975 0.175047 0.207653 0.237133 0.263794 0.287915
+ 0.309747 0.329514 0.347418 0.36364 0.378344 0.391674 0.403761 0.414724 0.424669 0.433689 0.441872 0.449294
+ 0.456024 0.462125 0.467653 0.472659 0.477186 0.481276 0.484962 0.488277 0.491246 0.493892 0.496233 0.498283
+ 0.500051 0.50154 0.502749 0.50367 0.504284 0.504565 0.504475 0.503967 -0.749079 -0.602319 -0.502612 -0.409597
+ -0.323722 -0.244967 -0.173067 -0.107631 -0.0482078 0.00566812 0.0544592 0.0986102 0.138542 0.174649 0.207295 0.236815
+ 0.263515 0.287671 0.309534 0.329327 0.347253 0.363494 0.378213 0.391555 0.403653 0.414624 0.424574 0.4336
+ 0.441786 0.44921 0.455941 0.462042 0.467569 0.472572 0.477096 0.481179 0.484858 0.488162 0.491118 0.493747
+ 0.496067 0.49809 0.499825 0.501275 0.502436 0.503301 0.503854 0.504073 0.503928 0.503382 -0.749079 -0.604156
+ -0.502893 -0.409583 -0.323814 -0.245237 -0.173482 -0.108137 -0.0487587 0.00510699 0.0539116 0.0980915 0.138061 0.174211
+ 0.206901 0.236464 0.263203 0.287395 0.309289 0.32911 0.347061 0.363322 0.378058 0.391415 0.403525 0.414506
+ 0.424466 0.433498 0.44169 0.449119 0.455854 0.461958 0.467487 0.47249 0.477012 0.481094 0.484769 0.488067
+ 0.491015 0.493633 0.495939 0.497945 0.499658 0.501081 0.502212 0.503042 0.503558 0.503746 0.503587 0.503073
+ -0.749079 -0.607343 -0.504223 -0.410402 -0.324532 -0.24596 -0.174219 -0.108872 -0.0494729 0.00442767 0.0532759 0.0975042
+ 0.137524 0.173724 0.206461 0.236069 0.262849 0.287079 0.309006 0.328856 0.346832 0.363117 0.377873 0.391247
+ 0.403373 0.414368 0.424339 0.433382 0.441583 0.44902 0.455762 0.461872 0.467405 0.472412 0.476938 0.481021
+ 0.484697 0.487995 0.490941 0.493556 0.495857 0.497855 0.499559 0.50097 0.502087 0.502901 0.503402 0.503578
+ 0.503424 0.502955 -0.749079 -0.607343 -0.504223 -0.410402 -0.324532 -0.24596 -0.174219 -0.108872 -0.0494729 0.00442767
+ 0.0532759 0.0975042 0.137524 0.173724 0.206461 0.236069 0.262849 0.287079 0.309006 0.328856 0.346832 0.363117
+ 0.377873 0.391247 0.403373 0.414368 0.424339 0.433382 0.441583 0.44902 0.455762 0.461872 0.467405 0.472412
+ 0.476938 0.481021 0.484697 0.487995 0.490941 0.493556 0.495857 0.497855 0.499559 0.50097 0.502087 0.502901
+ 0.503402 0.503578 0.503424 0.502955 -0.749079 -0.604156 -0.502893 -0.409583 -0.323814 -0.245237 -0.173482 -0.108137
+ -0.0487587 0.00510699 0.0539116 0.0980915 0.138061 0.174211 0.206901 0.236464 0.263203 0.287395 0.309289 0.32911
+ 0.347061 0.363322 0.378058 0.391415 0.403525 0.414506 0.424466 0.433498 0.44169 0.449119 0.455854 0.461958
+ 0.467487 0.47249 0.477012 0.481094 0.484769 0.488067 0.491015 0.493633 0.495939 0.497945 0.499658 0.501081
+ 0.502212 0.503042 0.503558 0.503746 0.503587 0.503073 -0.749079 -0.602319 -0.502612 -0.409597 -0.323722 -0.244967
+ -0.173067 -0.107631 -0.0482078 0.00566812 0.0544592 0.0986102 0.138542 0.174649 0.207295 0.236815 0.263515 0.287671
+ 0.309534 0.329327 0.347253 0.363494 0.378213 0.391555 0.403653 0.414624 0.424574 0.4336 0.441786 0.44921
+ 0.455941 0.462042 0.467569 0.472572 0.477096 0.481179 0.484858 0.488162 0.491118 0.493747 0.496067 0.49809
+ 0.499825 0.501275 0.502436 0.503301 0.503854 0.504073 0.503928 0.503382 -0.749079 -0.603761 -0.504158 -0.410705
+ -0.324322 -0.245153 -0.172962 -0.107339 -0.0478087 0.00612055 0.0549276 0.0990692 0.138975 0.175047 0.207653 0.237133
+ 0.263794 0.287915 0.309747 0.329514 0.347418 0.36364 0.378344 0.391674 0.403761 0.414724 0.424669 0.433689
+ 0.441872 0.449294 0.456024 0.462125 0.467653 0.472659 0.477186 0.481276 0.484962 0.488277 0.491246 0.493892
+ 0.496233 0.498283 0.500051 0.50154 0.502749 0.50367 0.504284 0.504565 0.504475 0.503967 -0.749079 -0.608996
+ -0.507675 -0.41289 -0.325557 -0.245743 -0.173132 -0.107244 -0.0475511 0.00647009 0.0553209 0.0994727 0.139366 0.175409
+ 0.207981 0.237423 0.264048 0.288136 0.309938 0.32968 0.347563 0.363768 0.378458 0.391777 0.403857 0.414813
+ 0.424753 0.433771 0.441952 0.449373 0.456104 0.462207 0.467739 0.472749 0.477283 0.48138 0.485078 0.488406
+ 0.491393 0.49406 0.496429 0.498513 0.500322 0.501863 0.503135 0.50413 0.504831 0.505213 0.505238 0.504871
+ -0.749079 -0.617035 -0.51256 -0.415801 -0.327221 -0.246623 -0.173517 -0.107314 -0.0474229 0.00672068 0.0556402 0.0998208
+ 0.139714 0.175739 0.208281 0.23769 0.264282 0.288338 0.310113 0.329831 0.347695 0.363885 0.378562 0.391872
+ 0.403944 0.414896 0.424832 0.433848 0.442028 0.44945 0.456183 0.462289 0.467825 0.472841 0.477383 0.48149
+ 0.4852 0.488544 0.491551 0.494244 0.496644 0.498767 0.500625 0.502226 0.503572 0.504659 0.505474 0.505996
+ 0.5062 0.506082 -0.749079 -0.625788 -0.517716 -0.418865 -0.329014 -0.247633 -0.174035 -0.107509 -0.047404 0.00688139
+ 0.0558896 0.100116 0.140021 0.176036 0.208556 0.237936 0.264498 0.288527 0.310277 0.329974 0.34782 0.363996
+ 0.378662 0.391963 0.404029 0.414976 0.42491 0.433924 0.442104 0.449527 0.456262 0.462372 0.467912 0.472935
+ 0.477484 0.481603 0.485326 0.488687 0.491715 0.494434 0.496868 0.499032 0.500943 0.502611 0.50404 0.505232
+ 0.506181 0.506876 0.507312 0.50753 -0.749079 -0.632909 -0.522009 -0.42151 -0.330619 -0.248592 -0.174583 -0.107769
+ -0.0474599 0.00697322 0.0560837 0.100368 0.140295 0.176307 0.208809 0.238167 0.264704 0.288708 0.310436 0.330115
+ 0.347945 0.364108 0.378763 0.392056 0.404116 0.415059 0.42499 0.434002 0.442182 0.449606 0.456343 0.462455
+ 0.468001 0.473029 0.477587 0.481715 0.485452 0.48883 0.491879 0.494625 0.497092 0.499299 0.501264 0.503
+ 0.504517 0.505821 0.506916 0.507805 0.508506 0.509107 -0.749079 -0.636849 -0.524743 -0.423359 -0.331784 -0.249336
+ -0.175065 -0.108023 -0.0475439 0.00702926 0.0562499 0.100599 0.140552 0.176565 0.209054 0.238392 0.264907 0.288891
+ 0.310599 0.33026 0.348076 0.364227 0.378872 0.392157 0.404211 0.415149 0.425076 0.434086 0.442265 0.449689
+ 0.456427 0.462542 0.468091 0.473124 0.477689 0.481827 0.485576 0.488969 0.492038 0.49481 0.49731 0.499558
+ 0.501576 0.503379 0.504983 0.506401 0.507645 0.508734 0.509709 0.51069 -0.749079 -0.637722 -0.525814 -0.424348
+ -0.33236 -0.249747 -0.175423 -0.108209 -0.0476118 0.00708507 0.0564262 0.100844 0.140822 0.176834 0.20931 0.238628
+ 0.265123 0.289087 0.310777 0.330421 0.348222 0.36436 0.378995 0.392271 0.404318 0.41525 0.425172 0.434179
+ 0.442356 0.449778 0.456516 0.462632 0.468184 0.473221 0.477792 0.481938 0.485698 0.489105 0.492193 0.494988
+ 0.497518 0.499805 0.501872 0.50374 0.505427 0.506953 0.508341 0.509622 0.510854 0.512171 -0.749079 -0.636549
+ -0.524982 -0.423772 -0.332149 -0.24965 -0.175645 -0.108288 -0.0476465 0.00715959 0.0566571 0.101146 0.141142 0.177145
+ 0.209602 0.238898 0.26537 0.289312 0.310981 0.330608 0.348393 0.364516 0.379139 0.392404 0.404441 0.415366
+ 0.425282 0.434284 0.442457 0.449877 0.456613 0.462729 0.468281 0.473321 0.477897 0.482049 0.485818 0.489238
+ 0.492341 0.495158 0.497715 0.500037 0.502149 0.504075 0.505838 0.507464 0.508984 0.510438 0.511892 0.513476
+ -0.749079 -0.634433 -0.523489 -0.422582 -0.331216 -0.248831 -0.174695 -0.107751 -0.0476501 0.00722244 0.0570025 0.101559
+ 0.141552 0.177531 0.209957 0.239222 0.265664 0.289579 0.311224 0.330828 0.348594 0.3647 0.379308 0.39256
+ 0.404586 0.415501 0.425409 0.434404 0.442571 0.449986 0.456719 0.462833 0.468385 0.473426 0.478004 0.482162
+ 0.485938 0.489368 0.492486 0.49532 0.497901 0.500255 0.502407 0.504384 0.506214 0.507927 0.50956 0.511161
+ 0.512798 0.514576 -0.749079 -0.632414 -0.521811 -0.421106 -0.329907 -0.247648 -0.17358 -0.106788 -0.0467161 0.0075919
+ 0.0575905 0.102142 0.142088 0.178016 0.210394 0.239615 0.266018 0.289897 0.311512 0.331089 0.34883 0.364916
+ 0.379505 0.392742 0.404754 0.415657 0.425554 0.43454 0.4427 0.450109 0.456837 0.462948 0.468497 0.473538
+ 0.478117 0.482278 0.486058 0.489495 0.492623 0.495472 0.498071 0.500449 0.502633 0.504652 0.506535 0.508317
+ 0.51004 0.511758 0.51354 0.515472 -0.749079 -0.634336 -0.52337 -0.422448 -0.331073 -0.248683 -0.174547 -0.107618
+ -0.0475145 0.00733047 0.0571094 0.101658 0.141641 0.177611 0.21003 0.239288 0.265724 0.289634 0.311276 0.330879
+ 0.348643 0.364749 0.379357 0.39261 0.404638 0.415555 0.425466 0.434464 0.442635 0.450055 0.456794 0.462914
+ 0.468474 0.473525 0.478115 0.482287 0.486082 0.489535 0.492681 0.495551 0.498176 0.500584 0.502804 0.504865
+ 0.506799 0.508642 0.510439 0.512243 0.514124 0.516164 -0.749079 -0.636331 -0.524729 -0.423502 -0.331873 -0.249376
+ -0.175369 -0.108066 -0.0474336 0.00734896 0.0568271 0.101296 0.141272 0.177259 0.209701 0.238985 0.265447 0.289382
+ 0.311048 0.330673 0.348458 0.364584 0.37921 0.392481 0.404524 0.415456 0.42538 0.434391 0.442574 0.450005
+ 0.456755 0.462886 0.468457 0.473519 0.47812 0.482305 0.486112 0.489581 0.492744 0.495633 0.498281 0.500715
+ 0.502965 0.505061 0.507036 0.508924 0.510767 0.512619 0.514542 0.516614 -0.749079 -0.637378 -0.525427 -0.423962
+ -0.331974 -0.249377 -0.175077 -0.107905 -0.0473391 0.00732379 0.0566334 0.101021 0.140973 0.176962 0.209419 0.238723
+ 0.265207 0.289164 0.310852 0.330497 0.348302 0.364446 0.379089 0.392376 0.404433 0.415378 0.425315 0.434338
+ 0.442531 0.449972 0.456732 0.462873 0.468453 0.473524 0.478136 0.482332 0.486152 0.489634 0.492812 0.495719
+ 0.498386 0.500843 0.503119 0.505243 0.507246 0.509162 0.511028 0.512888 0.514794 0.516808 -0.749079 -0.636386
+ -0.524263 -0.422886 -0.331329 -0.248914 -0.174684 -0.10769 -0.0472548 0.0072761 0.056458 0.100772 0.140695 0.176683
+ 0.209154 0.238478 0.264985 0.288966 0.310677 0.330344 0.348169 0.364331 0.378992 0.392293 0.404365 0.415322
+ 0.42527 0.434303 0.442506 0.449957 0.456725 0.462874 0.468462 0.473543 0.478164 0.482369 0.4862 0.489694
+ 0.492886 0.495808 0.498493 0.500968 0.503264 0.505409 0.507431 0.50936 0.511227 0.513063 0.514901 0.516774
+ -0.749079 -0.632376 -0.521497 -0.421026 -0.330171 -0.248189 -0.174231 -0.107469 -0.047209 0.00717915 0.0562499 0.1005
+ 0.140399 0.176391 0.208879 0.238229 0.264765 0.288774 0.310512 0.330204 0.348052 0.364235 0.378913 0.392231
+ 0.404317 0.415287 0.425245 0.434288 0.4425 0.449958 0.456734 0.46289 0.468486 0.473574 0.478203 0.482417
+ 0.486257 0.489761 0.492965 0.4959 0.498599 0.501089 0.503401 0.50556 0.507592 0.509524 0.511376 0.513166
+ 0.514904 0.516584 -0.749079 -0.625326 -0.517304 -0.41849 -0.328678 -0.247339 -0.173789 -0.107312 -0.0472511 0.00699459
+ 0.0559696 0.10017 0.140057 0.176061 0.208578 0.237963 0.264536 0.288581 0.310352 0.330075 0.347949 0.364155
+ 0.378853 0.392188 0.404288 0.41527 0.42524 0.434291 0.442511 0.449976 0.456758 0.462921 0.468522 0.473616
+ 0.478252 0.482472 0.48632 0.489833 0.493046 0.495992 0.498702 0.501204 0.503526 0.505694 0.507732 0.509658
+ 0.511489 0.513228 0.51486 0.516341 -0.749079 -0.616886 -0.512447 -0.41569 -0.327116 -0.246534 -0.173455 -0.107284
+ -0.0474236 0.00669385 0.0555946 0.0997649 0.139656 0.175689 0.208245 0.237676 0.264296 0.288385 0.310196 0.329954
+ 0.347859 0.36409 0.37881 0.392163 0.404277 0.415272 0.425251 0.434311 0.442538 0.450009 0.456796 0.462963
+ 0.468569 0.473668 0.478308 0.482534 0.486388 0.489907 0.493127 0.49608 0.498798 0.501308 0.503638 0.505811
+ 0.50785 0.50977 0.511582 0.513279 0.514831 0.516158 -0.749079 -0.60951 -0.50811 -0.413207 -0.325786 -0.24593
+ -0.173309 -0.107428 -0.0477461 0.00626875 0.055122 0.0992861 0.139202 0.175277 0.207887 0.237374 0.264049 0.288189
+ 0.310046 0.329843 0.347781 0.36404 0.378783 0.392153 0.404283 0.415289 0.425278 0.434345 0.442577 0.450053
+ 0.456844 0.463014 0.468624 0.473725 0.478368 0.482597 0.486455 0.489978 0.493202 0.496161 0.498883 0.501399
+ 0.503732 0.505908 0.507947 0.509863 0.511665 0.513346 0.514865 0.516127 -0.749079 -0.605399 -0.505395 -0.411557
+ -0.324928 -0.245635 -0.173393 -0.107754 -0.0482147 0.00573001 0.0545647 0.0987472 0.138706 0.174839 0.207514 0.237067
+ 0.263803 0.287999 0.309904 0.329742 0.347715 0.364002 0.378768 0.392157 0.4043 0.415317 0.425314 0.434387
+ 0.442624 0.450103 0.456897 0.463069 0.46868 0.473783 0.478427 0.482658 0.486517 0.490042 0.493268 0.496229
+ 0.498953 0.50147 0.503805 0.505982 0.50802 0.509937 0.511743 0.513437 0.514989 0.516304 -0.749079 -0.605669
+ -0.504804 -0.41095 -0.324625 -0.245676 -0.17371 -0.108253 -0.0488129 0.00509654 0.053942 0.0981664 0.138186 0.17439
+ 0.207138 0.236762 0.263563 0.287816 0.309771 0.32965 0.347657 0.363972 0.378759 0.392165 0.404322 0.415349
+ 0.425353 0.434431 0.442672 0.450153 0.456948 0.463121 0.468732 0.473835 0.478479 0.482709 0.486568 0.490092
+ 0.493319 0.496279 0.499003 0.501519 0.503853 0.506028 0.508065 0.509985 0.511805 0.51354 0.51519 0.516693
+ -0.749079 -0.609871 -0.505876 -0.411125 -0.324765 -0.246013 -0.174243 -0.108913 -0.049528 0.00438326 0.0532695 0.0975586
+ 0.137655 0.17394 0.206767 0.236463 0.263329 0.287639 0.309641 0.32956 0.347599 0.363939 0.378747 0.392168
+ 0.404337 0.415373 0.425384 0.434467 0.44271 0.450194 0.456989 0.463162 0.468773 0.473875 0.478517 0.482746
+ 0.486603 0.490125 0.493349 0.496306 0.499027 0.50154 0.50387 0.506041 0.508076 0.509997 0.511831 0.513616
+ 0.515413 0.517268 -0.749079 -0.615405 -0.507054 -0.411442 -0.325135 -0.246597 -0.174991 -0.10974 -0.0503596 0.00359659
+ 0.0525568 0.0969336 0.137121 0.173494 0.206401 0.236168 0.263096 0.287458 0.309503 0.329458 0.347525 0.363889
+ 0.378715 0.392151 0.404332 0.415376 0.425394 0.434482 0.442728 0.450214 0.457011 0.463184 0.468794 0.473895
+ 0.478536 0.482762 0.486616 0.490135 0.493355 0.496308 0.499024 0.501531 0.503855 0.50602 0.508048 0.509963
+ 0.511795 0.5136 0.51552 0.517978
</DataArray>
- <DataArray type="Float32" Name="velocity_Constant (m/s)" NumberOfComponents="3" format="ascii">
- 2.56881 0.0290946 0 2.49702 0.0274085 0 2.42959 0.0265336 0 2.36427 0.0257228 0
- 2.30109 0.024827 0 2.24024 0.0238515 0 2.18188 0.0228325 0 2.12609 0.0218037 0
- 2.07285 0.0207891 0 2.02211 0.0198035 0 1.97378 0.0188554 0 1.92778 0.0179488 0
- 1.88398 0.0170849 0 1.8423 0.0162635 0 1.80262 0.0154834 0 1.76483 0.0147427 0
- 1.72886 0.0140393 0 1.69459 0.0133713 0 1.66196 0.0127366 0 1.63087 0.0121333 0
- 1.60125 0.0115595 0 1.57304 0.0110137 0 1.54615 0.0104942 0 1.52053 0.00999981 0
- 1.49612 0.00952907 0 1.47286 0.00908083 0 1.45069 0.00865396 0 1.42957 0.00824741 0
- 1.40943 0.00786019 0 1.39024 0.00749139 0 1.37195 0.00714012 0 1.35452 0.00680557 0
- 1.3379 0.00648694 0 1.32207 0.00618352 0 1.30697 0.00589458 0 1.29258 0.00561948 0
- 1.27886 0.00535757 0 1.26577 0.00510826 0 1.2533 0.00487098 0 1.2414 0.00464517 0
- 1.23006 0.00443029 0 1.21924 0.00422584 0 1.20892 0.00403137 0 1.19907 0.00384651 0
- 1.18967 0.00367125 0 1.1807 0.00350638 0 1.17212 0.00335499 0 1.1639 0.00322558 0
- 1.15595 0.0031347 0 1.1482 0.0030653 0 2.46739 0.0857453 0 2.39626 0.0813146 0
- 2.33142 0.0784365 0 2.26929 0.0757859 0 2.20966 0.0730103 0 2.1525 0.0700821 0
- 2.09777 0.0670646 0 2.04549 0.0640303 0 1.99564 0.0610376 0 1.94817 0.0581262 0
- 1.90301 0.055321 0 1.86007 0.0526355 0 1.81927 0.0500758 0 1.78049 0.0476426 0
- 1.74364 0.0453334 0 1.7086 0.0431434 0 1.6753 0.0410671 0 1.64362 0.039098 0
- 1.61348 0.03723 0 1.58479 0.035457 0 1.55749 0.0337732 0 1.53149 0.0321733 0
- 1.50672 0.0306525 0 1.48314 0.0292062 0 1.46066 0.0278304 0 1.43925 0.0265212 0
- 1.41884 0.0252752 0 1.39939 0.0240891 0 1.38085 0.0229599 0 1.36317 0.0218848 0
- 1.34631 0.0208612 0 1.33024 0.0198866 0 1.31492 0.0189588 0 1.3003 0.0180754 0
- 1.28636 0.0172346 0 1.27306 0.0164343 0 1.26037 0.0156727 0 1.24826 0.0149482 0
- 1.2367 0.0142589 0 1.22566 0.0136035 0 1.21512 0.0129802 0 1.20505 0.0123876 0
- 1.19543 0.0118244 0 1.18623 0.0112895 0 1.17743 0.0107829 0 1.16901 0.0103067 0
- 1.16095 0.00986863 0 1.15321 0.00948667 0 1.14577 0.00918296 0 1.13871 0.00886301 0
- 2.27486 0.137404 0 2.21021 0.131517 0 2.15206 0.126622 0 2.0963 0.121918 0
- 2.04311 0.117122 0 1.99249 0.112207 0 1.94434 0.107233 0 1.8986 0.102283 0
- 1.85515 0.0974229 0 1.81392 0.0927053 0 1.7748 0.0881639 0 1.73771 0.0838191 0
- 1.70253 0.0796808 0 1.66916 0.0757514 0 1.63751 0.0720276 0 1.60747 0.0685024 0
- 1.57896 0.0651663 0 1.55188 0.0620091 0 1.52614 0.05902 0 1.50167 0.0561883 0
- 1.4784 0.0535041 0 1.45626 0.0509579 0 1.43518 0.0485411 0 1.4151 0.0462459 0
- 1.39598 0.044065 0 1.37777 0.0419918 0 1.36041 0.0400203 0 1.34386 0.038145 0
- 1.32808 0.0363609 0 1.31303 0.0346631 0 1.29868 0.0330475 0 1.28499 0.03151 0
- 1.27192 0.0300468 0 1.25946 0.0286546 0 1.24756 0.0273299 0 1.23619 0.0260698 0
- 1.22534 0.0248715 0 1.21497 0.0237321 0 1.20507 0.0226492 0 1.1956 0.0216202 0
- 1.18654 0.0206427 0 1.17787 0.0197144 0 1.16957 0.018833 0 1.16163 0.0179967 0
- 1.15401 0.0172048 0 1.14671 0.0164594 0 1.13971 0.0157678 0 1.13301 0.0151435 0
- 1.12663 0.0145831 0 1.12062 0.0139129 0 2.00261 0.180689 0 1.94914 0.174443 0
- 1.90185 0.168047 0 1.85642 0.161443 0 1.81327 0.154667 0 1.77246 0.14781 0
- 1.73392 0.140975 0 1.69754 0.13425 0 1.66317 0.127702 0 1.63071 0.121381 0
- 1.60004 0.115319 0 1.57105 0.109534 0 1.54364 0.104036 0 1.51772 0.0988266 0
- 1.49319 0.0938991 0 1.46996 0.0892436 0 1.44794 0.0848467 0 1.42707 0.0806938 0
- 1.40727 0.0767694 0 1.38846 0.0730587 0 1.37059 0.0695472 0 1.3536 0.0662217 0
- 1.33744 0.0630699 0 1.32206 0.0600805 0 1.30741 0.0572433 0 1.29346 0.0545491 0
- 1.28016 0.0519894 0 1.26748 0.0495565 0 1.25539 0.0472435 0 1.24386 0.0450439 0
- 1.23286 0.0429519 0 1.22235 0.040962 0 1.21232 0.0390693 0 1.20274 0.0372692 0
- 1.19359 0.0355574 0 1.18485 0.03393 0 1.17648 0.0323834 0 1.16848 0.0309139 0
- 1.16083 0.0295185 0 1.15349 0.0281938 0 1.14647 0.0269369 0 1.13973 0.0257445 0
- 1.13326 0.0246137 0 1.12705 0.0235414 0 1.12109 0.0225253 0 1.11535 0.0215646 0
- 1.10986 0.020661 0 1.1046 0.0198144 0 1.09963 0.0189954 0 1.09499 0.0180191 0
- 1.66786 0.212958 0 1.62967 0.207011 0 1.59679 0.199607 0 1.56524 0.191468 0
- 1.53542 0.183015 0 1.50742 0.174507 0 1.48117 0.166108 0 1.45656 0.157919 0
- 1.43346 0.150004 0 1.41176 0.142404 0 1.39138 0.135144 0 1.3722 0.128238 0
- 1.35416 0.121692 0 1.33717 0.115504 0 1.32115 0.109664 0 1.30603 0.104158 0
- 1.29175 0.0989691 0 1.27824 0.0940772 0 1.26545 0.089463 0 1.25333 0.0851074 0
- 1.24183 0.0809924 0 1.23091 0.0771011 0 1.22054 0.0734181 0 1.21067 0.0699293 0
- 1.20129 0.0666218 0 1.19235 0.0634842 0 1.18383 0.060506 0 1.17571 0.0576776 0
- 1.16796 0.0549905 0 1.16057 0.0524369 0 1.15351 0.0500097 0 1.14677 0.0477023 0
- 1.14032 0.0455088 0 1.13416 0.0434238 0 1.12826 0.0414423 0 1.12261 0.0395597 0
- 1.11721 0.0377719 0 1.11202 0.0360748 0 1.10704 0.0344648 0 1.10226 0.0329382 0
- 1.09766 0.0314916 0 1.09324 0.0301214 0 1.08897 0.0288236 0 1.08485 0.0275939 0
- 1.08087 0.0264277 0 1.07703 0.0253195 0 1.07334 0.0242617 0 1.06981 0.0232384 0
- 1.06649 0.0222 0 1.06343 0.0209836 0 1.29189 0.232203 0 1.2724 0.226759 0
- 1.25667 0.218744 0 1.24166 0.209577 0 1.22763 0.199983 0 1.21461 0.190358 0
- 1.20254 0.180913 0 1.19135 0.171757 0 1.18097 0.162948 0 1.17134 0.154518 0
- 1.16241 0.146487 0 1.15412 0.138865 0 1.14642 0.131658 0 1.13926 0.124861 0
- 1.13258 0.118462 0 1.12635 0.112442 0 1.12052 0.10678 0 1.11505 0.101452 0
- 1.1099 0.0964349 0 1.10506 0.091707 0 1.10049 0.0872468 0 1.09617 0.0830348 0
- 1.09208 0.0790534 0 1.08821 0.0752863 0 1.08453 0.0717189 0 1.08103 0.068338 0
- 1.0777 0.0651317 0 1.07452 0.0620893 0 1.07149 0.0592011 0 1.06859 0.0564583 0
- 1.06582 0.0538529 0 1.06316 0.0513778 0 1.06062 0.0490264 0 1.05817 0.0467929 0
- 1.05582 0.0446717 0 1.05356 0.0426581 0 1.05138 0.0407476 0 1.04927 0.0389361 0
- 1.04722 0.0372197 0 1.04524 0.0355949 0 1.04331 0.0340579 0 1.04142 0.032605 0
- 1.03957 0.0312316 0 1.03776 0.0299325 0 1.03597 0.0287002 0 1.03422 0.0275243 0
- 1.0325 0.0263875 0 1.03084 0.0252577 0 1.0293 0.0240682 0 1.02792 0.0226785 0
- 0.898516 0.237131 0 0.900213 0.231946 0 0.903226 0.223733 0 0.906201 0.214211 0
- 0.909158 0.204209 0 0.912113 0.194188 0 0.915063 0.184381 0 0.918004 0.174888 0
- 0.920946 0.165766 0 0.923897 0.157042 0 0.926867 0.148733 0 0.929857 0.140859 0
- 0.932853 0.133427 0 0.935836 0.126434 0 0.938787 0.119867 0 0.941689 0.113702 0
- 0.944528 0.107916 0 0.947293 0.102481 0 0.949978 0.0973721 0 0.952578 0.0925648 0
- 0.955089 0.0880359 0 0.957509 0.0837647 0 0.959836 0.079732 0 0.962071 0.0759207 0
- 0.964213 0.0723152 0 0.966262 0.0689016 0 0.96822 0.0656672 0 0.970088 0.0626008 0
- 0.971866 0.0596921 0 0.973557 0.056932 0 0.975162 0.0543123 0 0.976683 0.0518255 0
- 0.978122 0.0494648 0 0.979479 0.0472244 0 0.980757 0.0450987 0 0.981956 0.0430829 0
- 0.983077 0.0411727 0 0.98412 0.0393641 0 0.985086 0.0376537 0 0.985974 0.0360379 0
- 0.986782 0.0345135 0 0.987509 0.0330767 0 0.988153 0.0317232 0 0.98871 0.0304468 0
- 0.989181 0.0292384 0 0.989567 0.0280832 0 0.989876 0.0269555 0 0.990131 0.0258082 0
- 0.990377 0.0245556 0 0.990684 0.0230541 0 0.512475 0.227179 0 0.536409 0.221828 0
- 0.558223 0.21399 0 0.579033 0.204925 0 0.598769 0.19534 0 0.617482 0.185721 0
- 0.635216 0.1763 0 0.652048 0.167149 0 0.66807 0.158334 0 0.683361 0.14988 0
- 0.697996 0.141811 0 0.712027 0.134165 0 0.725479 0.126962 0 0.738365 0.120204 0
- 0.750694 0.113873 0 0.762481 0.107945 0 0.773744 0.102392 0 0.784501 0.0971865 0
- 0.794773 0.0923011 0 0.80458 0.0877107 0 0.813941 0.0833921 0 0.822877 0.0793242 0
- 0.831405 0.0754881 0 0.839543 0.0718665 0 0.847308 0.0684442 0 0.854715 0.0652073 0
- 0.861779 0.0621434 0 0.868516 0.0592414 0 0.874937 0.0564912 0 0.881057 0.053884 0
- 0.886888 0.0514116 0 0.892441 0.0490669 0 0.897727 0.0468435 0 0.902758 0.0447357 0
- 0.907541 0.0427384 0 0.912087 0.0408472 0 0.916403 0.0390582 0 0.920498 0.037368 0
- 0.924377 0.0357737 0 0.928046 0.0342724 0 0.93151 0.0328616 0 0.934771 0.0315383 0
- 0.937831 0.0302986 0 0.940691 0.0291368 0 0.943353 0.028043 0 0.945815 0.0269999 0
- 0.948085 0.0259756 0 0.950177 0.0249098 0 0.952134 0.0236917 0 0.95406 0.0221319 0
- 0.157527 0.20253 0 0.202481 0.197028 0 0.241358 0.190238 0 0.278396 0.182398 0
- 0.313506 0.173991 0 0.346731 0.165521 0 0.378128 0.157196 0 0.407833 0.149024 0
- 0.435995 0.141113 0 0.462736 0.133475 0 0.488193 0.126142 0 0.512464 0.119193 0
- 0.535596 0.112667 0 0.557629 0.106565 0 0.578604 0.100868 0 0.598567 0.0955486 0
- 0.617568 0.090577 0 0.635657 0.0859249 0 0.65288 0.0815662 0 0.669285 0.0774766 0
- 0.684913 0.0736345 0 0.699804 0.0700202 0 0.713996 0.066616 0 0.727524 0.0634062 0
- 0.740419 0.0603766 0 0.752712 0.0575145 0 0.764433 0.0548085 0 0.775606 0.0522483 0
- 0.786259 0.049825 0 0.796413 0.0475304 0 0.806093 0.0453572 0 0.815318 0.043299 0
- 0.824108 0.0413501 0 0.832483 0.0395055 0 0.840459 0.0377609 0 0.848053 0.0361126 0
- 0.855281 0.0345577 0 0.862155 0.0330934 0 0.868689 0.0317178 0 0.874894 0.0304292 0
- 0.880779 0.0292261 0 0.886352 0.0281067 0 0.891618 0.0270687 0 0.896582 0.0261075 0
- 0.901243 0.0252142 0 0.905602 0.0243712 0 0.909659 0.0235429 0 0.913423 0.0226575 0
- 0.916934 0.02157 0 0.920332 0.0199947 0 -0.145792 0.164499 0 -0.084254 0.159486 0
- -0.0311113 0.154164 0 0.0198549 0.148069 0 0.0682519 0.141514 0 0.114027 0.134797 0
- 0.157343 0.128149 0 0.198353 0.121499 0 0.237178 0.115049 0 0.273946 0.108732 0
- 0.308864 0.102585 0 0.342065 0.0967723 0 0.373608 0.0913459 0 0.403559 0.0862996 0
- 0.431992 0.0816074 0 0.458992 0.0772393 0 0.48464 0.0731667 0 0.509016 0.0693636 0
- 0.532193 0.0658064 0 0.554241 0.0624744 0 0.575223 0.0593488 0 0.595198 0.056413 0
- 0.61422 0.0536522 0 0.632339 0.0510529 0 0.649602 0.0486033 0 0.666052 0.0462927 0
- 0.68173 0.0441116 0 0.696674 0.0420514 0 0.710918 0.0401046 0 0.724497 0.0382644 0
- 0.737441 0.0365249 0 0.749779 0.0348807 0 0.761539 0.0333275 0 0.772748 0.0318614 0
- 0.783429 0.0304791 0 0.793605 0.029178 0 0.803298 0.0279562 0 0.812527 0.0268123 0
- 0.821309 0.0257455 0 0.829662 0.0247554 0 0.837599 0.0238422 0 0.845132 0.0230059 0
- 0.85227 0.0222462 0 0.859018 0.0215608 0 0.865378 0.0209434 0 0.871349 0.0203783 0
- 0.876925 0.0198288 0 0.882111 0.0192118 0 0.886946 0.018339 0 0.891605 0.0167806 0
- -0.378931 0.115745 0 -0.306739 0.112003 0 -0.243311 0.10839 0 -0.182337 0.104291 0
- -0.123979 0.0998885 0 -0.0682788 0.0952425 0 -0.0151554 0.0905522 0 0.0352929 0.0859294 0
- 0.082888 0.081483 0 0.127806 0.0769489 0 0.170355 0.0723944 0 0.210697 0.0681289 0
- 0.248903 0.0641898 0 0.28508 0.0605534 0 0.319353 0.0571884 0 0.351844 0.0540665 0
- 0.382665 0.0511634 0 0.411925 0.0484587 0 0.439718 0.0459344 0 0.466135 0.043575 0
- 0.491255 0.0413666 0 0.515153 0.0392971 0 0.537897 0.0373554 0 0.55955 0.0355317 0
- 0.580171 0.0338174 0 0.599813 0.0322046 0 0.618526 0.0306863 0 0.636358 0.0292563 0
- 0.653352 0.027909 0 0.669549 0.0266397 0 0.684987 0.0254441 0 0.699703 0.0243185 0
- 0.713729 0.02326 0 0.727099 0.0222663 0 0.739842 0.0213353 0 0.751985 0.020466 0
- 0.763556 0.0196577 0 0.774578 0.0189104 0 0.785073 0.0182249 0 0.795062 0.0176024 0
- 0.804563 0.017045 0 0.81359 0.016555 0 0.822156 0.0161345 0 0.830267 0.0157847 0
- 0.837928 0.015503 0 0.845134 0.0152774 0 0.85188 0.0150719 0 0.858165 0.0147919 0
- 0.864031 0.0141975 0 0.869677 0.0126787 0 -0.526768 0.0597798 0 -0.449846 0.0578014 0
- -0.380056 0.0560167 0 -0.312647 0.0539577 0 -0.247847 0.0516953 0 -0.185827 0.0492599 0
- -0.126709 0.0467415 0 -0.0704407 0.0443666 0 -0.0168465 0.0420943 0 0.0339631 0.0397553 0
- 0.0818719 0.0372217 0 0.127043 0.0348919 0 0.169657 0.0327704 0 0.209911 0.0308277 0
- 0.247981 0.0290392 0 0.284027 0.0273868 0 0.318189 0.0258562 0 0.350592 0.024436 0
- 0.381349 0.0231163 0 0.410564 0.0218887 0 0.438328 0.0207456 0 0.464727 0.0196804 0
- 0.489839 0.0186869 0 0.513736 0.0177599 0 0.536484 0.0168943 0 0.558145 0.0160858 0
- 0.578774 0.0153305 0 0.598426 0.014625 0 0.61715 0.0139662 0 0.634992 0.0133517 0
- 0.651995 0.0127791 0 0.6682 0.012247 0 0.683645 0.011754 0 0.698366 0.0112995 0
- 0.712397 0.0108832 0 0.72577 0.0105055 0 0.738513 0.0101673 0 0.750654 0.00987025 0
- 0.762219 0.00961673 0 0.773231 0.00940994 0 0.78371 0.00925388 0 0.793674 0.00915334 0
- 0.803136 0.0091136 0 0.812107 0.00913955 0 0.82059 0.00923326 0 0.828584 0.0093874 0
- 0.83608 0.00956787 0 0.84308 0.00966847 0 0.849625 0.00939131 0 0.855926 0.00792747 0
- -0.578014 0.000103433 0 -0.500352 0.000175394 0 -0.428291 0.000161587 0 -0.358552 9.53661e-05 0
- -0.291403 -1.98095e-06 0 -0.227079 -0.000117659 0 -0.165743 -0.000244394 0 -0.107345 -0.000380624 0
- -0.0517494 -0.000510325 0 0.00119229 -0.000641129 0 0.0512503 -0.000755375 0 0.0982386 -0.000858234 0
- 0.142462 -0.00095022 0 0.184183 -0.00103088 0 0.223609 -0.00109973 0 0.260916 -0.00115643 0
- 0.296255 -0.00120075 0 0.329759 -0.00123268 0 0.361548 -0.00125232 0 0.391731 -0.00125995 0
- 0.420404 -0.00125596 0 0.447659 -0.00124087 0 0.473576 -0.00121525 0 0.498231 -0.00117971 0
- 0.521694 -0.00113485 0 0.544028 -0.00108127 0 0.565295 -0.00101945 0 0.585549 -0.000949798 0
- 0.604842 -0.000872552 0 0.623223 -0.000787777 0 0.640737 -0.000695312 0 0.657427 -0.000594731 0
- 0.673334 -0.000485294 0 0.688493 -0.000365896 0 0.702942 -0.000235003 0 0.716712 -9.0578e-05 0
- 0.729836 6.99993e-05 0 0.742341 0.000250039 0 0.754255 0.00045366 0 0.765603 0.000685922 0
- 0.776405 0.000952969 0 0.786681 0.00126213 0 0.796448 0.00162182 0 0.805715 0.00204091 0
- 0.814488 0.00252628 0 0.822768 0.00307571 0 0.830549 0.00365767 0 0.83783 0.00415481 0
- 0.844653 0.00421005 0 0.851223 0.00281202 0 -0.526693 -0.0595893 0 -0.449662 -0.0574788 0
- -0.379789 -0.0557307 0 -0.312278 -0.0538116 0 -0.247362 -0.0517477 0 -0.185221 -0.0495442 0
- -0.125983 -0.0472764 0 -0.0696032 -0.0451712 0 -0.0159068 -0.0431534 0 0.0349818 -0.0410624 0
- 0.0829473 -0.0387528 0 0.128163 -0.0366243 0 0.170812 -0.0346818 0 0.211086 -0.0328954 0
- 0.249166 -0.0312397 0 0.285208 -0.0296958 0 0.319354 -0.0282492 0 0.35173 -0.0268885 0
- 0.38245 -0.025604 0 0.411617 -0.0243879 0 0.439326 -0.0232335 0 0.465661 -0.022135 0
- 0.490702 -0.0210877 0 0.514522 -0.0200874 0 0.537188 -0.0191303 0 0.558763 -0.0182133 0
- 0.579304 -0.0173334 0 0.598865 -0.016488 0 0.617497 -0.0156745 0 0.635247 -0.0148905 0
- 0.652158 -0.0141335 0 0.668274 -0.013401 0 0.683632 -0.0126903 0 0.698269 -0.0119985 0
- 0.712221 -0.0113222 0 0.725518 -0.0106577 0 0.738192 -0.0100009 0 0.750271 -0.00934658 0
- 0.761781 -0.00868912 0 0.772747 -0.00802162 0 0.78319 -0.00733591 0 0.79313 -0.00662225 0
- 0.802583 -0.00586929 0 0.811562 -0.00506445 0 0.820073 -0.00419622 0 0.828118 -0.00326176 0
- 0.835693 -0.0022898 0 0.842799 -0.00140711 0 0.849471 -0.00102393 0 0.855882 -0.00233866 0
- -0.378789 -0.115598 0 -0.306389 -0.111761 0 -0.242811 -0.10821 0 -0.181649 -0.10427 0
- -0.123082 -0.100076 0 -0.0671627 -0.0956639 0 -0.013822 -0.091219 0 0.0368198 -0.0868463 0
- 0.0845757 -0.0826401 0 0.12963 -0.0783302 0 0.172289 -0.0739844 0 0.212714 -0.0699057 0
- 0.250979 -0.0661311 0 0.287193 -0.0626366 0 0.321478 -0.0593901 0 0.353958 -0.056363 0
- 0.384747 -0.0535308 0 0.413954 -0.050873 0 0.441675 -0.0483723 0 0.468 -0.0460137 0
- 0.493013 -0.0437843 0 0.516789 -0.041673 0 0.539398 -0.03967 0 0.560904 -0.0377668 0
- 0.58137 -0.0359559 0 0.600849 -0.0342306 0 0.619394 -0.032585 0 0.637054 -0.0310134 0
- 0.653875 -0.0295109 0 0.669898 -0.0280727 0 0.685165 -0.0266942 0 0.699713 -0.0253708 0
- 0.713576 -0.0240981 0 0.72679 -0.0228714 0 0.739384 -0.0216858 0 0.751389 -0.0205361 0
- 0.762833 -0.0194166 0 0.773741 -0.0183206 0 0.784139 -0.0172411 0 0.794048 -0.0161694 0
- 0.803489 -0.0150957 0 0.812481 -0.0140082 0 0.82104 -0.012893 0 0.829179 -0.0117345 0
- 0.836906 -0.0105171 0 0.844227 -0.00923331 0 0.851139 -0.00790871 0 0.857642 -0.00667535 0
- 0.863754 -0.00598273 0 0.869601 -0.007186 0 -0.145604 -0.164412 0 -0.0837899 -0.159365 0
- -0.0304393 -0.154149 0 0.0207822 -0.148237 0 0.0694544 -0.141901 0 0.115509 -0.135417 0
- 0.159091 -0.129003 0 0.200341 -0.122576 0 0.239375 -0.116342 0 0.276317 -0.110225 0
- 0.311374 -0.104262 0 0.344679 -0.0986122 0 0.376292 -0.0933276 0 0.40628 -0.0884009 0
- 0.434719 -0.0838054 0 0.461694 -0.0795112 0 0.487287 -0.0754893 0 0.511581 -0.0717142 0
- 0.534649 -0.0681628 0 0.556563 -0.0648152 0 0.577389 -0.0616538 0 0.597188 -0.0586631 0
- 0.616017 -0.0558296 0 0.633927 -0.0531413 0 0.65097 -0.0505876 0 0.667191 -0.0481588 0
- 0.682633 -0.0458465 0 0.697336 -0.0436427 0 0.711338 -0.0415403 0 0.724676 -0.0395325 0
- 0.737383 -0.037613 0 0.74949 -0.0357755 0 0.761027 -0.0340141 0 0.772022 -0.0323225 0
- 0.782503 -0.0306947 0 0.792494 -0.029124 0 0.802019 -0.0276035 0 0.8111 -0.0261253 0
- 0.819759 -0.0246811 0 0.828014 -0.0232611 0 0.835885 -0.0218539 0 0.843388 -0.0204462 0
- 0.850538 -0.0190225 0 0.857349 -0.0175646 0 0.863831 -0.0160542 0 0.86999 -0.0144802 0
- 0.87583 -0.012864 0 0.881349 -0.0113372 0 0.886549 -0.0103705 0 0.891498 -0.0114346 0
- 0.15773 -0.202507 0 0.202988 -0.197057 0 0.242105 -0.190431 0 0.279439 -0.1828 0
- 0.314867 -0.174619 0 0.348404 -0.166373 0 0.380091 -0.158262 0 0.410055 -0.150288 0
- 0.438438 -0.142564 0 0.465359 -0.135095 0 0.490956 -0.127914 0 0.515326 -0.121099 0
- 0.538518 -0.114686 0 0.560572 -0.108676 0 0.581531 -0.103049 0 0.601443 -0.0977769 0
- 0.620358 -0.0928309 0 0.638328 -0.0881831 0 0.655402 -0.083808 0 0.671628 -0.0796825 0
- 0.687052 -0.0757863 0 0.701717 -0.0721011 0 0.715662 -0.0686107 0 0.728927 -0.0653006 0
- 0.741546 -0.062158 0 0.753554 -0.0591713 0 0.764982 -0.0563301 0 0.775861 -0.0536247 0
- 0.786219 -0.0510464 0 0.796082 -0.048587 0 0.805475 -0.0462387 0 0.814424 -0.043994 0
- 0.822949 -0.0418458 0 0.831074 -0.0397868 0 0.838817 -0.0378098 0 0.846199 -0.0359073 0
- 0.853238 -0.0340712 0 0.859952 -0.0322931 0 0.866356 -0.0305635 0 0.872467 -0.0288719 0
- 0.878299 -0.0272059 0 0.883868 -0.0255515 0 0.889186 -0.0238918 0 0.894266 -0.0222078 0
- 0.89912 -0.0204794 0 0.903758 -0.018693 0 0.908186 -0.0168661 0 0.912405 -0.0151252 0
- 0.916406 -0.0139427 0 0.920189 -0.0148484 0 0.512656 -0.227216 0 0.536883 -0.222026 0
- 0.558955 -0.214413 0 0.580082 -0.205586 0 0.600147 -0.196227 0 0.619173 -0.186815 0
- 0.637187 -0.177581 0 0.654259 -0.168598 0 0.670477 -0.159934 0 0.68592 -0.151616 0
- 0.700663 -0.143666 0 0.714759 -0.13612 0 0.728236 -0.128999 0 0.741105 -0.122301 0
- 0.753379 -0.11601 0 0.765074 -0.110101 0 0.776207 -0.104546 0 0.7868 -0.0993183 0
- 0.796875 -0.0943922 0 0.806456 -0.0897438 0 0.815565 -0.0853515 0 0.824225 -0.0811957 0
- 0.832458 -0.0772591 0 0.840286 -0.073526 0 0.847728 -0.0699823 0 0.854806 -0.0666153 0
- 0.861537 -0.0634135 0 0.867939 -0.0603662 0 0.87403 -0.0574637 0 0.879826 -0.0546968 0
- 0.885342 -0.052057 0 0.890594 -0.0495359 0 0.895596 -0.0471257 0 0.90036 -0.0448184 0
- 0.904901 -0.042606 0 0.909231 -0.0404806 0 0.913362 -0.0384335 0 0.917304 -0.0364557 0
- 0.921071 -0.0345374 0 0.924672 -0.0326675 0 0.928119 -0.0308336 0 0.931422 -0.0290211 0
- 0.934593 -0.0272133 0 0.937643 -0.0253907 0 0.940585 -0.0235334 0 0.943432 -0.0216267 0
- 0.946194 -0.0196852 0 0.948876 -0.0178267 0 0.951458 -0.016507 0 0.953877 -0.0172461 0
- 0.898652 -0.237218 0 0.900596 -0.232321 0 0.903873 -0.224398 0 0.90716 -0.215132 0
- 0.910426 -0.205345 0 0.913657 -0.195503 0 0.916834 -0.185847 0 0.919953 -0.176485 0
- 0.923024 -0.167479 0 0.92606 -0.158855 0 0.929073 -0.150631 0 0.932063 -0.142824 0
- 0.93502 -0.135442 0 0.937927 -0.128479 0 0.940764 -0.121921 0 0.943514 -0.115746 0
- 0.946166 -0.109929 0 0.948711 -0.104446 0 0.951146 -0.0992724 0 0.953468 -0.0943855 0
- 0.955677 -0.0897642 0 0.957775 -0.0853894 0 0.959764 -0.0812438 0 0.96165 -0.0773116 0
- 0.963434 -0.0735787 0 0.965123 -0.070032 0 0.966721 -0.0666598 0 0.968233 -0.0634512 0
- 0.969664 -0.0603961 0 0.971019 -0.0574851 0 0.972304 -0.0547092 0 0.973522 -0.0520598 0
- 0.974679 -0.0495288 0 0.97578 -0.0471079 0 0.97683 -0.0447891 0 0.977833 -0.0425639 0
- 0.978795 -0.0404239 0 0.97972 -0.0383598 0 0.980614 -0.0363617 0 0.981483 -0.0344189 0
- 0.982332 -0.032519 0 0.983169 -0.030648 0 0.984002 -0.0287897 0 0.984841 -0.0269259 0
- 0.985698 -0.0250375 0 0.986587 -0.023111 0 0.987522 -0.021159 0 0.988512 -0.0192894 0
- 0.98953 -0.0179245 0 0.990451 -0.018501 0 1.29196 -0.232334 0 1.27264 -0.227314 0
- 1.25717 -0.219648 0 1.24245 -0.210737 0 1.22867 -0.201327 0 1.21583 -0.191836 0
- 1.20388 -0.182498 0 1.19276 -0.173432 0 1.1824 -0.164702 0 1.17275 -0.15634 0
- 1.16376 -0.148362 0 1.15538 -0.140779 0 1.14755 -0.133592 0 1.14023 -0.126797 0
- 1.13336 -0.120379 0 1.1269 -0.114321 0 1.12081 -0.108603 0 1.11506 -0.103203 0
- 1.1096 -0.0981003 0 1.10443 -0.0932745 0 1.09951 -0.0887067 0 1.09483 -0.0843794 0
- 1.09037 -0.0802767 0 1.08611 -0.0763838 0 1.08205 -0.0726873 0 1.07818 -0.0691751 0
- 1.07448 -0.0658357 0 1.07095 -0.0626588 0 1.06757 -0.0596346 0 1.06435 -0.0567539 0
- 1.06128 -0.054008 0 1.05834 -0.0513886 0 1.05555 -0.0488877 0 1.05288 -0.0464972 0
- 1.05034 -0.0442093 0 1.04793 -0.0420158 0 1.04564 -0.0399086 0 1.04347 -0.0378787 0
- 1.04142 -0.0359169 0 1.03948 -0.0340128 0 1.03767 -0.032155 0 1.03598 -0.0303304 0
- 1.03442 -0.0285244 0 1.03299 -0.0267207 0 1.03171 -0.0249025 0 1.03059 -0.0230586 0
- 1.02964 -0.0212013 0 1.02888 -0.0194271 0 1.02826 -0.018112 0 1.02763 -0.0185414 0
- 1.66784 -0.213131 0 1.62973 -0.207751 0 1.5971 -0.200729 0 1.56576 -0.19281 0
- 1.53607 -0.184478 0 1.50811 -0.176044 0 1.48182 -0.167701 0 1.45711 -0.159563 0
- 1.43387 -0.151696 0 1.41201 -0.144138 0 1.39144 -0.136908 0 1.37205 -0.130018 0
- 1.35377 -0.123469 0 1.33652 -0.117258 0 1.32021 -0.111377 0 1.30478 -0.105811 0
- 1.29016 -0.100546 0 1.2763 -0.0955636 0 1.26313 -0.0908481 0 1.25063 -0.0863827 0
- 1.23874 -0.0821515 0 1.22743 -0.0781398 0 1.21666 -0.0743339 0 1.20641 -0.0707211 0
- 1.19664 -0.0672896 0 1.18734 -0.0640287 0 1.17847 -0.0609283 0 1.17002 -0.0579789 0
- 1.16196 -0.0551717 0 1.15428 -0.0524985 0 1.14697 -0.0499512 0 1.14 -0.0475223 0
- 1.13336 -0.0452044 0 1.12704 -0.0429901 0 1.12102 -0.0408721 0 1.1153 -0.0388433 0
- 1.10985 -0.0368958 0 1.10469 -0.0350219 0 1.09979 -0.033213 0 1.09515 -0.0314599 0
- 1.09077 -0.0297524 0 1.08664 -0.0280792 0 1.08277 -0.0264277 0 1.07915 -0.0247841 0
- 1.0758 -0.0231348 0 1.07273 -0.0214717 0 1.06996 -0.0198072 0 1.06748 -0.0182262 0
- 1.06526 -0.0170479 0 1.06308 -0.0173543 0 2.00245 -0.180911 0 1.94895 -0.175377 0
- 1.90186 -0.169333 0 1.85651 -0.162851 0 1.81327 -0.1561 0 1.77227 -0.149246 0
- 1.73346 -0.142422 0 1.69677 -0.13572 0 1.66209 -0.129204 0 1.6293 -0.122912 0
- 1.59829 -0.116867 0 1.56896 -0.111083 0 1.54119 -0.105567 0 1.51489 -0.100319 0
- 1.48997 -0.0953333 0 1.46634 -0.0906029 0 1.44391 -0.0861173 0 1.42262 -0.0818647 0
- 1.40239 -0.077833 0 1.38316 -0.0740099 0 1.36487 -0.0703834 0 1.34747 -0.0669422 0
- 1.33092 -0.0636754 0 1.31517 -0.060573 0 1.30017 -0.0576254 0 1.28589 -0.0548239 0
- 1.27229 -0.0521601 0 1.25934 -0.0496262 0 1.24701 -0.0472149 0 1.23526 -0.0449192 0
- 1.22408 -0.0427323 0 1.21344 -0.0406478 0 1.2033 -0.0386594 0 1.19365 -0.0367608 0
- 1.18448 -0.0349459 0 1.17575 -0.0332084 0 1.16745 -0.0315419 0 1.15958 -0.0299396 0
- 1.1521 -0.0283945 0 1.14501 -0.0268988 0 1.13831 -0.0254442 0 1.13198 -0.0240213 0
- 1.12602 -0.0226199 0 1.12043 -0.0212294 0 1.11522 -0.0198396 0 1.11039 -0.0184454 0
- 1.10595 -0.0170594 0 1.1019 -0.0157527 0 1.09819 -0.0147814 0 1.09458 -0.0149917 0
- 2.27451 -0.1377 0 2.2096 -0.132632 0 2.1515 -0.127931 0 2.09552 -0.12318 0
- 2.04191 -0.118299 0 1.99078 -0.113333 0 1.94211 -0.108354 0 1.89585 -0.103426 0
- 1.85191 -0.0986013 0 1.8102 -0.0939139 0 1.77061 -0.0893878 0 1.73304 -0.085038 0
- 1.69738 -0.0808731 0 1.66353 -0.0768965 0 1.63139 -0.0731079 0 1.60087 -0.0695037 0
- 1.57187 -0.0660783 0 1.54432 -0.0628249 0 1.51813 -0.0597356 0 1.49323 -0.0568025 0
- 1.46955 -0.0540175 0 1.44702 -0.0513728 0 1.4256 -0.0488606 0 1.40521 -0.046474 0
- 1.38581 -0.0442058 0 1.36735 -0.0420498 0 1.34978 -0.0399997 0 1.33306 -0.0380498 0
- 1.31714 -0.0361944 0 1.302 -0.0344283 0 1.28758 -0.0327464 0 1.27387 -0.0311437 0
- 1.26082 -0.0296155 0 1.2484 -0.0281569 0 1.2366 -0.0267633 0 1.22537 -0.0254299 0
- 1.21471 -0.0241516 0 1.20458 -0.0229236 0 1.19497 -0.0217402 0 1.18585 -0.0205958 0
- 1.17723 -0.0194839 0 1.16908 -0.0183979 0 1.1614 -0.0173302 0 1.15418 -0.0162731 0
- 1.14742 -0.01522 0 1.14113 -0.0141683 0 1.13531 -0.0131292 0 1.12995 -0.0121575 0
- 1.12499 -0.0114411 0 1.12016 -0.0115791 0 2.4666 -0.086154 0 2.39459 -0.0824318 0
- 2.32933 -0.0794446 0 2.26646 -0.0765837 0 2.20604 -0.0736786 0 2.14813 -0.070713 0
- 2.09273 -0.0677182 0 2.03983 -0.0647325 0 1.98938 -0.061789 0 1.94133 -0.0589129 0
- 1.89558 -0.0561223 0 1.85206 -0.0534293 0 1.81067 -0.0508417 0 1.77131 -0.0483637 0
- 1.7339 -0.0459967 0 1.69833 -0.0437401 0 1.66451 -0.0415916 0 1.63236 -0.0395479 0
- 1.60179 -0.0376049 0 1.57272 -0.0357584 0 1.54508 -0.0340037 0 1.51879 -0.0323365 0
- 1.49379 -0.0307522 0 1.47 -0.0292466 0 1.44738 -0.0278155 0 1.42586 -0.0264551 0
- 1.40539 -0.0251615 0 1.38592 -0.0239312 0 1.36739 -0.0227607 0 1.34977 -0.0216468 0
- 1.333 -0.0205861 0 1.31706 -0.0195757 0 1.3019 -0.0186126 0 1.28748 -0.0176936 0
- 1.27377 -0.0168159 0 1.26074 -0.0159764 0 1.24837 -0.015172 0 1.23662 -0.0143996 0
- 1.22547 -0.0136557 0 1.2149 -0.0129368 0 1.2049 -0.0122389 0 1.19544 -0.0115578 0
- 1.18652 -0.010889 0 1.17813 -0.0102281 0 1.17027 -0.00957102 0 1.16293 -0.00891695 0
- 1.15612 -0.00827388 0 1.14981 -0.00767686 0 1.14392 -0.00724126 0 1.13818 -0.00732199 0
- 2.56625 -0.0293322 0 2.49126 -0.0279284 0 2.42272 -0.0269064 0 2.35664 -0.0259602 0
- 2.29293 -0.0250043 0 2.23165 -0.0240251 0 2.17283 -0.0230309 0 2.11649 -0.0220347 0
- 2.06264 -0.0210482 0 2.01123 -0.0200807 0 1.9622 -0.0191391 0 1.9155 -0.0182281 0
- 1.87102 -0.0173508 0 1.8287 -0.0165093 0 1.78843 -0.0157042 0 1.75013 -0.0149357 0
- 1.71371 -0.0142033 0 1.67907 -0.013506 0 1.64613 -0.0128426 0 1.61482 -0.0122119 0
- 1.58504 -0.0116122 0 1.55672 -0.0110423 0 1.52979 -0.0105006 0 1.50418 -0.00998576 0
- 1.47983 -0.00949636 0 1.45667 -0.0090311 0 1.43464 -0.00858871 0 1.4137 -0.00816798 0
- 1.39378 -0.00776775 0 1.37484 -0.00738689 0 1.35682 -0.00702431 0 1.33969 -0.00667896 0
- 1.32341 -0.00634981 0 1.30792 -0.00603582 0 1.29321 -0.00573599 0 1.27923 -0.00544927 0
- 1.26595 -0.00517463 0 1.25334 -0.00491096 0 1.24138 -0.00465711 0 1.23004 -0.00441186 0
- 1.21931 -0.00417388 0 1.20917 -0.00394176 0 1.1996 -0.00371398 0 1.19059 -0.00348905 0
- 1.18215 -0.00326572 0 1.17426 -0.00304378 0 1.16693 -0.00282616 0 1.16011 -0.00262499 0
- 1.15373 -0.00247932 0 1.1475 -0.00250654 0 2.56625 0.0293322 0 2.49126 0.0279284 0
- 2.42272 0.0269064 0 2.35664 0.0259602 0 2.29293 0.0250043 0 2.23165 0.0240251 0
- 2.17283 0.0230309 0 2.11649 0.0220347 0 2.06264 0.0210482 0 2.01123 0.0200807 0
- 1.9622 0.0191391 0 1.9155 0.0182281 0 1.87102 0.0173508 0 1.8287 0.0165093 0
- 1.78843 0.0157042 0 1.75013 0.0149357 0 1.71371 0.0142033 0 1.67907 0.013506 0
- 1.64613 0.0128426 0 1.61482 0.0122119 0 1.58504 0.0116122 0 1.55672 0.0110423 0
- 1.52979 0.0105006 0 1.50418 0.00998576 0 1.47983 0.00949636 0 1.45667 0.0090311 0
- 1.43464 0.00858871 0 1.4137 0.00816798 0 1.39378 0.00776775 0 1.37484 0.00738689 0
- 1.35682 0.00702431 0 1.33969 0.00667896 0 1.32341 0.00634981 0 1.30792 0.00603582 0
- 1.29321 0.00573599 0 1.27923 0.00544927 0 1.26595 0.00517463 0 1.25334 0.00491096 0
- 1.24138 0.00465711 0 1.23004 0.00441186 0 1.21931 0.00417388 0 1.20917 0.00394176 0
- 1.1996 0.00371398 0 1.19059 0.00348905 0 1.18215 0.00326572 0 1.17426 0.00304378 0
- 1.16693 0.00282616 0 1.16011 0.00262499 0 1.15373 0.00247932 0 1.1475 0.00250654 0
- 2.4666 0.086154 0 2.39459 0.0824318 0 2.32933 0.0794446 0 2.26646 0.0765837 0
- 2.20604 0.0736786 0 2.14813 0.070713 0 2.09273 0.0677182 0 2.03983 0.0647325 0
- 1.98938 0.061789 0 1.94133 0.0589129 0 1.89558 0.0561223 0 1.85206 0.0534293 0
- 1.81067 0.0508417 0 1.77131 0.0483637 0 1.7339 0.0459967 0 1.69833 0.0437401 0
- 1.66451 0.0415916 0 1.63236 0.0395479 0 1.60179 0.0376049 0 1.57272 0.0357584 0
- 1.54508 0.0340037 0 1.51879 0.0323365 0 1.49379 0.0307522 0 1.47 0.0292466 0
- 1.44738 0.0278155 0 1.42586 0.0264551 0 1.40539 0.0251615 0 1.38592 0.0239312 0
- 1.36739 0.0227607 0 1.34977 0.0216468 0 1.333 0.0205861 0 1.31706 0.0195757 0
- 1.3019 0.0186126 0 1.28748 0.0176936 0 1.27377 0.0168159 0 1.26074 0.0159764 0
- 1.24837 0.015172 0 1.23662 0.0143996 0 1.22547 0.0136557 0 1.2149 0.0129368 0
- 1.2049 0.0122389 0 1.19544 0.0115578 0 1.18652 0.010889 0 1.17813 0.0102281 0
- 1.17027 0.00957102 0 1.16293 0.00891695 0 1.15612 0.00827388 0 1.14981 0.00767686 0
- 1.14392 0.00724126 0 1.13818 0.00732199 0 2.27451 0.1377 0 2.2096 0.132632 0
- 2.1515 0.127931 0 2.09552 0.12318 0 2.04191 0.118299 0 1.99078 0.113333 0
- 1.94211 0.108354 0 1.89585 0.103426 0 1.85191 0.0986013 0 1.8102 0.0939139 0
- 1.77061 0.0893878 0 1.73304 0.085038 0 1.69738 0.0808731 0 1.66353 0.0768965 0
- 1.63139 0.0731079 0 1.60087 0.0695037 0 1.57187 0.0660783 0 1.54432 0.0628249 0
- 1.51813 0.0597356 0 1.49323 0.0568025 0 1.46955 0.0540175 0 1.44702 0.0513728 0
- 1.4256 0.0488606 0 1.40521 0.046474 0 1.38581 0.0442058 0 1.36735 0.0420498 0
- 1.34978 0.0399997 0 1.33306 0.0380498 0 1.31714 0.0361944 0 1.302 0.0344283 0
- 1.28758 0.0327464 0 1.27387 0.0311437 0 1.26082 0.0296155 0 1.2484 0.0281569 0
- 1.2366 0.0267633 0 1.22537 0.0254299 0 1.21471 0.0241516 0 1.20458 0.0229236 0
- 1.19497 0.0217402 0 1.18585 0.0205958 0 1.17723 0.0194839 0 1.16908 0.0183979 0
- 1.1614 0.0173302 0 1.15418 0.0162731 0 1.14742 0.01522 0 1.14113 0.0141683 0
- 1.13531 0.0131292 0 1.12995 0.0121575 0 1.12499 0.0114411 0 1.12016 0.0115791 0
- 2.00245 0.180911 0 1.94895 0.175377 0 1.90186 0.169333 0 1.85651 0.162851 0
- 1.81327 0.1561 0 1.77227 0.149246 0 1.73346 0.142422 0 1.69677 0.13572 0
- 1.66209 0.129204 0 1.6293 0.122912 0 1.59829 0.116867 0 1.56896 0.111083 0
- 1.54119 0.105567 0 1.51489 0.100319 0 1.48997 0.0953333 0 1.46634 0.0906029 0
- 1.44391 0.0861173 0 1.42262 0.0818647 0 1.40239 0.077833 0 1.38316 0.0740099 0
- 1.36487 0.0703834 0 1.34747 0.0669422 0 1.33092 0.0636754 0 1.31517 0.060573 0
- 1.30017 0.0576254 0 1.28589 0.0548239 0 1.27229 0.0521601 0 1.25934 0.0496262 0
- 1.24701 0.0472149 0 1.23526 0.0449192 0 1.22408 0.0427323 0 1.21344 0.0406478 0
- 1.2033 0.0386594 0 1.19365 0.0367608 0 1.18448 0.0349459 0 1.17575 0.0332084 0
- 1.16745 0.0315419 0 1.15958 0.0299396 0 1.1521 0.0283945 0 1.14501 0.0268988 0
- 1.13831 0.0254442 0 1.13198 0.0240213 0 1.12602 0.0226199 0 1.12043 0.0212294 0
- 1.11522 0.0198396 0 1.11039 0.0184454 0 1.10595 0.0170594 0 1.1019 0.0157527 0
- 1.09819 0.0147814 0 1.09458 0.0149917 0 1.66784 0.213131 0 1.62973 0.207751 0
- 1.5971 0.200729 0 1.56576 0.19281 0 1.53607 0.184478 0 1.50811 0.176044 0
- 1.48182 0.167701 0 1.45711 0.159563 0 1.43387 0.151696 0 1.41201 0.144138 0
- 1.39144 0.136908 0 1.37205 0.130018 0 1.35377 0.123469 0 1.33652 0.117258 0
- 1.32021 0.111377 0 1.30478 0.105811 0 1.29016 0.100546 0 1.2763 0.0955636 0
- 1.26313 0.0908481 0 1.25063 0.0863827 0 1.23874 0.0821515 0 1.22743 0.0781398 0
- 1.21666 0.0743339 0 1.20641 0.0707211 0 1.19664 0.0672896 0 1.18734 0.0640287 0
- 1.17847 0.0609283 0 1.17002 0.0579789 0 1.16196 0.0551717 0 1.15428 0.0524985 0
- 1.14697 0.0499512 0 1.14 0.0475223 0 1.13336 0.0452044 0 1.12704 0.0429901 0
- 1.12102 0.0408721 0 1.1153 0.0388433 0 1.10985 0.0368958 0 1.10469 0.0350219 0
- 1.09979 0.033213 0 1.09515 0.0314599 0 1.09077 0.0297524 0 1.08664 0.0280792 0
- 1.08277 0.0264277 0 1.07915 0.0247841 0 1.0758 0.0231348 0 1.07273 0.0214717 0
- 1.06996 0.0198072 0 1.06748 0.0182262 0 1.06526 0.0170479 0 1.06308 0.0173543 0
- 1.29196 0.232334 0 1.27264 0.227314 0 1.25717 0.219648 0 1.24245 0.210737 0
- 1.22867 0.201327 0 1.21583 0.191836 0 1.20388 0.182498 0 1.19276 0.173432 0
- 1.1824 0.164702 0 1.17275 0.15634 0 1.16376 0.148362 0 1.15538 0.140779 0
- 1.14755 0.133592 0 1.14023 0.126797 0 1.13336 0.120379 0 1.1269 0.114321 0
- 1.12081 0.108603 0 1.11506 0.103203 0 1.1096 0.0981003 0 1.10443 0.0932745 0
- 1.09951 0.0887067 0 1.09483 0.0843794 0 1.09037 0.0802767 0 1.08611 0.0763838 0
- 1.08205 0.0726873 0 1.07818 0.0691751 0 1.07448 0.0658357 0 1.07095 0.0626588 0
- 1.06757 0.0596346 0 1.06435 0.0567539 0 1.06128 0.054008 0 1.05834 0.0513886 0
- 1.05555 0.0488877 0 1.05288 0.0464972 0 1.05034 0.0442093 0 1.04793 0.0420158 0
- 1.04564 0.0399086 0 1.04347 0.0378787 0 1.04142 0.0359169 0 1.03948 0.0340128 0
- 1.03767 0.032155 0 1.03598 0.0303304 0 1.03442 0.0285244 0 1.03299 0.0267207 0
- 1.03171 0.0249025 0 1.03059 0.0230586 0 1.02964 0.0212013 0 1.02888 0.0194271 0
- 1.02826 0.018112 0 1.02763 0.0185414 0 0.898652 0.237218 0 0.900596 0.232321 0
- 0.903873 0.224398 0 0.90716 0.215132 0 0.910426 0.205345 0 0.913657 0.195503 0
- 0.916834 0.185847 0 0.919953 0.176485 0 0.923024 0.167479 0 0.92606 0.158855 0
- 0.929073 0.150631 0 0.932063 0.142824 0 0.93502 0.135442 0 0.937927 0.128479 0
- 0.940764 0.121921 0 0.943514 0.115746 0 0.946166 0.109929 0 0.948711 0.104446 0
- 0.951146 0.0992724 0 0.953468 0.0943855 0 0.955677 0.0897642 0 0.957775 0.0853894 0
- 0.959764 0.0812438 0 0.96165 0.0773116 0 0.963434 0.0735787 0 0.965123 0.070032 0
- 0.966721 0.0666598 0 0.968233 0.0634512 0 0.969664 0.0603961 0 0.971019 0.0574851 0
- 0.972304 0.0547092 0 0.973522 0.0520598 0 0.974679 0.0495288 0 0.97578 0.0471079 0
- 0.97683 0.0447891 0 0.977833 0.0425639 0 0.978795 0.0404239 0 0.97972 0.0383598 0
- 0.980614 0.0363617 0 0.981483 0.0344189 0 0.982332 0.032519 0 0.983169 0.030648 0
- 0.984002 0.0287897 0 0.984841 0.0269259 0 0.985698 0.0250375 0 0.986587 0.023111 0
- 0.987522 0.021159 0 0.988512 0.0192894 0 0.98953 0.0179245 0 0.990451 0.018501 0
- 0.512656 0.227216 0 0.536883 0.222026 0 0.558955 0.214413 0 0.580082 0.205586 0
- 0.600147 0.196227 0 0.619173 0.186815 0 0.637187 0.177581 0 0.654259 0.168598 0
- 0.670477 0.159934 0 0.68592 0.151616 0 0.700663 0.143666 0 0.714759 0.13612 0
- 0.728236 0.128999 0 0.741105 0.122301 0 0.753379 0.11601 0 0.765074 0.110101 0
- 0.776207 0.104546 0 0.7868 0.0993183 0 0.796875 0.0943922 0 0.806456 0.0897438 0
- 0.815565 0.0853515 0 0.824225 0.0811957 0 0.832458 0.0772591 0 0.840286 0.073526 0
- 0.847728 0.0699823 0 0.854806 0.0666153 0 0.861537 0.0634135 0 0.867939 0.0603662 0
- 0.87403 0.0574637 0 0.879826 0.0546968 0 0.885342 0.052057 0 0.890594 0.0495359 0
- 0.895596 0.0471257 0 0.90036 0.0448184 0 0.904901 0.042606 0 0.909231 0.0404806 0
- 0.913362 0.0384335 0 0.917304 0.0364557 0 0.921071 0.0345374 0 0.924672 0.0326675 0
- 0.928119 0.0308336 0 0.931422 0.0290211 0 0.934593 0.0272133 0 0.937643 0.0253907 0
- 0.940585 0.0235334 0 0.943432 0.0216267 0 0.946194 0.0196852 0 0.948876 0.0178267 0
- 0.951458 0.016507 0 0.953877 0.0172461 0 0.15773 0.202507 0 0.202988 0.197057 0
- 0.242105 0.190431 0 0.279439 0.1828 0 0.314867 0.174619 0 0.348404 0.166373 0
- 0.380091 0.158262 0 0.410055 0.150288 0 0.438438 0.142564 0 0.465359 0.135095 0
- 0.490956 0.127914 0 0.515326 0.121099 0 0.538518 0.114686 0 0.560572 0.108676 0
- 0.581531 0.103049 0 0.601443 0.0977769 0 0.620358 0.0928309 0 0.638328 0.0881831 0
- 0.655402 0.083808 0 0.671628 0.0796825 0 0.687052 0.0757863 0 0.701717 0.0721011 0
- 0.715662 0.0686107 0 0.728927 0.0653006 0 0.741546 0.062158 0 0.753554 0.0591713 0
- 0.764982 0.0563301 0 0.775861 0.0536247 0 0.786219 0.0510464 0 0.796082 0.048587 0
- 0.805475 0.0462387 0 0.814424 0.043994 0 0.822949 0.0418458 0 0.831074 0.0397868 0
- 0.838817 0.0378098 0 0.846199 0.0359073 0 0.853238 0.0340712 0 0.859952 0.0322931 0
- 0.866356 0.0305635 0 0.872467 0.0288719 0 0.878299 0.0272059 0 0.883868 0.0255515 0
- 0.889186 0.0238918 0 0.894266 0.0222078 0 0.89912 0.0204794 0 0.903758 0.018693 0
- 0.908186 0.0168661 0 0.912405 0.0151252 0 0.916406 0.0139427 0 0.920189 0.0148484 0
- -0.145604 0.164412 0 -0.0837899 0.159365 0 -0.0304393 0.154149 0 0.0207822 0.148237 0
- 0.0694544 0.141901 0 0.115509 0.135417 0 0.159091 0.129003 0 0.200341 0.122576 0
- 0.239375 0.116342 0 0.276317 0.110225 0 0.311374 0.104262 0 0.344679 0.0986122 0
- 0.376292 0.0933276 0 0.40628 0.0884009 0 0.434719 0.0838054 0 0.461694 0.0795112 0
- 0.487287 0.0754893 0 0.511581 0.0717142 0 0.534649 0.0681628 0 0.556563 0.0648152 0
- 0.577389 0.0616538 0 0.597188 0.0586631 0 0.616017 0.0558296 0 0.633927 0.0531413 0
- 0.65097 0.0505876 0 0.667191 0.0481588 0 0.682633 0.0458465 0 0.697336 0.0436427 0
- 0.711338 0.0415403 0 0.724676 0.0395325 0 0.737383 0.037613 0 0.74949 0.0357755 0
- 0.761027 0.0340141 0 0.772022 0.0323225 0 0.782503 0.0306947 0 0.792494 0.029124 0
- 0.802019 0.0276035 0 0.8111 0.0261253 0 0.819759 0.0246811 0 0.828014 0.0232611 0
- 0.835885 0.0218539 0 0.843388 0.0204462 0 0.850538 0.0190225 0 0.857349 0.0175646 0
- 0.863831 0.0160542 0 0.86999 0.0144802 0 0.87583 0.012864 0 0.881349 0.0113372 0
- 0.886549 0.0103705 0 0.891498 0.0114346 0 -0.378789 0.115598 0 -0.306389 0.111761 0
- -0.242811 0.10821 0 -0.181649 0.10427 0 -0.123082 0.100076 0 -0.0671627 0.0956639 0
- -0.013822 0.091219 0 0.0368198 0.0868463 0 0.0845757 0.0826401 0 0.12963 0.0783302 0
- 0.172289 0.0739844 0 0.212714 0.0699057 0 0.250979 0.0661311 0 0.287193 0.0626366 0
- 0.321478 0.0593901 0 0.353958 0.056363 0 0.384747 0.0535308 0 0.413954 0.050873 0
- 0.441675 0.0483723 0 0.468 0.0460137 0 0.493013 0.0437843 0 0.516789 0.041673 0
- 0.539398 0.03967 0 0.560904 0.0377668 0 0.58137 0.0359559 0 0.600849 0.0342306 0
- 0.619394 0.032585 0 0.637054 0.0310134 0 0.653875 0.0295109 0 0.669898 0.0280727 0
- 0.685165 0.0266942 0 0.699713 0.0253708 0 0.713576 0.0240981 0 0.72679 0.0228714 0
- 0.739384 0.0216858 0 0.751389 0.0205361 0 0.762833 0.0194166 0 0.773741 0.0183206 0
- 0.784139 0.0172411 0 0.794048 0.0161694 0 0.803489 0.0150957 0 0.812481 0.0140082 0
- 0.82104 0.012893 0 0.829179 0.0117345 0 0.836906 0.0105171 0 0.844227 0.00923331 0
- 0.851139 0.00790871 0 0.857642 0.00667535 0 0.863754 0.00598273 0 0.869601 0.007186 0
- -0.526693 0.0595893 0 -0.449662 0.0574788 0 -0.379789 0.0557307 0 -0.312278 0.0538116 0
- -0.247362 0.0517477 0 -0.185221 0.0495442 0 -0.125983 0.0472764 0 -0.0696032 0.0451712 0
- -0.0159068 0.0431534 0 0.0349818 0.0410624 0 0.0829473 0.0387528 0 0.128163 0.0366243 0
- 0.170812 0.0346818 0 0.211086 0.0328954 0 0.249166 0.0312397 0 0.285208 0.0296958 0
- 0.319354 0.0282492 0 0.35173 0.0268885 0 0.38245 0.025604 0 0.411617 0.0243879 0
- 0.439326 0.0232335 0 0.465661 0.022135 0 0.490702 0.0210877 0 0.514522 0.0200874 0
- 0.537188 0.0191303 0 0.558763 0.0182133 0 0.579304 0.0173334 0 0.598865 0.016488 0
- 0.617497 0.0156745 0 0.635247 0.0148905 0 0.652158 0.0141335 0 0.668274 0.013401 0
- 0.683632 0.0126903 0 0.698269 0.0119985 0 0.712221 0.0113222 0 0.725518 0.0106577 0
- 0.738192 0.0100009 0 0.750271 0.00934658 0 0.761781 0.00868912 0 0.772747 0.00802162 0
- 0.78319 0.00733591 0 0.79313 0.00662225 0 0.802583 0.00586929 0 0.811562 0.00506445 0
- 0.820073 0.00419622 0 0.828118 0.00326176 0 0.835693 0.0022898 0 0.842799 0.00140711 0
- 0.849471 0.00102393 0 0.855882 0.00233866 0 -0.578014 -0.000103433 0 -0.500352 -0.000175394 0
- -0.428291 -0.000161587 0 -0.358552 -9.53661e-05 0 -0.291403 1.98095e-06 0 -0.227079 0.000117659 0
- -0.165743 0.000244394 0 -0.107345 0.000380624 0 -0.0517494 0.000510325 0 0.00119229 0.000641129 0
- 0.0512503 0.000755375 0 0.0982386 0.000858234 0 0.142462 0.00095022 0 0.184183 0.00103088 0
- 0.223609 0.00109973 0 0.260916 0.00115643 0 0.296255 0.00120075 0 0.329759 0.00123268 0
- 0.361548 0.00125232 0 0.391731 0.00125995 0 0.420404 0.00125596 0 0.447659 0.00124087 0
- 0.473576 0.00121525 0 0.498231 0.00117971 0 0.521694 0.00113485 0 0.544028 0.00108127 0
- 0.565295 0.00101945 0 0.585549 0.000949798 0 0.604842 0.000872552 0 0.623223 0.000787777 0
- 0.640737 0.000695312 0 0.657427 0.000594731 0 0.673334 0.000485294 0 0.688493 0.000365896 0
- 0.702942 0.000235003 0 0.716712 9.0578e-05 0 0.729836 -6.99993e-05 0 0.742341 -0.000250039 0
- 0.754255 -0.00045366 0 0.765603 -0.000685922 0 0.776405 -0.000952969 0 0.786681 -0.00126213 0
- 0.796448 -0.00162182 0 0.805715 -0.00204091 0 0.814488 -0.00252628 0 0.822768 -0.00307571 0
- 0.830549 -0.00365767 0 0.83783 -0.00415481 0 0.844653 -0.00421005 0 0.851223 -0.00281202 0
- -0.526768 -0.0597798 0 -0.449846 -0.0578014 0 -0.380056 -0.0560167 0 -0.312647 -0.0539577 0
- -0.247847 -0.0516953 0 -0.185827 -0.0492599 0 -0.126709 -0.0467415 0 -0.0704407 -0.0443666 0
- -0.0168465 -0.0420943 0 0.0339631 -0.0397553 0 0.0818719 -0.0372217 0 0.127043 -0.0348919 0
- 0.169657 -0.0327704 0 0.209911 -0.0308277 0 0.247981 -0.0290392 0 0.284027 -0.0273868 0
- 0.318189 -0.0258562 0 0.350592 -0.024436 0 0.381349 -0.0231163 0 0.410564 -0.0218887 0
- 0.438328 -0.0207456 0 0.464727 -0.0196804 0 0.489839 -0.0186869 0 0.513736 -0.0177599 0
- 0.536484 -0.0168943 0 0.558145 -0.0160858 0 0.578774 -0.0153305 0 0.598426 -0.014625 0
- 0.61715 -0.0139662 0 0.634992 -0.0133517 0 0.651995 -0.0127791 0 0.6682 -0.012247 0
- 0.683645 -0.011754 0 0.698366 -0.0112995 0 0.712397 -0.0108832 0 0.72577 -0.0105055 0
- 0.738513 -0.0101673 0 0.750654 -0.00987025 0 0.762219 -0.00961673 0 0.773231 -0.00940994 0
- 0.78371 -0.00925388 0 0.793674 -0.00915334 0 0.803136 -0.0091136 0 0.812107 -0.00913955 0
- 0.82059 -0.00923326 0 0.828584 -0.0093874 0 0.83608 -0.00956787 0 0.84308 -0.00966847 0
- 0.849625 -0.00939131 0 0.855926 -0.00792747 0 -0.378931 -0.115745 0 -0.306739 -0.112003 0
- -0.243311 -0.10839 0 -0.182337 -0.104291 0 -0.123979 -0.0998885 0 -0.0682788 -0.0952425 0
- -0.0151554 -0.0905522 0 0.0352929 -0.0859294 0 0.082888 -0.081483 0 0.127806 -0.0769489 0
- 0.170355 -0.0723944 0 0.210697 -0.0681289 0 0.248903 -0.0641898 0 0.28508 -0.0605534 0
- 0.319353 -0.0571884 0 0.351844 -0.0540665 0 0.382665 -0.0511634 0 0.411925 -0.0484587 0
- 0.439718 -0.0459344 0 0.466135 -0.043575 0 0.491255 -0.0413666 0 0.515153 -0.0392971 0
- 0.537897 -0.0373554 0 0.55955 -0.0355317 0 0.580171 -0.0338174 0 0.599813 -0.0322046 0
- 0.618526 -0.0306863 0 0.636358 -0.0292563 0 0.653352 -0.027909 0 0.669549 -0.0266397 0
- 0.684987 -0.0254441 0 0.699703 -0.0243185 0 0.713729 -0.02326 0 0.727099 -0.0222663 0
- 0.739842 -0.0213353 0 0.751985 -0.020466 0 0.763556 -0.0196577 0 0.774578 -0.0189104 0
- 0.785073 -0.0182249 0 0.795062 -0.0176024 0 0.804563 -0.017045 0 0.81359 -0.016555 0
- 0.822156 -0.0161345 0 0.830267 -0.0157847 0 0.837928 -0.015503 0 0.845134 -0.0152774 0
- 0.85188 -0.0150719 0 0.858165 -0.0147919 0 0.864031 -0.0141975 0 0.869677 -0.0126787 0
- -0.145792 -0.164499 0 -0.084254 -0.159486 0 -0.0311113 -0.154164 0 0.0198549 -0.148069 0
- 0.0682519 -0.141514 0 0.114027 -0.134797 0 0.157343 -0.128149 0 0.198353 -0.121499 0
- 0.237178 -0.115049 0 0.273946 -0.108732 0 0.308864 -0.102585 0 0.342065 -0.0967723 0
- 0.373608 -0.0913459 0 0.403559 -0.0862996 0 0.431992 -0.0816074 0 0.458992 -0.0772393 0
- 0.48464 -0.0731667 0 0.509016 -0.0693636 0 0.532193 -0.0658064 0 0.554241 -0.0624744 0
- 0.575223 -0.0593488 0 0.595198 -0.056413 0 0.61422 -0.0536522 0 0.632339 -0.0510529 0
- 0.649602 -0.0486033 0 0.666052 -0.0462927 0 0.68173 -0.0441116 0 0.696674 -0.0420514 0
- 0.710918 -0.0401046 0 0.724497 -0.0382644 0 0.737441 -0.0365249 0 0.749779 -0.0348807 0
- 0.761539 -0.0333275 0 0.772748 -0.0318614 0 0.783429 -0.0304791 0 0.793605 -0.029178 0
- 0.803298 -0.0279562 0 0.812527 -0.0268123 0 0.821309 -0.0257455 0 0.829662 -0.0247554 0
- 0.837599 -0.0238422 0 0.845132 -0.0230059 0 0.85227 -0.0222462 0 0.859018 -0.0215608 0
- 0.865378 -0.0209434 0 0.871349 -0.0203783 0 0.876925 -0.0198288 0 0.882111 -0.0192118 0
- 0.886946 -0.018339 0 0.891605 -0.0167806 0 0.157527 -0.20253 0 0.202481 -0.197028 0
- 0.241358 -0.190238 0 0.278396 -0.182398 0 0.313506 -0.173991 0 0.346731 -0.165521 0
- 0.378128 -0.157196 0 0.407833 -0.149024 0 0.435995 -0.141113 0 0.462736 -0.133475 0
- 0.488193 -0.126142 0 0.512464 -0.119193 0 0.535596 -0.112667 0 0.557629 -0.106565 0
- 0.578604 -0.100868 0 0.598567 -0.0955486 0 0.617568 -0.090577 0 0.635657 -0.0859249 0
- 0.65288 -0.0815662 0 0.669285 -0.0774766 0 0.684913 -0.0736345 0 0.699804 -0.0700202 0
- 0.713996 -0.066616 0 0.727524 -0.0634062 0 0.740419 -0.0603766 0 0.752712 -0.0575145 0
- 0.764433 -0.0548085 0 0.775606 -0.0522483 0 0.786259 -0.049825 0 0.796413 -0.0475304 0
- 0.806093 -0.0453572 0 0.815318 -0.043299 0 0.824108 -0.0413501 0 0.832483 -0.0395055 0
- 0.840459 -0.0377609 0 0.848053 -0.0361126 0 0.855281 -0.0345577 0 0.862155 -0.0330934 0
- 0.868689 -0.0317178 0 0.874894 -0.0304292 0 0.880779 -0.0292261 0 0.886352 -0.0281067 0
- 0.891618 -0.0270687 0 0.896582 -0.0261075 0 0.901243 -0.0252142 0 0.905602 -0.0243712 0
- 0.909659 -0.0235429 0 0.913423 -0.0226575 0 0.916934 -0.02157 0 0.920332 -0.0199947 0
- 0.512475 -0.227179 0 0.536409 -0.221828 0 0.558223 -0.21399 0 0.579033 -0.204925 0
- 0.598769 -0.19534 0 0.617482 -0.185721 0 0.635216 -0.1763 0 0.652048 -0.167149 0
- 0.66807 -0.158334 0 0.683361 -0.14988 0 0.697996 -0.141811 0 0.712027 -0.134165 0
- 0.725479 -0.126962 0 0.738365 -0.120204 0 0.750694 -0.113873 0 0.762481 -0.107945 0
- 0.773744 -0.102392 0 0.784501 -0.0971865 0 0.794773 -0.0923011 0 0.80458 -0.0877107 0
- 0.813941 -0.0833921 0 0.822877 -0.0793242 0 0.831405 -0.0754881 0 0.839543 -0.0718665 0
- 0.847308 -0.0684442 0 0.854715 -0.0652073 0 0.861779 -0.0621434 0 0.868516 -0.0592414 0
- 0.874937 -0.0564912 0 0.881057 -0.053884 0 0.886888 -0.0514116 0 0.892441 -0.0490669 0
- 0.897727 -0.0468435 0 0.902758 -0.0447357 0 0.907541 -0.0427384 0 0.912087 -0.0408472 0
- 0.916403 -0.0390582 0 0.920498 -0.037368 0 0.924377 -0.0357737 0 0.928046 -0.0342724 0
- 0.93151 -0.0328616 0 0.934771 -0.0315383 0 0.937831 -0.0302986 0 0.940691 -0.0291368 0
- 0.943353 -0.028043 0 0.945815 -0.0269999 0 0.948085 -0.0259756 0 0.950177 -0.0249098 0
- 0.952134 -0.0236917 0 0.95406 -0.0221319 0 0.898516 -0.237131 0 0.900213 -0.231946 0
- 0.903226 -0.223733 0 0.906201 -0.214211 0 0.909158 -0.204209 0 0.912113 -0.194188 0
- 0.915063 -0.184381 0 0.918004 -0.174888 0 0.920946 -0.165766 0 0.923897 -0.157042 0
- 0.926867 -0.148733 0 0.929857 -0.140859 0 0.932853 -0.133427 0 0.935836 -0.126434 0
- 0.938787 -0.119867 0 0.941689 -0.113702 0 0.944528 -0.107916 0 0.947293 -0.102481 0
- 0.949978 -0.0973721 0 0.952578 -0.0925648 0 0.955089 -0.0880359 0 0.957509 -0.0837647 0
- 0.959836 -0.079732 0 0.962071 -0.0759207 0 0.964213 -0.0723152 0 0.966262 -0.0689016 0
- 0.96822 -0.0656672 0 0.970088 -0.0626008 0 0.971866 -0.0596921 0 0.973557 -0.056932 0
- 0.975162 -0.0543123 0 0.976683 -0.0518255 0 0.978122 -0.0494648 0 0.979479 -0.0472244 0
- 0.980757 -0.0450987 0 0.981956 -0.0430829 0 0.983077 -0.0411727 0 0.98412 -0.0393641 0
- 0.985086 -0.0376537 0 0.985974 -0.0360379 0 0.986782 -0.0345135 0 0.987509 -0.0330767 0
- 0.988153 -0.0317232 0 0.98871 -0.0304468 0 0.989181 -0.0292384 0 0.989567 -0.0280832 0
- 0.989876 -0.0269555 0 0.990131 -0.0258082 0 0.990377 -0.0245556 0 0.990684 -0.0230541 0
- 1.29189 -0.232203 0 1.2724 -0.226759 0 1.25667 -0.218744 0 1.24166 -0.209577 0
- 1.22763 -0.199983 0 1.21461 -0.190358 0 1.20254 -0.180913 0 1.19135 -0.171757 0
- 1.18097 -0.162948 0 1.17134 -0.154518 0 1.16241 -0.146487 0 1.15412 -0.138865 0
- 1.14642 -0.131658 0 1.13926 -0.124861 0 1.13258 -0.118462 0 1.12635 -0.112442 0
- 1.12052 -0.10678 0 1.11505 -0.101452 0 1.1099 -0.0964349 0 1.10506 -0.091707 0
- 1.10049 -0.0872468 0 1.09617 -0.0830348 0 1.09208 -0.0790534 0 1.08821 -0.0752863 0
- 1.08453 -0.0717189 0 1.08103 -0.068338 0 1.0777 -0.0651317 0 1.07452 -0.0620893 0
- 1.07149 -0.0592011 0 1.06859 -0.0564583 0 1.06582 -0.0538529 0 1.06316 -0.0513778 0
- 1.06062 -0.0490264 0 1.05817 -0.0467929 0 1.05582 -0.0446717 0 1.05356 -0.0426581 0
- 1.05138 -0.0407476 0 1.04927 -0.0389361 0 1.04722 -0.0372197 0 1.04524 -0.0355949 0
- 1.04331 -0.0340579 0 1.04142 -0.032605 0 1.03957 -0.0312316 0 1.03776 -0.0299325 0
- 1.03597 -0.0287002 0 1.03422 -0.0275243 0 1.0325 -0.0263875 0 1.03084 -0.0252577 0
- 1.0293 -0.0240682 0 1.02792 -0.0226785 0 1.66786 -0.212958 0 1.62967 -0.207011 0
- 1.59679 -0.199607 0 1.56524 -0.191468 0 1.53542 -0.183015 0 1.50742 -0.174507 0
- 1.48117 -0.166108 0 1.45656 -0.157919 0 1.43346 -0.150004 0 1.41176 -0.142404 0
- 1.39138 -0.135144 0 1.3722 -0.128238 0 1.35416 -0.121692 0 1.33717 -0.115504 0
- 1.32115 -0.109664 0 1.30603 -0.104158 0 1.29175 -0.0989691 0 1.27824 -0.0940772 0
- 1.26545 -0.089463 0 1.25333 -0.0851074 0 1.24183 -0.0809924 0 1.23091 -0.0771011 0
- 1.22054 -0.0734181 0 1.21067 -0.0699293 0 1.20129 -0.0666218 0 1.19235 -0.0634842 0
- 1.18383 -0.060506 0 1.17571 -0.0576776 0 1.16796 -0.0549905 0 1.16057 -0.0524369 0
- 1.15351 -0.0500097 0 1.14677 -0.0477023 0 1.14032 -0.0455088 0 1.13416 -0.0434238 0
- 1.12826 -0.0414423 0 1.12261 -0.0395597 0 1.11721 -0.0377719 0 1.11202 -0.0360748 0
- 1.10704 -0.0344648 0 1.10226 -0.0329382 0 1.09766 -0.0314916 0 1.09324 -0.0301214 0
- 1.08897 -0.0288236 0 1.08485 -0.0275939 0 1.08087 -0.0264277 0 1.07703 -0.0253195 0
- 1.07334 -0.0242617 0 1.06981 -0.0232384 0 1.06649 -0.0222 0 1.06343 -0.0209836 0
- 2.00261 -0.180689 0 1.94914 -0.174443 0 1.90185 -0.168047 0 1.85642 -0.161443 0
- 1.81327 -0.154667 0 1.77246 -0.14781 0 1.73392 -0.140975 0 1.69754 -0.13425 0
- 1.66317 -0.127702 0 1.63071 -0.121381 0 1.60004 -0.115319 0 1.57105 -0.109534 0
- 1.54364 -0.104036 0 1.51772 -0.0988266 0 1.49319 -0.0938991 0 1.46996 -0.0892436 0
- 1.44794 -0.0848467 0 1.42707 -0.0806938 0 1.40727 -0.0767694 0 1.38846 -0.0730587 0
- 1.37059 -0.0695472 0 1.3536 -0.0662217 0 1.33744 -0.0630699 0 1.32206 -0.0600805 0
- 1.30741 -0.0572433 0 1.29346 -0.0545491 0 1.28016 -0.0519894 0 1.26748 -0.0495565 0
- 1.25539 -0.0472435 0 1.24386 -0.0450439 0 1.23286 -0.0429519 0 1.22235 -0.040962 0
- 1.21232 -0.0390693 0 1.20274 -0.0372692 0 1.19359 -0.0355574 0 1.18485 -0.03393 0
- 1.17648 -0.0323834 0 1.16848 -0.0309139 0 1.16083 -0.0295185 0 1.15349 -0.0281938 0
- 1.14647 -0.0269369 0 1.13973 -0.0257445 0 1.13326 -0.0246137 0 1.12705 -0.0235414 0
- 1.12109 -0.0225253 0 1.11535 -0.0215646 0 1.10986 -0.020661 0 1.1046 -0.0198144 0
- 1.09963 -0.0189954 0 1.09499 -0.0180191 0 2.27486 -0.137404 0 2.21021 -0.131517 0
- 2.15206 -0.126622 0 2.0963 -0.121918 0 2.04311 -0.117122 0 1.99249 -0.112207 0
- 1.94434 -0.107233 0 1.8986 -0.102283 0 1.85515 -0.0974229 0 1.81392 -0.0927053 0
- 1.7748 -0.0881639 0 1.73771 -0.0838191 0 1.70253 -0.0796808 0 1.66916 -0.0757514 0
- 1.63751 -0.0720276 0 1.60747 -0.0685024 0 1.57896 -0.0651663 0 1.55188 -0.0620091 0
- 1.52614 -0.05902 0 1.50167 -0.0561883 0 1.4784 -0.0535041 0 1.45626 -0.0509579 0
- 1.43518 -0.0485411 0 1.4151 -0.0462459 0 1.39598 -0.044065 0 1.37777 -0.0419918 0
- 1.36041 -0.0400203 0 1.34386 -0.038145 0 1.32808 -0.0363609 0 1.31303 -0.0346631 0
- 1.29868 -0.0330475 0 1.28499 -0.03151 0 1.27192 -0.0300468 0 1.25946 -0.0286546 0
- 1.24756 -0.0273299 0 1.23619 -0.0260698 0 1.22534 -0.0248715 0 1.21497 -0.0237321 0
- 1.20507 -0.0226492 0 1.1956 -0.0216202 0 1.18654 -0.0206427 0 1.17787 -0.0197144 0
- 1.16957 -0.018833 0 1.16163 -0.0179967 0 1.15401 -0.0172048 0 1.14671 -0.0164594 0
- 1.13971 -0.0157678 0 1.13301 -0.0151435 0 1.12663 -0.0145831 0 1.12062 -0.0139129 0
- 2.46739 -0.0857453 0 2.39626 -0.0813146 0 2.33142 -0.0784365 0 2.26929 -0.0757859 0
- 2.20966 -0.0730103 0 2.1525 -0.0700821 0 2.09777 -0.0670646 0 2.04549 -0.0640303 0
- 1.99564 -0.0610376 0 1.94817 -0.0581262 0 1.90301 -0.055321 0 1.86007 -0.0526355 0
- 1.81927 -0.0500758 0 1.78049 -0.0476426 0 1.74364 -0.0453334 0 1.7086 -0.0431434 0
- 1.6753 -0.0410671 0 1.64362 -0.039098 0 1.61348 -0.03723 0 1.58479 -0.035457 0
- 1.55749 -0.0337732 0 1.53149 -0.0321733 0 1.50672 -0.0306525 0 1.48314 -0.0292062 0
- 1.46066 -0.0278304 0 1.43925 -0.0265212 0 1.41884 -0.0252752 0 1.39939 -0.0240891 0
- 1.38085 -0.0229599 0 1.36317 -0.0218848 0 1.34631 -0.0208612 0 1.33024 -0.0198866 0
- 1.31492 -0.0189588 0 1.3003 -0.0180754 0 1.28636 -0.0172346 0 1.27306 -0.0164343 0
- 1.26037 -0.0156727 0 1.24826 -0.0149482 0 1.2367 -0.0142589 0 1.22566 -0.0136035 0
- 1.21512 -0.0129802 0 1.20505 -0.0123876 0 1.19543 -0.0118244 0 1.18623 -0.0112895 0
- 1.17743 -0.0107829 0 1.16901 -0.0103067 0 1.16095 -0.00986863 0 1.15321 -0.00948667 0
- 1.14577 -0.00918296 0 1.13871 -0.00886301 0 2.56881 -0.0290946 0 2.49702 -0.0274085 0
- 2.42959 -0.0265336 0 2.36427 -0.0257228 0 2.30109 -0.024827 0 2.24024 -0.0238515 0
- 2.18188 -0.0228325 0 2.12609 -0.0218037 0 2.07285 -0.0207891 0 2.02211 -0.0198035 0
- 1.97378 -0.0188554 0 1.92778 -0.0179488 0 1.88398 -0.0170849 0 1.8423 -0.0162635 0
- 1.80262 -0.0154834 0 1.76483 -0.0147427 0 1.72886 -0.0140393 0 1.69459 -0.0133713 0
- 1.66196 -0.0127366 0 1.63087 -0.0121333 0 1.60125 -0.0115595 0 1.57304 -0.0110137 0
- 1.54615 -0.0104942 0 1.52053 -0.00999981 0 1.49612 -0.00952907 0 1.47286 -0.00908083 0
- 1.45069 -0.00865396 0 1.42957 -0.00824741 0 1.40943 -0.00786019 0 1.39024 -0.00749139 0
- 1.37195 -0.00714012 0 1.35452 -0.00680557 0 1.3379 -0.00648694 0 1.32207 -0.00618352 0
- 1.30697 -0.00589458 0 1.29258 -0.00561948 0 1.27886 -0.00535757 0 1.26577 -0.00510826 0
- 1.2533 -0.00487098 0 1.2414 -0.00464517 0 1.23006 -0.00443029 0 1.21924 -0.00422584 0
- 1.20892 -0.00403137 0 1.19907 -0.00384651 0 1.18967 -0.00367125 0 1.1807 -0.00350638 0
- 1.17212 -0.00335499 0 1.1639 -0.00322558 0 1.15595 -0.0031347 0 1.1482 -0.0030653 0
+ <DataArray type="Float32" Name="velocity_c (m/s)" NumberOfComponents="3" format="ascii">
+ 2.56902 0.029554 0 2.49712 0.0276693 0 2.42921 0.0266607 0 2.36367 0.0257708 0
+ 2.30042 0.0248317 0 2.23959 0.0238343 0 2.18129 0.0228058 0 2.12556 0.0217742 0
+ 2.07239 0.0207602 0 2.02172 0.019777 0 1.97346 0.0188318 0 1.92751 0.0179282 0
+ 1.88377 0.0170673 0 1.84212 0.0162486 0 1.80247 0.0154708 0 1.76472 0.0147321 0
+ 1.72877 0.0140305 0 1.69452 0.013364 0 1.6619 0.0127305 0 1.63083 0.0121282 0
+ 1.60123 0.0115552 0 1.57302 0.0110101 0 1.54614 0.0104913 0 1.52053 0.00999733 0
+ 1.49613 0.00952701 0 1.47287 0.00907911 0 1.45071 0.00865253 0 1.42958 0.00824623 0
+ 1.40945 0.00785924 0 1.39026 0.00749063 0 1.37197 0.00713954 0 1.35454 0.00680514 0
+ 1.33793 0.00648666 0 1.32209 0.00618338 0 1.30699 0.00589458 0 1.2926 0.00561962 0
+ 1.27888 0.00535786 0 1.2658 0.0051087 0 1.25332 0.00487158 0 1.24142 0.00464592 0
+ 1.23008 0.00443122 0 1.21926 0.00422694 0 1.20893 0.00403262 0 1.19908 0.00384789 0
+ 1.18968 0.0036727 0 1.1807 0.00350779 0 1.17212 0.00335617 0 1.1639 0.00322621 0
+ 1.15595 0.00313439 0 1.1482 0.00306408 0 2.46762 0.0870729 0 2.39637 0.0821149 0
+ 2.33096 0.078871 0 2.26847 0.0759864 0 2.20866 0.0730689 0 2.15141 0.0700591 0
+ 2.09669 0.0669979 0 2.04446 0.0639433 0 1.99469 0.060944 0 1.94731 0.058034 0
+ 1.90225 0.0552345 0 1.85941 0.0525568 0 1.8187 0.0500055 0 1.78 0.0475808 0
+ 1.74323 0.0452796 0 1.70826 0.043097 0 1.67501 0.0410272 0 1.64339 0.0390639 0
+ 1.61329 0.0372009 0 1.58465 0.0354322 0 1.55737 0.0337521 0 1.5314 0.0321554 0
+ 1.50667 0.0306372 0 1.4831 0.0291933 0 1.46064 0.0278194 0 1.43925 0.0265119 0
+ 1.41885 0.0252674 0 1.39941 0.0240825 0 1.38088 0.0229545 0 1.36321 0.0218803 0
+ 1.34636 0.0208576 0 1.3303 0.0198838 0 1.31498 0.0189567 0 1.30036 0.018074 0
+ 1.28642 0.0172339 0 1.27312 0.0164343 0 1.26043 0.0156734 0 1.24832 0.0149495 0
+ 1.23676 0.0142611 0 1.22572 0.0136063 0 1.21517 0.0129838 0 1.2051 0.012392 0
+ 1.19547 0.0118296 0 1.18626 0.0112954 0 1.17746 0.0107892 0 1.16903 0.010313 0
+ 1.16096 0.00987423 0 1.15321 0.00949044 0 1.14577 0.00918343 0 1.13871 0.00885996 0
+ 2.27507 0.139466 0 2.21034 0.132825 0 2.1517 0.127399 0 2.0956 0.122332 0
+ 2.0422 0.117297 0 1.99145 0.112229 0 1.94325 0.107162 0 1.8975 0.102158 0
+ 1.8541 0.0972716 0 1.81293 0.0925443 0 1.77389 0.088004 0 1.73688 0.0836666 0
+ 1.70179 0.0795395 0 1.66851 0.0756229 0 1.63695 0.0719124 0 1.60699 0.0684002 0
+ 1.57855 0.0650764 0 1.55153 0.0619305 0 1.52586 0.0589515 0 1.50144 0.0561289 0
+ 1.47822 0.0534526 0 1.45611 0.0509134 0 1.43507 0.0485028 0 1.41503 0.0462129 0
+ 1.39594 0.0440366 0 1.37775 0.0419674 0 1.36041 0.0399994 0 1.34388 0.0381272 0
+ 1.32812 0.0363458 0 1.31308 0.0346505 0 1.29874 0.0330371 0 1.28506 0.0315016 0
+ 1.27201 0.0300403 0 1.25954 0.0286498 0 1.24765 0.0273269 0 1.23629 0.0260685 0
+ 1.22544 0.0248718 0 1.21507 0.0237342 0 1.20516 0.022653 0 1.19569 0.0216259 0
+ 1.18663 0.0206503 0 1.17795 0.0197239 0 1.16965 0.0188443 0 1.16169 0.0180097 0
+ 1.15407 0.0172191 0 1.14675 0.0164742 0 1.13974 0.0157817 0 1.13303 0.0151544 0
+ 1.12663 0.0145881 0 1.12062 0.0139105 0 2.00279 0.183281 0 1.94931 0.176133 0
+ 1.90169 0.169105 0 1.85599 0.162058 0 1.81264 0.154975 0 1.7717 0.147911 0
+ 1.73307 0.140938 0 1.69664 0.134125 0 1.66227 0.127526 0 1.62983 0.121177 0
+ 1.5992 0.115104 0 1.57027 0.109321 0 1.54292 0.103832 0 1.51707 0.0986348 0
+ 1.49261 0.0937226 0 1.46945 0.0890833 0 1.4475 0.0847026 0 1.4267 0.0805652 0
+ 1.40695 0.0766554 0 1.3882 0.072958 0 1.37038 0.0694587 0 1.35343 0.0661441 0
+ 1.33731 0.063002 0 1.32197 0.0600213 0 1.30736 0.0571918 0 1.29343 0.0545043 0
+ 1.28016 0.0519506 0 1.26751 0.0495231 0 1.25544 0.0472149 0 1.24392 0.0450196 0
+ 1.23294 0.0429315 0 1.22244 0.0409452 0 1.21243 0.0390559 0 1.20286 0.037259 0
+ 1.19371 0.0355503 0 1.18497 0.033926 0 1.17661 0.0323823 0 1.16861 0.030916 0
+ 1.16095 0.0295237 0 1.15362 0.0282023 0 1.14659 0.0269487 0 1.13984 0.0257598 0
+ 1.13337 0.0246324 0 1.12715 0.0235633 0 1.12117 0.02255 0 1.11542 0.0215909 0
+ 1.10991 0.020687 0 1.10464 0.0198369 0 1.09965 0.01901 0 1.09499 0.0180216 0
+ 1.66803 0.215812 0 1.62992 0.208921 0 1.59688 0.200855 0 1.56515 0.192243 0
+ 1.53517 0.183451 0 1.50704 0.174701 0 1.48068 0.166132 0 1.45599 0.157827 0
+ 1.43285 0.149836 0 1.41114 0.142189 0 1.39075 0.134904 0 1.3716 0.127989 0
+ 1.35359 0.121445 0 1.33664 0.115265 0 1.32067 0.109439 0 1.3056 0.10395 0
+ 1.29136 0.0987777 0 1.27791 0.0939034 0 1.26517 0.0893063 0 1.25309 0.084967 0
+ 1.24164 0.0808672 0 1.23077 0.0769898 0 1.22043 0.0733196 0 1.21061 0.0698423 0
+ 1.20125 0.0665452 0 1.19234 0.063417 0 1.18385 0.0604472 0 1.17575 0.0576265 0
+ 1.16803 0.0549463 0 1.16066 0.052399 0 1.15361 0.0499775 0 1.14688 0.0476755 0
+ 1.14045 0.045487 0 1.1343 0.0434068 0 1.12841 0.0414299 0 1.12277 0.0395519 0
+ 1.11736 0.0377686 0 1.11218 0.0360761 0 1.1072 0.0344708 0 1.10242 0.0329493 0
+ 1.09782 0.0315078 0 1.09338 0.0301429 0 1.08911 0.0288505 0 1.08498 0.0276261 0
+ 1.08098 0.0264646 0 1.07713 0.0253599 0 1.07341 0.0243033 0 1.06986 0.0232772 0
+ 1.06652 0.0222297 0 1.06343 0.0209955 0 1.29205 0.235012 0 1.27273 0.228714 0
+ 1.25699 0.220087 0 1.2419 0.210465 0 1.22775 0.200529 0 1.21461 0.190647 0
+ 1.20243 0.181013 0 1.19115 0.171719 0 1.18071 0.162814 0 1.17103 0.15432 0
+ 1.16207 0.146249 0 1.15377 0.138606 0 1.14607 0.131392 0 1.13893 0.124597 0
+ 1.13227 0.118207 0 1.12607 0.112201 0 1.12027 0.106554 0 1.11483 0.101244 0
+ 1.10972 0.0962445 0 1.10491 0.0915339 0 1.10038 0.0870903 0 1.09609 0.0828942 0
+ 1.09203 0.0789274 0 1.08819 0.0751739 0 1.08454 0.071619 0 1.08106 0.0682495 0
+ 1.07775 0.0650537 0 1.0746 0.0620209 0 1.07159 0.0591414 0 1.06871 0.0564067 0
+ 1.06595 0.0538088 0 1.06331 0.0513407 0 1.06078 0.0489959 0 1.05834 0.0467687 0
+ 1.056 0.0446537 0 1.05374 0.0426462 0 1.05156 0.0407418 0 1.04945 0.0389365 0
+ 1.04741 0.0372266 0 1.04542 0.0356085 0 1.04349 0.0340786 0 1.0416 0.0326331 0
+ 1.03974 0.0312674 0 1.03791 0.0299759 0 1.03611 0.028751 0 1.03433 0.0275812 0
+ 1.03259 0.0264482 0 1.03091 0.0253174 0 1.02934 0.0241185 0 1.02793 0.0227041 0
+ 0.898638 0.23959 0 0.900569 0.23379 0 0.903712 0.225087 0 0.906678 0.215163 0
+ 0.909567 0.204838 0 0.912433 0.194561 0 0.91529 0.184556 0 0.918145 0.174914 0
+ 0.921014 0.165681 0 0.923907 0.156879 0 0.926833 0.148518 0 0.929791 0.140611 0
+ 0.932768 0.133163 0 0.935743 0.126165 0 0.938693 0.119601 0 0.941601 0.113445 0
+ 0.944451 0.107672 0 0.947232 0.102252 0 0.949935 0.0971599 0 0.952554 0.0923694 0
+ 0.955086 0.0878573 0 0.957528 0.0836023 0 0.959877 0.0795851 0 0.962132 0.0757885 0
+ 0.964294 0.0721967 0 0.966363 0.0687957 0 0.968339 0.0655732 0 0.970223 0.0625177 0
+ 0.972017 0.0596192 0 0.973722 0.0568686 0 0.97534 0.0542578 0 0.976871 0.0517793 0
+ 0.978319 0.0494267 0 0.979684 0.0471939 0 0.980968 0.0450758 0 0.982171 0.0430675 0
+ 0.983295 0.0411649 0 0.98434 0.0393641 0 0.985305 0.0376617 0 0.986189 0.0360545 0
+ 0.986992 0.0345391 0 0.987711 0.0331119 0 0.988344 0.0317685 0 0.988887 0.0305025 0
+ 0.98934 0.0293046 0 0.989703 0.028159 0 0.989985 0.0270385 0 0.990208 0.0258932 0
+ 0.990419 0.0246316 0 0.990696 0.0230974 0 0.512534 0.229051 0 0.536695 0.22345 0
+ 0.558734 0.215282 0 0.579616 0.20589 0 0.599349 0.196014 0 0.618022 0.186153 0
+ 0.635698 0.176537 0 0.652467 0.167233 0 0.668427 0.1583 0 0.683662 0.149758 0
+ 0.698249 0.141628 0 0.712241 0.133941 0 0.725661 0.126715 0 0.738522 0.119945 0
+ 0.750834 0.113611 0 0.76261 0.107688 0 0.773866 0.102144 0 0.784621 0.096951 0
+ 0.794895 0.0920798 0 0.804706 0.0875046 0 0.814075 0.0832017 0 0.823019 0.0791494 0
+ 0.831557 0.0753286 0 0.839705 0.0717218 0 0.847481 0.0683135 0 0.854898 0.0650899 0
+ 0.861973 0.0620384 0 0.868719 0.0591481 0 0.87515 0.056409 0 0.881279 0.0538122 0
+ 0.887117 0.0513496 0 0.892676 0.0490143 0 0.897968 0.0468 0 0.903003 0.044701 0
+ 0.907789 0.0427124 0 0.912337 0.0408299 0 0.916654 0.0390497 0 0.920748 0.0373687 0
+ 0.924625 0.0357839 0 0.928289 0.0342928 0 0.931746 0.032893 0 0.934998 0.0315814 0
+ 0.938046 0.0303544 0 0.940891 0.0292059 0 0.943533 0.0281261 0 0.945971 0.0270966 0
+ 0.94821 0.0260839 0 0.950266 0.0250242 0 0.952183 0.0237982 0 0.954074 0.0221962 0
+ 0.157467 0.203753 0 0.202558 0.198358 0 0.24174 0.191397 0 0.278942 0.183308 0
+ 0.314134 0.174656 0 0.347388 0.165971 0 0.378779 0.157465 0 0.40846 0.149145 0
+ 0.436586 0.141118 0 0.463287 0.13339 0 0.488705 0.125992 0 0.512936 0.118998 0
+ 0.536032 0.112444 0 0.558031 0.106327 0 0.578977 0.100624 0 0.598915 0.0953044 0
+ 0.617896 0.0903382 0 0.635968 0.0856952 0 0.653179 0.0813479 0 0.669574 0.0772713 0
+ 0.685195 0.0734431 0 0.700082 0.069843 0 0.714272 0.0664531 0 0.727798 0.0632574 0
+ 0.740694 0.0602413 0 0.752988 0.0573923 0 0.76471 0.0546987 0 0.775886 0.0521505 0
+ 0.78654 0.0497385 0 0.796696 0.0474547 0 0.806377 0.0452918 0 0.815603 0.0432436 0
+ 0.824394 0.0413043 0 0.832769 0.0394692 0 0.840745 0.0377342 0 0.848338 0.0360955 0
+ 0.855563 0.0345504 0 0.862433 0.0330964 0 0.868963 0.0317317 0 0.875161 0.0304547 0
+ 0.881038 0.0292643 0 0.8866 0.0281588 0 0.891853 0.0271359 0 0.8968 0.0261911 0
+ 0.90144 0.0253155 0 0.905773 0.0244906 0 0.909797 0.0236792 0 0.913521 0.0228046 0
+ 0.916988 0.0217108 0 0.920347 0.020083 0 -0.146012 0.16522 0 -0.0844795 0.160488 0
+ -0.030966 0.155111 0 0.0202635 0.148848 0 0.0688346 0.142105 0 0.114718 0.135212 0
+ 0.158093 0.12841 0 0.199126 0.121629 0 0.23795 0.115075 0 0.274702 0.108671 0
+ 0.309596 0.102463 0 0.342765 0.0966072 0 0.374273 0.0911525 0 0.404186 0.0860889 0
+ 0.432583 0.0813877 0 0.459549 0.0770173 0 0.485166 0.0729472 0 0.509513 0.0691503 0
+ 0.532666 0.0656019 0 0.554692 0.0622804 0 0.575655 0.0591666 0 0.595613 0.0562432 0
+ 0.614621 0.0534951 0 0.632728 0.0509086 0 0.649981 0.0484715 0 0.666422 0.0461732 0
+ 0.682093 0.044004 0 0.697029 0.0419553 0 0.711268 0.0400196 0 0.724841 0.0381901 0
+ 0.73778 0.0364609 0 0.750113 0.0348269 0 0.761869 0.0332836 0 0.773073 0.0318273 0
+ 0.783749 0.0304549 0 0.793919 0.0291639 0 0.803606 0.0279526 0 0.812828 0.0268198 0
+ 0.821603 0.0257648 0 0.829947 0.0247876 0 0.837874 0.0238886 0 0.845395 0.023068 0
+ 0.852518 0.0223258 0 0.859248 0.0216599 0 0.865586 0.021064 0 0.871529 0.0205218 0
+ 0.877071 0.0199947 0 0.882215 0.019394 0 0.887004 0.0185171 0 0.891622 0.0168949 0
+ -0.379289 0.116155 0 -0.307247 0.112669 0 -0.243426 0.109061 0 -0.182115 0.104866 0
+ -0.123498 0.100336 0 -0.0676083 0.0955624 0 -0.0143541 0.0907566 0 0.0361716 0.0860354 0
+ 0.0838004 0.0815063 0 0.128729 0.0768951 0 0.171271 0.0722901 0 0.21159 0.0679891 0
+ 0.249764 0.0640255 0 0.285904 0.0603733 0 0.320137 0.0569993 0 0.352586 0.0538738 0
+ 0.383368 0.0509714 0 0.41259 0.0482707 0 0.440349 0.0457529 0 0.466732 0.0434017 0
+ 0.491822 0.0412029 0 0.515693 0.0391437 0 0.538412 0.0372128 0 0.560044 0.0354003 0
+ 0.580644 0.0336971 0 0.600268 0.0320953 0 0.618965 0.0305878 0 0.636782 0.0291684 0
+ 0.653762 0.0278315 0 0.669947 0.0265723 0 0.685373 0.0253865 0 0.700078 0.0242708 0
+ 0.714094 0.023222 0 0.727454 0.022238 0 0.740187 0.021317 0 0.752321 0.020458 0
+ 0.763882 0.0196605 0 0.774893 0.0189247 0 0.785378 0.0182517 0 0.795356 0.0176431 0
+ 0.804845 0.0171011 0 0.813858 0.0166283 0 0.822408 0.0162275 0 0.830501 0.0159 0
+ 0.838138 0.0156435 0 0.845316 0.0154455 0 0.852028 0.0152681 0 0.858271 0.0150103 0
+ 0.864091 0.0144143 0 0.869695 0.0128204 0 -0.527224 0.0599785 0 -0.450561 0.0581433 0
+ -0.380368 0.0563753 0 -0.312577 0.0542713 0 -0.247457 0.0519407 0 -0.185189 0.0494323 0
+ -0.125891 0.0468447 0 -0.069498 0.0444127 0 -0.0158247 0.0420874 0 0.0350213 0.0396944 0
+ 0.0829337 0.0371271 0 0.128088 0.0347731 0 0.170674 0.0326341 0 0.21089 0.0306796 0
+ 0.248919 0.028884 0 0.28492 0.0272284 0 0.319036 0.0256979 0 0.351394 0.0242803 0
+ 0.382108 0.0229653 0 0.411281 0.021744 0 0.439007 0.0206083 0 0.465369 0.0195513 0
+ 0.490448 0.0185667 0 0.514314 0.0176488 0 0.537033 0.0167926 0 0.558667 0.0159935 0
+ 0.579273 0.0152476 0 0.598902 0.0145515 0 0.617605 0.0139019 0 0.635428 0.0132965 0
+ 0.652413 0.012733 0 0.668601 0.0122099 0 0.684031 0.0117261 0 0.698737 0.0112809 0
+ 0.712754 0.0108742 0 0.726113 0.0105066 0 0.738843 0.0101792 0 0.750972 0.00989376 0
+ 0.762524 0.00965309 0 0.773522 0.00946066 0 0.783987 0.00932087 0 0.793935 0.00923893 0
+ 0.803381 0.00922062 0 0.812333 0.00927137 0 0.820793 0.0093936 0 0.82876 0.00957978 0
+ 0.836223 0.00979383 0 0.843182 0.00992246 0 0.849683 0.00964647 0 0.855943 0.00809671 0
+ -0.578509 0.000117823 0 -0.501145 0.000200615 0 -0.428674 0.000186778 0 -0.358532 0.000113469 0
+ -0.291035 4.39197e-06 0 -0.226434 -0.000126082 0 -0.164892 -0.000269577 0 -0.106346 -0.000423987 0
+ -0.0506507 -0.000570788 0 0.00234161 -0.000718087 0 0.0524109 -0.000845676 0 0.0993876 -0.000959361 0
+ 0.143585 -0.0010597 0 0.185268 -0.00114629 0 0.22465 -0.00121877 0 0.26191 -0.00127696 0
+ 0.297199 -0.00132089 0 0.330653 -0.00135077 0 0.362393 -0.00136697 0 0.392528 -0.00137 0
+ 0.421156 -0.0013605 0 0.448367 -0.00133918 0 0.474244 -0.00130678 0 0.498861 -0.00126408 0
+ 0.522288 -0.0012118 0 0.544589 -0.00115062 0 0.565825 -0.00108111 0 0.586051 -0.00100371 0
+ 0.605317 -0.000918679 0 0.623674 -0.000826078 0 0.641165 -0.000725717 0 0.657834 -0.000617116 0
+ 0.67372 -0.00049946 0 0.688861 -0.000371535 0 0.703292 -0.000231674 0 0.717046 -7.76714e-05 0
+ 0.730153 9.3301e-05 0 0.742643 0.000284806 0 0.754542 0.000501265 0 0.765875 0.000748109 0
+ 0.776662 0.00103192 0 0.786922 0.00136056 0 0.796671 0.00174306 0 0.80592 0.00218891 0
+ 0.814672 0.00270558 0 0.822927 0.00329084 0 0.830678 0.00391128 0 0.837923 0.0044418 0
+ 0.844705 0.00450098 0 0.851238 0.00300732 0 -0.527142 -0.0597614 0 -0.450356 -0.0577738 0
+ -0.380071 -0.0560436 0 -0.312165 -0.0540947 0 -0.246913 -0.0519866 0 -0.184507 -0.04974 0
+ -0.125074 -0.0474361 0 -0.0685545 -0.0453098 0 -0.0147656 -0.0432724 0 0.0361695 -0.0411585 0
+ 0.0841449 -0.038841 0 0.129349 -0.0367089 0 0.171971 -0.0347648 0 0.212208 -0.0329775 0
+ 0.250242 -0.0313211 0 0.286235 -0.0297763 0 0.320329 -0.0283284 0 0.352653 -0.0269656 0
+ 0.383321 -0.0256786 0 0.412437 -0.0244592 0 0.440096 -0.023301 0 0.466385 -0.0221982 0
+ 0.491381 -0.0211462 0 0.515159 -0.0201407 0 0.537786 -0.0191782 0 0.559323 -0.0182555 0
+ 0.579829 -0.0173698 0 0.599358 -0.0165184 0 0.61796 -0.0156988 0 0.635681 -0.0149085 0
+ 0.652567 -0.014145 0 0.668658 -0.0134058 0 0.683994 -0.012688 0 0.69861 -0.0119887 0
+ 0.712541 -0.0113043 0 0.72582 -0.0106311 0 0.738476 -0.00996446 0 0.750539 -0.00929918 0
+ 0.762033 -0.00862919 0 0.772983 -0.00794722 0 0.78341 -0.00724459 0 0.793335 -0.00651099 0
+ 0.802772 -0.00573435 0 0.811733 -0.00490131 0 0.820225 -0.00399966 0 0.828248 -0.00302637 0
+ 0.835798 -0.00201203 0 0.842874 -0.00109168 0 0.849513 -0.000702358 0 0.855894 -0.00212104 0
+ -0.37913 -0.115988 0 -0.306858 -0.112389 0 -0.242867 -0.108849 0 -0.181345 -0.104832 0
+ -0.12249 -0.100535 0 -0.0663529 -0.0960256 0 -0.0128519 -0.0914979 0 0.0378937 -0.0870602 0
+ 0.0857051 -0.0828023 0 0.130787 -0.0784425 0 0.173452 -0.074069 0 0.213863 -0.0699729 0
+ 0.252099 -0.0661868 0 0.288273 -0.0626847 0 0.322513 -0.0594333 0 0.354943 -0.0564027 0
+ 0.385681 -0.053568 0 0.414835 -0.0509082 0 0.442504 -0.0484055 0 0.468779 -0.0460448 0
+ 0.493742 -0.0438131 0 0.51747 -0.0416992 0 0.540034 -0.0396933 0 0.561497 -0.037787 0
+ 0.581922 -0.0359727 0 0.601363 -0.0342438 0 0.619873 -0.0325942 0 0.6375 -0.0310185 0
+ 0.654289 -0.0295116 0 0.670283 -0.0280687 0 0.685523 -0.0266852 0 0.700045 -0.0253565 0
+ 0.713886 -0.024078 0 0.727077 -0.022845 0 0.739651 -0.0216524 0 0.751637 -0.0204949 0
+ 0.763063 -0.0193664 0 0.773955 -0.0182603 0 0.784337 -0.0171687 0 0.794231 -0.016083 0
+ 0.803658 -0.0149926 0 0.812636 -0.0138851 0 0.821181 -0.0127459 0 0.829306 -0.0115583 0
+ 0.837018 -0.0103061 0 0.844322 -0.00898155 0 0.851216 -0.00761191 0 0.857697 -0.00633792 0
+ 0.863786 -0.00563756 0 0.869611 -0.00695095 0 -0.145801 -0.165119 0 -0.0839611 -0.160344 0
+ -0.0302135 -0.155085 0 0.021304 -0.149027 0 0.0701866 -0.14253 0 0.116387 -0.135901 0
+ 0.160065 -0.129366 0 0.201374 -0.122836 0 0.240436 -0.116525 0 0.277385 -0.110344 0
+ 0.312433 -0.104338 0 0.345716 -0.0986588 0 0.377297 -0.0933546 0 0.407244 -0.0884146 0
+ 0.435639 -0.0838106 0 0.462565 -0.0795109 0 0.48811 -0.0754856 0 0.512353 -0.0717083 0
+ 0.535372 -0.0681556 0 0.557238 -0.064807 0 0.578017 -0.0616447 0 0.597771 -0.0586532 0
+ 0.616556 -0.0558186 0 0.634427 -0.053129 0 0.651431 -0.0505737 0 0.667615 -0.0481432 0
+ 0.683023 -0.0458287 0 0.697694 -0.0436225 0 0.711667 -0.0415174 0 0.724977 -0.0395066 0
+ 0.737658 -0.0375836 0 0.749741 -0.0357422 0 0.761256 -0.0339764 0 0.772231 -0.0322798 0
+ 0.782693 -0.0306462 0 0.792666 -0.0290688 0 0.802175 -0.0275403 0 0.811241 -0.0260528 0
+ 0.819886 -0.0245974 0 0.828129 -0.023164 0 0.835988 -0.0217406 0 0.84348 -0.0203133 0
+ 0.85062 -0.0188657 0 0.857421 -0.0173787 0 0.863893 -0.0158332 0 0.870043 -0.0142175 0
+ 0.875873 -0.012555 0 0.88138 -0.0109858 0 0.886567 -0.0100101 0 0.891503 -0.0111874 0
+ 0.157694 -0.203724 0 0.203126 -0.198384 0 0.242578 -0.191604 0 0.280114 -0.18375 0
+ 0.315666 -0.175355 0 0.349277 -0.166925 0 0.381001 -0.158663 0 0.410979 -0.150567 0
+ 0.439359 -0.142748 0 0.466266 -0.135207 0 0.49184 -0.127973 0 0.516179 -0.12112 0
+ 0.539335 -0.114682 0 0.561349 -0.108656 0 0.582265 -0.103018 0 0.602132 -0.097739 0
+ 0.621002 -0.0927892 0 0.638927 -0.0881396 0 0.655958 -0.0837638 0 0.672141 -0.0796385 0
+ 0.687524 -0.0757428 0 0.702149 -0.0720581 0 0.716057 -0.0685682 0 0.729286 -0.0652585 0
+ 0.741871 -0.0621161 0 0.753847 -0.0591293 0 0.765246 -0.0562876 0 0.776097 -0.0535815 0
+ 0.786429 -0.0510021 0 0.796267 -0.0485411 0 0.805639 -0.0461908 0 0.814567 -0.0439436 0
+ 0.823073 -0.0417923 0 0.83118 -0.0397296 0 0.838908 -0.037748 0 0.846276 -0.0358398 0
+ 0.853302 -0.0339969 0 0.860003 -0.0322104 0 0.866397 -0.0304706 0 0.872499 -0.0287665 0
+ 0.878323 -0.0270852 0 0.883885 -0.0254119 0 0.889198 -0.0237291 0 0.894274 -0.0220167 0
+ 0.899125 -0.0202537 0 0.903762 -0.0184261 0 0.90819 -0.016553 0 0.912409 -0.0147692 0
+ 0.916409 -0.0135765 0 0.920191 -0.0145952 0 0.512738 -0.229089 0 0.537225 -0.223665 0
+ 0.559556 -0.21575 0 0.580796 -0.206625 0 0.600905 -0.197009 0 0.619939 -0.187386 0
+ 0.63794 -0.177983 0 0.654989 -0.168868 0 0.671177 -0.160102 0 0.686587 -0.151706 0
+ 0.701296 -0.1437 0 0.715357 -0.136114 0 0.728796 -0.128965 0 0.741628 -0.122249 0
+ 0.753864 -0.115946 0 0.76552 -0.11003 0 0.776616 -0.104471 0 0.787172 -0.0992425 0
+ 0.797211 -0.0943167 0 0.806758 -0.0896694 0 0.815834 -0.0852788 0 0.824462 -0.0811249 0
+ 0.832666 -0.0771903 0 0.840465 -0.073459 0 0.847881 -0.069917 0 0.854934 -0.0665514 0
+ 0.861641 -0.0633505 0 0.868022 -0.0603039 0 0.874093 -0.0574016 0 0.87987 -0.0546345 0
+ 0.885369 -0.051994 0 0.890606 -0.0494717 0 0.895593 -0.0470596 0 0.900345 -0.0447497 0
+ 0.904875 -0.0425338 0 0.909195 -0.0404039 0 0.913317 -0.038351 0 0.917252 -0.036366 0
+ 0.921013 -0.0344386 0 0.92461 -0.0325574 0 0.928054 -0.0307092 0 0.931356 -0.0288792 0
+ 0.934528 -0.0270494 0 0.937581 -0.0251999 0 0.940528 -0.0233095 0 0.943383 -0.0213631 0
+ 0.946155 -0.0193768 0 0.94885 -0.0174763 0 0.951445 -0.0161457 0 0.953873 -0.0169941 0
+ 0.89879 -0.239685 0 0.900998 -0.234204 0 0.904437 -0.225827 0 0.907759 -0.216197 0
+ 0.911004 -0.206121 0 0.914193 -0.196052 0 0.917321 -0.186221 0 0.920391 -0.176725 0
+ 0.923416 -0.167616 0 0.92641 -0.158916 0 0.929383 -0.150636 0 0.932338 -0.14279 0
+ 0.935263 -0.13538 0 0.938138 -0.1284 0 0.940945 -0.12183 0 0.943667 -0.115648 0
+ 0.946292 -0.109829 0 0.948811 -0.104346 0 0.951221 -0.0991731 0 0.953519 -0.0942884 0
+ 0.955706 -0.0896699 0 0.957783 -0.0852981 0 0.959752 -0.0811556 0 0.961619 -0.0772264 0
+ 0.963386 -0.0734963 0 0.965059 -0.0699521 0 0.966642 -0.0665821 0 0.96814 -0.0633753 0
+ 0.969558 -0.0603215 0 0.970902 -0.0574114 0 0.972176 -0.0546358 0 0.973385 -0.0519863 0
+ 0.974535 -0.0494545 0 0.975629 -0.047032 0 0.976673 -0.0447107 0 0.977672 -0.0424821 0
+ 0.978631 -0.0403374 0 0.979555 -0.0382671 0 0.980449 -0.0362612 0 0.981319 -0.0343083 0
+ 0.982172 -0.0323956 0 0.983014 -0.0305086 0 0.983855 -0.0286302 0 0.984705 -0.0267414 0
+ 0.985575 -0.0248224 0 0.986482 -0.0228589 0 0.987439 -0.020865 0 0.988454 -0.0189555 0
+ 0.9895 -0.0175793 0 0.990443 -0.0182581 0 1.29212 -0.235156 0 1.273 -0.229327 0
+ 1.25755 -0.221096 0 1.24279 -0.211773 0 1.22893 -0.202057 0 1.21602 -0.192337 0
+ 1.204 -0.182826 0 1.19282 -0.17363 0 1.18241 -0.164803 0 1.17272 -0.156369 0
+ 1.16369 -0.14834 0 1.15528 -0.140721 0 1.14743 -0.133509 0 1.14009 -0.126697 0
+ 1.1332 -0.12027 0 1.12673 -0.114207 0 1.12062 -0.108487 0 1.11485 -0.103088 0
+ 1.10939 -0.097987 0 1.1042 -0.0931642 0 1.09927 -0.0885999 0 1.09458 -0.0842765 0
+ 1.09011 -0.0801776 0 1.08585 -0.0762885 0 1.08179 -0.0725956 0 1.07791 -0.0690867 0
+ 1.0742 -0.0657503 0 1.07066 -0.0625759 0 1.06729 -0.0595538 0 1.06406 -0.0566748 0
+ 1.06099 -0.0539301 0 1.05805 -0.0513113 0 1.05525 -0.0488103 0 1.05259 -0.0464191 0
+ 1.05005 -0.0441296 0 1.04764 -0.0419337 0 1.04535 -0.0398228 0 1.04319 -0.0377879 0
+ 1.04114 -0.0358195 0 1.03922 -0.0339067 0 1.03741 -0.0320377 0 1.03574 -0.030199 0
+ 1.03419 -0.0283753 0 1.03278 -0.0265493 0 1.03152 -0.0247037 0 1.03043 -0.0228265 0
+ 1.02951 -0.0209313 0 1.02879 -0.0191207 0 1.02822 -0.0177943 0 1.02761 -0.0183159 0
+ 1.668 -0.216002 0 1.62999 -0.209737 0 1.59722 -0.20211 0 1.56574 -0.193767 0
+ 1.53593 -0.185132 0 1.50787 -0.176478 0 1.48149 -0.167973 0 1.45672 -0.159717 0
+ 1.43344 -0.151763 0 1.41155 -0.144141 0 1.39095 -0.136867 0 1.37155 -0.129945 0
+ 1.35326 -0.123375 0 1.336 -0.117151 0 1.31969 -0.111261 0 1.30426 -0.105692 0
+ 1.28964 -0.100425 0 1.27578 -0.0954446 0 1.26262 -0.0907318 0 1.25012 -0.0862698 0
+ 1.23824 -0.0820425 0 1.22693 -0.078035 0 1.21616 -0.0742334 0 1.20592 -0.0706247 0
+ 1.19615 -0.0671972 0 1.18685 -0.0639399 0 1.17799 -0.0608428 0 1.16954 -0.0578963 0
+ 1.16149 -0.0550917 0 1.15382 -0.0524206 0 1.14651 -0.049875 0 1.13955 -0.0474472 0
+ 1.13292 -0.0451298 0 1.1266 -0.0429154 0 1.12059 -0.0407967 0 1.11488 -0.0387661 0
+ 1.10945 -0.0368159 0 1.10429 -0.0349381 0 1.09941 -0.0331238 0 1.09478 -0.0313635 0
+ 1.09042 -0.0296468 0 1.08631 -0.0279617 0 1.08246 -0.026295 0 1.07887 -0.0246324 0
+ 1.07555 -0.0229596 0 1.07252 -0.0212679 0 1.06978 -0.0195708 0 1.06736 -0.017958 0
+ 1.06519 -0.016769 0 1.06306 -0.0171546 0 2.00262 -0.183522 0 1.9491 -0.177159 0
+ 1.9017 -0.170549 0 1.85611 -0.163676 0 1.8127 -0.156651 0 1.77157 -0.149601 0
+ 1.73268 -0.142637 0 1.69593 -0.135834 0 1.66121 -0.129244 0 1.6284 -0.122899 0
+ 1.59738 -0.116817 0 1.56805 -0.111008 0 1.54029 -0.105474 0 1.514 -0.100215 0
+ 1.4891 -0.0952239 0 1.46548 -0.090491 0 1.44307 -0.0860053 0 1.4218 -0.0817544 0
+ 1.40158 -0.0777255 0 1.38237 -0.0739059 0 1.3641 -0.0702833 0 1.34673 -0.0668461 0
+ 1.33019 -0.0635834 0 1.31445 -0.060485 0 1.29947 -0.0575412 0 1.2852 -0.0547432 0
+ 1.27162 -0.0520826 0 1.25869 -0.0495517 0 1.24637 -0.047143 0 1.23464 -0.0448494 0
+ 1.22347 -0.0426643 0 1.21284 -0.0405811 0 1.20272 -0.0385935 0 1.19309 -0.0366952 0
+ 1.18393 -0.03488 0 1.17522 -0.0331414 0 1.16694 -0.031473 0 1.15908 -0.0298678 0
+ 1.15162 -0.0283186 0 1.14455 -0.0268173 0 1.13787 -0.0253554 0 1.13157 -0.023923 0
+ 1.12564 -0.0225095 0 1.12008 -0.0211038 0 1.11491 -0.019695 0 1.11012 -0.0182777 0
+ 1.10574 -0.0168651 0 1.10175 -0.0155324 0 1.09811 -0.0145517 0 1.09456 -0.0148259 0
+ 2.27468 -0.13978 0 2.20967 -0.134042 0 2.1511 -0.128885 0 2.09479 -0.123819 0
+ 2.04096 -0.11872 0 1.98968 -0.113599 0 1.94091 -0.10851 0 1.89459 -0.103504 0
+ 1.85063 -0.0986229 0 1.80891 -0.0938956 0 1.76932 -0.0893414 0 1.73177 -0.0849724 0
+ 1.69613 -0.0807949 0 1.66231 -0.0768107 0 1.6302 -0.0730179 0 1.59972 -0.0694122 0
+ 1.57075 -0.0659871 0 1.54323 -0.0627353 0 1.51708 -0.0596485 0 1.49221 -0.0567184 0
+ 1.46856 -0.0539367 0 1.44606 -0.0512954 0 1.42466 -0.0487866 0 1.40431 -0.0464033 0
+ 1.38493 -0.0441383 0 1.3665 -0.0419852 0 1.34895 -0.0399379 0 1.33225 -0.0379904 0
+ 1.31636 -0.0361372 0 1.30124 -0.0343729 0 1.28684 -0.0326926 0 1.27315 -0.0310912 0
+ 1.26012 -0.0295638 0 1.24773 -0.0281057 0 1.23594 -0.026712 0 1.22474 -0.025378 0
+ 1.2141 -0.0240985 0 1.20399 -0.0228684 0 1.1944 -0.0216822 0 1.18532 -0.0205338 0
+ 1.17672 -0.0194167 0 1.1686 -0.0183237 0 1.16095 -0.0172472 0 1.15378 -0.016179 0
+ 1.14707 -0.015112 0 1.14083 -0.0140433 0 1.13507 -0.0129846 0 1.12978 -0.0119935 0
+ 1.1249 -0.0112697 0 1.12013 -0.0114546 0 2.46679 -0.0874934 0 2.39461 -0.0833357 0
+ 2.32876 -0.0800531 0 2.26549 -0.0769896 0 2.20481 -0.0739437 0 2.14673 -0.0708793 0
+ 2.09122 -0.0678144 0 2.03827 -0.0647787 0 1.9878 -0.0617996 0 1.93974 -0.0588983 0
+ 1.89401 -0.05609 0 1.85052 -0.053385 0 1.80916 -0.0507896 0 1.76985 -0.0483069 0
+ 1.73248 -0.0459375 0 1.69695 -0.0436801 0 1.66318 -0.041532 0 1.63107 -0.0394894 0
+ 1.60055 -0.0375481 0 1.57152 -0.0357036 0 1.54392 -0.0339511 0 1.51767 -0.0322862 0
+ 1.4927 -0.0307041 0 1.46896 -0.0292007 0 1.44637 -0.0277718 0 1.42488 -0.0264133 0
+ 1.40444 -0.0251215 0 1.385 -0.0238929 0 1.3665 -0.0227239 0 1.34891 -0.0216112 0
+ 1.33217 -0.0205516 0 1.31625 -0.0195421 0 1.30112 -0.0185796 0 1.28672 -0.017661 0
+ 1.27304 -0.0167833 0 1.26004 -0.0159435 0 1.24769 -0.0151385 0 1.23597 -0.0143649 0
+ 1.22485 -0.0136193 0 1.21431 -0.012898 0 1.20433 -0.0121969 0 1.19491 -0.0115116 0
+ 1.18603 -0.0108375 0 1.17769 -0.0101698 0 1.16988 -0.00950426 0 1.1626 -0.00883982 0
+ 1.15585 -0.00818471 0 1.14962 -0.00757569 0 1.14382 -0.00713529 0 1.13815 -0.00724457 0
+ 2.56645 -0.0297951 0 2.49127 -0.0282396 0 2.42207 -0.0271156 0 2.35555 -0.0260995 0
+ 2.29156 -0.0250951 0 2.23009 -0.0240818 0 2.17116 -0.0230635 0 2.11477 -0.0220501 0
+ 2.06089 -0.0210514 0 2.00948 -0.0200752 0 1.96048 -0.0191276 0 1.9138 -0.0182125 0
+ 1.86937 -0.0173326 0 1.82709 -0.0164895 0 1.78688 -0.0156836 0 1.74863 -0.0149148 0
+ 1.71226 -0.0141825 0 1.67767 -0.0134857 0 1.64479 -0.0128229 0 1.61352 -0.0121928 0
+ 1.58378 -0.011594 0 1.55551 -0.0110248 0 1.52862 -0.0104839 0 1.50306 -0.00996986 0
+ 1.47874 -0.00948119 0 1.45562 -0.00901662 0 1.43363 -0.00857487 0 1.41272 -0.00815473 0
+ 1.39283 -0.00775501 0 1.37392 -0.00737461 0 1.35594 -0.00701242 0 1.33884 -0.00666738 0
+ 1.32258 -0.00633845 0 1.30713 -0.0060246 0 1.29244 -0.0057248 0 1.27849 -0.00543801 0
+ 1.26523 -0.00516315 0 1.25266 -0.0048991 0 1.24073 -0.00464469 0 1.22942 -0.00439865 0
+ 1.21872 -0.00415961 0 1.20862 -0.00392609 0 1.19909 -0.00369652 0 1.19013 -0.00346931 0
+ 1.18174 -0.00324313 0 1.17392 -0.00301771 0 1.16665 -0.00279603 0 1.15991 -0.00259079 0
+ 1.15362 -0.00244346 0 1.14747 -0.00248025 0 2.56645 0.0297951 0 2.49127 0.0282396 0
+ 2.42207 0.0271156 0 2.35555 0.0260995 0 2.29156 0.0250951 0 2.23009 0.0240818 0
+ 2.17116 0.0230635 0 2.11477 0.0220501 0 2.06089 0.0210514 0 2.00948 0.0200752 0
+ 1.96048 0.0191276 0 1.9138 0.0182125 0 1.86937 0.0173326 0 1.82709 0.0164895 0
+ 1.78688 0.0156836 0 1.74863 0.0149148 0 1.71226 0.0141825 0 1.67767 0.0134857 0
+ 1.64479 0.0128229 0 1.61352 0.0121928 0 1.58378 0.011594 0 1.55551 0.0110248 0
+ 1.52862 0.0104839 0 1.50306 0.00996986 0 1.47874 0.00948119 0 1.45562 0.00901662 0
+ 1.43363 0.00857487 0 1.41272 0.00815473 0 1.39283 0.00775501 0 1.37392 0.00737461 0
+ 1.35594 0.00701242 0 1.33884 0.00666738 0 1.32258 0.00633845 0 1.30713 0.0060246 0
+ 1.29244 0.0057248 0 1.27849 0.00543801 0 1.26523 0.00516315 0 1.25266 0.0048991 0
+ 1.24073 0.00464469 0 1.22942 0.00439865 0 1.21872 0.00415961 0 1.20862 0.00392609 0
+ 1.19909 0.00369652 0 1.19013 0.00346931 0 1.18174 0.00324313 0 1.17392 0.00301771 0
+ 1.16665 0.00279603 0 1.15991 0.00259079 0 1.15362 0.00244346 0 1.14747 0.00248025 0
+ 2.46679 0.0874934 0 2.39461 0.0833357 0 2.32876 0.0800531 0 2.26549 0.0769896 0
+ 2.20481 0.0739437 0 2.14673 0.0708793 0 2.09122 0.0678144 0 2.03827 0.0647787 0
+ 1.9878 0.0617996 0 1.93974 0.0588983 0 1.89401 0.05609 0 1.85052 0.053385 0
+ 1.80916 0.0507896 0 1.76985 0.0483069 0 1.73248 0.0459375 0 1.69695 0.0436801 0
+ 1.66318 0.041532 0 1.63107 0.0394894 0 1.60055 0.0375481 0 1.57152 0.0357036 0
+ 1.54392 0.0339511 0 1.51767 0.0322862 0 1.4927 0.0307041 0 1.46896 0.0292007 0
+ 1.44637 0.0277718 0 1.42488 0.0264133 0 1.40444 0.0251215 0 1.385 0.0238929 0
+ 1.3665 0.0227239 0 1.34891 0.0216112 0 1.33217 0.0205516 0 1.31625 0.0195421 0
+ 1.30112 0.0185796 0 1.28672 0.017661 0 1.27304 0.0167833 0 1.26004 0.0159435 0
+ 1.24769 0.0151385 0 1.23597 0.0143649 0 1.22485 0.0136193 0 1.21431 0.012898 0
+ 1.20433 0.0121969 0 1.19491 0.0115116 0 1.18603 0.0108375 0 1.17769 0.0101698 0
+ 1.16988 0.00950426 0 1.1626 0.00883982 0 1.15585 0.00818471 0 1.14962 0.00757569 0
+ 1.14382 0.00713529 0 1.13815 0.00724457 0 2.27468 0.13978 0 2.20967 0.134042 0
+ 2.1511 0.128885 0 2.09479 0.123819 0 2.04096 0.11872 0 1.98968 0.113599 0
+ 1.94091 0.10851 0 1.89459 0.103504 0 1.85063 0.0986229 0 1.80891 0.0938956 0
+ 1.76932 0.0893414 0 1.73177 0.0849724 0 1.69613 0.0807949 0 1.66231 0.0768107 0
+ 1.6302 0.0730179 0 1.59972 0.0694122 0 1.57075 0.0659871 0 1.54323 0.0627353 0
+ 1.51708 0.0596485 0 1.49221 0.0567184 0 1.46856 0.0539367 0 1.44606 0.0512954 0
+ 1.42466 0.0487866 0 1.40431 0.0464033 0 1.38493 0.0441383 0 1.3665 0.0419852 0
+ 1.34895 0.0399379 0 1.33225 0.0379904 0 1.31636 0.0361372 0 1.30124 0.0343729 0
+ 1.28684 0.0326926 0 1.27315 0.0310912 0 1.26012 0.0295638 0 1.24773 0.0281057 0
+ 1.23594 0.026712 0 1.22474 0.025378 0 1.2141 0.0240985 0 1.20399 0.0228684 0
+ 1.1944 0.0216822 0 1.18532 0.0205338 0 1.17672 0.0194167 0 1.1686 0.0183237 0
+ 1.16095 0.0172472 0 1.15378 0.016179 0 1.14707 0.015112 0 1.14083 0.0140433 0
+ 1.13507 0.0129846 0 1.12978 0.0119935 0 1.1249 0.0112697 0 1.12013 0.0114546 0
+ 2.00262 0.183522 0 1.9491 0.177159 0 1.9017 0.170549 0 1.85611 0.163676 0
+ 1.8127 0.156651 0 1.77157 0.149601 0 1.73268 0.142637 0 1.69593 0.135834 0
+ 1.66121 0.129244 0 1.6284 0.122899 0 1.59738 0.116817 0 1.56805 0.111008 0
+ 1.54029 0.105474 0 1.514 0.100215 0 1.4891 0.0952239 0 1.46548 0.090491 0
+ 1.44307 0.0860053 0 1.4218 0.0817544 0 1.40158 0.0777255 0 1.38237 0.0739059 0
+ 1.3641 0.0702833 0 1.34673 0.0668461 0 1.33019 0.0635834 0 1.31445 0.060485 0
+ 1.29947 0.0575412 0 1.2852 0.0547432 0 1.27162 0.0520826 0 1.25869 0.0495517 0
+ 1.24637 0.047143 0 1.23464 0.0448494 0 1.22347 0.0426643 0 1.21284 0.0405811 0
+ 1.20272 0.0385935 0 1.19309 0.0366952 0 1.18393 0.03488 0 1.17522 0.0331414 0
+ 1.16694 0.031473 0 1.15908 0.0298678 0 1.15162 0.0283186 0 1.14455 0.0268173 0
+ 1.13787 0.0253554 0 1.13157 0.023923 0 1.12564 0.0225095 0 1.12008 0.0211038 0
+ 1.11491 0.019695 0 1.11012 0.0182777 0 1.10574 0.0168651 0 1.10175 0.0155324 0
+ 1.09811 0.0145517 0 1.09456 0.0148259 0 1.668 0.216002 0 1.62999 0.209737 0
+ 1.59722 0.20211 0 1.56574 0.193767 0 1.53593 0.185132 0 1.50787 0.176478 0
+ 1.48149 0.167973 0 1.45672 0.159717 0 1.43344 0.151763 0 1.41155 0.144141 0
+ 1.39095 0.136867 0 1.37155 0.129945 0 1.35326 0.123375 0 1.336 0.117151 0
+ 1.31969 0.111261 0 1.30426 0.105692 0 1.28964 0.100425 0 1.27578 0.0954446 0
+ 1.26262 0.0907318 0 1.25012 0.0862698 0 1.23824 0.0820425 0 1.22693 0.078035 0
+ 1.21616 0.0742334 0 1.20592 0.0706247 0 1.19615 0.0671972 0 1.18685 0.0639399 0
+ 1.17799 0.0608428 0 1.16954 0.0578963 0 1.16149 0.0550917 0 1.15382 0.0524206 0
+ 1.14651 0.049875 0 1.13955 0.0474472 0 1.13292 0.0451298 0 1.1266 0.0429154 0
+ 1.12059 0.0407967 0 1.11488 0.0387661 0 1.10945 0.0368159 0 1.10429 0.0349381 0
+ 1.09941 0.0331238 0 1.09478 0.0313635 0 1.09042 0.0296468 0 1.08631 0.0279617 0
+ 1.08246 0.026295 0 1.07887 0.0246324 0 1.07555 0.0229596 0 1.07252 0.0212679 0
+ 1.06978 0.0195708 0 1.06736 0.017958 0 1.06519 0.016769 0 1.06306 0.0171546 0
+ 1.29212 0.235156 0 1.273 0.229327 0 1.25755 0.221096 0 1.24279 0.211773 0
+ 1.22893 0.202057 0 1.21602 0.192337 0 1.204 0.182826 0 1.19282 0.17363 0
+ 1.18241 0.164803 0 1.17272 0.156369 0 1.16369 0.14834 0 1.15528 0.140721 0
+ 1.14743 0.133509 0 1.14009 0.126697 0 1.1332 0.12027 0 1.12673 0.114207 0
+ 1.12062 0.108487 0 1.11485 0.103088 0 1.10939 0.097987 0 1.1042 0.0931642 0
+ 1.09927 0.0885999 0 1.09458 0.0842765 0 1.09011 0.0801776 0 1.08585 0.0762885 0
+ 1.08179 0.0725956 0 1.07791 0.0690867 0 1.0742 0.0657503 0 1.07066 0.0625759 0
+ 1.06729 0.0595538 0 1.06406 0.0566748 0 1.06099 0.0539301 0 1.05805 0.0513113 0
+ 1.05525 0.0488103 0 1.05259 0.0464191 0 1.05005 0.0441296 0 1.04764 0.0419337 0
+ 1.04535 0.0398228 0 1.04319 0.0377879 0 1.04114 0.0358195 0 1.03922 0.0339067 0
+ 1.03741 0.0320377 0 1.03574 0.030199 0 1.03419 0.0283753 0 1.03278 0.0265493 0
+ 1.03152 0.0247037 0 1.03043 0.0228265 0 1.02951 0.0209313 0 1.02879 0.0191207 0
+ 1.02822 0.0177943 0 1.02761 0.0183159 0 0.89879 0.239685 0 0.900998 0.234204 0
+ 0.904437 0.225827 0 0.907759 0.216197 0 0.911004 0.206121 0 0.914193 0.196052 0
+ 0.917321 0.186221 0 0.920391 0.176725 0 0.923416 0.167616 0 0.92641 0.158916 0
+ 0.929383 0.150636 0 0.932338 0.14279 0 0.935263 0.13538 0 0.938138 0.1284 0
+ 0.940945 0.12183 0 0.943667 0.115648 0 0.946292 0.109829 0 0.948811 0.104346 0
+ 0.951221 0.0991731 0 0.953519 0.0942884 0 0.955706 0.0896699 0 0.957783 0.0852981 0
+ 0.959752 0.0811556 0 0.961619 0.0772264 0 0.963386 0.0734963 0 0.965059 0.0699521 0
+ 0.966642 0.0665821 0 0.96814 0.0633753 0 0.969558 0.0603215 0 0.970902 0.0574114 0
+ 0.972176 0.0546358 0 0.973385 0.0519863 0 0.974535 0.0494545 0 0.975629 0.047032 0
+ 0.976673 0.0447107 0 0.977672 0.0424821 0 0.978631 0.0403374 0 0.979555 0.0382671 0
+ 0.980449 0.0362612 0 0.981319 0.0343083 0 0.982172 0.0323956 0 0.983014 0.0305086 0
+ 0.983855 0.0286302 0 0.984705 0.0267414 0 0.985575 0.0248224 0 0.986482 0.0228589 0
+ 0.987439 0.020865 0 0.988454 0.0189555 0 0.9895 0.0175793 0 0.990443 0.0182581 0
+ 0.512738 0.229089 0 0.537225 0.223665 0 0.559556 0.21575 0 0.580796 0.206625 0
+ 0.600905 0.197009 0 0.619939 0.187386 0 0.63794 0.177983 0 0.654989 0.168868 0
+ 0.671177 0.160102 0 0.686587 0.151706 0 0.701296 0.1437 0 0.715357 0.136114 0
+ 0.728796 0.128965 0 0.741628 0.122249 0 0.753864 0.115946 0 0.76552 0.11003 0
+ 0.776616 0.104471 0 0.787172 0.0992425 0 0.797211 0.0943167 0 0.806758 0.0896694 0
+ 0.815834 0.0852788 0 0.824462 0.0811249 0 0.832666 0.0771903 0 0.840465 0.073459 0
+ 0.847881 0.069917 0 0.854934 0.0665514 0 0.861641 0.0633505 0 0.868022 0.0603039 0
+ 0.874093 0.0574016 0 0.87987 0.0546345 0 0.885369 0.051994 0 0.890606 0.0494717 0
+ 0.895593 0.0470596 0 0.900345 0.0447497 0 0.904875 0.0425338 0 0.909195 0.0404039 0
+ 0.913317 0.038351 0 0.917252 0.036366 0 0.921013 0.0344386 0 0.92461 0.0325574 0
+ 0.928054 0.0307092 0 0.931356 0.0288792 0 0.934528 0.0270494 0 0.937581 0.0251999 0
+ 0.940528 0.0233095 0 0.943383 0.0213631 0 0.946155 0.0193768 0 0.94885 0.0174763 0
+ 0.951445 0.0161457 0 0.953873 0.0169941 0 0.157694 0.203724 0 0.203126 0.198384 0
+ 0.242578 0.191604 0 0.280114 0.18375 0 0.315666 0.175355 0 0.349277 0.166925 0
+ 0.381001 0.158663 0 0.410979 0.150567 0 0.439359 0.142748 0 0.466266 0.135207 0
+ 0.49184 0.127973 0 0.516179 0.12112 0 0.539335 0.114682 0 0.561349 0.108656 0
+ 0.582265 0.103018 0 0.602132 0.097739 0 0.621002 0.0927892 0 0.638927 0.0881396 0
+ 0.655958 0.0837638 0 0.672141 0.0796385 0 0.687524 0.0757428 0 0.702149 0.0720581 0
+ 0.716057 0.0685682 0 0.729286 0.0652585 0 0.741871 0.0621161 0 0.753847 0.0591293 0
+ 0.765246 0.0562876 0 0.776097 0.0535815 0 0.786429 0.0510021 0 0.796267 0.0485411 0
+ 0.805639 0.0461908 0 0.814567 0.0439436 0 0.823073 0.0417923 0 0.83118 0.0397296 0
+ 0.838908 0.037748 0 0.846276 0.0358398 0 0.853302 0.0339969 0 0.860003 0.0322104 0
+ 0.866397 0.0304706 0 0.872499 0.0287665 0 0.878323 0.0270852 0 0.883885 0.0254119 0
+ 0.889198 0.0237291 0 0.894274 0.0220167 0 0.899125 0.0202537 0 0.903762 0.0184261 0
+ 0.90819 0.016553 0 0.912409 0.0147692 0 0.916409 0.0135765 0 0.920191 0.0145952 0
+ -0.145801 0.165119 0 -0.0839611 0.160344 0 -0.0302135 0.155085 0 0.021304 0.149027 0
+ 0.0701866 0.14253 0 0.116387 0.135901 0 0.160065 0.129366 0 0.201374 0.122836 0
+ 0.240436 0.116525 0 0.277385 0.110344 0 0.312433 0.104338 0 0.345716 0.0986588 0
+ 0.377297 0.0933546 0 0.407244 0.0884146 0 0.435639 0.0838106 0 0.462565 0.0795109 0
+ 0.48811 0.0754856 0 0.512353 0.0717083 0 0.535372 0.0681556 0 0.557238 0.064807 0
+ 0.578017 0.0616447 0 0.597771 0.0586532 0 0.616556 0.0558186 0 0.634427 0.053129 0
+ 0.651431 0.0505737 0 0.667615 0.0481432 0 0.683023 0.0458287 0 0.697694 0.0436225 0
+ 0.711667 0.0415174 0 0.724977 0.0395066 0 0.737658 0.0375836 0 0.749741 0.0357422 0
+ 0.761256 0.0339764 0 0.772231 0.0322798 0 0.782693 0.0306462 0 0.792666 0.0290688 0
+ 0.802175 0.0275403 0 0.811241 0.0260528 0 0.819886 0.0245974 0 0.828129 0.023164 0
+ 0.835988 0.0217406 0 0.84348 0.0203133 0 0.85062 0.0188657 0 0.857421 0.0173787 0
+ 0.863893 0.0158332 0 0.870043 0.0142175 0 0.875873 0.012555 0 0.88138 0.0109858 0
+ 0.886567 0.0100101 0 0.891503 0.0111874 0 -0.37913 0.115988 0 -0.306858 0.112389 0
+ -0.242867 0.108849 0 -0.181345 0.104832 0 -0.12249 0.100535 0 -0.0663529 0.0960256 0
+ -0.0128519 0.0914979 0 0.0378937 0.0870602 0 0.0857051 0.0828023 0 0.130787 0.0784425 0
+ 0.173452 0.074069 0 0.213863 0.0699729 0 0.252099 0.0661868 0 0.288273 0.0626847 0
+ 0.322513 0.0594333 0 0.354943 0.0564027 0 0.385681 0.053568 0 0.414835 0.0509082 0
+ 0.442504 0.0484055 0 0.468779 0.0460448 0 0.493742 0.0438131 0 0.51747 0.0416992 0
+ 0.540034 0.0396933 0 0.561497 0.037787 0 0.581922 0.0359727 0 0.601363 0.0342438 0
+ 0.619873 0.0325942 0 0.6375 0.0310185 0 0.654289 0.0295116 0 0.670283 0.0280687 0
+ 0.685523 0.0266852 0 0.700045 0.0253565 0 0.713886 0.024078 0 0.727077 0.022845 0
+ 0.739651 0.0216524 0 0.751637 0.0204949 0 0.763063 0.0193664 0 0.773955 0.0182603 0
+ 0.784337 0.0171687 0 0.794231 0.016083 0 0.803658 0.0149926 0 0.812636 0.0138851 0
+ 0.821181 0.0127459 0 0.829306 0.0115583 0 0.837018 0.0103061 0 0.844322 0.00898155 0
+ 0.851216 0.00761191 0 0.857697 0.00633792 0 0.863786 0.00563756 0 0.869611 0.00695095 0
+ -0.527142 0.0597614 0 -0.450356 0.0577738 0 -0.380071 0.0560436 0 -0.312165 0.0540947 0
+ -0.246913 0.0519866 0 -0.184507 0.04974 0 -0.125074 0.0474361 0 -0.0685545 0.0453098 0
+ -0.0147656 0.0432724 0 0.0361695 0.0411585 0 0.0841449 0.038841 0 0.129349 0.0367089 0
+ 0.171971 0.0347648 0 0.212208 0.0329775 0 0.250242 0.0313211 0 0.286235 0.0297763 0
+ 0.320329 0.0283284 0 0.352653 0.0269656 0 0.383321 0.0256786 0 0.412437 0.0244592 0
+ 0.440096 0.023301 0 0.466385 0.0221982 0 0.491381 0.0211462 0 0.515159 0.0201407 0
+ 0.537786 0.0191782 0 0.559323 0.0182555 0 0.579829 0.0173698 0 0.599358 0.0165184 0
+ 0.61796 0.0156988 0 0.635681 0.0149085 0 0.652567 0.014145 0 0.668658 0.0134058 0
+ 0.683994 0.012688 0 0.69861 0.0119887 0 0.712541 0.0113043 0 0.72582 0.0106311 0
+ 0.738476 0.00996446 0 0.750539 0.00929918 0 0.762033 0.00862919 0 0.772983 0.00794722 0
+ 0.78341 0.00724459 0 0.793335 0.00651099 0 0.802772 0.00573435 0 0.811733 0.00490131 0
+ 0.820225 0.00399966 0 0.828248 0.00302637 0 0.835798 0.00201203 0 0.842874 0.00109168 0
+ 0.849513 0.000702358 0 0.855894 0.00212104 0 -0.578509 -0.000117823 0 -0.501145 -0.000200615 0
+ -0.428674 -0.000186778 0 -0.358532 -0.000113469 0 -0.291035 -4.39197e-06 0 -0.226434 0.000126082 0
+ -0.164892 0.000269577 0 -0.106346 0.000423987 0 -0.0506507 0.000570788 0 0.00234161 0.000718087 0
+ 0.0524109 0.000845676 0 0.0993876 0.000959361 0 0.143585 0.0010597 0 0.185268 0.00114629 0
+ 0.22465 0.00121877 0 0.26191 0.00127696 0 0.297199 0.00132089 0 0.330653 0.00135077 0
+ 0.362393 0.00136697 0 0.392528 0.00137 0 0.421156 0.0013605 0 0.448367 0.00133918 0
+ 0.474244 0.00130678 0 0.498861 0.00126408 0 0.522288 0.0012118 0 0.544589 0.00115062 0
+ 0.565825 0.00108111 0 0.586051 0.00100371 0 0.605317 0.000918679 0 0.623674 0.000826078 0
+ 0.641165 0.000725717 0 0.657834 0.000617116 0 0.67372 0.00049946 0 0.688861 0.000371535 0
+ 0.703292 0.000231674 0 0.717046 7.76714e-05 0 0.730153 -9.3301e-05 0 0.742643 -0.000284806 0
+ 0.754542 -0.000501265 0 0.765875 -0.000748109 0 0.776662 -0.00103192 0 0.786922 -0.00136056 0
+ 0.796671 -0.00174306 0 0.80592 -0.00218891 0 0.814672 -0.00270558 0 0.822927 -0.00329084 0
+ 0.830678 -0.00391128 0 0.837923 -0.0044418 0 0.844705 -0.00450098 0 0.851238 -0.00300732 0
+ -0.527224 -0.0599785 0 -0.450561 -0.0581433 0 -0.380368 -0.0563753 0 -0.312577 -0.0542713 0
+ -0.247457 -0.0519407 0 -0.185189 -0.0494323 0 -0.125891 -0.0468447 0 -0.069498 -0.0444127 0
+ -0.0158247 -0.0420874 0 0.0350213 -0.0396944 0 0.0829337 -0.0371271 0 0.128088 -0.0347731 0
+ 0.170674 -0.0326341 0 0.21089 -0.0306796 0 0.248919 -0.028884 0 0.28492 -0.0272284 0
+ 0.319036 -0.0256979 0 0.351394 -0.0242803 0 0.382108 -0.0229653 0 0.411281 -0.021744 0
+ 0.439007 -0.0206083 0 0.465369 -0.0195513 0 0.490448 -0.0185667 0 0.514314 -0.0176488 0
+ 0.537033 -0.0167926 0 0.558667 -0.0159935 0 0.579273 -0.0152476 0 0.598902 -0.0145515 0
+ 0.617605 -0.0139019 0 0.635428 -0.0132965 0 0.652413 -0.012733 0 0.668601 -0.0122099 0
+ 0.684031 -0.0117261 0 0.698737 -0.0112809 0 0.712754 -0.0108742 0 0.726113 -0.0105066 0
+ 0.738843 -0.0101792 0 0.750972 -0.00989376 0 0.762524 -0.00965309 0 0.773522 -0.00946066 0
+ 0.783987 -0.00932087 0 0.793935 -0.00923893 0 0.803381 -0.00922062 0 0.812333 -0.00927137 0
+ 0.820793 -0.0093936 0 0.82876 -0.00957978 0 0.836223 -0.00979383 0 0.843182 -0.00992246 0
+ 0.849683 -0.00964647 0 0.855943 -0.00809671 0 -0.379289 -0.116155 0 -0.307247 -0.112669 0
+ -0.243426 -0.109061 0 -0.182115 -0.104866 0 -0.123498 -0.100336 0 -0.0676083 -0.0955624 0
+ -0.0143541 -0.0907566 0 0.0361716 -0.0860354 0 0.0838004 -0.0815063 0 0.128729 -0.0768951 0
+ 0.171271 -0.0722901 0 0.21159 -0.0679891 0 0.249764 -0.0640255 0 0.285904 -0.0603733 0
+ 0.320137 -0.0569993 0 0.352586 -0.0538738 0 0.383368 -0.0509714 0 0.41259 -0.0482707 0
+ 0.440349 -0.0457529 0 0.466732 -0.0434017 0 0.491822 -0.0412029 0 0.515693 -0.0391437 0
+ 0.538412 -0.0372128 0 0.560044 -0.0354003 0 0.580644 -0.0336971 0 0.600268 -0.0320953 0
+ 0.618965 -0.0305878 0 0.636782 -0.0291684 0 0.653762 -0.0278315 0 0.669947 -0.0265723 0
+ 0.685373 -0.0253865 0 0.700078 -0.0242708 0 0.714094 -0.023222 0 0.727454 -0.022238 0
+ 0.740187 -0.021317 0 0.752321 -0.020458 0 0.763882 -0.0196605 0 0.774893 -0.0189247 0
+ 0.785378 -0.0182517 0 0.795356 -0.0176431 0 0.804845 -0.0171011 0 0.813858 -0.0166283 0
+ 0.822408 -0.0162275 0 0.830501 -0.0159 0 0.838138 -0.0156435 0 0.845316 -0.0154455 0
+ 0.852028 -0.0152681 0 0.858271 -0.0150103 0 0.864091 -0.0144143 0 0.869695 -0.0128204 0
+ -0.146012 -0.16522 0 -0.0844795 -0.160488 0 -0.030966 -0.155111 0 0.0202635 -0.148848 0
+ 0.0688346 -0.142105 0 0.114718 -0.135212 0 0.158093 -0.12841 0 0.199126 -0.121629 0
+ 0.23795 -0.115075 0 0.274702 -0.108671 0 0.309596 -0.102463 0 0.342765 -0.0966072 0
+ 0.374273 -0.0911525 0 0.404186 -0.0860889 0 0.432583 -0.0813877 0 0.459549 -0.0770173 0
+ 0.485166 -0.0729472 0 0.509513 -0.0691503 0 0.532666 -0.0656019 0 0.554692 -0.0622804 0
+ 0.575655 -0.0591666 0 0.595613 -0.0562432 0 0.614621 -0.0534951 0 0.632728 -0.0509086 0
+ 0.649981 -0.0484715 0 0.666422 -0.0461732 0 0.682093 -0.044004 0 0.697029 -0.0419553 0
+ 0.711268 -0.0400196 0 0.724841 -0.0381901 0 0.73778 -0.0364609 0 0.750113 -0.0348269 0
+ 0.761869 -0.0332836 0 0.773073 -0.0318273 0 0.783749 -0.0304549 0 0.793919 -0.0291639 0
+ 0.803606 -0.0279526 0 0.812828 -0.0268198 0 0.821603 -0.0257648 0 0.829947 -0.0247876 0
+ 0.837874 -0.0238886 0 0.845395 -0.023068 0 0.852518 -0.0223258 0 0.859248 -0.0216599 0
+ 0.865586 -0.021064 0 0.871529 -0.0205218 0 0.877071 -0.0199947 0 0.882215 -0.019394 0
+ 0.887004 -0.0185171 0 0.891622 -0.0168949 0 0.157467 -0.203753 0 0.202558 -0.198358 0
+ 0.24174 -0.191397 0 0.278942 -0.183308 0 0.314134 -0.174656 0 0.347388 -0.165971 0
+ 0.378779 -0.157465 0 0.40846 -0.149145 0 0.436586 -0.141118 0 0.463287 -0.13339 0
+ 0.488705 -0.125992 0 0.512936 -0.118998 0 0.536032 -0.112444 0 0.558031 -0.106327 0
+ 0.578977 -0.100624 0 0.598915 -0.0953044 0 0.617896 -0.0903382 0 0.635968 -0.0856952 0
+ 0.653179 -0.0813479 0 0.669574 -0.0772713 0 0.685195 -0.0734431 0 0.700082 -0.069843 0
+ 0.714272 -0.0664531 0 0.727798 -0.0632574 0 0.740694 -0.0602413 0 0.752988 -0.0573923 0
+ 0.76471 -0.0546987 0 0.775886 -0.0521505 0 0.78654 -0.0497385 0 0.796696 -0.0474547 0
+ 0.806377 -0.0452918 0 0.815603 -0.0432436 0 0.824394 -0.0413043 0 0.832769 -0.0394692 0
+ 0.840745 -0.0377342 0 0.848338 -0.0360955 0 0.855563 -0.0345504 0 0.862433 -0.0330964 0
+ 0.868963 -0.0317317 0 0.875161 -0.0304547 0 0.881038 -0.0292643 0 0.8866 -0.0281588 0
+ 0.891853 -0.0271359 0 0.8968 -0.0261911 0 0.90144 -0.0253155 0 0.905773 -0.0244906 0
+ 0.909797 -0.0236792 0 0.913521 -0.0228046 0 0.916988 -0.0217108 0 0.920347 -0.020083 0
+ 0.512534 -0.229051 0 0.536695 -0.22345 0 0.558734 -0.215282 0 0.579616 -0.20589 0
+ 0.599349 -0.196014 0 0.618022 -0.186153 0 0.635698 -0.176537 0 0.652467 -0.167233 0
+ 0.668427 -0.1583 0 0.683662 -0.149758 0 0.698249 -0.141628 0 0.712241 -0.133941 0
+ 0.725661 -0.126715 0 0.738522 -0.119945 0 0.750834 -0.113611 0 0.76261 -0.107688 0
+ 0.773866 -0.102144 0 0.784621 -0.096951 0 0.794895 -0.0920798 0 0.804706 -0.0875046 0
+ 0.814075 -0.0832017 0 0.823019 -0.0791494 0 0.831557 -0.0753286 0 0.839705 -0.0717218 0
+ 0.847481 -0.0683135 0 0.854898 -0.0650899 0 0.861973 -0.0620384 0 0.868719 -0.0591481 0
+ 0.87515 -0.056409 0 0.881279 -0.0538122 0 0.887117 -0.0513496 0 0.892676 -0.0490143 0
+ 0.897968 -0.0468 0 0.903003 -0.044701 0 0.907789 -0.0427124 0 0.912337 -0.0408299 0
+ 0.916654 -0.0390497 0 0.920748 -0.0373687 0 0.924625 -0.0357839 0 0.928289 -0.0342928 0
+ 0.931746 -0.032893 0 0.934998 -0.0315814 0 0.938046 -0.0303544 0 0.940891 -0.0292059 0
+ 0.943533 -0.0281261 0 0.945971 -0.0270966 0 0.94821 -0.0260839 0 0.950266 -0.0250242 0
+ 0.952183 -0.0237982 0 0.954074 -0.0221962 0 0.898638 -0.23959 0 0.900569 -0.23379 0
+ 0.903712 -0.225087 0 0.906678 -0.215163 0 0.909567 -0.204838 0 0.912433 -0.194561 0
+ 0.91529 -0.184556 0 0.918145 -0.174914 0 0.921014 -0.165681 0 0.923907 -0.156879 0
+ 0.926833 -0.148518 0 0.929791 -0.140611 0 0.932768 -0.133163 0 0.935743 -0.126165 0
+ 0.938693 -0.119601 0 0.941601 -0.113445 0 0.944451 -0.107672 0 0.947232 -0.102252 0
+ 0.949935 -0.0971599 0 0.952554 -0.0923694 0 0.955086 -0.0878573 0 0.957528 -0.0836023 0
+ 0.959877 -0.0795851 0 0.962132 -0.0757885 0 0.964294 -0.0721967 0 0.966363 -0.0687957 0
+ 0.968339 -0.0655732 0 0.970223 -0.0625177 0 0.972017 -0.0596192 0 0.973722 -0.0568686 0
+ 0.97534 -0.0542578 0 0.976871 -0.0517793 0 0.978319 -0.0494267 0 0.979684 -0.0471939 0
+ 0.980968 -0.0450758 0 0.982171 -0.0430675 0 0.983295 -0.0411649 0 0.98434 -0.0393641 0
+ 0.985305 -0.0376617 0 0.986189 -0.0360545 0 0.986992 -0.0345391 0 0.987711 -0.0331119 0
+ 0.988344 -0.0317685 0 0.988887 -0.0305025 0 0.98934 -0.0293046 0 0.989703 -0.028159 0
+ 0.989985 -0.0270385 0 0.990208 -0.0258932 0 0.990419 -0.0246316 0 0.990696 -0.0230974 0
+ 1.29205 -0.235012 0 1.27273 -0.228714 0 1.25699 -0.220087 0 1.2419 -0.210465 0
+ 1.22775 -0.200529 0 1.21461 -0.190647 0 1.20243 -0.181013 0 1.19115 -0.171719 0
+ 1.18071 -0.162814 0 1.17103 -0.15432 0 1.16207 -0.146249 0 1.15377 -0.138606 0
+ 1.14607 -0.131392 0 1.13893 -0.124597 0 1.13227 -0.118207 0 1.12607 -0.112201 0
+ 1.12027 -0.106554 0 1.11483 -0.101244 0 1.10972 -0.0962445 0 1.10491 -0.0915339 0
+ 1.10038 -0.0870903 0 1.09609 -0.0828942 0 1.09203 -0.0789274 0 1.08819 -0.0751739 0
+ 1.08454 -0.071619 0 1.08106 -0.0682495 0 1.07775 -0.0650537 0 1.0746 -0.0620209 0
+ 1.07159 -0.0591414 0 1.06871 -0.0564067 0 1.06595 -0.0538088 0 1.06331 -0.0513407 0
+ 1.06078 -0.0489959 0 1.05834 -0.0467687 0 1.056 -0.0446537 0 1.05374 -0.0426462 0
+ 1.05156 -0.0407418 0 1.04945 -0.0389365 0 1.04741 -0.0372266 0 1.04542 -0.0356085 0
+ 1.04349 -0.0340786 0 1.0416 -0.0326331 0 1.03974 -0.0312674 0 1.03791 -0.0299759 0
+ 1.03611 -0.028751 0 1.03433 -0.0275812 0 1.03259 -0.0264482 0 1.03091 -0.0253174 0
+ 1.02934 -0.0241185 0 1.02793 -0.0227041 0 1.66803 -0.215812 0 1.62992 -0.208921 0
+ 1.59688 -0.200855 0 1.56515 -0.192243 0 1.53517 -0.183451 0 1.50704 -0.174701 0
+ 1.48068 -0.166132 0 1.45599 -0.157827 0 1.43285 -0.149836 0 1.41114 -0.142189 0
+ 1.39075 -0.134904 0 1.3716 -0.127989 0 1.35359 -0.121445 0 1.33664 -0.115265 0
+ 1.32067 -0.109439 0 1.3056 -0.10395 0 1.29136 -0.0987777 0 1.27791 -0.0939034 0
+ 1.26517 -0.0893063 0 1.25309 -0.084967 0 1.24164 -0.0808672 0 1.23077 -0.0769898 0
+ 1.22043 -0.0733196 0 1.21061 -0.0698423 0 1.20125 -0.0665452 0 1.19234 -0.063417 0
+ 1.18385 -0.0604472 0 1.17575 -0.0576265 0 1.16803 -0.0549463 0 1.16066 -0.052399 0
+ 1.15361 -0.0499775 0 1.14688 -0.0476755 0 1.14045 -0.045487 0 1.1343 -0.0434068 0
+ 1.12841 -0.0414299 0 1.12277 -0.0395519 0 1.11736 -0.0377686 0 1.11218 -0.0360761 0
+ 1.1072 -0.0344708 0 1.10242 -0.0329493 0 1.09782 -0.0315078 0 1.09338 -0.0301429 0
+ 1.08911 -0.0288505 0 1.08498 -0.0276261 0 1.08098 -0.0264646 0 1.07713 -0.0253599 0
+ 1.07341 -0.0243033 0 1.06986 -0.0232772 0 1.06652 -0.0222297 0 1.06343 -0.0209955 0
+ 2.00279 -0.183281 0 1.94931 -0.176133 0 1.90169 -0.169105 0 1.85599 -0.162058 0
+ 1.81264 -0.154975 0 1.7717 -0.147911 0 1.73307 -0.140938 0 1.69664 -0.134125 0
+ 1.66227 -0.127526 0 1.62983 -0.121177 0 1.5992 -0.115104 0 1.57027 -0.109321 0
+ 1.54292 -0.103832 0 1.51707 -0.0986348 0 1.49261 -0.0937226 0 1.46945 -0.0890833 0
+ 1.4475 -0.0847026 0 1.4267 -0.0805652 0 1.40695 -0.0766554 0 1.3882 -0.072958 0
+ 1.37038 -0.0694587 0 1.35343 -0.0661441 0 1.33731 -0.063002 0 1.32197 -0.0600213 0
+ 1.30736 -0.0571918 0 1.29343 -0.0545043 0 1.28016 -0.0519506 0 1.26751 -0.0495231 0
+ 1.25544 -0.0472149 0 1.24392 -0.0450196 0 1.23294 -0.0429315 0 1.22244 -0.0409452 0
+ 1.21243 -0.0390559 0 1.20286 -0.037259 0 1.19371 -0.0355503 0 1.18497 -0.033926 0
+ 1.17661 -0.0323823 0 1.16861 -0.030916 0 1.16095 -0.0295237 0 1.15362 -0.0282023 0
+ 1.14659 -0.0269487 0 1.13984 -0.0257598 0 1.13337 -0.0246324 0 1.12715 -0.0235633 0
+ 1.12117 -0.02255 0 1.11542 -0.0215909 0 1.10991 -0.020687 0 1.10464 -0.0198369 0
+ 1.09965 -0.01901 0 1.09499 -0.0180216 0 2.27507 -0.139466 0 2.21034 -0.132825 0
+ 2.1517 -0.127399 0 2.0956 -0.122332 0 2.0422 -0.117297 0 1.99145 -0.112229 0
+ 1.94325 -0.107162 0 1.8975 -0.102158 0 1.8541 -0.0972716 0 1.81293 -0.0925443 0
+ 1.77389 -0.088004 0 1.73688 -0.0836666 0 1.70179 -0.0795395 0 1.66851 -0.0756229 0
+ 1.63695 -0.0719124 0 1.60699 -0.0684002 0 1.57855 -0.0650764 0 1.55153 -0.0619305 0
+ 1.52586 -0.0589515 0 1.50144 -0.0561289 0 1.47822 -0.0534526 0 1.45611 -0.0509134 0
+ 1.43507 -0.0485028 0 1.41503 -0.0462129 0 1.39594 -0.0440366 0 1.37775 -0.0419674 0
+ 1.36041 -0.0399994 0 1.34388 -0.0381272 0 1.32812 -0.0363458 0 1.31308 -0.0346505 0
+ 1.29874 -0.0330371 0 1.28506 -0.0315016 0 1.27201 -0.0300403 0 1.25954 -0.0286498 0
+ 1.24765 -0.0273269 0 1.23629 -0.0260685 0 1.22544 -0.0248718 0 1.21507 -0.0237342 0
+ 1.20516 -0.022653 0 1.19569 -0.0216259 0 1.18663 -0.0206503 0 1.17795 -0.0197239 0
+ 1.16965 -0.0188443 0 1.16169 -0.0180097 0 1.15407 -0.0172191 0 1.14675 -0.0164742 0
+ 1.13974 -0.0157817 0 1.13303 -0.0151544 0 1.12663 -0.0145881 0 1.12062 -0.0139105 0
+ 2.46762 -0.0870729 0 2.39637 -0.0821149 0 2.33096 -0.078871 0 2.26847 -0.0759864 0
+ 2.20866 -0.0730689 0 2.15141 -0.0700591 0 2.09669 -0.0669979 0 2.04446 -0.0639433 0
+ 1.99469 -0.060944 0 1.94731 -0.058034 0 1.90225 -0.0552345 0 1.85941 -0.0525568 0
+ 1.8187 -0.0500055 0 1.78 -0.0475808 0 1.74323 -0.0452796 0 1.70826 -0.043097 0
+ 1.67501 -0.0410272 0 1.64339 -0.0390639 0 1.61329 -0.0372009 0 1.58465 -0.0354322 0
+ 1.55737 -0.0337521 0 1.5314 -0.0321554 0 1.50667 -0.0306372 0 1.4831 -0.0291933 0
+ 1.46064 -0.0278194 0 1.43925 -0.0265119 0 1.41885 -0.0252674 0 1.39941 -0.0240825 0
+ 1.38088 -0.0229545 0 1.36321 -0.0218803 0 1.34636 -0.0208576 0 1.3303 -0.0198838 0
+ 1.31498 -0.0189567 0 1.30036 -0.018074 0 1.28642 -0.0172339 0 1.27312 -0.0164343 0
+ 1.26043 -0.0156734 0 1.24832 -0.0149495 0 1.23676 -0.0142611 0 1.22572 -0.0136063 0
+ 1.21517 -0.0129838 0 1.2051 -0.012392 0 1.19547 -0.0118296 0 1.18626 -0.0112954 0
+ 1.17746 -0.0107892 0 1.16903 -0.010313 0 1.16096 -0.00987423 0 1.15321 -0.00949044 0
+ 1.14577 -0.00918343 0 1.13871 -0.00885996 0 2.56902 -0.029554 0 2.49712 -0.0276693 0
+ 2.42921 -0.0266607 0 2.36367 -0.0257708 0 2.30042 -0.0248317 0 2.23959 -0.0238343 0
+ 2.18129 -0.0228058 0 2.12556 -0.0217742 0 2.07239 -0.0207602 0 2.02172 -0.019777 0
+ 1.97346 -0.0188318 0 1.92751 -0.0179282 0 1.88377 -0.0170673 0 1.84212 -0.0162486 0
+ 1.80247 -0.0154708 0 1.76472 -0.0147321 0 1.72877 -0.0140305 0 1.69452 -0.013364 0
+ 1.6619 -0.0127305 0 1.63083 -0.0121282 0 1.60123 -0.0115552 0 1.57302 -0.0110101 0
+ 1.54614 -0.0104913 0 1.52053 -0.00999733 0 1.49613 -0.00952701 0 1.47287 -0.00907911 0
+ 1.45071 -0.00865253 0 1.42958 -0.00824623 0 1.40945 -0.00785924 0 1.39026 -0.00749063 0
+ 1.37197 -0.00713954 0 1.35454 -0.00680514 0 1.33793 -0.00648666 0 1.32209 -0.00618338 0
+ 1.30699 -0.00589458 0 1.2926 -0.00561962 0 1.27888 -0.00535786 0 1.2658 -0.0051087 0
+ 1.25332 -0.00487158 0 1.24142 -0.00464592 0 1.23008 -0.00443122 0 1.21926 -0.00422694 0
+ 1.20893 -0.00403262 0 1.19908 -0.00384789 0 1.18968 -0.0036727 0 1.1807 -0.00350779 0
+ 1.17212 -0.00335617 0 1.1639 -0.00322621 0 1.15595 -0.00313439 0 1.1482 -0.00306408 0
</DataArray>
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
@@ -1414,19 +1414,19 @@
0.754695 0.0096607 0 0.766235 0.00920622 0 0.777232 0.00877312 0 0.787712 0.00836039 0
0.797699 0.00796708 0 0.807216 0.00759227 0 0.816286 0.0072351 0 0.824928 0.00689473 0
0.833165 0.00657037 0 0.841013 0.00626127 0 0.848493 0.00596671 0 0.85562 0.00568601 0
- -0.580556 -1.58545e-17 0 -0.5062 -1.51086e-17 0 -0.435341 -1.43978e-17 0 -0.367817 -1.37205e-17 0
- -0.303468 -1.3075e-17 0 -0.242147 -1.24599e-17 0 -0.183711 -1.18737e-17 0 -0.128024 -1.13151e-17 0
- -0.0749569 -1.07828e-17 0 -0.0243861 -1.02756e-17 0 0.0238056 -9.79215e-18 0 0.0697301 -9.33148e-18 0
- 0.113494 -8.89249e-18 0 0.155199 -8.47414e-18 0 0.194943 -8.07548e-18 0 0.232816 -7.69558e-18 0
- 0.268908 -7.33354e-18 0 0.303302 -6.98854e-18 0 0.336077 -6.65977e-18 0 0.367311 -6.34646e-18 0
- 0.397076 -6.0479e-18 0 0.42544 -5.76338e-18 0 0.45247 -5.49224e-18 0 0.478228 -5.23386e-18 0
- 0.502775 -4.98764e-18 0 0.526166 -4.753e-18 0 0.548458 -4.52939e-18 0 0.5697 -4.31631e-18 0
- 0.589943 -4.11325e-18 0 0.609234 -3.91975e-18 0 0.627618 -3.73535e-18 0 0.645136 -3.55962e-18 0
- 0.661831 -3.39216e-18 0 0.67774 -3.23258e-18 0 0.6929 -3.0805e-18 0 0.707347 -2.93558e-18 0
- 0.721115 -2.79748e-18 0 0.734235 -2.66587e-18 0 0.746738 -2.54046e-18 0 0.758652 -2.42094e-18 0
- 0.770007 -2.30705e-18 0 0.780826 -2.19852e-18 0 0.791137 -2.09509e-18 0 0.800963 -1.99653e-18 0
- 0.810327 -1.9026e-18 0 0.81925 -1.81309e-18 0 0.827753 -1.7278e-18 0 0.835856 -1.64651e-18 0
- 0.843578 -1.56906e-18 0 0.850937 -1.49524e-18 0 -0.5309 -0.0602904 0 -0.45888 -0.0574541 0
+ -0.580556 -0 0 -0.5062 -0 0 -0.435341 -0 0 -0.367817 -0 0
+ -0.303468 -0 0 -0.242147 -0 0 -0.183711 -0 0 -0.128024 -0 0
+ -0.0749569 -0 0 -0.0243861 -0 0 0.0238056 -0 0 0.0697301 -0 0
+ 0.113494 -0 0 0.155199 -0 0 0.194943 -0 0 0.232816 -0 0
+ 0.268908 -0 0 0.303302 -0 0 0.336077 -0 0 0.367311 -0 0
+ 0.397076 -0 0 0.42544 -0 0 0.45247 -0 0 0.478228 -0 0
+ 0.502775 -0 0 0.526166 -0 0 0.548458 -0 0 0.5697 -0 0
+ 0.589943 -0 0 0.609234 -0 0 0.627618 -0 0 0.645136 -0 0
+ 0.661831 -0 0 0.67774 -0 0 0.6929 -0 0 0.707347 -0 0
+ 0.721115 -0 0 0.734235 -0 0 0.746738 -0 0 0.758652 -0 0
+ 0.770007 -0 0 0.780826 -0 0 0.791137 -0 0 0.800963 -0 0
+ 0.810327 -0 0 0.81925 -0 0 0.827753 -0 0 0.835856 -0 0
+ 0.843578 -0 0 0.850937 -0 0 -0.5309 -0.0602904 0 -0.45888 -0.0574541 0
-0.390247 -0.0547512 0 -0.324844 -0.0521755 0 -0.262517 -0.0497209 0 -0.203123 -0.0473818 0
-0.146523 -0.0451527 0 -0.0925852 -0.0430286 0 -0.0411851 -0.0410043 0 0.00779687 -0.0390753 0
0.0544745 -0.037237 0 0.0989563 -0.0354852 0 0.141345 -0.0338158 0 0.18174 -0.032225 0
@@ -1898,7 +1898,7 @@
-0.3 -0.5 0 -0.3 -0.46 0 -0.25 -0.5 0 -0.25 -0.46 0
-0.2 -0.5 0 -0.2 -0.46 0 -0.15 -0.5 0 -0.15 -0.46 0
-0.1 -0.5 0 -0.1 -0.46 0 -0.05 -0.5 0 -0.05 -0.46 0
- 2.77556e-17 -0.5 0 2.77556e-17 -0.46 0 0.05 -0.5 0 0.05 -0.46 0
+ 0 -0.5 0 0 -0.46 0 0.05 -0.5 0 0.05 -0.46 0
0.1 -0.5 0 0.1 -0.46 0 0.15 -0.5 0 0.15 -0.46 0
0.2 -0.5 0 0.2 -0.46 0 0.25 -0.5 0 0.25 -0.46 0
0.3 -0.5 0 0.3 -0.46 0 0.35 -0.5 0 0.35 -0.46 0
@@ -1921,7 +1921,7 @@
2 -0.5 0 2 -0.46 0 -0.5 -0.42 0 -0.45 -0.42 0
-0.4 -0.42 0 -0.35 -0.42 0 -0.3 -0.42 0 -0.25 -0.42 0
-0.2 -0.42 0 -0.15 -0.42 0 -0.1 -0.42 0 -0.05 -0.42 0
- 2.77556e-17 -0.42 0 0.05 -0.42 0 0.1 -0.42 0 0.15 -0.42 0
+ 0 -0.42 0 0.05 -0.42 0 0.1 -0.42 0 0.15 -0.42 0
0.2 -0.42 0 0.25 -0.42 0 0.3 -0.42 0 0.35 -0.42 0
0.4 -0.42 0 0.45 -0.42 0 0.5 -0.42 0 0.55 -0.42 0
0.6 -0.42 0 0.65 -0.42 0 0.7 -0.42 0 0.75 -0.42 0
@@ -1933,7 +1933,7 @@
1.8 -0.42 0 1.85 -0.42 0 1.9 -0.42 0 1.95 -0.42 0
2 -0.42 0 -0.5 -0.38 0 -0.45 -0.38 0 -0.4 -0.38 0
-0.35 -0.38 0 -0.3 -0.38 0 -0.25 -0.38 0 -0.2 -0.38 0
- -0.15 -0.38 0 -0.1 -0.38 0 -0.05 -0.38 0 2.77556e-17 -0.38 0
+ -0.15 -0.38 0 -0.1 -0.38 0 -0.05 -0.38 0 0 -0.38 0
0.05 -0.38 0 0.1 -0.38 0 0.15 -0.38 0 0.2 -0.38 0
0.25 -0.38 0 0.3 -0.38 0 0.35 -0.38 0 0.4 -0.38 0
0.45 -0.38 0 0.5 -0.38 0 0.55 -0.38 0 0.6 -0.38 0
@@ -1946,7 +1946,7 @@
1.85 -0.38 0 1.9 -0.38 0 1.95 -0.38 0 2 -0.38 0
-0.5 -0.34 0 -0.45 -0.34 0 -0.4 -0.34 0 -0.35 -0.34 0
-0.3 -0.34 0 -0.25 -0.34 0 -0.2 -0.34 0 -0.15 -0.34 0
- -0.1 -0.34 0 -0.05 -0.34 0 2.77556e-17 -0.34 0 0.05 -0.34 0
+ -0.1 -0.34 0 -0.05 -0.34 0 0 -0.34 0 0.05 -0.34 0
0.1 -0.34 0 0.15 -0.34 0 0.2 -0.34 0 0.25 -0.34 0
0.3 -0.34 0 0.35 -0.34 0 0.4 -0.34 0 0.45 -0.34 0
0.5 -0.34 0 0.55 -0.34 0 0.6 -0.34 0 0.65 -0.34 0
@@ -1959,7 +1959,7 @@
1.9 -0.34 0 1.95 -0.34 0 2 -0.34 0 -0.5 -0.3 0
-0.45 -0.3 0 -0.4 -0.3 0 -0.35 -0.3 0 -0.3 -0.3 0
-0.25 -0.3 0 -0.2 -0.3 0 -0.15 -0.3 0 -0.1 -0.3 0
- -0.05 -0.3 0 2.77556e-17 -0.3 0 0.05 -0.3 0 0.1 -0.3 0
+ -0.05 -0.3 0 0 -0.3 0 0.05 -0.3 0 0.1 -0.3 0
0.15 -0.3 0 0.2 -0.3 0 0.25 -0.3 0 0.3 -0.3 0
0.35 -0.3 0 0.4 -0.3 0 0.45 -0.3 0 0.5 -0.3 0
0.55 -0.3 0 0.6 -0.3 0 0.65 -0.3 0 0.7 -0.3 0
@@ -1972,7 +1972,7 @@
1.95 -0.3 0 2 -0.3 0 -0.5 -0.26 0 -0.45 -0.26 0
-0.4 -0.26 0 -0.35 -0.26 0 -0.3 -0.26 0 -0.25 -0.26 0
-0.2 -0.26 0 -0.15 -0.26 0 -0.1 -0.26 0 -0.05 -0.26 0
- 2.77556e-17 -0.26 0 0.05 -0.26 0 0.1 -0.26 0 0.15 -0.26 0
+ 0 -0.26 0 0.05 -0.26 0 0.1 -0.26 0 0.15 -0.26 0
0.2 -0.26 0 0.25 -0.26 0 0.3 -0.26 0 0.35 -0.26 0
0.4 -0.26 0 0.45 -0.26 0 0.5 -0.26 0 0.55 -0.26 0
0.6 -0.26 0 0.65 -0.26 0 0.7 -0.26 0 0.75 -0.26 0
@@ -1984,7 +1984,7 @@
1.8 -0.26 0 1.85 -0.26 0 1.9 -0.26 0 1.95 -0.26 0
2 -0.26 0 -0.5 -0.22 0 -0.45 -0.22 0 -0.4 -0.22 0
-0.35 -0.22 0 -0.3 -0.22 0 -0.25 -0.22 0 -0.2 -0.22 0
- -0.15 -0.22 0 -0.1 -0.22 0 -0.05 -0.22 0 2.77556e-17 -0.22 0
+ -0.15 -0.22 0 -0.1 -0.22 0 -0.05 -0.22 0 0 -0.22 0
0.05 -0.22 0 0.1 -0.22 0 0.15 -0.22 0 0.2 -0.22 0
0.25 -0.22 0 0.3 -0.22 0 0.35 -0.22 0 0.4 -0.22 0
0.45 -0.22 0 0.5 -0.22 0 0.55 -0.22 0 0.6 -0.22 0
@@ -1997,7 +1997,7 @@
1.85 -0.22 0 1.9 -0.22 0 1.95 -0.22 0 2 -0.22 0
-0.5 -0.18 0 -0.45 -0.18 0 -0.4 -0.18 0 -0.35 -0.18 0
-0.3 -0.18 0 -0.25 -0.18 0 -0.2 -0.18 0 -0.15 -0.18 0
- -0.1 -0.18 0 -0.05 -0.18 0 2.77556e-17 -0.18 0 0.05 -0.18 0
+ -0.1 -0.18 0 -0.05 -0.18 0 0 -0.18 0 0.05 -0.18 0
0.1 -0.18 0 0.15 -0.18 0 0.2 -0.18 0 0.25 -0.18 0
0.3 -0.18 0 0.35 -0.18 0 0.4 -0.18 0 0.45 -0.18 0
0.5 -0.18 0 0.55 -0.18 0 0.6 -0.18 0 0.65 -0.18 0
@@ -2010,7 +2010,7 @@
1.9 -0.18 0 1.95 -0.18 0 2 -0.18 0 -0.5 -0.14 0
-0.45 -0.14 0 -0.4 -0.14 0 -0.35 -0.14 0 -0.3 -0.14 0
-0.25 -0.14 0 -0.2 -0.14 0 -0.15 -0.14 0 -0.1 -0.14 0
- -0.05 -0.14 0 2.77556e-17 -0.14 0 0.05 -0.14 0 0.1 -0.14 0
+ -0.05 -0.14 0 0 -0.14 0 0.05 -0.14 0 0.1 -0.14 0
0.15 -0.14 0 0.2 -0.14 0 0.25 -0.14 0 0.3 -0.14 0
0.35 -0.14 0 0.4 -0.14 0 0.45 -0.14 0 0.5 -0.14 0
0.55 -0.14 0 0.6 -0.14 0 0.65 -0.14 0 0.7 -0.14 0
@@ -2023,7 +2023,7 @@
1.95 -0.14 0 2 -0.14 0 -0.5 -0.1 0 -0.45 -0.1 0
-0.4 -0.1 0 -0.35 -0.1 0 -0.3 -0.1 0 -0.25 -0.1 0
-0.2 -0.1 0 -0.15 -0.1 0 -0.1 -0.1 0 -0.05 -0.1 0
- 2.77556e-17 -0.1 0 0.05 -0.1 0 0.1 -0.1 0 0.15 -0.1 0
+ 0 -0.1 0 0.05 -0.1 0 0.1 -0.1 0 0.15 -0.1 0
0.2 -0.1 0 0.25 -0.1 0 0.3 -0.1 0 0.35 -0.1 0
0.4 -0.1 0 0.45 -0.1 0 0.5 -0.1 0 0.55 -0.1 0
0.6 -0.1 0 0.65 -0.1 0 0.7 -0.1 0 0.75 -0.1 0
@@ -2035,7 +2035,7 @@
1.8 -0.1 0 1.85 -0.1 0 1.9 -0.1 0 1.95 -0.1 0
2 -0.1 0 -0.5 -0.06 0 -0.45 -0.06 0 -0.4 -0.06 0
-0.35 -0.06 0 -0.3 -0.06 0 -0.25 -0.06 0 -0.2 -0.06 0
- -0.15 -0.06 0 -0.1 -0.06 0 -0.05 -0.06 0 2.77556e-17 -0.06 0
+ -0.15 -0.06 0 -0.1 -0.06 0 -0.05 -0.06 0 0 -0.06 0
0.05 -0.06 0 0.1 -0.06 0 0.15 -0.06 0 0.2 -0.06 0
0.25 -0.06 0 0.3 -0.06 0 0.35 -0.06 0 0.4 -0.06 0
0.45 -0.06 0 0.5 -0.06 0 0.55 -0.06 0 0.6 -0.06 0
@@ -2048,7 +2048,7 @@
1.85 -0.06 0 1.9 -0.06 0 1.95 -0.06 0 2 -0.06 0
-0.5 -0.02 0 -0.45 -0.02 0 -0.4 -0.02 0 -0.35 -0.02 0
-0.3 -0.02 0 -0.25 -0.02 0 -0.2 -0.02 0 -0.15 -0.02 0
- -0.1 -0.02 0 -0.05 -0.02 0 2.77556e-17 -0.02 0 0.05 -0.02 0
+ -0.1 -0.02 0 -0.05 -0.02 0 0 -0.02 0 0.05 -0.02 0
0.1 -0.02 0 0.15 -0.02 0 0.2 -0.02 0 0.25 -0.02 0
0.3 -0.02 0 0.35 -0.02 0 0.4 -0.02 0 0.45 -0.02 0
0.5 -0.02 0 0.55 -0.02 0 0.6 -0.02 0 0.65 -0.02 0
@@ -2061,7 +2061,7 @@
1.9 -0.02 0 1.95 -0.02 0 2 -0.02 0 -0.5 0.02 0
-0.45 0.02 0 -0.4 0.02 0 -0.35 0.02 0 -0.3 0.02 0
-0.25 0.02 0 -0.2 0.02 0 -0.15 0.02 0 -0.1 0.02 0
- -0.05 0.02 0 2.77556e-17 0.02 0 0.05 0.02 0 0.1 0.02 0
+ -0.05 0.02 0 0 0.02 0 0.05 0.02 0 0.1 0.02 0
0.15 0.02 0 0.2 0.02 0 0.25 0.02 0 0.3 0.02 0
0.35 0.02 0 0.4 0.02 0 0.45 0.02 0 0.5 0.02 0
0.55 0.02 0 0.6 0.02 0 0.65 0.02 0 0.7 0.02 0
@@ -2074,7 +2074,7 @@
1.95 0.02 0 2 0.02 0 -0.5 0.06 0 -0.45 0.06 0
-0.4 0.06 0 -0.35 0.06 0 -0.3 0.06 0 -0.25 0.06 0
-0.2 0.06 0 -0.15 0.06 0 -0.1 0.06 0 -0.05 0.06 0
- 2.77556e-17 0.06 0 0.05 0.06 0 0.1 0.06 0 0.15 0.06 0
+ 0 0.06 0 0.05 0.06 0 0.1 0.06 0 0.15 0.06 0
0.2 0.06 0 0.25 0.06 0 0.3 0.06 0 0.35 0.06 0
0.4 0.06 0 0.45 0.06 0 0.5 0.06 0 0.55 0.06 0
0.6 0.06 0 0.65 0.06 0 0.7 0.06 0 0.75 0.06 0
@@ -2086,7 +2086,7 @@
1.8 0.06 0 1.85 0.06 0 1.9 0.06 0 1.95 0.06 0
2 0.06 0 -0.5 0.1 0 -0.45 0.1 0 -0.4 0.1 0
-0.35 0.1 0 -0.3 0.1 0 -0.25 0.1 0 -0.2 0.1 0
- -0.15 0.1 0 -0.1 0.1 0 -0.05 0.1 0 2.77556e-17 0.1 0
+ -0.15 0.1 0 -0.1 0.1 0 -0.05 0.1 0 0 0.1 0
0.05 0.1 0 0.1 0.1 0 0.15 0.1 0 0.2 0.1 0
0.25 0.1 0 0.3 0.1 0 0.35 0.1 0 0.4 0.1 0
0.45 0.1 0 0.5 0.1 0 0.55 0.1 0 0.6 0.1 0
@@ -2099,7 +2099,7 @@
1.85 0.1 0 1.9 0.1 0 1.95 0.1 0 2 0.1 0
-0.5 0.14 0 -0.45 0.14 0 -0.4 0.14 0 -0.35 0.14 0
-0.3 0.14 0 -0.25 0.14 0 -0.2 0.14 0 -0.15 0.14 0
- -0.1 0.14 0 -0.05 0.14 0 2.77556e-17 0.14 0 0.05 0.14 0
+ -0.1 0.14 0 -0.05 0.14 0 0 0.14 0 0.05 0.14 0
0.1 0.14 0 0.15 0.14 0 0.2 0.14 0 0.25 0.14 0
0.3 0.14 0 0.35 0.14 0 0.4 0.14 0 0.45 0.14 0
0.5 0.14 0 0.55 0.14 0 0.6 0.14 0 0.65 0.14 0
@@ -2112,7 +2112,7 @@
1.9 0.14 0 1.95 0.14 0 2 0.14 0 -0.5 0.18 0
-0.45 0.18 0 -0.4 0.18 0 -0.35 0.18 0 -0.3 0.18 0
-0.25 0.18 0 -0.2 0.18 0 -0.15 0.18 0 -0.1 0.18 0
- -0.05 0.18 0 2.77556e-17 0.18 0 0.05 0.18 0 0.1 0.18 0
+ -0.05 0.18 0 0 0.18 0 0.05 0.18 0 0.1 0.18 0
0.15 0.18 0 0.2 0.18 0 0.25 0.18 0 0.3 0.18 0
0.35 0.18 0 0.4 0.18 0 0.45 0.18 0 0.5 0.18 0
0.55 0.18 0 0.6 0.18 0 0.65 0.18 0 0.7 0.18 0
@@ -2125,7 +2125,7 @@
1.95 0.18 0 2 0.18 0 -0.5 0.22 0 -0.45 0.22 0
-0.4 0.22 0 -0.35 0.22 0 -0.3 0.22 0 -0.25 0.22 0
-0.2 0.22 0 -0.15 0.22 0 -0.1 0.22 0 -0.05 0.22 0
- 2.77556e-17 0.22 0 0.05 0.22 0 0.1 0.22 0 0.15 0.22 0
+ 0 0.22 0 0.05 0.22 0 0.1 0.22 0 0.15 0.22 0
0.2 0.22 0 0.25 0.22 0 0.3 0.22 0 0.35 0.22 0
0.4 0.22 0 0.45 0.22 0 0.5 0.22 0 0.55 0.22 0
0.6 0.22 0 0.65 0.22 0 0.7 0.22 0 0.75 0.22 0
@@ -2137,7 +2137,7 @@
1.8 0.22 0 1.85 0.22 0 1.9 0.22 0 1.95 0.22 0
2 0.22 0 -0.5 0.26 0 -0.45 0.26 0 -0.4 0.26 0
-0.35 0.26 0 -0.3 0.26 0 -0.25 0.26 0 -0.2 0.26 0
- -0.15 0.26 0 -0.1 0.26 0 -0.05 0.26 0 2.77556e-17 0.26 0
+ -0.15 0.26 0 -0.1 0.26 0 -0.05 0.26 0 0 0.26 0
0.05 0.26 0 0.1 0.26 0 0.15 0.26 0 0.2 0.26 0
0.25 0.26 0 0.3 0.26 0 0.35 0.26 0 0.4 0.26 0
0.45 0.26 0 0.5 0.26 0 0.55 0.26 0 0.6 0.26 0
@@ -2150,7 +2150,7 @@
1.85 0.26 0 1.9 0.26 0 1.95 0.26 0 2 0.26 0
-0.5 0.3 0 -0.45 0.3 0 -0.4 0.3 0 -0.35 0.3 0
-0.3 0.3 0 -0.25 0.3 0 -0.2 0.3 0 -0.15 0.3 0
- -0.1 0.3 0 -0.05 0.3 0 2.77556e-17 0.3 0 0.05 0.3 0
+ -0.1 0.3 0 -0.05 0.3 0 0 0.3 0 0.05 0.3 0
0.1 0.3 0 0.15 0.3 0 0.2 0.3 0 0.25 0.3 0
0.3 0.3 0 0.35 0.3 0 0.4 0.3 0 0.45 0.3 0
0.5 0.3 0 0.55 0.3 0 0.6 0.3 0 0.65 0.3 0
@@ -2163,7 +2163,7 @@
1.9 0.3 0 1.95 0.3 0 2 0.3 0 -0.5 0.34 0
-0.45 0.34 0 -0.4 0.34 0 -0.35 0.34 0 -0.3 0.34 0
-0.25 0.34 0 -0.2 0.34 0 -0.15 0.34 0 -0.1 0.34 0
- -0.05 0.34 0 2.77556e-17 0.34 0 0.05 0.34 0 0.1 0.34 0
+ -0.05 0.34 0 0 0.34 0 0.05 0.34 0 0.1 0.34 0
0.15 0.34 0 0.2 0.34 0 0.25 0.34 0 0.3 0.34 0
0.35 0.34 0 0.4 0.34 0 0.45 0.34 0 0.5 0.34 0
0.55 0.34 0 0.6 0.34 0 0.65 0.34 0 0.7 0.34 0
@@ -2176,7 +2176,7 @@
1.95 0.34 0 2 0.34 0 -0.5 0.38 0 -0.45 0.38 0
-0.4 0.38 0 -0.35 0.38 0 -0.3 0.38 0 -0.25 0.38 0
-0.2 0.38 0 -0.15 0.38 0 -0.1 0.38 0 -0.05 0.38 0
- 2.77556e-17 0.38 0 0.05 0.38 0 0.1 0.38 0 0.15 0.38 0
+ 0 0.38 0 0.05 0.38 0 0.1 0.38 0 0.15 0.38 0
0.2 0.38 0 0.25 0.38 0 0.3 0.38 0 0.35 0.38 0
0.4 0.38 0 0.45 0.38 0 0.5 0.38 0 0.55 0.38 0
0.6 0.38 0 0.65 0.38 0 0.7 0.38 0 0.75 0.38 0
@@ -2188,7 +2188,7 @@
1.8 0.38 0 1.85 0.38 0 1.9 0.38 0 1.95 0.38 0
2 0.38 0 -0.5 0.42 0 -0.45 0.42 0 -0.4 0.42 0
-0.35 0.42 0 -0.3 0.42 0 -0.25 0.42 0 -0.2 0.42 0
- -0.15 0.42 0 -0.1 0.42 0 -0.05 0.42 0 2.77556e-17 0.42 0
+ -0.15 0.42 0 -0.1 0.42 0 -0.05 0.42 0 0 0.42 0
0.05 0.42 0 0.1 0.42 0 0.15 0.42 0 0.2 0.42 0
0.25 0.42 0 0.3 0.42 0 0.35 0.42 0 0.4 0.42 0
0.45 0.42 0 0.5 0.42 0 0.55 0.42 0 0.6 0.42 0
@@ -2201,7 +2201,7 @@
1.85 0.42 0 1.9 0.42 0 1.95 0.42 0 2 0.42 0
-0.5 0.46 0 -0.45 0.46 0 -0.4 0.46 0 -0.35 0.46 0
-0.3 0.46 0 -0.25 0.46 0 -0.2 0.46 0 -0.15 0.46 0
- -0.1 0.46 0 -0.05 0.46 0 2.77556e-17 0.46 0 0.05 0.46 0
+ -0.1 0.46 0 -0.05 0.46 0 0 0.46 0 0.05 0.46 0
0.1 0.46 0 0.15 0.46 0 0.2 0.46 0 0.25 0.46 0
0.3 0.46 0 0.35 0.46 0 0.4 0.46 0 0.45 0.46 0
0.5 0.46 0 0.55 0.46 0 0.6 0.46 0 0.65 0.46 0
@@ -2214,7 +2214,7 @@
1.9 0.46 0 1.95 0.46 0 2 0.46 0 -0.5 0.5 0
-0.45 0.5 0 -0.4 0.5 0 -0.35 0.5 0 -0.3 0.5 0
-0.25 0.5 0 -0.2 0.5 0 -0.15 0.5 0 -0.1 0.5 0
- -0.05 0.5 0 2.77556e-17 0.5 0 0.05 0.5 0 0.1 0.5 0
+ -0.05 0.5 0 0 0.5 0 0.05 0.5 0 0.1 0.5 0
0.15 0.5 0 0.2 0.5 0 0.25 0.5 0 0.3 0.5 0
0.35 0.5 0 0.4 0.5 0 0.45 0.5 0 0.5 0.5 0
0.55 0.5 0 0.6 0.5 0 0.65 0.5 0 0.7 0.5 0
@@ -2227,7 +2227,7 @@
1.95 0.5 0 2 0.5 0 -0.5 0.54 0 -0.45 0.54 0
-0.4 0.54 0 -0.35 0.54 0 -0.3 0.54 0 -0.25 0.54 0
-0.2 0.54 0 -0.15 0.54 0 -0.1 0.54 0 -0.05 0.54 0
- 2.77556e-17 0.54 0 0.05 0.54 0 0.1 0.54 0 0.15 0.54 0
+ 0 0.54 0 0.05 0.54 0 0.1 0.54 0 0.15 0.54 0
0.2 0.54 0 0.25 0.54 0 0.3 0.54 0 0.35 0.54 0
0.4 0.54 0 0.45 0.54 0 0.5 0.54 0 0.55 0.54 0
0.6 0.54 0 0.65 0.54 0 0.7 0.54 0 0.75 0.54 0
@@ -2239,7 +2239,7 @@
1.8 0.54 0 1.85 0.54 0 1.9 0.54 0 1.95 0.54 0
2 0.54 0 -0.5 0.58 0 -0.45 0.58 0 -0.4 0.58 0
-0.35 0.58 0 -0.3 0.58 0 -0.25 0.58 0 -0.2 0.58 0
- -0.15 0.58 0 -0.1 0.58 0 -0.05 0.58 0 2.77556e-17 0.58 0
+ -0.15 0.58 0 -0.1 0.58 0 -0.05 0.58 0 0 0.58 0
0.05 0.58 0 0.1 0.58 0 0.15 0.58 0 0.2 0.58 0
0.25 0.58 0 0.3 0.58 0 0.35 0.58 0 0.4 0.58 0
0.45 0.58 0 0.5 0.58 0 0.55 0.58 0 0.6 0.58 0
@@ -2252,7 +2252,7 @@
1.85 0.58 0 1.9 0.58 0 1.95 0.58 0 2 0.58 0
-0.5 0.62 0 -0.45 0.62 0 -0.4 0.62 0 -0.35 0.62 0
-0.3 0.62 0 -0.25 0.62 0 -0.2 0.62 0 -0.15 0.62 0
- -0.1 0.62 0 -0.05 0.62 0 2.77556e-17 0.62 0 0.05 0.62 0
+ -0.1 0.62 0 -0.05 0.62 0 0 0.62 0 0.05 0.62 0
0.1 0.62 0 0.15 0.62 0 0.2 0.62 0 0.25 0.62 0
0.3 0.62 0 0.35 0.62 0 0.4 0.62 0 0.45 0.62 0
0.5 0.62 0 0.55 0.62 0 0.6 0.62 0 0.65 0.62 0
@@ -2265,7 +2265,7 @@
1.9 0.62 0 1.95 0.62 0 2 0.62 0 -0.5 0.66 0
-0.45 0.66 0 -0.4 0.66 0 -0.35 0.66 0 -0.3 0.66 0
-0.25 0.66 0 -0.2 0.66 0 -0.15 0.66 0 -0.1 0.66 0
- -0.05 0.66 0 2.77556e-17 0.66 0 0.05 0.66 0 0.1 0.66 0
+ -0.05 0.66 0 0 0.66 0 0.05 0.66 0 0.1 0.66 0
0.15 0.66 0 0.2 0.66 0 0.25 0.66 0 0.3 0.66 0
0.35 0.66 0 0.4 0.66 0 0.45 0.66 0 0.5 0.66 0
0.55 0.66 0 0.6 0.66 0 0.65 0.66 0 0.7 0.66 0
@@ -2278,7 +2278,7 @@
1.95 0.66 0 2 0.66 0 -0.5 0.7 0 -0.45 0.7 0
-0.4 0.7 0 -0.35 0.7 0 -0.3 0.7 0 -0.25 0.7 0
-0.2 0.7 0 -0.15 0.7 0 -0.1 0.7 0 -0.05 0.7 0
- 2.77556e-17 0.7 0 0.05 0.7 0 0.1 0.7 0 0.15 0.7 0
+ 0 0.7 0 0.05 0.7 0 0.1 0.7 0 0.15 0.7 0
0.2 0.7 0 0.25 0.7 0 0.3 0.7 0 0.35 0.7 0
0.4 0.7 0 0.45 0.7 0 0.5 0.7 0 0.55 0.7 0
0.6 0.7 0 0.65 0.7 0 0.7 0.7 0 0.75 0.7 0
@@ -2290,7 +2290,7 @@
1.8 0.7 0 1.85 0.7 0 1.9 0.7 0 1.95 0.7 0
2 0.7 0 -0.5 0.74 0 -0.45 0.74 0 -0.4 0.74 0
-0.35 0.74 0 -0.3 0.74 0 -0.25 0.74 0 -0.2 0.74 0
- -0.15 0.74 0 -0.1 0.74 0 -0.05 0.74 0 2.77556e-17 0.74 0
+ -0.15 0.74 0 -0.1 0.74 0 -0.05 0.74 0 0 0.74 0
0.05 0.74 0 0.1 0.74 0 0.15 0.74 0 0.2 0.74 0
0.25 0.74 0 0.3 0.74 0 0.35 0.74 0 0.4 0.74 0
0.45 0.74 0 0.5 0.74 0 0.55 0.74 0 0.6 0.74 0
@@ -2303,7 +2303,7 @@
1.85 0.74 0 1.9 0.74 0 1.95 0.74 0 2 0.74 0
-0.5 0.78 0 -0.45 0.78 0 -0.4 0.78 0 -0.35 0.78 0
-0.3 0.78 0 -0.25 0.78 0 -0.2 0.78 0 -0.15 0.78 0
- -0.1 0.78 0 -0.05 0.78 0 2.77556e-17 0.78 0 0.05 0.78 0
+ -0.1 0.78 0 -0.05 0.78 0 0 0.78 0 0.05 0.78 0
0.1 0.78 0 0.15 0.78 0 0.2 0.78 0 0.25 0.78 0
0.3 0.78 0 0.35 0.78 0 0.4 0.78 0 0.45 0.78 0
0.5 0.78 0 0.55 0.78 0 0.6 0.78 0 0.65 0.78 0
@@ -2316,7 +2316,7 @@
1.9 0.78 0 1.95 0.78 0 2 0.78 0 -0.5 0.82 0
-0.45 0.82 0 -0.4 0.82 0 -0.35 0.82 0 -0.3 0.82 0
-0.25 0.82 0 -0.2 0.82 0 -0.15 0.82 0 -0.1 0.82 0
- -0.05 0.82 0 2.77556e-17 0.82 0 0.05 0.82 0 0.1 0.82 0
+ -0.05 0.82 0 0 0.82 0 0.05 0.82 0 0.1 0.82 0
0.15 0.82 0 0.2 0.82 0 0.25 0.82 0 0.3 0.82 0
0.35 0.82 0 0.4 0.82 0 0.45 0.82 0 0.5 0.82 0
0.55 0.82 0 0.6 0.82 0 0.65 0.82 0 0.7 0.82 0
@@ -2329,7 +2329,7 @@
1.95 0.82 0 2 0.82 0 -0.5 0.86 0 -0.45 0.86 0
-0.4 0.86 0 -0.35 0.86 0 -0.3 0.86 0 -0.25 0.86 0
-0.2 0.86 0 -0.15 0.86 0 -0.1 0.86 0 -0.05 0.86 0
- 2.77556e-17 0.86 0 0.05 0.86 0 0.1 0.86 0 0.15 0.86 0
+ 0 0.86 0 0.05 0.86 0 0.1 0.86 0 0.15 0.86 0
0.2 0.86 0 0.25 0.86 0 0.3 0.86 0 0.35 0.86 0
0.4 0.86 0 0.45 0.86 0 0.5 0.86 0 0.55 0.86 0
0.6 0.86 0 0.65 0.86 0 0.7 0.86 0 0.75 0.86 0
@@ -2341,7 +2341,7 @@
1.8 0.86 0 1.85 0.86 0 1.9 0.86 0 1.95 0.86 0
2 0.86 0 -0.5 0.9 0 -0.45 0.9 0 -0.4 0.9 0
-0.35 0.9 0 -0.3 0.9 0 -0.25 0.9 0 -0.2 0.9 0
- -0.15 0.9 0 -0.1 0.9 0 -0.05 0.9 0 2.77556e-17 0.9 0
+ -0.15 0.9 0 -0.1 0.9 0 -0.05 0.9 0 0 0.9 0
0.05 0.9 0 0.1 0.9 0 0.15 0.9 0 0.2 0.9 0
0.25 0.9 0 0.3 0.9 0 0.35 0.9 0 0.4 0.9 0
0.45 0.9 0 0.5 0.9 0 0.55 0.9 0 0.6 0.9 0
@@ -2354,7 +2354,7 @@
1.85 0.9 0 1.9 0.9 0 1.95 0.9 0 2 0.9 0
-0.5 0.94 0 -0.45 0.94 0 -0.4 0.94 0 -0.35 0.94 0
-0.3 0.94 0 -0.25 0.94 0 -0.2 0.94 0 -0.15 0.94 0
- -0.1 0.94 0 -0.05 0.94 0 2.77556e-17 0.94 0 0.05 0.94 0
+ -0.1 0.94 0 -0.05 0.94 0 0 0.94 0 0.05 0.94 0
0.1 0.94 0 0.15 0.94 0 0.2 0.94 0 0.25 0.94 0
0.3 0.94 0 0.35 0.94 0 0.4 0.94 0 0.45 0.94 0
0.5 0.94 0 0.55 0.94 0 0.6 0.94 0 0.65 0.94 0
@@ -2367,7 +2367,7 @@
1.9 0.94 0 1.95 0.94 0 2 0.94 0 -0.5 0.98 0
-0.45 0.98 0 -0.4 0.98 0 -0.35 0.98 0 -0.3 0.98 0
-0.25 0.98 0 -0.2 0.98 0 -0.15 0.98 0 -0.1 0.98 0
- -0.05 0.98 0 2.77556e-17 0.98 0 0.05 0.98 0 0.1 0.98 0
+ -0.05 0.98 0 0 0.98 0 0.05 0.98 0 0.1 0.98 0
0.15 0.98 0 0.2 0.98 0 0.25 0.98 0 0.3 0.98 0
0.35 0.98 0 0.4 0.98 0 0.45 0.98 0 0.5 0.98 0
0.55 0.98 0 0.6 0.98 0 0.65 0.98 0 0.7 0.98 0
@@ -2380,7 +2380,7 @@
1.95 0.98 0 2 0.98 0 -0.5 1.02 0 -0.45 1.02 0
-0.4 1.02 0 -0.35 1.02 0 -0.3 1.02 0 -0.25 1.02 0
-0.2 1.02 0 -0.15 1.02 0 -0.1 1.02 0 -0.05 1.02 0
- 2.77556e-17 1.02 0 0.05 1.02 0 0.1 1.02 0 0.15 1.02 0
+ 0 1.02 0 0.05 1.02 0 0.1 1.02 0 0.15 1.02 0
0.2 1.02 0 0.25 1.02 0 0.3 1.02 0 0.35 1.02 0
0.4 1.02 0 0.45 1.02 0 0.5 1.02 0 0.55 1.02 0
0.6 1.02 0 0.65 1.02 0 0.7 1.02 0 0.75 1.02 0
@@ -2392,7 +2392,7 @@
1.8 1.02 0 1.85 1.02 0 1.9 1.02 0 1.95 1.02 0
2 1.02 0 -0.5 1.06 0 -0.45 1.06 0 -0.4 1.06 0
-0.35 1.06 0 -0.3 1.06 0 -0.25 1.06 0 -0.2 1.06 0
- -0.15 1.06 0 -0.1 1.06 0 -0.05 1.06 0 2.77556e-17 1.06 0
+ -0.15 1.06 0 -0.1 1.06 0 -0.05 1.06 0 0 1.06 0
0.05 1.06 0 0.1 1.06 0 0.15 1.06 0 0.2 1.06 0
0.25 1.06 0 0.3 1.06 0 0.35 1.06 0 0.4 1.06 0
0.45 1.06 0 0.5 1.06 0 0.55 1.06 0 0.6 1.06 0
@@ -2405,7 +2405,7 @@
1.85 1.06 0 1.9 1.06 0 1.95 1.06 0 2 1.06 0
-0.5 1.1 0 -0.45 1.1 0 -0.4 1.1 0 -0.35 1.1 0
-0.3 1.1 0 -0.25 1.1 0 -0.2 1.1 0 -0.15 1.1 0
- -0.1 1.1 0 -0.05 1.1 0 2.77556e-17 1.1 0 0.05 1.1 0
+ -0.1 1.1 0 -0.05 1.1 0 0 1.1 0 0.05 1.1 0
0.1 1.1 0 0.15 1.1 0 0.2 1.1 0 0.25 1.1 0
0.3 1.1 0 0.35 1.1 0 0.4 1.1 0 0.45 1.1 0
0.5 1.1 0 0.55 1.1 0 0.6 1.1 0 0.65 1.1 0
@@ -2418,7 +2418,7 @@
1.9 1.1 0 1.95 1.1 0 2 1.1 0 -0.5 1.14 0
-0.45 1.14 0 -0.4 1.14 0 -0.35 1.14 0 -0.3 1.14 0
-0.25 1.14 0 -0.2 1.14 0 -0.15 1.14 0 -0.1 1.14 0
- -0.05 1.14 0 2.77556e-17 1.14 0 0.05 1.14 0 0.1 1.14 0
+ -0.05 1.14 0 0 1.14 0 0.05 1.14 0 0.1 1.14 0
0.15 1.14 0 0.2 1.14 0 0.25 1.14 0 0.3 1.14 0
0.35 1.14 0 0.4 1.14 0 0.45 1.14 0 0.5 1.14 0
0.55 1.14 0 0.6 1.14 0 0.65 1.14 0 0.7 1.14 0
@@ -2431,7 +2431,7 @@
1.95 1.14 0 2 1.14 0 -0.5 1.18 0 -0.45 1.18 0
-0.4 1.18 0 -0.35 1.18 0 -0.3 1.18 0 -0.25 1.18 0
-0.2 1.18 0 -0.15 1.18 0 -0.1 1.18 0 -0.05 1.18 0
- 2.77556e-17 1.18 0 0.05 1.18 0 0.1 1.18 0 0.15 1.18 0
+ 0 1.18 0 0.05 1.18 0 0.1 1.18 0 0.15 1.18 0
0.2 1.18 0 0.25 1.18 0 0.3 1.18 0 0.35 1.18 0
0.4 1.18 0 0.45 1.18 0 0.5 1.18 0 0.55 1.18 0
0.6 1.18 0 0.65 1.18 0 0.7 1.18 0 0.75 1.18 0
@@ -2443,7 +2443,7 @@
1.8 1.18 0 1.85 1.18 0 1.9 1.18 0 1.95 1.18 0
2 1.18 0 -0.5 1.22 0 -0.45 1.22 0 -0.4 1.22 0
-0.35 1.22 0 -0.3 1.22 0 -0.25 1.22 0 -0.2 1.22 0
- -0.15 1.22 0 -0.1 1.22 0 -0.05 1.22 0 2.77556e-17 1.22 0
+ -0.15 1.22 0 -0.1 1.22 0 -0.05 1.22 0 0 1.22 0
0.05 1.22 0 0.1 1.22 0 0.15 1.22 0 0.2 1.22 0
0.25 1.22 0 0.3 1.22 0 0.35 1.22 0 0.4 1.22 0
0.45 1.22 0 0.5 1.22 0 0.55 1.22 0 0.6 1.22 0
@@ -2456,7 +2456,7 @@
1.85 1.22 0 1.9 1.22 0 1.95 1.22 0 2 1.22 0
-0.5 1.26 0 -0.45 1.26 0 -0.4 1.26 0 -0.35 1.26 0
-0.3 1.26 0 -0.25 1.26 0 -0.2 1.26 0 -0.15 1.26 0
- -0.1 1.26 0 -0.05 1.26 0 2.77556e-17 1.26 0 0.05 1.26 0
+ -0.1 1.26 0 -0.05 1.26 0 0 1.26 0 0.05 1.26 0
0.1 1.26 0 0.15 1.26 0 0.2 1.26 0 0.25 1.26 0
0.3 1.26 0 0.35 1.26 0 0.4 1.26 0 0.45 1.26 0
0.5 1.26 0 0.55 1.26 0 0.6 1.26 0 0.65 1.26 0
@@ -2469,7 +2469,7 @@
1.9 1.26 0 1.95 1.26 0 2 1.26 0 -0.5 1.3 0
-0.45 1.3 0 -0.4 1.3 0 -0.35 1.3 0 -0.3 1.3 0
-0.25 1.3 0 -0.2 1.3 0 -0.15 1.3 0 -0.1 1.3 0
- -0.05 1.3 0 2.77556e-17 1.3 0 0.05 1.3 0 0.1 1.3 0
+ -0.05 1.3 0 0 1.3 0 0.05 1.3 0 0.1 1.3 0
0.15 1.3 0 0.2 1.3 0 0.25 1.3 0 0.3 1.3 0
0.35 1.3 0 0.4 1.3 0 0.45 1.3 0 0.5 1.3 0
0.55 1.3 0 0.6 1.3 0 0.65 1.3 0 0.7 1.3 0
@@ -2482,7 +2482,7 @@
1.95 1.3 0 2 1.3 0 -0.5 1.34 0 -0.45 1.34 0
-0.4 1.34 0 -0.35 1.34 0 -0.3 1.34 0 -0.25 1.34 0
-0.2 1.34 0 -0.15 1.34 0 -0.1 1.34 0 -0.05 1.34 0
- 2.77556e-17 1.34 0 0.05 1.34 0 0.1 1.34 0 0.15 1.34 0
+ 0 1.34 0 0.05 1.34 0 0.1 1.34 0 0.15 1.34 0
0.2 1.34 0 0.25 1.34 0 0.3 1.34 0 0.35 1.34 0
0.4 1.34 0 0.45 1.34 0 0.5 1.34 0 0.55 1.34 0
0.6 1.34 0 0.65 1.34 0 0.7 1.34 0 0.75 1.34 0
@@ -2494,7 +2494,7 @@
1.8 1.34 0 1.85 1.34 0 1.9 1.34 0 1.95 1.34 0
2 1.34 0 -0.5 1.38 0 -0.45 1.38 0 -0.4 1.38 0
-0.35 1.38 0 -0.3 1.38 0 -0.25 1.38 0 -0.2 1.38 0
- -0.15 1.38 0 -0.1 1.38 0 -0.05 1.38 0 2.77556e-17 1.38 0
+ -0.15 1.38 0 -0.1 1.38 0 -0.05 1.38 0 0 1.38 0
0.05 1.38 0 0.1 1.38 0 0.15 1.38 0 0.2 1.38 0
0.25 1.38 0 0.3 1.38 0 0.35 1.38 0 0.4 1.38 0
0.45 1.38 0 0.5 1.38 0 0.55 1.38 0 0.6 1.38 0
@@ -2507,7 +2507,7 @@
1.85 1.38 0 1.9 1.38 0 1.95 1.38 0 2 1.38 0
-0.5 1.42 0 -0.45 1.42 0 -0.4 1.42 0 -0.35 1.42 0
-0.3 1.42 0 -0.25 1.42 0 -0.2 1.42 0 -0.15 1.42 0
- -0.1 1.42 0 -0.05 1.42 0 2.77556e-17 1.42 0 0.05 1.42 0
+ -0.1 1.42 0 -0.05 1.42 0 0 1.42 0 0.05 1.42 0
0.1 1.42 0 0.15 1.42 0 0.2 1.42 0 0.25 1.42 0
0.3 1.42 0 0.35 1.42 0 0.4 1.42 0 0.45 1.42 0
0.5 1.42 0 0.55 1.42 0 0.6 1.42 0 0.65 1.42 0
@@ -2520,7 +2520,7 @@
1.9 1.42 0 1.95 1.42 0 2 1.42 0 -0.5 1.46 0
-0.45 1.46 0 -0.4 1.46 0 -0.35 1.46 0 -0.3 1.46 0
-0.25 1.46 0 -0.2 1.46 0 -0.15 1.46 0 -0.1 1.46 0
- -0.05 1.46 0 2.77556e-17 1.46 0 0.05 1.46 0 0.1 1.46 0
+ -0.05 1.46 0 0 1.46 0 0.05 1.46 0 0.1 1.46 0
0.15 1.46 0 0.2 1.46 0 0.25 1.46 0 0.3 1.46 0
0.35 1.46 0 0.4 1.46 0 0.45 1.46 0 0.5 1.46 0
0.55 1.46 0 0.6 1.46 0 0.65 1.46 0 0.7 1.46 0
@@ -2533,7 +2533,7 @@
1.95 1.46 0 2 1.46 0 -0.5 1.5 0 -0.45 1.5 0
-0.4 1.5 0 -0.35 1.5 0 -0.3 1.5 0 -0.25 1.5 0
-0.2 1.5 0 -0.15 1.5 0 -0.1 1.5 0 -0.05 1.5 0
- 2.77556e-17 1.5 0 0.05 1.5 0 0.1 1.5 0 0.15 1.5 0
+ 0 1.5 0 0.05 1.5 0 0.1 1.5 0 0.15 1.5 0
0.2 1.5 0 0.25 1.5 0 0.3 1.5 0 0.35 1.5 0
0.4 1.5 0 0.45 1.5 0 0.5 1.5 0 0.55 1.5 0
0.6 1.5 0 0.65 1.5 0 0.7 1.5 0 0.75 1.5 0