STYLE: use HashTable iterator 'val()' method instead of 'object()'

This commit is contained in:
Mark Olesen
2019-01-18 16:26:50 +01:00
parent 53efb24a8d
commit ed94a2714d
57 changed files with 134 additions and 139 deletions

View File

@ -142,7 +142,7 @@ void Foam::radiation::laserDTRM::initialiseReflection()
key,
reflectionModel::New
(
iter.object(),
iter.val(),
mesh_
)
);

View File

@ -46,7 +46,7 @@ void Foam::phaseSystem::createSubModels
key,
modelType::New
(
iter.object(),
iter.val(),
phasePairs_[key]
)
);
@ -76,7 +76,7 @@ void Foam::phaseSystem::createSubModels
key,
modelType::New
(
iter.object(),
iter.val(),
mesh
)
);

View File

@ -61,7 +61,7 @@ HeatAndMassTransferPhaseSystem
forAllConstIters(this->phasePairs_, phasePairIter)
{
const phasePair& pair = *(phasePairIter.object());
const phasePair& pair = *(phasePairIter.val());
if (pair.ordered())
{
@ -194,7 +194,7 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::dmdt
forAllConstIters(this->phasePairs_, phasePairIter)
{
const phasePair& pair = *(phasePairIter.object());
const phasePair& pair = *(phasePairIter.val());
if (pair.ordered())
{
@ -231,7 +231,7 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::momentumTransfer() const
// Source term due to mass transfer
forAllConstIters(this->phasePairs_, phasePairIter)
{
const phasePair& pair = *(phasePairIter.object());
const phasePair& pair = *(phasePairIter.val());
if (pair.ordered())
{
@ -318,7 +318,7 @@ Foam::HeatAndMassTransferPhaseSystem<BasePhaseSystem>::heatTransfer() const
// Source term due to mass transfer
forAllConstIters(this->phasePairs_, phasePairIter)
{
const phasePair& pair = *(phasePairIter.object());
const phasePair& pair = *(phasePairIter.val());
if (pair.ordered())
{

View File

@ -82,7 +82,7 @@ massTransfer() const
// Reset the interfacial mass flow rates
forAllConstIters(this->phasePairs_, phasePairIter)
{
const phasePair& pair = *(phasePairIter.object());
const phasePair& pair = *(phasePairIter.val());
if (pair.ordered())
{
@ -99,11 +99,9 @@ massTransfer() const
// Sum up the contribution from each interface composition model
forAllConstIters(interfaceCompositionModels_, modelIter)
{
const phasePair& pair =
*(this->phasePairs_[modelIter.key()]);
const phasePair& pair = *(this->phasePairs_[modelIter.key()]);
const interfaceCompositionModel& compositionModel =
*(modelIter.object());
const interfaceCompositionModel& compositionModel = *(modelIter.val());
const phaseModel& phase = pair.phase1();
const phaseModel& otherPhase = pair.phase2();
@ -185,7 +183,7 @@ correctThermo()
forAllConstIters(this->phasePairs_, phasePairIter)
{
const phasePair& pair = *(phasePairIter.object());
const phasePair& pair = *(phasePairIter.val());
if (pair.ordered())
{

View File

@ -44,7 +44,7 @@ ThermalPhaseChangePhaseSystem
forAllConstIters(this->phasePairs_, phasePairIter)
{
const phasePair& pair = *(phasePairIter.object());
const phasePair& pair = *(phasePairIter.val());
if (pair.ordered())
{
@ -106,7 +106,7 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::heatTransfer() const
// Accumulate mDotL contributions from boundaries
forAllConstIters(this->phasePairs_, phasePairIter)
{
const phasePair& pair = *(phasePairIter.object());
const phasePair& pair = *(phasePairIter.val());
if (pair.ordered())
{
@ -201,7 +201,7 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::massTransfer() const
forAllConstIters(this->phasePairs_, phasePairIter)
{
const phasePair& pair = *(phasePairIter.object());
const phasePair& pair = *(phasePairIter.val());
if (pair.ordered())
{
@ -270,7 +270,7 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::iDmdt
forAllConstIters(this->phasePairs_, phasePairIter)
{
const phasePair& pair = *(phasePairIter.object());
const phasePair& pair = *(phasePairIter.val());
if (pair.ordered())
{
@ -305,7 +305,7 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
forAllConstIters(this->phasePairs_, phasePairIter)
{
const phasePair& pair = *(phasePairIter.object());
const phasePair& pair = *(phasePairIter.val());
if (pair.ordered())
{

View File

@ -48,7 +48,7 @@ void Foam::phaseSystem::createSubModels
key,
modelType::New
(
iter.object(),
iter.val(),
phasePairs_[key]()
)
);