diff --git a/configure.ac b/configure.ac
index cff59c36c9a5afd3471786af51373aa2bf8e4479..80386d6cb680aefd11d0abcd13c0b5a2afa82901 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,6 +120,8 @@ AC_CONFIG_FILES([dumux.pc
test/geomechanics/el1p2c/Makefile
test/geomechanics/el2p/Makefile
test/material/Makefile
+ test/material/fluidmatrixinteractions/Makefile
+ test/material/fluidmatrixinteractions/2p/Makefile
test/material/fluidsystems/Makefile
test/material/immiscibleflash/Makefile
test/material/ncpflash/Makefile
diff --git a/dumux/io/gnuplotinterface.hh b/dumux/io/gnuplotinterface.hh
index 5d4ae16dea263f523294ab99487fc1f18b5d9d92..a19e7a111be9a4f152b099cbd35792b591334490 100644
--- a/dumux/io/gnuplotinterface.hh
+++ b/dumux/io/gnuplotinterface.hh
@@ -42,6 +42,8 @@
#include <string>
#include <vector>
+#include <dune/common/stdstreams.hh>
+
namespace Dumux
{
/*!
@@ -306,9 +308,9 @@ private:
void checkNumber(Scalar number, std::string text = "") const
{
if (std::isnan(number))
- std::cout << "warning: " << text << " is not a number, adjust your data range" << std::endl;
+ Dune::dwarn << "warning: " << text << " is not a number, adjust your data range" << std::endl;
if (std::isinf(number))
- std::cout << "warning: " << text << " is infinity, adjust your data range" << std::endl;
+ Dune::dwarn << "warning: " << text << " is infinity, adjust your data range" << std::endl;
}
// Convert number to string
diff --git a/test/material/CMakeLists.txt b/test/material/CMakeLists.txt
index 4edc997072d5796af9cbecda29a7e18f03aaebfd..f74559ffced8bced5842afc6ddaa1f3bee35028b 100644
--- a/test/material/CMakeLists.txt
+++ b/test/material/CMakeLists.txt
@@ -1,4 +1,5 @@
add_subdirectory("fluidsystems")
+add_subdirectory("fluidmatrixinteractions")
add_subdirectory("immiscibleflash")
add_subdirectory("ncpflash")
add_subdirectory("pengrobinson")
diff --git a/test/material/Makefile.am b/test/material/Makefile.am
index 0352053729d246ce4951f593d73c895b1403b30c..7921739c6b6b5522280e10d52a9a8c034e200021 100644
--- a/test/material/Makefile.am
+++ b/test/material/Makefile.am
@@ -1,4 +1,9 @@
-SUBDIRS = fluidsystems immiscibleflash ncpflash pengrobinson tabulation
+SUBDIRS = fluidmatrixinteractions \
+ fluidsystems \
+ immiscibleflash \
+ ncpflash \
+ pengrobinson \
+ tabulation
EXTRA_DIST=CMakeLists.txt
include $(top_srcdir)/am/global-rules
diff --git a/test/material/fluidmatrixinteractions/2p/CMakeLists.txt b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e7c5a9889a7f39ef97c4681a99972b18b946d546
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt
@@ -0,0 +1,21 @@
+add_dumux_test(test_thermalconductivityjohansen test_thermalconductivityjohansen test_thermalconductivityjohansen.cc
+ ${CMAKE_SOURCE_DIR}/bin/runTest.sh
+ exact
+ ${CMAKE_SOURCE_DIR}/test/references/thermalconductivityjohansen-reference.dat
+ ${CMAKE_CURRENT_BINARY_DIR}/8_lambda_eff.dat
+ ${CMAKE_CURRENT_BINARY_DIR}/test_thermalconductivityjohansen
+ -TimeManager.DtInitial 1 # [s]
+ -TimeManager.TEnd 2 # [s]
+ -Grid.File ${CMAKE_SOURCE_DIR}/test/implicit/2p/grids/test_2p.dgf
+)
+
+add_dumux_test(test_thermalconductivitysomerton test_thermalconductivitysomerton test_thermalconductivitysomerton.cc
+ ${CMAKE_SOURCE_DIR}/bin/runTest.sh
+ exact
+ ${CMAKE_SOURCE_DIR}/test/references/thermalconductivitysomerton-reference.dat
+ ${CMAKE_CURRENT_BINARY_DIR}/8_lambda_eff.dat
+ ${CMAKE_CURRENT_BINARY_DIR}/test_thermalconductivitysomerton
+ -TimeManager.DtInitial 1 # [s]
+ -TimeManager.TEnd 2 # [s]
+ -Grid.File ${CMAKE_SOURCE_DIR}/test/implicit/2p/grids/test_2p.dgf
+)
diff --git a/test/material/fluidmatrixinteractions/2p/Makefile.am b/test/material/fluidmatrixinteractions/2p/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..af40343014bc54c9c402ce594210b39a1ef9c8cf
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/2p/Makefile.am
@@ -0,0 +1,9 @@
+check_PROGRAMS = test_thermalconductivityjohansen \
+ test_thermalconductivitysomerton
+
+test_thermalconductivityjohansen_SOURCES = test_thermalconductivityjohansen.cc
+test_thermalconductivitysomerton_SOURCES = test_thermalconductivitysomerton.cc
+
+EXTRA_DIST=CMakeLists.txt
+noinst_HEADERS:=$(wildcard *.hh)
+include $(top_srcdir)/am/global-rules
diff --git a/test/material/fluidmatrixinteractions/2p/test_thermalconductivityjohansen.cc b/test/material/fluidmatrixinteractions/2p/test_thermalconductivityjohansen.cc
new file mode 100644
index 0000000000000000000000000000000000000000..4df0f78ea5459fae2126e843cb56a379462021c2
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/2p/test_thermalconductivityjohansen.cc
@@ -0,0 +1,58 @@
+// -*- 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 Johansen thermal conductivity law
+ */
+#include "config.h"
+#include "thermalconductivityjohansenproblem.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";
+
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+int main(int argc, char** argv)
+{
+ typedef TTAG(ThermalConductivityJohansenProblem) ProblemTypeTag;
+ return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+}
diff --git a/test/material/fluidmatrixinteractions/2p/test_thermalconductivitysomerton.cc b/test/material/fluidmatrixinteractions/2p/test_thermalconductivitysomerton.cc
new file mode 100644
index 0000000000000000000000000000000000000000..84049b83e8bc790fdc5728e1af43339ef8f1014c
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/2p/test_thermalconductivitysomerton.cc
@@ -0,0 +1,58 @@
+// -*- 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 Somerton thermal conductivity law
+ */
+#include "config.h"
+#include "thermalconductivitysomertonproblem.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";
+
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+int main(int argc, char** argv)
+{
+ typedef TTAG(ThermalConductivitySomertonProblem) ProblemTypeTag;
+ return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+}
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
new file mode 100644
index 0000000000000000000000000000000000000000..102c11e14bbfa830c8db471891d52904c15dd347
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
@@ -0,0 +1,218 @@
+// -*- 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 Simple test problem for the Johansen thermal conductivity law
+ */
+#ifndef DUMUX_THERMAL_CONDUCTIVITY_JOHANSEN_PROBLEM_HH
+#define DUMUX_THERMAL_CONDUCTIVITY_JOHANSEN_PROBLEM_HH
+
+#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+
+#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
+
+#include <dumux/implicit/2p2c/2p2cmodel.hh>
+#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivityjohansen.hh>
+
+#include "thermalconductivityspatialparams.hh"
+
+#define ISOTHERMAL 0
+
+namespace Dumux
+{
+template <class TypeTag>
+class ThermalConductivityJohansenProblem;
+
+namespace Properties
+{
+NEW_TYPE_TAG(ThermalConductivityJohansenProblem, INHERITS_FROM(BoxModel, TwoPTwoCNI, ThermalConductivitySpatialParams));
+
+// Set the grid type
+SET_TYPE_PROP(ThermalConductivityJohansenProblem, Grid, Dune::YaspGrid<2>);
+
+// Set the problem property
+SET_TYPE_PROP(ThermalConductivityJohansenProblem, Problem, Dumux::ThermalConductivityJohansenProblem<TypeTag>);
+
+// Set the wetting phase
+SET_TYPE_PROP(ThermalConductivityJohansenProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+
+// Set thermal conductivity law
+SET_TYPE_PROP(ThermalConductivityJohansenProblem, ThermalConductivityModel,
+ ThermalConductivityJohansen<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+}
+
+
+/*!
+ * \ingroup MaterialTestProblems
+ *
+ * \brief Simple test problem for the Johansen thermal conductivity law
+ *
+ * To run the test execute the following line in shell:
+ * <tt>./test_thermalconductivityjohansen</tt>
+ *
+ */
+template <class TypeTag >
+class ThermalConductivityJohansenProblem : public ImplicitPorousMediaProblem<TypeTag>
+{
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GridView::Grid Grid;
+
+ typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+
+ // copy some indices for convenience
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ enum {
+ pressureIdx = Indices::pressureIdx,
+ switchIdx = Indices::switchIdx,
+ temperatureIdx = Indices::temperatureIdx,
+
+ // Phase State
+ wPhaseOnly = Indices::wPhaseOnly,
+
+ // 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 Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+
+ //! property that defines whether mole or mass fractions are used
+ static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
+
+public:
+ /*!
+ * \brief The constructor.
+ *
+ * \param timeManager The time manager
+ * \param gridView The grid view
+ */
+ ThermalConductivityJohansenProblem(TimeManager &timeManager, const GridView &gridView)
+ : ParentType(timeManager, gridView)
+ {
+ FluidSystem::init();
+ this->spatialParams().plotMaterialLaw();
+ }
+
+ /*!
+ * \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 "test_thermalconductivitysomerton"; }
+
+
+ //! \copydoc Dumux::ImplicitProblem::sourceAtPos()
+ void sourceAtPos(PrimaryVariables &values,
+ const GlobalPosition &globalPos) const
+ {
+ values = 0;
+ }
+
+ // \}
+
+ /*!
+ * \name Boundary conditions
+ */
+ // \{
+
+
+ //! \copydoc Dumux::ImplicitProblem::boundaryTypesAtPos()
+ void boundaryTypesAtPos(BoundaryTypes &values,
+ const GlobalPosition &globalPos) const
+ {
+ values.setAllDirichlet();
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::dirichletAtPos()
+ void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
+ {
+ initial_(values, globalPos);
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::neumann()
+ void neumann(PrimaryVariables &values,
+ const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const Intersection &intersection,
+ const int scvIdx,
+ const int boundaryFaceIdx) const
+ {
+ values = 0;
+ }
+
+ // \}
+
+ /*!
+ * \name Volume terms
+ */
+ // \{
+
+
+ //! \copydoc Dumux::ImplicitProblem::initialAtPos()
+ void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
+ {
+ initial_(values, globalPos);
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::initialPhasePresence()
+ int initialPhasePresence(const Vertex &vertex,
+ int &vIdxGlobal,
+ const GlobalPosition &globalPos) const
+ {
+ return wPhaseOnly;
+ }
+
+private:
+ // internal method for the initial condition (reused for the
+ // dirichlet conditions!)
+ void initial_(PrimaryVariables &values,
+ const GlobalPosition &globalPos) const
+ {
+ Scalar densityW = 1000.0;
+ values[pressureIdx] = 1e5 + globalPos[1]*densityW*9.81;
+ values[switchIdx] = 0.0;
+ values[temperatureIdx] = 283.0 + globalPos[1]*0.03;
+ }
+};
+} //end namespace
+
+#endif
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
new file mode 100644
index 0000000000000000000000000000000000000000..115c20ed843cfb912ad67459cc528a35596985c2
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
@@ -0,0 +1,218 @@
+// -*- 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 Simple test problem for the Somerton thermal conductivity law
+ */
+#ifndef DUMUX_THERMAL_CONDUCTIVITY_SOMERTON_PROBLEM_HH
+#define DUMUX_THERMAL_CONDUCTIVITY_SOMERTON_PROBLEM_HH
+
+#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+
+#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
+
+#include <dumux/implicit/2p2c/2p2cmodel.hh>
+#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/material/fluidmatrixinteractions/2p/thermalconductivitysomerton.hh>
+
+#include "thermalconductivityspatialparams.hh"
+
+#define ISOTHERMAL 0
+
+namespace Dumux
+{
+template <class TypeTag>
+class ThermalConductivitySomertonProblem;
+
+namespace Properties
+{
+NEW_TYPE_TAG(ThermalConductivitySomertonProblem, INHERITS_FROM(BoxModel, TwoPTwoCNI, ThermalConductivitySpatialParams));
+
+// Set the grid type
+SET_TYPE_PROP(ThermalConductivitySomertonProblem, Grid, Dune::YaspGrid<2>);
+
+// Set the problem property
+SET_TYPE_PROP(ThermalConductivitySomertonProblem, Problem, Dumux::ThermalConductivitySomertonProblem<TypeTag>);
+
+// Set the wetting phase
+SET_TYPE_PROP(ThermalConductivitySomertonProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+
+// Set thermal conductivity law
+SET_TYPE_PROP(ThermalConductivitySomertonProblem, ThermalConductivityModel,
+ ThermalConductivitySomerton<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+}
+
+
+/*!
+ * \ingroup MaterialTestProblems
+ *
+ * \brief Simple test problem for the Somerton thermal conductivity law
+ *
+ * To run the test execute the following line in shell:
+ * <tt>./test_thermalconductivitysomerton</tt>
+ *
+ */
+template <class TypeTag >
+class ThermalConductivitySomertonProblem : public ImplicitPorousMediaProblem<TypeTag>
+{
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GridView::Grid Grid;
+
+ typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+
+ // copy some indices for convenience
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ enum {
+ pressureIdx = Indices::pressureIdx,
+ switchIdx = Indices::switchIdx,
+ temperatureIdx = Indices::temperatureIdx,
+
+ // Phase State
+ wPhaseOnly = Indices::wPhaseOnly,
+
+ // 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 Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+
+ //! property that defines whether mole or mass fractions are used
+ static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
+
+public:
+ /*!
+ * \brief The constructor.
+ *
+ * \param timeManager The time manager
+ * \param gridView The grid view
+ */
+ ThermalConductivitySomertonProblem(TimeManager &timeManager, const GridView &gridView)
+ : ParentType(timeManager, gridView)
+ {
+ FluidSystem::init();
+ this->spatialParams().plotMaterialLaw();
+ }
+
+ /*!
+ * \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 "test_thermalconductivitysomerton"; }
+
+
+ //! \copydoc Dumux::ImplicitProblem::sourceAtPos()
+ void sourceAtPos(PrimaryVariables &values,
+ const GlobalPosition &globalPos) const
+ {
+ values = 0;
+ }
+
+ // \}
+
+ /*!
+ * \name Boundary conditions
+ */
+ // \{
+
+
+ //! \copydoc Dumux::ImplicitProblem::boundaryTypesAtPos()
+ void boundaryTypesAtPos(BoundaryTypes &values,
+ const GlobalPosition &globalPos) const
+ {
+ values.setAllDirichlet();
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::dirichletAtPos()
+ void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
+ {
+ initial_(values, globalPos);
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::neumann()
+ void neumann(PrimaryVariables &values,
+ const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const Intersection &intersection,
+ const int scvIdx,
+ const int boundaryFaceIdx) const
+ {
+ values = 0;
+ }
+
+ // \}
+
+ /*!
+ * \name Volume terms
+ */
+ // \{
+
+
+ //! \copydoc Dumux::ImplicitProblem::initialAtPos()
+ void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
+ {
+ initial_(values, globalPos);
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::initialPhasePresence()
+ int initialPhasePresence(const Vertex &vertex,
+ int &vIdxGlobal,
+ const GlobalPosition &globalPos) const
+ {
+ return wPhaseOnly;
+ }
+
+private:
+ // internal method for the initial condition (reused for the
+ // dirichlet conditions!)
+ void initial_(PrimaryVariables &values,
+ const GlobalPosition &globalPos) const
+ {
+ Scalar densityW = 1000.0;
+ values[pressureIdx] = 1e5 + globalPos[1]*densityW*9.81;
+ values[switchIdx] = 0.0;
+ values[temperatureIdx] = 283.0 + globalPos[1]*0.03;
+ }
+};
+} //end namespace
+
+#endif
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.hh
new file mode 100644
index 0000000000000000000000000000000000000000..ab1ba7c495737b37746dcee35162a79a4d0cc550
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivityspatialparams.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 Definition of the spatial parameters for the thermal conductivity tests.
+ */
+#ifndef DUMUX_THERMAL_CONDUCTIVITY_SPATIAL_PARAMS_HH
+#define DUMUX_THERMAL_CONDUCTIVITY_SPATIAL_PARAMS_HH
+
+#include <dumux/io/plotthermalconductivitymodel.hh>
+#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
+#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
+
+#include <dumux/implicit/2p2c/2p2cmodel.hh>
+
+namespace Dumux
+{
+
+//forward declaration
+template<class TypeTag>
+class ThermalConductivitySpatialParams;
+
+namespace Properties
+{
+// The spatial parameters TypeTag
+NEW_TYPE_TAG(ThermalConductivitySpatialParams);
+
+// Set the spatial parameters
+SET_TYPE_PROP(ThermalConductivitySpatialParams, SpatialParams, Dumux::ThermalConductivitySpatialParams<TypeTag>);
+
+// Set the material law parameterized by absolute saturations
+SET_TYPE_PROP(ThermalConductivitySpatialParams,
+ MaterialLaw,
+ EffToAbsLaw<RegularizedBrooksCorey<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
+}
+
+/*!
+ * \ingroup MaterialTestProblems
+ * \brief Definition of the spatial parameters for the thermal conductivity tests.
+ */
+template<class TypeTag>
+class ThermalConductivitySpatialParams : 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 typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GridView::template Codim<0>::Entity Element;
+
+public:
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+ typedef typename MaterialLaw::Params MaterialLawParams;
+
+ /*!
+ * \brief The constructor
+ *
+ * \param gridView The grid view
+ */
+ ThermalConductivitySpatialParams(const GridView &gridView)
+ : ParentType(gridView)
+ {
+ porosity_ = 0.3;
+ rhoSolid_ = 2700.0;
+ lambdaSolid_ = 2.8;
+
+ // residual saturations
+ materialParams_.setSwr(0.2);
+ materialParams_.setSnr(0.0);
+
+ // parameters for the Brooks-Corey law
+ materialParams_.setPe(1e4);
+ materialParams_.setLambda(2.0);
+ }
+
+ /*!
+ * \brief This is called from the problem and creates a gnuplot output
+ * of e.g the pc-Sw curve
+ */
+ void plotMaterialLaw()
+ {
+ PlotThermalConductivityModel<TypeTag> plotThermalConductivityModel_;
+ plotThermalConductivityModel_.plotlambdaeff(porosity_, rhoSolid_, lambdaSolid_,
+ 0.0, 1.0, "lambda_eff", false);
+ }
+
+ /*!
+ * \brief Apply the intrinsic permeability tensor to a pressure
+ * potential gradient.
+ *
+ * \param element The current finite element
+ * \param fvGeometry The current finite volume geometry of the element
+ * \param scvIdx The index of the sub-control volume
+ */
+ const Scalar intrinsicPermeability(const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const int scvIdx) const
+ { return 1e-10; }
+
+ /*!
+ * \brief Define the porosity \f$[-]\f$ of the spatial parameters
+ *
+ * \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
+ */
+ Scalar porosity(const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const int scvIdx) const
+ { return porosity_; }
+
+
+ /*!
+ * \brief return the parameter object for the Brooks-Corey material law which depends on the position
+ *
+ * \param element The current finite element
+ * \param fvGeometry The current finite volume geometry of the element
+ * \param scvIdx The index of the sub-control volume
+ */
+ const MaterialLawParams& materialLawParams(const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const int scvIdx) const
+ { return materialParams_; }
+
+ /*!
+ * \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; /* specific heat capacity of granite [J / (kg K)] */ }
+
+ /*!
+ * \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 rhoSolid_; /* density of granite [kg/m^3] */ }
+
+ /*!
+ * \brief Returns the thermal conductivity \f$\mathrm{[W/(m K)]}\f$ of the porous material.
+ *
+ * \param element The finite element
+ * \param fvGeometry The finite volume geometry
+ * \param scvIdx The local index of the sub-control volume where
+ * the heat capacity needs to be defined
+ */
+ Scalar solidThermalConductivity(const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const int scvIdx) const
+ { return lambdaSolid_; /* [W/(m K) */ }
+
+private:
+ Scalar porosity_;
+ Scalar lambdaSolid_;
+ Scalar rhoSolid_;
+
+ MaterialLawParams materialParams_;
+};
+
+}
+
+#endif
diff --git a/test/material/fluidmatrixinteractions/CMakeLists.txt b/test/material/fluidmatrixinteractions/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ab9a0754b44c211746a24d6459688c8e61c46a53
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/CMakeLists.txt
@@ -0,0 +1,24 @@
+add_subdirectory("2p")
+
+add_dumux_test(test_effectivediffusivitymillingtonquirk test_effectivediffusivitymillingtonquirk test_effectivediffusivitymillingtonquirk.cc
+ ${CMAKE_SOURCE_DIR}/bin/runTest.sh
+ exact
+ ${CMAKE_SOURCE_DIR}/test/references/effectivediffusivitymillingtonquirk-reference.dat
+ ${CMAKE_CURRENT_BINARY_DIR}/7_deff.dat
+ ${CMAKE_CURRENT_BINARY_DIR}/test_effectivediffusivitymillingtonquirk
+ -TimeManager.DtInitial 1 # [s]
+ -TimeManager.TEnd 2 # [s]
+ -Grid.File ${CMAKE_SOURCE_DIR}/test/implicit/2p/grids/test_2p.dgf
+)
+
+add_dumux_test(test_effectivediffusivityconstanttau test_effectivediffusivityconstanttau test_effectivediffusivityconstanttau.cc
+ ${CMAKE_SOURCE_DIR}/bin/runTest.sh
+ exact
+ ${CMAKE_SOURCE_DIR}/test/references/effectivediffusivityconstanttau-reference.dat
+ ${CMAKE_CURRENT_BINARY_DIR}/7_deff.dat
+ ${CMAKE_CURRENT_BINARY_DIR}/test_effectivediffusivityconstanttau
+ -TimeManager.DtInitial 1 # [s]
+ -TimeManager.TEnd 2 # [s]
+ -Grid.File ${CMAKE_SOURCE_DIR}/test/implicit/2p/grids/test_2p.dgf
+ -tau 0.3
+)
diff --git a/test/material/fluidmatrixinteractions/Makefile.am b/test/material/fluidmatrixinteractions/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..f24b9f001eea9b2347ba6bfccf49be08d91df51f
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/Makefile.am
@@ -0,0 +1,11 @@
+SUBDIRS = 2p
+
+check_PROGRAMS = test_effectivediffusivityconstanttau \
+ test_effectivediffusivitymillingtonquirk
+
+test_effectivediffusivityconstanttau_SOURCES = test_effectivediffusivityconstanttau.cc
+test_effectivediffusivitymillingtonquirk_SOURCES = test_effectivediffusivitymillingtonquirk.cc
+
+EXTRA_DIST=CMakeLists.txt
+noinst_HEADERS:=$(wildcard *.hh)
+include $(top_srcdir)/am/global-rules
\ No newline at end of file
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
new file mode 100644
index 0000000000000000000000000000000000000000..84af3951d685a0e725a12633de9a454c0f0fe5a6
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
@@ -0,0 +1,218 @@
+// -*- 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 Simple test problem for the Somerton thermal conductivity law
+ */
+#ifndef DUMUX_THERMAL_CONDUCTIVITY_SOMERTON_PROBLEM_HH
+#define DUMUX_THERMAL_CONDUCTIVITY_SOMERTON_PROBLEM_HH
+
+#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+
+#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
+
+#include <dumux/implicit/2p2c/2p2cmodel.hh>
+#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/material/fluidmatrixinteractions/diffusivityconstanttau.hh>
+
+#include "effectivediffusivityspatialparams.hh"
+
+#define ISOTHERMAL 0
+
+namespace Dumux
+{
+template <class TypeTag>
+class EffectiveDiffusivityConstantTauProblem;
+
+namespace Properties
+{
+NEW_TYPE_TAG(EffectiveDiffusivityConstantTauProblem, INHERITS_FROM(BoxModel, TwoPTwoCNI, EffectiveDiffusivitySpatialParams));
+
+// Set the grid type
+SET_TYPE_PROP(EffectiveDiffusivityConstantTauProblem, Grid, Dune::YaspGrid<2>);
+
+// Set the problem property
+SET_TYPE_PROP(EffectiveDiffusivityConstantTauProblem, Problem, Dumux::EffectiveDiffusivityConstantTauProblem<TypeTag>);
+
+// Set the wetting phase
+SET_TYPE_PROP(EffectiveDiffusivityConstantTauProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+
+// Set thermal conductivity law
+SET_TYPE_PROP(EffectiveDiffusivityConstantTauProblem, EffectiveDiffusivityModel,
+ DiffusivityConstantTau<TypeTag, typename GET_PROP_TYPE(TypeTag, Scalar)>);
+}
+
+
+/*!
+ * \ingroup MaterialTestProblems
+ *
+ * \brief Simple test problem for the Somerton thermal conductivity law
+ *
+ * To run the test execute the following line in shell:
+ * <tt>./test_thermalconductivitysomerton</tt>
+ *
+ */
+template <class TypeTag >
+class EffectiveDiffusivityConstantTauProblem : public ImplicitPorousMediaProblem<TypeTag>
+{
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GridView::Grid Grid;
+
+ typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+
+ // copy some indices for convenience
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ enum {
+ pressureIdx = Indices::pressureIdx,
+ switchIdx = Indices::switchIdx,
+ temperatureIdx = Indices::temperatureIdx,
+
+ // Phase State
+ wPhaseOnly = Indices::wPhaseOnly,
+
+ // 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 Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+
+ //! property that defines whether mole or mass fractions are used
+ static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
+
+public:
+ /*!
+ * \brief The constructor.
+ *
+ * \param timeManager The time manager
+ * \param gridView The grid view
+ */
+ EffectiveDiffusivityConstantTauProblem(TimeManager &timeManager, const GridView &gridView)
+ : ParentType(timeManager, gridView)
+ {
+ FluidSystem::init();
+ this->spatialParams().plotMaterialLaw();
+ }
+
+ /*!
+ * \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 "test_thermalconductivitysomerton"; }
+
+
+ //! \copydoc Dumux::ImplicitProblem::sourceAtPos()
+ void sourceAtPos(PrimaryVariables &values,
+ const GlobalPosition &globalPos) const
+ {
+ values = 0;
+ }
+
+ // \}
+
+ /*!
+ * \name Boundary conditions
+ */
+ // \{
+
+
+ //! \copydoc Dumux::ImplicitProblem::boundaryTypesAtPos()
+ void boundaryTypesAtPos(BoundaryTypes &values,
+ const GlobalPosition &globalPos) const
+ {
+ values.setAllDirichlet();
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::dirichletAtPos()
+ void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
+ {
+ initial_(values, globalPos);
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::neumann()
+ void neumann(PrimaryVariables &values,
+ const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const Intersection &intersection,
+ const int scvIdx,
+ const int boundaryFaceIdx) const
+ {
+ values = 0;
+ }
+
+ // \}
+
+ /*!
+ * \name Volume terms
+ */
+ // \{
+
+
+ //! \copydoc Dumux::ImplicitProblem::initialAtPos()
+ void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
+ {
+ initial_(values, globalPos);
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::initialPhasePresence()
+ int initialPhasePresence(const Vertex &vertex,
+ int &vIdxGlobal,
+ const GlobalPosition &globalPos) const
+ {
+ return wPhaseOnly;
+ }
+
+private:
+ // internal method for the initial condition (reused for the
+ // dirichlet conditions!)
+ void initial_(PrimaryVariables &values,
+ const GlobalPosition &globalPos) const
+ {
+ Scalar densityW = 1000.0;
+ values[pressureIdx] = 1e5 + globalPos[1]*densityW*9.81;
+ values[switchIdx] = 0.0;
+ values[temperatureIdx] = 283.0 + globalPos[1]*0.03;
+ }
+};
+} //end namespace
+
+#endif
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
new file mode 100644
index 0000000000000000000000000000000000000000..3b089f63b035c1e544acf15b3b6b1776a1c163a9
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
@@ -0,0 +1,218 @@
+// -*- 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 Millington and Quirk effective diffusivity model
+ */
+#ifndef DUMUX_EFFECTIVE_DIFFUSIVITY_MILLINGTON_QUIRK_PROBLEM_HH
+#define DUMUX_EFFECTIVE_DIFFUSIVITY_MILLINGTON_QUIRK_PROBLEM_HH
+
+#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
+
+#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
+
+#include <dumux/implicit/2p2c/2p2cmodel.hh>
+#include <dumux/implicit/common/implicitporousmediaproblem.hh>
+#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
+
+#include "effectivediffusivityspatialparams.hh"
+
+#define ISOTHERMAL 0
+
+namespace Dumux
+{
+template <class TypeTag>
+class EffectiveDiffusivityMillingtonQuirkProblem;
+
+namespace Properties
+{
+NEW_TYPE_TAG(EffectiveDiffusivityMillingtonQuirkProblem, INHERITS_FROM(BoxModel, TwoPTwoCNI, EffectiveDiffusivitySpatialParams));
+
+// Set the grid type
+SET_TYPE_PROP(EffectiveDiffusivityMillingtonQuirkProblem, Grid, Dune::YaspGrid<2>);
+
+// Set the problem property
+SET_TYPE_PROP(EffectiveDiffusivityMillingtonQuirkProblem, Problem, Dumux::EffectiveDiffusivityMillingtonQuirkProblem<TypeTag>);
+
+// Set the wetting phase
+SET_TYPE_PROP(EffectiveDiffusivityMillingtonQuirkProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
+
+// Set thermal conductivity law
+SET_TYPE_PROP(EffectiveDiffusivityMillingtonQuirkProblem, EffectiveDiffusivityModel,
+ DiffusivityMillingtonQuirk<typename GET_PROP_TYPE(TypeTag, Scalar)>);
+}
+
+
+/*!
+ * \ingroup MaterialTestProblems
+ *
+ * \brief Test for the Millington and Quirk effective diffusivity model
+ *
+ * To run the test execute the following line in shell:
+ * <tt>./test_effectivediffusivitymillingtonquirk</tt>
+ *
+ */
+template <class TypeTag >
+class EffectiveDiffusivityMillingtonQuirkProblem : public ImplicitPorousMediaProblem<TypeTag>
+{
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
+ typedef typename GridView::Grid Grid;
+
+ typedef ImplicitPorousMediaProblem<TypeTag> ParentType;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+
+ // copy some indices for convenience
+ typedef typename GET_PROP_TYPE(TypeTag, Indices) Indices;
+ enum {
+ pressureIdx = Indices::pressureIdx,
+ switchIdx = Indices::switchIdx,
+ temperatureIdx = Indices::temperatureIdx,
+
+ // Phase State
+ wPhaseOnly = Indices::wPhaseOnly,
+
+ // 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 Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
+
+ //! property that defines whether mole or mass fractions are used
+ static const bool useMoles = GET_PROP_VALUE(TypeTag, UseMoles);
+
+public:
+ /*!
+ * \brief The constructor.
+ *
+ * \param timeManager The time manager
+ * \param gridView The grid view
+ */
+ EffectiveDiffusivityMillingtonQuirkProblem(TimeManager &timeManager, const GridView &gridView)
+ : ParentType(timeManager, gridView)
+ {
+ FluidSystem::init();
+ this->spatialParams().plotMaterialLaw();
+ }
+
+ /*!
+ * \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 "test_thermalconductivitysomerton"; }
+
+
+ //! \copydoc Dumux::ImplicitProblem::sourceAtPos()
+ void sourceAtPos(PrimaryVariables &values,
+ const GlobalPosition &globalPos) const
+ {
+ values = 0;
+ }
+
+ // \}
+
+ /*!
+ * \name Boundary conditions
+ */
+ // \{
+
+
+ //! \copydoc Dumux::ImplicitProblem::boundaryTypesAtPos()
+ void boundaryTypesAtPos(BoundaryTypes &values,
+ const GlobalPosition &globalPos) const
+ {
+ values.setAllDirichlet();
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::dirichletAtPos()
+ void dirichletAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
+ {
+ initial_(values, globalPos);
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::neumann()
+ void neumann(PrimaryVariables &values,
+ const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const Intersection &intersection,
+ const int scvIdx,
+ const int boundaryFaceIdx) const
+ {
+ values = 0;
+ }
+
+ // \}
+
+ /*!
+ * \name Volume terms
+ */
+ // \{
+
+
+ //! \copydoc Dumux::ImplicitProblem::initialAtPos()
+ void initialAtPos(PrimaryVariables &values, const GlobalPosition &globalPos) const
+ {
+ initial_(values, globalPos);
+ }
+
+
+ //! \copydoc Dumux::ImplicitProblem::initialPhasePresence()
+ int initialPhasePresence(const Vertex &vertex,
+ int &vIdxGlobal,
+ const GlobalPosition &globalPos) const
+ {
+ return wPhaseOnly;
+ }
+
+private:
+ // internal method for the initial condition (reused for the
+ // dirichlet conditions!)
+ void initial_(PrimaryVariables &values,
+ const GlobalPosition &globalPos) const
+ {
+ Scalar densityW = 1000.0;
+ values[pressureIdx] = 1e5 + globalPos[1]*densityW*9.81;
+ values[switchIdx] = 0.0;
+ values[temperatureIdx] = 283.0 + globalPos[1]*0.03;
+ }
+};
+} //end namespace
+
+#endif
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivityspatialparams.hh b/test/material/fluidmatrixinteractions/effectivediffusivityspatialparams.hh
new file mode 100644
index 0000000000000000000000000000000000000000..b97b335d62e13811cad61f3b0b059584dbb18746
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/effectivediffusivityspatialparams.hh
@@ -0,0 +1,203 @@
+// -*- 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 effective diffusivity tests.
+ */
+#ifndef DUMUX_EFFECTIVE_DIFFUSIVITY_SPATIAL_PARAMS_HH
+#define DUMUX_EFFECTIVE_DIFFUSIVITY_SPATIAL_PARAMS_HH
+
+#include <dumux/io/ploteffectivediffusivitymodel.hh>
+#include <dumux/material/spatialparams/implicitspatialparams.hh>
+#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
+#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
+
+#include <dumux/implicit/2p2c/2p2cmodel.hh>
+
+namespace Dumux
+{
+
+//forward declaration
+template<class TypeTag>
+class EffectiveDiffusivitySpatialParams;
+
+namespace Properties
+{
+// The spatial parameters TypeTag
+NEW_TYPE_TAG(EffectiveDiffusivitySpatialParams);
+
+// Set the spatial parameters
+SET_TYPE_PROP(EffectiveDiffusivitySpatialParams, SpatialParams, Dumux::EffectiveDiffusivitySpatialParams<TypeTag>);
+
+// Set the material law parameterized by absolute saturations
+SET_TYPE_PROP(EffectiveDiffusivitySpatialParams,
+ MaterialLaw,
+ EffToAbsLaw<RegularizedBrooksCorey<typename GET_PROP_TYPE(TypeTag, Scalar)> >);
+}
+
+/*!
+ * \ingroup MaterialTestProblems
+ * \brief Definition of the spatial parameters for the effective diffusivity tests.
+ */
+template<class TypeTag>
+class EffectiveDiffusivitySpatialParams : 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 typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
+ typedef typename GridView::template Codim<0>::Entity Element;
+
+public:
+ typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
+ typedef typename MaterialLaw::Params MaterialLawParams;
+
+ /*!
+ * \brief The constructor
+ *
+ * \param gridView The grid view
+ */
+ EffectiveDiffusivitySpatialParams(const GridView &gridView)
+ : ParentType(gridView)
+ {
+ porosity_ = 0.3;
+ rhoSolid_ = 2700.0;
+ lambdaSolid_ = 2.8;
+
+ // residual saturations
+ materialParams_.setSwr(0.2);
+ materialParams_.setSnr(0.0);
+
+ // parameters for the Brooks-Corey law
+ materialParams_.setPe(1e4);
+ materialParams_.setLambda(2.0);
+ }
+
+ /*!
+ * \brief This is called from the problem and creates a gnuplot output
+ * of e.g the pc-Sw curve
+ */
+ void plotMaterialLaw()
+ {
+ PlotEffectiveDiffusivityModel<TypeTag> plotEffectiveDiffusivityModel;
+ plotEffectiveDiffusivityModel.plotdeff(porosity_, 0.0, 1.0, "deff", false);
+ }
+
+ /*!
+ * \brief Apply the intrinsic permeability tensor to a pressure
+ * potential gradient.
+ *
+ * \param element The current finite element
+ * \param fvGeometry The current finite volume geometry of the element
+ * \param scvIdx The index of the sub-control volume
+ */
+ const Scalar intrinsicPermeability(const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const int scvIdx) const
+ { return 1e-10; }
+
+ /*!
+ * \brief Define the porosity \f$[-]\f$ of the spatial parameters
+ *
+ * \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
+ */
+ Scalar porosity(const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const int scvIdx) const
+ { return porosity_; }
+
+
+ /*!
+ * \brief return the parameter object for the Brooks-Corey material law which depends on the position
+ *
+ * \param element The current finite element
+ * \param fvGeometry The current finite volume geometry of the element
+ * \param scvIdx The index of the sub-control volume
+ */
+ const MaterialLawParams& materialLawParams(const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const int scvIdx) const
+ { return materialParams_; }
+
+ /*!
+ * \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; /* specific heat capacity of granite [J / (kg K)] */ }
+
+ /*!
+ * \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 rhoSolid_; /* density of granite [kg/m^3] */ }
+
+ /*!
+ * \brief Returns the thermal conductivity \f$\mathrm{[W/(m K)]}\f$ of the porous material.
+ *
+ * \param element The finite element
+ * \param fvGeometry The finite volume geometry
+ * \param scvIdx The local index of the sub-control volume where
+ * the heat capacity needs to be defined
+ */
+ Scalar solidThermalConductivity(const Element &element,
+ const FVElementGeometry &fvGeometry,
+ const int scvIdx) const
+ { return lambdaSolid_; /* [W/(m K) */ }
+
+private:
+ Scalar porosity_;
+ Scalar lambdaSolid_;
+ Scalar rhoSolid_;
+
+ MaterialLawParams materialParams_;
+};
+
+}
+
+#endif
diff --git a/test/material/fluidmatrixinteractions/test_effectivediffusivityconstanttau.cc b/test/material/fluidmatrixinteractions/test_effectivediffusivityconstanttau.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a3b1813e5c29337eaa14186364fb425367ac67f1
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/test_effectivediffusivityconstanttau.cc
@@ -0,0 +1,58 @@
+// -*- 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 constant tau effective diffusivity model
+ */
+#include "config.h"
+#include "effectivediffusivityconstanttauproblem.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";
+
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+int main(int argc, char** argv)
+{
+ typedef TTAG(EffectiveDiffusivityConstantTauProblem) ProblemTypeTag;
+ return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+}
diff --git a/test/material/fluidmatrixinteractions/test_effectivediffusivitymillingtonquirk.cc b/test/material/fluidmatrixinteractions/test_effectivediffusivitymillingtonquirk.cc
new file mode 100644
index 0000000000000000000000000000000000000000..e467650b32f3b2769d25aa675f156634ef08b260
--- /dev/null
+++ b/test/material/fluidmatrixinteractions/test_effectivediffusivitymillingtonquirk.cc
@@ -0,0 +1,58 @@
+// -*- 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 Millington and Quirk effective diffusivity model
+ */
+#include "config.h"
+#include "effectivediffusivitymillingtonquirkproblem.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";
+
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+int main(int argc, char** argv)
+{
+ typedef TTAG(EffectiveDiffusivityMillingtonQuirkProblem) ProblemTypeTag;
+ return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+}
diff --git a/test/references/effectivediffusivityconstanttau-reference.dat b/test/references/effectivediffusivityconstanttau-reference.dat
new file mode 100644
index 0000000000000000000000000000000000000000..3342f2e07df33b927605761bc95ab1aa226c6cf2
--- /dev/null
+++ b/test/references/effectivediffusivityconstanttau-reference.dat
@@ -0,0 +1,1001 @@
+0 0
+0.001 9e-05
+0.002 0.00018
+0.003 0.00027
+0.004 0.00036
+0.005 0.00045
+0.006 0.00054
+0.007 0.00063
+0.008 0.00072
+0.009 0.00081
+0.01 0.0009
+0.011 0.00099
+0.012 0.00108
+0.013 0.00117
+0.014 0.00126
+0.015 0.00135
+0.016 0.00144
+0.017 0.00153
+0.018 0.00162
+0.019 0.00171
+0.02 0.0018
+0.021 0.00189
+0.022 0.00198
+0.023 0.00207
+0.024 0.00216
+0.025 0.00225
+0.026 0.00234
+0.027 0.00243
+0.028 0.00252
+0.029 0.00261
+0.03 0.0027
+0.031 0.00279
+0.032 0.00288
+0.033 0.00297
+0.034 0.00306
+0.035 0.00315
+0.036 0.00324
+0.037 0.00333
+0.038 0.00342
+0.039 0.00351
+0.04 0.0036
+0.041 0.00369
+0.042 0.00378
+0.043 0.00387
+0.044 0.00396
+0.045 0.00405
+0.046 0.00414
+0.047 0.00423
+0.048 0.00432
+0.049 0.00441
+0.05 0.0045
+0.051 0.00459
+0.052 0.00468
+0.053 0.00477
+0.054 0.00486
+0.055 0.00495
+0.056 0.00504
+0.057 0.00513
+0.058 0.00522
+0.059 0.00531
+0.06 0.0054
+0.061 0.00549
+0.062 0.00558
+0.063 0.00567
+0.064 0.00576
+0.065 0.00585
+0.066 0.00594
+0.067 0.00603
+0.068 0.00612
+0.069 0.00621
+0.07 0.0063
+0.071 0.00639
+0.072 0.00648
+0.073 0.00657
+0.074 0.00666
+0.075 0.00675
+0.076 0.00684
+0.077 0.00693
+0.078 0.00702
+0.079 0.00711
+0.08 0.0072
+0.081 0.00729
+0.082 0.00738
+0.083 0.00747
+0.084 0.00756
+0.085 0.00765
+0.086 0.00774
+0.087 0.00783
+0.088 0.00792
+0.089 0.00801
+0.09 0.0081
+0.091 0.00819
+0.092 0.00828
+0.093 0.00837
+0.094 0.00846
+0.095 0.00855
+0.096 0.00864
+0.097 0.00873
+0.098 0.00882
+0.099 0.00891
+0.1 0.009
+0.101 0.00909
+0.102 0.00918
+0.103 0.00927
+0.104 0.00936
+0.105 0.00945
+0.106 0.00954
+0.107 0.00963
+0.108 0.00972
+0.109 0.00981
+0.11 0.0099
+0.111 0.00999
+0.112 0.01008
+0.113 0.01017
+0.114 0.01026
+0.115 0.01035
+0.116 0.01044
+0.117 0.01053
+0.118 0.01062
+0.119 0.01071
+0.12 0.0108
+0.121 0.01089
+0.122 0.01098
+0.123 0.01107
+0.124 0.01116
+0.125 0.01125
+0.126 0.01134
+0.127 0.01143
+0.128 0.01152
+0.129 0.01161
+0.13 0.0117
+0.131 0.01179
+0.132 0.01188
+0.133 0.01197
+0.134 0.01206
+0.135 0.01215
+0.136 0.01224
+0.137 0.01233
+0.138 0.01242
+0.139 0.01251
+0.14 0.0126
+0.141 0.01269
+0.142 0.01278
+0.143 0.01287
+0.144 0.01296
+0.145 0.01305
+0.146 0.01314
+0.147 0.01323
+0.148 0.01332
+0.149 0.01341
+0.15 0.0135
+0.151 0.01359
+0.152 0.01368
+0.153 0.01377
+0.154 0.01386
+0.155 0.01395
+0.156 0.01404
+0.157 0.01413
+0.158 0.01422
+0.159 0.01431
+0.16 0.0144
+0.161 0.01449
+0.162 0.01458
+0.163 0.01467
+0.164 0.01476
+0.165 0.01485
+0.166 0.01494
+0.167 0.01503
+0.168 0.01512
+0.169 0.01521
+0.17 0.0153
+0.171 0.01539
+0.172 0.01548
+0.173 0.01557
+0.174 0.01566
+0.175 0.01575
+0.176 0.01584
+0.177 0.01593
+0.178 0.01602
+0.179 0.01611
+0.18 0.0162
+0.181 0.01629
+0.182 0.01638
+0.183 0.01647
+0.184 0.01656
+0.185 0.01665
+0.186 0.01674
+0.187 0.01683
+0.188 0.01692
+0.189 0.01701
+0.19 0.0171
+0.191 0.01719
+0.192 0.01728
+0.193 0.01737
+0.194 0.01746
+0.195 0.01755
+0.196 0.01764
+0.197 0.01773
+0.198 0.01782
+0.199 0.01791
+0.2 0.018
+0.201 0.01809
+0.202 0.01818
+0.203 0.01827
+0.204 0.01836
+0.205 0.01845
+0.206 0.01854
+0.207 0.01863
+0.208 0.01872
+0.209 0.01881
+0.21 0.0189
+0.211 0.01899
+0.212 0.01908
+0.213 0.01917
+0.214 0.01926
+0.215 0.01935
+0.216 0.01944
+0.217 0.01953
+0.218 0.01962
+0.219 0.01971
+0.22 0.0198
+0.221 0.01989
+0.222 0.01998
+0.223 0.02007
+0.224 0.02016
+0.225 0.02025
+0.226 0.02034
+0.227 0.02043
+0.228 0.02052
+0.229 0.02061
+0.23 0.0207
+0.231 0.02079
+0.232 0.02088
+0.233 0.02097
+0.234 0.02106
+0.235 0.02115
+0.236 0.02124
+0.237 0.02133
+0.238 0.02142
+0.239 0.02151
+0.24 0.0216
+0.241 0.02169
+0.242 0.02178
+0.243 0.02187
+0.244 0.02196
+0.245 0.02205
+0.246 0.02214
+0.247 0.02223
+0.248 0.02232
+0.249 0.02241
+0.25 0.0225
+0.251 0.02259
+0.252 0.02268
+0.253 0.02277
+0.254 0.02286
+0.255 0.02295
+0.256 0.02304
+0.257 0.02313
+0.258 0.02322
+0.259 0.02331
+0.26 0.0234
+0.261 0.02349
+0.262 0.02358
+0.263 0.02367
+0.264 0.02376
+0.265 0.02385
+0.266 0.02394
+0.267 0.02403
+0.268 0.02412
+0.269 0.02421
+0.27 0.0243
+0.271 0.02439
+0.272 0.02448
+0.273 0.02457
+0.274 0.02466
+0.275 0.02475
+0.276 0.02484
+0.277 0.02493
+0.278 0.02502
+0.279 0.02511
+0.28 0.0252
+0.281 0.02529
+0.282 0.02538
+0.283 0.02547
+0.284 0.02556
+0.285 0.02565
+0.286 0.02574
+0.287 0.02583
+0.288 0.02592
+0.289 0.02601
+0.29 0.0261
+0.291 0.02619
+0.292 0.02628
+0.293 0.02637
+0.294 0.02646
+0.295 0.02655
+0.296 0.02664
+0.297 0.02673
+0.298 0.02682
+0.299 0.02691
+0.3 0.027
+0.301 0.02709
+0.302 0.02718
+0.303 0.02727
+0.304 0.02736
+0.305 0.02745
+0.306 0.02754
+0.307 0.02763
+0.308 0.02772
+0.309 0.02781
+0.31 0.0279
+0.311 0.02799
+0.312 0.02808
+0.313 0.02817
+0.314 0.02826
+0.315 0.02835
+0.316 0.02844
+0.317 0.02853
+0.318 0.02862
+0.319 0.02871
+0.32 0.0288
+0.321 0.02889
+0.322 0.02898
+0.323 0.02907
+0.324 0.02916
+0.325 0.02925
+0.326 0.02934
+0.327 0.02943
+0.328 0.02952
+0.329 0.02961
+0.33 0.0297
+0.331 0.02979
+0.332 0.02988
+0.333 0.02997
+0.334 0.03006
+0.335 0.03015
+0.336 0.03024
+0.337 0.03033
+0.338 0.03042
+0.339 0.03051
+0.34 0.0306
+0.341 0.03069
+0.342 0.03078
+0.343 0.03087
+0.344 0.03096
+0.345 0.03105
+0.346 0.03114
+0.347 0.03123
+0.348 0.03132
+0.349 0.03141
+0.35 0.0315
+0.351 0.03159
+0.352 0.03168
+0.353 0.03177
+0.354 0.03186
+0.355 0.03195
+0.356 0.03204
+0.357 0.03213
+0.358 0.03222
+0.359 0.03231
+0.36 0.0324
+0.361 0.03249
+0.362 0.03258
+0.363 0.03267
+0.364 0.03276
+0.365 0.03285
+0.366 0.03294
+0.367 0.03303
+0.368 0.03312
+0.369 0.03321
+0.37 0.0333
+0.371 0.03339
+0.372 0.03348
+0.373 0.03357
+0.374 0.03366
+0.375 0.03375
+0.376 0.03384
+0.377 0.03393
+0.378 0.03402
+0.379 0.03411
+0.38 0.0342
+0.381 0.03429
+0.382 0.03438
+0.383 0.03447
+0.384 0.03456
+0.385 0.03465
+0.386 0.03474
+0.387 0.03483
+0.388 0.03492
+0.389 0.03501
+0.39 0.0351
+0.391 0.03519
+0.392 0.03528
+0.393 0.03537
+0.394 0.03546
+0.395 0.03555
+0.396 0.03564
+0.397 0.03573
+0.398 0.03582
+0.399 0.03591
+0.4 0.036
+0.401 0.03609
+0.402 0.03618
+0.403 0.03627
+0.404 0.03636
+0.405 0.03645
+0.406 0.03654
+0.407 0.03663
+0.408 0.03672
+0.409 0.03681
+0.41 0.0369
+0.411 0.03699
+0.412 0.03708
+0.413 0.03717
+0.414 0.03726
+0.415 0.03735
+0.416 0.03744
+0.417 0.03753
+0.418 0.03762
+0.419 0.03771
+0.42 0.0378
+0.421 0.03789
+0.422 0.03798
+0.423 0.03807
+0.424 0.03816
+0.425 0.03825
+0.426 0.03834
+0.427 0.03843
+0.428 0.03852
+0.429 0.03861
+0.43 0.0387
+0.431 0.03879
+0.432 0.03888
+0.433 0.03897
+0.434 0.03906
+0.435 0.03915
+0.436 0.03924
+0.437 0.03933
+0.438 0.03942
+0.439 0.03951
+0.44 0.0396
+0.441 0.03969
+0.442 0.03978
+0.443 0.03987
+0.444 0.03996
+0.445 0.04005
+0.446 0.04014
+0.447 0.04023
+0.448 0.04032
+0.449 0.04041
+0.45 0.0405
+0.451 0.04059
+0.452 0.04068
+0.453 0.04077
+0.454 0.04086
+0.455 0.04095
+0.456 0.04104
+0.457 0.04113
+0.458 0.04122
+0.459 0.04131
+0.46 0.0414
+0.461 0.04149
+0.462 0.04158
+0.463 0.04167
+0.464 0.04176
+0.465 0.04185
+0.466 0.04194
+0.467 0.04203
+0.468 0.04212
+0.469 0.04221
+0.47 0.0423
+0.471 0.04239
+0.472 0.04248
+0.473 0.04257
+0.474 0.04266
+0.475 0.04275
+0.476 0.04284
+0.477 0.04293
+0.478 0.04302
+0.479 0.04311
+0.48 0.0432
+0.481 0.04329
+0.482 0.04338
+0.483 0.04347
+0.484 0.04356
+0.485 0.04365
+0.486 0.04374
+0.487 0.04383
+0.488 0.04392
+0.489 0.04401
+0.49 0.0441
+0.491 0.04419
+0.492 0.04428
+0.493 0.04437
+0.494 0.04446
+0.495 0.04455
+0.496 0.04464
+0.497 0.04473
+0.498 0.04482
+0.499 0.04491
+0.5 0.045
+0.501 0.04509
+0.502 0.04518
+0.503 0.04527
+0.504 0.04536
+0.505 0.04545
+0.506 0.04554
+0.507 0.04563
+0.508 0.04572
+0.509 0.04581
+0.51 0.0459
+0.511 0.04599
+0.512 0.04608
+0.513 0.04617
+0.514 0.04626
+0.515 0.04635
+0.516 0.04644
+0.517 0.04653
+0.518 0.04662
+0.519 0.04671
+0.52 0.0468
+0.521 0.04689
+0.522 0.04698
+0.523 0.04707
+0.524 0.04716
+0.525 0.04725
+0.526 0.04734
+0.527 0.04743
+0.528 0.04752
+0.529 0.04761
+0.53 0.0477
+0.531 0.04779
+0.532 0.04788
+0.533 0.04797
+0.534 0.04806
+0.535 0.04815
+0.536 0.04824
+0.537 0.04833
+0.538 0.04842
+0.539 0.04851
+0.54 0.0486
+0.541 0.04869
+0.542 0.04878
+0.543 0.04887
+0.544 0.04896
+0.545 0.04905
+0.546 0.04914
+0.547 0.04923
+0.548 0.04932
+0.549 0.04941
+0.55 0.0495
+0.551 0.04959
+0.552 0.04968
+0.553 0.04977
+0.554 0.04986
+0.555 0.04995
+0.556 0.05004
+0.557 0.05013
+0.558 0.05022
+0.559 0.05031
+0.56 0.0504
+0.561 0.05049
+0.562 0.05058
+0.563 0.05067
+0.564 0.05076
+0.565 0.05085
+0.566 0.05094
+0.567 0.05103
+0.568 0.05112
+0.569 0.05121
+0.57 0.0513
+0.571 0.05139
+0.572 0.05148
+0.573 0.05157
+0.574 0.05166
+0.575 0.05175
+0.576 0.05184
+0.577 0.05193
+0.578 0.05202
+0.579 0.05211
+0.58 0.0522
+0.581 0.05229
+0.582 0.05238
+0.583 0.05247
+0.584 0.05256
+0.585 0.05265
+0.586 0.05274
+0.587 0.05283
+0.588 0.05292
+0.589 0.05301
+0.59 0.0531
+0.591 0.05319
+0.592 0.05328
+0.593 0.05337
+0.594 0.05346
+0.595 0.05355
+0.596 0.05364
+0.597 0.05373
+0.598 0.05382
+0.599 0.05391
+0.6 0.054
+0.601 0.05409
+0.602 0.05418
+0.603 0.05427
+0.604 0.05436
+0.605 0.05445
+0.606 0.05454
+0.607 0.05463
+0.608 0.05472
+0.609 0.05481
+0.61 0.0549
+0.611 0.05499
+0.612 0.05508
+0.613 0.05517
+0.614 0.05526
+0.615 0.05535
+0.616 0.05544
+0.617 0.05553
+0.618 0.05562
+0.619 0.05571
+0.62 0.0558
+0.621 0.05589
+0.622 0.05598
+0.623 0.05607
+0.624 0.05616
+0.625 0.05625
+0.626 0.05634
+0.627 0.05643
+0.628 0.05652
+0.629 0.05661
+0.63 0.0567
+0.631 0.05679
+0.632 0.05688
+0.633 0.05697
+0.634 0.05706
+0.635 0.05715
+0.636 0.05724
+0.637 0.05733
+0.638 0.05742
+0.639 0.05751
+0.64 0.0576
+0.641 0.05769
+0.642 0.05778
+0.643 0.05787
+0.644 0.05796
+0.645 0.05805
+0.646 0.05814
+0.647 0.05823
+0.648 0.05832
+0.649 0.05841
+0.65 0.0585
+0.651 0.05859
+0.652 0.05868
+0.653 0.05877
+0.654 0.05886
+0.655 0.05895
+0.656 0.05904
+0.657 0.05913
+0.658 0.05922
+0.659 0.05931
+0.66 0.0594
+0.661 0.05949
+0.662 0.05958
+0.663 0.05967
+0.664 0.05976
+0.665 0.05985
+0.666 0.05994
+0.667 0.06003
+0.668 0.06012
+0.669 0.06021
+0.67 0.0603
+0.671 0.06039
+0.672 0.06048
+0.673 0.06057
+0.674 0.06066
+0.675 0.06075
+0.676 0.06084
+0.677 0.06093
+0.678 0.06102
+0.679 0.06111
+0.68 0.0612
+0.681 0.06129
+0.682 0.06138
+0.683 0.06147
+0.684 0.06156
+0.685 0.06165
+0.686 0.06174
+0.687 0.06183
+0.688 0.06192
+0.689 0.06201
+0.69 0.0621
+0.691 0.06219
+0.692 0.06228
+0.693 0.06237
+0.694 0.06246
+0.695 0.06255
+0.696 0.06264
+0.697 0.06273
+0.698 0.06282
+0.699 0.06291
+0.7 0.063
+0.701 0.06309
+0.702 0.06318
+0.703 0.06327
+0.704 0.06336
+0.705 0.06345
+0.706 0.06354
+0.707 0.06363
+0.708 0.06372
+0.709 0.06381
+0.71 0.0639
+0.711 0.06399
+0.712 0.06408
+0.713 0.06417
+0.714 0.06426
+0.715 0.06435
+0.716 0.06444
+0.717 0.06453
+0.718 0.06462
+0.719 0.06471
+0.72 0.0648
+0.721 0.06489
+0.722 0.06498
+0.723 0.06507
+0.724 0.06516
+0.725 0.06525
+0.726 0.06534
+0.727 0.06543
+0.728 0.06552
+0.729 0.06561
+0.73 0.0657
+0.731 0.06579
+0.732 0.06588
+0.733 0.06597
+0.734 0.06606
+0.735 0.06615
+0.736 0.06624
+0.737 0.06633
+0.738 0.06642
+0.739 0.06651
+0.74 0.0666
+0.741 0.06669
+0.742 0.06678
+0.743 0.06687
+0.744 0.06696
+0.745 0.06705
+0.746 0.06714
+0.747 0.06723
+0.748 0.06732
+0.749 0.06741
+0.75 0.0675
+0.751 0.06759
+0.752 0.06768
+0.753 0.06777
+0.754 0.06786
+0.755 0.06795
+0.756 0.06804
+0.757 0.06813
+0.758 0.06822
+0.759 0.06831
+0.76 0.0684
+0.761 0.06849
+0.762 0.06858
+0.763 0.06867
+0.764 0.06876
+0.765 0.06885
+0.766 0.06894
+0.767 0.06903
+0.768 0.06912
+0.769 0.06921
+0.77 0.0693
+0.771 0.06939
+0.772 0.06948
+0.773 0.06957
+0.774 0.06966
+0.775 0.06975
+0.776 0.06984
+0.777 0.06993
+0.778 0.07002
+0.779 0.07011
+0.78 0.0702
+0.781 0.07029
+0.782 0.07038
+0.783 0.07047
+0.784 0.07056
+0.785 0.07065
+0.786 0.07074
+0.787 0.07083
+0.788 0.07092
+0.789 0.07101
+0.79 0.0711
+0.791 0.07119
+0.792 0.07128
+0.793 0.07137
+0.794 0.07146
+0.795 0.07155
+0.796 0.07164
+0.797 0.07173
+0.798 0.07182
+0.799 0.07191
+0.8 0.072
+0.801 0.07209
+0.802 0.07218
+0.803 0.07227
+0.804 0.07236
+0.805 0.07245
+0.806 0.07254
+0.807 0.07263
+0.808 0.07272
+0.809 0.07281
+0.81 0.0729
+0.811 0.07299
+0.812 0.07308
+0.813 0.07317
+0.814 0.07326
+0.815 0.07335
+0.816 0.07344
+0.817 0.07353
+0.818 0.07362
+0.819 0.07371
+0.82 0.0738
+0.821 0.07389
+0.822 0.07398
+0.823 0.07407
+0.824 0.07416
+0.825 0.07425
+0.826 0.07434
+0.827 0.07443
+0.828 0.07452
+0.829 0.07461
+0.83 0.0747
+0.831 0.07479
+0.832 0.07488
+0.833 0.07497
+0.834 0.07506
+0.835 0.07515
+0.836 0.07524
+0.837 0.07533
+0.838 0.07542
+0.839 0.07551
+0.84 0.0756
+0.841 0.07569
+0.842 0.07578
+0.843 0.07587
+0.844 0.07596
+0.845 0.07605
+0.846 0.07614
+0.847 0.07623
+0.848 0.07632
+0.849 0.07641
+0.85 0.0765
+0.851 0.07659
+0.852 0.07668
+0.853 0.07677
+0.854 0.07686
+0.855 0.07695
+0.856 0.07704
+0.857 0.07713
+0.858 0.07722
+0.859 0.07731
+0.86 0.0774
+0.861 0.07749
+0.862 0.07758
+0.863 0.07767
+0.864 0.07776
+0.865 0.07785
+0.866 0.07794
+0.867 0.07803
+0.868 0.07812
+0.869 0.07821
+0.87 0.0783
+0.871 0.07839
+0.872 0.07848
+0.873 0.07857
+0.874 0.07866
+0.875 0.07875
+0.876 0.07884
+0.877 0.07893
+0.878 0.07902
+0.879 0.07911
+0.88 0.0792
+0.881 0.07929
+0.882 0.07938
+0.883 0.07947
+0.884 0.07956
+0.885 0.07965
+0.886 0.07974
+0.887 0.07983
+0.888 0.07992
+0.889 0.08001
+0.89 0.0801
+0.891 0.08019
+0.892 0.08028
+0.893 0.08037
+0.894 0.08046
+0.895 0.08055
+0.896 0.08064
+0.897 0.08073
+0.898 0.08082
+0.899 0.08091
+0.9 0.081
+0.901 0.08109
+0.902 0.08118
+0.903 0.08127
+0.904 0.08136
+0.905 0.08145
+0.906 0.08154
+0.907 0.08163
+0.908 0.08172
+0.909 0.08181
+0.91 0.0819
+0.911 0.08199
+0.912 0.08208
+0.913 0.08217
+0.914 0.08226
+0.915 0.08235
+0.916 0.08244
+0.917 0.08253
+0.918 0.08262
+0.919 0.08271
+0.92 0.0828
+0.921 0.08289
+0.922 0.08298
+0.923 0.08307
+0.924 0.08316
+0.925 0.08325
+0.926 0.08334
+0.927 0.08343
+0.928 0.08352
+0.929 0.08361
+0.93 0.0837
+0.931 0.08379
+0.932 0.08388
+0.933 0.08397
+0.934 0.08406
+0.935 0.08415
+0.936 0.08424
+0.937 0.08433
+0.938 0.08442
+0.939 0.08451
+0.94 0.0846
+0.941 0.08469
+0.942 0.08478
+0.943 0.08487
+0.944 0.08496
+0.945 0.08505
+0.946 0.08514
+0.947 0.08523
+0.948 0.08532
+0.949 0.08541
+0.95 0.0855
+0.951 0.08559
+0.952 0.08568
+0.953 0.08577
+0.954 0.08586
+0.955 0.08595
+0.956 0.08604
+0.957 0.08613
+0.958 0.08622
+0.959 0.08631
+0.96 0.0864
+0.961 0.08649
+0.962 0.08658
+0.963 0.08667
+0.964 0.08676
+0.965 0.08685
+0.966 0.08694
+0.967 0.08703
+0.968 0.08712
+0.969 0.08721
+0.97 0.0873
+0.971 0.08739
+0.972 0.08748
+0.973 0.08757
+0.974 0.08766
+0.975 0.08775
+0.976 0.08784
+0.977 0.08793
+0.978 0.08802
+0.979 0.08811
+0.98 0.0882
+0.981 0.08829
+0.982 0.08838
+0.983 0.08847
+0.984 0.08856
+0.985 0.08865
+0.986 0.08874
+0.987 0.08883
+0.988 0.08892
+0.989 0.08901
+0.99 0.0891
+0.991 0.08919
+0.992 0.08928
+0.993 0.08937
+0.994 0.08946
+0.995 0.08955
+0.996 0.08964
+0.997 0.08973
+0.998 0.08982
+0.999 0.08991
+1 0.09
diff --git a/test/references/effectivediffusivitymillingtonquirk-reference.dat b/test/references/effectivediffusivitymillingtonquirk-reference.dat
new file mode 100644
index 0000000000000000000000000000000000000000..97d4f7e23f309629b737be405b7f7afcaec3ca4e
--- /dev/null
+++ b/test/references/effectivediffusivitymillingtonquirk-reference.dat
@@ -0,0 +1,1001 @@
+0 0
+0.001 2.0083e-11
+0.002 2.02424e-10
+0.003 7.82046e-10
+0.004 2.0403e-09
+0.005 4.29268e-09
+0.006 7.88253e-09
+0.007 1.31772e-08
+0.008 2.0565e-08
+0.009 3.04535e-08
+0.01 4.32675e-08
+0.011 5.9448e-08
+0.012 7.9451e-08
+0.013 1.03746e-07
+0.014 1.32817e-07
+0.015 1.6716e-07
+0.016 2.07282e-07
+0.017 2.53702e-07
+0.018 3.06952e-07
+0.019 3.6757e-07
+0.02 4.36109e-07
+0.021 5.13128e-07
+0.022 5.99198e-07
+0.023 6.94898e-07
+0.024 8.00816e-07
+0.025 9.17547e-07
+0.026 1.0457e-06
+0.027 1.18588e-06
+0.028 1.33872e-06
+0.029 1.50483e-06
+0.03 1.68487e-06
+0.031 1.87946e-06
+0.032 2.08927e-06
+0.033 2.31495e-06
+0.034 2.55716e-06
+0.035 2.81658e-06
+0.036 3.09388e-06
+0.037 3.38975e-06
+0.038 3.70488e-06
+0.039 4.03996e-06
+0.04 4.3957e-06
+0.041 4.77281e-06
+0.042 5.17201e-06
+0.043 5.59401e-06
+0.044 6.03954e-06
+0.045 6.50934e-06
+0.046 7.00413e-06
+0.047 7.52468e-06
+0.048 8.07171e-06
+0.049 8.646e-06
+0.05 9.2483e-06
+0.051 9.87936e-06
+0.052 1.054e-05
+0.053 1.12309e-05
+0.054 1.19529e-05
+0.055 1.27068e-05
+0.056 1.34934e-05
+0.057 1.43135e-05
+0.058 1.51678e-05
+0.059 1.60571e-05
+0.06 1.69824e-05
+0.061 1.79444e-05
+0.062 1.89438e-05
+0.063 1.99816e-05
+0.064 2.10585e-05
+0.065 2.21755e-05
+0.066 2.33332e-05
+0.067 2.45326e-05
+0.068 2.57746e-05
+0.069 2.70598e-05
+0.07 2.83893e-05
+0.071 2.97639e-05
+0.072 3.11843e-05
+0.073 3.26516e-05
+0.074 3.41665e-05
+0.075 3.573e-05
+0.076 3.73428e-05
+0.077 3.90059e-05
+0.078 4.07202e-05
+0.079 4.24866e-05
+0.08 4.43059e-05
+0.081 4.61791e-05
+0.082 4.8107e-05
+0.083 5.00905e-05
+0.084 5.21306e-05
+0.085 5.42281e-05
+0.086 5.63841e-05
+0.087 5.85993e-05
+0.088 6.08748e-05
+0.089 6.32113e-05
+0.09 6.561e-05
+0.091 6.80717e-05
+0.092 7.05972e-05
+0.093 7.31877e-05
+0.094 7.5844e-05
+0.095 7.8567e-05
+0.096 8.13578e-05
+0.097 8.42172e-05
+0.098 8.71462e-05
+0.099 9.01458e-05
+0.1 9.3217e-05
+0.101 9.63606e-05
+0.102 9.95777e-05
+0.103 0.000102869
+0.104 0.000106236
+0.105 0.00010968
+0.106 0.0001132
+0.107 0.000116799
+0.108 0.000120478
+0.109 0.000124237
+0.11 0.000128077
+0.111 0.000131999
+0.112 0.000136005
+0.113 0.000140095
+0.114 0.000144271
+0.115 0.000148532
+0.116 0.000152882
+0.117 0.000157319
+0.118 0.000161846
+0.119 0.000166463
+0.12 0.000171172
+0.121 0.000175973
+0.122 0.000180868
+0.123 0.000185857
+0.124 0.000190942
+0.125 0.000196123
+0.126 0.000201402
+0.127 0.000206779
+0.128 0.000212257
+0.129 0.000217835
+0.13 0.000223515
+0.131 0.000229298
+0.132 0.000235184
+0.133 0.000241176
+0.134 0.000247274
+0.135 0.000253478
+0.136 0.000259791
+0.137 0.000266214
+0.138 0.000272746
+0.139 0.00027939
+0.14 0.000286147
+0.141 0.000293016
+0.142 0.000300001
+0.143 0.000307101
+0.144 0.000314319
+0.145 0.000321654
+0.146 0.000329108
+0.147 0.000336682
+0.148 0.000344377
+0.149 0.000352194
+0.15 0.000360135
+0.151 0.000368201
+0.152 0.000376392
+0.153 0.00038471
+0.154 0.000393155
+0.155 0.00040173
+0.156 0.000410434
+0.157 0.00041927
+0.158 0.000428238
+0.159 0.00043734
+0.16 0.000446576
+0.161 0.000455947
+0.162 0.000465456
+0.163 0.000475102
+0.164 0.000484888
+0.165 0.000494813
+0.166 0.000504881
+0.167 0.00051509
+0.168 0.000525443
+0.169 0.000535941
+0.17 0.000546585
+0.171 0.000557377
+0.172 0.000568316
+0.173 0.000579405
+0.174 0.000590644
+0.175 0.000602035
+0.176 0.000613579
+0.177 0.000625277
+0.178 0.00063713
+0.179 0.00064914
+0.18 0.000661307
+0.181 0.000673633
+0.182 0.000686119
+0.183 0.000698766
+0.184 0.000711576
+0.185 0.000724548
+0.186 0.000737686
+0.187 0.000750989
+0.188 0.00076446
+0.189 0.000778098
+0.19 0.000791906
+0.191 0.000805885
+0.192 0.000820035
+0.193 0.000834359
+0.194 0.000848856
+0.195 0.000863529
+0.196 0.000878379
+0.197 0.000893406
+0.198 0.000908613
+0.199 0.000924
+0.2 0.000939568
+0.201 0.000955319
+0.202 0.000971254
+0.203 0.000987374
+0.204 0.00100368
+0.205 0.00102017
+0.206 0.00103686
+0.207 0.00105373
+0.208 0.00107079
+0.209 0.00108805
+0.21 0.0011055
+0.211 0.00112315
+0.212 0.00114099
+0.213 0.00115903
+0.214 0.00117727
+0.215 0.0011957
+0.216 0.00121434
+0.217 0.00123318
+0.218 0.00125223
+0.219 0.00127148
+0.22 0.00129093
+0.221 0.0013106
+0.222 0.00133047
+0.223 0.00135055
+0.224 0.00137085
+0.225 0.00139135
+0.226 0.00141207
+0.227 0.00143301
+0.228 0.00145416
+0.229 0.00147553
+0.23 0.00149711
+0.231 0.00151892
+0.232 0.00154095
+0.233 0.0015632
+0.234 0.00158568
+0.235 0.00160838
+0.236 0.0016313
+0.237 0.00165446
+0.238 0.00167784
+0.239 0.00170146
+0.24 0.0017253
+0.241 0.00174938
+0.242 0.0017737
+0.243 0.00179825
+0.244 0.00182303
+0.245 0.00184806
+0.246 0.00187332
+0.247 0.00189882
+0.248 0.00192457
+0.249 0.00195056
+0.25 0.0019768
+0.251 0.00200328
+0.252 0.00203
+0.253 0.00205698
+0.254 0.00208421
+0.255 0.00211168
+0.256 0.00213941
+0.257 0.0021674
+0.258 0.00219564
+0.259 0.00222413
+0.26 0.00225289
+0.261 0.0022819
+0.262 0.00231117
+0.263 0.00234071
+0.264 0.00237051
+0.265 0.00240057
+0.266 0.0024309
+0.267 0.0024615
+0.268 0.00249236
+0.269 0.0025235
+0.27 0.0025549
+0.271 0.00258658
+0.272 0.00261853
+0.273 0.00265076
+0.274 0.00268326
+0.275 0.00271605
+0.276 0.00274911
+0.277 0.00278245
+0.278 0.00281608
+0.279 0.00284998
+0.28 0.00288418
+0.281 0.00291865
+0.282 0.00295342
+0.283 0.00298848
+0.284 0.00302382
+0.285 0.00305946
+0.286 0.00309539
+0.287 0.00313161
+0.288 0.00316813
+0.289 0.00320495
+0.29 0.00324206
+0.291 0.00327948
+0.292 0.0033172
+0.293 0.00335522
+0.294 0.00339354
+0.295 0.00343217
+0.296 0.0034711
+0.297 0.00351035
+0.298 0.0035499
+0.299 0.00358976
+0.3 0.00362994
+0.301 0.00367043
+0.302 0.00371123
+0.303 0.00375235
+0.304 0.00379379
+0.305 0.00383555
+0.306 0.00387763
+0.307 0.00392003
+0.308 0.00396276
+0.309 0.00400581
+0.31 0.00404918
+0.311 0.00409289
+0.312 0.00413692
+0.313 0.00418128
+0.314 0.00422598
+0.315 0.00427101
+0.316 0.00431637
+0.317 0.00436207
+0.318 0.00440811
+0.319 0.00445448
+0.32 0.0045012
+0.321 0.00454826
+0.322 0.00459566
+0.323 0.00464341
+0.324 0.0046915
+0.325 0.00473994
+0.326 0.00478873
+0.327 0.00483787
+0.328 0.00488736
+0.329 0.00493721
+0.33 0.00498741
+0.331 0.00503796
+0.332 0.00508888
+0.333 0.00514015
+0.334 0.00519178
+0.335 0.00524378
+0.336 0.00529614
+0.337 0.00534886
+0.338 0.00540195
+0.339 0.00545541
+0.34 0.00550924
+0.341 0.00556343
+0.342 0.005618
+0.343 0.00567295
+0.344 0.00572827
+0.345 0.00578396
+0.346 0.00584003
+0.347 0.00589649
+0.348 0.00595332
+0.349 0.00601053
+0.35 0.00606813
+0.351 0.00612612
+0.352 0.00618449
+0.353 0.00624325
+0.354 0.0063024
+0.355 0.00636194
+0.356 0.00642187
+0.357 0.0064822
+0.358 0.00654292
+0.359 0.00660404
+0.36 0.00666556
+0.361 0.00672748
+0.362 0.0067898
+0.363 0.00685252
+0.364 0.00691565
+0.365 0.00697918
+0.366 0.00704312
+0.367 0.00710747
+0.368 0.00717223
+0.369 0.00723741
+0.37 0.00730299
+0.371 0.00736899
+0.372 0.00743541
+0.373 0.00750224
+0.374 0.0075695
+0.375 0.00763717
+0.376 0.00770527
+0.377 0.00777379
+0.378 0.00784274
+0.379 0.00791211
+0.38 0.00798191
+0.381 0.00805215
+0.382 0.00812281
+0.383 0.0081939
+0.384 0.00826544
+0.385 0.0083374
+0.386 0.00840981
+0.387 0.00848265
+0.388 0.00855593
+0.389 0.00862966
+0.39 0.00870383
+0.391 0.00877844
+0.392 0.0088535
+0.393 0.00892901
+0.394 0.00900497
+0.395 0.00908138
+0.396 0.00915825
+0.397 0.00923556
+0.398 0.00931334
+0.399 0.00939157
+0.4 0.00947025
+0.401 0.0095494
+0.402 0.00962901
+0.403 0.00970909
+0.404 0.00978963
+0.405 0.00987063
+0.406 0.00995211
+0.407 0.0100341
+0.408 0.0101165
+0.409 0.0101994
+0.41 0.0102827
+0.411 0.0103666
+0.412 0.0104509
+0.413 0.0105357
+0.414 0.0106209
+0.415 0.0107067
+0.416 0.0107929
+0.417 0.0108797
+0.418 0.0109669
+0.419 0.0110546
+0.42 0.0111428
+0.421 0.0112314
+0.422 0.0113206
+0.423 0.0114103
+0.424 0.0115004
+0.425 0.0115911
+0.426 0.0116823
+0.427 0.0117739
+0.428 0.0118661
+0.429 0.0119588
+0.43 0.0120519
+0.431 0.0121456
+0.432 0.0122398
+0.433 0.0123345
+0.434 0.0124297
+0.435 0.0125254
+0.436 0.0126217
+0.437 0.0127184
+0.438 0.0128157
+0.439 0.0129135
+0.44 0.0130118
+0.441 0.0131106
+0.442 0.01321
+0.443 0.0133099
+0.444 0.0134103
+0.445 0.0135112
+0.446 0.0136127
+0.447 0.0137147
+0.448 0.0138173
+0.449 0.0139203
+0.45 0.0140239
+0.451 0.0141281
+0.452 0.0142328
+0.453 0.014338
+0.454 0.0144438
+0.455 0.0145501
+0.456 0.014657
+0.457 0.0147644
+0.458 0.0148724
+0.459 0.0149809
+0.46 0.0150899
+0.461 0.0151996
+0.462 0.0153098
+0.463 0.0154205
+0.464 0.0155318
+0.465 0.0156437
+0.466 0.0157561
+0.467 0.0158691
+0.468 0.0159826
+0.469 0.0160967
+0.47 0.0162114
+0.471 0.0163267
+0.472 0.0164425
+0.473 0.0165589
+0.474 0.0166759
+0.475 0.0167935
+0.476 0.0169116
+0.477 0.0170303
+0.478 0.0171496
+0.479 0.0172695
+0.48 0.01739
+0.481 0.017511
+0.482 0.0176327
+0.483 0.0177549
+0.484 0.0178778
+0.485 0.0180012
+0.486 0.0181252
+0.487 0.0182498
+0.488 0.018375
+0.489 0.0185008
+0.49 0.0186272
+0.491 0.0187543
+0.492 0.0188819
+0.493 0.0190101
+0.494 0.019139
+0.495 0.0192684
+0.496 0.0193985
+0.497 0.0195291
+0.498 0.0196604
+0.499 0.0197923
+0.5 0.0199248
+0.501 0.020058
+0.502 0.0201918
+0.503 0.0203261
+0.504 0.0204612
+0.505 0.0205968
+0.506 0.0207331
+0.507 0.02087
+0.508 0.0210075
+0.509 0.0211456
+0.51 0.0212844
+0.511 0.0214239
+0.512 0.0215639
+0.513 0.0217047
+0.514 0.021846
+0.515 0.021988
+0.516 0.0221306
+0.517 0.0222739
+0.518 0.0224179
+0.519 0.0225624
+0.52 0.0227077
+0.521 0.0228536
+0.522 0.0230001
+0.523 0.0231473
+0.524 0.0232952
+0.525 0.0234437
+0.526 0.0235929
+0.527 0.0237427
+0.528 0.0238932
+0.529 0.0240444
+0.53 0.0241962
+0.531 0.0243488
+0.532 0.0245019
+0.533 0.0246558
+0.534 0.0248103
+0.535 0.0249655
+0.536 0.0251214
+0.537 0.025278
+0.538 0.0254352
+0.539 0.0255932
+0.54 0.0257518
+0.541 0.0259111
+0.542 0.0260711
+0.543 0.0262318
+0.544 0.0263932
+0.545 0.0265552
+0.546 0.026718
+0.547 0.0268815
+0.548 0.0270456
+0.549 0.0272105
+0.55 0.027376
+0.551 0.0275423
+0.552 0.0277093
+0.553 0.027877
+0.554 0.0280454
+0.555 0.0282145
+0.556 0.0283843
+0.557 0.0285548
+0.558 0.028726
+0.559 0.028898
+0.56 0.0290707
+0.561 0.0292441
+0.562 0.0294182
+0.563 0.029593
+0.564 0.0297686
+0.565 0.0299449
+0.566 0.030122
+0.567 0.0302997
+0.568 0.0304782
+0.569 0.0306574
+0.57 0.0308374
+0.571 0.0310181
+0.572 0.0311996
+0.573 0.0313817
+0.574 0.0315647
+0.575 0.0317483
+0.576 0.0319328
+0.577 0.0321179
+0.578 0.0323039
+0.579 0.0324905
+0.58 0.032678
+0.581 0.0328661
+0.582 0.0330551
+0.583 0.0332448
+0.584 0.0334352
+0.585 0.0336265
+0.586 0.0338185
+0.587 0.0340112
+0.588 0.0342047
+0.589 0.034399
+0.59 0.0345941
+0.591 0.0347899
+0.592 0.0349865
+0.593 0.0351839
+0.594 0.0353821
+0.595 0.035581
+0.596 0.0357807
+0.597 0.0359812
+0.598 0.0361825
+0.599 0.0363846
+0.6 0.0365875
+0.601 0.0367911
+0.602 0.0369956
+0.603 0.0372008
+0.604 0.0374069
+0.605 0.0376137
+0.606 0.0378214
+0.607 0.0380298
+0.608 0.038239
+0.609 0.0384491
+0.61 0.0386599
+0.611 0.0388716
+0.612 0.0390841
+0.613 0.0392973
+0.614 0.0395114
+0.615 0.0397264
+0.616 0.0399421
+0.617 0.0401586
+0.618 0.040376
+0.619 0.0405942
+0.62 0.0408132
+0.621 0.041033
+0.622 0.0412537
+0.623 0.0414752
+0.624 0.0416975
+0.625 0.0419207
+0.626 0.0421447
+0.627 0.0423695
+0.628 0.0425952
+0.629 0.0428217
+0.63 0.043049
+0.631 0.0432772
+0.632 0.0435063
+0.633 0.0437362
+0.634 0.0439669
+0.635 0.0441985
+0.636 0.0444309
+0.637 0.0446642
+0.638 0.0448984
+0.639 0.0451334
+0.64 0.0453692
+0.641 0.045606
+0.642 0.0458436
+0.643 0.046082
+0.644 0.0463214
+0.645 0.0465615
+0.646 0.0468026
+0.647 0.0470445
+0.648 0.0472874
+0.649 0.047531
+0.65 0.0477756
+0.651 0.048021
+0.652 0.0482674
+0.653 0.0485146
+0.654 0.0487627
+0.655 0.0490117
+0.656 0.0492615
+0.657 0.0495123
+0.658 0.0497639
+0.659 0.0500165
+0.66 0.0502699
+0.661 0.0505242
+0.662 0.0507795
+0.663 0.0510356
+0.664 0.0512927
+0.665 0.0515506
+0.666 0.0518095
+0.667 0.0520692
+0.668 0.0523299
+0.669 0.0525915
+0.67 0.052854
+0.671 0.0531174
+0.672 0.0533817
+0.673 0.053647
+0.674 0.0539131
+0.675 0.0541802
+0.676 0.0544483
+0.677 0.0547172
+0.678 0.0549871
+0.679 0.0552579
+0.68 0.0555296
+0.681 0.0558023
+0.682 0.0560759
+0.683 0.0563504
+0.684 0.0566259
+0.685 0.0569024
+0.686 0.0571797
+0.687 0.057458
+0.688 0.0577373
+0.689 0.0580175
+0.69 0.0582987
+0.691 0.0585808
+0.692 0.0588638
+0.693 0.0591479
+0.694 0.0594329
+0.695 0.0597188
+0.696 0.0600057
+0.697 0.0602936
+0.698 0.0605824
+0.699 0.0608722
+0.7 0.061163
+0.701 0.0614547
+0.702 0.0617474
+0.703 0.0620411
+0.704 0.0623358
+0.705 0.0626314
+0.706 0.062928
+0.707 0.0632256
+0.708 0.0635242
+0.709 0.0638238
+0.71 0.0641243
+0.711 0.0644259
+0.712 0.0647284
+0.713 0.0650319
+0.714 0.0653365
+0.715 0.065642
+0.716 0.0659485
+0.717 0.066256
+0.718 0.0665646
+0.719 0.0668741
+0.72 0.0671846
+0.721 0.0674962
+0.722 0.0678087
+0.723 0.0681223
+0.724 0.0684369
+0.725 0.0687525
+0.726 0.0690691
+0.727 0.0693867
+0.728 0.0697054
+0.729 0.0700251
+0.73 0.0703458
+0.731 0.0706675
+0.732 0.0709902
+0.733 0.071314
+0.734 0.0716388
+0.735 0.0719647
+0.736 0.0722916
+0.737 0.0726195
+0.738 0.0729485
+0.739 0.0732785
+0.74 0.0736095
+0.741 0.0739416
+0.742 0.0742748
+0.743 0.074609
+0.744 0.0749442
+0.745 0.0752805
+0.746 0.0756179
+0.747 0.0759563
+0.748 0.0762957
+0.749 0.0766363
+0.75 0.0769779
+0.751 0.0773205
+0.752 0.0776642
+0.753 0.078009
+0.754 0.0783549
+0.755 0.0787018
+0.756 0.0790498
+0.757 0.0793989
+0.758 0.0797491
+0.759 0.0801003
+0.76 0.0804526
+0.761 0.080806
+0.762 0.0811605
+0.763 0.0815161
+0.764 0.0818728
+0.765 0.0822305
+0.766 0.0825894
+0.767 0.0829493
+0.768 0.0833104
+0.769 0.0836725
+0.77 0.0840358
+0.771 0.0844001
+0.772 0.0847655
+0.773 0.0851321
+0.774 0.0854998
+0.775 0.0858685
+0.776 0.0862384
+0.777 0.0866094
+0.778 0.0869815
+0.779 0.0873548
+0.78 0.0877291
+0.781 0.0881046
+0.782 0.0884812
+0.783 0.0888589
+0.784 0.0892377
+0.785 0.0896177
+0.786 0.0899988
+0.787 0.0903811
+0.788 0.0907644
+0.789 0.091149
+0.79 0.0915346
+0.791 0.0919214
+0.792 0.0923093
+0.793 0.0926984
+0.794 0.0930886
+0.795 0.09348
+0.796 0.0938725
+0.797 0.0942662
+0.798 0.094661
+0.799 0.095057
+0.8 0.0954542
+0.801 0.0958525
+0.802 0.096252
+0.803 0.0966526
+0.804 0.0970544
+0.805 0.0974574
+0.806 0.0978615
+0.807 0.0982668
+0.808 0.0986733
+0.809 0.0990809
+0.81 0.0994898
+0.811 0.0998998
+0.812 0.100311
+0.813 0.100723
+0.814 0.101137
+0.815 0.101552
+0.816 0.101968
+0.817 0.102385
+0.818 0.102803
+0.819 0.103223
+0.82 0.103643
+0.821 0.104065
+0.822 0.104488
+0.823 0.104913
+0.824 0.105338
+0.825 0.105765
+0.826 0.106193
+0.827 0.106622
+0.828 0.107052
+0.829 0.107484
+0.83 0.107917
+0.831 0.108351
+0.832 0.108786
+0.833 0.109222
+0.834 0.10966
+0.835 0.110099
+0.836 0.110539
+0.837 0.11098
+0.838 0.111423
+0.839 0.111867
+0.84 0.112312
+0.841 0.112758
+0.842 0.113206
+0.843 0.113655
+0.844 0.114105
+0.845 0.114556
+0.846 0.115008
+0.847 0.115462
+0.848 0.115917
+0.849 0.116373
+0.85 0.116831
+0.851 0.11729
+0.852 0.11775
+0.853 0.118211
+0.854 0.118674
+0.855 0.119138
+0.856 0.119603
+0.857 0.120069
+0.858 0.120537
+0.859 0.121006
+0.86 0.121476
+0.861 0.121947
+0.862 0.12242
+0.863 0.122894
+0.864 0.123369
+0.865 0.123846
+0.866 0.124324
+0.867 0.124803
+0.868 0.125284
+0.869 0.125765
+0.87 0.126248
+0.871 0.126733
+0.872 0.127218
+0.873 0.127705
+0.874 0.128194
+0.875 0.128683
+0.876 0.129174
+0.877 0.129666
+0.878 0.13016
+0.879 0.130655
+0.88 0.131151
+0.881 0.131648
+0.882 0.132147
+0.883 0.132647
+0.884 0.133148
+0.885 0.133651
+0.886 0.134155
+0.887 0.134661
+0.888 0.135167
+0.889 0.135675
+0.89 0.136185
+0.891 0.136695
+0.892 0.137208
+0.893 0.137721
+0.894 0.138236
+0.895 0.138752
+0.896 0.139269
+0.897 0.139788
+0.898 0.140308
+0.899 0.14083
+0.9 0.141352
+0.901 0.141877
+0.902 0.142402
+0.903 0.142929
+0.904 0.143457
+0.905 0.143987
+0.906 0.144518
+0.907 0.145051
+0.908 0.145584
+0.909 0.146119
+0.91 0.146656
+0.911 0.147194
+0.912 0.147733
+0.913 0.148274
+0.914 0.148816
+0.915 0.149359
+0.916 0.149904
+0.917 0.15045
+0.918 0.150998
+0.919 0.151547
+0.92 0.152097
+0.921 0.152649
+0.922 0.153202
+0.923 0.153757
+0.924 0.154313
+0.925 0.15487
+0.926 0.155429
+0.927 0.155989
+0.928 0.156551
+0.929 0.157114
+0.93 0.157678
+0.931 0.158244
+0.932 0.158811
+0.933 0.15938
+0.934 0.15995
+0.935 0.160522
+0.936 0.161095
+0.937 0.161669
+0.938 0.162245
+0.939 0.162822
+0.94 0.163401
+0.941 0.163981
+0.942 0.164563
+0.943 0.165146
+0.944 0.16573
+0.945 0.166316
+0.946 0.166904
+0.947 0.167492
+0.948 0.168083
+0.949 0.168674
+0.95 0.169268
+0.951 0.169862
+0.952 0.170458
+0.953 0.171056
+0.954 0.171655
+0.955 0.172255
+0.956 0.172857
+0.957 0.173461
+0.958 0.174066
+0.959 0.174672
+0.96 0.17528
+0.961 0.175889
+0.962 0.1765
+0.963 0.177113
+0.964 0.177726
+0.965 0.178342
+0.966 0.178958
+0.967 0.179577
+0.968 0.180196
+0.969 0.180818
+0.97 0.18144
+0.971 0.182065
+0.972 0.18269
+0.973 0.183318
+0.974 0.183947
+0.975 0.184577
+0.976 0.185209
+0.977 0.185842
+0.978 0.186477
+0.979 0.187113
+0.98 0.187751
+0.981 0.18839
+0.982 0.189031
+0.983 0.189674
+0.984 0.190317
+0.985 0.190963
+0.986 0.19161
+0.987 0.192258
+0.988 0.192909
+0.989 0.19356
+0.99 0.194213
+0.991 0.194868
+0.992 0.195524
+0.993 0.196182
+0.994 0.196841
+0.995 0.197502
+0.996 0.198165
+0.997 0.198829
+0.998 0.199494
+0.999 0.200161
+1 0.20083
diff --git a/test/references/thermalconductivityjohansen-reference.dat b/test/references/thermalconductivityjohansen-reference.dat
new file mode 100644
index 0000000000000000000000000000000000000000..35f62ca33972d22e984ba5c26a8d0b65838e7191
--- /dev/null
+++ b/test/references/thermalconductivityjohansen-reference.dat
@@ -0,0 +1,1001 @@
+0 0.0900446
+0.001 0.115479
+0.002 0.140191
+0.003 0.164212
+0.004 0.187571
+0.005 0.210294
+0.006 0.232407
+0.007 0.253933
+0.008 0.274898
+0.009 0.295321
+0.01 0.315223
+0.011 0.334625
+0.012 0.353545
+0.013 0.372
+0.014 0.390009
+0.015 0.407585
+0.016 0.424746
+0.017 0.441505
+0.018 0.457877
+0.019 0.473874
+0.02 0.48951
+0.021 0.504797
+0.022 0.519745
+0.023 0.534367
+0.024 0.548673
+0.025 0.562672
+0.026 0.576376
+0.027 0.589792
+0.028 0.60293
+0.029 0.615799
+0.03 0.628406
+0.031 0.64076
+0.032 0.652868
+0.033 0.664738
+0.034 0.676376
+0.035 0.687789
+0.036 0.698983
+0.037 0.709966
+0.038 0.720742
+0.039 0.731317
+0.04 0.741698
+0.041 0.751889
+0.042 0.761895
+0.043 0.771722
+0.044 0.781375
+0.045 0.790857
+0.046 0.800174
+0.047 0.809329
+0.048 0.818327
+0.049 0.827172
+0.05 0.835867
+0.051 0.844417
+0.052 0.852826
+0.053 0.861095
+0.054 0.86923
+0.055 0.877233
+0.056 0.885107
+0.057 0.892856
+0.058 0.900483
+0.059 0.90799
+0.06 0.915379
+0.061 0.922655
+0.062 0.929819
+0.063 0.936875
+0.064 0.943824
+0.065 0.950668
+0.066 0.957411
+0.067 0.964055
+0.068 0.970601
+0.069 0.977051
+0.07 0.983409
+0.071 0.989675
+0.072 0.995853
+0.073 1.00194
+0.074 1.00795
+0.075 1.01387
+0.076 1.01971
+0.077 1.02547
+0.078 1.03115
+0.079 1.03675
+0.08 1.04228
+0.081 1.04773
+0.082 1.05311
+0.083 1.05842
+0.084 1.06366
+0.085 1.06883
+0.086 1.07394
+0.087 1.07898
+0.088 1.08395
+0.089 1.08886
+0.09 1.09371
+0.091 1.0985
+0.092 1.10323
+0.093 1.1079
+0.094 1.11252
+0.095 1.11707
+0.096 1.12158
+0.097 1.12602
+0.098 1.13042
+0.099 1.13476
+0.1 1.13905
+0.101 1.14329
+0.102 1.14748
+0.103 1.15162
+0.104 1.15571
+0.105 1.15975
+0.106 1.16375
+0.107 1.16771
+0.108 1.17161
+0.109 1.17548
+0.11 1.1793
+0.111 1.18308
+0.112 1.18682
+0.113 1.19051
+0.114 1.19417
+0.115 1.19778
+0.116 1.20136
+0.117 1.2049
+0.118 1.2084
+0.119 1.21186
+0.12 1.21528
+0.121 1.21867
+0.122 1.22203
+0.123 1.22534
+0.124 1.22863
+0.125 1.23188
+0.126 1.2351
+0.127 1.23828
+0.128 1.24143
+0.129 1.24455
+0.13 1.24764
+0.131 1.2507
+0.132 1.25372
+0.133 1.25672
+0.134 1.25969
+0.135 1.26263
+0.136 1.26553
+0.137 1.26842
+0.138 1.27127
+0.139 1.27409
+0.14 1.27689
+0.141 1.27966
+0.142 1.28241
+0.143 1.28513
+0.144 1.28782
+0.145 1.29049
+0.146 1.29314
+0.147 1.29575
+0.148 1.29835
+0.149 1.30092
+0.15 1.30347
+0.151 1.30599
+0.152 1.30849
+0.153 1.31097
+0.154 1.31343
+0.155 1.31586
+0.156 1.31828
+0.157 1.32067
+0.158 1.32304
+0.159 1.32539
+0.16 1.32772
+0.161 1.33003
+0.162 1.33231
+0.163 1.33458
+0.164 1.33683
+0.165 1.33906
+0.166 1.34127
+0.167 1.34347
+0.168 1.34564
+0.169 1.3478
+0.17 1.34993
+0.171 1.35205
+0.172 1.35415
+0.173 1.35624
+0.174 1.35831
+0.175 1.36036
+0.176 1.36239
+0.177 1.36441
+0.178 1.36641
+0.179 1.36839
+0.18 1.37036
+0.181 1.37231
+0.182 1.37425
+0.183 1.37617
+0.184 1.37808
+0.185 1.37997
+0.186 1.38185
+0.187 1.38371
+0.188 1.38556
+0.189 1.38739
+0.19 1.38921
+0.191 1.39101
+0.192 1.3928
+0.193 1.39458
+0.194 1.39634
+0.195 1.39809
+0.196 1.39983
+0.197 1.40156
+0.198 1.40327
+0.199 1.40496
+0.2 1.40665
+0.201 1.40832
+0.202 1.40998
+0.203 1.41163
+0.204 1.41327
+0.205 1.41489
+0.206 1.41651
+0.207 1.41811
+0.208 1.4197
+0.209 1.42127
+0.21 1.42284
+0.211 1.4244
+0.212 1.42594
+0.213 1.42747
+0.214 1.429
+0.215 1.43051
+0.216 1.43201
+0.217 1.4335
+0.218 1.43498
+0.219 1.43645
+0.22 1.43791
+0.221 1.43936
+0.222 1.4408
+0.223 1.44223
+0.224 1.44365
+0.225 1.44506
+0.226 1.44646
+0.227 1.44785
+0.228 1.44923
+0.229 1.4506
+0.23 1.45197
+0.231 1.45332
+0.232 1.45467
+0.233 1.456
+0.234 1.45733
+0.235 1.45865
+0.236 1.45996
+0.237 1.46126
+0.238 1.46255
+0.239 1.46384
+0.24 1.46511
+0.241 1.46638
+0.242 1.46764
+0.243 1.46889
+0.244 1.47014
+0.245 1.47137
+0.246 1.4726
+0.247 1.47382
+0.248 1.47503
+0.249 1.47624
+0.25 1.47744
+0.251 1.47863
+0.252 1.47981
+0.253 1.48098
+0.254 1.48215
+0.255 1.48331
+0.256 1.48446
+0.257 1.48561
+0.258 1.48675
+0.259 1.48788
+0.26 1.48901
+0.261 1.49013
+0.262 1.49124
+0.263 1.49234
+0.264 1.49344
+0.265 1.49453
+0.266 1.49562
+0.267 1.4967
+0.268 1.49777
+0.269 1.49883
+0.27 1.49989
+0.271 1.50095
+0.272 1.50199
+0.273 1.50304
+0.274 1.50407
+0.275 1.5051
+0.276 1.50612
+0.277 1.50714
+0.278 1.50815
+0.279 1.50916
+0.28 1.51016
+0.281 1.51115
+0.282 1.51214
+0.283 1.51312
+0.284 1.5141
+0.285 1.51507
+0.286 1.51604
+0.287 1.517
+0.288 1.51795
+0.289 1.5189
+0.29 1.51985
+0.291 1.52079
+0.292 1.52172
+0.293 1.52265
+0.294 1.52357
+0.295 1.52449
+0.296 1.52541
+0.297 1.52631
+0.298 1.52722
+0.299 1.52812
+0.3 1.52901
+0.301 1.5299
+0.302 1.53078
+0.303 1.53166
+0.304 1.53254
+0.305 1.53341
+0.306 1.53427
+0.307 1.53514
+0.308 1.53599
+0.309 1.53684
+0.31 1.53769
+0.311 1.53853
+0.312 1.53937
+0.313 1.54021
+0.314 1.54104
+0.315 1.54186
+0.316 1.54268
+0.317 1.5435
+0.318 1.54431
+0.319 1.54512
+0.32 1.54592
+0.321 1.54672
+0.322 1.54752
+0.323 1.54831
+0.324 1.5491
+0.325 1.54988
+0.326 1.55066
+0.327 1.55144
+0.328 1.55221
+0.329 1.55298
+0.33 1.55374
+0.331 1.5545
+0.332 1.55526
+0.333 1.55601
+0.334 1.55676
+0.335 1.55751
+0.336 1.55825
+0.337 1.55899
+0.338 1.55972
+0.339 1.56045
+0.34 1.56118
+0.341 1.5619
+0.342 1.56263
+0.343 1.56334
+0.344 1.56406
+0.345 1.56476
+0.346 1.56547
+0.347 1.56617
+0.348 1.56687
+0.349 1.56757
+0.35 1.56826
+0.351 1.56895
+0.352 1.56964
+0.353 1.57032
+0.354 1.571
+0.355 1.57168
+0.356 1.57235
+0.357 1.57302
+0.358 1.57369
+0.359 1.57435
+0.36 1.57501
+0.361 1.57567
+0.362 1.57633
+0.363 1.57698
+0.364 1.57763
+0.365 1.57827
+0.366 1.57892
+0.367 1.57956
+0.368 1.58019
+0.369 1.58083
+0.37 1.58146
+0.371 1.58209
+0.372 1.58271
+0.373 1.58333
+0.374 1.58395
+0.375 1.58457
+0.376 1.58518
+0.377 1.5858
+0.378 1.5864
+0.379 1.58701
+0.38 1.58761
+0.381 1.58821
+0.382 1.58881
+0.383 1.58941
+0.384 1.59
+0.385 1.59059
+0.386 1.59118
+0.387 1.59176
+0.388 1.59234
+0.389 1.59292
+0.39 1.5935
+0.391 1.59407
+0.392 1.59465
+0.393 1.59522
+0.394 1.59578
+0.395 1.59635
+0.396 1.59691
+0.397 1.59747
+0.398 1.59803
+0.399 1.59858
+0.4 1.59914
+0.401 1.59969
+0.402 1.60023
+0.403 1.60078
+0.404 1.60132
+0.405 1.60187
+0.406 1.6024
+0.407 1.60294
+0.408 1.60347
+0.409 1.60401
+0.41 1.60454
+0.411 1.60506
+0.412 1.60559
+0.413 1.60611
+0.414 1.60663
+0.415 1.60715
+0.416 1.60767
+0.417 1.60818
+0.418 1.6087
+0.419 1.60921
+0.42 1.60972
+0.421 1.61022
+0.422 1.61073
+0.423 1.61123
+0.424 1.61173
+0.425 1.61223
+0.426 1.61272
+0.427 1.61322
+0.428 1.61371
+0.429 1.6142
+0.43 1.61469
+0.431 1.61517
+0.432 1.61566
+0.433 1.61614
+0.434 1.61662
+0.435 1.6171
+0.436 1.61758
+0.437 1.61805
+0.438 1.61852
+0.439 1.61899
+0.44 1.61946
+0.441 1.61993
+0.442 1.6204
+0.443 1.62086
+0.444 1.62132
+0.445 1.62178
+0.446 1.62224
+0.447 1.6227
+0.448 1.62315
+0.449 1.6236
+0.45 1.62406
+0.451 1.6245
+0.452 1.62495
+0.453 1.6254
+0.454 1.62584
+0.455 1.62629
+0.456 1.62673
+0.457 1.62717
+0.458 1.6276
+0.459 1.62804
+0.46 1.62847
+0.461 1.62891
+0.462 1.62934
+0.463 1.62977
+0.464 1.63019
+0.465 1.63062
+0.466 1.63104
+0.467 1.63147
+0.468 1.63189
+0.469 1.63231
+0.47 1.63273
+0.471 1.63314
+0.472 1.63356
+0.473 1.63397
+0.474 1.63438
+0.475 1.6348
+0.476 1.6352
+0.477 1.63561
+0.478 1.63602
+0.479 1.63642
+0.48 1.63683
+0.481 1.63723
+0.482 1.63763
+0.483 1.63803
+0.484 1.63842
+0.485 1.63882
+0.486 1.63921
+0.487 1.63961
+0.488 1.64
+0.489 1.64039
+0.49 1.64078
+0.491 1.64117
+0.492 1.64155
+0.493 1.64194
+0.494 1.64232
+0.495 1.6427
+0.496 1.64308
+0.497 1.64346
+0.498 1.64384
+0.499 1.64422
+0.5 1.64459
+0.501 1.64496
+0.502 1.64534
+0.503 1.64571
+0.504 1.64608
+0.505 1.64645
+0.506 1.64681
+0.507 1.64718
+0.508 1.64755
+0.509 1.64791
+0.51 1.64827
+0.511 1.64863
+0.512 1.64899
+0.513 1.64935
+0.514 1.64971
+0.515 1.65007
+0.516 1.65042
+0.517 1.65077
+0.518 1.65113
+0.519 1.65148
+0.52 1.65183
+0.521 1.65218
+0.522 1.65252
+0.523 1.65287
+0.524 1.65322
+0.525 1.65356
+0.526 1.6539
+0.527 1.65425
+0.528 1.65459
+0.529 1.65493
+0.53 1.65527
+0.531 1.6556
+0.532 1.65594
+0.533 1.65627
+0.534 1.65661
+0.535 1.65694
+0.536 1.65727
+0.537 1.6576
+0.538 1.65793
+0.539 1.65826
+0.54 1.65859
+0.541 1.65892
+0.542 1.65924
+0.543 1.65957
+0.544 1.65989
+0.545 1.66021
+0.546 1.66053
+0.547 1.66085
+0.548 1.66117
+0.549 1.66149
+0.55 1.66181
+0.551 1.66212
+0.552 1.66244
+0.553 1.66275
+0.554 1.66306
+0.555 1.66338
+0.556 1.66369
+0.557 1.664
+0.558 1.66431
+0.559 1.66461
+0.56 1.66492
+0.561 1.66523
+0.562 1.66553
+0.563 1.66584
+0.564 1.66614
+0.565 1.66644
+0.566 1.66674
+0.567 1.66704
+0.568 1.66734
+0.569 1.66764
+0.57 1.66794
+0.571 1.66823
+0.572 1.66853
+0.573 1.66882
+0.574 1.66912
+0.575 1.66941
+0.576 1.6697
+0.577 1.66999
+0.578 1.67028
+0.579 1.67057
+0.58 1.67086
+0.581 1.67115
+0.582 1.67144
+0.583 1.67172
+0.584 1.67201
+0.585 1.67229
+0.586 1.67257
+0.587 1.67285
+0.588 1.67314
+0.589 1.67342
+0.59 1.6737
+0.591 1.67397
+0.592 1.67425
+0.593 1.67453
+0.594 1.67481
+0.595 1.67508
+0.596 1.67536
+0.597 1.67563
+0.598 1.6759
+0.599 1.67618
+0.6 1.67645
+0.601 1.67672
+0.602 1.67699
+0.603 1.67726
+0.604 1.67752
+0.605 1.67779
+0.606 1.67806
+0.607 1.67832
+0.608 1.67859
+0.609 1.67885
+0.61 1.67912
+0.611 1.67938
+0.612 1.67964
+0.613 1.6799
+0.614 1.68016
+0.615 1.68042
+0.616 1.68068
+0.617 1.68094
+0.618 1.68119
+0.619 1.68145
+0.62 1.68171
+0.621 1.68196
+0.622 1.68222
+0.623 1.68247
+0.624 1.68272
+0.625 1.68297
+0.626 1.68323
+0.627 1.68348
+0.628 1.68373
+0.629 1.68398
+0.63 1.68422
+0.631 1.68447
+0.632 1.68472
+0.633 1.68497
+0.634 1.68521
+0.635 1.68546
+0.636 1.6857
+0.637 1.68594
+0.638 1.68619
+0.639 1.68643
+0.64 1.68667
+0.641 1.68691
+0.642 1.68715
+0.643 1.68739
+0.644 1.68763
+0.645 1.68787
+0.646 1.68811
+0.647 1.68834
+0.648 1.68858
+0.649 1.68881
+0.65 1.68905
+0.651 1.68928
+0.652 1.68952
+0.653 1.68975
+0.654 1.68998
+0.655 1.69021
+0.656 1.69044
+0.657 1.69067
+0.658 1.6909
+0.659 1.69113
+0.66 1.69136
+0.661 1.69159
+0.662 1.69182
+0.663 1.69204
+0.664 1.69227
+0.665 1.69249
+0.666 1.69272
+0.667 1.69294
+0.668 1.69317
+0.669 1.69339
+0.67 1.69361
+0.671 1.69383
+0.672 1.69405
+0.673 1.69428
+0.674 1.6945
+0.675 1.69471
+0.676 1.69493
+0.677 1.69515
+0.678 1.69537
+0.679 1.69559
+0.68 1.6958
+0.681 1.69602
+0.682 1.69623
+0.683 1.69645
+0.684 1.69666
+0.685 1.69688
+0.686 1.69709
+0.687 1.6973
+0.688 1.69751
+0.689 1.69772
+0.69 1.69793
+0.691 1.69814
+0.692 1.69835
+0.693 1.69856
+0.694 1.69877
+0.695 1.69898
+0.696 1.69919
+0.697 1.69939
+0.698 1.6996
+0.699 1.69981
+0.7 1.70001
+0.701 1.70022
+0.702 1.70042
+0.703 1.70062
+0.704 1.70083
+0.705 1.70103
+0.706 1.70123
+0.707 1.70143
+0.708 1.70163
+0.709 1.70183
+0.71 1.70203
+0.711 1.70223
+0.712 1.70243
+0.713 1.70263
+0.714 1.70283
+0.715 1.70303
+0.716 1.70322
+0.717 1.70342
+0.718 1.70362
+0.719 1.70381
+0.72 1.70401
+0.721 1.7042
+0.722 1.7044
+0.723 1.70459
+0.724 1.70478
+0.725 1.70497
+0.726 1.70517
+0.727 1.70536
+0.728 1.70555
+0.729 1.70574
+0.73 1.70593
+0.731 1.70612
+0.732 1.70631
+0.733 1.7065
+0.734 1.70669
+0.735 1.70687
+0.736 1.70706
+0.737 1.70725
+0.738 1.70743
+0.739 1.70762
+0.74 1.70781
+0.741 1.70799
+0.742 1.70817
+0.743 1.70836
+0.744 1.70854
+0.745 1.70873
+0.746 1.70891
+0.747 1.70909
+0.748 1.70927
+0.749 1.70945
+0.75 1.70963
+0.751 1.70982
+0.752 1.71
+0.753 1.71017
+0.754 1.71035
+0.755 1.71053
+0.756 1.71071
+0.757 1.71089
+0.758 1.71107
+0.759 1.71124
+0.76 1.71142
+0.761 1.7116
+0.762 1.71177
+0.763 1.71195
+0.764 1.71212
+0.765 1.7123
+0.766 1.71247
+0.767 1.71264
+0.768 1.71282
+0.769 1.71299
+0.77 1.71316
+0.771 1.71333
+0.772 1.71351
+0.773 1.71368
+0.774 1.71385
+0.775 1.71402
+0.776 1.71419
+0.777 1.71436
+0.778 1.71453
+0.779 1.7147
+0.78 1.71486
+0.781 1.71503
+0.782 1.7152
+0.783 1.71537
+0.784 1.71553
+0.785 1.7157
+0.786 1.71587
+0.787 1.71603
+0.788 1.7162
+0.789 1.71636
+0.79 1.71653
+0.791 1.71669
+0.792 1.71685
+0.793 1.71702
+0.794 1.71718
+0.795 1.71734
+0.796 1.7175
+0.797 1.71767
+0.798 1.71783
+0.799 1.71799
+0.8 1.71815
+0.801 1.71831
+0.802 1.71847
+0.803 1.71863
+0.804 1.71879
+0.805 1.71895
+0.806 1.71911
+0.807 1.71926
+0.808 1.71942
+0.809 1.71958
+0.81 1.71974
+0.811 1.71989
+0.812 1.72005
+0.813 1.72021
+0.814 1.72036
+0.815 1.72052
+0.816 1.72067
+0.817 1.72083
+0.818 1.72098
+0.819 1.72113
+0.82 1.72129
+0.821 1.72144
+0.822 1.72159
+0.823 1.72175
+0.824 1.7219
+0.825 1.72205
+0.826 1.7222
+0.827 1.72235
+0.828 1.7225
+0.829 1.72265
+0.83 1.7228
+0.831 1.72295
+0.832 1.7231
+0.833 1.72325
+0.834 1.7234
+0.835 1.72355
+0.836 1.7237
+0.837 1.72385
+0.838 1.72399
+0.839 1.72414
+0.84 1.72429
+0.841 1.72443
+0.842 1.72458
+0.843 1.72473
+0.844 1.72487
+0.845 1.72502
+0.846 1.72516
+0.847 1.72531
+0.848 1.72545
+0.849 1.72559
+0.85 1.72574
+0.851 1.72588
+0.852 1.72602
+0.853 1.72617
+0.854 1.72631
+0.855 1.72645
+0.856 1.72659
+0.857 1.72673
+0.858 1.72688
+0.859 1.72702
+0.86 1.72716
+0.861 1.7273
+0.862 1.72744
+0.863 1.72758
+0.864 1.72772
+0.865 1.72786
+0.866 1.72799
+0.867 1.72813
+0.868 1.72827
+0.869 1.72841
+0.87 1.72855
+0.871 1.72868
+0.872 1.72882
+0.873 1.72896
+0.874 1.72909
+0.875 1.72923
+0.876 1.72937
+0.877 1.7295
+0.878 1.72964
+0.879 1.72977
+0.88 1.72991
+0.881 1.73004
+0.882 1.73018
+0.883 1.73031
+0.884 1.73044
+0.885 1.73058
+0.886 1.73071
+0.887 1.73084
+0.888 1.73097
+0.889 1.73111
+0.89 1.73124
+0.891 1.73137
+0.892 1.7315
+0.893 1.73163
+0.894 1.73176
+0.895 1.73189
+0.896 1.73202
+0.897 1.73215
+0.898 1.73228
+0.899 1.73241
+0.9 1.73254
+0.901 1.73267
+0.902 1.7328
+0.903 1.73293
+0.904 1.73306
+0.905 1.73318
+0.906 1.73331
+0.907 1.73344
+0.908 1.73357
+0.909 1.73369
+0.91 1.73382
+0.911 1.73395
+0.912 1.73407
+0.913 1.7342
+0.914 1.73432
+0.915 1.73445
+0.916 1.73457
+0.917 1.7347
+0.918 1.73482
+0.919 1.73495
+0.92 1.73507
+0.921 1.7352
+0.922 1.73532
+0.923 1.73544
+0.924 1.73557
+0.925 1.73569
+0.926 1.73581
+0.927 1.73593
+0.928 1.73605
+0.929 1.73618
+0.93 1.7363
+0.931 1.73642
+0.932 1.73654
+0.933 1.73666
+0.934 1.73678
+0.935 1.7369
+0.936 1.73702
+0.937 1.73714
+0.938 1.73726
+0.939 1.73738
+0.94 1.7375
+0.941 1.73762
+0.942 1.73774
+0.943 1.73786
+0.944 1.73797
+0.945 1.73809
+0.946 1.73821
+0.947 1.73833
+0.948 1.73845
+0.949 1.73856
+0.95 1.73868
+0.951 1.7388
+0.952 1.73891
+0.953 1.73903
+0.954 1.73914
+0.955 1.73926
+0.956 1.73938
+0.957 1.73949
+0.958 1.73961
+0.959 1.73972
+0.96 1.73983
+0.961 1.73995
+0.962 1.74006
+0.963 1.74018
+0.964 1.74029
+0.965 1.7404
+0.966 1.74052
+0.967 1.74063
+0.968 1.74074
+0.969 1.74086
+0.97 1.74097
+0.971 1.74108
+0.972 1.74119
+0.973 1.7413
+0.974 1.74142
+0.975 1.74153
+0.976 1.74164
+0.977 1.74175
+0.978 1.74186
+0.979 1.74197
+0.98 1.74208
+0.981 1.74219
+0.982 1.7423
+0.983 1.74241
+0.984 1.74252
+0.985 1.74263
+0.986 1.74274
+0.987 1.74285
+0.988 1.74295
+0.989 1.74306
+0.99 1.74317
+0.991 1.74328
+0.992 1.74339
+0.993 1.74349
+0.994 1.7436
+0.995 1.74371
+0.996 1.74382
+0.997 1.74392
+0.998 1.74403
+0.999 1.74414
+1 1.74424
diff --git a/test/references/thermalconductivitysomerton-reference.dat b/test/references/thermalconductivitysomerton-reference.dat
new file mode 100644
index 0000000000000000000000000000000000000000..e000a727817ac6abc5125d6c2cdf7579bea4a09a
--- /dev/null
+++ b/test/references/thermalconductivitysomerton-reference.dat
@@ -0,0 +1,1001 @@
+0 0.676305
+0.001 0.710076
+0.002 0.724065
+0.003 0.734799
+0.004 0.743847
+0.005 0.75182
+0.006 0.759027
+0.007 0.765655
+0.008 0.771824
+0.009 0.777619
+0.01 0.783099
+0.011 0.788311
+0.012 0.793292
+0.013 0.798069
+0.014 0.802665
+0.015 0.8071
+0.016 0.81139
+0.017 0.815547
+0.018 0.819584
+0.019 0.82351
+0.02 0.827334
+0.021 0.831064
+0.022 0.834706
+0.023 0.838266
+0.024 0.841749
+0.025 0.845161
+0.026 0.848505
+0.027 0.851785
+0.028 0.855005
+0.029 0.858168
+0.03 0.861277
+0.031 0.864335
+0.032 0.867343
+0.033 0.870305
+0.034 0.873223
+0.035 0.876098
+0.036 0.878932
+0.037 0.881727
+0.038 0.884484
+0.039 0.887206
+0.04 0.889892
+0.041 0.892546
+0.042 0.895167
+0.043 0.897757
+0.044 0.900317
+0.045 0.902849
+0.046 0.905352
+0.047 0.907828
+0.048 0.910278
+0.049 0.912703
+0.05 0.915103
+0.051 0.917479
+0.052 0.919832
+0.053 0.922163
+0.054 0.924471
+0.055 0.926758
+0.056 0.929025
+0.057 0.931271
+0.058 0.933498
+0.059 0.935706
+0.06 0.937895
+0.061 0.940066
+0.062 0.942219
+0.063 0.944355
+0.064 0.946474
+0.065 0.948577
+0.066 0.950663
+0.067 0.952734
+0.068 0.954789
+0.069 0.956829
+0.07 0.958855
+0.071 0.960866
+0.072 0.962863
+0.073 0.964846
+0.074 0.966815
+0.075 0.968772
+0.076 0.970715
+0.077 0.972645
+0.078 0.974564
+0.079 0.976469
+0.08 0.978363
+0.081 0.980245
+0.082 0.982116
+0.083 0.983975
+0.084 0.985823
+0.085 0.987659
+0.086 0.989486
+0.087 0.991301
+0.088 0.993106
+0.089 0.994901
+0.09 0.996686
+0.091 0.998461
+0.092 1.00023
+0.093 1.00198
+0.094 1.00373
+0.095 1.00547
+0.096 1.00719
+0.097 1.00891
+0.098 1.01062
+0.099 1.01232
+0.1 1.01402
+0.101 1.0157
+0.102 1.01738
+0.103 1.01904
+0.104 1.0207
+0.105 1.02236
+0.106 1.024
+0.107 1.02564
+0.108 1.02726
+0.109 1.02889
+0.11 1.0305
+0.111 1.03211
+0.112 1.03371
+0.113 1.0353
+0.114 1.03688
+0.115 1.03846
+0.116 1.04003
+0.117 1.0416
+0.118 1.04315
+0.119 1.0447
+0.12 1.04625
+0.121 1.04779
+0.122 1.04932
+0.123 1.05084
+0.124 1.05236
+0.125 1.05388
+0.126 1.05538
+0.127 1.05689
+0.128 1.05838
+0.129 1.05987
+0.13 1.06136
+0.131 1.06283
+0.132 1.06431
+0.133 1.06577
+0.134 1.06723
+0.135 1.06869
+0.136 1.07014
+0.137 1.07159
+0.138 1.07303
+0.139 1.07446
+0.14 1.07589
+0.141 1.07731
+0.142 1.07873
+0.143 1.08015
+0.144 1.08156
+0.145 1.08296
+0.146 1.08436
+0.147 1.08576
+0.148 1.08715
+0.149 1.08853
+0.15 1.08992
+0.151 1.09129
+0.152 1.09266
+0.153 1.09403
+0.154 1.09539
+0.155 1.09675
+0.156 1.09811
+0.157 1.09946
+0.158 1.1008
+0.159 1.10214
+0.16 1.10348
+0.161 1.10481
+0.162 1.10614
+0.163 1.10747
+0.164 1.10879
+0.165 1.1101
+0.166 1.11142
+0.167 1.11272
+0.168 1.11403
+0.169 1.11533
+0.17 1.11663
+0.171 1.11792
+0.172 1.11921
+0.173 1.12049
+0.174 1.12178
+0.175 1.12305
+0.176 1.12433
+0.177 1.1256
+0.178 1.12687
+0.179 1.12813
+0.18 1.12939
+0.181 1.13065
+0.182 1.1319
+0.183 1.13315
+0.184 1.1344
+0.185 1.13564
+0.186 1.13688
+0.187 1.13812
+0.188 1.13935
+0.189 1.14058
+0.19 1.14181
+0.191 1.14303
+0.192 1.14425
+0.193 1.14547
+0.194 1.14668
+0.195 1.14789
+0.196 1.1491
+0.197 1.15031
+0.198 1.15151
+0.199 1.15271
+0.2 1.1539
+0.201 1.15509
+0.202 1.15628
+0.203 1.15747
+0.204 1.15865
+0.205 1.15983
+0.206 1.16101
+0.207 1.16219
+0.208 1.16336
+0.209 1.16453
+0.21 1.1657
+0.211 1.16686
+0.212 1.16802
+0.213 1.16918
+0.214 1.17033
+0.215 1.17149
+0.216 1.17264
+0.217 1.17378
+0.218 1.17493
+0.219 1.17607
+0.22 1.17721
+0.221 1.17835
+0.222 1.17948
+0.223 1.18062
+0.224 1.18174
+0.225 1.18287
+0.226 1.184
+0.227 1.18512
+0.228 1.18624
+0.229 1.18735
+0.23 1.18847
+0.231 1.18958
+0.232 1.19069
+0.233 1.1918
+0.234 1.1929
+0.235 1.19401
+0.236 1.19511
+0.237 1.1962
+0.238 1.1973
+0.239 1.19839
+0.24 1.19948
+0.241 1.20057
+0.242 1.20166
+0.243 1.20274
+0.244 1.20383
+0.245 1.20491
+0.246 1.20598
+0.247 1.20706
+0.248 1.20813
+0.249 1.2092
+0.25 1.21027
+0.251 1.21134
+0.252 1.2124
+0.253 1.21347
+0.254 1.21453
+0.255 1.21559
+0.256 1.21664
+0.257 1.2177
+0.258 1.21875
+0.259 1.2198
+0.26 1.22085
+0.261 1.22189
+0.262 1.22294
+0.263 1.22398
+0.264 1.22502
+0.265 1.22606
+0.266 1.2271
+0.267 1.22813
+0.268 1.22916
+0.269 1.23019
+0.27 1.23122
+0.271 1.23225
+0.272 1.23327
+0.273 1.2343
+0.274 1.23532
+0.275 1.23634
+0.276 1.23735
+0.277 1.23837
+0.278 1.23938
+0.279 1.24039
+0.28 1.2414
+0.281 1.24241
+0.282 1.24342
+0.283 1.24442
+0.284 1.24543
+0.285 1.24643
+0.286 1.24743
+0.287 1.24842
+0.288 1.24942
+0.289 1.25041
+0.29 1.25141
+0.291 1.2524
+0.292 1.25339
+0.293 1.25437
+0.294 1.25536
+0.295 1.25634
+0.296 1.25733
+0.297 1.25831
+0.298 1.25928
+0.299 1.26026
+0.3 1.26124
+0.301 1.26221
+0.302 1.26318
+0.303 1.26416
+0.304 1.26512
+0.305 1.26609
+0.306 1.26706
+0.307 1.26802
+0.308 1.26899
+0.309 1.26995
+0.31 1.27091
+0.311 1.27187
+0.312 1.27282
+0.313 1.27378
+0.314 1.27473
+0.315 1.27568
+0.316 1.27663
+0.317 1.27758
+0.318 1.27853
+0.319 1.27948
+0.32 1.28042
+0.321 1.28136
+0.322 1.28231
+0.323 1.28325
+0.324 1.28419
+0.325 1.28512
+0.326 1.28606
+0.327 1.28699
+0.328 1.28793
+0.329 1.28886
+0.33 1.28979
+0.331 1.29072
+0.332 1.29164
+0.333 1.29257
+0.334 1.29349
+0.335 1.29442
+0.336 1.29534
+0.337 1.29626
+0.338 1.29718
+0.339 1.2981
+0.34 1.29901
+0.341 1.29993
+0.342 1.30084
+0.343 1.30175
+0.344 1.30267
+0.345 1.30358
+0.346 1.30448
+0.347 1.30539
+0.348 1.3063
+0.349 1.3072
+0.35 1.3081
+0.351 1.30901
+0.352 1.30991
+0.353 1.31081
+0.354 1.3117
+0.355 1.3126
+0.356 1.3135
+0.357 1.31439
+0.358 1.31528
+0.359 1.31618
+0.36 1.31707
+0.361 1.31796
+0.362 1.31884
+0.363 1.31973
+0.364 1.32062
+0.365 1.3215
+0.366 1.32238
+0.367 1.32327
+0.368 1.32415
+0.369 1.32503
+0.37 1.32591
+0.371 1.32678
+0.372 1.32766
+0.373 1.32853
+0.374 1.32941
+0.375 1.33028
+0.376 1.33115
+0.377 1.33202
+0.378 1.33289
+0.379 1.33376
+0.38 1.33463
+0.381 1.33549
+0.382 1.33636
+0.383 1.33722
+0.384 1.33808
+0.385 1.33894
+0.386 1.3398
+0.387 1.34066
+0.388 1.34152
+0.389 1.34238
+0.39 1.34323
+0.391 1.34409
+0.392 1.34494
+0.393 1.34579
+0.394 1.34664
+0.395 1.34749
+0.396 1.34834
+0.397 1.34919
+0.398 1.35004
+0.399 1.35088
+0.4 1.35173
+0.401 1.35257
+0.402 1.35341
+0.403 1.35426
+0.404 1.3551
+0.405 1.35594
+0.406 1.35677
+0.407 1.35761
+0.408 1.35845
+0.409 1.35928
+0.41 1.36012
+0.411 1.36095
+0.412 1.36178
+0.413 1.36262
+0.414 1.36345
+0.415 1.36427
+0.416 1.3651
+0.417 1.36593
+0.418 1.36676
+0.419 1.36758
+0.42 1.36841
+0.421 1.36923
+0.422 1.37005
+0.423 1.37087
+0.424 1.37169
+0.425 1.37251
+0.426 1.37333
+0.427 1.37415
+0.428 1.37497
+0.429 1.37578
+0.43 1.3766
+0.431 1.37741
+0.432 1.37822
+0.433 1.37904
+0.434 1.37985
+0.435 1.38066
+0.436 1.38147
+0.437 1.38227
+0.438 1.38308
+0.439 1.38389
+0.44 1.38469
+0.441 1.3855
+0.442 1.3863
+0.443 1.3871
+0.444 1.38791
+0.445 1.38871
+0.446 1.38951
+0.447 1.39031
+0.448 1.3911
+0.449 1.3919
+0.45 1.3927
+0.451 1.39349
+0.452 1.39429
+0.453 1.39508
+0.454 1.39588
+0.455 1.39667
+0.456 1.39746
+0.457 1.39825
+0.458 1.39904
+0.459 1.39983
+0.46 1.40061
+0.461 1.4014
+0.462 1.40219
+0.463 1.40297
+0.464 1.40376
+0.465 1.40454
+0.466 1.40532
+0.467 1.4061
+0.468 1.40689
+0.469 1.40767
+0.47 1.40845
+0.471 1.40922
+0.472 1.41
+0.473 1.41078
+0.474 1.41155
+0.475 1.41233
+0.476 1.4131
+0.477 1.41388
+0.478 1.41465
+0.479 1.41542
+0.48 1.41619
+0.481 1.41696
+0.482 1.41773
+0.483 1.4185
+0.484 1.41927
+0.485 1.42004
+0.486 1.4208
+0.487 1.42157
+0.488 1.42233
+0.489 1.4231
+0.49 1.42386
+0.491 1.42462
+0.492 1.42538
+0.493 1.42615
+0.494 1.42691
+0.495 1.42766
+0.496 1.42842
+0.497 1.42918
+0.498 1.42994
+0.499 1.43069
+0.5 1.43145
+0.501 1.4322
+0.502 1.43296
+0.503 1.43371
+0.504 1.43446
+0.505 1.43522
+0.506 1.43597
+0.507 1.43672
+0.508 1.43747
+0.509 1.43822
+0.51 1.43896
+0.511 1.43971
+0.512 1.44046
+0.513 1.4412
+0.514 1.44195
+0.515 1.44269
+0.516 1.44344
+0.517 1.44418
+0.518 1.44492
+0.519 1.44566
+0.52 1.4464
+0.521 1.44714
+0.522 1.44788
+0.523 1.44862
+0.524 1.44936
+0.525 1.4501
+0.526 1.45084
+0.527 1.45157
+0.528 1.45231
+0.529 1.45304
+0.53 1.45377
+0.531 1.45451
+0.532 1.45524
+0.533 1.45597
+0.534 1.4567
+0.535 1.45743
+0.536 1.45816
+0.537 1.45889
+0.538 1.45962
+0.539 1.46035
+0.54 1.46107
+0.541 1.4618
+0.542 1.46253
+0.543 1.46325
+0.544 1.46398
+0.545 1.4647
+0.546 1.46542
+0.547 1.46614
+0.548 1.46687
+0.549 1.46759
+0.55 1.46831
+0.551 1.46903
+0.552 1.46975
+0.553 1.47046
+0.554 1.47118
+0.555 1.4719
+0.556 1.47262
+0.557 1.47333
+0.558 1.47405
+0.559 1.47476
+0.56 1.47548
+0.561 1.47619
+0.562 1.4769
+0.563 1.47761
+0.564 1.47832
+0.565 1.47904
+0.566 1.47975
+0.567 1.48045
+0.568 1.48116
+0.569 1.48187
+0.57 1.48258
+0.571 1.48329
+0.572 1.48399
+0.573 1.4847
+0.574 1.4854
+0.575 1.48611
+0.576 1.48681
+0.577 1.48751
+0.578 1.48822
+0.579 1.48892
+0.58 1.48962
+0.581 1.49032
+0.582 1.49102
+0.583 1.49172
+0.584 1.49242
+0.585 1.49312
+0.586 1.49382
+0.587 1.49451
+0.588 1.49521
+0.589 1.49591
+0.59 1.4966
+0.591 1.4973
+0.592 1.49799
+0.593 1.49869
+0.594 1.49938
+0.595 1.50007
+0.596 1.50076
+0.597 1.50145
+0.598 1.50215
+0.599 1.50284
+0.6 1.50352
+0.601 1.50421
+0.602 1.5049
+0.603 1.50559
+0.604 1.50628
+0.605 1.50696
+0.606 1.50765
+0.607 1.50834
+0.608 1.50902
+0.609 1.50971
+0.61 1.51039
+0.611 1.51107
+0.612 1.51176
+0.613 1.51244
+0.614 1.51312
+0.615 1.5138
+0.616 1.51448
+0.617 1.51516
+0.618 1.51584
+0.619 1.51652
+0.62 1.5172
+0.621 1.51788
+0.622 1.51855
+0.623 1.51923
+0.624 1.51991
+0.625 1.52058
+0.626 1.52126
+0.627 1.52193
+0.628 1.52261
+0.629 1.52328
+0.63 1.52395
+0.631 1.52463
+0.632 1.5253
+0.633 1.52597
+0.634 1.52664
+0.635 1.52731
+0.636 1.52798
+0.637 1.52865
+0.638 1.52932
+0.639 1.52999
+0.64 1.53065
+0.641 1.53132
+0.642 1.53199
+0.643 1.53265
+0.644 1.53332
+0.645 1.53398
+0.646 1.53465
+0.647 1.53531
+0.648 1.53598
+0.649 1.53664
+0.65 1.5373
+0.651 1.53796
+0.652 1.53863
+0.653 1.53929
+0.654 1.53995
+0.655 1.54061
+0.656 1.54127
+0.657 1.54193
+0.658 1.54259
+0.659 1.54324
+0.66 1.5439
+0.661 1.54456
+0.662 1.54521
+0.663 1.54587
+0.664 1.54653
+0.665 1.54718
+0.666 1.54784
+0.667 1.54849
+0.668 1.54914
+0.669 1.5498
+0.67 1.55045
+0.671 1.5511
+0.672 1.55175
+0.673 1.5524
+0.674 1.55305
+0.675 1.5537
+0.676 1.55435
+0.677 1.555
+0.678 1.55565
+0.679 1.5563
+0.68 1.55695
+0.681 1.5576
+0.682 1.55824
+0.683 1.55889
+0.684 1.55953
+0.685 1.56018
+0.686 1.56082
+0.687 1.56147
+0.688 1.56211
+0.689 1.56276
+0.69 1.5634
+0.691 1.56404
+0.692 1.56468
+0.693 1.56533
+0.694 1.56597
+0.695 1.56661
+0.696 1.56725
+0.697 1.56789
+0.698 1.56853
+0.699 1.56917
+0.7 1.5698
+0.701 1.57044
+0.702 1.57108
+0.703 1.57172
+0.704 1.57235
+0.705 1.57299
+0.706 1.57363
+0.707 1.57426
+0.708 1.5749
+0.709 1.57553
+0.71 1.57616
+0.711 1.5768
+0.712 1.57743
+0.713 1.57806
+0.714 1.5787
+0.715 1.57933
+0.716 1.57996
+0.717 1.58059
+0.718 1.58122
+0.719 1.58185
+0.72 1.58248
+0.721 1.58311
+0.722 1.58374
+0.723 1.58436
+0.724 1.58499
+0.725 1.58562
+0.726 1.58625
+0.727 1.58687
+0.728 1.5875
+0.729 1.58813
+0.73 1.58875
+0.731 1.58937
+0.732 1.59
+0.733 1.59062
+0.734 1.59125
+0.735 1.59187
+0.736 1.59249
+0.737 1.59311
+0.738 1.59374
+0.739 1.59436
+0.74 1.59498
+0.741 1.5956
+0.742 1.59622
+0.743 1.59684
+0.744 1.59746
+0.745 1.59808
+0.746 1.5987
+0.747 1.59931
+0.748 1.59993
+0.749 1.60055
+0.75 1.60116
+0.751 1.60178
+0.752 1.6024
+0.753 1.60301
+0.754 1.60363
+0.755 1.60424
+0.756 1.60486
+0.757 1.60547
+0.758 1.60608
+0.759 1.6067
+0.76 1.60731
+0.761 1.60792
+0.762 1.60853
+0.763 1.60915
+0.764 1.60976
+0.765 1.61037
+0.766 1.61098
+0.767 1.61159
+0.768 1.6122
+0.769 1.61281
+0.77 1.61342
+0.771 1.61402
+0.772 1.61463
+0.773 1.61524
+0.774 1.61585
+0.775 1.61645
+0.776 1.61706
+0.777 1.61767
+0.778 1.61827
+0.779 1.61888
+0.78 1.61948
+0.781 1.62009
+0.782 1.62069
+0.783 1.62129
+0.784 1.6219
+0.785 1.6225
+0.786 1.6231
+0.787 1.6237
+0.788 1.62431
+0.789 1.62491
+0.79 1.62551
+0.791 1.62611
+0.792 1.62671
+0.793 1.62731
+0.794 1.62791
+0.795 1.62851
+0.796 1.62911
+0.797 1.6297
+0.798 1.6303
+0.799 1.6309
+0.8 1.6315
+0.801 1.63209
+0.802 1.63269
+0.803 1.63329
+0.804 1.63388
+0.805 1.63448
+0.806 1.63507
+0.807 1.63567
+0.808 1.63626
+0.809 1.63685
+0.81 1.63745
+0.811 1.63804
+0.812 1.63863
+0.813 1.63923
+0.814 1.63982
+0.815 1.64041
+0.816 1.641
+0.817 1.64159
+0.818 1.64218
+0.819 1.64277
+0.82 1.64336
+0.821 1.64395
+0.822 1.64454
+0.823 1.64513
+0.824 1.64572
+0.825 1.64631
+0.826 1.64689
+0.827 1.64748
+0.828 1.64807
+0.829 1.64865
+0.83 1.64924
+0.831 1.64983
+0.832 1.65041
+0.833 1.651
+0.834 1.65158
+0.835 1.65217
+0.836 1.65275
+0.837 1.65334
+0.838 1.65392
+0.839 1.6545
+0.84 1.65508
+0.841 1.65567
+0.842 1.65625
+0.843 1.65683
+0.844 1.65741
+0.845 1.65799
+0.846 1.65857
+0.847 1.65915
+0.848 1.65973
+0.849 1.66031
+0.85 1.66089
+0.851 1.66147
+0.852 1.66205
+0.853 1.66263
+0.854 1.66321
+0.855 1.66379
+0.856 1.66436
+0.857 1.66494
+0.858 1.66552
+0.859 1.66609
+0.86 1.66667
+0.861 1.66724
+0.862 1.66782
+0.863 1.66839
+0.864 1.66897
+0.865 1.66954
+0.866 1.67012
+0.867 1.67069
+0.868 1.67126
+0.869 1.67184
+0.87 1.67241
+0.871 1.67298
+0.872 1.67355
+0.873 1.67413
+0.874 1.6747
+0.875 1.67527
+0.876 1.67584
+0.877 1.67641
+0.878 1.67698
+0.879 1.67755
+0.88 1.67812
+0.881 1.67869
+0.882 1.67926
+0.883 1.67982
+0.884 1.68039
+0.885 1.68096
+0.886 1.68153
+0.887 1.68209
+0.888 1.68266
+0.889 1.68323
+0.89 1.68379
+0.891 1.68436
+0.892 1.68493
+0.893 1.68549
+0.894 1.68606
+0.895 1.68662
+0.896 1.68718
+0.897 1.68775
+0.898 1.68831
+0.899 1.68888
+0.9 1.68944
+0.901 1.69
+0.902 1.69056
+0.903 1.69113
+0.904 1.69169
+0.905 1.69225
+0.906 1.69281
+0.907 1.69337
+0.908 1.69393
+0.909 1.69449
+0.91 1.69505
+0.911 1.69561
+0.912 1.69617
+0.913 1.69673
+0.914 1.69729
+0.915 1.69785
+0.916 1.6984
+0.917 1.69896
+0.918 1.69952
+0.919 1.70008
+0.92 1.70063
+0.921 1.70119
+0.922 1.70175
+0.923 1.7023
+0.924 1.70286
+0.925 1.70341
+0.926 1.70397
+0.927 1.70452
+0.928 1.70508
+0.929 1.70563
+0.93 1.70619
+0.931 1.70674
+0.932 1.70729
+0.933 1.70785
+0.934 1.7084
+0.935 1.70895
+0.936 1.7095
+0.937 1.71005
+0.938 1.71061
+0.939 1.71116
+0.94 1.71171
+0.941 1.71226
+0.942 1.71281
+0.943 1.71336
+0.944 1.71391
+0.945 1.71446
+0.946 1.71501
+0.947 1.71556
+0.948 1.7161
+0.949 1.71665
+0.95 1.7172
+0.951 1.71775
+0.952 1.7183
+0.953 1.71884
+0.954 1.71939
+0.955 1.71994
+0.956 1.72048
+0.957 1.72103
+0.958 1.72157
+0.959 1.72212
+0.96 1.72266
+0.961 1.72321
+0.962 1.72375
+0.963 1.7243
+0.964 1.72484
+0.965 1.72539
+0.966 1.72593
+0.967 1.72647
+0.968 1.72702
+0.969 1.72756
+0.97 1.7281
+0.971 1.72864
+0.972 1.72918
+0.973 1.72973
+0.974 1.73027
+0.975 1.73081
+0.976 1.73135
+0.977 1.73189
+0.978 1.73243
+0.979 1.73297
+0.98 1.73351
+0.981 1.73405
+0.982 1.73459
+0.983 1.73512
+0.984 1.73566
+0.985 1.7362
+0.986 1.73674
+0.987 1.73728
+0.988 1.73781
+0.989 1.73835
+0.99 1.73889
+0.991 1.73942
+0.992 1.73996
+0.993 1.7405
+0.994 1.74103
+0.995 1.74157
+0.996 1.7421
+0.997 1.74264
+0.998 1.74317
+0.999 1.74371
+1 1.74424