Skip to content
Snippets Groups Projects
Commit 7d6a54ee authored by Johannes Hommel's avatar Johannes Hommel
Browse files

Corrected various variable names in 2pncminvolvars according to naming

conventions, review by vishal


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15209 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 6eefd8d0
No related branches found
No related tags found
No related merge requests found
......@@ -197,10 +197,10 @@ public:
// permeabilityFactor_ = std::pow((this->porosity_/initialPorosity_),8);
//Tixier relation with residual water saturation set to 0.001
//permeabilityFactor_ = (std::pow((250 * (std::pow(this->porosity_,3)) / 0.001),2)) / InitialPermeability_;
//permeabilityFactor_ = (std::pow((250 * (std::pow(this->porosity_,3)) / 0.001),2)) / initialPermeability_;
//Coates relation with residual water saturation set to 0.001
//permeabilityFactor_ = (std::pow((100 * (std::pow(this->porosity_,2)) * (1-0.001) / 0.001,2))) / InitialPermeability_ ;
//permeabilityFactor_ = (std::pow((100 * (std::pow(this->porosity_,2)) * (1-0.001) / 0.001,2))) / initialPermeability_ ;
// energy related quantities not contained in the fluid state
......@@ -403,15 +403,15 @@ public:
* \brief Returns the inital porosity of the
* pure, precipitate-free porous medium
*/
Scalar InitialPorosity() const
Scalar initialPorosity() const
{ return initialPorosity_;}
/*!
* \brief Returns the inital permeability of the
* pure, precipitate-free porous medium
*/
Scalar InitialPermeability() const
{ return InitialPermeability_;}
Scalar initialPermeability() const
{ return initialPermeability_;}
/*!
* \brief Returns the factor for the reduction of the initial permeability
......@@ -527,7 +527,7 @@ protected:
// Scalar saturationIdx_[numSPhases];
Scalar permeabilityFactor_;
Scalar initialPorosity_;
Scalar InitialPermeability_;
Scalar initialPermeability_;
Scalar minimumPorosity_;
Scalar sumPrecipitates_;
Scalar salinity_;
......
......@@ -370,7 +370,7 @@ public:
if (precipSalt*this->timeManager().timeStepSize() + volVars.precipitateVolumeFraction(sPhaseIdx)* volVars.molarDensity(sPhaseIdx)< 0)
precipSalt = - volVars.precipitateVolumeFraction(sPhaseIdx)* volVars.molarDensity(sPhaseIdx)/this->timeManager().timeStepSize();
if (volVars.precipitateVolumeFraction(sPhaseIdx) >= volVars.InitialPorosity() - saltPorosity && precipSalt > 0)
if (volVars.precipitateVolumeFraction(sPhaseIdx) >= volVars.initialPorosity() - saltPorosity && precipSalt > 0)
precipSalt = 0;
source[conti0EqIdx + NaClIdx] += -precipSalt;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment