From a5ffdf4428086eefdc30f8ce27fc9c683b1ff252 Mon Sep 17 00:00:00 2001
From: Holger Class <holger.class@iws.uni-stuttgart.de>
Date: Thu, 31 May 2012 13:51:29 +0000
Subject: [PATCH] git-svn-id:
svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@8414
2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../3p/parkerVanGen3p.hh | 6 ++--
.../3p/parkerVanGen3pparams.hh | 33 ++++++++++++++++++-
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
index a7e2d2c771..36a5936f25 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3p.hh
@@ -102,7 +102,7 @@ public:
/* evaluate tangential */
r = (Se-Se_regu)*pc_prime+pc;
- return(r);
+ return(r/params.betaGW());
}
}
@@ -146,7 +146,7 @@ public:
/* evaluate tangential */
r = (Se-Se_regu)*pc_prime+pc;
- return(r);
+ return(r/params.betaNW());
}
}
@@ -189,7 +189,7 @@ public:
/* evaluate tangential */
r = (Se-Se_regu)*pc_prime+pc;
- return(r);
+ return(r/params.betaGN());
}
}
diff --git a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
index a804648b38..0338f1491d 100644
--- a/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
+++ b/dumux/material/fluidmatrixinteractions/3p/parkerVanGen3pparams.hh
@@ -46,7 +46,7 @@ public:
ParkerVanGen3PParams()
{}
- ParkerVanGen3PParams(Scalar vgAlpha, Scalar vgN, Scalar KdNAPL, Scalar rhoBulk, Dune::FieldVector<Scalar, 4> residualSaturation, bool regardSnr=false)
+ ParkerVanGen3PParams(Scalar vgAlpha, Scalar vgN, Scalar KdNAPL, Scalar rhoBulk, Dune::FieldVector<Scalar, 4> residualSaturation, Scalar betaNW = 1, Scalar betaGN = 1, Scalar betaGW = 1, bool regardSnr=false)
{
setVgAlpha(vgAlpha);
setVgN(vgN);
@@ -56,6 +56,9 @@ public:
setSwrx(residualSaturation[3]);
setkrRegardsSnr(regardSnr);
setKdNAPL(KdNAPL);
+ setBetaNW(betaNW);
+ setBetaGN(betaGN);
+ setBetaGW(betaGW);
setRhoBulk(rhoBulk);
};
@@ -181,6 +184,30 @@ public:
void setSwrx(Scalar input)
{ Swrx_ = input; }
+ /*!
+ * \brief defines the scaling parameters of capillary pressure between the phases (=1 for Gas-Water)
+ */
+ void setBetaNW(Scalar input)
+ { betaNW_ = input; }
+
+ void setBetaGN(Scalar input)
+ { betaGN_ = input; }
+
+ void setBetaGW(Scalar input)
+ { betaGW_ = input; }
+
+ /*!
+ * \brief Return the values for the beta scaling parameters of capillary pressure between the phases
+ */
+ Scalar betaNW() const
+ { return betaNW_; }
+
+ Scalar betaGN() const
+ { return betaNW_; }
+
+ Scalar betaGW() const
+ { return betaNW_; }
+
/*!
* \brief defines if residual n-phase saturation should be regarded in its relative permeability.
*/
@@ -230,6 +257,10 @@ private:
Scalar KdNAPL_;
Scalar rhoBulk_;
+ Scalar betaNW_;
+ Scalar betaGN_;
+ Scalar betaGW_;
+
bool krRegardsSnr_ ;
};
} // namespace Dumux
--
GitLab