Commit 6474d6ba authored by Martin Schneider's avatar Martin Schneider
Browse files

Merge branch 'origin/fix/tutorial-exercise1f' into 'master'

[fix/tutorial-exercise1f] Exercise 1f makes more sense now

The changing constitutive relations task in exercise 1 previously was about
exchanging the EffToAbsLaw with a LinearMaterial law. It makes more sense to
replace the RegularizedBrooksCorey.
The description in the handbook was adapted accordingly.

See merge request !248
parents d81923d0 36d017c4
......@@ -441,16 +441,14 @@ Please reverse the changes made in this part of the exercise, as we will continu
to use immiscible phases from here on and hence do not need a complex fluid system.
\item \textbf{Changing Constitutive Relations} \\
Use an unregularized linear law with an entry pressure of $p_e = \unit[0.0]{Pa}$
and maximal capillary pressure of e.g. $p_{c_{max}} = \unit[2000.0]{Pa}$ instead of using a
Use an unregularized linear law with an entry pressure of $p_e = \unit[0.0]{Pa}$
and maximal capillary pressure of e.g. $p_{c_{max}} = \unit[2000.0]{Pa}$ instead of using a
regularized Brooks-Corey law for the
relative permeability and for the capillary pressure saturation relationship.
To do that you have
to change the material law property (line \ref{tutorial-implicit:eff2abs}) in
\texttt{tutorialspatialparams\_implicit.hh}. Leave the type definition of \texttt{Scalar} and remove
the type definition of \texttt{BrooksAndCorey} in the private section of
the property definition. Exchange the \texttt{EffToAbsLaw} with the \texttt{LinearMaterial} law type in the
public section.
to change the material law property (line \ref{tutorial-implicit:rawlaw}) in
\texttt{tutorialspatialparams\_implicit.hh}. Exchange the \texttt{RegularizedBrooksCorey} material law with the \texttt{LinearMaterial} law type in the private section of
the property definition.
You can find the material laws in the folder
\verb+dumux/material/fluidmatrixinteractions+. The necessary parameters
of the linear law and the respective \texttt{set}-functions can be found
......
Index: tutorialspatialparams_implicit.hh
===================================================================
--- tutorialspatialparams_implicit.hh (revision 15068)
+++ tutorialspatialparams_implicit.hh (working copy)
@@ -54,10 +54,10 @@
diff --git a/tutorial/tutorialspatialparams_implicit.hh b/tutorial/tutorialspatialparams_implicit.hh
index 18086e9..541c799 100644
--- a/tutorial/tutorialspatialparams_implicit.hh
+++ b/tutorial/tutorialspatialparams_implicit.hh
@@ -54,7 +54,7 @@ private:
// material law typedefs
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// select material law to be used
- typedef RegularizedBrooksCorey<Scalar> RawMaterialLaw; /*@\label{tutorial-implicit:rawlaw}@*/
+// typedef RegularizedBrooksCorey<Scalar> RawMaterialLaw; /*@\label{tutorial-implicit:rawlaw}@*/
+ typedef LinearMaterial<Scalar> RawMaterialLaw; /*@\label{tutorial-implicit:rawlaw}@*/
public:
// adapter for absolute law
- typedef EffToAbsLaw<RawMaterialLaw> type; /*@\label{tutorial-implicit:eff2abs}@*/
+ typedef LinearMaterial<Scalar> type; /*@\label{tutorial-implicit:eff2abs}@*/
};
}
@@ -150,12 +150,12 @@
K_[i][i] = 1e-7;
//set residual saturations
- materialParams_.setSwr(0.0); /*@\label{tutorial-implicit:setLawParams}@*/
- materialParams_.setSnr(0.0);
+// materialParams_.setSwr(0.0); /*@\label{tutorial-implicit:setLawParams}@*/
+// materialParams_.setSnr(0.0);
typedef EffToAbsLaw<RawMaterialLaw> type; /*@\label{tutorial-implicit:eff2abs}@*/
@@ -154,8 +154,8 @@ public:
materialParams_.setSnr(0.0);
//parameters of Brooks & Corey Law
- materialParams_.setPe(500.0);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment