diff --git a/diffusivityModel/diffusivityModel/diffusivityModel.C b/diffusivityModel/diffusivityModel/diffusivityModel.C index 904ed55..f5c08f7 100644 --- a/diffusivityModel/diffusivityModel/diffusivityModel.C +++ b/diffusivityModel/diffusivityModel/diffusivityModel.C @@ -173,8 +173,7 @@ void Foam::diffusivityModel::calculateMuD const scalar Ti, const scalar rhoQc2i, const scalarField &localY, - const scalarField &localX, - const bool caseElectron + const scalarField &localX ) { @@ -182,9 +181,8 @@ void Foam::diffusivityModel::calculateMuD label neutralStart = 0; - if (caseElectron) + if (electron_.valid()) { - ionStart = 1; neutralStart = ionStart + ions_.size(); @@ -297,13 +295,12 @@ void Foam::diffusivityModel::calculateK const UList &Zrot, const scalar rhoi, const scalar pi, - const scalar Ti, - const bool caseElectron + const scalar Ti ) { label ionStart = 0; - if (caseElectron) + if (electron_.valid()) { ionStart = 1; @@ -700,7 +697,7 @@ void Foam::diffusivityModel::correct() localX[i] = Y[i][celli] * WbarI / Wpure[i]; } - calculateMuD ( muI, Dij, pi, Ti, rhoQc2i, localY, localX, electron_.valid()); + calculateMuD ( muI, Dij, pi, Ti, rhoQc2i, localY, localX); forAll (Dii, i) { @@ -728,7 +725,7 @@ void Foam::diffusivityModel::correct() } // Pure Thermal conductivities - calculateK ( kI, muI, Dii, Zrot, rhoi, pi, Ti, electron_.valid()); + calculateK ( kI, muI, Dii, Zrot, rhoi, pi, Ti); mixAvgDi(Di, Dij, localX, localY); forAll (Di, i) @@ -763,7 +760,7 @@ void Foam::diffusivityModel::correct() localX[i] = localY[i] * WbarI / Wpure[i]; } - calculateMuD ( muI, Dij, pi, Ti, rhoQc2i, localY, localX, electron_.valid()); + calculateMuD ( muI, Dij, pi, Ti, rhoQc2i, localY, localX); forAll (Dii, i) { @@ -792,7 +789,7 @@ void Foam::diffusivityModel::correct() } // Pure Thermal conductivities - calculateK ( kI, muI, Dii, Zrot, rhoi, pi, Ti, electron_.valid()); + calculateK ( kI, muI, Dii, Zrot, rhoi, pi, Ti); mixAvgDi(Di, Dij, localX, localY); forAll (Di, i) diff --git a/diffusivityModel/diffusivityModel/diffusivityModel.H b/diffusivityModel/diffusivityModel/diffusivityModel.H index a33e33d..d310380 100644 --- a/diffusivityModel/diffusivityModel/diffusivityModel.H +++ b/diffusivityModel/diffusivityModel/diffusivityModel.H @@ -131,8 +131,7 @@ class diffusivityModel const scalar Ti, const scalar rhoQc2i, const scalarField &localY, - const scalarField &localX, - const bool caseElectron=true + const scalarField &localX ); inline void calculateK @@ -143,8 +142,7 @@ class diffusivityModel const UList &Zrot, const scalar rhoi, const scalar pi, - const scalar Ti, - const bool caseElectron=true + const scalar Ti ); public: