diff --git a/exercises/exercise-basic/spatialparams.hh b/exercises/exercise-basic/spatialparams.hh
index 354caedae96d178e41c146ec92a1d88d08dd23ff..e3dac53444681d65939cb466791437ae37d56013 100644
--- a/exercises/exercise-basic/spatialparams.hh
+++ b/exercises/exercise-basic/spatialparams.hh
@@ -108,11 +108,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/exercise-biomineralization/biominspatialparams.hh b/exercises/exercise-biomineralization/biominspatialparams.hh
index e147f8fec15d62ee5d33ea0993356d791e1866ce..ab63115cf9b396a31ec79b31304654be98dce619 100644
--- a/exercises/exercise-biomineralization/biominspatialparams.hh
+++ b/exercises/exercise-biomineralization/biominspatialparams.hh
@@ -245,11 +245,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/exercise-coupling-ff-pm/2pspatialparams.hh b/exercises/exercise-coupling-ff-pm/2pspatialparams.hh
index 7a6f7360d3605809d2575e925c54acf44a9ecd2d..9727e1f59104e50d27612c241fe3a4f9d15ff1b6 100644
--- a/exercises/exercise-coupling-ff-pm/2pspatialparams.hh
+++ b/exercises/exercise-coupling-ff-pm/2pspatialparams.hh
@@ -85,11 +85,7 @@ public:
{ return alphaBJ_; }
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/exercise-fluidsystem/spatialparams.hh b/exercises/exercise-fluidsystem/spatialparams.hh
index a9390531d032e6014dccea5ae0b5b50eb716a36e..1da703d6c1111c54e1730e58fa544bb84fce5688 100644
--- a/exercises/exercise-fluidsystem/spatialparams.hh
+++ b/exercises/exercise-fluidsystem/spatialparams.hh
@@ -28,7 +28,7 @@
// include parent spatialparameters
#include <dumux/material/spatialparams/fv.hh>
-// include material laws
+//inlclude fluid matrix interaction relationship
#include <dumux/material/fluidmatrixinteractions/2p/brookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
@@ -107,11 +107,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/exercise-fractures/README.md b/exercises/exercise-fractures/README.md
index e5778b02cf3117bd432c1fc9808a46008c9ac950..e8a07c7e1e4fb20b47010eb7e3b4e68397dc59c6 100644
--- a/exercises/exercise-fractures/README.md
+++ b/exercises/exercise-fractures/README.md
@@ -131,7 +131,7 @@ Furthermore, modify the function `dirichletAtPos(...)` in `matrixproblem.hh` suc
In this part, we want to change the parameterization of the fractures such that they act as both hydraulic and capillary barriers. In the `fracturespatialparams.hh` file you will see that the spatial parameters class already contains a set of parameters with the post-fix _Barrier_, which are read in from the input file in the class constructor.
-Use these as return values for porosity, permeability and material law parameters. Take a look at the results.
+Use these as return values for porosity, permeability and fluid-matrix interaction parameters. Take a look at the results.
You will see that only little nitrogen enters the domain, but if you display the pressure distribution in the matrix, you will notice that we cannot observe the pressure distribution we would expect. With the fracture permeabilities being this much lower than the matrix permeability, we would expect substantial pressure drops to be visible across them.
@@ -193,7 +193,7 @@ int getElementDomainMarker(const Element& element) const
The domain markers are also already added to the output (see `main.cc`, search for `// add domain markers to output`). To visualize them, open any of your previously produced results with _Paraview_ and take a look at them by selecting __domainMarker__.
-Adjust the functions for permeability, porosity and material law parameters in the `fracturespatialparams.hh` file such that they are selected depending on the domain marker of the elements. You will see in the results that the pressure jump across the first vertical fracture is now lower than before, because there are highly permeable fractures crossing it, allowing for a pressure release into the other parts of the domain.
+Adjust the functions for permeability, porosity and fluid-matrix interaction parameters in the `fracturespatialparams.hh` file such that they are selected depending on the domain marker of the elements. You will see in the results that the pressure jump across the first vertical fracture is now lower than before, because there are highly permeable fractures crossing it, allowing for a pressure release into the other parts of the domain.
## Additional task:
diff --git a/exercises/exercise-fractures/fracturespatialparams.hh b/exercises/exercise-fractures/fracturespatialparams.hh
index 85113fb0cd1e9cd894ec2c2da3a4742ffdf20ce7..61bdf4fc3d1e9573e2c2e5967732f1bedd6368e4 100644
--- a/exercises/exercise-fractures/fracturespatialparams.hh
+++ b/exercises/exercise-fractures/fracturespatialparams.hh
@@ -101,10 +101,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law for the sub-control volume
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
+ * \brief Returns the fluid-matrix interaction law for the sub-control volume
*
* \param element The current finite element
* \param scv The sub-control volume
diff --git a/exercises/exercise-fractures/matrixspatialparams.hh b/exercises/exercise-fractures/matrixspatialparams.hh
index b6c77c8e094f99a706dac7912dd48119e9882f70..939e488d829780825b1ce80d382b85f532c7e9a3 100644
--- a/exercises/exercise-fractures/matrixspatialparams.hh
+++ b/exercises/exercise-fractures/matrixspatialparams.hh
@@ -79,11 +79,7 @@ public:
{ return porosity_; }
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/exercise-grids/spatialparams.hh b/exercises/exercise-grids/spatialparams.hh
index ea7e3084ba5ea77278d884e91ef374030cff6704..433e3f6baa61ff2763c6ba31f543b72fd11f5136 100644
--- a/exercises/exercise-grids/spatialparams.hh
+++ b/exercises/exercise-grids/spatialparams.hh
@@ -109,11 +109,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/exercise-properties/spatialparams.hh b/exercises/exercise-properties/spatialparams.hh
index fa106e87b416d71af8206d1b721daf02ae9d0028..90af3c6f2efe86b6ff26b548a11f6922f7f27db5 100644
--- a/exercises/exercise-properties/spatialparams.hh
+++ b/exercises/exercise-properties/spatialparams.hh
@@ -91,11 +91,7 @@ public:
{ return 0.4; }
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/exercise-runtimeparams/spatialparams.hh b/exercises/exercise-runtimeparams/spatialparams.hh
index 4a0327a6ca1a80d0c6453ad70c09579e72af3d98..a6b67613a8f2596e5c2593b6e1af71781687df0c 100644
--- a/exercises/exercise-runtimeparams/spatialparams.hh
+++ b/exercises/exercise-runtimeparams/spatialparams.hh
@@ -109,11 +109,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/solution/exercise-basic/spatialparams.hh b/exercises/solution/exercise-basic/spatialparams.hh
index 75d073b7de09139fc6e955ea876531c023f00cd1..b6c1e80de2505e2df071370f7a7a1efe80ff8131 100644
--- a/exercises/solution/exercise-basic/spatialparams.hh
+++ b/exercises/solution/exercise-basic/spatialparams.hh
@@ -108,11 +108,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/solution/exercise-biomineralization/biominspatialparams.hh b/exercises/solution/exercise-biomineralization/biominspatialparams.hh
index 1f70ef5d132693a99bdbca1dfa3c3798b98ab992..fed4a8d6799fc347e7a8025c2e3b6d7ecb13f8ea 100644
--- a/exercises/solution/exercise-biomineralization/biominspatialparams.hh
+++ b/exercises/solution/exercise-biomineralization/biominspatialparams.hh
@@ -245,11 +245,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/solution/exercise-coupling-ff-pm/2pspatialparams.hh b/exercises/solution/exercise-coupling-ff-pm/2pspatialparams.hh
index 7a6f7360d3605809d2575e925c54acf44a9ecd2d..9727e1f59104e50d27612c241fe3a4f9d15ff1b6 100644
--- a/exercises/solution/exercise-coupling-ff-pm/2pspatialparams.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/2pspatialparams.hh
@@ -85,11 +85,7 @@ public:
{ return alphaBJ_; }
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/solution/exercise-fluidsystem/spatialparams.hh b/exercises/solution/exercise-fluidsystem/spatialparams.hh
index befc4d560968d10893cf6df4fc31665c6df5d8e2..48f87a507e6392e3eae62c5d4e91768d75aac65c 100644
--- a/exercises/solution/exercise-fluidsystem/spatialparams.hh
+++ b/exercises/solution/exercise-fluidsystem/spatialparams.hh
@@ -28,7 +28,7 @@
// include parent spatialparameters
#include <dumux/material/spatialparams/fv.hh>
-// include material laws
+//inlclude fluid matrix interaction relationship
#include <dumux/material/fluidmatrixinteractions/2p/brookscorey.hh>
#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
@@ -106,11 +106,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
@@ -157,7 +153,7 @@ private:
Dune::FieldMatrix<Scalar, dim, dim> K_;
Dune::FieldMatrix<Scalar, dim, dim> KLens_;
- // Object that holds the values/parameters of the selected material law.
+ // Object that holds the values/parameters of the selected fluid matrix interaction relationship
const PcKrSwCurve pcKrSwCurve_;
const PcKrSwCurve lensPcKrSwCurve_;
};
diff --git a/exercises/solution/exercise-fractures/fracturespatialparams.hh b/exercises/solution/exercise-fractures/fracturespatialparams.hh
index 264c0b662868e826064b8a3bf1c20d69cdff4722..81bc286b92e26f37643f8f20aa040ace53b91109 100644
--- a/exercises/solution/exercise-fractures/fracturespatialparams.hh
+++ b/exercises/solution/exercise-fractures/fracturespatialparams.hh
@@ -53,7 +53,7 @@ class FractureSpatialParams
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- // use a regularized van-genuchten material law
+ // use a van-genuchten fluid matrix interaction relationship
using PcKrSwCurve = FluidMatrix::VanGenuchtenDefault<Scalar>;
// we identify those fractures as barriers, that have a domain marker
@@ -131,10 +131,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law for the sub-control volume
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
+ * \brief Returns the fluid-matrix interaction law for the sub-control volume
*
* \param element The current finite element
* \param scv The sub-control volume
diff --git a/exercises/solution/exercise-fractures/matrixspatialparams.hh b/exercises/solution/exercise-fractures/matrixspatialparams.hh
index e8f45aa8c5790d4ada28ae41558155260ccd5078..1f049007743f4a83543c35ce9e405e421c5ce0ed 100644
--- a/exercises/solution/exercise-fractures/matrixspatialparams.hh
+++ b/exercises/solution/exercise-fractures/matrixspatialparams.hh
@@ -52,7 +52,7 @@ class MatrixSpatialParams
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
- // use a regularized van-genuchten material law
+ // use a van-genuchten fluid matrix interaction relationship
using PcKrSwCurve = FluidMatrix::VanGenuchtenDefault<Scalar>;
public:
@@ -80,11 +80,7 @@ public:
{ return porosity_; }
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/solution/exercise-grids/spatialparams.hh b/exercises/solution/exercise-grids/spatialparams.hh
index ea7e3084ba5ea77278d884e91ef374030cff6704..433e3f6baa61ff2763c6ba31f543b72fd11f5136 100644
--- a/exercises/solution/exercise-grids/spatialparams.hh
+++ b/exercises/solution/exercise-grids/spatialparams.hh
@@ -109,11 +109,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/solution/exercise-properties/spatialparams.hh b/exercises/solution/exercise-properties/spatialparams.hh
index fa106e87b416d71af8206d1b721daf02ae9d0028..90af3c6f2efe86b6ff26b548a11f6922f7f27db5 100644
--- a/exercises/solution/exercise-properties/spatialparams.hh
+++ b/exercises/solution/exercise-properties/spatialparams.hh
@@ -91,11 +91,7 @@ public:
{ return 0.4; }
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
diff --git a/exercises/solution/exercise-runtimeparams/spatialparams.hh b/exercises/solution/exercise-runtimeparams/spatialparams.hh
index 617cd87acf2136bab2dbe3d95e83bc8a352db5f6..869a826bdfb4678509884ea269ce63df4d411431 100644
--- a/exercises/solution/exercise-runtimeparams/spatialparams.hh
+++ b/exercises/solution/exercise-runtimeparams/spatialparams.hh
@@ -109,11 +109,7 @@ public:
}
/*!
- * \brief Returns the parameters for the material law at a given location
- *
- * This method is not actually required by the Richards model, but provided
- * for the convenience of the RichardsLensProblem
- *
+ * \brief Returns the fluid-matrix interaction law at a given location
* \param globalPos The global coordinates for the given location
*/
auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const