Commit b5b4378b authored by Andreas Lauser's avatar Andreas Lauser
Browse files

Revert "remove trailing white space"

due to an incorrect regular expression, this removed trailing "+"
signs instead of white space.

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@5053 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 3b19d8e9
......@@ -134,7 +134,7 @@ public:
const VolumeVariables &dn = this->curVolVars_(fluxVars.downstreamIdx(normalFlux));
flux[pressureIdx] =
(( upwindWeight)*(up.density()/up.viscosity())
+
(1 - upwindWeight)*(dn.density()/dn.viscosity()))
*
normalFlux;
......
......@@ -78,7 +78,7 @@ public:
phasePressure_ = primaryVars[pressureIdx];
x1_ = primaryVars[x1Idx];
meanMolarMass_ =
(1 - x1_)*FluidSystem::molarMass(comp1Index)
(1 - x1_)*FluidSystem::molarMass(comp1Index) +
(x1_ )*FluidSystem::molarMass(comp2Index);
density_ = FluidSystem::phaseDensity(phaseIndex, temperature_, phasePressure_, *this);
......
......@@ -267,7 +267,7 @@ protected:
// Diffusion coefficient in the porous medium
diffCoeffPM_
= 1./2*(vDat_i.porosity() * vDat_i.tortuosity() * vDat_i.diffCoeff()
= 1./2*(vDat_i.porosity() * vDat_i.tortuosity() * vDat_i.diffCoeff() +
vDat_j.porosity() * vDat_j.tortuosity() * vDat_j.diffCoeff());
}
......
......@@ -148,14 +148,14 @@ public:
flux[contiEqIdx] =
normalFlux *
(( upwindAlpha)*up.density()/up.viscosity()
+
((1 - upwindAlpha)*dn.density()/dn.viscosity()));
// advective flux of the second component
flux[transEqIdx] +=
normalFlux *
(( upwindAlpha)*up.concentration(1)/up.viscosity()
+
(1 - upwindAlpha)*dn.concentration(1)/dn.viscosity());
// diffusive flux of second component
......
......@@ -178,7 +178,7 @@ public:
normalFlux
*
(( mobilityUpwindAlpha)*up.density(phaseIdx)*up.mobility(phaseIdx)
+
(1 - mobilityUpwindAlpha)*dn.density(phaseIdx)*dn.mobility(phaseIdx));
}
}
......
......@@ -119,7 +119,7 @@ public:
Sn = priVars[saturationIdx];
p[wPhaseIdx] = priVars[pressureIdx];
p[nPhaseIdx] =
p[wPhaseIdx]
p[wPhaseIdx] +
MaterialLaw::pC(materialParams, 1 - Sn);
}
else if (int(formulation) == pnSw) {
......
......@@ -171,14 +171,14 @@ private:
fI = fJ = 0.5; // doesn't matter because no phase is
// present in both cells!
densityAtIP_[phaseIdx] =
(fI*elemDat[i].density(phaseIdx)
(fI*elemDat[i].density(phaseIdx) +
fJ*elemDat[j].density(phaseIdx))
/
(fI + fJ);
// phase density
molarDensityAtIP_[phaseIdx]
=
(fI*elemDat[i].molarDensity(phaseIdx)
(fI*elemDat[i].molarDensity(phaseIdx) +
fJ*elemDat[j].molarDensity(phaseIdx))
/
(fI + fJ);
......
......@@ -115,12 +115,12 @@ public:
vertDat.internalEnergy(lPhaseIdx) *
//vertDat.enthalpy(lPhaseIdx) *
vertDat.saturation(lPhaseIdx)
+
vertDat.density(gPhaseIdx) *
vertDat.internalEnergy(gPhaseIdx) *
//vertDat.enthalpy(gPhaseIdx) *
vertDat.saturation(gPhaseIdx))
+
vertDat.temperature()*vertDat.heatCapacity();
}
......@@ -153,7 +153,7 @@ public:
( up.density(phase) *
up.mobility(phase) *
up.enthalpy(phase))
+
(1-mobilityUpwindAlpha) * // downstream vertex
( dn.density(phase) *
dn.mobility(phase) *
......
......@@ -113,7 +113,7 @@ public:
vertDat.porosity()*(vertDat.density(wPhaseIdx) *
vertDat.internalEnergy(wPhaseIdx) *
vertDat.saturation(wPhaseIdx)
+
vertDat.density(nPhaseIdx) *
vertDat.internalEnergy(nPhaseIdx) *
vertDat.saturation(nPhaseIdx))
......@@ -160,7 +160,7 @@ public:
up.density(phaseIdx)*
up.mobility(phaseIdx)*
up.enthalpy(phaseIdx)
+
(1 - mobilityUpwindAlpha)*
dn.density(phaseIdx)*
dn.mobility(phaseIdx)*
......
......@@ -134,7 +134,7 @@ public:
normalFlux
*
(( mobilityUpwindAlpha)*up.density(wPhaseIdx)*up.mobility(wPhaseIdx)
+
(1 - mobilityUpwindAlpha)*dn.density(wPhaseIdx)*dn.mobility(wPhaseIdx));
}
......
......@@ -149,11 +149,11 @@ public:
return
moment_(i)* x_i1*x_i1*x_i1 / (6 * h_i1)
+
moment_(i + 1)* x_i*x_i*x_i / (6 * h_i1)
+
A_i*x_i
+
B_i;
}
......@@ -180,9 +180,9 @@ public:
return
-moment_(i) * x_i1*x_i1 / (2 * h_i1)
+
moment_(i + 1) * x_i*x_i / (2 * h_i1)
+
A_i;
}
......
......@@ -70,10 +70,10 @@ inline Scalar henryIAPWS(Scalar E,
}
Scalar exponent =
q*F
E/temperature*f
(F
G*pow(tau, 2.0/3)
q*F +
E/temperature*f +
(F +
G*pow(tau, 2.0/3) +
H*tau)*
exp((H2O::tripleTemperature() - temperature)/100);
// CAUTION: K_D is formulated in mole fractions. We have to
......
......@@ -234,18 +234,18 @@ public:
Scalar rhow = H2O::liquidDensity(temperature, pressure);
return
rhow
rhow +
1000*salinity*(
0.668
0.44*salinity
0.668 +
0.44*salinity +
1.0E-6*(
300*pMPa -
2400*pMPa*salinity
2400*pMPa*salinity +
TempC*(
80.0 -
3*TempC -
3300*salinity -
13*pMPa
13*pMPa +
47*pMPa*salinity)));
}
......
......@@ -229,8 +229,8 @@ public:
Scalar Fc = 1 - 0.2756*omega + 0.059035*mu_r4;
Scalar Tstar = 1.2593 * temperature/Tc;
Scalar Omega_v =
1.16145*std::pow(Tstar, -0.14874)
0.52487*std::exp(- 0.77320*Tstar)
1.16145*std::pow(Tstar, -0.14874) +
0.52487*std::exp(- 0.77320*Tstar) +
2.16178*std::exp(- 2.43787*Tstar);
Scalar mu = 40.785*Fc*std::sqrt(M*temperature)/(std::pow(Vc, 2./3)*Omega_v);
......
......@@ -224,8 +224,8 @@ public:
Scalar Fc = 1 - 0.2756*omega + 0.059035*mu_r4;
Scalar Tstar = 1.2593 * temperature/Tc;
Scalar Omega_v =
1.16145*std::pow(Tstar, -0.14874)
0.52487*std::exp(- 0.77320*Tstar)
1.16145*std::pow(Tstar, -0.14874) +
0.52487*std::exp(- 0.77320*Tstar) +
2.16178*std::exp(- 2.43787*Tstar);
Scalar mu = 40.785*Fc*std::sqrt(M*temperature)/(std::pow(Vc, 2./3)*Omega_v);
......
......@@ -182,7 +182,7 @@ public:
Region2::ddgamma_dtaudpi(temperature, pv);
return
enthalpyRegion2_(temperature, pv)
enthalpyRegion2_(temperature, pv) +
(pressure - pv)*dh_dp;
};
......@@ -223,7 +223,7 @@ public:
Region1::ddgamma_dtaudpi(temperature, pv);
return
enthalpyRegion1_(temperature, pv)
enthalpyRegion1_(temperature, pv) +
(pressure - pv)*dh_dp;
};
......@@ -787,7 +787,7 @@ private:
return
- pow(tau, 2 ) *
Region1::ddgamma_ddtau(temperature, pressure) * R
Region1::ddgamma_ddtau(temperature, pressure) * R +
diff;
};
......
......@@ -119,9 +119,9 @@ public:
return
criticalPressure() *
std::exp(criticalTemperature()/T*
(sigma*(N1
sqrtSigma*N2
sigma*(sqrtSigma*N3
(sigma*(N1 +
sqrtSigma*N2 +
sigma*(sqrtSigma*N3 +
sigma*sigma*sigma*N4))));
}
......@@ -258,8 +258,8 @@ public:
Scalar Fc = 1 - 0.2756*omega + 0.059035*mu_r4;
Scalar Tstar = 1.2593 * temperature/Tc;
Scalar Omega_v =
1.16145*std::pow(Tstar, -0.14874)
0.52487*std::exp(- 0.77320*Tstar)
1.16145*std::pow(Tstar, -0.14874) +
0.52487*std::exp(- 0.77320*Tstar) +
2.16178*std::exp(- 2.43787*Tstar);
Scalar mu = 40.785*Fc*std::sqrt(M*temperature)/(std::pow(Vc, 2./3)*Omega_v);
......
......@@ -117,8 +117,8 @@ public:
return
triplePressure()*
std::exp(X*(A
X*(B + C*X)
std::exp(X*(A +
X*(B + C*X) +
D*std::pow(1 - X,
epsilon)));
}
......@@ -234,8 +234,8 @@ public:
Scalar Fc = 1 - 0.2756*omega + 0.059035*mu_r4;
Scalar Tstar = 1.2593 * temperature/Tc;
Scalar Omega_v =
1.16145*std::pow(Tstar, -0.14874)
0.52487*std::exp(- 0.77320*Tstar)
1.16145*std::pow(Tstar, -0.14874) +
0.52487*std::exp(- 0.77320*Tstar) +
2.16178*std::exp(- 2.43787*Tstar);
Scalar mu = 40.785*Fc*std::sqrt(M*temperature)/(std::pow(Vc, 2./3)*Omega_v);
......
......@@ -207,8 +207,8 @@ public:
Scalar Fc = 1 - 0.2756*omega + 0.059035*mu_r4;
Scalar Tstar = 1.2593 * temperature/Tc;
Scalar Omega_v =
1.16145*std::pow(Tstar, -0.14874)
0.52487*std::exp(- 0.77320*Tstar)
1.16145*std::pow(Tstar, -0.14874) +
0.52487*std::exp(- 0.77320*Tstar) +
2.16178*std::exp(- 2.43787*Tstar);
Scalar mu = 40.785*Fc*std::sqrt(M*temperature)/(std::pow(Vc, 2./3)*Omega_v);
......
......@@ -166,7 +166,7 @@ public:
Scalar density =
Scalar(iRho)/(nDensity_ - 1) *
(maxGasDensity__[iT] - minGasDensity__[iT])
+
minGasDensity__[iT];
unsigned i = iT + iRho*nTemp_;
......@@ -188,7 +188,7 @@ public:
Scalar density =
Scalar(iRho)/(nDensity_ - 1) *
(maxLiquidDensity__[iT] - minLiquidDensity__[iT])
+
minLiquidDensity__[iT];
unsigned i = iT + iRho*nTemp_;
......@@ -455,7 +455,7 @@ private:
alphaT -= iT;
return
values[iT ]*(1 - alphaT)
values[iT ]*(1 - alphaT) +
values[iT + 1]*( alphaT);
}
......@@ -480,9 +480,9 @@ private:
alphaP2 -= iP2;
return
values[(iT ) + (iP1 )*nTemp_]*(1 - alphaT)*(1 - alphaP1)
values[(iT ) + (iP1 + 1)*nTemp_]*(1 - alphaT)*( alphaP1)
values[(iT + 1) + (iP2 )*nTemp_]*( alphaT)*(1 - alphaP2)
values[(iT ) + (iP1 )*nTemp_]*(1 - alphaT)*(1 - alphaP1) +
values[(iT ) + (iP1 + 1)*nTemp_]*(1 - alphaT)*( alphaP1) +
values[(iT + 1) + (iP2 )*nTemp_]*( alphaT)*(1 - alphaP2) +
values[(iT + 1) + (iP2 + 1)*nTemp_]*( alphaT)*( alphaP2);
}
......@@ -507,9 +507,9 @@ private:
alphaP2 -= iP2;
return
values[(iT ) + (iP1 )*nTemp_]*(1 - alphaT)*(1 - alphaP1)
values[(iT ) + (iP1 + 1)*nTemp_]*(1 - alphaT)*( alphaP1)
values[(iT + 1) + (iP2 )*nTemp_]*( alphaT)*(1 - alphaP2)
values[(iT ) + (iP1 )*nTemp_]*(1 - alphaT)*(1 - alphaP1) +
values[(iT ) + (iP1 + 1)*nTemp_]*(1 - alphaT)*( alphaP1) +
values[(iT + 1) + (iP2 )*nTemp_]*( alphaT)*(1 - alphaP2) +
values[(iT + 1) + (iP2 + 1)*nTemp_]*( alphaT)*( alphaP2);
}
......@@ -529,9 +529,9 @@ private:
alphaP2 -= iP2;
return
values[(iT ) + (iP1 )*nTemp_]*(1 - alphaT)*(1 - alphaP1)
values[(iT ) + (iP1 + 1)*nTemp_]*(1 - alphaT)*( alphaP1)
values[(iT + 1) + (iP2 )*nTemp_]*( alphaT)*(1 - alphaP2)
values[(iT ) + (iP1 )*nTemp_]*(1 - alphaT)*(1 - alphaP1) +
values[(iT ) + (iP1 + 1)*nTemp_]*(1 - alphaT)*( alphaP1) +
values[(iT + 1) + (iP2 )*nTemp_]*( alphaT)*(1 - alphaP2) +
values[(iT + 1) + (iP2 + 1)*nTemp_]*( alphaT)*( alphaP2);
}
......@@ -551,9 +551,9 @@ private:
alphaP2 -= iP2;
return
values[(iT ) + (iP1 )*nTemp_]*(1 - alphaT)*(1 - alphaP1)
values[(iT ) + (iP1 + 1)*nTemp_]*(1 - alphaT)*( alphaP1)
values[(iT + 1) + (iP2 )*nTemp_]*( alphaT)*(1 - alphaP2)
values[(iT ) + (iP1 )*nTemp_]*(1 - alphaT)*(1 - alphaP1) +
values[(iT ) + (iP1 + 1)*nTemp_]*(1 - alphaT)*( alphaP1) +
values[(iT + 1) + (iP2 )*nTemp_]*( alphaT)*(1 - alphaP2) +
values[(iT + 1) + (iP2 + 1)*nTemp_]*( alphaT)*( alphaP2);
}
......
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