ENH: Output cloud property dictionaries as ascii

This commit is contained in:
andy 2011-02-28 10:36:34 +00:00
parent eec0068e37
commit 69f62abe26
3 changed files with 28 additions and 5 deletions

View File

@ -97,7 +97,12 @@ void Foam::Cloud<ParticleType>::writeCloudUniformProperties() const
uniformPropsDict.subDict(procName).add("particleCount", np[i]); uniformPropsDict.subDict(procName).add("particleCount", np[i]);
} }
uniformPropsDict.regIOobject::write(); uniformPropsDict.writeObject
(
IOstream::ASCII,
IOstream::currentVersion,
time().writeCompression()
);
} }

View File

@ -91,7 +91,12 @@ void Foam::InjectionModel<CloudType>::writeProps()
propsDict.add("parcelsAddedTotal", parcelsAddedTotal_); propsDict.add("parcelsAddedTotal", parcelsAddedTotal_);
propsDict.add("timeStep0", timeStep0_); propsDict.add("timeStep0", timeStep0_);
propsDict.regIOobject::write(); propsDict.writeObject
(
IOstream::ASCII,
IOstream::currentVersion,
this->owner().db().time().writeCompression()
);
} }
} }

View File

@ -48,13 +48,17 @@ Foam::label Foam::LocalInteraction<CloudType>::applyToPatch
template<class CloudType> template<class CloudType>
void Foam::LocalInteraction<CloudType>::readProps() void Foam::LocalInteraction<CloudType>::readProps()
{ {
if (!this->owner().solution().transient())
{
return;
}
IOobject propsDictHeader IOobject propsDictHeader
( (
"localInteractionProperties", "localInteractionProperties",
this->owner().db().time().timeName(), this->owner().db().time().timeName(),
"uniform"/cloud::prefix/this->owner().name(), "uniform"/cloud::prefix/this->owner().name(),
this->owner().db(), this->owner().db(),
IOobject::MUST_READ, IOobject::MUST_READ_IF_MODIFIED,
IOobject::NO_WRITE, IOobject::NO_WRITE,
false false
); );
@ -62,7 +66,6 @@ void Foam::LocalInteraction<CloudType>::readProps()
if (propsDictHeader.headerOk()) if (propsDictHeader.headerOk())
{ {
const IOdictionary propsDict(propsDictHeader); const IOdictionary propsDict(propsDictHeader);
propsDict.readIfPresent("nEscape", nEscape0_); propsDict.readIfPresent("nEscape", nEscape0_);
propsDict.readIfPresent("massEscape", massEscape0_); propsDict.readIfPresent("massEscape", massEscape0_);
propsDict.readIfPresent("nStick", nStick0_); propsDict.readIfPresent("nStick", nStick0_);
@ -80,6 +83,11 @@ void Foam::LocalInteraction<CloudType>::writeProps
const scalarList& massStick const scalarList& massStick
) const ) const
{ {
if (!this->owner().solution().transient())
{
return;
}
if (this->owner().db().time().outputTime()) if (this->owner().db().time().outputTime())
{ {
IOdictionary propsDict IOdictionary propsDict
@ -101,7 +109,12 @@ void Foam::LocalInteraction<CloudType>::writeProps
propsDict.add("nStick", nStick); propsDict.add("nStick", nStick);
propsDict.add("massStick", massStick); propsDict.add("massStick", massStick);
propsDict.regIOobject::write(); propsDict.writeObject
(
IOstream::ASCII,
IOstream::currentVersion,
this->owner().db().time().writeCompression()
);
} }
} }