MRG: Resolve conflict with latest foundation merge

This commit is contained in:
Andrew Heather
2016-10-26 15:37:15 +01:00
243 changed files with 11116 additions and 28853 deletions

View File

@ -17,7 +17,7 @@ FoamFile
application reactingTwoPhaseEulerFoam;
startFrom startTime;
startFrom latestTime;
startTime 0;
@ -25,11 +25,11 @@ stopAt endTime;
endTime 2;
deltaT 1e-5;
deltaT 1e-4;
writeControl adjustableRunTime;
writeInterval 0.1;
writeInterval 0.5;
purgeWrite 0;
@ -37,7 +37,7 @@ writeFormat ascii;
writePrecision 9;
writeCompression compressed;
writeCompression uncompressed;
timeFormat general;

View File

@ -0,0 +1,54 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class dictionary;
location "system";
object controlDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
application reactingTwoPhaseEulerFoam;
startFrom latestTime;
startTime 0;
stopAt endTime;
endTime 2;
deltaT 1e-4;
writeControl adjustableRunTime;
writeInterval 0.5;
purgeWrite 0;
writeFormat ascii;
writePrecision 9;
writeCompression uncompressed;
timeFormat general;
timePrecision 6;
runTimeModifiable yes;
adjustTimeStep yes;
maxCo 0.05;
maxDeltaT 0.001;
// ************************************************************************* //

View File

@ -80,10 +80,10 @@ solvers
PIMPLE
{
nOuterCorrectors 3;
nOuterCorrectors 6;
nCorrectors 1;
nNonOrthogonalCorrectors 0;
nEnergyCorrectors 3;
nEnergyCorrectors 2;
faceMomentum yes;
}
@ -97,7 +97,7 @@ relaxationFactors
equations
{
".*" 1;
"h.*" 0.4;
"h.*" 0.3;
}
}