Commit df010ec6 authored by mattijs's avatar mattijs
Browse files

Merge branch 'feature-snappyHexMesh' of...

Merge branch 'feature-snappyHexMesh' of develop.openfoam.com:Development/OpenFOAM-dev-OpenCFD into feature-snappyHexMesh
parents 2de68a9a 57547918
......@@ -55,7 +55,7 @@ PDRkEpsilon::PDRkEpsilon
const word& modelName
)
:
Foam::RASModels::kEpsilon<eddyDiffusivity<compressible::turbulenceModel> >
Foam::RASModels::kEpsilon<EddyDiffusivity<compressible::turbulenceModel> >
(
geometricOneField(),
rho,
......
......@@ -80,7 +80,7 @@ class PDRkEpsilon
:
public Foam::RASModels::kEpsilon
<
eddyDiffusivity
EddyDiffusivity
<
compressible::turbulenceModel
>
......
......@@ -58,7 +58,7 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "CourantNo.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
}
......
......@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "CourantNo.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
}
......
......@@ -59,7 +59,7 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "CourantNo.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
}
......
......@@ -45,8 +45,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
pimple.dict(),
GREAT,
dimDensity
dimDensity,
GREAT
)
);
......@@ -56,8 +56,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
pimple.dict(),
0,
dimDensity
dimDensity,
0
)
);
......
......@@ -63,12 +63,11 @@ int main(int argc, char *argv[])
#include "createMRF.H"
#include "createFvOptions.H"
#include "createRhoUf.H"
#include "CourantNo.H"
#include "createControls.H"
if (!LTS)
{
#include "CourantNo.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
}
......
......@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "CourantNo.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
}
......
......@@ -52,8 +52,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
simple.dict(),
GREAT,
dimDensity
dimDensity,
GREAT
)
);
......@@ -63,8 +63,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
simple.dict(),
0,
dimDensity
dimDensity,
0
)
);
......
......@@ -51,8 +51,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
simple.dict(),
GREAT,
dimDensity
dimDensity,
GREAT
)
);
......@@ -62,8 +62,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
simple.dict(),
0,
dimDensity
dimDensity,
0
)
);
......
......@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
#include "createMRF.H"
#include "createFvOptions.H"
#include "createRhoUf.H"
#include "CourantNo.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -187,8 +187,8 @@ forAll(fluidRegions, i)
(
"rhoMax",
simpleDict,
GREAT,
dimDensity
dimDensity,
GREAT
)
)
);
......@@ -202,8 +202,8 @@ forAll(fluidRegions, i)
(
"rhoMin",
simpleDict,
0,
dimDensity
dimDensity,
0
)
)
);
......
......@@ -24,4 +24,5 @@
thermo.correct();
Info<< "Min/max T:" << min(thermo.T()) << ' ' << max(thermo.T()) << endl;
Info<< "Min/max T:" << min(thermo.T()).value() << ' '
<< max(thermo.T()).value() << endl;
......@@ -30,7 +30,8 @@ if (finalIter)
thermo.correct();
Info<< "Min/max T:" << min(thermo.T()) << ' ' << max(thermo.T()) << endl;
Info<< "Min/max T:" << min(thermo.T()).value() << ' '
<< max(thermo.T()).value() << endl;
if (finalIter)
{
......
......@@ -70,7 +70,7 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "CourantNo.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
}
......
......@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
pimple.dict(),
GREAT,
dimDensity
dimDensity,
GREAT
)
);
......@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
pimple.dict(),
0,
dimDensity
dimDensity,
0
)
);
......
......@@ -65,7 +65,7 @@ int main(int argc, char *argv[])
if (!LTS)
{
#include "CourantNo.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
}
......
......@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
simple.dict(),
GREAT,
dimDensity
dimDensity,
GREAT
)
);
......@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
simple.dict(),
0,
dimDensity
dimDensity,
0
)
);
......
......@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
pimple.dict(),
GREAT,
dimDensity
dimDensity,
GREAT
)
);
......@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
pimple.dict(),
0,
dimDensity
dimDensity,
0
)
);
......
......@@ -32,8 +32,6 @@ Description
if (adjustTimeStep)
{
#include "CourantNo.H"
if (CoNum > SMALL)
{
scalar maxDeltaTFact =
......
Markdown is supported
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