diff --git a/doc/handbook/3_tutorialimplicit.tex b/doc/handbook/3_tutorialimplicit.tex index 0505d8fb4a6a4046b602e3e5bd3e9487cf8727ba..03196ac4ae8240516f2f98ee1ee18dafc29e396c 100644 --- a/doc/handbook/3_tutorialimplicit.tex +++ b/doc/handbook/3_tutorialimplicit.tex @@ -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 diff --git a/tutorial/solutions_implicit/ex1f_tutorialspatialparams_implicit.diff b/tutorial/solutions_implicit/ex1f_tutorialspatialparams_implicit.diff index e1736bc2e094df68c7bf66e841f4e3cbf78b0378..ed5b11191269c2b65356228f1d027d45b3bd264e 100644 --- a/tutorial/solutions_implicit/ex1f_tutorialspatialparams_implicit.diff +++ b/tutorial/solutions_implicit/ex1f_tutorialspatialparams_implicit.diff @@ -1,28 +1,18 @@ -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 RawMaterialLaw; /*@\label{tutorial-implicit:rawlaw}@*/ -+// typedef RegularizedBrooksCorey RawMaterialLaw; /*@\label{tutorial-implicit:rawlaw}@*/ ++ typedef LinearMaterial RawMaterialLaw; /*@\label{tutorial-implicit:rawlaw}@*/ public: // adapter for absolute law -- typedef EffToAbsLaw type; /*@\label{tutorial-implicit:eff2abs}@*/ -+ typedef LinearMaterial 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 type; /*@\label{tutorial-implicit:eff2abs}@*/ +@@ -154,8 +154,8 @@ public: + materialParams_.setSnr(0.0); //parameters of Brooks & Corey Law - materialParams_.setPe(500.0);