From 982c28d545c03c376ad5ac97f221806514ac97b8 Mon Sep 17 00:00:00 2001 From: sergio Date: Wed, 5 Apr 2017 13:58:45 -0700 Subject: [PATCH 1/2] BUG: Gitlab issue 442. Resetting allLambda for phases in the alphaEqns.H for interMixingFoam --- .../multiphase/interFoam/interMixingFoam/alphaEqns.H | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H index d720aa97f6..3f75765dd7 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H @@ -108,6 +108,11 @@ ); } + alphaPhi1 = alphaPhi1BD + lambda*alphaPhi1; + + // Reset allLambda to 1.0 + allLambda = 1.0; + // Create the complete flux for alpha2 surfaceScalarField alphaPhi2 ( @@ -172,7 +177,6 @@ } // Construct the limited fluxes - alphaPhi1 = alphaPhi1BD + lambda*alphaPhi1; alphaPhi2 = alphaPhi2BD + lambda*alphaPhi2; // Solve for alpha1 From 90eeafb43ec4355ba656670bdf4cc93ea78eb3d2 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 7 Apr 2017 07:46:17 +0200 Subject: [PATCH 2/2] BUG: typo in addProfiling0 macro (fixes #446) --- src/OpenFOAM/global/profiling/profiling.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenFOAM/global/profiling/profiling.H b/src/OpenFOAM/global/profiling/profiling.H index c6872f8e2b..f9c246bbb8 100644 --- a/src/OpenFOAM/global/profiling/profiling.H +++ b/src/OpenFOAM/global/profiling/profiling.H @@ -468,7 +468,7 @@ public: // \sa addProfiling // \sa endProfiling #define addProfiling0(name) \ - ::Foam::Profiling::Trigger profilingTriggerFor##name(#name) + ::Foam::profiling::Trigger profilingTriggerFor##name(#name) //- Define profiling with specified name and description correspond to the // compiler-defined function name string: