From 69f62abe260c8dedfb2e6586b641b0ee8d0b59be Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 28 Feb 2011 10:36:34 +0000
Subject: [PATCH] ENH: Output cloud property dictionaries as ascii

---
 src/lagrangian/basic/Cloud/CloudIO.C          |  7 ++++++-
 .../InjectionModel/InjectionModel.C           |  7 ++++++-
 .../LocalInteraction/LocalInteraction.C       | 19 ++++++++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 0b978a2cc9..f1ce310bac 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -97,7 +97,12 @@ void Foam::Cloud<ParticleType>::writeCloudUniformProperties() const
         uniformPropsDict.subDict(procName).add("particleCount", np[i]);
     }
 
-    uniformPropsDict.regIOobject::write();
+    uniformPropsDict.writeObject
+    (
+        IOstream::ASCII,
+        IOstream::currentVersion,
+        time().writeCompression()
+    );
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 22e11fa894..94b5a3d91b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -91,7 +91,12 @@ void Foam::InjectionModel<CloudType>::writeProps()
         propsDict.add("parcelsAddedTotal", parcelsAddedTotal_);
         propsDict.add("timeStep0", timeStep0_);
 
-        propsDict.regIOobject::write();
+        propsDict.writeObject
+        (
+            IOstream::ASCII,
+            IOstream::currentVersion,
+            this->owner().db().time().writeCompression()
+        );
     }
 }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
index 465dd9b04f..80b9fe3881 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -48,13 +48,17 @@ Foam::label Foam::LocalInteraction<CloudType>::applyToPatch
 template<class CloudType>
 void Foam::LocalInteraction<CloudType>::readProps()
 {
+    if (!this->owner().solution().transient())
+    {
+        return;
+    }
     IOobject propsDictHeader
     (
         "localInteractionProperties",
         this->owner().db().time().timeName(),
         "uniform"/cloud::prefix/this->owner().name(),
         this->owner().db(),
-        IOobject::MUST_READ,
+        IOobject::MUST_READ_IF_MODIFIED,
         IOobject::NO_WRITE,
         false
     );
@@ -62,7 +66,6 @@ void Foam::LocalInteraction<CloudType>::readProps()
     if (propsDictHeader.headerOk())
     {
         const IOdictionary propsDict(propsDictHeader);
-
         propsDict.readIfPresent("nEscape", nEscape0_);
         propsDict.readIfPresent("massEscape", massEscape0_);
         propsDict.readIfPresent("nStick", nStick0_);
@@ -80,6 +83,11 @@ void Foam::LocalInteraction<CloudType>::writeProps
     const scalarList& massStick
 ) const
 {
+    if (!this->owner().solution().transient())
+    {
+        return;
+    }
+
     if (this->owner().db().time().outputTime())
     {
         IOdictionary propsDict
@@ -101,7 +109,12 @@ void Foam::LocalInteraction<CloudType>::writeProps
         propsDict.add("nStick", nStick);
         propsDict.add("massStick", massStick);
 
-        propsDict.regIOobject::write();
+        propsDict.writeObject
+        (
+            IOstream::ASCII,
+            IOstream::currentVersion,
+            this->owner().db().time().writeCompression()
+        );
     }
 }