From c1682f93ce642492817833cc9c84484baa0d83c5 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Thu, 20 Jan 2011 15:58:26 +0000 Subject: [PATCH] Revert "remove trailing white space" due to an incorrect regular expression, this removed trailing "+" signs instead of white space. --- .../material/binarycoefficients/henryiapws.hh | 8 ++--- dumux/material/components/brine.hh | 10 +++---- dumux/material/components/ch4.hh | 4 +-- dumux/material/components/h2.hh | 4 +-- dumux/material/components/h2o.hh | 6 ++-- dumux/material/components/n2.hh | 10 +++---- dumux/material/components/o2.hh | 8 ++--- dumux/material/components/simpleco2.hh | 4 +-- .../material/components/tabulatedcomponent.hh | 30 +++++++++---------- .../fluidmatrixinteractions/2p/brookscorey.hh | 2 +- dumux/material/fluidsystems/h2o_n2_system.hh | 8 ++--- .../spatialparameters/boxspatialparameters.hh | 2 +- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dumux/material/binarycoefficients/henryiapws.hh b/dumux/material/binarycoefficients/henryiapws.hh index bbd43ee7e..2f14fd6f7 100644 --- a/dumux/material/binarycoefficients/henryiapws.hh +++ b/dumux/material/binarycoefficients/henryiapws.hh @@ -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 diff --git a/dumux/material/components/brine.hh b/dumux/material/components/brine.hh index 4d33b5412..af165772e 100644 --- a/dumux/material/components/brine.hh +++ b/dumux/material/components/brine.hh @@ -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))); } diff --git a/dumux/material/components/ch4.hh b/dumux/material/components/ch4.hh index 1c6e06635..d03bea285 100644 --- a/dumux/material/components/ch4.hh +++ b/dumux/material/components/ch4.hh @@ -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); diff --git a/dumux/material/components/h2.hh b/dumux/material/components/h2.hh index 414abeb24..b04440db9 100644 --- a/dumux/material/components/h2.hh +++ b/dumux/material/components/h2.hh @@ -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); diff --git a/dumux/material/components/h2o.hh b/dumux/material/components/h2o.hh index cf034e19c..e5c38141b 100644 --- a/dumux/material/components/h2o.hh +++ b/dumux/material/components/h2o.hh @@ -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; }; diff --git a/dumux/material/components/n2.hh b/dumux/material/components/n2.hh index 73433eb60..11313fee2 100644 --- a/dumux/material/components/n2.hh +++ b/dumux/material/components/n2.hh @@ -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); diff --git a/dumux/material/components/o2.hh b/dumux/material/components/o2.hh index a7e1c15f4..8679cde32 100644 --- a/dumux/material/components/o2.hh +++ b/dumux/material/components/o2.hh @@ -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); diff --git a/dumux/material/components/simpleco2.hh b/dumux/material/components/simpleco2.hh index 58cd0950c..a045f54c4 100644 --- a/dumux/material/components/simpleco2.hh +++ b/dumux/material/components/simpleco2.hh @@ -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); diff --git a/dumux/material/components/tabulatedcomponent.hh b/dumux/material/components/tabulatedcomponent.hh index e37aed4d4..149f76a5b 100644 --- a/dumux/material/components/tabulatedcomponent.hh +++ b/dumux/material/components/tabulatedcomponent.hh @@ -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); } diff --git a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh index 372befb4c..323983530 100644 --- a/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh +++ b/dumux/material/fluidmatrixinteractions/2p/brookscorey.hh @@ -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) diff --git a/dumux/material/fluidsystems/h2o_n2_system.hh b/dumux/material/fluidsystems/h2o_n2_system.hh index 0824c1321..c07790dd8 100644 --- a/dumux/material/fluidsystems/h2o_n2_system.hh +++ b/dumux/material/fluidsystems/h2o_n2_system.hh @@ -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()); } diff --git a/dumux/material/spatialparameters/boxspatialparameters.hh b/dumux/material/spatialparameters/boxspatialparameters.hh index 24bbcb9a3..52c627e6b 100644 --- a/dumux/material/spatialparameters/boxspatialparameters.hh +++ b/dumux/material/spatialparameters/boxspatialparameters.hh @@ -113,7 +113,7 @@ public: (asImp_().extrusionFactorScv(element, fvElemGeom, fvElemGeom.subContVolFace[scvfIdx].i) - + + asImp_().extrusionFactorScv(element, fvElemGeom, fvElemGeom.subContVolFace[scvfIdx].j));