From 5caa39b34c7dc0db95294d206174b96c84bfd816 Mon Sep 17 00:00:00 2001
From: Kilian Weishaupt <kilian.weishaupt@iws.uni-stuttgart.de>
Date: Thu, 9 Jun 2016 08:14:23 +0200
Subject: [PATCH] [test] Include plotMaterialLaw in 3p test
---
.../3p/implicit/infiltration3pproblem.hh | 2 ++
.../3p/implicit/infiltration3pspatialparams.hh | 18 ++++++++++++++++++
.../3p/implicit/test_box3p.input | 3 +++
.../3p/implicit/test_cc3p.input | 3 +++
4 files changed, 26 insertions(+)
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
index 7a73d40545..4dc9f78780 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
@@ -143,6 +143,8 @@ public:
FluidSystem::init(282.15, 284.15, 3, 8e4, 3e5, 200);
name_ = GET_RUNTIME_PARAM(TypeTag, std::string, Problem.Name);
+
+ this->spatialParams().plotMaterialLaw();
}
/*!
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
index ea8b9fcc01..c7bc3e18a8 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
@@ -30,6 +30,7 @@
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
#include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
+#include <dumux/io/plotmateriallaw3p.hh>
namespace Dumux
{
@@ -117,11 +118,26 @@ public:
// parameters for adsorption
materialParams_.setKdNAPL(0.);
materialParams_.setRhoBulk(1500.);
+
+ plotFluidMatrixInteractions_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, Output,
+ PlotFluidMatrixInteractions);
}
~InfiltrationThreePSpatialParams()
{}
+ /*!
+ * \brief This is called from the problem and creates a gnuplot output
+ * of e.g the pc-Sw curve
+ */
+ void plotMaterialLaw()
+ {
+ PlotMaterialLaw<TypeTag> plotMaterialLaw(plotFluidMatrixInteractions_);
+
+ plotMaterialLaw.plotpc(materialParams_);
+ plotMaterialLaw.plotkr(materialParams_);
+ }
+
/*!
* \brief Intrinsic permability
*
@@ -188,6 +204,8 @@ private:
Scalar porosity_;
MaterialLawParams materialParams_;
+
+ bool plotFluidMatrixInteractions_;
};
}
diff --git a/test/porousmediumflow/3p/implicit/test_box3p.input b/test/porousmediumflow/3p/implicit/test_box3p.input
index edd8a86f23..6445dff4ae 100644
--- a/test/porousmediumflow/3p/implicit/test_box3p.input
+++ b/test/porousmediumflow/3p/implicit/test_box3p.input
@@ -15,3 +15,6 @@ porosity = 0.40
vanGenuchtenAlpha = 0.0005
vanGenuchtenN = 4.0
+[Output]
+PlotFluidMatrixInteractions = false
+
diff --git a/test/porousmediumflow/3p/implicit/test_cc3p.input b/test/porousmediumflow/3p/implicit/test_cc3p.input
index 08652caa0f..764e1a3f0c 100644
--- a/test/porousmediumflow/3p/implicit/test_cc3p.input
+++ b/test/porousmediumflow/3p/implicit/test_cc3p.input
@@ -15,3 +15,6 @@ porosity = 0.40
vanGenuchtenAlpha = 0.0005
vanGenuchtenN = 4.0
+[Output]
+PlotFluidMatrixInteractions = false
+
--
GitLab