From e3a26cfe3d5c2c85dbd1a765ac3d8ba5e6f1b601 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Fri, 25 Jan 2013 15:34:16 +0000
Subject: [PATCH] ENH: Film model updates for surface quantities
---
.../kinematicSingleLayer/kinematicSingleLayer.C | 12 ++++++------
.../thermoSingleLayer/thermoSingleLayer.C | 16 +++++++++-------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
index 21d86aa6fa8..824ee22e7e2 100644
--- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -299,8 +299,6 @@ tmp<Foam::fvVectorMatrix> kinematicSingleLayer::solveMomentum
Info<< "kinematicSingleLayer::solveMomentum()" << endl;
}
- updateSurfaceVelocities();
-
// Momentum
tmp<fvVectorMatrix> tUEqn
(
@@ -861,8 +859,13 @@ void kinematicSingleLayer::evolveRegion()
Info<< "kinematicSingleLayer::evolveRegion()" << endl;
}
+ // Update film coverage indicator
correctAlpha();
+ // Update film wall and surface velocities
+ updateSurfaceVelocities();
+
+ // Update sub-models to provide updated source contributions
updateSubmodels();
// Solve continuity for deltaRho_
@@ -890,9 +893,6 @@ void kinematicSingleLayer::evolveRegion()
// Update deltaRho_ with new delta_
deltaRho_ == delta_*rho_;
- // Update film wall and surface velocities
- updateSurfaceVelocities();
-
// Reset source terms for next time integration
resetPrimaryRegionSourceTerms();
}
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index 5bf0534819f..42d459ce012 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -637,8 +637,16 @@ void thermoSingleLayer::evolveRegion()
Info<< "thermoSingleLayer::evolveRegion()" << endl;
}
+ // Update film coverage indicator
correctAlpha();
+ // Update film wall and surface velocities
+ updateSurfaceVelocities();
+
+ // Update film wall and surface temperatures
+ updateSurfaceTemperatures();
+
+ // Update sub-models to provide updated source contributions
updateSubmodels();
// Solve continuity for deltaRho_
@@ -672,12 +680,6 @@ void thermoSingleLayer::evolveRegion()
// Update temperature using latest hs_
T_ == T(hs_);
- // Update film wall and surface velocities
- updateSurfaceVelocities();
-
- // Update film wall and surface temperatures
- updateSurfaceTemperatures();
-
// Reset source terms for next time integration
resetPrimaryRegionSourceTerms();
}
--
GitLab