From 79639bcecf116eb26de5943b3ca8dbaedf10c1ed Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 25 Jun 2018 13:43:07 +0200
Subject: [PATCH] ENH: clear catalyst inputs on functionObject::end
- forces release of memory for the associated backends
- log which channels are being emitted.
The printChannels pipeline was redundant anyhow.
---
src/catalyst/catalystDict | 1 -
src/catalyst/catalystFunctionObject.C | 12 +++++++++++-
.../multiRegionHeater/system/catalyst | 1 -
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/catalyst/catalystDict b/src/catalyst/catalystDict
index 5c35268..463d01c 100644
--- a/src/catalyst/catalystDict
+++ b/src/catalyst/catalystDict
@@ -19,7 +19,6 @@ catalyst
scripts
(
- // "<etc>/caseDicts/insitu/catalyst/printChannels.py"
"<etc>/caseDicts/insitu/catalyst/writeAll.py"
);
diff --git a/src/catalyst/catalystFunctionObject.C b/src/catalyst/catalystFunctionObject.C
index c7d31fc..a73d6ec 100644
--- a/src/catalyst/catalystFunctionObject.C
+++ b/src/catalyst/catalystFunctionObject.C
@@ -336,7 +336,15 @@ bool Foam::functionObjects::catalystFunctionObject::execute()
if (outputs.size())
{
- Log << type() << ": send data" << nl;
+ if (log)
+ {
+ Info<< type() << ": send data (";
+ for (const word& channelName : outputs.sortedToc())
+ {
+ Info<< ' ' << channelName;
+ }
+ Info<< " )" << nl;
+ }
adaptor_().process(dataq, outputs);
}
@@ -373,6 +381,8 @@ bool Foam::functionObjects::catalystFunctionObject::end()
}
adaptor_.clear();
+ inputs_.clear();
+
return true;
}
diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/catalyst b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/catalyst
index a3a707d..8a03f3f 100644
--- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/catalyst
+++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/catalyst
@@ -7,7 +7,6 @@ catalyst
scripts
(
"<system>/scripts/slice1.py"
- // "<etc>/caseDicts/insitu/catalyst/printChannels.py"
// "<etc>/caseDicts/insitu/catalyst/writeAll.py"
);
--
GitLab