Commit 22c63e4d authored by mark's avatar mark
Browse files

Merge remote-tracking branch 'origin/master' into develop

parents c400b108 7e16d36a
...@@ -108,6 +108,11 @@ ...@@ -108,6 +108,11 @@
); );
} }
alphaPhi1 = alphaPhi1BD + lambda*alphaPhi1;
// Reset allLambda to 1.0
allLambda = 1.0;
// Create the complete flux for alpha2 // Create the complete flux for alpha2
surfaceScalarField alphaPhi2 surfaceScalarField alphaPhi2
( (
...@@ -172,7 +177,6 @@ ...@@ -172,7 +177,6 @@
} }
// Construct the limited fluxes // Construct the limited fluxes
alphaPhi1 = alphaPhi1BD + lambda*alphaPhi1;
alphaPhi2 = alphaPhi2BD + lambda*alphaPhi2; alphaPhi2 = alphaPhi2BD + lambda*alphaPhi2;
// Solve for alpha1 // Solve for alpha1
......
...@@ -472,7 +472,7 @@ public: ...@@ -472,7 +472,7 @@ public:
// \sa addProfiling // \sa addProfiling
// \sa endProfiling // \sa endProfiling
#define addProfiling0(name) \ #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 //- Define profiling with specified name and description correspond to the
// compiler-defined function name string: // compiler-defined function name string:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment