From b36c952f26691ead0630d6c4f34af59d20d1f240 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 10 Dec 2013 16:31:37 +0000
Subject: [PATCH] ENH: surface film - enabled smooth restart for addedMass
counter
---
.../kinematicSingleLayer/kinematicSingleLayer.C | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 347e3ddb898..928f65da6eb 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -136,6 +136,16 @@ void kinematicSingleLayer::transferPrimaryRegionSourceFields()
rhoSp_.correctBoundaryConditions();
USp_.correctBoundaryConditions();
pSp_.correctBoundaryConditions();
+
+ // update addedMassTotal counter
+ if (time().outputTime())
+ {
+ scalar addedMassTotal = 0.0;
+ outputProperties().readIfPresent("addedMassTotal", addedMassTotal);
+ addedMassTotal += returnReduce(addedMassTotal_, sumOp<scalar>());
+ outputProperties().add("addedMassTotal", addedMassTotal, true);
+ addedMassTotal_ = 0.0;
+ }
}
@@ -1055,9 +1065,11 @@ void kinematicSingleLayer::info() const
const scalarField& deltaInternal = delta_.internalField();
const vectorField& Uinternal = U_.internalField();
+ scalar addedMassTotal = 0.0;
+ outputProperties().readIfPresent("addedMassTotal", addedMassTotal);
+ addedMassTotal += returnReduce(addedMassTotal_, sumOp<scalar>());
- Info<< indent << "added mass = "
- << returnReduce<scalar>(addedMassTotal_, sumOp<scalar>()) << nl
+ Info<< indent << "added mass = " << addedMassTotal << nl
<< indent << "current mass = "
<< gSum((deltaRho_*magSf())()) << nl
<< indent << "min/max(mag(U)) = " << gMin(mag(Uinternal)) << ", "
--
GitLab