ENH: Clouds - only read parcel fields when solution is active

This commit is contained in:
andy
2011-03-02 11:01:47 +00:00
parent b2de414a99
commit b91eb061b2
5 changed files with 21 additions and 21 deletions

View File

@ -114,13 +114,13 @@ Foam::CollidingCloud<CloudType>::CollidingCloud
if (this->solution().active()) if (this->solution().active())
{ {
setModels(); setModels();
}
if (readFields) if (readFields)
{ {
parcelType::readFields(*this); parcelType::readFields(*this);
} }
} }
}
template<class CloudType> template<class CloudType>

View File

@ -360,12 +360,12 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
if (solution_.active()) if (solution_.active())
{ {
setModels(); setModels();
}
if (readFields) if (readFields)
{ {
parcelType::readFields(*this); parcelType::readFields(*this);
} }
}
if (solution_.resetSourcesOnStartup()) if (solution_.resetSourcesOnStartup())
{ {

View File

@ -117,6 +117,11 @@ Foam::ReactingCloud<CloudType>::ReactingCloud
if (this->solution().active()) if (this->solution().active())
{ {
setModels(); setModels();
if (readFields)
{
parcelType::readFields(*this, this->composition());
}
} }
// Set storage for mass source fields and initialise to zero // Set storage for mass source fields and initialise to zero
@ -142,11 +147,6 @@ Foam::ReactingCloud<CloudType>::ReactingCloud
); );
} }
if (readFields)
{
parcelType::readFields(*this, this->composition());
}
if (this->solution().resetSourcesOnStartup()) if (this->solution().resetSourcesOnStartup())
{ {
resetSourceTerms(); resetSourceTerms();

View File

@ -94,12 +94,12 @@ Foam::ReactingMultiphaseCloud<CloudType>::ReactingMultiphaseCloud
if (this->solution().active()) if (this->solution().active())
{ {
setModels(); setModels();
}
if (readFields) if (readFields)
{ {
parcelType::readFields(*this, this->composition()); parcelType::readFields(*this, this->composition());
} }
}
if (this->solution().resetSourcesOnStartup()) if (this->solution().resetSourcesOnStartup())
{ {

View File

@ -135,12 +135,12 @@ Foam::ThermoCloud<CloudType>::ThermoCloud
if (this->solution().active()) if (this->solution().active())
{ {
setModels(); setModels();
}
if (readFields) if (readFields)
{ {
parcelType::readFields(*this); parcelType::readFields(*this);
} }
}
if (this->solution().resetSourcesOnStartup()) if (this->solution().resetSourcesOnStartup())
{ {