mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
remove trailing white space
This commit is contained in:
Andreas Lauser
committed by
Andreas Lauser
Andreas Lauser
parent
cbe860a31d
commit
f1944cae28
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -212,7 +212,7 @@ public:
|
||||
|
||||
return
|
||||
2.0*(Swe - 1)*(
|
||||
1 +
|
||||
1
|
||||
pow(Swe, 2.0/params.alpha())*(
|
||||
1.0/params.alpha() + 1.0/2 -
|
||||
Swe*(1.0/params.alpha() + 1.0/2)
|
||||
|
||||
@@ -151,7 +151,7 @@ public:
|
||||
// water molecule in the liquid
|
||||
return
|
||||
clH2O*(H2O::molarMass()*fluidState.moleFrac(lPhaseIdx, H2OIdx)
|
||||
+
|
||||
|
||||
N2::molarMass()*fluidState.moleFrac(lPhaseIdx, N2Idx));
|
||||
}
|
||||
else if (phaseIdx == gPhaseIdx) {
|
||||
@@ -162,7 +162,7 @@ public:
|
||||
fluidState.moleFrac(gPhaseIdx, N2Idx) *
|
||||
fluidState.phasePressure(gPhaseIdx);
|
||||
return
|
||||
H2O::gasDensity(temperature, fugH2O) +
|
||||
H2O::gasDensity(temperature, fugH2O)
|
||||
N2::gasDensity(temperature, fugN2);
|
||||
}
|
||||
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
|
||||
@@ -452,7 +452,7 @@ public:
|
||||
return
|
||||
fluidState.massFrac(lPhaseIdx, H2OIdx)*
|
||||
H2O::liquidEnthalpy(temperature, pressure)
|
||||
+
|
||||
|
||||
fluidState.massFrac(lPhaseIdx, N2Idx)*
|
||||
N2::gasEnthalpy(temperature, pN2);
|
||||
}
|
||||
@@ -502,7 +502,7 @@ private:
|
||||
// water molecule in the liquid
|
||||
return
|
||||
clH2O*(xlH2O*H2O::molarMass()
|
||||
+
|
||||
|
||||
xlN2*N2::molarMass());
|
||||
}
|
||||
|
||||
|
||||
@@ -113,7 +113,7 @@ public:
|
||||
(asImp_().extrusionFactorScv(element,
|
||||
fvElemGeom,
|
||||
fvElemGeom.subContVolFace[scvfIdx].i)
|
||||
+
|
||||
|
||||
asImp_().extrusionFactorScv(element,
|
||||
fvElemGeom,
|
||||
fvElemGeom.subContVolFace[scvfIdx].j));
|
||||
|
||||
Reference in New Issue
Block a user