zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mark Olesen
2017-04-07 09:28:26 +02:00
parent d794f599d8 90eeafb43e
commit b257e80d9a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqns.H
View File

@ -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 @@
} }
// 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

2
src/OpenFOAM/global/profiling/profiling.H
View File

@ -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: