diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.C b/src/functionObjects/solvers/electricPotential/electricPotential.C index 13766c9063..37aeb615a2 100644 --- a/src/functionObjects/solvers/electricPotential/electricPotential.C +++ b/src/functionObjects/solvers/electricPotential/electricPotential.C @@ -201,11 +201,11 @@ Foam::functionObjects::electricPotential::electricPotential ) ) ), - fieldName_ + Vname_ ( dict.getOrDefault ( - "field", + "V", IOobject::scopedName(typeName, "V") ) ), @@ -216,7 +216,7 @@ Foam::functionObjects::electricPotential::electricPotential // Force creation of transported field so any BCs using it can // look it up - volScalarField& eV = getOrReadField(fieldName_); + volScalarField& eV = getOrReadField(Vname_); eV.correctBoundaryConditions(); } @@ -225,88 +225,88 @@ Foam::functionObjects::electricPotential::electricPotential bool Foam::functionObjects::electricPotential::read(const dictionary& dict) { - if (fvMeshFunctionObject::read(dict)) + if (!fvMeshFunctionObject::read(dict)) { - Log << type() << " read: " << name() << endl; + return false; + } - dict.readIfPresent("sigma", sigma_); - dict.readIfPresent("epsilonr", epsilonr_); - dict.readIfPresent("nCorr", nCorr_); - dict.readIfPresent("writeDerivedFields", writeDerivedFields_); + Log << type() << " read: " << name() << endl; - // If flow is multiphase - if (!phasesDict_.empty()) + dict.readIfPresent("sigma", sigma_); + dict.readIfPresent("epsilonr", epsilonr_); + dict.readIfPresent("nCorr", nCorr_); + dict.readIfPresent("writeDerivedFields", writeDerivedFields_); + + // If flow is multiphase + if (!phasesDict_.empty()) + { + phaseNames_.setSize(phasesDict_.size()); + phases_.setSize(phasesDict_.size()); + sigmas_.setSize(phasesDict_.size()); + + if (writeDerivedFields_) { - phaseNames_.setSize(phasesDict_.size()); - phases_.setSize(phasesDict_.size()); - sigmas_.setSize(phasesDict_.size()); + epsilonrs_.setSize(phasesDict_.size()); + } + + label phasei = 0; + for (const entry& dEntry : phasesDict_) + { + const word& key = dEntry.keyword(); + + if (!dEntry.isDict()) + { + FatalIOErrorInFunction(phasesDict_) + << "Entry " << key << " is not a dictionary" << nl + << exit(FatalIOError); + } + + const dictionary& subDict = dEntry.dict(); + + phaseNames_[phasei] = key; + + sigmas_.set + ( + phasei, + new dimensionedScalar + ( + sqr(dimCurrent)*pow3(dimTime)/(dimMass*pow3(dimLength)), + subDict.getCheck + ( + "sigma", + scalarMinMax::ge(SMALL) + ) + ) + ); if (writeDerivedFields_) { - epsilonrs_.setSize(phasesDict_.size()); - } - - label phasei = 0; - for (const entry& dEntry : phasesDict_) - { - const word& key = dEntry.keyword(); - - if (!dEntry.isDict()) - { - FatalIOErrorInFunction(phasesDict_) - << "Entry " << key << " is not a dictionary" << nl - << exit(FatalIOError); - } - - const dictionary& subDict = dEntry.dict(); - - phaseNames_[phasei] = key; - - sigmas_.set + epsilonrs_.set ( phasei, new dimensionedScalar ( - sqr(dimCurrent)*pow3(dimTime)/(dimMass*pow3(dimLength)), + dimless, subDict.getCheck ( - "sigma", + "epsilonr", scalarMinMax::ge(SMALL) ) ) ); - - if (writeDerivedFields_) - { - epsilonrs_.set - ( - phasei, - new dimensionedScalar - ( - dimless, - subDict.getCheck - ( - "epsilonr", - scalarMinMax::ge(SMALL) - ) - ) - ); - } - - ++phasei; } - forAll(phaseNames_, i) - { - phases_.set - ( - i, - mesh_.getObjectPtr(phaseNames_[i]) - ); - } + ++phasei; } - return true; + forAll(phaseNames_, i) + { + phases_.set + ( + i, + mesh_.getObjectPtr(phaseNames_[i]) + ); + } } return false; @@ -318,11 +318,11 @@ bool Foam::functionObjects::electricPotential::execute() Log << type() << " execute: " << name() << endl; tmp tsigma = this->sigma(); - const volScalarField& sigma = tsigma(); + const auto& sigma = tsigma(); - volScalarField& eV = getOrReadField(fieldName_); + volScalarField& eV = getOrReadField(Vname_); - for (label i = 1; i <= nCorr_; ++i) + for (int i = 1; i <= nCorr_; ++i) { fvScalarMatrix eVEqn ( @@ -343,10 +343,10 @@ bool Foam::functionObjects::electricPotential::execute() bool Foam::functionObjects::electricPotential::write() { Log << type() << " write: " << name() << nl - << tab << fieldName_ + << tab << Vname_ << endl; - volScalarField& eV = getOrReadField(fieldName_); + volScalarField& eV = getOrReadField(Vname_); if (writeDerivedFields_) { diff --git a/src/functionObjects/solvers/electricPotential/electricPotential.H b/src/functionObjects/solvers/electricPotential/electricPotential.H index 171e668512..f29472c283 100644 --- a/src/functionObjects/solvers/electricPotential/electricPotential.H +++ b/src/functionObjects/solvers/electricPotential/electricPotential.H @@ -118,9 +118,9 @@ Usage } // Optional entries - nCorr